Merge pull request #256 from argentlabs/issue/goerli-ens-registry

[ADD] Multicall/ENS registry addresses for Goerli
argentlabs · Jul 12, 2022 · da7bcde · da7bcde
2 parents 9247d06 + 08c0991
commit da7bcde
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/web3sTests/ENS/ENSTests.swift b/web3sTests/ENS/ENSTests.swift
@@ -23,7 +23,7 @@ class ENSTests: XCTestCase {
 
     func testGivenRopstenRegistry_WhenExistingDomainName_ResolvesOwnerAddressCorrectly() async {
         do {
-            let function = ENSContracts.ENSRegistryFunctions.owner(contract: ENSContracts.RopstenAddress, _node: EthereumNameService.nameHash(name: "test").web3.hexData ?? Data())
+            let function = ENSContracts.ENSRegistryFunctions.owner(contract: ENSContracts.RegistryAddress, _node: EthereumNameService.nameHash(name: "test").web3.hexData ?? Data())
 
             let tx = try function.transaction()
 

diff --git a/web3swift/src/ENS/ENSContracts.swift b/web3swift/src/ENS/ENSContracts.swift
@@ -9,15 +9,16 @@ import Foundation
 public typealias ENSRegistryResolverParameter = ENSContracts.ResolveParameter
 
 public enum ENSContracts {
-    static let RopstenAddress: EthereumAddress = "0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e"
-    static let MainnetAddress: EthereumAddress = "0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e"
+    static let RegistryAddress: EthereumAddress = "0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e"
 
     public static func registryAddress(for network: EthereumNetwork) -> EthereumAddress? {
         switch network {
         case .ropsten:
-            return ENSContracts.RopstenAddress
+            return ENSContracts.RegistryAddress
         case .mainnet:
-            return ENSContracts.MainnetAddress
+            return ENSContracts.RegistryAddress
+        case .goerli:
+            return ENSContracts.RegistryAddress
         default:
             return nil
         }

diff --git a/web3swift/src/Multicall/MulticallContract.swift b/web3swift/src/Multicall/MulticallContract.swift
@@ -9,6 +9,7 @@ import Foundation
 extension Multicall {
     public enum Contract {
 
+        static let goerliAddress: EthereumAddress = "0x77dCa2C955b15e9dE4dbBCf1246B4B85b651e50e"
         static let ropstenAddress: EthereumAddress = "0x604D19Ba889A223693B0E78bC1269760B291b9Df"
         static let rinkebyAddress: EthereumAddress = "0xF20A5837Eb2D9F1F7cdf9D635f3Bc68C47B8B8fF"
         static let mainnetAddress: EthereumAddress = "0xF34D2Cb31175a51B23fb6e08cA06d7208FaD379F"
@@ -21,6 +22,8 @@ extension Multicall {
                 return Self.rinkebyAddress
             case .mainnet:
                 return Self.mainnetAddress
+            case .goerli:
+                return Self.goerliAddress
             default:
                 return nil
             }