Skip to content

Commit

Permalink
Merge pull request #67 from matterinc/feature/erc721
Browse files Browse the repository at this point in the history
Feature/erc721
  • Loading branch information
shamatar authored Oct 18, 2018
2 parents 784473f + bf7538d commit 125832e
Show file tree
Hide file tree
Showing 37 changed files with 252 additions and 74 deletions.
8 changes: 4 additions & 4 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
2 changes: 1 addition & 1 deletion Pods/Headers/Public/BigInt/BigInt-iOS-umbrella.h

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

2 changes: 1 addition & 1 deletion Pods/Headers/Public/BigInt/BigInt-iOS.modulemap

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

2 changes: 1 addition & 1 deletion Pods/Headers/Public/BigInt/BigInt-macOS-umbrella.h

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

2 changes: 1 addition & 1 deletion Pods/Headers/Public/BigInt/BigInt-macOS.modulemap

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

2 changes: 1 addition & 1 deletion Pods/Headers/Public/CryptoSwift/CryptoSwift-iOS-umbrella.h

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

2 changes: 1 addition & 1 deletion Pods/Headers/Public/CryptoSwift/CryptoSwift-iOS.modulemap

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/Headers/Public/PromiseKit/PromiseKit-umbrella.h

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

2 changes: 1 addition & 1 deletion Pods/Headers/Public/PromiseKit/PromiseKit.modulemap

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/Headers/Public/Result/Result-iOS-umbrella.h

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

2 changes: 1 addition & 1 deletion Pods/Headers/Public/Result/Result-iOS.modulemap

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

2 changes: 1 addition & 1 deletion Pods/Headers/Public/Result/Result-macOS-umbrella.h

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

2 changes: 1 addition & 1 deletion Pods/Headers/Public/Result/Result-macOS.modulemap

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

2 changes: 1 addition & 1 deletion Pods/Headers/Public/SipHash/SipHash-iOS-umbrella.h

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

2 changes: 1 addition & 1 deletion Pods/Headers/Public/SipHash/SipHash-iOS.modulemap

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

2 changes: 1 addition & 1 deletion Pods/Headers/Public/SipHash/SipHash-macOS-umbrella.h

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

2 changes: 1 addition & 1 deletion Pods/Headers/Public/SipHash/SipHash-macOS.modulemap

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

2 changes: 1 addition & 1 deletion Pods/Headers/Public/SwiftRLP/SwiftRLP-iOS-umbrella.h

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

2 changes: 1 addition & 1 deletion Pods/Headers/Public/SwiftRLP/SwiftRLP-iOS.modulemap

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

2 changes: 1 addition & 1 deletion Pods/Headers/Public/SwiftRLP/SwiftRLP-macOS-umbrella.h

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

2 changes: 1 addition & 1 deletion Pods/Headers/Public/SwiftRLP/SwiftRLP-macOS.modulemap

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

2 changes: 1 addition & 1 deletion Pods/Headers/Public/scrypt/scrypt-iOS-umbrella.h

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

2 changes: 1 addition & 1 deletion Pods/Headers/Public/scrypt/scrypt-iOS.modulemap

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

2 changes: 1 addition & 1 deletion Pods/Headers/Public/scrypt/scrypt-macOS-umbrella.h

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

2 changes: 1 addition & 1 deletion Pods/Headers/Public/scrypt/scrypt-macOS.modulemap

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.

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.

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.

4 changes: 2 additions & 2 deletions Pods/secp256k1_swift/Classes/secp256k1.swift

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

