Skip to content

Commit

Permalink
Merge pull request #68 from matterinc/develop
Browse files Browse the repository at this point in the history
Add TxPool and ERC721 native class
  • Loading branch information
shamatar authored Oct 18, 2018
2 parents 85c36b0 + 5fdeb52 commit 6480bca
Show file tree
Hide file tree
Showing 32 changed files with 1,631 additions and 620 deletions.
6 changes: 3 additions & 3 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2018 Aleksandr Vlasov, Stichting Bankex Foundation <av@bankexfoundation.org>
Copyright (c) 2018 Aleksandr Vlasov, <alex.m.vlasov@gmail.com>

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

Copyright 2018 Stichting Bankex Foundation
Copyright 2018 Aleksandr Vlasov

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -200,4 +200,4 @@ Copyright (c) 2018 Aleksandr Vlasov, Stichting Bankex Foundation <av@bankexfound
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
limitations under the License.
10 changes: 5 additions & 5 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ PODS:
- Result (4.0.0)
- scrypt (2.0):
- CryptoSwift (~> 0.11)
- secp256k1_swift (1.0.2)
- secp256k1_swift (1.0.3)
- SipHash (1.2.2)
- SwiftRLP (1.0.1):
- BigInt (~> 3.1)
Expand All @@ -25,7 +25,7 @@ DEPENDENCIES:
- PromiseKit (~> 6.4.1)
- Result (~> 4.0)
- scrypt (~> 2.0)
- secp256k1_swift (~> 1.0.2)
- secp256k1_swift (~> 1.0.3)
- SwiftRLP (~> 1.0.1)

SPEC REPOS:
Expand All @@ -45,10 +45,10 @@ SPEC CHECKSUMS:
PromiseKit: 4c76a6506638034e3d7bede97b2ff7743f7bd2dc
Result: 7645bb3f50c2ce726dd0ff2fa7b6f42bbe6c3713
scrypt: 3fe5b1a3b0976f97cd87488673a8f7c65708cc84
secp256k1_swift: 1e6ac4ee77fbef7f97f87e096a918a1248b8c4f6
secp256k1_swift: 4fc5c4b2d2c6d21ee8ccb868cdc92da12f38bed9
SipHash: fad90a4683e420c52ef28063063dbbce248ea6d4
SwiftRLP: 9de2c9512a9a6bf0909cd84cc143a7ff1aff7820

PODFILE CHECKSUM: bce98dcdfceae57faa2cd3bcb3d595f16beaad0b
PODFILE CHECKSUM: c1d9470cb065e1f6c00709092108f522105e869f

COCOAPODS: 1.6.0.beta.1
COCOAPODS: 1.6.0.beta.2
10 changes: 5 additions & 5 deletions Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1,033 changes: 489 additions & 544 deletions Pods/Pods.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 6480bca

Please sign in to comment.