Skip to content

Commit 3f759ac

Browse files
JeneaVranceanuJeneaVranceanu
committed
fix: conflicts agains develop
2 parents bffba81 + 34cf1e8 commit 3f759ac

File tree

360 files changed

+25828
-31767
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

360 files changed

+25828
-31767
lines changed

Diff for: ‎.codespellrc

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[codespell]
2+
count = True
3+
ignore-words-list = ans,deriver,inout,packag
4+
skip = *.js,*WordLists.swift,.git,Carthage,.build,build

Diff for: ‎.github/ISSUE_TEMPLATE/bug_report.yml

+67
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
name: Bug Report
2+
description: File a bug report.
3+
labels: ['bug']
4+
body:
5+
- type: markdown
6+
attributes:
7+
value: |
8+
Thanks for taking the time to fill out this bug report!
9+
- type: textarea
10+
id: bug-description
11+
attributes:
12+
label: What happened?
13+
description: Please describe the bug.
14+
placeholder: Description of the bug.
15+
validations:
16+
required: true
17+
- type: textarea
18+
id: steps-to-reproduce
19+
attributes:
20+
label: What are the steps to reproduce?
21+
description: Please describe the steps to reproduce the bug.
22+
placeholder: |
23+
Step 1: ...
24+
Step 2: ...
25+
Step 3: ...
26+
validations:
27+
required: true
28+
- type: textarea
29+
id: expected-behavior
30+
attributes:
31+
label: What is the expected behavior?
32+
description: Please describe the behavior you expect.
33+
placeholder: I expect that...
34+
validations:
35+
required: true
36+
- type: textarea
37+
id: error-thrown
38+
attributes:
39+
label: What is the error thrown?
40+
description: Please provide the exact error thrown.
41+
placeholder: Web3Error.invalidData("Exact error message")
42+
validations:
43+
required: true
44+
- type: textarea
45+
id: source-path
46+
attributes:
47+
label: What's the stack trace said?
48+
description: Please provide the exact source path.
49+
placeholder: Sources/Core/Transaction/CodableTransaction.swift:129 func recoverPublicKey()
50+
validations:
51+
required: true
52+
- type: textarea
53+
id: os-version
54+
attributes:
55+
label: OS version
56+
description: Please specify what platform and os version you are using?
57+
placeholder: macOS 13.0.1 (22A400)
58+
validations:
59+
required: true
60+
- type: textarea
61+
id: lib-version
62+
attributes:
63+
label: Library version
64+
description: Please specify what library version you are using?
65+
placeholder: 3.0.6 or "ef06fbfc735ab687ebf89c937a9d1ffe6d81d37f" commit.
66+
validations:
67+
required: true

Diff for: ‎.github/ISSUE_TEMPLATE/documentation-request.yml

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: Documentation Request
2+
description: Suggest documentation you would like added
3+
labels: ['documentation']
4+
body:
5+
- type: markdown
6+
attributes:
7+
value: |
8+
Thanks for taking the time to fill out this documentation request!
9+
- type: textarea
10+
id: area
11+
attributes:
12+
label: What piece of the framework are having the lack of docs?
13+
description: Bring the link, either type, either method name that is having the lack of docs
14+
placeholder: "`Sources/Core/EthereumABI.swift:ABIElementPropertiesProtocol` or `ABIElementPropertiesProtocol`"
15+
validations:
16+
required: true
17+
- type: textarea
18+
id: reason
19+
attributes:
20+
label: What bit of docs would you like to have?
21+
description: A clear and concise description of why this documentation needs to be improved.
22+
placeholder: There's a lack of docs that covers both the intent of this type and the way how it should be used within client code.
23+
validations:
24+
required: true

Diff for: ‎.github/ISSUE_TEMPLATE/feature_request.yml

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: Feature Request
2+
description: Suggest an idea for this project
3+
labels: ['enhancement']
4+
body:
5+
- type: markdown
6+
attributes:
7+
value: |
8+
Thanks for taking the time to fill out this feature request!
9+
- type: textarea
10+
id: problem
11+
attributes:
12+
label: What context is your feature request related to?
13+
description: Short context name, please do not overcomplicate neither over fractionize it.
14+
placeholder: Transaction pipeline enhancement, supported platform list extending, etc.
15+
validations:
16+
required: true
17+
- type: textarea
18+
id: solution
19+
attributes:
20+
label: What solution would you like?
21+
description: A clear and concise description of what you want to happen.
22+
placeholder: I would like that your lib has a magic "give me money" button, that provides me to just to build it, be uploaded to the AppStore and to get rich.
23+
validations:
24+
required: true
25+
- type: textarea
26+
id: context
27+
attributes:
28+
label: Any additional context?
29+
description: If there's some specs either standard for such feature invented already here's the good place to provide those.
30+
placeholder: Here's the pictures of house that i'd wanted to be able to bough after i've got rich and the my future cars list as well.

