Skip to content

Commit 145a29a

Browse files
TonioMacaronioTonioMacaronio
committed
removed Class folders, added ENS Base Registrar, changed content hash for InterfaceName in ENSResolver
1 parent 6645f9a commit 145a29a

File tree

98 files changed

+183
-81
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+183
-81
lines changed

‎web3swift.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ s.swift_version = '5.0'
1717
s.module_name = 'Web3swift'
1818
s.ios.deployment_target = "9.0"
1919
s.osx.deployment_target = "10.11"
20-
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"
20+
s.source_files = "web3swift/{Promises,Web3,Contract,KeystoreManager,Transaction,Convenience,HookedFunctions}/*.{h,swift}", "web3swift/Utils/**/*.swift" "web3swift/PrecompiledContracts/**/*.swift", "web3swift/web3swift.h"
2121
s.public_header_files = "web3swift/web3swift.h"
2222
s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }
2323

‎web3swift.xcodeproj/project.pbxproj

Lines changed: 50 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@
1818
3A3F59BD225931BE0075C9E7 /* NameHash.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81A7B2502143C3A8004CD2C7 /* NameHash.swift */; };
1919
3A3F59BE225931BE0075C9E7 /* ENS.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2E668CD214F8A7B00C3CC2D /* ENS.swift */; };
2020
3A3F59BF225931BE0075C9E7 /* ENSResolver.swift in Sources */ = {isa = PBXBuildFile; fileRef = B219DC162154F3EE0035BF94 /* ENSResolver.swift */; };
21+
3A52CCB22264A6D4001C8D7A /* NonceMiddleware.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81ED4EA72190D922003E932E /* NonceMiddleware.swift */; };
22+
3A52CCB32264A6DC001C8D7A /* NonceMiddleware.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81ED4EA72190D922003E932E /* NonceMiddleware.swift */; };
23+
3A52CCB72264B712001C8D7A /* BaseRegistrar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A52CCB62264B712001C8D7A /* BaseRegistrar.swift */; };
24+
3A52CCB82264B712001C8D7A /* BaseRegistrar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A52CCB62264B712001C8D7A /* BaseRegistrar.swift */; };
25+
3A52CCBA2264B728001C8D7A /* RegistrarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A52CCB92264B728001C8D7A /* RegistrarController.swift */; };
26+
3A52CCBB2264B728001C8D7A /* RegistrarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A52CCB92264B728001C8D7A /* RegistrarController.swift */; };
2127
3AE8913C2256286C00D08E99 /* Web3+ERC1155.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AE8911C2256286B00D08E99 /* Web3+ERC1155.swift */; };
2228
3AE8913D2256286C00D08E99 /* Web3+ERC1155.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AE8911C2256286B00D08E99 /* Web3+ERC1155.swift */; };
2329
3AE8913E2256286C00D08E99 /* Web3+ERC1376.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AE8911E2256286B00D08E99 /* Web3+ERC1376.swift */; };
@@ -258,6 +264,8 @@
258264
2B8FEFF3962166E1BEADC886 /* Pods_web3swift_ios.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_web3swift_ios.framework; sourceTree = BUILT_PRODUCTS_DIR; };
259265
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>"; };
260266
391A0D2EF42488E5C8AB2F71 /* Pods_web3swift_osx_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_web3swift_osx_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
267+
3A52CCB62264B712001C8D7A /* BaseRegistrar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseRegistrar.swift; sourceTree = "<group>"; };
268+
3A52CCB92264B728001C8D7A /* RegistrarController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RegistrarController.swift; sourceTree = "<group>"; };
261269
3AE8911C2256286B00D08E99 /* Web3+ERC1155.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Web3+ERC1155.swift"; sourceTree = "<group>"; };
262270
3AE8911E2256286B00D08E99 /* Web3+ERC1376.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Web3+ERC1376.swift"; sourceTree = "<group>"; };
263271
3AE891202256286B00D08E99 /* Web3+ERC888.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Web3+ERC888.swift"; sourceTree = "<group>"; };
@@ -469,7 +477,7 @@
469477
1CD91AFE1FD76910007BFB45 /* web3swift */ = {
470478
isa = PBXGroup;
471479
children = (
472-
8159C50921343EF900197B91 /* PrecompiledContracts */,
480+
8159C50921343EF900197B91 /* Tokens */,
473481
81FECD43211ADE20006DA367 /* ObjectiveCbridge */,
474482
81A1821220D5A2430016741F /* Promises */,
475483
81C0FCED20440BDF00D82FAF /* HookedFunctions */,
@@ -515,6 +523,27 @@
515523
path = web3swiftTests;
516524
sourceTree = "<group>";
517525
};
526+
3A52CCB42264A938001C8D7A /* ENS */ = {
527+
isa = PBXGroup;
528+
children = (
529+
81A7B2502143C3A8004CD2C7 /* NameHash.swift */,
530+
B2E668CD214F8A7B00C3CC2D /* ENS.swift */,
531+
B219DC162154F3EE0035BF94 /* ENSResolver.swift */,
532+
3A52CCB62264B712001C8D7A /* BaseRegistrar.swift */,
533+
3A52CCB92264B728001C8D7A /* RegistrarController.swift */,
534+
);
535+
path = ENS;
536+
sourceTree = "<group>";
537+
};
538+
3A52CCB52264A9E1001C8D7A /* EIP */ = {
539+
isa = PBXGroup;
540+
children = (
541+
81FB21F8207BA78B007F9A83 /* EIP67Code.swift */,
542+
81A7B2862143DBF6004CD2C7 /* EIP681.swift */,
543+
);
544+
path = EIP;
545+
sourceTree = "<group>";
546+
};
518547
3AE8911B2256286B00D08E99 /* ERC1155 */ = {
519548
isa = PBXGroup;
520549
children = (
@@ -674,33 +703,22 @@
674703
8113D2AE1FD7E1590074282C /* Utils */ = {
675704
isa = PBXGroup;
676705
children = (
677-
8113D2AF1FD7E1590074282C /* Classes */,
706+
3A52CCB52264A9E1001C8D7A /* EIP */,
707+
3A52CCB42264A938001C8D7A /* ENS */,
708+
8113D2AF1FD7E1590074282C /* Hooks */,
678709
);
679710
path = Utils;
680711
sourceTree = "<group>";
681712
};
682-
8113D2AF1FD7E1590074282C /* Classes */ = {
713+
8113D2AF1FD7E1590074282C /* Hooks */ = {
683714
isa = PBXGroup;
684715
children = (
685-
81FB21F8207BA78B007F9A83 /* EIP67Code.swift */,
686-
81A7B2502143C3A8004CD2C7 /* NameHash.swift */,
687-
81A7B2862143DBF6004CD2C7 /* EIP681.swift */,
688-
B2E668CD214F8A7B00C3CC2D /* ENS.swift */,
689-
B219DC162154F3EE0035BF94 /* ENSResolver.swift */,
690716
81ED4EA72190D922003E932E /* NonceMiddleware.swift */,
691717
);
692-
path = Classes;
718+
path = Hooks;
693719
sourceTree = "<group>";
694720
};
695721
8113D2B51FD7E1590074282C /* KeystoreManager */ = {
696-
isa = PBXGroup;
697-
children = (
698-
8113D2B71FD7E1590074282C /* Classes */,
699-
);
700-
path = KeystoreManager;
701-
sourceTree = "<group>";
702-
};
703-
8113D2B71FD7E1590074282C /* Classes */ = {
704722
isa = PBXGroup;
705723
children = (
706724
817EBB2420066E2B00E02EAA /* AbstractKeystore.swift */,
@@ -715,28 +733,20 @@
715733
8103BBCB2077B84400499769 /* PlainKeystore.swift */,
716734
8160E5CD20B8245A0070070B /* IBAN.swift */,
717735
);
718-
path = Classes;
736+
path = KeystoreManager;
719737
sourceTree = "<group>";
720738
};
721739
8113D2C11FD7E1590074282C /* Transaction */ = {
722-
isa = PBXGroup;
723-
children = (
724-
8113D2C21FD7E1590074282C /* Classes */,
725-
);
726-
path = Transaction;
727-
sourceTree = "<group>";
728-
};
729-
8113D2C21FD7E1590074282C /* Classes */ = {
730740
isa = PBXGroup;
731741
children = (
732742
8113D2C31FD7E1590074282C /* EthereumTransaction.swift */,
733743
81C0FCF520440F9900D82FAF /* TransactionSigner.swift */,
734744
8125F06820499AC300A0F2FE /* BloomFilter.swift */,
735745
);
736-
path = Classes;
746+
path = Transaction;
737747
sourceTree = "<group>";
738748
};
739-
8159C50921343EF900197B91 /* PrecompiledContracts */ = {
749+
8159C50921343EF900197B91 /* Tokens */ = {
740750
isa = PBXGroup;
741751
children = (
742752
3AE891262256286B00D08E99 /* ERC20 */,
@@ -756,18 +766,10 @@
756766
3AE8912A2256286B00D08E99 /* ERC1644 */,
757767
3AE891212256286B00D08E99 /* ST20 */,
758768
);
759-
path = PrecompiledContracts;
769+
path = Tokens;
760770
sourceTree = "<group>";
761771
};
762772
818EABD71FDC9A3800E013FC /* Contract */ = {
763-
isa = PBXGroup;
764-
children = (
765-
818EABD81FDC9A4800E013FC /* Classes */,
766-
);
767-
path = Contract;
768-
sourceTree = "<group>";
769-
};
770-
818EABD81FDC9A4800E013FC /* Classes */ = {
771773
isa = PBXGroup;
772774
children = (
773775
81C5DA2D2074EBF500424CD6 /* EthereumContract.swift */,
@@ -776,18 +778,10 @@
776778
81D7D97420A3240900A193EC /* EthereumFilterEncodingExtensions.swift */,
777779
81D7D97720A61E3800A193EC /* EventFiltering.swift */,
778780
);
779-
path = Classes;
781+
path = Contract;
780782
sourceTree = "<group>";
781783
};
782784
81A1821220D5A2430016741F /* Promises */ = {
783-
isa = PBXGroup;
784-
children = (
785-
81A1821320D5A24F0016741F /* Classes */,
786-
);
787-
path = Promises;
788-
sourceTree = "<group>";
789-
};
790-
81A1821320D5A24F0016741F /* Classes */ = {
791785
isa = PBXGroup;
792786
children = (
793787
81A1821720D5A3E70016741F /* Promise+HttpProvider.swift */,
@@ -811,18 +805,10 @@
811805
81195AAF20D7FF8500ABC6B1 /* Promise+Web3+Contract+GetIndexedEvents.swift */,
812806
985BFD4D216E2E0A00B28C14 /* Promise+Web3+TxPool.swift */,
813807
);
814-
path = Classes;
808+
path = Promises;
815809
sourceTree = "<group>";
816810
};
817811
81C0FCEA20440BB400D82FAF /* Web3 */ = {
818-
isa = PBXGroup;
819-
children = (
820-
81C0FCEB20440BBE00D82FAF /* Classes */,
821-
);
822-
path = Web3;
823-
sourceTree = "<group>";
824-
};
825-
81C0FCEB20440BBE00D82FAF /* Classes */ = {
826812
isa = PBXGroup;
827813
children = (
828814
81DDECCE1FDF004E0063684A /* Web3.swift */,
@@ -846,24 +832,16 @@
846832
81909D1721862D5A007D2AE5 /* Web3+Eventloop.swift */,
847833
3AE891602256611E00D08E99 /* Web3+Eth+Websocket.swift */,
848834
);
849-
path = Classes;
835+
path = Web3;
850836
sourceTree = "<group>";
851837
};
852838
81C0FCED20440BDF00D82FAF /* HookedFunctions */ = {
853-
isa = PBXGroup;
854-
children = (
855-
81C0FCEE20440BE900D82FAF /* Classes */,
856-
);
857-
path = HookedFunctions;
858-
sourceTree = "<group>";
859-
};
860-
81C0FCEE20440BE900D82FAF /* Classes */ = {
861839
isa = PBXGroup;
862840
children = (
863841
81C0FCEF20440C3600D82FAF /* Web3+Wallet.swift */,
864842
81C0FCF8204456E600D82FAF /* Web3+BrowserFunctions.swift */,
865843
);
866-
path = Classes;
844+
path = HookedFunctions;
867845
sourceTree = "<group>";
868846
};
869847
81FA43F42044097100EE14D5 /* web3swift-macOS_Tests */ = {
@@ -876,14 +854,6 @@
876854
sourceTree = "<group>";
877855
};
878856
81FB21F6207BA6DC007F9A83 /* Convenience */ = {
879-
isa = PBXGroup;
880-
children = (
881-
81FB21F7207BA6EB007F9A83 /* Classes */,
882-
);
883-
path = Convenience;
884-
sourceTree = "<group>";
885-
};
886-
81FB21F7207BA6EB007F9A83 /* Classes */ = {
887857
isa = PBXGroup;
888858
children = (
889859
81C5DA272072E18200424CD6 /* NativeTypesEncoding+Extensions.swift */,
@@ -897,7 +867,7 @@
897867
8113D2FF1FD7F30F0074282C /* String+Extension.swift */,
898868
81909D2021884893007D2AE5 /* BigUInt+Extensions.swift */,
899869
);
900-
path = Classes;
870+
path = Convenience;
901871
sourceTree = "<group>";
902872
};
903873
81FECD43211ADE20006DA367 /* ObjectiveCbridge */ = {
@@ -1197,6 +1167,7 @@
11971167
isa = PBXSourcesBuildPhase;
11981168
buildActionMask = 2147483647;
11991169
files = (
1170+
3A52CCB22264A6D4001C8D7A /* NonceMiddleware.swift in Sources */,
12001171
3A3F59BC225931B00075C9E7 /* NameHash.swift in Sources */,
12011172
3A3F59BB225931780075C9E7 /* ENSResolver.swift in Sources */,
12021173
3A3F59BA225931710075C9E7 /* ENS.swift in Sources */,
@@ -1248,6 +1219,7 @@
12481219
3AE891612256611E00D08E99 /* Web3+Eth+Websocket.swift in Sources */,
12491220
81A1822520D678590016741F /* Promise+Web3+Eth+GetGasPrice.swift in Sources */,
12501221
8113DE7C1FD8514400CD8DF1 /* NSRegularExpressionExtension.swift in Sources */,
1222+
3A52CCBA2264B728001C8D7A /* RegistrarController.swift in Sources */,
12511223
81C5DA2E2074EBF500424CD6 /* EthereumContract.swift in Sources */,
12521224
810B0F9E1FEC5B9C00CF0DA2 /* Web3+Eth.swift in Sources */,
12531225
3AE891462256286C00D08E99 /* Web3+ERC165.swift in Sources */,
@@ -1286,6 +1258,7 @@
12861258
81A1822B20D67A1B0016741F /* Promise+Web3+Eth+GetTransactionDetails.swift in Sources */,
12871259
815630042007BC8F00A0EC2F /* BIP39+WordLists.swift in Sources */,
12881260
8113D2CE1FD7E1590074282C /* EthereumTransaction.swift in Sources */,
1261+
3A52CCB72264B712001C8D7A /* BaseRegistrar.swift in Sources */,
12891262
3AE8914E2256286C00D08E99 /* Web3+ERC721.swift in Sources */,
12901263
81A1821F20D676BC0016741F /* Promise+Web3+Eth+GetTransactionCount.swift in Sources */,
12911264
81A1821520D5A2700016741F /* Promise+Web3+Eth+GetBalance.swift in Sources */,
@@ -1321,6 +1294,7 @@
13211294
isa = PBXSourcesBuildPhase;
13221295
buildActionMask = 2147483647;
13231296
files = (
1297+
3A52CCB32264A6DC001C8D7A /* NonceMiddleware.swift in Sources */,
13241298
3A3F59BD225931BE0075C9E7 /* NameHash.swift in Sources */,
13251299
3A3F59BE225931BE0075C9E7 /* ENS.swift in Sources */,
13261300
3A3F59BF225931BE0075C9E7 /* ENSResolver.swift in Sources */,
@@ -1372,6 +1346,7 @@
13721346
81A1824920D7DDA20016741F /* Promise+Web3+Personal+Sign.swift in Sources */,
13731347
81A1822620D678590016741F /* Promise+Web3+Eth+GetGasPrice.swift in Sources */,
13741348
81909D1621862D37007D2AE5 /* Web3+MutatingTransaction.swift in Sources */,
1349+
3A52CCBB2264B728001C8D7A /* RegistrarController.swift in Sources */,
13751350
41948133203630530065A83B /* BIP39.swift in Sources */,
13761351
3AE891472256286C00D08E99 /* Web3+ERC165.swift in Sources */,
13771352
3AE8913F2256286C00D08E99 /* Web3+ERC1376.swift in Sources */,
@@ -1410,6 +1385,7 @@
14101385
81909D1321862D17007D2AE5 /* Web3+ReadingTransaction.swift in Sources */,
14111386
4194813F203630530065A83B /* Dictionary+Extension.swift in Sources */,
14121387
41948140203630530065A83B /* Array+Extension.swift in Sources */,
1388+
3A52CCB82264B712001C8D7A /* BaseRegistrar.swift in Sources */,
14131389
3AE8914F2256286C00D08E99 /* Web3+ERC721.swift in Sources */,
14141390
81A1822020D676BC0016741F /* Promise+Web3+Eth+GetTransactionCount.swift in Sources */,
14151391
81A1821620D5A2700016741F /* Promise+Web3+Eth+GetBalance.swift in Sources */,

‎web3swift/Contract/Classes/ComparisonExtensions.swift renamed to ‎web3swift/Contract/ComparisonExtensions.swift

File renamed without changes.

‎web3swift/Contract/Classes/ContractProtocol.swift renamed to ‎web3swift/Contract/ContractProtocol.swift

File renamed without changes.

‎web3swift/Contract/Classes/EthereumContract.swift renamed to ‎web3swift/Contract/EthereumContract.swift

File renamed without changes.

‎web3swift/Contract/Classes/EthereumFilterEncodingExtensions.swift renamed to ‎web3swift/Contract/EthereumFilterEncodingExtensions.swift

File renamed without changes.

‎web3swift/Contract/Classes/EventFiltering.swift renamed to ‎web3swift/Contract/EventFiltering.swift

File renamed without changes.

‎web3swift/Convenience/Classes/Array+Extension.swift renamed to ‎web3swift/Convenience/Array+Extension.swift

File renamed without changes.

‎web3swift/Convenience/Classes/Base58.swift renamed to ‎web3swift/Convenience/Base58.swift

File renamed without changes.

‎web3swift/Convenience/Classes/BigUInt+Extensions.swift renamed to ‎web3swift/Convenience/BigUInt+Extensions.swift

File renamed without changes.

0 commit comments

Comments
 (0)