Skip to content

Commit d596ea4

Browse files
authored
Merge pull request #84 from matterinc/2.0
2.0.1
2 parents e960456 + 38f8caa commit d596ea4

File tree

197 files changed

+6651
-5918
lines changed

Some content is hidden

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

197 files changed

+6651
-5918
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,3 +67,4 @@ fastlane/screenshots
6767
fastlane/test_output
6868
API_keys.plist
6969
web3swiftTests/key.json
70+
web3swiftTests/Resources/key.json

Podfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@ def import_pods
22
pod 'scrypt', '~> 2.0'
33
pod "PromiseKit", "~> 6.4.1"
44
pod 'BigInt', '~> 3.1'
5-
pod 'CryptoSwift', '~> 0.12'
5+
pod 'CryptoSwift', '~> 0.13'
66
pod 'Result', '~> 4.0'
77
pod 'secp256k1_swift', '~> 1.0.3', :modular_headers => true
88
pod 'SwiftRLP', '~> 1.1'
99
pod 'EthereumAddress', '~> 1.0.0'
10+
pod 'EthereumABI', '~>1.1.1'
1011
end
1112

1213
target 'web3swift-macOS' do

Podfile.lock

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ PODS:
22
- BigInt (3.1.0):
33
- SipHash (~> 1.2)
44
- CryptoSwift (0.13.0)
5+
- EthereumABI (1.1.1):
6+
- BigInt (~> 3.1)
7+
- CryptoSwift (~> 0.13)
8+
- EthereumAddress (~> 1.0.0)
59
- EthereumAddress (1.0.0):
610
- CryptoSwift (~> 0.13)
711
- PromiseKit (6.4.1):
@@ -23,7 +27,8 @@ PODS:
2327

2428
DEPENDENCIES:
2529
- BigInt (~> 3.1)
26-
- CryptoSwift (~> 0.12)
30+
- CryptoSwift (~> 0.13)
31+
- EthereumABI (~> 1.1.1)
2732
- EthereumAddress (~> 1.0.0)
2833
- PromiseKit (~> 6.4.1)
2934
- Result (~> 4.0)
@@ -35,6 +40,7 @@ SPEC REPOS:
3540
https://github.com/cocoapods/specs.git:
3641
- BigInt
3742
- CryptoSwift
43+
- EthereumABI
3844
- EthereumAddress
3945
- PromiseKit
4046
- Result
@@ -46,6 +52,7 @@ SPEC REPOS:
4652
SPEC CHECKSUMS:
4753
BigInt: 76b5dfdfa3e2e478d4ffdf161aeede5502e2742f
4854
CryptoSwift: 16e78bebf567bad1c87b2d58f6547f25b74c31aa
55+
EthereumABI: f040f5429e5a4366d028c88b88d9441e137593af
4956
EthereumAddress: f476e1320dca3a0024431e713ede7a09c7eb7796
5057
PromiseKit: 4c76a6506638034e3d7bede97b2ff7743f7bd2dc
5158
Result: 7645bb3f50c2ce726dd0ff2fa7b6f42bbe6c3713
@@ -54,6 +61,6 @@ SPEC CHECKSUMS:
5461
SipHash: fad90a4683e420c52ef28063063dbbce248ea6d4
5562
SwiftRLP: 5512899925f1a9e1c78c902ed3bf857880e814a0
5663

57-
PODFILE CHECKSUM: 9f923f3cffffde022aaef140f9cd311a152e9c49
64+
PODFILE CHECKSUM: 72534436a5f24d6d07a676642432e134a85ff3e5
5865

59-
COCOAPODS: 1.6.0.beta.1
66+
COCOAPODS: 1.6.0.beta.2

Pods/EthereumABI/EthereumABI/Classes/ABI.swift

Lines changed: 28 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

web3swift/ABIv2/Classes/ABIv2Decoding.swift renamed to Pods/EthereumABI/EthereumABI/Classes/ABIDecoding.swift

Lines changed: 17 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)