Diff for: ‎.github/pull_request_template.md

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
## **Summary of Changes**
2+
3+
Fixes # _(if applicable - add the number of issue this PR addresses)_
4+
5+
## **Test Data or Screenshots**
6+
7+
###### _By submitting this pull request, you are confirming the following:_
8+
9+
- I have reviewed the [Contribution Guidelines](https://github.com/web3swift-team/web3swift/blob/develop/CONTRIBUTION.md).
10+
- I have performed a self-review of my own code.
11+
- I have updated my repository to match the `develop` branch.
12+
- I have included test data or screenshots that prove my fix is effective or that my feature works.
13+
- I have checked that all tests work and swiftlint is not throwing any errors/warnings.

Diff for: ‎.github/workflows/ci.yml

-77
This file was deleted.

Diff for: ‎.github/workflows/macOS-tests.yml

+61
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
name: "macOS 12"
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
- develop
8+
- hotfix
9+
paths:
10+
- Packag*.swift
11+
- web3swift.podspec
12+
- Cartfile
13+
- Sources/**
14+
- 'Tests/**'
15+
- 'web3swift*/**'
16+
- '.github/workflows/**'
17+
pull_request:
18+
branches:
19+
- master
20+
- develop
21+
- unstable
22+
# Temporary develop-X.Y.Z branches may be added and removed from here as we release new versions
23+
- develop-4.0
24+
25+
env:
26+
DEVELOPER_DIR: /Applications/Xcode_14.1.app/Contents/Developer
27+
28+
jobs:
29+
spm:
30+
name: Swift Package Manager 5.7
31+
runs-on: macOS-12
32+
concurrency:
33+
group: spm-${{ github.run_id }}
34+
cancel-in-progress: false
35+
steps:
36+
- uses: actions/checkout@v3
37+
- name: Discover typos
38+
run: |
39+
pip3 install --upgrade pip
40+
pip3 install codespell
41+
codespell # See .codespellrc for args
42+
- name: SwiftLint
43+
run: |
44+
# 1. Make all automated fixes that are possible
45+
# 2. git diff to see what (if any) automated fixes were made
46+
# 3. See https://github.com/realm/SwiftLint#xcode explains why the double run
47+
swiftlint --fix --quiet && git diff && swiftlint --quiet
48+
- name: Resolve dependencies
49+
run: swift package resolve
50+
- name: Build
51+
run: swift build --build-tests
52+
- name: Install ganache
53+
run: npm install ganache --global
54+
- name: Start ganache in background
55+
run: ganache &
56+
- name: Wait till ganache starts
57+
run: sleep 1
58+
- name: Run local tests
59+
run: swift test --skip-build -c debug --filter localTests
60+
- name: Run remote tests
61+
run: swift test --skip-build -c debug --filter remoteTests

Diff for: ‎.github/workflows/pre-commit.yml

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# https://pre-commit.com
2+
# This GitHub Action assumes that the repo contains a valid .pre-commit-config.yaml file.
3+
# Using pre-commit.ci is even better than using GitHub Actions for pre-commit.
4+
name: pre-commit
5+
on:
6+
pull_request:
7+
branches: [develop]
8+
push:
9+
branches: [develop]
10+
workflow_dispatch:
11+
jobs:
12+
pre-commit:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/checkout@v3
16+
- uses: actions/setup-python@v4
17+
with:
18+
python-version: 3.x
19+
- run: pip install pre-commit
20+
- run: pre-commit --version
21+
- run: pre-commit install
22+
- run: pre-commit run --all-files

Diff for: ‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ xcuserdata/
2121
*.moved-aside
2222
*.xccheckout
2323
*.xcscmblueprint
24+
web3swift.xcodeproj/
2425

2526
## Obj-C/Swift specific
2627
*.hmap
@@ -40,6 +41,7 @@ Package.pins
4041
.build/
4142
.swiftpm/**
4243
*/.swiftpm/**
44+
Package.resolved
4345

4446
# CocoaPods
4547
#

Diff for: ‎.pre-commit-config.yaml

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
repos:
2+
- repo: https://github.com/pre-commit/pre-commit-hooks
3+
rev: v3.2.0
4+
hooks:
5+
- id: trailing-whitespace
6+
- id: end-of-file-fixer
7+
- id: check-yaml
8+
- id: check-added-large-files
9+
- id: check-case-conflict
10+
- id: check-json
11+
- id: mixed-line-ending
12+
- id: no-commit-to-branch
13+
args: [--branch, staging, --branch, main, --branch, master, --branch, develop-4.0, --branch, develop-upstream]
14+
- repo: https://github.com/codespell-project/codespell
15+
rev: v2.2.2
16+
hooks:
17+
- id: codespell # See .codespellrc for args
18+
# - repo: https://github.com/realm/SwiftLint # Too slow in pre-commit
19+
# rev: 0.50.3
20+
# hooks:
21+
# - id: swiftlint
22+
# args: [--fix, Sources, Tests]

0 commit comments

Comments
 (0)