Skip to content

Commit

Permalink
Merge pull request #26 from matterinc/develop
Browse files Browse the repository at this point in the history
Implement EIP681 parser (untested)
  • Loading branch information
shamatar authored Sep 8, 2018
2 parents c232d91 + 7b66e9e commit 74bdd9a
Show file tree
Hide file tree
Showing 35 changed files with 1,964 additions and 1,138 deletions.
2 changes: 1 addition & 1 deletion Podfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
def import_pods
pod 'scrypt', '~> 1.6'
pod 'scrypt', '~> 1.7'
pod "PromiseKit", "~> 6.3"
pod 'BigInt', '~> 3.1'
pod 'CryptoSwift', '~> 0.11'
Expand Down
8 changes: 4 additions & 4 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ PODS:
- PromiseKit/UIKit (6.4.0):
- PromiseKit/CorePromise
- Result (3.2.4)
- scrypt (1.6):
- scrypt (1.7):
- CryptoSwift (~> 0.11)
- secp256k1_ios (0.1.3)
- SipHash (1.2.2)
Expand All @@ -22,7 +22,7 @@ DEPENDENCIES:
- CryptoSwift (~> 0.11)
- PromiseKit (~> 6.3)
- Result (~> 3.0)
- scrypt (~> 1.6)
- scrypt (~> 1.7)
- secp256k1_ios (from `https://github.com/shamatar/secp256k1_ios.git`)

SPEC REPOS:
Expand All @@ -48,10 +48,10 @@ SPEC CHECKSUMS:
CryptoSwift: ad5208dd2aae0a764ea4ce2c2d34bd067cae67f0
PromiseKit: ae3616f45d7bb9bf4ff1e91abc9b7a8c48a340e0
Result: d2d07204ce72856f1fd9130bbe42c35a7b0fea10
scrypt: 9b08b4f2a45cb38d17026feb7e287cfca1603125
scrypt: a828bd579086977f6db7f9798d1c6332ccaaed4e
secp256k1_ios: ac9ef04e761f43c58012b28548afa91493761f17
SipHash: fad90a4683e420c52ef28063063dbbce248ea6d4

PODFILE CHECKSUM: 6adb2e455ccff337782d78f394b1fdaa1d087882
PODFILE CHECKSUM: f536cef086b9f22f5c02cedf59f84825befa9b5f

COCOAPODS: 1.5.3
1 change: 1 addition & 0 deletions Pods/Headers/Private/scrypt/Cimpl.h

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

8 changes: 4 additions & 4 deletions Pods/Manifest.lock

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

2,214 changes: 1,113 additions & 1,101 deletions Pods/Pods.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Pods/Target Support Files/Pods-web3swift-iOS/Pods-web3swift-iOS.debug.xcconfig
100755 → 100644

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

2 changes: 1 addition & 1 deletion Pods/Target Support Files/Pods-web3swift-iOS/Pods-web3swift-iOS.release.xcconfig
100755 → 100644

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.

2 changes: 1 addition & 1 deletion Pods/Target Support Files/Pods-web3swift-macOS/Pods-web3swift-macOS.debug.xcconfig
100755 → 100644

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

2 changes: 1 addition & 1 deletion Pods/Target Support Files/Pods-web3swift-macOS/Pods-web3swift-macOS.release.xcconfig
100755 → 100644

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.

5 changes: 3 additions & 2 deletions Pods/Target Support Files/scrypt-iOS/scrypt-iOS.xcconfig

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

3 changes: 2 additions & 1 deletion Pods/Target Support Files/scrypt-macOS/scrypt-macOS.xcconfig

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

Loading

0 comments on commit 74bdd9a

Please sign in to comment.