44 changes: 12 additions & 32 deletions web3swift.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@
E23B5AE320EA69B900DC7F32 /* web3swift_numberFormattingUtil_Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E23B5AE220EA69B900DC7F32 /* web3swift_numberFormattingUtil_Tests.swift */; };
E23B5AE520EA6A0A00DC7F32 /* web3swift_contractV2_Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E23B5AE420EA6A0A00DC7F32 /* web3swift_contractV2_Tests.swift */; };
E2C590762152835400FF53D3 /* JSONRPCrequestDispatcher+ObjC.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2C590752152835400FF53D3 /* JSONRPCrequestDispatcher+ObjC.swift */; };
E2E94C60217788E0005F54A0 /* Web3+ERC721.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2E94C5F217788E0005F54A0 /* Web3+ERC721.swift */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -380,6 +381,7 @@
E23B5AE220EA69B900DC7F32 /* web3swift_numberFormattingUtil_Tests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = web3swift_numberFormattingUtil_Tests.swift; sourceTree = "<group>"; };
E23B5AE420EA6A0A00DC7F32 /* web3swift_contractV2_Tests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = web3swift_contractV2_Tests.swift; sourceTree = "<group>"; };
E2C590752152835400FF53D3 /* JSONRPCrequestDispatcher+ObjC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "JSONRPCrequestDispatcher+ObjC.swift"; sourceTree = "<group>"; };
E2E94C5F217788E0005F54A0 /* Web3+ERC721.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Web3+ERC721.swift"; sourceTree = "<group>"; };
FB43EC035C593F9E5A3644B6 /* Pods-web3swift-macOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-web3swift-macOS.debug.xcconfig"; path = "Pods/Target Support Files/Pods-web3swift-macOS/Pods-web3swift-macOS.debug.xcconfig"; sourceTree = "<group>"; };
FC1E6C115639177F2629E42A /* Pods_web3swift_osx.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_web3swift_osx.framework; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */
Expand Down Expand Up @@ -471,7 +473,6 @@
81FECD43211ADE20006DA367 /* ObjectiveCbridge */,
0073F22320D949D7000791F1 /* BlockExplorer */,
81A1821220D5A2430016741F /* Promises */,
81FB2204207BCFD9007F9A83 /* Resources */,
81C5DA082072542300424CD6 /* ABIv2 */,
81C0FCED20440BDF00D82FAF /* HookedFunctions */,
81C0FCEA20440BB400D82FAF /* Web3 */,
Expand Down Expand Up @@ -617,25 +618,10 @@
path = ERC20;
sourceTree = "<group>";
};
8159C50721343EDD00197B91 /* ERC721 */ = {
isa = PBXGroup;
children = (
);
path = ERC721;
sourceTree = "<group>";
};
8159C50821343EED00197B91 /* PrivateKeyControlledAccount */ = {
isa = PBXGroup;
children = (
);
path = PrivateKeyControlledAccount;
sourceTree = "<group>";
};
8159C50921343EF900197B91 /* PrecompiledContracts */ = {
isa = PBXGroup;
children = (
8159C50821343EED00197B91 /* PrivateKeyControlledAccount */,
8159C50721343EDD00197B91 /* ERC721 */,
E2E94C5E2177886C005F54A0 /* ERC721 */,
8159C50621343ED300197B91 /* ERC20 */,
);
path = PrecompiledContracts;
Expand Down Expand Up @@ -799,21 +785,6 @@
path = Classes;
sourceTree = "<group>";
};
81FB2204207BCFD9007F9A83 /* Resources */ = {
isa = PBXGroup;
children = (
81FB2205207BCFE4007F9A83 /* Classes */,
);
path = Resources;
sourceTree = "<group>";
};
81FB2205207BCFE4007F9A83 /* Classes */ = {
isa = PBXGroup;
children = (
);
path = Classes;
sourceTree = "<group>";
};
81FECD43211ADE20006DA367 /* ObjectiveCbridge */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -853,6 +824,14 @@
name = Pods;
sourceTree = "<group>";
};
E2E94C5E2177886C005F54A0 /* ERC721 */ = {
isa = PBXGroup;
children = (
E2E94C5F217788E0005F54A0 /* Web3+ERC721.swift */,
);
path = ERC721;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXHeadersBuildPhase section */
Expand Down Expand Up @@ -1133,6 +1112,7 @@
817EBB122004FE2F00E02EAA /* BIP32HDNode.swift in Sources */,
8113D2C41FD7E1590074282C /* CryptoExtensions.swift in Sources */,
81A1822220D678060016741F /* Promise+Web3+Eth+GetBlockNumber.swift in Sources */,
E2E94C60217788E0005F54A0 /* Web3+ERC721.swift in Sources */,
81C5DA252072E14E00424CD6 /* ABIv2Encoding.swift in Sources */,
81A1824220D7AA750016741F /* Promise+Web3+Eth+SendTransaction.swift in Sources */,
817EBB2920075D2E00E02EAA /* BIP39.swift in Sources */,
Expand Down
Loading

0 comments on commit 125832e

Please sign in to comment.