Skip to content
Merged

2.1.4 #170

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
c97b40d
updated example
zkToha Apr 11, 2019
6645f9a
Merge pull request #158 from matter-labs/fixExample
zkToha Apr 11, 2019
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
4b14b50
Merge pull request #162 from matter-labs/ENSPermanentRegistrarSupport
zkToha Apr 19, 2019
0e4db01
added reverse registrar
zkToha Apr 20, 2019
2becf4e
Merge pull request #165 from matter-labs/ENSPermanentRegistrarSupport
zkToha Apr 20, 2019
1affbec
Update Usage.md
zkToha Apr 20, 2019
e78081d
Update README.md
zkToha Apr 20, 2019
59935aa
fixed warnings
zkToha Apr 23, 2019
06d5499
raised v
zkToha Apr 24, 2019
3a694dd
Merge pull request #168 from matter-labs/fixWarnings
zkToha Apr 24, 2019
4646cf5
try 1
zkToha Apr 24, 2019
dd5613c
try 2
zkToha Apr 24, 2019
121cdc5
Merge pull request #169 from matter-labs/fixTravis
zkToha Apr 24, 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
Prev Previous commit
Next Next commit
some changes
  • Loading branch information
zkToha committed Apr 19, 2019
commit e633fd25675049e81534050858c23063fbff02a1
6 changes: 2 additions & 4 deletions web3swift/Utils/EIP/EIP681.swift
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,8 @@ extension Web3 {
do {
let web = web3(provider: InfuraProvider(Networks.fromInt(Int(code.chainID ?? 1)) ?? Networks.Mainnet)!)
let ensModel = ENS(web3: web)
guard let address = try ensModel?.useENSResolver(withDomain: ens)
.getAddress(forNode: ens) else {
return nil
}
try ensModel?.setENSResolver(withDomain: ens)
let address = try ensModel?.getAddress(forNode: ens)
nativeValue = address as AnyObject
} catch {
return nil
Expand Down
18 changes: 6 additions & 12 deletions web3swift/Utils/ENS/ENS.swift
Original file line number Diff line number Diff line change
Expand Up @@ -24,48 +24,42 @@ public class ENS {
self.registry = registry
}

func useENSResolver(_ resolver: Resolver) throws -> ENS {
func setENSResolver(_ resolver: Resolver) throws {
guard resolver.web3.provider.url == self.web3.provider.url else {
throw Web3Error.processingError(desc: "Resolver should use same provider as ENS")
}
self.resolver = resolver
return self
}

func useENSResolver(withDomain domain: String) throws -> ENS {
func setENSResolver(withDomain domain: String) throws {
guard let resolver = try? self.registry.getResolver(forDomain: domain) else {
throw Web3Error.processingError(desc: "No resolver for this domain")
}
self.resolver = resolver
return self
}

func useBaseRegistrar(_ baseRegistrar: BaseRegistrar) throws -> ENS {
func setBaseRegistrar(_ baseRegistrar: BaseRegistrar) throws {
guard baseRegistrar.web3.provider.url == self.web3.provider.url else {
throw Web3Error.processingError(desc: "Base registrar should use same provider as ENS")
}
self.baseRegistrar = baseRegistrar
return self
}

func useBaseRegistrar(withAddress address: EthereumAddress) -> ENS {
func setBaseRegistrar(withAddress address: EthereumAddress) {
let baseRegistrar = BaseRegistrar(web3: web3, address: address)
self.baseRegistrar = baseRegistrar
return self
}

func useRegistrarController(_ registrarController: ETHRegistrarController) throws -> ENS {
func setRegistrarController(_ registrarController: ETHRegistrarController) throws {
guard registrarController.web3.provider.url == self.web3.provider.url else {
throw Web3Error.processingError(desc: "Registrar controller should use same provider as ENS")
}
self.registrarController = registrarController
return self
}

func useRegistrarController(withAddress address: EthereumAddress) -> ENS {
func setRegistrarController(withAddress address: EthereumAddress) {
let registrarController = ETHRegistrarController(web3: web3, address: address)
self.registrarController = registrarController
return self
}

lazy var defaultOptions: TransactionOptions = {
Expand Down