Skip to content

WIP: ENS BaseRegistrar and RegistrarController support #162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zkToha merged 12 commits into from
Apr 19, 2019
Merged

WIP: ENS BaseRegistrar and RegistrarController support #162

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
145a29a
removed Class folders, added ENS Base Registrar, changed content hash…
zkToha Apr 15, 2019
f3353c1
added ethregistrarcontroller support
zkToha Apr 16, 2019
e44757d
fixed support interface methods in ercs, refactored and changed archi…
zkToha Apr 17, 2019
32d2a15
some changes in convenient ens methods, updated changelog
zkToha Apr 18, 2019
84c6cd0
added registrars abis
zkToha Apr 18, 2019
1f12304
fixed test
zkToha Apr 19, 2019
2ac70ec
fixed readme
zkToha Apr 19, 2019
b40b29f
removed empty advancedusage
zkToha Apr 19, 2019
b2627ed
Update Usage.md
zkToha Apr 19, 2019
b9f46ee
Update README.md
zkToha Apr 19, 2019
e633fd2
some changes
zkToha Apr 19, 2019
6474d71
Merge branch 'ENSPermanentRegistrarSupport' of https://github.com/mat…
zkToha Apr 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
removed Class folders, added ENS Base Registrar, changed content hash… 
… for InterfaceName in ENSResolver
  • Loading branch information
@zkToha
zkToha committed Apr 15, 2019
commit 145a29ab4d87f83f651e292225dc6df14347cb15
2 changes: 1 addition & 1 deletion web3swift.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ s.swift_version = '5.0'
s.module_name = 'Web3swift'
s.ios.deployment_target = "9.0"
s.osx.deployment_target = "10.11"
s.source_files = "web3swift/{Promises,Web3,Contract,KeystoreManager,Transaction,Convenience,HookedFunctions}/Classes/*.{h,swift}", "web3swift/Utils/Classes/{EIP67Code, EIP681, ENS, ENSResolver, NonceMiddleware}.swift", "web3swift/PrecompiledContracts/**/*.swift", "web3swift/web3swift.h"
s.source_files = "web3swift/{Promises,Web3,Contract,KeystoreManager,Transaction,Convenience,HookedFunctions}/*.{h,swift}", "web3swift/Utils/**/*.swift" "web3swift/PrecompiledContracts/**/*.swift", "web3swift/web3swift.h"
s.public_header_files = "web3swift/web3swift.h"
s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }

