Skip to content

Commit 3adf09b

Browse files
committed
- allow EIP681 for now
1 parent 56e5b50 commit 3adf09b

File tree

3 files changed

+23
-18
lines changed

3 files changed

+23
-18
lines changed

web3swift.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ s.module_name = 'Web3swift'
1818
s.ios.deployment_target = "9.0"
1919
s.osx.deployment_target = "10.11"
2020
s.source_files = "web3swift/**/*.{h,swift}",
21-
s.exclude_files = "web3swift/ObjectiveCbridge/Classes/*.{swift}", "web3swift/Utils/Classes/EIP681.swift", "web3swift/Utils/Classes/ENS.swift", "web3swift/Utils/Classes/ENSResolver.swift"
21+
s.exclude_files = "web3swift/ObjectiveCbridge/Classes/*.{swift}", "web3swift/Utils/Classes/ENS.swift", "web3swift/Utils/Classes/ENSResolver.swift"
2222
s.public_header_files = "web3swift/**/*.{h}"
2323
s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }
2424

web3swift.xcodeproj/project.pbxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,8 @@
101101
81909D2D218858EA007D2AE5 /* web3swift_ERC20_Class_Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8159C50D2135901700197B91 /* web3swift_ERC20_Class_Tests.swift */; };
102102
81909D2E21885B2C007D2AE5 /* Web3+ERC721.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2E94C5F217788E0005F54A0 /* Web3+ERC721.swift */; };
103103
81909D2F21885B2C007D2AE5 /* Web3+ERC721.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2E94C5F217788E0005F54A0 /* Web3+ERC721.swift */; };
104+
81909D4A218864A8007D2AE5 /* EIP681.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81A7B2862143DBF6004CD2C7 /* EIP681.swift */; };
105+
81909D4B218864A9007D2AE5 /* EIP681.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81A7B2862143DBF6004CD2C7 /* EIP681.swift */; };
104106
81A1821520D5A2700016741F /* Promise+Web3+Eth+GetBalance.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81A1821420D5A2700016741F /* Promise+Web3+Eth+GetBalance.swift */; };
105107
81A1821620D5A2700016741F /* Promise+Web3+Eth+GetBalance.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81A1821420D5A2700016741F /* Promise+Web3+Eth+GetBalance.swift */; };
106108
81A1821A20D5A6F70016741F /* Promise+HttpProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81A1821720D5A3E70016741F /* Promise+HttpProvider.swift */; };
@@ -1059,6 +1061,7 @@
10591061
817EBB162004FE4200E02EAA /* Web3+HttpProvider.swift in Sources */,
10601062
8103BBCC2077B84400499769 /* PlainKeystore.swift in Sources */,
10611063
81DFB3FF210775320011DC85 /* Web3+Infura.swift in Sources */,
1064+
81909D4A218864A8007D2AE5 /* EIP681.swift in Sources */,
10621065
81C0FCF220440EB500D82FAF /* Web3+Protocols.swift in Sources */,
10631066
81C0FCF420440F0900D82FAF /* Web3+Options.swift in Sources */,
10641067
81A1822E20D67BC30016741F /* Promise+Web3+Eth+GetTransactionReceipt.swift in Sources */,
@@ -1157,6 +1160,7 @@
11571160
81C0FD042044A8A700D82FAF /* Web3+Options.swift in Sources */,
11581161
81A1823220D68A110016741F /* Promise+Batching.swift in Sources */,
11591162
4194813C203630530065A83B /* Base58.swift in Sources */,
1163+
81909D4B218864A9007D2AE5 /* EIP681.swift in Sources */,
11601164
8103BBCD2077B84400499769 /* PlainKeystore.swift in Sources */,
11611165
4194813D203630530065A83B /* RIPEMD160+StackOveflow.swift in Sources */,
11621166
4194813E203630530065A83B /* Data+Extension.swift in Sources */,

web3swift/Utils/Classes/EIP681.swift

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -120,23 +120,24 @@ extension Web3 {
120120
switch val {
121121
case .ethereumAddress(let ethereumAddress):
122122
nativeValue = ethereumAddress as AnyObject
123-
case .ensAddress(let ens):
124-
let web = web3(provider: InfuraProvider(Networks.fromInt(Int(code.chainID ?? 1)) ?? Networks.Mainnet)!)
125-
let ensModel = ENS(web3: web)
126-
let resolver = ensModel.resolver(forDomain: ens)
127-
switch resolver {
128-
case .failure(_):
129-
nativeValue = ens as AnyObject
130-
case .success(var res):
131-
let address = res.addr(forDomain: ens)
132-
switch address {
133-
case .failure(_):
134-
nativeValue = ens as AnyObject
135-
case .success(let res):
136-
nativeValue = res as AnyObject
137-
}
138-
}
139-
123+
default:
124+
return nil
125+
// case .ensAddress(let ens):
126+
// let web = web3(provider: InfuraProvider(Networks.fromInt(Int(code.chainID ?? 1)) ?? Networks.Mainnet)!)
127+
// let ensModel = ENS(web3: web)
128+
// let resolver = ensModel.resolver(forDomain: ens)
129+
// switch resolver {
130+
// case .failure(_):
131+
// nativeValue = ens as AnyObject
132+
// case .success(var res):
133+
// let address = res.addr(forDomain: ens)
134+
// switch address {
135+
// case .failure(_):
136+
// nativeValue = ens as AnyObject
137+
// case .success(let res):
138+
// nativeValue = res as AnyObject
139+
// }
140+
// }
140141
}
141142
case .uint(bits: _):
142143
if let val = BigUInt(value, radix: 10) {

0 commit comments

Comments
 (0)