Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: web3swift-team/web3swift
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.1.10
Choose a base ref
...
head repository: web3swift-team/web3swift
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1.5
Choose a head ref
  • 15 commits
  • 32 files changed
  • 3 contributors

Commits on Oct 4, 2018

  1. License got reverted somewhere after PRs

    No more affiliation with Bankex
    shamatar authored Oct 4, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    d16d01d View commit details
  2. Merge pull request #60 from matterinc/feature/readmeImprovement

    License got reverted somewhere after PRs
    shamatar authored Oct 4, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    4e1911d View commit details

Commits on Oct 12, 2018

  1. Copy the full SHA
    45a7dab View commit details

Commits on Oct 13, 2018

  1. added logo

    TonioMacaronio committed Oct 13, 2018
    Copy the full SHA
    ce9388e View commit details
  2. Update README.md

    TonioMacaronio authored Oct 13, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    4f552f5 View commit details
  3. Merge pull request #66 from matterinc/feature/addingLogo

    Feature/adding logo
    TonioMacaronio authored Oct 13, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    9ab3494 View commit details
  4. Update README.md

    TonioMacaronio authored Oct 13, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    ef4a602 View commit details

Commits on Oct 17, 2018

  1. deleted red folders

    TonioMacaronio committed Oct 17, 2018
    Copy the full SHA
    47021be View commit details
  2. started erc721

    TonioMacaronio committed Oct 17, 2018
    Copy the full SHA
    d6a710c View commit details
  3. finished erc721

    TonioMacaronio committed Oct 17, 2018
    Copy the full SHA
    568ec5d View commit details
  4. Copy the full SHA
    bf7538d View commit details

Commits on Oct 18, 2018

  1. Merge pull request #64 from currybab/feature/pendingTransactions

    adds txpool function and its local node test
    shamatar authored Oct 18, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    784473f View commit details
  2. Merge pull request #67 from matterinc/feature/erc721

    Feature/erc721
    shamatar authored Oct 18, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    125832e View commit details
  3. Copy the full SHA
    5fdeb52 View commit details
  4. Merge pull request #68 from matterinc/develop

    Add TxPool and ERC721 native class
    shamatar authored Oct 18, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    6480bca View commit details
Showing with 1,631 additions and 620 deletions.
  1. +3 −3 LICENSE
  2. +5 −5 Podfile.lock
  3. +5 −5 Pods/Manifest.lock
  4. +489 −544 Pods/Pods.xcodeproj/project.pbxproj
  5. +235 −1 Pods/Target Support Files/Pods-web3swift-iOS/Pods-web3swift-iOS-acknowledgements.plist
  6. +1 −1 Pods/Target Support Files/Pods-web3swift-iOS/Pods-web3swift-iOS.debug.xcconfig
  7. +1 −1 Pods/Target Support Files/Pods-web3swift-iOS/Pods-web3swift-iOS.release.xcconfig
  8. +25 −1 Pods/Target Support Files/Pods-web3swift-iOS_Tests/Pods-web3swift-iOS_Tests-acknowledgements.plist
  9. +1 −1 Pods/Target Support Files/Pods-web3swift-iOS_Tests/Pods-web3swift-iOS_Tests.debug.xcconfig
  10. +1 −1 Pods/Target Support Files/Pods-web3swift-iOS_Tests/Pods-web3swift-iOS_Tests.release.xcconfig
  11. +235 −1 Pods/Target Support Files/Pods-web3swift-macOS/Pods-web3swift-macOS-acknowledgements.plist
  12. +1 −1 Pods/Target Support Files/Pods-web3swift-macOS/Pods-web3swift-macOS.debug.xcconfig
  13. +1 −1 Pods/Target Support Files/Pods-web3swift-macOS/Pods-web3swift-macOS.release.xcconfig
  14. +25 −1 ...Target Support Files/Pods-web3swift-macOS_Tests/Pods-web3swift-macOS_Tests-acknowledgements.plist
  15. +1 −1 Pods/Target Support Files/Pods-web3swift-macOS_Tests/Pods-web3swift-macOS_Tests.debug.xcconfig
  16. +1 −1 Pods/Target Support Files/Pods-web3swift-macOS_Tests/Pods-web3swift-macOS_Tests.release.xcconfig
  17. +2 −2 Pods/secp256k1_swift/Classes/secp256k1.swift
  18. +2 −0 README.md
  19. BIN web3swift-logo.png
  20. +20 −32 web3swift.xcodeproj/project.pbxproj
  21. +11 −9 web3swift/KeystoreManager/Classes/BIP32Keystore.swift
  22. +31 −1 web3swift/KeystoreManager/Classes/BIP39.swift
  23. +4 −0 web3swift/KeystoreManager/Classes/EthereumAddress.swift
  24. +198 −0 web3swift/PrecompiledContracts/ERC721/Web3+ERC721.swift
  25. +59 −0 web3swift/Promises/Classes/Promise+Web3+TxPool.swift
  26. +24 −0 web3swift/Web3/Classes/Web3+Instance.swift
  27. +11 −2 web3swift/Web3/Classes/Web3+JSONRPC.swift
  28. +9 −0 web3swift/Web3/Classes/Web3+Methods.swift
  29. +107 −2 web3swift/Web3/Classes/Web3+Structures.swift
  30. +50 −0 web3swift/Web3/Classes/Web3+TxPool.swift
  31. +8 −1 web3swiftTests/web3swift_keystores_Tests.swift
  32. +65 −2 web3swiftTests/web3swift_local_node_Tests.swift
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
@@ -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.
@@ -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
@@ -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)
@@ -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:
@@ -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.

Loading