Expand Down
124 changes: 50 additions & 74 deletions web3swift.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@
3A3F59BD225931BE0075C9E7 /* NameHash.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81A7B2502143C3A8004CD2C7 /* NameHash.swift */; };
3A3F59BE225931BE0075C9E7 /* ENS.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2E668CD214F8A7B00C3CC2D /* ENS.swift */; };
3A3F59BF225931BE0075C9E7 /* ENSResolver.swift in Sources */ = {isa = PBXBuildFile; fileRef = B219DC162154F3EE0035BF94 /* ENSResolver.swift */; };
3A52CCB22264A6D4001C8D7A /* NonceMiddleware.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81ED4EA72190D922003E932E /* NonceMiddleware.swift */; };
3A52CCB32264A6DC001C8D7A /* NonceMiddleware.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81ED4EA72190D922003E932E /* NonceMiddleware.swift */; };
3A52CCB72264B712001C8D7A /* BaseRegistrar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A52CCB62264B712001C8D7A /* BaseRegistrar.swift */; };
3A52CCB82264B712001C8D7A /* BaseRegistrar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A52CCB62264B712001C8D7A /* BaseRegistrar.swift */; };
3A52CCBA2264B728001C8D7A /* RegistrarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A52CCB92264B728001C8D7A /* RegistrarController.swift */; };
3A52CCBB2264B728001C8D7A /* RegistrarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A52CCB92264B728001C8D7A /* RegistrarController.swift */; };
3AE8913C2256286C00D08E99 /* Web3+ERC1155.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AE8911C2256286B00D08E99 /* Web3+ERC1155.swift */; };
3AE8913D2256286C00D08E99 /* Web3+ERC1155.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AE8911C2256286B00D08E99 /* Web3+ERC1155.swift */; };
3AE8913E2256286C00D08E99 /* Web3+ERC1376.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AE8911E2256286B00D08E99 /* Web3+ERC1376.swift */; };
Expand Down Expand Up @@ -258,6 +264,8 @@
2B8FEFF3962166E1BEADC886 /* Pods_web3swift_ios.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_web3swift_ios.framework; sourceTree = BUILT_PRODUCTS_DIR; };
342700493511FEB189700D13 /* Pods-web3swift-iOS_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-web3swift-iOS_Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-web3swift-iOS_Tests/Pods-web3swift-iOS_Tests.debug.xcconfig"; sourceTree = "<group>"; };
391A0D2EF42488E5C8AB2F71 /* Pods_web3swift_osx_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_web3swift_osx_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
3A52CCB62264B712001C8D7A /* BaseRegistrar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseRegistrar.swift; sourceTree = "<group>"; };
3A52CCB92264B728001C8D7A /* RegistrarController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RegistrarController.swift; sourceTree = "<group>"; };
3AE8911C2256286B00D08E99 /* Web3+ERC1155.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Web3+ERC1155.swift"; sourceTree = "<group>"; };
3AE8911E2256286B00D08E99 /* Web3+ERC1376.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Web3+ERC1376.swift"; sourceTree = "<group>"; };
3AE891202256286B00D08E99 /* Web3+ERC888.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Web3+ERC888.swift"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -469,7 +477,7 @@
1CD91AFE1FD76910007BFB45 /* web3swift */ = {
isa = PBXGroup;
children = (
8159C50921343EF900197B91 /* PrecompiledContracts */,
8159C50921343EF900197B91 /* Tokens */,
81FECD43211ADE20006DA367 /* ObjectiveCbridge */,
81A1821220D5A2430016741F /* Promises */,
81C0FCED20440BDF00D82FAF /* HookedFunctions */,
Expand Down Expand Up @@ -515,6 +523,27 @@
path = web3swiftTests;
sourceTree = "<group>";
};
3A52CCB42264A938001C8D7A /* ENS */ = {
isa = PBXGroup;
children = (
81A7B2502143C3A8004CD2C7 /* NameHash.swift */,
B2E668CD214F8A7B00C3CC2D /* ENS.swift */,
B219DC162154F3EE0035BF94 /* ENSResolver.swift */,
3A52CCB62264B712001C8D7A /* BaseRegistrar.swift */,
3A52CCB92264B728001C8D7A /* RegistrarController.swift */,
);
path = ENS;
sourceTree = "<group>";
};
3A52CCB52264A9E1001C8D7A /* EIP */ = {
isa = PBXGroup;
children = (
81FB21F8207BA78B007F9A83 /* EIP67Code.swift */,
81A7B2862143DBF6004CD2C7 /* EIP681.swift */,
);
path = EIP;
sourceTree = "<group>";
};
3AE8911B2256286B00D08E99 /* ERC1155 */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -674,33 +703,22 @@
8113D2AE1FD7E1590074282C /* Utils */ = {
isa = PBXGroup;
children = (
8113D2AF1FD7E1590074282C /* Classes */,
3A52CCB52264A9E1001C8D7A /* EIP */,
3A52CCB42264A938001C8D7A /* ENS */,
8113D2AF1FD7E1590074282C /* Hooks */,
);
path = Utils;
sourceTree = "<group>";
};
8113D2AF1FD7E1590074282C /* Classes */ = {
8113D2AF1FD7E1590074282C /* Hooks */ = {
isa = PBXGroup;
children = (
81FB21F8207BA78B007F9A83 /* EIP67Code.swift */,
81A7B2502143C3A8004CD2C7 /* NameHash.swift */,
81A7B2862143DBF6004CD2C7 /* EIP681.swift */,
B2E668CD214F8A7B00C3CC2D /* ENS.swift */,
B219DC162154F3EE0035BF94 /* ENSResolver.swift */,
81ED4EA72190D922003E932E /* NonceMiddleware.swift */,
);
path = Classes;
path = Hooks;
sourceTree = "<group>";
};
8113D2B51FD7E1590074282C /* KeystoreManager */ = {
isa = PBXGroup;
children = (
8113D2B71FD7E1590074282C /* Classes */,
);
path = KeystoreManager;
sourceTree = "<group>";
};
8113D2B71FD7E1590074282C /* Classes */ = {
isa = PBXGroup;
children = (
817EBB2420066E2B00E02EAA /* AbstractKeystore.swift */,
Expand All @@ -715,28 +733,20 @@
8103BBCB2077B84400499769 /* PlainKeystore.swift */,
8160E5CD20B8245A0070070B /* IBAN.swift */,
);
path = Classes;
path = KeystoreManager;
sourceTree = "<group>";
};
8113D2C11FD7E1590074282C /* Transaction */ = {
isa = PBXGroup;
children = (
8113D2C21FD7E1590074282C /* Classes */,
);
path = Transaction;
sourceTree = "<group>";
};
8113D2C21FD7E1590074282C /* Classes */ = {
isa = PBXGroup;
children = (
8113D2C31FD7E1590074282C /* EthereumTransaction.swift */,
81C0FCF520440F9900D82FAF /* TransactionSigner.swift */,
8125F06820499AC300A0F2FE /* BloomFilter.swift */,
);
path = Classes;
path = Transaction;
sourceTree = "<group>";
};
8159C50921343EF900197B91 /* PrecompiledContracts */ = {
8159C50921343EF900197B91 /* Tokens */ = {
isa = PBXGroup;
children = (
3AE891262256286B00D08E99 /* ERC20 */,
Expand All @@ -756,18 +766,10 @@
3AE8912A2256286B00D08E99 /* ERC1644 */,
3AE891212256286B00D08E99 /* ST20 */,
);
path = PrecompiledContracts;
path = Tokens;
sourceTree = "<group>";
};
818EABD71FDC9A3800E013FC /* Contract */ = {
isa = PBXGroup;
children = (
818EABD81FDC9A4800E013FC /* Classes */,
);
path = Contract;
sourceTree = "<group>";
};
818EABD81FDC9A4800E013FC /* Classes */ = {
isa = PBXGroup;
children = (
81C5DA2D2074EBF500424CD6 /* EthereumContract.swift */,
Expand All @@ -776,18 +778,10 @@
81D7D97420A3240900A193EC /* EthereumFilterEncodingExtensions.swift */,
81D7D97720A61E3800A193EC /* EventFiltering.swift */,
);
path = Classes;
path = Contract;
sourceTree = "<group>";
};
81A1821220D5A2430016741F /* Promises */ = {
isa = PBXGroup;
children = (
81A1821320D5A24F0016741F /* Classes */,
);
path = Promises;
sourceTree = "<group>";
};
81A1821320D5A24F0016741F /* Classes */ = {
isa = PBXGroup;
children = (
81A1821720D5A3E70016741F /* Promise+HttpProvider.swift */,
Expand All @@ -811,18 +805,10 @@
81195AAF20D7FF8500ABC6B1 /* Promise+Web3+Contract+GetIndexedEvents.swift */,
985BFD4D216E2E0A00B28C14 /* Promise+Web3+TxPool.swift */,
);
path = Classes;
path = Promises;
sourceTree = "<group>";
};
81C0FCEA20440BB400D82FAF /* Web3 */ = {
isa = PBXGroup;
children = (
81C0FCEB20440BBE00D82FAF /* Classes */,
);
path = Web3;
sourceTree = "<group>";
};
81C0FCEB20440BBE00D82FAF /* Classes */ = {
isa = PBXGroup;
children = (
81DDECCE1FDF004E0063684A /* Web3.swift */,
Expand All @@ -846,24 +832,16 @@
81909D1721862D5A007D2AE5 /* Web3+Eventloop.swift */,
3AE891602256611E00D08E99 /* Web3+Eth+Websocket.swift */,
);
path = Classes;
path = Web3;
sourceTree = "<group>";
};
81C0FCED20440BDF00D82FAF /* HookedFunctions */ = {
isa = PBXGroup;
children = (
81C0FCEE20440BE900D82FAF /* Classes */,
);
path = HookedFunctions;
sourceTree = "<group>";
};
81C0FCEE20440BE900D82FAF /* Classes */ = {
isa = PBXGroup;
children = (
81C0FCEF20440C3600D82FAF /* Web3+Wallet.swift */,
81C0FCF8204456E600D82FAF /* Web3+BrowserFunctions.swift */,
);
path = Classes;
path = HookedFunctions;
sourceTree = "<group>";
};
81FA43F42044097100EE14D5 /* web3swift-macOS_Tests */ = {
Expand All @@ -876,14 +854,6 @@
sourceTree = "<group>";
};
81FB21F6207BA6DC007F9A83 /* Convenience */ = {
isa = PBXGroup;
children = (
81FB21F7207BA6EB007F9A83 /* Classes */,
);
path = Convenience;
sourceTree = "<group>";
};
81FB21F7207BA6EB007F9A83 /* Classes */ = {
isa = PBXGroup;
children = (
81C5DA272072E18200424CD6 /* NativeTypesEncoding+Extensions.swift */,
Expand All @@ -897,7 +867,7 @@
8113D2FF1FD7F30F0074282C /* String+Extension.swift */,
81909D2021884893007D2AE5 /* BigUInt+Extensions.swift */,
);
path = Classes;
path = Convenience;
sourceTree = "<group>";
};
81FECD43211ADE20006DA367 /* ObjectiveCbridge */ = {
Expand Down Expand Up @@ -1197,6 +1167,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
3A52CCB22264A6D4001C8D7A /* NonceMiddleware.swift in Sources */,
3A3F59BC225931B00075C9E7 /* NameHash.swift in Sources */,
3A3F59BB225931780075C9E7 /* ENSResolver.swift in Sources */,
3A3F59BA225931710075C9E7 /* ENS.swift in Sources */,
Expand Down Expand Up @@ -1248,6 +1219,7 @@
3AE891612256611E00D08E99 /* Web3+Eth+Websocket.swift in Sources */,
81A1822520D678590016741F /* Promise+Web3+Eth+GetGasPrice.swift in Sources */,
8113DE7C1FD8514400CD8DF1 /* NSRegularExpressionExtension.swift in Sources */,
3A52CCBA2264B728001C8D7A /* RegistrarController.swift in Sources */,
81C5DA2E2074EBF500424CD6 /* EthereumContract.swift in Sources */,
810B0F9E1FEC5B9C00CF0DA2 /* Web3+Eth.swift in Sources */,
3AE891462256286C00D08E99 /* Web3+ERC165.swift in Sources */,
Expand Down Expand Up @@ -1286,6 +1258,7 @@
81A1822B20D67A1B0016741F /* Promise+Web3+Eth+GetTransactionDetails.swift in Sources */,
815630042007BC8F00A0EC2F /* BIP39+WordLists.swift in Sources */,
8113D2CE1FD7E1590074282C /* EthereumTransaction.swift in Sources */,
3A52CCB72264B712001C8D7A /* BaseRegistrar.swift in Sources */,
3AE8914E2256286C00D08E99 /* Web3+ERC721.swift in Sources */,
81A1821F20D676BC0016741F /* Promise+Web3+Eth+GetTransactionCount.swift in Sources */,
81A1821520D5A2700016741F /* Promise+Web3+Eth+GetBalance.swift in Sources */,
Expand Down Expand Up @@ -1321,6 +1294,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
3A52CCB32264A6DC001C8D7A /* NonceMiddleware.swift in Sources */,
3A3F59BD225931BE0075C9E7 /* NameHash.swift in Sources */,
3A3F59BE225931BE0075C9E7 /* ENS.swift in Sources */,
3A3F59BF225931BE0075C9E7 /* ENSResolver.swift in Sources */,
Expand Down Expand Up @@ -1372,6 +1346,7 @@
81A1824920D7DDA20016741F /* Promise+Web3+Personal+Sign.swift in Sources */,
81A1822620D678590016741F /* Promise+Web3+Eth+GetGasPrice.swift in Sources */,
81909D1621862D37007D2AE5 /* Web3+MutatingTransaction.swift in Sources */,
3A52CCBB2264B728001C8D7A /* RegistrarController.swift in Sources */,
41948133203630530065A83B /* BIP39.swift in Sources */,
3AE891472256286C00D08E99 /* Web3+ERC165.swift in Sources */,
3AE8913F2256286C00D08E99 /* Web3+ERC1376.swift in Sources */,
Expand Down Expand Up @@ -1410,6 +1385,7 @@
81909D1321862D17007D2AE5 /* Web3+ReadingTransaction.swift in Sources */,
4194813F203630530065A83B /* Dictionary+Extension.swift in Sources */,
41948140203630530065A83B /* Array+Extension.swift in Sources */,
3A52CCB82264B712001C8D7A /* BaseRegistrar.swift in Sources */,
3AE8914F2256286C00D08E99 /* Web3+ERC721.swift in Sources */,
81A1822020D676BC0016741F /* Promise+Web3+Eth+GetTransactionCount.swift in Sources */,
81A1821620D5A2700016741F /* Promise+Web3+Eth+GetBalance.swift in Sources */,
Expand Down
0 ...ntract/Classes/ComparisonExtensions.swift → ...swift/Contract/ComparisonExtensions.swift
View file
Open in desktop
File renamed without changes.
0 ...t/Contract/Classes/ContractProtocol.swift → web3swift/Contract/ContractProtocol.swift
View file
Open in desktop
File renamed without changes.
0 ...t/Contract/Classes/EthereumContract.swift → web3swift/Contract/EthereumContract.swift
View file
Open in desktop
File renamed without changes.
0 ...es/EthereumFilterEncodingExtensions.swift → ...ct/EthereumFilterEncodingExtensions.swift
View file
Open in desktop
File renamed without changes.
0 ...ift/Contract/Classes/EventFiltering.swift → web3swift/Contract/EventFiltering.swift
View file
Open in desktop
File renamed without changes.
0 ...Convenience/Classes/Array+Extension.swift → web3swift/Convenience/Array+Extension.swift
View file
Open in desktop
File renamed without changes.
0 web3swift/Convenience/Classes/Base58.swift → web3swift/Convenience/Base58.swift
View file
Open in desktop
File renamed without changes.
0 ...venience/Classes/BigUInt+Extensions.swift → ...wift/Convenience/BigUInt+Extensions.swift
View file
Open in desktop
File renamed without changes.
0 ...onvenience/Classes/CryptoExtensions.swift → web3swift/Convenience/CryptoExtensions.swift
View file
Open in desktop
File renamed without changes.
0 .../Convenience/Classes/Data+Extension.swift → web3swift/Convenience/Data+Extension.swift
View file
Open in desktop
File renamed without changes.
0 ...nience/Classes/Dictionary+Extension.swift → ...ft/Convenience/Dictionary+Extension.swift
View file
Open in desktop
File renamed without changes.
0 ...lasses/NSRegularExpressionExtension.swift → ...nience/NSRegularExpressionExtension.swift
View file
Open in desktop
File renamed without changes.
0 ...sses/NativeTypesEncoding+Extensions.swift → ...ence/NativeTypesEncoding+Extensions.swift
View file
Open in desktop
File renamed without changes.
0 ...ence/Classes/RIPEMD160+StackOveflow.swift → .../Convenience/RIPEMD160+StackOveflow.swift
View file
Open in desktop
File renamed without changes.
0 ...onvenience/Classes/String+Extension.swift → web3swift/Convenience/String+Extension.swift
View file
Open in desktop
File renamed without changes.
0 ...tions/Classes/Web3+BrowserFunctions.swift → ...okedFunctions/Web3+BrowserFunctions.swift
View file
Open in desktop
File renamed without changes.
0 ...HookedFunctions/Classes/Web3+Wallet.swift → web3swift/HookedFunctions/Web3+Wallet.swift
View file
Open in desktop
File renamed without changes.
0 ...oreManager/Classes/AbstractKeystore.swift → ...ft/KeystoreManager/AbstractKeystore.swift
View file
Open in desktop
File renamed without changes.
0 ...KeystoreManager/Classes/BIP32HDNode.swift → web3swift/KeystoreManager/BIP32HDNode.swift
View file
Open in desktop
File renamed without changes.
0 ...ystoreManager/Classes/BIP32Keystore.swift → ...swift/KeystoreManager/BIP32Keystore.swift
View file
Open in desktop
File renamed without changes.
0 .../Classes/BIP32KeystoreJSONStructure.swift → ...eManager/BIP32KeystoreJSONStructure.swift
View file
Open in desktop
File renamed without changes.
0 ...toreManager/Classes/BIP39+WordLists.swift → ...ift/KeystoreManager/BIP39+WordLists.swift
View file
Open in desktop
File renamed without changes.
0 ...swift/KeystoreManager/Classes/BIP39.swift → web3swift/KeystoreManager/BIP39.swift
View file
Open in desktop
File renamed without changes.
0 ...eManager/Classes/EthereumKeystoreV3.swift → .../KeystoreManager/EthereumKeystoreV3.swift
View file
Open in desktop
File renamed without changes.
0 web3swift/KeystoreManager/Classes/IBAN.swift → web3swift/KeystoreManager/IBAN.swift
View file
Open in desktop
File renamed without changes.
0 ...toreManager/Classes/KeystoreManager.swift → ...ift/KeystoreManager/KeystoreManager.swift
View file
Open in desktop
File renamed without changes.
0 ...ger/Classes/KeystoreV3JSONStructure.swift → ...toreManager/KeystoreV3JSONStructure.swift
View file
Open in desktop
File renamed without changes.
0 ...ystoreManager/Classes/PlainKeystore.swift → ...swift/KeystoreManager/PlainKeystore.swift
View file
Open in desktop
File renamed without changes.
0 ...t/Promises/Classes/Promise+Batching.swift → web3swift/Promises/Promise+Batching.swift
View file
Open in desktop
File renamed without changes.
0 ...omises/Classes/Promise+HttpProvider.swift → ...swift/Promises/Promise+HttpProvider.swift
View file
Open in desktop
File renamed without changes.
0 ...mise+Web3+Contract+GetIndexedEvents.swift → ...mise+Web3+Contract+GetIndexedEvents.swift
View file
Open in desktop
File renamed without changes.
0 ...mises/Classes/Promise+Web3+Eth+Call.swift → ...wift/Promises/Promise+Web3+Eth+Call.swift
View file
Open in desktop
File renamed without changes.
0 ...lasses/Promise+Web3+Eth+EstimateGas.swift → ...omises/Promise+Web3+Eth+EstimateGas.swift
View file
Open in desktop
File renamed without changes.
0 ...lasses/Promise+Web3+Eth+GetAccounts.swift → ...omises/Promise+Web3+Eth+GetAccounts.swift
View file
Open in desktop
File renamed without changes.
0 ...Classes/Promise+Web3+Eth+GetBalance.swift → ...romises/Promise+Web3+Eth+GetBalance.swift
View file
Open in desktop
File renamed without changes.
0 ...ses/Promise+Web3+Eth+GetBlockByHash.swift → ...ses/Promise+Web3+Eth+GetBlockByHash.swift
View file
Open in desktop
File renamed without changes.
0 ...s/Promise+Web3+Eth+GetBlockByNumber.swift → ...s/Promise+Web3+Eth+GetBlockByNumber.swift
View file
Open in desktop
File renamed without changes.
0 ...ses/Promise+Web3+Eth+GetBlockNumber.swift → ...ses/Promise+Web3+Eth+GetBlockNumber.swift
View file
Open in desktop
File renamed without changes.
0 ...lasses/Promise+Web3+Eth+GetGasPrice.swift → ...omises/Promise+Web3+Eth+GetGasPrice.swift
View file
Open in desktop
File renamed without changes.
0 ...romise+Web3+Eth+GetTransactionCount.swift → ...romise+Web3+Eth+GetTransactionCount.swift
View file
Open in desktop
File renamed without changes.
0 ...mise+Web3+Eth+GetTransactionDetails.swift → ...mise+Web3+Eth+GetTransactionDetails.swift
View file
Open in desktop
File renamed without changes.
0 ...mise+Web3+Eth+GetTransactionReceipt.swift → ...mise+Web3+Eth+GetTransactionReceipt.swift
View file
Open in desktop
File renamed without changes.
0 ...Promise+Web3+Eth+SendRawTransaction.swift → ...Promise+Web3+Eth+SendRawTransaction.swift
View file
Open in desktop
File renamed without changes.
0 ...es/Promise+Web3+Eth+SendTransaction.swift → ...es/Promise+Web3+Eth+SendTransaction.swift
View file
Open in desktop
File renamed without changes.
0 ...Promise+Web3+Personal+CreateAccount.swift → ...Promise+Web3+Personal+CreateAccount.swift
View file
Open in desktop
File renamed without changes.
0 .../Classes/Promise+Web3+Personal+Sign.swift → ...Promises/Promise+Web3+Personal+Sign.swift
View file
Open in desktop
File renamed without changes.
0 ...Promise+Web3+Personal+UnlockAccount.swift → ...Promise+Web3+Personal+UnlockAccount.swift
View file
Open in desktop
File renamed without changes.
0 ...romises/Classes/Promise+Web3+TxPool.swift → web3swift/Promises/Promise+Web3+TxPool.swift
View file
Open in desktop
File renamed without changes.
0 ...piledContracts/ERC1155/Web3+ERC1155.swift → web3swift/Tokens/ERC1155/Web3+ERC1155.swift
View file
Open in desktop
File renamed without changes.
0 ...piledContracts/ERC1376/Web3+ERC1376.swift → web3swift/Tokens/ERC1376/Web3+ERC1376.swift
View file
Open in desktop
File renamed without changes.
0 ...piledContracts/ERC1400/Web3+ERC1400.swift → web3swift/Tokens/ERC1400/Web3+ERC1400.swift
View file
Open in desktop
File renamed without changes.
0 ...piledContracts/ERC1410/Web3+ERC1410.swift → web3swift/Tokens/ERC1410/Web3+ERC1410.swift
View file
Open in desktop
File renamed without changes.
0 ...piledContracts/ERC1594/Web3+ERC1594.swift → web3swift/Tokens/ERC1594/Web3+ERC1594.swift
View file
Open in desktop
File renamed without changes.
0 ...piledContracts/ERC1633/Web3+ERC1633.swift → web3swift/Tokens/ERC1633/Web3+ERC1633.swift
View file
Open in desktop
File renamed without changes.
0 ...piledContracts/ERC1643/Web3+ERC1643.swift → web3swift/Tokens/ERC1643/Web3+ERC1643.swift
View file
Open in desktop
File renamed without changes.
0 ...piledContracts/ERC1644/Web3+ERC1644.swift → web3swift/Tokens/ERC1644/Web3+ERC1644.swift
View file
Open in desktop
File renamed without changes.
0 ...ompiledContracts/ERC165/Web3+ERC165.swift → web3swift/Tokens/ERC165/Web3+ERC165.swift
View file
Open in desktop
File renamed without changes.
0 ...ecompiledContracts/ERC20/Web3+ERC20.swift → web3swift/Tokens/ERC20/Web3+ERC20.swift
View file
Open in desktop
File renamed without changes.
24 changes: 24 additions & 0 deletions ...ompiledContracts/ERC721/Web3+ERC721.swift → web3swift/Tokens/ERC721/Web3+ERC721.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ protocol IERC721: IERC165 {

func transferFrom(from: EthereumAddress, to: EthereumAddress, originalOwner: EthereumAddress, tokenId: BigUInt) throws -> WriteTransaction

func safeTransferFrom(from: EthereumAddress, to: EthereumAddress, originalOwner: EthereumAddress, tokenId: BigUInt) throws -> WriteTransaction

func safeTransferFrom(from: EthereumAddress, to: EthereumAddress, originalOwner: EthereumAddress, tokenId: BigUInt, data: [UInt8]) throws -> WriteTransaction

func transfer(from: EthereumAddress, to: EthereumAddress, tokenId: BigUInt) throws -> WriteTransaction

func approve(from: EthereumAddress, approved: EthereumAddress, tokenId: BigUInt) throws -> WriteTransaction
Expand Down Expand Up @@ -152,6 +156,26 @@ public class ERC721: IERC721 {
return tx
}

public func safeTransferFrom(from: EthereumAddress, to: EthereumAddress, originalOwner: EthereumAddress, tokenId: BigUInt) throws -> WriteTransaction {
let contract = self.contract
var basicOptions = TransactionOptions()
basicOptions.from = from
basicOptions.to = self.address

let tx = contract.write("safeTransferFrom", parameters: [originalOwner, to, tokenId] as [AnyObject], transactionOptions: basicOptions)!
return tx
}

public func safeTransferFrom(from: EthereumAddress, to: EthereumAddress, originalOwner: EthereumAddress, tokenId: BigUInt, data: [UInt8]) throws -> WriteTransaction {
let contract = self.contract
var basicOptions = TransactionOptions()
basicOptions.from = from
basicOptions.to = self.address

let tx = contract.write("safeTransferFrom", parameters: [originalOwner, to, tokenId, data] as [AnyObject], transactionOptions: basicOptions)!
return tx
}

public func approve(from: EthereumAddress, approved: EthereumAddress, tokenId: BigUInt) throws -> WriteTransaction {
let contract = self.contract
var basicOptions = TransactionOptions()
Expand Down
20 changes: 20 additions & 0 deletions ...piledContracts/ERC721x/Web3+ERC721x.swift → web3swift/Tokens/ERC721x/Web3+ERC721x.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,26 @@ public class ERC721x: IERC721x {
return tx
}

public func safeTransferFrom(from: EthereumAddress, to: EthereumAddress, originalOwner: EthereumAddress, tokenId: BigUInt) throws -> WriteTransaction {
let contract = self.contract
var basicOptions = TransactionOptions()
basicOptions.from = from
basicOptions.to = self.address

let tx = contract.write("safeTransferFrom", parameters: [originalOwner, to, tokenId] as [AnyObject], transactionOptions: basicOptions)!
return tx
}

public func safeTransferFrom(from: EthereumAddress, to: EthereumAddress, originalOwner: EthereumAddress, tokenId: BigUInt, data: [UInt8]) throws -> WriteTransaction {
let contract = self.contract
var basicOptions = TransactionOptions()
basicOptions.from = from
basicOptions.to = self.address

let tx = contract.write("safeTransferFrom", parameters: [originalOwner, to, tokenId, data] as [AnyObject], transactionOptions: basicOptions)!
return tx
}

public func approve(from: EthereumAddress, approved: EthereumAddress, tokenId: BigUInt) throws -> WriteTransaction {
let contract = self.contract
var basicOptions = TransactionOptions()
Expand Down
0 ...ompiledContracts/ERC777/Web3+ERC777.swift → web3swift/Tokens/ERC777/Web3+ERC777.swift
View file
Open in desktop
File renamed without changes.
0 ...ompiledContracts/ERC820/Web3+ERC820.swift → web3swift/Tokens/ERC820/Web3+ERC820.swift
View file
Open in desktop
File renamed without changes.
0 ...ompiledContracts/ERC888/Web3+ERC888.swift → web3swift/Tokens/ERC888/Web3+ERC888.swift
View file
Open in desktop
File renamed without changes.
0 ...PrecompiledContracts/ST20/Web3+ST20.swift → web3swift/Tokens/ST20/Web3+ST20.swift
View file
Open in desktop
File renamed without changes.
0 ...edContracts/ST20/Web3+SecurityToken.swift → ...wift/Tokens/ST20/Web3+SecurityToken.swift
View file
Open in desktop
File renamed without changes.
0 ...ift/Transaction/Classes/BloomFilter.swift → web3swift/Transaction/BloomFilter.swift
View file
Open in desktop
File renamed without changes.
0 ...saction/Classes/EthereumTransaction.swift → ...ift/Transaction/EthereumTransaction.swift
View file
Open in desktop
File renamed without changes.
0 ...ansaction/Classes/TransactionSigner.swift → ...swift/Transaction/TransactionSigner.swift
View file
Open in desktop
File renamed without changes.
0 web3swift/Utils/Classes/EIP67Code.swift → web3swift/Utils/EIP/EIP67Code.swift
View file
Open in desktop
File renamed without changes.
0 web3swift/Utils/Classes/EIP681.swift → web3swift/Utils/EIP/EIP681.swift
View file
Open in desktop
File renamed without changes.
Loading