Skip to content

Commit

Permalink
feat: remove goerli testnets (#3389)
Browse files Browse the repository at this point in the history
  • Loading branch information
paulbalaji authored Mar 12, 2024
1 parent 2173b8b commit 76bd730
Show file tree
Hide file tree
Showing 55 changed files with 194 additions and 3,300 deletions.
7 changes: 7 additions & 0 deletions .changeset/eleven-books-train.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
'@hyperlane-xyz/infra': minor
'@hyperlane-xyz/sdk': minor
'@hyperlane-xyz/core': minor
---

Remove support for goerli networks (including optimismgoerli, arbitrumgoerli, lineagoerli and polygonzkevmtestnet)
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,6 @@ const DOMAINS: &[RawDomain] = &[
is_test_net: false,
is_deprecated: false,
},
RawDomain {
name: "arbitrumgoerli",
token: "ETH",
domain: 421613,
chain_id: 421613,
is_test_net: true,
is_deprecated: false,
},
RawDomain {
name: "avalanche",
token: "AVAX",
Expand Down Expand Up @@ -102,14 +94,6 @@ const DOMAINS: &[RawDomain] = &[
is_test_net: false,
is_deprecated: false,
},
RawDomain {
name: "goerli",
token: "ETH",
domain: 5,
chain_id: 5,
is_test_net: true,
is_deprecated: false,
},
RawDomain {
name: "mantapacific",
token: "ETH",
Expand Down Expand Up @@ -150,14 +134,6 @@ const DOMAINS: &[RawDomain] = &[
is_test_net: false,
is_deprecated: false,
},
RawDomain {
name: "optimismgoerli",
token: "ETH",
domain: 420,
chain_id: 420,
is_test_net: true,
is_deprecated: false,
},
RawDomain {
name: "polygon",
token: "MATIC",
Expand All @@ -174,14 +150,6 @@ const DOMAINS: &[RawDomain] = &[
is_test_net: false,
is_deprecated: false,
},
RawDomain {
name: "polygonzkevmtestnet",
token: "ETH",
domain: 1442,
chain_id: 1442,
is_test_net: true,
is_deprecated: false,
},
RawDomain {
name: "scroll",
token: "ETH",
Expand Down
2 changes: 1 addition & 1 deletion rust/chains/hyperlane-ethereum/src/mailbox.rs
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ mod test {
provider.clone(),
&ContractLocator {
// An Arbitrum Nitro chain
domain: &HyperlaneDomain::Known(KnownHyperlaneDomain::ArbitrumGoerli),
domain: &HyperlaneDomain::Known(KnownHyperlaneDomain::PlumeTestnet),
// Address doesn't matter because we're using a MockProvider
address: H256::default(),
},
Expand Down
199 changes: 0 additions & 199 deletions rust/config/testnet4_config.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,50 +56,6 @@
"from": 20231908
}
},
"arbitrumgoerli": {
"blocks": {
"confirmations": 1,
"estimateBlockTime": 3,
"reorgPeriod": 1
},
"chainId": 421613,
"displayName": "Arbitrum Goerli",
"displayNameShort": "Arb. Goerli",
"domainId": 421613,
"isTestnet": true,
"name": "arbitrumgoerli",
"nativeToken": {
"decimals": 18,
"name": "Ether",
"symbol": "ETH"
},
"protocol": "ethereum",
"technicalStack": "arbitrumnitro",
"rpcUrls": [
{
"http": "https://goerli-rollup.arbitrum.io/rpc"
}
],
"merkleRootMultisigIsmFactory": "0x17D58eBb5Ea0E2d360c877E119FAef4C4052e6B9",
"messageIdMultisigIsmFactory": "0x922CeEe9e8832a047e6aD68Df4F079F271b73Ac3",
"aggregationIsmFactory": "0xC5Bb8CDD44B6c56695df45c7AA8012a97dD6ED13",
"aggregationHookFactory": "0x39a8711BF44165A2292Cb5cB43229659c2Bb11c9",
"proxyAdmin": "0x00DFB81Bfc45fa03060b605273147F274ea807E5",
"mailbox": "0x13dABc0351407d5aAa0A50003a166A73b4febfDc",
"validatorAnnounce": "0x4a01EEBa1CC20F47A2e60aE4ec932051601FcB9e",
"merkleTreeHook": "0xf0A38e1eEA49dAc7968F470c3aA0BDE2565A5d80",
"storageGasOracle": "0xFc8229ADB46D96056A6e451Fb3c55d60FFeD056f",
"interchainGasPaymaster": "0x76189acFA212298d7022624a4633411eE0d2f26F",
"aggregationHook": "0xf852EB6b98d84A4296754043a56759a0Ae0E06df",
"protocolFee": "0x0358ba0D90ED2d90fB8cBb610F27C274D8077a0B",
"fallbackRoutingHook": "0xEdA6f85f4761A1f9e42FD40CA5a4E8Ce1C764015",
"testRecipient": "0x07543860AE9E72aBcF2Bae9827b23621A64Fa416",
"testTokenRecipient": "0x207db41AB053213451f1a71d936353C9056A0205",
"routingIsmFactory": "0x4D6b4fe86cA1B49ea9CcDFA92F97e4EA0C27Cef2",
"index": {
"from": 9815754
}
},
"bsctestnet": {
"blockExplorers": [
{
Expand Down Expand Up @@ -208,59 +164,6 @@
"from": 26503317
}
},
"goerli": {
"blockExplorers": [
{
"apiUrl": "https://api-goerli.etherscan.io/api",
"family": "etherscan",
"name": "Etherscan",
"url": "https://goerli.etherscan.io"
}
],
"blocks": {
"confirmations": 1,
"estimateBlockTime": 13,
"reorgPeriod": 2
},
"chainId": 5,
"displayName": "Goerli",
"domainId": 5,
"isTestnet": true,
"name": "goerli",
"nativeToken": {
"decimals": 18,
"name": "Ether",
"symbol": "ETH"
},
"protocol": "ethereum",
"rpcUrls": [
{
"http": "https://goerli.infura.io/v3/9aa3d95b3bc440fa88ea12eaa4456161"
},
{
"http": "https://rpc.ankr.com/eth_goerli"
}
],
"merkleRootMultisigIsmFactory": "0x8e43aCfb338B137A3befd9b92BfD84E128adE0B8",
"messageIdMultisigIsmFactory": "0xDdB54502A8e2a31C48148C62A8a9E83a693d6173",
"aggregationIsmFactory": "0x8a176773d54292123d271FA0B9C7C8Def4c3a31b",
"aggregationHookFactory": "0x6bc243963f80AEa80948e8538bB114d4122DD9c5",
"proxyAdmin": "0x0EdB3604D230963ecE9d83963164CFe2fDef576B",
"storageGasOracle": "0xeC34c715ee6d050b2172E8aF650Db779561266C1",
"interchainGasPaymaster": "0x0cD26594ea6c6526927C0F5225AC09F6288e7140",
"aggregationHook": "0x2dF77b3efe9B8f9aEDf7bFC86f40B048178d8116",
"protocolFee": "0x9293B8dAcA7933765de499C992B0Fa86Bb104b0f",
"merkleTreeHook": "0x28c294C61D3dE053462d2Cfa5d5f8c8D70605A59",
"mailbox": "0x49cfd6Ef774AcAb14814D699e3F7eE36Fdfba932",
"validatorAnnounce": "0x3c182AD9cA8A71bc107Ef440C2667E8360e1158E",
"fallbackRoutingHook": "0xd9E546CBB9577dC6346EdB40b24E86aE52487ab8",
"testRecipient": "0x4fC0Ac163eFFEb7890937cB89275B2C231880F22",
"testTokenRecipient": "0xd8958706B33E20C88679a22203F0AFa6158c834d",
"routingIsmFactory": "0xeB998dC788E2c1e772d198d32e50890544776e75",
"index": {
"from": 9890775
}
},
"mumbai": {
"blockExplorers": [
{
Expand Down Expand Up @@ -319,57 +222,6 @@
"from": 40879305
}
},
"optimismgoerli": {
"blockExplorers": [
{
"apiUrl": "https://api-goerli-optimism.etherscan.io/api",
"family": "etherscan",
"name": "Etherscan",
"url": "https://goerli-optimism.etherscan.io"
}
],
"blocks": {
"confirmations": 1,
"estimateBlockTime": 3,
"reorgPeriod": 1
},
"chainId": 420,
"displayName": "Optimism Goerli",
"displayNameShort": "Opt. Goerli",
"domainId": 420,
"isTestnet": true,
"name": "optimismgoerli",
"nativeToken": {
"decimals": 18,
"name": "Ether",
"symbol": "ETH"
},
"protocol": "ethereum",
"rpcUrls": [
{
"http": "https://goerli.optimism.io"
}
],
"merkleRootMultisigIsmFactory": "0xAbC25d7daDD748948F5cC912A807b0f8FcBb56a9",
"messageIdMultisigIsmFactory": "0x7868B6026E36C4b6E2ca6a0CaBDb1A6D0CcC443B",
"aggregationIsmFactory": "0xf666A33C451E8371907aD22dd545E1678fCa1582",
"aggregationHookFactory": "0x00cE81F7B02e0673815a8b0A54e62AeabDE78685",
"proxyAdmin": "0x800b4be4Dc91E56DE934D9f16888d113eFf89Ebb",
"mailbox": "0xB5f021728Ea6223E3948Db2da61d612307945eA2",
"validatorAnnounce": "0x24D31e12E4d3bc2C46C994FcE0c828b218A1aeAb",
"merkleTreeHook": "0xFEe074B31B5B259eB3109737bE13D39B853b47b9",
"storageGasOracle": "0x4927C33299091033D935C15DE6b6073164e99BE0",
"interchainGasPaymaster": "0x02A7661273528EfF3d78CBE7CbD1a717b28B89fC",
"aggregationHook": "0x1C8A2588b8038BF9B7b1b60dD0EdF5b995A45599",
"protocolFee": "0x962e30F6A3ECDA85c7fa1FcF38cD04efA991Ee20",
"fallbackRoutingHook": "0xc775c748F8c9F5443151Fd989e8B61375657474d",
"testRecipient": "0x518eA1802407b4b5AAF3aA92c1A803FfbA9FB7fe",
"testTokenRecipient": "0xB9E45eA920DE14e95A16Ed5e1275F893552f2e32",
"routingIsmFactory": "0xce8E9D701A1DFfe672c1d8dB20De2B3fa6F4437D",
"index": {
"from": 15557498
}
},
"plumetestnet": {
"blockExplorers": [
{
Expand Down Expand Up @@ -425,57 +277,6 @@
"from": 4206
}
},
"polygonzkevmtestnet": {
"blockExplorers": [
{
"apiUrl": "https://api-testnet-zkevm.polygonscan.com/api",
"family": "etherscan",
"name": "PolygonScan",
"url": "https://testnet-zkevm.polygonscan.com"
}
],
"blocks": {
"confirmations": 1,
"estimateBlockTime": 3,
"reorgPeriod": 1
},
"chainId": 1442,
"displayName": "Polygon zkEVM Testnet",
"displayNameShort": "ZkEvm Testnet",
"domainId": 1442,
"isTestnet": true,
"name": "polygonzkevmtestnet",
"nativeToken": {
"decimals": 18,
"name": "Ether",
"symbol": "ETH"
},
"protocol": "ethereum",
"rpcUrls": [
{
"http": "https://rpc.public.zkevm-test.net"
}
],
"merkleRootMultisigIsmFactory": "0xfc6e546510dC9d76057F1f76633FCFfC188CB213",
"messageIdMultisigIsmFactory": "0x275aCcCa81cAD931dC6fB6E49ED233Bc99Bed4A7",
"aggregationIsmFactory": "0xeb6f11189197223c656807a83B0DD374f9A6dF44",
"aggregationHookFactory": "0x16B710b86CAd07E6F1C531861a16F5feC29dba37",
"proxyAdmin": "0x666a24F62f7A97BA33c151776Eb3D9441a059eB8",
"mailbox": "0x598facE78a4302f11E3de0bee1894Da0b2Cb71F8",
"validatorAnnounce": "0x7914A3349107A7295Bbf2374db5A973d73D1b324",
"merkleTreeHook": "0x68311418D79fE8d96599384ED767d225635d88a8",
"storageGasOracle": "0x3707bc8C7342aA6f693bCe1Bd7671Fca146F7F0A",
"interchainGasPaymaster": "0xAD34A66Bf6dB18E858F6B686557075568c6E031C",
"aggregationHook": "0x0Fd2C6F0Ad45e766660b9fDebCF36a2AD69536D1",
"protocolFee": "0xddf4C3e791caCaFd26D7fb275549739B38ae6e75",
"fallbackRoutingHook": "0xBF2C366530C1269d531707154948494D3fF4AcA7",
"testRecipient": "0x11918DC33E067C5DA83EEF58E50F856398b8Df4C",
"testTokenRecipient": "0x04438ef7622f5412f82915F59caD4f704C61eA48",
"routingIsmFactory": "0xc08675806BA844467E559E45E4bB59e66778bDcd",
"index": {
"from": 2846728
}
},
"scrollsepolia": {
"blockExplorers": [
{
Expand Down
21 changes: 8 additions & 13 deletions rust/hyperlane-core/src/chain.rs
Original file line number Diff line number Diff line change
Expand Up @@ -50,21 +50,17 @@ impl<'a> std::fmt::Display for ContractLocator<'a> {
)]
pub enum KnownHyperlaneDomain {
Ethereum = 1,
Goerli = 5,
Sepolia = 11155111,

Polygon = 137,
Mumbai = 80001,
PolygonZkEvmTestnet = 1442,

Avalanche = 43114,
Fuji = 43113,

Arbitrum = 42161,
ArbitrumGoerli = 421613,

Optimism = 10,
OptimismGoerli = 420,

#[cfg_attr(feature = "strum", strum(serialize = "bsc"))]
BinanceSmartChain = 56,
Expand Down Expand Up @@ -106,7 +102,6 @@ pub enum KnownHyperlaneDomain {
SealevelTest2 = 13376,

// -- v3 testnets --
LineaGoerli = 59140,
ScrollSepolia = 534351,

/// Cosmos local chains
Expand Down Expand Up @@ -224,8 +219,8 @@ impl KnownHyperlaneDomain {
Moonbeam, Gnosis, MantaPacific, Neutron, Injective, InEvm
],
Testnet: [
Goerli, Mumbai, Fuji, ArbitrumGoerli, OptimismGoerli, BinanceSmartChainTestnet,
Alfajores, MoonbaseAlpha, Sepolia, PolygonZkEvmTestnet, LineaGoerli, ScrollSepolia, Chiado, PlumeTestnet
Mumbai, Fuji, BinanceSmartChainTestnet,
Alfajores, MoonbaseAlpha, Sepolia, ScrollSepolia, Chiado, PlumeTestnet
],
LocalTestChain: [Test1, Test2, Test3, FuelTest1, SealevelTest1, SealevelTest2, CosmosTest99990, CosmosTest99991],
})
Expand All @@ -236,9 +231,9 @@ impl KnownHyperlaneDomain {

many_to_one!(match self {
HyperlaneDomainProtocol::Ethereum: [
Ethereum, Goerli, Sepolia, Polygon, Mumbai, Avalanche, Fuji, Arbitrum, ArbitrumGoerli,
Optimism, OptimismGoerli, BinanceSmartChain, BinanceSmartChainTestnet, Celo, Gnosis,
Alfajores, Moonbeam, InEvm, MoonbaseAlpha, PolygonZkEvmTestnet, LineaGoerli, ScrollSepolia,
Ethereum, Sepolia, Polygon, Mumbai, Avalanche, Fuji, Arbitrum,
Optimism, BinanceSmartChain, BinanceSmartChainTestnet, Celo, Gnosis,
Alfajores, Moonbeam, InEvm, MoonbaseAlpha, ScrollSepolia,
Chiado, MantaPacific, PlumeTestnet, Test1, Test2, Test3
],
HyperlaneDomainProtocol::Fuel: [FuelTest1],
Expand All @@ -251,11 +246,11 @@ impl KnownHyperlaneDomain {
use KnownHyperlaneDomain::*;

many_to_one!(match self {
HyperlaneDomainTechnicalStack::ArbitrumNitro: [Arbitrum, ArbitrumGoerli, PlumeTestnet],
HyperlaneDomainTechnicalStack::ArbitrumNitro: [Arbitrum, PlumeTestnet],
HyperlaneDomainTechnicalStack::Other: [
Ethereum, Goerli, Sepolia, Polygon, Mumbai, Avalanche, Fuji, Optimism, OptimismGoerli,
Ethereum, Sepolia, Polygon, Mumbai, Avalanche, Fuji, Optimism,
BinanceSmartChain, BinanceSmartChainTestnet, Celo, Gnosis, Alfajores, Moonbeam, MoonbaseAlpha,
PolygonZkEvmTestnet, LineaGoerli, ScrollSepolia, Chiado, MantaPacific, Neutron, Injective, InEvm,
ScrollSepolia, Chiado, MantaPacific, Neutron, Injective, InEvm,
Test1, Test2, Test3, FuelTest1, SealevelTest1, SealevelTest2, CosmosTest99990, CosmosTest99991
],
})
Expand Down
Loading

0 comments on commit 76bd730

Please sign in to comment.