Skip to content

Commit 6480bca

Browse files
authored
Merge pull request #68 from matterinc/develop
Add TxPool and ERC721 native class
2 parents 85c36b0 + 5fdeb52 commit 6480bca

32 files changed

+1631
-620
lines changed

LICENSE

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2018 Aleksandr Vlasov, Stichting Bankex Foundation <[email protected]>
1+
Copyright (c) 2018 Aleksandr Vlasov, <[email protected]>
22

33
Apache License
44
Version 2.0, January 2004
@@ -188,7 +188,7 @@ Copyright (c) 2018 Aleksandr Vlasov, Stichting Bankex Foundation <av@bankexfound
188188
same "printed page" as the copyright notice for easier
189189
identification within third-party archives.
190190

191-
Copyright 2018 Stichting Bankex Foundation
191+
Copyright 2018 Aleksandr Vlasov
192192

193193
Licensed under the Apache License, Version 2.0 (the "License");
194194
you may not use this file except in compliance with the License.
@@ -200,4 +200,4 @@ Copyright (c) 2018 Aleksandr Vlasov, Stichting Bankex Foundation <av@bankexfound
200200
distributed under the License is distributed on an "AS IS" BASIS,
201201
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
202202
See the License for the specific language governing permissions and
203-
limitations under the License.
203+
limitations under the License.

Podfile.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ PODS:
1414
- Result (4.0.0)
1515
- scrypt (2.0):
1616
- CryptoSwift (~> 0.11)
17-
- secp256k1_swift (1.0.2)
17+
- secp256k1_swift (1.0.3)
1818
- SipHash (1.2.2)
1919
- SwiftRLP (1.0.1):
2020
- BigInt (~> 3.1)
@@ -25,7 +25,7 @@ DEPENDENCIES:
2525
- PromiseKit (~> 6.4.1)
2626
- Result (~> 4.0)
2727
- scrypt (~> 2.0)
28-
- secp256k1_swift (~> 1.0.2)
28+
- secp256k1_swift (~> 1.0.3)
2929
- SwiftRLP (~> 1.0.1)
3030

3131
SPEC REPOS:
@@ -45,10 +45,10 @@ SPEC CHECKSUMS:
4545
PromiseKit: 4c76a6506638034e3d7bede97b2ff7743f7bd2dc
4646
Result: 7645bb3f50c2ce726dd0ff2fa7b6f42bbe6c3713
4747
scrypt: 3fe5b1a3b0976f97cd87488673a8f7c65708cc84
48-
secp256k1_swift: 1e6ac4ee77fbef7f97f87e096a918a1248b8c4f6
48+
secp256k1_swift: 4fc5c4b2d2c6d21ee8ccb868cdc92da12f38bed9
4949
SipHash: fad90a4683e420c52ef28063063dbbce248ea6d4
5050
SwiftRLP: 9de2c9512a9a6bf0909cd84cc143a7ff1aff7820
5151

52-
PODFILE CHECKSUM: bce98dcdfceae57faa2cd3bcb3d595f16beaad0b
52+
PODFILE CHECKSUM: c1d9470cb065e1f6c00709092108f522105e869f
5353

54-
COCOAPODS: 1.6.0.beta.1
54+
COCOAPODS: 1.6.0.beta.2

Pods/Manifest.lock

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

Pods/Pods.xcodeproj/project.pbxproj

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

Pods/Target Support Files/Pods-web3swift-iOS/Pods-web3swift-iOS-acknowledgements.plist

Lines changed: 235 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Target Support Files/Pods-web3swift-iOS/Pods-web3swift-iOS.debug.xcconfig

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Target Support Files/Pods-web3swift-iOS/Pods-web3swift-iOS.release.xcconfig

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)