From 76bd73010355a53b2a2720431b34fd4745faa469 Mon Sep 17 00:00:00 2001 From: Paul Balaji Date: Tue, 12 Mar 2024 17:32:02 +0000 Subject: [PATCH] feat: remove goerli testnets (#3389) --- .changeset/eleven-books-train.md | 7 + .../m20230309_000001_create_table_domain.rs | 32 - rust/chains/hyperlane-ethereum/src/mailbox.rs | 2 +- rust/config/testnet4_config.json | 199 ----- rust/hyperlane-core/src/chain.rs | 21 +- .../environments/testnet3/chain-config.json | 103 +-- .../hyperlane/helloworld-config.json | 11 +- .../helloworld/hyperlane/program-ids.json | 14 +- .../helloworld/rc/helloworld-config.json | 11 +- .../testnet3/helloworld/rc/program-ids.json | 14 +- .../hyperlane/multisig-config.json | 29 +- .../solanadevnet/rc/multisig-config.json | 47 +- .../environments/testnet4/chain-config.json | 122 --- .../hyperlane/multisig-config.json | 174 ++-- .../hyperlane/multisig-config.json | 174 ++-- typescript/infra/config/aw-multisig.json | 28 - .../environments/mainnet3/token-bridge.ts | 11 - .../test/middleware/accounts/addresses.json | 9 - .../middleware/liquidity-layer/addresses.json | 5 - .../liquidity-layer/verification.json | 32 - .../test/middleware/queries/addresses.json | 9 - .../config/environments/testnet4/agent.ts | 45 +- .../config/environments/testnet4/chains.ts | 4 - .../testnet4/core/verification.json | 476 ----------- .../testnet4/create2/addresses.json | 9 - .../testnet4/create2/verification.json | 24 - .../config/environments/testnet4/funding.ts | 6 +- .../environments/testnet4/gas-oracle.ts | 10 - .../environments/testnet4/helloworld.ts | 6 +- .../helloworld/hyperlane/addresses.json | 12 - .../helloworld/hyperlane/verification.json | 164 ---- .../testnet4/helloworld/rc/addresses.json | 12 - .../testnet4/helloworld/rc/verification.json | 32 - .../config/environments/testnet4/hooks.ts | 7 - .../testnet4/ism/verification.json | 792 ------------------ .../environments/testnet4/liquidityLayer.ts | 22 - .../middleware/accounts/verification.json | 168 ---- .../middleware/liquidity-layer/addresses.json | 6 - .../liquidity-layer/verification.json | 20 - .../middleware/queries/verification.json | 78 -- .../testnet4/testquerysender/addresses.json | 9 - .../testquerysender/verification.json | 24 - .../environments/testnet4/token-bridge.ts | 22 - .../environments/testnet4/validators.ts | 118 --- .../testnet4/warp/verification.json | 14 - .../infra/config/rcMultisigIsmConfigs.ts | 20 - .../infra/scripts/announce-validators.ts | 2 +- .../funding/fund-keys-from-deployer.ts | 55 +- typescript/sdk/src/consts/chainMetadata.ts | 124 --- typescript/sdk/src/consts/chains.ts | 10 - .../sdk/src/consts/environments/testnet.json | 72 -- typescript/sdk/src/consts/multisigIsm.ts | 45 - .../sdk/src/metadata/chainMetadata.test.ts | 2 +- .../SmartProvider/SmartProvider.test.ts | 20 +- typescript/sdk/src/token/Token.test.ts | 10 +- 55 files changed, 194 insertions(+), 3300 deletions(-) create mode 100644 .changeset/eleven-books-train.md delete mode 100644 typescript/infra/config/environments/testnet4/hooks.ts diff --git a/.changeset/eleven-books-train.md b/.changeset/eleven-books-train.md new file mode 100644 index 000000000..01e4bc5a0 --- /dev/null +++ b/.changeset/eleven-books-train.md @@ -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) diff --git a/rust/agents/scraper/migration/src/m20230309_000001_create_table_domain.rs b/rust/agents/scraper/migration/src/m20230309_000001_create_table_domain.rs index d6dee6809..444447024 100644 --- a/rust/agents/scraper/migration/src/m20230309_000001_create_table_domain.rs +++ b/rust/agents/scraper/migration/src/m20230309_000001_create_table_domain.rs @@ -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", @@ -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", @@ -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", @@ -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", diff --git a/rust/chains/hyperlane-ethereum/src/mailbox.rs b/rust/chains/hyperlane-ethereum/src/mailbox.rs index 4f7323ed0..f92338f6b 100644 --- a/rust/chains/hyperlane-ethereum/src/mailbox.rs +++ b/rust/chains/hyperlane-ethereum/src/mailbox.rs @@ -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(), }, diff --git a/rust/config/testnet4_config.json b/rust/config/testnet4_config.json index ccee524eb..76fcec119 100644 --- a/rust/config/testnet4_config.json +++ b/rust/config/testnet4_config.json @@ -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": [ { @@ -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": [ { @@ -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": [ { @@ -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": [ { diff --git a/rust/hyperlane-core/src/chain.rs b/rust/hyperlane-core/src/chain.rs index 9a23774b7..6181806e5 100644 --- a/rust/hyperlane-core/src/chain.rs +++ b/rust/hyperlane-core/src/chain.rs @@ -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, @@ -106,7 +102,6 @@ pub enum KnownHyperlaneDomain { SealevelTest2 = 13376, // -- v3 testnets -- - LineaGoerli = 59140, ScrollSepolia = 534351, /// Cosmos local chains @@ -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], }) @@ -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], @@ -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 ], }) diff --git a/rust/sealevel/environments/testnet3/chain-config.json b/rust/sealevel/environments/testnet3/chain-config.json index ae5158a8b..478287bf7 100644 --- a/rust/sealevel/environments/testnet3/chain-config.json +++ b/rust/sealevel/environments/testnet3/chain-config.json @@ -139,43 +139,6 @@ }, "isTestnet": true }, - "goerli": { - "chainId": 5, - "domainId": 5, - "name": "goerli", - "protocol": "ethereum", - "displayName": "Goerli", - "nativeToken": { - "name": "Ether", - "symbol": "ETH", - "decimals": 18 - }, - "rpcUrls": [ - { - "http": "https://goerli.infura.io/v3/9aa3d95b3bc440fa88ea12eaa4456161" - }, - { - "http": "https://rpc.ankr.com/eth_goerli" - }, - { - "http": "https://eth-goerli.public.blastapi.io" - } - ], - "blockExplorers": [ - { - "name": "Etherscan", - "url": "https://goerli.etherscan.io", - "apiUrl": "https://api-goerli.etherscan.io/api", - "family": "etherscan" - } - ], - "blocks": { - "confirmations": 1, - "reorgPeriod": 2, - "estimateBlockTime": 13 - }, - "isTestnet": true - }, "moonbasealpha": { "chainId": 1287, "domainId": 1287, @@ -208,70 +171,6 @@ }, "isTestnet": true }, - "optimismgoerli": { - "chainId": 420, - "domainId": 420, - "name": "optimismgoerli", - "protocol": "ethereum", - "displayName": "Optimism Goerli", - "displayNameShort": "Opt. Goerli", - "nativeToken": { - "name": "Ether", - "symbol": "ETH", - "decimals": 18 - }, - "rpcUrls": [ - { - "http": "https://goerli.optimism.io" - } - ], - "blockExplorers": [ - { - "name": "Etherscan", - "url": "https://goerli-optimism.etherscan.io", - "apiUrl": "https://api-goerli-optimism.etherscan.io/api", - "family": "etherscan" - } - ], - "blocks": { - "confirmations": 1, - "reorgPeriod": 1, - "estimateBlockTime": 3 - }, - "isTestnet": true - }, - "arbitrumgoerli": { - "chainId": 421613, - "domainId": 421613, - "name": "arbitrumgoerli", - "protocol": "ethereum", - "displayName": "Arbitrum Goerli", - "displayNameShort": "Arb. Goerli", - "nativeToken": { - "name": "Ether", - "symbol": "ETH", - "decimals": 18 - }, - "rpcUrls": [ - { - "http": "https://goerli-rollup.arbitrum.io/rpc" - } - ], - "blockExplorers": [ - { - "name": "Arbiscan", - "url": "https://goerli.arbiscan.io", - "apiUrl": "https://api-goerli.arbiscan.io/api", - "family": "etherscan" - } - ], - "blocks": { - "confirmations": 1, - "reorgPeriod": 1, - "estimateBlockTime": 3 - }, - "isTestnet": true - }, "sepolia": { "chainId": 11155111, "domainId": 11155111, @@ -332,4 +231,4 @@ } ] } -} \ No newline at end of file +} diff --git a/rust/sealevel/environments/testnet3/helloworld/hyperlane/helloworld-config.json b/rust/sealevel/environments/testnet3/helloworld/hyperlane/helloworld-config.json index a03eae987..4432348c7 100644 --- a/rust/sealevel/environments/testnet3/helloworld/hyperlane/helloworld-config.json +++ b/rust/sealevel/environments/testnet3/helloworld/hyperlane/helloworld-config.json @@ -14,19 +14,10 @@ "bsctestnet": { "foreignDeployment": "0xE09BF59dCA6e622efC33f6fbd8EF85dE45233388" }, - "goerli": { - "foreignDeployment": "0x405BFdEcB33230b4Ad93C29ba4499b776CfBa189" - }, "moonbasealpha": { "foreignDeployment": "0x89e02C3C7b97bCBa63279E10E2a44e6cEF69E6B2" }, - "optimismgoerli": { - "foreignDeployment": "0x3582d1238cBC812165981E4fFaB0E8D9a4518910" - }, - "arbitrumgoerli": { - "foreignDeployment": "0x339B46496D60b1b6B42e9715DeD8B3D2154dA0Bb" - }, "sepolia": { "foreignDeployment": "0x5d56B8a669F50193b54319442c6EEE5edD662381" } -} \ No newline at end of file +} diff --git a/rust/sealevel/environments/testnet3/helloworld/hyperlane/program-ids.json b/rust/sealevel/environments/testnet3/helloworld/hyperlane/program-ids.json index 1eca03712..066fd4b0b 100644 --- a/rust/sealevel/environments/testnet3/helloworld/hyperlane/program-ids.json +++ b/rust/sealevel/environments/testnet3/helloworld/hyperlane/program-ids.json @@ -3,10 +3,6 @@ "hex": "0x000000000000000000000000e09bf59dca6e622efc33f6fbd8ef85de45233388", "base58": "11111111111148VaL9DFuVc9DbDjRR7c3qyCEjyy" }, - "optimismgoerli": { - "hex": "0x0000000000000000000000003582d1238cbc812165981e4ffab0e8d9a4518910", - "base58": "111111111111kEreeMSXc3Nh2JoYtisyZj8pb6X" - }, "fuji": { "hex": "0x0000000000000000000000005da3b8d6f73df6003a490072106730218c475aad", "base58": "1111111111112JfXZf7EYaEMM1st6wFZbcLN2uwA" @@ -23,20 +19,12 @@ "hex": "0x000000000000000000000000477d860f8f41bc69ddd32821f2bf2c2af0243f16", "base58": "111111111111zmUjMVNXAe5bcqPR8cvaPz5SrQu" }, - "goerli": { - "hex": "0x000000000000000000000000405bfdecb33230b4ad93c29ba4499b776cfba189", - "base58": "111111111111u1H27LrKRuu1G7bDpPWUXKphQSt" - }, "sepolia": { "hex": "0x0000000000000000000000005d56b8a669f50193b54319442c6eee5edd662381", "base58": "1111111111112JRRxgtLh6eyMDsTHUehn6bJcPJ8" }, - "arbitrumgoerli": { - "hex": "0x000000000000000000000000339b46496d60b1b6b42e9715ded8b3d2154da0bb", - "base58": "111111111111ihbsGG5PRTKTSYSGewGtDFs2vfc" - }, "moonbasealpha": { "hex": "0x00000000000000000000000089e02c3c7b97bcba63279e10e2a44e6cef69e6b2", "base58": "1111111111112vQhuwgKwhQ7SM1HZEm6yXQkzCau" } -} \ No newline at end of file +} diff --git a/rust/sealevel/environments/testnet3/helloworld/rc/helloworld-config.json b/rust/sealevel/environments/testnet3/helloworld/rc/helloworld-config.json index e2a072b56..1655b4d14 100644 --- a/rust/sealevel/environments/testnet3/helloworld/rc/helloworld-config.json +++ b/rust/sealevel/environments/testnet3/helloworld/rc/helloworld-config.json @@ -14,19 +14,10 @@ "bsctestnet": { "foreignDeployment": "0xd259b0e793535325786675542aB296c451535c27" }, - "goerli": { - "foreignDeployment": "0x03e9531ae74e8F0f96DE26788a22d35bdaD24185" - }, "moonbasealpha": { "foreignDeployment": "0xE9D6317a10860340f035f3d09052D9d376855bE8" }, - "optimismgoerli": { - "foreignDeployment": "0x057d38d184d74192B96840D8FbB37e584dDb569A" - }, - "arbitrumgoerli": { - "foreignDeployment": "0xaAF1BF6f2BfaE290ea8615066fd167e396a2f578" - }, "sepolia": { "foreignDeployment": "0x6AD4DEBA8A147d000C09de6465267a9047d1c217" } -} \ No newline at end of file +} diff --git a/rust/sealevel/environments/testnet3/helloworld/rc/program-ids.json b/rust/sealevel/environments/testnet3/helloworld/rc/program-ids.json index 99f4db546..aaad44915 100644 --- a/rust/sealevel/environments/testnet3/helloworld/rc/program-ids.json +++ b/rust/sealevel/environments/testnet3/helloworld/rc/program-ids.json @@ -3,18 +3,10 @@ "hex": "0x0000000000000000000000006ad4deba8a147d000c09de6465267a9047d1c217", "base58": "1111111111112VKnX2KMsqSTDw9YoXRsZJTwTcUW" }, - "goerli": { - "hex": "0x00000000000000000000000003e9531ae74e8f0f96de26788a22d35bdad24185", - "base58": "1111111111114AKBbRbDjAP93LQgmXJPvfVU7SC" - }, "solanadevnet": { "hex": "0xbba2f483e642449d0a39efe5f9603f7c559423acebd3c854d07560ccd0439228", "base58": "DdTMkk9nuqH5LnD56HLkPiKMV3yB3BNEYSQfgmJHa5i7" }, - "optimismgoerli": { - "hex": "0x000000000000000000000000057d38d184d74192b96840d8fbb37e584ddb569a", - "base58": "1111111111115SFp65pWdvPTRK5fmHa3sc4Eq6Z" - }, "fuji": { "hex": "0x000000000000000000000000ac003fcdd0ee223664f2a000b5a59d082745700b", "base58": "1111111111113Pz2bmxxVNgkKkZPpxgouHiZAjTx" @@ -23,10 +15,6 @@ "hex": "0x000000000000000000000000e9d6317a10860340f035f3d09052d9d376855be8", "base58": "1111111111114Fx2onL6wvVgGmyjgzGhy48HzCZM" }, - "arbitrumgoerli": { - "hex": "0x000000000000000000000000aaf1bf6f2bfae290ea8615066fd167e396a2f578", - "base58": "1111111111113P8WPEsejkHP1Zysy1xXafVFFnaT" - }, "bsctestnet": { "hex": "0x000000000000000000000000d259b0e793535325786675542ab296c451535c27", "base58": "1111111111113vyKMMTb6aSQDhDLqEvqcPBcTtRC" @@ -39,4 +27,4 @@ "hex": "0x000000000000000000000000ab0892029c3e7dd4c0235590dc296e618a7b4d03", "base58": "1111111111113PCgiXuWFu2FmvhykJp51x5y5jyC" } -} \ No newline at end of file +} diff --git a/rust/sealevel/environments/testnet3/multisig-ism-message-id/solanadevnet/hyperlane/multisig-config.json b/rust/sealevel/environments/testnet3/multisig-ism-message-id/solanadevnet/hyperlane/multisig-config.json index c758f40bc..f28912dad 100644 --- a/rust/sealevel/environments/testnet3/multisig-ism-message-id/solanadevnet/hyperlane/multisig-config.json +++ b/rust/sealevel/environments/testnet3/multisig-ism-message-id/solanadevnet/hyperlane/multisig-config.json @@ -35,15 +35,6 @@ "0x95b76562e4ba1791a27ba4236801271c9115b141" ] }, - "goerli": { - "type": 3, - "threshold": 2, - "validators": [ - "0xf43fbd072fd38e1121d4b3b0b8a35116bbb01ea9", - "0xa33020552a21f35e75bd385c6ab95c3dfa82d930", - "0x0bba4043ff242f8bf3f39bafa8930a84d644d947" - ] - }, "sepolia": { "type": 3, "threshold": 2, @@ -62,24 +53,6 @@ "0xe70b85206a968a99a597581f0fa09c99e7681093" ] }, - "optimismgoerli": { - "type": 3, - "threshold": 2, - "validators": [ - "0xbb8d77eefbecc55db6e5a19b0fc3dc290776f189", - "0x69792508b4ddaa3ca52241ccfcd1e0b119a1ee65", - "0x11ddb46c6b653e0cdd7ad5bee32ae316e18f8453" - ] - }, - "arbitrumgoerli": { - "type": 3, - "threshold": 2, - "validators": [ - "0xce798fa21e323f6b24d9838a10ffecdefdfc4f30", - "0xa792d39dca4426927e0f00c1618d61c9cb41779d", - "0xdf181fcc11dfac5d01467e4547101a856dd5aa04" - ] - }, "proteustestnet": { "type": 3, "threshold": 2, @@ -89,4 +62,4 @@ "0xd4b2a50c53fc6614bb3cd3198e0fdc03f5da973f" ] } -} \ No newline at end of file +} diff --git a/rust/sealevel/environments/testnet3/multisig-ism-message-id/solanadevnet/rc/multisig-config.json b/rust/sealevel/environments/testnet3/multisig-ism-message-id/solanadevnet/rc/multisig-config.json index 870829e4a..04d6400dd 100644 --- a/rust/sealevel/environments/testnet3/multisig-ism-message-id/solanadevnet/rc/multisig-config.json +++ b/rust/sealevel/environments/testnet3/multisig-ism-message-id/solanadevnet/rc/multisig-config.json @@ -2,64 +2,31 @@ "alfajores": { "type": 3, "threshold": 1, - "validators": [ - "0x45e5c228b38e1cf09e9a3423ed0cf4862c4bf3de" - ] + "validators": ["0x45e5c228b38e1cf09e9a3423ed0cf4862c4bf3de"] }, "fuji": { "type": 3, "threshold": 1, - "validators": [ - "0xd81ba169170a9b582812cf0e152d2c168572e21f" - ] + "validators": ["0xd81ba169170a9b582812cf0e152d2c168572e21f"] }, "mumbai": { "type": 3, "threshold": 1, - "validators": [ - "0xb537c4ce34e1cad718be52aa30b095e416eae46a" - ] + "validators": ["0xb537c4ce34e1cad718be52aa30b095e416eae46a"] }, "bsctestnet": { "type": 3, "threshold": 1, - "validators": [ - "0x77f80ef5b18977e15d81aea8dd3a88e7df4bc0eb" - ] - }, - "goerli": { - "type": 3, - "threshold": 1, - "validators": [ - "0x9597ddb4ad2af237665559574b820596bb77ae7a" - ] + "validators": ["0x77f80ef5b18977e15d81aea8dd3a88e7df4bc0eb"] }, "sepolia": { "type": 3, "threshold": 1, - "validators": [ - "0x183f15924f3a464c54c9393e8d268eb44d2b208c" - ] + "validators": ["0x183f15924f3a464c54c9393e8d268eb44d2b208c"] }, "moonbasealpha": { "type": 3, "threshold": 1, - "validators": [ - "0xbeaf158f85d7b64ced36b8aea0bbc4cd0f2d1a5d" - ] - }, - "optimismgoerli": { - "type": 3, - "threshold": 1, - "validators": [ - "0x1d6798671ac532f2bf30c3a5230697a4695705e4" - ] - }, - "arbitrumgoerli": { - "type": 3, - "threshold": 1, - "validators": [ - "0x6d13367c7cd713a4ea79a2552adf824bf1ecdd5e" - ] + "validators": ["0xbeaf158f85d7b64ced36b8aea0bbc4cd0f2d1a5d"] } -} \ No newline at end of file +} diff --git a/rust/sealevel/environments/testnet4/chain-config.json b/rust/sealevel/environments/testnet4/chain-config.json index efb4a36c6..7deb8b892 100644 --- a/rust/sealevel/environments/testnet4/chain-config.json +++ b/rust/sealevel/environments/testnet4/chain-config.json @@ -146,40 +146,6 @@ "gasPrice": 80000000000 } }, - "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" - } - ] - }, "scrollsepolia": { "blockExplorers": [ { @@ -277,94 +243,6 @@ } ] }, - "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" - } - ] - }, - "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", - "rpcUrls": [ - { - "http": "https://goerli-rollup.arbitrum.io/rpc" - } - ] - }, - "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" - } - ] - }, "solanatestnet": { "blockExplorers": [ { diff --git a/rust/sealevel/environments/testnet4/multisig-ism-message-id/eclipsetestnet/hyperlane/multisig-config.json b/rust/sealevel/environments/testnet4/multisig-ism-message-id/eclipsetestnet/hyperlane/multisig-config.json index 6f746e5b8..45f98f852 100644 --- a/rust/sealevel/environments/testnet4/multisig-ism-message-id/eclipsetestnet/hyperlane/multisig-config.json +++ b/rust/sealevel/environments/testnet4/multisig-ism-message-id/eclipsetestnet/hyperlane/multisig-config.json @@ -1,108 +1,70 @@ { - "alfajores": { - "threshold": 2, - "validators": [ - "0x2233a5ce12f814bd64c9cdd73410bb8693124d40", - "0xba279f965489d90f90490e3c49e860e0b43c2ae6", - "0x86485dcec5f7bb8478dd251676372d054dea6653" - ], - "type": 3 - }, - "arbitrumgoerli": { - "threshold": 2, - "validators": [ - "0x071c8d135845ae5a2cb73f98d681d519014c0a8b", - "0x1bcf03360989f15cbeb174c188288f2c6d2760d7", - "0xc1590eaaeaf380e7859564c5ebcdcc87e8369e0d" - ], - "type": 3 - }, - "bsctestnet": { - "threshold": 2, - "validators": [ - "0x242d8a855a8c932dec51f7999ae7d1e48b10c95e", - "0xf620f5e3d25a3ae848fec74bccae5de3edcd8796", - "0x1f030345963c54ff8229720dd3a711c15c554aeb" - ], - "type": 3 - }, - "fuji": { - "threshold": 2, - "validators": [ - "0xd8154f73d04cc7f7f0c332793692e6e6f6b2402e", - "0x895ae30bc83ff1493b9cf7781b0b813d23659857", - "0x43e915573d9f1383cbf482049e4a012290759e7f" - ], - "type": 3 - }, - "goerli": { - "threshold": 2, - "validators": [ - "0x05a9b5efe9f61f9142453d8e9f61565f333c6768", - "0x43a96c7dfbd8187c95013d6ee8665650cbdb2673", - "0x7940a12c050e24e1839c21ecb12f65afd84e8c5b" - ], - "type": 3 - }, - "moonbasealpha": { - "threshold": 2, - "validators": [ - "0x521877064bd7ac7500d300f162c8c47c256a2f9c", - "0xbc1c70f58ae0459d4b8a013245420a893837d568", - "0x01e42c2c44af81dda1ac16fec76fea2a7a54a44c" - ], - "type": 3 - }, - "mumbai": { - "threshold": 2, - "validators": [ - "0xebc301013b6cd2548e347c28d2dc43ec20c068f2", - "0x315db9868fc8813b221b1694f8760ece39f45447", - "0x17517c98358c5937c5d9ee47ce1f5b4c2b7fc9f5" - ], - "type": 3 - }, - "optimismgoerli": { - "threshold": 2, - "validators": [ - "0x79e58546e2faca865c6732ad5f6c4951051c4d67", - "0x7bbfe1bb7146aad7df309c637987d856179ebbc1", - "0xf3d2fb4d53c2bb6a88cec040e0d87430fcee4e40" - ], - "type": 3 - }, - "polygonzkevmtestnet": { - "threshold": 2, - "validators": [ - "0x3f06b725bc9648917eb11c414e9f8d76fd959550", - "0x27bfc57679d9dd4ab2e870f5ed7ec0b339a0b636", - "0xd476548222f43206d0abaa30e46e28670aa7859c" - ], - "type": 3 - }, - "scrollsepolia": { - "threshold": 2, - "validators": [ - "0xbe18dbd758afb367180260b524e6d4bcd1cb6d05", - "0x9a11ed23ae962974018ab45bc133caabff7b3271", - "0x7867bea3c9761fe64e6d124b171f91fd5dd79644" - ], - "type": 3 - }, - "sepolia": { - "threshold": 2, - "validators": [ - "0xb22b65f202558adf86a8bb2847b76ae1036686a5", - "0x469f0940684d147defc44f3647146cb90dd0bc8e", - "0xd3c75dcf15056012a4d74c483a0c6ea11d8c2b83" - ], - "type": 3 - }, - "solanatestnet": { - "threshold": 1, - "validators": [ - "0xd4ce8fa138d4e083fc0e480cca0dbfa4f5f30bd5" - ], - "type": 3 - } + "alfajores": { + "threshold": 2, + "validators": [ + "0x2233a5ce12f814bd64c9cdd73410bb8693124d40", + "0xba279f965489d90f90490e3c49e860e0b43c2ae6", + "0x86485dcec5f7bb8478dd251676372d054dea6653" + ], + "type": 3 + }, + "bsctestnet": { + "threshold": 2, + "validators": [ + "0x242d8a855a8c932dec51f7999ae7d1e48b10c95e", + "0xf620f5e3d25a3ae848fec74bccae5de3edcd8796", + "0x1f030345963c54ff8229720dd3a711c15c554aeb" + ], + "type": 3 + }, + "fuji": { + "threshold": 2, + "validators": [ + "0xd8154f73d04cc7f7f0c332793692e6e6f6b2402e", + "0x895ae30bc83ff1493b9cf7781b0b813d23659857", + "0x43e915573d9f1383cbf482049e4a012290759e7f" + ], + "type": 3 + }, + "moonbasealpha": { + "threshold": 2, + "validators": [ + "0x521877064bd7ac7500d300f162c8c47c256a2f9c", + "0xbc1c70f58ae0459d4b8a013245420a893837d568", + "0x01e42c2c44af81dda1ac16fec76fea2a7a54a44c" + ], + "type": 3 + }, + "mumbai": { + "threshold": 2, + "validators": [ + "0xebc301013b6cd2548e347c28d2dc43ec20c068f2", + "0x315db9868fc8813b221b1694f8760ece39f45447", + "0x17517c98358c5937c5d9ee47ce1f5b4c2b7fc9f5" + ], + "type": 3 + }, + "scrollsepolia": { + "threshold": 2, + "validators": [ + "0xbe18dbd758afb367180260b524e6d4bcd1cb6d05", + "0x9a11ed23ae962974018ab45bc133caabff7b3271", + "0x7867bea3c9761fe64e6d124b171f91fd5dd79644" + ], + "type": 3 + }, + "sepolia": { + "threshold": 2, + "validators": [ + "0xb22b65f202558adf86a8bb2847b76ae1036686a5", + "0x469f0940684d147defc44f3647146cb90dd0bc8e", + "0xd3c75dcf15056012a4d74c483a0c6ea11d8c2b83" + ], + "type": 3 + }, + "solanatestnet": { + "threshold": 1, + "validators": ["0xd4ce8fa138d4e083fc0e480cca0dbfa4f5f30bd5"], + "type": 3 + } } diff --git a/rust/sealevel/environments/testnet4/multisig-ism-message-id/solanatestnet/hyperlane/multisig-config.json b/rust/sealevel/environments/testnet4/multisig-ism-message-id/solanatestnet/hyperlane/multisig-config.json index b35110fdc..727a68d05 100644 --- a/rust/sealevel/environments/testnet4/multisig-ism-message-id/solanatestnet/hyperlane/multisig-config.json +++ b/rust/sealevel/environments/testnet4/multisig-ism-message-id/solanatestnet/hyperlane/multisig-config.json @@ -1,108 +1,70 @@ { - "alfajores": { - "threshold": 2, - "validators": [ - "0x2233a5ce12f814bd64c9cdd73410bb8693124d40", - "0xba279f965489d90f90490e3c49e860e0b43c2ae6", - "0x86485dcec5f7bb8478dd251676372d054dea6653" - ], - "type": 3 - }, - "arbitrumgoerli": { - "threshold": 2, - "validators": [ - "0x071c8d135845ae5a2cb73f98d681d519014c0a8b", - "0x1bcf03360989f15cbeb174c188288f2c6d2760d7", - "0xc1590eaaeaf380e7859564c5ebcdcc87e8369e0d" - ], - "type": 3 - }, - "bsctestnet": { - "threshold": 2, - "validators": [ - "0x242d8a855a8c932dec51f7999ae7d1e48b10c95e", - "0xf620f5e3d25a3ae848fec74bccae5de3edcd8796", - "0x1f030345963c54ff8229720dd3a711c15c554aeb" - ], - "type": 3 - }, - "fuji": { - "threshold": 2, - "validators": [ - "0xd8154f73d04cc7f7f0c332793692e6e6f6b2402e", - "0x895ae30bc83ff1493b9cf7781b0b813d23659857", - "0x43e915573d9f1383cbf482049e4a012290759e7f" - ], - "type": 3 - }, - "goerli": { - "threshold": 2, - "validators": [ - "0x05a9b5efe9f61f9142453d8e9f61565f333c6768", - "0x43a96c7dfbd8187c95013d6ee8665650cbdb2673", - "0x7940a12c050e24e1839c21ecb12f65afd84e8c5b" - ], - "type": 3 - }, - "moonbasealpha": { - "threshold": 2, - "validators": [ - "0x521877064bd7ac7500d300f162c8c47c256a2f9c", - "0xbc1c70f58ae0459d4b8a013245420a893837d568", - "0x01e42c2c44af81dda1ac16fec76fea2a7a54a44c" - ], - "type": 3 - }, - "mumbai": { - "threshold": 2, - "validators": [ - "0xebc301013b6cd2548e347c28d2dc43ec20c068f2", - "0x315db9868fc8813b221b1694f8760ece39f45447", - "0x17517c98358c5937c5d9ee47ce1f5b4c2b7fc9f5" - ], - "type": 3 - }, - "optimismgoerli": { - "threshold": 2, - "validators": [ - "0x79e58546e2faca865c6732ad5f6c4951051c4d67", - "0x7bbfe1bb7146aad7df309c637987d856179ebbc1", - "0xf3d2fb4d53c2bb6a88cec040e0d87430fcee4e40" - ], - "type": 3 - }, - "polygonzkevmtestnet": { - "threshold": 2, - "validators": [ - "0x3f06b725bc9648917eb11c414e9f8d76fd959550", - "0x27bfc57679d9dd4ab2e870f5ed7ec0b339a0b636", - "0xd476548222f43206d0abaa30e46e28670aa7859c" - ], - "type": 3 - }, - "scrollsepolia": { - "threshold": 2, - "validators": [ - "0xbe18dbd758afb367180260b524e6d4bcd1cb6d05", - "0x9a11ed23ae962974018ab45bc133caabff7b3271", - "0x7867bea3c9761fe64e6d124b171f91fd5dd79644" - ], - "type": 3 - }, - "sepolia": { - "threshold": 2, - "validators": [ - "0xb22b65f202558adf86a8bb2847b76ae1036686a5", - "0x469f0940684d147defc44f3647146cb90dd0bc8e", - "0xd3c75dcf15056012a4d74c483a0c6ea11d8c2b83" - ], - "type": 3 - }, - "eclipsetestnet": { - "threshold": 1, - "validators": [ - "0xf344f34abca9a444545b5295066348a0ae22dda3" - ], - "type": 3 - } + "alfajores": { + "threshold": 2, + "validators": [ + "0x2233a5ce12f814bd64c9cdd73410bb8693124d40", + "0xba279f965489d90f90490e3c49e860e0b43c2ae6", + "0x86485dcec5f7bb8478dd251676372d054dea6653" + ], + "type": 3 + }, + "bsctestnet": { + "threshold": 2, + "validators": [ + "0x242d8a855a8c932dec51f7999ae7d1e48b10c95e", + "0xf620f5e3d25a3ae848fec74bccae5de3edcd8796", + "0x1f030345963c54ff8229720dd3a711c15c554aeb" + ], + "type": 3 + }, + "fuji": { + "threshold": 2, + "validators": [ + "0xd8154f73d04cc7f7f0c332793692e6e6f6b2402e", + "0x895ae30bc83ff1493b9cf7781b0b813d23659857", + "0x43e915573d9f1383cbf482049e4a012290759e7f" + ], + "type": 3 + }, + "moonbasealpha": { + "threshold": 2, + "validators": [ + "0x521877064bd7ac7500d300f162c8c47c256a2f9c", + "0xbc1c70f58ae0459d4b8a013245420a893837d568", + "0x01e42c2c44af81dda1ac16fec76fea2a7a54a44c" + ], + "type": 3 + }, + "mumbai": { + "threshold": 2, + "validators": [ + "0xebc301013b6cd2548e347c28d2dc43ec20c068f2", + "0x315db9868fc8813b221b1694f8760ece39f45447", + "0x17517c98358c5937c5d9ee47ce1f5b4c2b7fc9f5" + ], + "type": 3 + }, + "scrollsepolia": { + "threshold": 2, + "validators": [ + "0xbe18dbd758afb367180260b524e6d4bcd1cb6d05", + "0x9a11ed23ae962974018ab45bc133caabff7b3271", + "0x7867bea3c9761fe64e6d124b171f91fd5dd79644" + ], + "type": 3 + }, + "sepolia": { + "threshold": 2, + "validators": [ + "0xb22b65f202558adf86a8bb2847b76ae1036686a5", + "0x469f0940684d147defc44f3647146cb90dd0bc8e", + "0xd3c75dcf15056012a4d74c483a0c6ea11d8c2b83" + ], + "type": 3 + }, + "eclipsetestnet": { + "threshold": 1, + "validators": ["0xf344f34abca9a444545b5295066348a0ae22dda3"], + "type": 3 + } } diff --git a/typescript/infra/config/aw-multisig.json b/typescript/infra/config/aw-multisig.json index 2abd102e8..0fe535cf9 100644 --- a/typescript/infra/config/aw-multisig.json +++ b/typescript/infra/config/aw-multisig.json @@ -13,13 +13,6 @@ "0x3369e12edd52570806f126eb50be269ba5e65843" ] }, - "arbitrumgoerli": { - "validators": [ - "0x071c8d135845ae5a2cb73f98d681d519014c0a8b", - "0x1bcf03360989f15cbeb174c188288f2c6d2760d7", - "0xc1590eaaeaf380e7859564c5ebcdcc87e8369e0d" - ] - }, "avalanche": { "validators": [ "0x3fb8263859843bffb02950c492d492cae169f4cf", @@ -79,13 +72,6 @@ "0xb93a72cee19402553c9dd7fed2461aebd04e2454" ] }, - "goerli": { - "validators": [ - "0x05a9b5efe9f61f9142453d8e9f61565f333c6768", - "0x43a96c7dfbd8187c95013d6ee8665650cbdb2673", - "0x7940a12c050e24e1839c21ecb12f65afd84e8c5b" - ] - }, "inevm": { "validators": [ "0xf9e35ee88e4448a3673b4676a4e153e3584a08eb", @@ -135,13 +121,6 @@ "0x779a17e035018396724a6dec8a59bda1b5adf738" ] }, - "optimismgoerli": { - "validators": [ - "0x79e58546e2faca865c6732ad5f6c4951051c4d67", - "0x7bbfe1bb7146aad7df309c637987d856179ebbc1", - "0xf3d2fb4d53c2bb6a88cec040e0d87430fcee4e40" - ] - }, "plumetestnet": { "validators": [ "0xe765a214849f3ecdf00793b97d00422f2d408ea6", @@ -163,13 +142,6 @@ "0x6a1da2e0b7ae26aaece1377c0a4dbe25b85fa3ca" ] }, - "polygonzkevmtestnet": { - "validators": [ - "0x3f06b725bc9648917eb11c414e9f8d76fd959550", - "0x27bfc57679d9dd4ab2e870f5ed7ec0b339a0b636", - "0xd476548222f43206d0abaa30e46e28670aa7859c" - ] - }, "scroll": { "validators": [ "0xad557170a9f2f21c35e03de07cb30dcbcc3dff63", diff --git a/typescript/infra/config/environments/mainnet3/token-bridge.ts b/typescript/infra/config/environments/mainnet3/token-bridge.ts index 16e568a41..7dc12ce63 100644 --- a/typescript/infra/config/environments/mainnet3/token-bridge.ts +++ b/typescript/infra/config/environments/mainnet3/token-bridge.ts @@ -8,22 +8,11 @@ import { } from '@hyperlane-xyz/sdk'; const circleDomainMapping = [ - { - hyperlaneDomain: getDomainId(chainMetadata[Chains.goerli]), - circleDomain: 0, - }, { hyperlaneDomain: getDomainId(chainMetadata[Chains.fuji]), circleDomain: 1 }, ]; // Circle deployed contracts export const circleBridgeAdapterConfig: ChainMap = { - [Chains.goerli]: { - type: BridgeAdapterType.Circle, - tokenMessengerAddress: '0xdabec94b97f7b5fca28f050cc8eeac2dc9920476', - messageTransmitterAddress: '0x40a61d3d2afcf5a5d31fcdf269e575fb99dd87f7', - usdcAddress: '0x07865c6e87b9f70255377e024ace6630c1eaa37f', - circleDomainMapping, - }, [Chains.fuji]: { type: BridgeAdapterType.Circle, tokenMessengerAddress: '0x0fc1103927af27af808d03135214718bcedbe9ad', diff --git a/typescript/infra/config/environments/test/middleware/accounts/addresses.json b/typescript/infra/config/environments/test/middleware/accounts/addresses.json index e58797a5b..aed8d78a7 100644 --- a/typescript/infra/config/environments/test/middleware/accounts/addresses.json +++ b/typescript/infra/config/environments/test/middleware/accounts/addresses.json @@ -10,14 +10,5 @@ }, "bsctestnet": { "router": "0xc011170d9795a7a2d065E384EAd1CA3394A7d35E" - }, - "goerli": { - "router": "0xc011170d9795a7a2d065E384EAd1CA3394A7d35E" - }, - "optimismgoerli": { - "router": "0xc011170d9795a7a2d065E384EAd1CA3394A7d35E" - }, - "arbitrumgoerli": { - "router": "0xc011170d9795a7a2d065E384EAd1CA3394A7d35E" } } diff --git a/typescript/infra/config/environments/test/middleware/liquidity-layer/addresses.json b/typescript/infra/config/environments/test/middleware/liquidity-layer/addresses.json index 8fe20c0ff..038c6d75d 100644 --- a/typescript/infra/config/environments/test/middleware/liquidity-layer/addresses.json +++ b/typescript/infra/config/environments/test/middleware/liquidity-layer/addresses.json @@ -4,11 +4,6 @@ "portalAdapter": "0xe589a05be1304b43A6FEb9c5D6a6EEEA35656271", "router": "0x3428e12EfDb2446c1E7feC3f1CED099A8a7cD541" }, - "goerli": { - "circleBridgeAdapter": "0x17EB33454AAEF8E91510540a0ebF4a8213dd740D", - "portalAdapter": "0xe589a05be1304b43A6FEb9c5D6a6EEEA35656271", - "router": "0x3428e12EfDb2446c1E7feC3f1CED099A8a7cD541" - }, "mumbai": { "portalAdapter": "0xe589a05be1304b43A6FEb9c5D6a6EEEA35656271", "router": "0x3428e12EfDb2446c1E7feC3f1CED099A8a7cD541" diff --git a/typescript/infra/config/environments/test/middleware/liquidity-layer/verification.json b/typescript/infra/config/environments/test/middleware/liquidity-layer/verification.json index 20d474c4a..2a43d68ca 100644 --- a/typescript/infra/config/environments/test/middleware/liquidity-layer/verification.json +++ b/typescript/infra/config/environments/test/middleware/liquidity-layer/verification.json @@ -31,38 +31,6 @@ "constructorArguments": "" } ], - "goerli": [ - { - "name": "LiquidityLayerRouter", - "address": "0x3428e12EfDb2446c1E7feC3f1CED099A8a7cD541", - "isProxy": false, - "constructorArguments": "" - }, - { - "name": "CircleBridgeAdapter", - "address": "0xb54AD7AE42B7c505100594365CdBC4b28Ef51FE6", - "isProxy": false, - "constructorArguments": "" - }, - { - "name": "PortalAdapter", - "address": "0xe589a05be1304b43A6FEb9c5D6a6EEEA35656271", - "isProxy": false, - "constructorArguments": "" - }, - { - "name": "CircleBridgeAdapter", - "address": "0x54FCA26E5FF828847D8caF471e44cD5727C73B0d", - "isProxy": false, - "constructorArguments": "" - }, - { - "name": "CircleBridgeAdapter", - "address": "0x17EB33454AAEF8E91510540a0ebF4a8213dd740D", - "isProxy": false, - "constructorArguments": "" - } - ], "mumbai": [ { "name": "LiquidityLayerRouter", diff --git a/typescript/infra/config/environments/test/middleware/queries/addresses.json b/typescript/infra/config/environments/test/middleware/queries/addresses.json index e14048a62..9cb16369a 100644 --- a/typescript/infra/config/environments/test/middleware/queries/addresses.json +++ b/typescript/infra/config/environments/test/middleware/queries/addresses.json @@ -10,14 +10,5 @@ }, "bsctestnet": { "router": "0x6141e7E7fA2c1beB8be030B0a7DB4b8A10c7c3cd" - }, - "goerli": { - "router": "0x6141e7E7fA2c1beB8be030B0a7DB4b8A10c7c3cd" - }, - "optimismgoerli": { - "router": "0x6141e7E7fA2c1beB8be030B0a7DB4b8A10c7c3cd" - }, - "arbitrumgoerli": { - "router": "0x6141e7E7fA2c1beB8be030B0a7DB4b8A10c7c3cd" } } diff --git a/typescript/infra/config/environments/testnet4/agent.ts b/typescript/infra/config/environments/testnet4/agent.ts index 0d76116c9..cd4529fb1 100644 --- a/typescript/infra/config/environments/testnet4/agent.ts +++ b/typescript/infra/config/environments/testnet4/agent.ts @@ -2,8 +2,6 @@ import { Chains, GasPaymentEnforcementPolicyType, RpcConsensusType, - chainMetadata, - getDomainId, } from '@hyperlane-xyz/sdk'; import { @@ -35,46 +33,34 @@ const repo = 'gcr.io/abacus-labs-dev/hyperlane-agent'; export const hyperlaneContextAgentChainConfig: AgentChainConfig = { [Role.Validator]: { [Chains.alfajores]: true, - [Chains.arbitrumgoerli]: true, [Chains.bsctestnet]: true, [Chains.eclipsetestnet]: true, [Chains.fuji]: true, - [Chains.goerli]: true, [Chains.mumbai]: true, - [Chains.optimismgoerli]: true, [Chains.plumetestnet]: true, - [Chains.polygonzkevmtestnet]: true, [Chains.scrollsepolia]: true, [Chains.sepolia]: true, [Chains.solanatestnet]: true, }, [Role.Relayer]: { [Chains.alfajores]: true, - [Chains.arbitrumgoerli]: true, [Chains.bsctestnet]: true, [Chains.eclipsetestnet]: true, [Chains.fuji]: true, - [Chains.goerli]: true, [Chains.mumbai]: true, - [Chains.optimismgoerli]: true, [Chains.plumetestnet]: true, - [Chains.polygonzkevmtestnet]: true, [Chains.scrollsepolia]: true, [Chains.sepolia]: true, [Chains.solanatestnet]: true, }, [Role.Scraper]: { [Chains.alfajores]: true, - [Chains.arbitrumgoerli]: true, [Chains.bsctestnet]: true, // Cannot scrape non-EVM chains [Chains.eclipsetestnet]: false, [Chains.fuji]: true, - [Chains.goerli]: true, [Chains.mumbai]: true, - [Chains.optimismgoerli]: true, [Chains.plumetestnet]: true, - [Chains.polygonzkevmtestnet]: true, [Chains.scrollsepolia]: true, [Chains.sepolia]: true, // Cannot scrape non-EVM chains @@ -112,7 +98,7 @@ const hyperlane: RootAgentConfig = { rpcConsensusType: RpcConsensusType.Fallback, docker: { repo, - tag: '9736164-20240307-131918', + tag: '7d1f975-20240312-113101', }, blacklist: [ ...releaseCandidateHelloworldMatchingList, @@ -122,24 +108,6 @@ const hyperlane: RootAgentConfig = { // gas, we blacklist the old TestRecipient address. recipientAddress: '0xBC3cFeca7Df5A45d61BC60E7898E63670e1654aE', }, - // OptimismGoerli griefers: - { - destinationDomain: getDomainId(chainMetadata.optimismgoerli), - recipientAddress: [ - '0xed4de02c6f4cb1161bdfefdb2fcdeef4546fa36c', - '0x723192fc414fe536b414117a4b2c5a7b71f912e3', - '0x5a48723d80a7ee3be6855ca293059b5287ee6689', - ], - }, - // Goerli griefers: - { - destinationDomain: getDomainId(chainMetadata.goerli), - recipientAddress: [ - '0x0461c69ff7f29cfb5efd36b9d377fdfc95418c2b', - '0xe747c82ed8560ba137b24a3a97ff7504b50c3e91', - '0x6ad92511ee4a3835bde9b1bfd7063023b56a8c56', - ], - }, ], gasPaymentEnforcement, metricAppContexts: [ @@ -159,7 +127,7 @@ const hyperlane: RootAgentConfig = { rpcConsensusType: RpcConsensusType.Fallback, docker: { repo, - tag: '9736164-20240307-131918', + tag: '7d1f975-20240312-113101', }, chains: validatorChainConfig(Contexts.Hyperlane), }, @@ -167,7 +135,7 @@ const hyperlane: RootAgentConfig = { rpcConsensusType: RpcConsensusType.Fallback, docker: { repo, - tag: 'dd8ac43-20240306-113016', + tag: '7d1f975-20240312-113101', }, }, }; @@ -181,20 +149,17 @@ const releaseCandidate: RootAgentConfig = { rpcConsensusType: RpcConsensusType.Fallback, docker: { repo, - tag: '9736164-20240307-131918', + tag: '7d1f975-20240312-113101', }, whitelist: [...releaseCandidateHelloworldMatchingList], gasPaymentEnforcement, transactionGasLimit: 750000, - // Skipping arbitrum because the gas price estimates are inclusive of L1 - // fees which leads to wildly off predictions. - skipTransactionGasLimitFor: [chainMetadata.arbitrumgoerli.name], }, validators: { rpcConsensusType: RpcConsensusType.Fallback, docker: { repo, - tag: '9736164-20240307-131918', + tag: '7d1f975-20240312-113101', }, chains: validatorChainConfig(Contexts.ReleaseCandidate), }, diff --git a/typescript/infra/config/environments/testnet4/chains.ts b/typescript/infra/config/environments/testnet4/chains.ts index 502a667f9..d4d7d4672 100644 --- a/typescript/infra/config/environments/testnet4/chains.ts +++ b/typescript/infra/config/environments/testnet4/chains.ts @@ -9,15 +9,11 @@ import { // These chains may be any protocol type. export const supportedChainNames = [ Chains.alfajores, - Chains.arbitrumgoerli, Chains.bsctestnet, Chains.eclipsetestnet, Chains.fuji, - Chains.goerli, Chains.mumbai, - Chains.optimismgoerli, Chains.plumetestnet, - Chains.polygonzkevmtestnet, Chains.scrollsepolia, Chains.sepolia, Chains.solanatestnet, diff --git a/typescript/infra/config/environments/testnet4/core/verification.json b/typescript/infra/config/environments/testnet4/core/verification.json index cf8e5b5d7..b5a1e1101 100644 --- a/typescript/infra/config/environments/testnet4/core/verification.json +++ b/typescript/infra/config/environments/testnet4/core/verification.json @@ -1363,110 +1363,6 @@ "name": "FallbackRoutingHook" } ], - "arbitrumgoerli": [ - { - "address": "0x00DFB81Bfc45fa03060b605273147F274ea807E5", - "constructorArguments": "0x", - "isProxy": false, - "name": "ProxyAdmin" - }, - { - "address": "0x13dABc0351407d5aAa0A50003a166A73b4febfDc", - "constructorArguments": "0x000000000000000000000000385c7f179168f5da92c72e17ae8ef50f3874077f00000000000000000000000000dfb81bfc45fa03060b605273147f274ea807e500000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000", - "isProxy": true, - "name": "TransparentUpgradeableProxy" - }, - { - "address": "0x385C7f179168f5Da92c72E17AE8EF50F3874077f", - "constructorArguments": "0x0000000000000000000000000000000000000000000000000000000000066eed", - "isProxy": false, - "name": "Mailbox" - }, - { - "address": "0xf0A38e1eEA49dAc7968F470c3aA0BDE2565A5d80", - "constructorArguments": "0x00000000000000000000000013dabc0351407d5aaa0a50003a166a73b4febfdc", - "isProxy": false, - "name": "MerkleTreeHook" - }, - { - "address": "0x00DFB81Bfc45fa03060b605273147F274ea807E5", - "constructorArguments": "0x", - "isProxy": false, - "name": "ProxyAdmin" - }, - { - "address": "0xFc8229ADB46D96056A6e451Fb3c55d60FFeD056f", - "constructorArguments": "0x", - "isProxy": false, - "name": "StorageGasOracle" - }, - { - "address": "0x76189acFA212298d7022624a4633411eE0d2f26F", - "constructorArguments": "0x000000000000000000000000b241991527f1c21ade14f55589e5940ac4852fa000000000000000000000000000dfb81bfc45fa03060b605273147f274ea807e500000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000044485cc955000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c00000000000000000000000000000000000000000000000000000000", - "isProxy": true, - "name": "TransparentUpgradeableProxy" - }, - { - "address": "0xb241991527F1C21adE14F55589E5940aC4852Fa0", - "constructorArguments": "0x", - "isProxy": false, - "name": "InterchainGasPaymaster" - }, - { - "address": "0xf0A38e1eEA49dAc7968F470c3aA0BDE2565A5d80", - "constructorArguments": "0x00000000000000000000000013dabc0351407d5aaa0a50003a166a73b4febfdc", - "isProxy": false, - "name": "MerkleTreeHook" - }, - { - "address": "0x00DFB81Bfc45fa03060b605273147F274ea807E5", - "constructorArguments": "0x", - "isProxy": false, - "name": "ProxyAdmin" - }, - { - "address": "0xFc8229ADB46D96056A6e451Fb3c55d60FFeD056f", - "constructorArguments": "0x", - "isProxy": false, - "name": "StorageGasOracle" - }, - { - "address": "0x76189acFA212298d7022624a4633411eE0d2f26F", - "constructorArguments": "0x000000000000000000000000b241991527f1c21ade14f55589e5940ac4852fa000000000000000000000000000dfb81bfc45fa03060b605273147f274ea807e500000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000044485cc955000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c00000000000000000000000000000000000000000000000000000000", - "isProxy": true, - "name": "TransparentUpgradeableProxy" - }, - { - "address": "0xb241991527F1C21adE14F55589E5940aC4852Fa0", - "constructorArguments": "0x", - "isProxy": false, - "name": "InterchainGasPaymaster" - }, - { - "address": "0x0358ba0D90ED2d90fB8cBb610F27C274D8077a0B", - "constructorArguments": "0x000000000000000000000000000000000000000000000000000000003b9aca000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c", - "isProxy": false, - "name": "ProtocolFee" - }, - { - "address": "0x4a01EEBa1CC20F47A2e60aE4ec932051601FcB9e", - "constructorArguments": "0x00000000000000000000000013dabc0351407d5aaa0a50003a166a73b4febfdc", - "isProxy": false, - "name": "ValidatorAnnounce" - }, - { - "address": "0x3Ce607F6FcE5Dfb9821f33504d86E04A4CD0C75f", - "constructorArguments": "00000000000000000000000013dabc0351407d5aaa0a50003a166a73b4febfdc000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c000000000000000000000000f0a38e1eea49dac7968f470c3aa0bde2565a5d80", - "isProxy": false, - "name": "FallbackRoutingHook" - }, - { - "address": "0x3Ce607F6FcE5Dfb9821f33504d86E04A4CD0C75f", - "constructorArguments": "00000000000000000000000013dabc0351407d5aaa0a50003a166a73b4febfdc000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c000000000000000000000000f0a38e1eea49dac7968f470c3aa0bde2565a5d80", - "isProxy": false, - "name": "FallbackRoutingHook" - } - ], "bsctestnet": [ { "address": "0xb12282d2E838Aa5f2A4F9Ee5f624a77b7199A078", @@ -1927,170 +1823,6 @@ "name": "FallbackRoutingHook" } ], - "goerli": [ - { - "address": "0x0EdB3604D230963ecE9d83963164CFe2fDef576B", - "constructorArguments": "0x", - "isProxy": false, - "name": "ProxyAdmin" - }, - { - "address": "0x49cfd6Ef774AcAb14814D699e3F7eE36Fdfba932", - "constructorArguments": "0x0000000000000000000000004a67be3a7db40a8ae110f85ab66b0203f9401a770000000000000000000000000edb3604d230963ece9d83963164cfe2fdef576b00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000", - "isProxy": true, - "name": "TransparentUpgradeableProxy" - }, - { - "address": "0x4a67bE3a7DB40a8Ae110F85ab66b0203f9401a77", - "constructorArguments": "0x0000000000000000000000000000000000000000000000000000000000000005", - "isProxy": false, - "name": "Mailbox" - }, - { - "address": "0x28c294C61D3dE053462d2Cfa5d5f8c8D70605A59", - "constructorArguments": "0x00000000000000000000000049cfd6ef774acab14814d699e3f7ee36fdfba932", - "isProxy": false, - "name": "MerkleTreeHook" - }, - { - "address": "0x0EdB3604D230963ecE9d83963164CFe2fDef576B", - "constructorArguments": "0x", - "isProxy": false, - "name": "ProxyAdmin" - }, - { - "address": "0xeC34c715ee6d050b2172E8aF650Db779561266C1", - "constructorArguments": "0x", - "isProxy": false, - "name": "StorageGasOracle" - }, - { - "address": "0x0cD26594ea6c6526927C0F5225AC09F6288e7140", - "constructorArguments": "0x000000000000000000000000ee99ea7cc4035e942917cd444e0a653a4b9d3e1a0000000000000000000000000edb3604d230963ece9d83963164cfe2fdef576b00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000044485cc955000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c00000000000000000000000000000000000000000000000000000000", - "isProxy": true, - "name": "TransparentUpgradeableProxy" - }, - { - "address": "0xee99eA7cC4035E942917cd444e0A653A4B9d3e1A", - "constructorArguments": "0x", - "isProxy": false, - "name": "InterchainGasPaymaster" - }, - { - "address": "0x28c294C61D3dE053462d2Cfa5d5f8c8D70605A59", - "constructorArguments": "0x00000000000000000000000049cfd6ef774acab14814d699e3f7ee36fdfba932", - "isProxy": false, - "name": "MerkleTreeHook" - }, - { - "address": "0x0EdB3604D230963ecE9d83963164CFe2fDef576B", - "constructorArguments": "0x", - "isProxy": false, - "name": "ProxyAdmin" - }, - { - "address": "0xeC34c715ee6d050b2172E8aF650Db779561266C1", - "constructorArguments": "0x", - "isProxy": false, - "name": "StorageGasOracle" - }, - { - "address": "0x0cD26594ea6c6526927C0F5225AC09F6288e7140", - "constructorArguments": "0x000000000000000000000000ee99ea7cc4035e942917cd444e0a653a4b9d3e1a0000000000000000000000000edb3604d230963ece9d83963164cfe2fdef576b00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000044485cc955000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c00000000000000000000000000000000000000000000000000000000", - "isProxy": true, - "name": "TransparentUpgradeableProxy" - }, - { - "address": "0xee99eA7cC4035E942917cd444e0A653A4B9d3e1A", - "constructorArguments": "0x", - "isProxy": false, - "name": "InterchainGasPaymaster" - }, - { - "address": "0x9293B8dAcA7933765de499C992B0Fa86Bb104b0f", - "constructorArguments": "0x000000000000000000000000000000000000000000000000000000003b9aca000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c", - "isProxy": false, - "name": "ProtocolFee" - }, - { - "address": "0x3c182AD9cA8A71bc107Ef440C2667E8360e1158E", - "constructorArguments": "0x00000000000000000000000049cfd6ef774acab14814d699e3f7ee36fdfba932", - "isProxy": false, - "name": "ValidatorAnnounce" - }, - { - "address": "0x66F356393a9d66C7757dE475d02969783796d54c", - "constructorArguments": "00000000000000000000000049cfd6ef774acab14814d699e3f7ee36fdfba932000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c00000000000000000000000028c294c61d3de053462d2cfa5d5f8c8d70605a59", - "isProxy": false, - "name": "FallbackRoutingHook" - }, - { - "address": "0x7523AE9fAebf49749a0E7148403c8d26C23a53da", - "constructorArguments": "00000000000000000000000049cfd6ef774acab14814d699e3f7ee36fdfba9320000000000000000000000000000000000000000000000000000000000014a330000000000000000000000001681cc382e08a72d4b64a123080896e30f96b7400000000000000000000000008e5693140ea606bceb98761d9beb1bc87383706d", - "isProxy": false, - "name": "OpStackHook" - }, - { - "address": "0x66F356393a9d66C7757dE475d02969783796d54c", - "constructorArguments": "00000000000000000000000049cfd6ef774acab14814d699e3f7ee36fdfba932000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c00000000000000000000000028c294c61d3de053462d2cfa5d5f8c8d70605a59", - "isProxy": false, - "name": "FallbackRoutingHook" - }, - { - "address": "0x7523AE9fAebf49749a0E7148403c8d26C23a53da", - "constructorArguments": "00000000000000000000000049cfd6ef774acab14814d699e3f7ee36fdfba9320000000000000000000000000000000000000000000000000000000000014a330000000000000000000000001681cc382e08a72d4b64a123080896e30f96b7400000000000000000000000008e5693140ea606bceb98761d9beb1bc87383706d", - "isProxy": false, - "name": "OpStackHook" - }, - { - "address": "0x108FD05a2c0Ba834506167ef8f9FD715B3319d8F", - "constructorArguments": "00000000000000000000000049cfd6ef774acab14814d699e3f7ee36fdfba9320000000000000000000000000000000000000000000000000000000000014a330000000000000000000000003212977fbe6464c2bb60fdb85ab0a5e06e25cdfb0000000000000000000000008e5693140ea606bceb98761d9beb1bc87383706d", - "isProxy": false, - "name": "OpStackHook" - }, - { - "address": "0x108FD05a2c0Ba834506167ef8f9FD715B3319d8F", - "constructorArguments": "00000000000000000000000049cfd6ef774acab14814d699e3f7ee36fdfba9320000000000000000000000000000000000000000000000000000000000014a330000000000000000000000003212977fbe6464c2bb60fdb85ab0a5e06e25cdfb0000000000000000000000008e5693140ea606bceb98761d9beb1bc87383706d", - "isProxy": false, - "name": "OpStackHook" - }, - { - "address": "0x8BAB125B823ee5E55797394c03B15874bF176A53", - "constructorArguments": "00000000000000000000000049cfd6ef774acab14814d699e3f7ee36fdfba932000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c00000000000000000000000028c294c61d3de053462d2cfa5d5f8c8d70605a59", - "isProxy": false, - "name": "FallbackRoutingHook" - }, - { - "address": "0x8BAB125B823ee5E55797394c03B15874bF176A53", - "constructorArguments": "00000000000000000000000049cfd6ef774acab14814d699e3f7ee36fdfba932000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c00000000000000000000000028c294c61d3de053462d2cfa5d5f8c8d70605a59", - "isProxy": false, - "name": "FallbackRoutingHook" - }, - { - "address": "0xDd66CB60D4Ffb7f0d8FB91CB1D20aBcaBC82900a", - "constructorArguments": "00000000000000000000000049cfd6ef774acab14814d699e3f7ee36fdfba932000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c00000000000000000000000028c294c61d3de053462d2cfa5d5f8c8d70605a59", - "isProxy": false, - "name": "FallbackRoutingHook" - }, - { - "address": "0xce59701919507F2d379270657A4e410F570aBe0D", - "constructorArguments": "00000000000000000000000049cfd6ef774acab14814d699e3f7ee36fdfba9320000000000000000000000000000000000000000000000000000000000014a33000000000000000000000000e0c5bdafee7f7065402337040e426a42b5c336500000000000000000000000008e5693140ea606bceb98761d9beb1bc87383706d", - "isProxy": false, - "name": "OpStackHook" - }, - { - "address": "0xDd66CB60D4Ffb7f0d8FB91CB1D20aBcaBC82900a", - "constructorArguments": "00000000000000000000000049cfd6ef774acab14814d699e3f7ee36fdfba932000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c00000000000000000000000028c294c61d3de053462d2cfa5d5f8c8d70605a59", - "isProxy": false, - "name": "FallbackRoutingHook" - }, - { - "address": "0xce59701919507F2d379270657A4e410F570aBe0D", - "constructorArguments": "00000000000000000000000049cfd6ef774acab14814d699e3f7ee36fdfba9320000000000000000000000000000000000000000000000000000000000014a33000000000000000000000000e0c5bdafee7f7065402337040e426a42b5c336500000000000000000000000008e5693140ea606bceb98761d9beb1bc87383706d", - "isProxy": false, - "name": "OpStackHook" - } - ], "moonbasealpha": [ { "address": "0xb241991527F1C21adE14F55589E5940aC4852Fa0", @@ -2299,110 +2031,6 @@ "name": "FallbackRoutingHook" } ], - "optimismgoerli": [ - { - "address": "0x800b4be4Dc91E56DE934D9f16888d113eFf89Ebb", - "constructorArguments": "0x", - "isProxy": false, - "name": "ProxyAdmin" - }, - { - "address": "0xB5f021728Ea6223E3948Db2da61d612307945eA2", - "constructorArguments": "0x000000000000000000000000a04b18c7e45f41cb28590d37784017ea1bbce052000000000000000000000000800b4be4dc91e56de934d9f16888d113eff89ebb00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000", - "isProxy": true, - "name": "TransparentUpgradeableProxy" - }, - { - "address": "0xA04b18c7E45F41CB28590D37784017Ea1bbCe052", - "constructorArguments": "0x00000000000000000000000000000000000000000000000000000000000001a4", - "isProxy": false, - "name": "Mailbox" - }, - { - "address": "0xFEe074B31B5B259eB3109737bE13D39B853b47b9", - "constructorArguments": "0x000000000000000000000000b5f021728ea6223e3948db2da61d612307945ea2", - "isProxy": false, - "name": "MerkleTreeHook" - }, - { - "address": "0x800b4be4Dc91E56DE934D9f16888d113eFf89Ebb", - "constructorArguments": "0x", - "isProxy": false, - "name": "ProxyAdmin" - }, - { - "address": "0x4927C33299091033D935C15DE6b6073164e99BE0", - "constructorArguments": "0x", - "isProxy": false, - "name": "StorageGasOracle" - }, - { - "address": "0x02A7661273528EfF3d78CBE7CbD1a717b28B89fC", - "constructorArguments": "0x00000000000000000000000003c39954c2dc91d32f68461300391e8605e83176000000000000000000000000800b4be4dc91e56de934d9f16888d113eff89ebb00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000044485cc955000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c00000000000000000000000000000000000000000000000000000000", - "isProxy": true, - "name": "TransparentUpgradeableProxy" - }, - { - "address": "0x03C39954C2DC91d32f68461300391E8605e83176", - "constructorArguments": "0x", - "isProxy": false, - "name": "InterchainGasPaymaster" - }, - { - "address": "0xFEe074B31B5B259eB3109737bE13D39B853b47b9", - "constructorArguments": "0x000000000000000000000000b5f021728ea6223e3948db2da61d612307945ea2", - "isProxy": false, - "name": "MerkleTreeHook" - }, - { - "address": "0x800b4be4Dc91E56DE934D9f16888d113eFf89Ebb", - "constructorArguments": "0x", - "isProxy": false, - "name": "ProxyAdmin" - }, - { - "address": "0x4927C33299091033D935C15DE6b6073164e99BE0", - "constructorArguments": "0x", - "isProxy": false, - "name": "StorageGasOracle" - }, - { - "address": "0x02A7661273528EfF3d78CBE7CbD1a717b28B89fC", - "constructorArguments": "0x00000000000000000000000003c39954c2dc91d32f68461300391e8605e83176000000000000000000000000800b4be4dc91e56de934d9f16888d113eff89ebb00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000044485cc955000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c00000000000000000000000000000000000000000000000000000000", - "isProxy": true, - "name": "TransparentUpgradeableProxy" - }, - { - "address": "0x03C39954C2DC91d32f68461300391E8605e83176", - "constructorArguments": "0x", - "isProxy": false, - "name": "InterchainGasPaymaster" - }, - { - "address": "0x962e30F6A3ECDA85c7fa1FcF38cD04efA991Ee20", - "constructorArguments": "0x000000000000000000000000000000000000000000000000000000003b9aca000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c", - "isProxy": false, - "name": "ProtocolFee" - }, - { - "address": "0x24D31e12E4d3bc2C46C994FcE0c828b218A1aeAb", - "constructorArguments": "0x000000000000000000000000b5f021728ea6223e3948db2da61d612307945ea2", - "isProxy": false, - "name": "ValidatorAnnounce" - }, - { - "address": "0xba962f31B8DE02238fDdf8CE6a21260Af8C5Dd2F", - "constructorArguments": "000000000000000000000000b5f021728ea6223e3948db2da61d612307945ea2000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c000000000000000000000000fee074b31b5b259eb3109737be13d39b853b47b9", - "isProxy": false, - "name": "FallbackRoutingHook" - }, - { - "address": "0xba962f31B8DE02238fDdf8CE6a21260Af8C5Dd2F", - "constructorArguments": "000000000000000000000000b5f021728ea6223e3948db2da61d612307945ea2000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c000000000000000000000000fee074b31b5b259eb3109737be13d39b853b47b9", - "isProxy": false, - "name": "FallbackRoutingHook" - } - ], "plumetestnet": [ { "address": "0x589C201a07c26b4725A4A829d772f24423da480B", @@ -2903,110 +2531,6 @@ "name": "ValidatorAnnounce" } ], - "polygonzkevmtestnet": [ - { - "address": "0x666a24F62f7A97BA33c151776Eb3D9441a059eB8", - "constructorArguments": "0x", - "isProxy": false, - "name": "ProxyAdmin" - }, - { - "address": "0x598facE78a4302f11E3de0bee1894Da0b2Cb71F8", - "constructorArguments": "0x000000000000000000000000ef48bd850e5827b96b55c4d28fb32bbaa73616f2000000000000000000000000666a24f62f7a97ba33c151776eb3d9441a059eb800000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000", - "isProxy": true, - "name": "TransparentUpgradeableProxy" - }, - { - "address": "0xef48bd850E5827B96B55C4D28FB32Bbaa73616F2", - "constructorArguments": "0x00000000000000000000000000000000000000000000000000000000000005a2", - "isProxy": false, - "name": "Mailbox" - }, - { - "address": "0x68311418D79fE8d96599384ED767d225635d88a8", - "constructorArguments": "0x000000000000000000000000598face78a4302f11e3de0bee1894da0b2cb71f8", - "isProxy": false, - "name": "MerkleTreeHook" - }, - { - "address": "0x666a24F62f7A97BA33c151776Eb3D9441a059eB8", - "constructorArguments": "0x", - "isProxy": false, - "name": "ProxyAdmin" - }, - { - "address": "0x3707bc8C7342aA6f693bCe1Bd7671Fca146F7F0A", - "constructorArguments": "0x", - "isProxy": false, - "name": "StorageGasOracle" - }, - { - "address": "0xAD34A66Bf6dB18E858F6B686557075568c6E031C", - "constructorArguments": "0x000000000000000000000000863e8c26621c52aca1849c53500606e73ba272f0000000000000000000000000666a24f62f7a97ba33c151776eb3d9441a059eb800000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000044485cc955000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c00000000000000000000000000000000000000000000000000000000", - "isProxy": true, - "name": "TransparentUpgradeableProxy" - }, - { - "address": "0x863E8c26621c52ACa1849C53500606e73BA272F0", - "constructorArguments": "0x", - "isProxy": false, - "name": "InterchainGasPaymaster" - }, - { - "address": "0x68311418D79fE8d96599384ED767d225635d88a8", - "constructorArguments": "0x000000000000000000000000598face78a4302f11e3de0bee1894da0b2cb71f8", - "isProxy": false, - "name": "MerkleTreeHook" - }, - { - "address": "0x666a24F62f7A97BA33c151776Eb3D9441a059eB8", - "constructorArguments": "0x", - "isProxy": false, - "name": "ProxyAdmin" - }, - { - "address": "0x3707bc8C7342aA6f693bCe1Bd7671Fca146F7F0A", - "constructorArguments": "0x", - "isProxy": false, - "name": "StorageGasOracle" - }, - { - "address": "0xAD34A66Bf6dB18E858F6B686557075568c6E031C", - "constructorArguments": "0x000000000000000000000000863e8c26621c52aca1849c53500606e73ba272f0000000000000000000000000666a24f62f7a97ba33c151776eb3d9441a059eb800000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000044485cc955000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c00000000000000000000000000000000000000000000000000000000", - "isProxy": true, - "name": "TransparentUpgradeableProxy" - }, - { - "address": "0x863E8c26621c52ACa1849C53500606e73BA272F0", - "constructorArguments": "0x", - "isProxy": false, - "name": "InterchainGasPaymaster" - }, - { - "address": "0xddf4C3e791caCaFd26D7fb275549739B38ae6e75", - "constructorArguments": "0x000000000000000000000000000000000000000000000000000000003b9aca000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c", - "isProxy": false, - "name": "ProtocolFee" - }, - { - "address": "0x7914A3349107A7295Bbf2374db5A973d73D1b324", - "constructorArguments": "0x000000000000000000000000598face78a4302f11e3de0bee1894da0b2cb71f8", - "isProxy": false, - "name": "ValidatorAnnounce" - }, - { - "address": "0xB057Fb841027a8554521DcCdeC3c3474CaC99AB5", - "constructorArguments": "000000000000000000000000598face78a4302f11e3de0bee1894da0b2cb71f8000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c00000000000000000000000068311418d79fe8d96599384ed767d225635d88a8", - "isProxy": false, - "name": "FallbackRoutingHook" - }, - { - "address": "0xB057Fb841027a8554521DcCdeC3c3474CaC99AB5", - "constructorArguments": "000000000000000000000000598face78a4302f11e3de0bee1894da0b2cb71f8000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c00000000000000000000000068311418d79fe8d96599384ed767d225635d88a8", - "isProxy": false, - "name": "FallbackRoutingHook" - } - ], "scrollsepolia": [ { "address": "0x598facE78a4302f11E3de0bee1894Da0b2Cb71F8", diff --git a/typescript/infra/config/environments/testnet4/create2/addresses.json b/typescript/infra/config/environments/testnet4/create2/addresses.json index 65fb9e104..740ba7abf 100644 --- a/typescript/infra/config/environments/testnet4/create2/addresses.json +++ b/typescript/infra/config/environments/testnet4/create2/addresses.json @@ -11,15 +11,6 @@ "bsctestnet": { "Create2Factory": "0xc97D8e6f57b0d64971453dDc6EB8483fec9d163a" }, - "goerli": { - "Create2Factory": "0xc97D8e6f57b0d64971453dDc6EB8483fec9d163a" - }, - "optimismgoerli": { - "Create2Factory": "0xc97D8e6f57b0d64971453dDc6EB8483fec9d163a" - }, - "arbitrumgoerli": { - "Create2Factory": "0xc97D8e6f57b0d64971453dDc6EB8483fec9d163a" - }, "sepolia": { "Create2Factory": "0xc97D8e6f57b0d64971453dDc6EB8483fec9d163a" } diff --git a/typescript/infra/config/environments/testnet4/create2/verification.json b/typescript/infra/config/environments/testnet4/create2/verification.json index 53f6de713..acd051fa9 100644 --- a/typescript/infra/config/environments/testnet4/create2/verification.json +++ b/typescript/infra/config/environments/testnet4/create2/verification.json @@ -55,14 +55,6 @@ "isProxy": false } ], - "goerli": [ - { - "name": "Create2Factory", - "address": "0xc97D8e6f57b0d64971453dDc6EB8483fec9d163a", - "constructorArguments": "", - "isProxy": false - } - ], "moonbasealpha": [ { "name": "Create2Factory", @@ -71,22 +63,6 @@ "isProxy": false } ], - "optimismgoerli": [ - { - "name": "Create2Factory", - "address": "0xc97D8e6f57b0d64971453dDc6EB8483fec9d163a", - "constructorArguments": "", - "isProxy": false - } - ], - "arbitrumgoerli": [ - { - "name": "Create2Factory", - "address": "0xc97D8e6f57b0d64971453dDc6EB8483fec9d163a", - "constructorArguments": "", - "isProxy": false - } - ], "sepolia": [ { "name": "Create2Factory", diff --git a/typescript/infra/config/environments/testnet4/funding.ts b/typescript/infra/config/environments/testnet4/funding.ts index 1e5ce5300..69948bbc3 100644 --- a/typescript/infra/config/environments/testnet4/funding.ts +++ b/typescript/infra/config/environments/testnet4/funding.ts @@ -9,7 +9,7 @@ import { environment } from './chains'; export const keyFunderConfig: KeyFunderConfig = { docker: { repo: 'gcr.io/abacus-labs-dev/hyperlane-monorepo', - tag: 'c037206-20240220-152500', + tag: '7d1f975-20240312-113049', }, // We're currently using the same deployer key as testnet2. // To minimize nonce clobbering we offset the key funder cron @@ -29,14 +29,10 @@ export const keyFunderConfig: KeyFunderConfig = { alfajores: '5', bsctestnet: '5', fuji: '5', - goerli: '0.5', mumbai: '5', plumetestnet: '0.2', sepolia: '5', // Funder boosts itself upto 5x balance on L2 before dispersing funds - arbitrumgoerli: '0.5', - optimismgoerli: '0.5', - polygonzkevmtestnet: '1', scrollsepolia: '1', }, desiredKathyBalancePerChain: { diff --git a/typescript/infra/config/environments/testnet4/gas-oracle.ts b/typescript/infra/config/environments/testnet4/gas-oracle.ts index 805a6799a..5dfe45fcb 100644 --- a/typescript/infra/config/environments/testnet4/gas-oracle.ts +++ b/typescript/infra/config/environments/testnet4/gas-oracle.ts @@ -19,13 +19,8 @@ const gasPrices: ChainMap = { fuji: ethers.utils.parseUnits('30', 'gwei'), mumbai: ethers.utils.parseUnits('45', 'gwei'), bsctestnet: ethers.utils.parseUnits('15', 'gwei'), - goerli: ethers.utils.parseUnits('5', 'gwei'), sepolia: ethers.utils.parseUnits('5', 'gwei'), - optimismgoerli: ethers.utils.parseUnits('0.5', 'gwei'), - arbitrumgoerli: ethers.utils.parseUnits('0.5', 'gwei'), scrollsepolia: ethers.utils.parseUnits('0.5', 'gwei'), - lineagoerli: ethers.utils.parseUnits('1', 'gwei'), - polygonzkevmtestnet: ethers.utils.parseUnits('1', 'gwei'), chiado: ethers.utils.parseUnits('2', 'gwei'), solanatestnet: ethers.BigNumber.from('28'), eclipsetestnet: ethers.BigNumber.from('28'), @@ -53,13 +48,8 @@ const chainTokenRarity: ChainMap = { fuji: Rarity.Rare, mumbai: Rarity.Rare, bsctestnet: Rarity.Rare, - goerli: Rarity.Mythic, sepolia: Rarity.Mythic, - optimismgoerli: Rarity.Mythic, - arbitrumgoerli: Rarity.Mythic, scrollsepolia: Rarity.Rare, - lineagoerli: Rarity.Rare, - polygonzkevmtestnet: Rarity.Common, chiado: Rarity.Common, solanatestnet: Rarity.Common, eclipsetestnet: Rarity.Common, diff --git a/typescript/infra/config/environments/testnet4/helloworld.ts b/typescript/infra/config/environments/testnet4/helloworld.ts index 079d96d4d..08f637ec7 100644 --- a/typescript/infra/config/environments/testnet4/helloworld.ts +++ b/typescript/infra/config/environments/testnet4/helloworld.ts @@ -1,4 +1,4 @@ -import { Chains, RpcConsensusType } from '@hyperlane-xyz/sdk'; +import { RpcConsensusType } from '@hyperlane-xyz/sdk'; import { HelloWorldConfig } from '../../../src/config'; import { HelloWorldKathyRunMode } from '../../../src/config/helloworld/types'; @@ -13,7 +13,7 @@ export const hyperlaneHelloworld: HelloWorldConfig = { kathy: { docker: { repo: 'gcr.io/abacus-labs-dev/hyperlane-monorepo', - tag: '620925c-20240213-171901', + tag: '7d1f975-20240312-113049', }, chainsToSkip: [], runEnv: environment, @@ -33,7 +33,7 @@ export const releaseCandidateHelloworld: HelloWorldConfig = { kathy: { docker: { repo: 'gcr.io/abacus-labs-dev/hyperlane-monorepo', - tag: '620925c-20240213-171901', + tag: '7d1f975-20240312-113049', }, chainsToSkip: [], runEnv: environment, diff --git a/typescript/infra/config/environments/testnet4/helloworld/hyperlane/addresses.json b/typescript/infra/config/environments/testnet4/helloworld/hyperlane/addresses.json index e8a9ab59a..fc8b407c1 100644 --- a/typescript/infra/config/environments/testnet4/helloworld/hyperlane/addresses.json +++ b/typescript/infra/config/environments/testnet4/helloworld/hyperlane/addresses.json @@ -1,19 +1,10 @@ { - "arbitrumgoerli": { - "router": "0xFd1e3710347659703962934d2381970ae0022227" - }, - "optimismgoerli": { - "router": "0x372Cf98E673C235C1abD78DEAA61480e6fe55e46" - }, "scrollsepolia": { "router": "0x66b71A4e18FbE09a6977A6520B47fEDdffA82a1c" }, "alfajores": { "router": "0xD0Ef694E96Bb695DC829f71956227eD141e3089F" }, - "polygonzkevmtestnet": { - "router": "0x783c4a0bB6663359281aD4a637D5af68F83ae213" - }, "fuji": { "router": "0x0B1C1B54f45e02552331D3106e71f5e0b573D5D4" }, @@ -25,8 +16,5 @@ }, "bsctestnet": { "router": "0xEF6DE81100B9314B45A1bdfA5C9148aFC4DdbDeE" - }, - "goerli": { - "router": "0x31b6a75ef30C8612738CC55eA3CB2d5DD3694DC7" } } diff --git a/typescript/infra/config/environments/testnet4/helloworld/hyperlane/verification.json b/typescript/infra/config/environments/testnet4/helloworld/hyperlane/verification.json index 23f22a483..2f369a219 100644 --- a/typescript/infra/config/environments/testnet4/helloworld/hyperlane/verification.json +++ b/typescript/infra/config/environments/testnet4/helloworld/hyperlane/verification.json @@ -145,44 +145,6 @@ "isProxy": false } ], - "goerli": [ - { - "name": "HelloWorld", - "address": "0x0637A1360Ea44602DAe5c4ba515c2BCb6C762fbc", - "constructorArguments": "000000000000000000000000cc737a94fecaec165abcf12ded095bb13f037685000000000000000000000000f857706ce59cb7ae6df81bbd0b0a656db3e6beda", - "isProxy": false - }, - { - "name": "HelloWorld", - "address": "0x405BFdEcB33230b4Ad93C29ba4499b776CfBa189", - "constructorArguments": "000000000000000000000000cc737a94fecaec165abcf12ded095bb13f037685000000000000000000000000f90cb82a76492614d07b82a7658917f3ac811ac1", - "isProxy": false - }, - { - "name": "HelloWorld", - "address": "0xBF5b89eBdF86560F872603e2063f17b78dFbae02", - "constructorArguments": "000000000000000000000000c4796aabce2a9d774ce4603f5db5fb1605791dbd0000000000000000000000000cd26594ea6c6526927c0f5225ac09f6288e7140", - "isProxy": false - }, - { - "name": "HelloWorld", - "address": "0xA5F234545270cea8f31A8760b8b7ABcaA3654951", - "constructorArguments": "000000000000000000000000c4796aabce2a9d774ce4603f5db5fb1605791dbd0000000000000000000000000cd26594ea6c6526927c0f5225ac09f6288e7140", - "isProxy": false - }, - { - "name": "HelloWorld", - "address": "0x33AA9cFBC7E222B3eC231EcAa58dd846cC393C28", - "constructorArguments": "000000000000000000000000c4796aabce2a9d774ce4603f5db5fb1605791dbd0000000000000000000000000000000000000000000000000000000000000000", - "isProxy": false - }, - { - "name": "HelloWorld", - "address": "0x31b6a75ef30C8612738CC55eA3CB2d5DD3694DC7", - "constructorArguments": "00000000000000000000000049cfd6ef774acab14814d699e3f7ee36fdfba9320000000000000000000000000000000000000000000000000000000000000000", - "isProxy": false - } - ], "moonbasealpha": [ { "name": "HelloWorld", @@ -215,94 +177,6 @@ "isProxy": false } ], - "optimismgoerli": [ - { - "name": "HelloWorld", - "address": "0xa76A3E719E5ff7159a29B8876272052b89B3589F", - "constructorArguments": "000000000000000000000000cc737a94fecaec165abcf12ded095bb13f037685000000000000000000000000f857706ce59cb7ae6df81bbd0b0a656db3e6beda", - "isProxy": false - }, - { - "name": "HelloWorld", - "address": "0x3582d1238cBC812165981E4fFaB0E8D9a4518910", - "constructorArguments": "000000000000000000000000cc737a94fecaec165abcf12ded095bb13f037685000000000000000000000000f90cb82a76492614d07b82a7658917f3ac811ac1", - "isProxy": false - }, - { - "name": "HelloWorld", - "address": "0x050500E43Fa7F245f3012527DE29d22176c594c7", - "constructorArguments": "000000000000000000000000b5f021728ea6223e3948db2da61d612307945ea200000000000000000000000002a7661273528eff3d78cbe7cbd1a717b28b89fc", - "isProxy": false - }, - { - "name": "HelloWorld", - "address": "0x7Dc5cE596995af8e5D568563038109B9bCA7F7c6", - "constructorArguments": "000000000000000000000000b5f021728ea6223e3948db2da61d612307945ea200000000000000000000000002a7661273528eff3d78cbe7cbd1a717b28b89fc", - "isProxy": false - }, - { - "name": "HelloWorld", - "address": "0xe7B2e23A9A77556736DBB040A8a5159a80Db73D5", - "constructorArguments": "000000000000000000000000b5f021728ea6223e3948db2da61d612307945ea20000000000000000000000000000000000000000000000000000000000000000", - "isProxy": false - }, - { - "name": "HelloWorld", - "address": "0x138e726C327E9dd0779104B8d42331757CAeeB9F", - "constructorArguments": "000000000000000000000000b5f021728ea6223e3948db2da61d612307945ea20000000000000000000000000000000000000000000000000000000000000000", - "isProxy": false - }, - { - "name": "HelloWorld", - "address": "0x372Cf98E673C235C1abD78DEAA61480e6fe55e46", - "constructorArguments": "000000000000000000000000b5f021728ea6223e3948db2da61d612307945ea20000000000000000000000000000000000000000000000000000000000000000", - "isProxy": false - } - ], - "arbitrumgoerli": [ - { - "name": "HelloWorld", - "address": "0xa76A3E719E5ff7159a29B8876272052b89B3589F", - "constructorArguments": "000000000000000000000000cc737a94fecaec165abcf12ded095bb13f037685000000000000000000000000f857706ce59cb7ae6df81bbd0b0a656db3e6beda", - "isProxy": false - }, - { - "name": "HelloWorld", - "address": "0x339B46496D60b1b6B42e9715DeD8B3D2154dA0Bb", - "constructorArguments": "000000000000000000000000cc737a94fecaec165abcf12ded095bb13f037685000000000000000000000000f90cb82a76492614d07b82a7658917f3ac811ac1", - "isProxy": false - }, - { - "name": "HelloWorld", - "address": "0xB8D70C9352AA59f5EB138e045117841910c107a3", - "constructorArguments": "00000000000000000000000013dabc0351407d5aaa0a50003a166a73b4febfdc00000000000000000000000076189acfa212298d7022624a4633411ee0d2f26f", - "isProxy": false - }, - { - "name": "HelloWorld", - "address": "0xA3bAaC7d60d10abA54cC2Ffb4b63469810C5aDc0", - "constructorArguments": "00000000000000000000000013dabc0351407d5aaa0a50003a166a73b4febfdc00000000000000000000000076189acfa212298d7022624a4633411ee0d2f26f", - "isProxy": false - }, - { - "name": "HelloWorld", - "address": "0x9C63cE44d595cfd97215fcb97d58CFD07a9D6BD7", - "constructorArguments": "00000000000000000000000013dabc0351407d5aaa0a50003a166a73b4febfdc0000000000000000000000000000000000000000000000000000000000000000", - "isProxy": false - }, - { - "name": "HelloWorld", - "address": "0x22C7d91A4533536FE6006EFA46074E2Df8f82e82", - "constructorArguments": "00000000000000000000000013dabc0351407d5aaa0a50003a166a73b4febfdc0000000000000000000000000000000000000000000000000000000000000000", - "isProxy": false - }, - { - "name": "HelloWorld", - "address": "0xFd1e3710347659703962934d2381970ae0022227", - "constructorArguments": "00000000000000000000000013dabc0351407d5aaa0a50003a166a73b4febfdc0000000000000000000000000000000000000000000000000000000000000000", - "isProxy": false - } - ], "sepolia": [ { "name": "HelloWorld", @@ -372,43 +246,5 @@ "constructorArguments": "0000000000000000000000003c5154a193d6e2955650f9305c8d80c18c814a680000000000000000000000000000000000000000000000000000000000000000", "isProxy": false } - ], - "polygonzkevmtestnet": [ - { - "name": "HelloWorld", - "address": "0xD0680F80F4f947968206806C2598Cbc5b6FE5b03", - "constructorArguments": "000000000000000000000000598face78a4302f11e3de0bee1894da0b2cb71f8000000000000000000000000ad34a66bf6db18e858f6b686557075568c6e031c", - "isProxy": false - }, - { - "name": "HelloWorld", - "address": "0x433f7d6d0cB9eb8FF2902Ad01C1BEd6C09934a33", - "constructorArguments": "000000000000000000000000598face78a4302f11e3de0bee1894da0b2cb71f8000000000000000000000000ad34a66bf6db18e858f6b686557075568c6e031c", - "isProxy": false - }, - { - "name": "HelloWorld", - "address": "0xEe421285728284000ec6c6C55C6F9161faeFfa99", - "constructorArguments": "000000000000000000000000598face78a4302f11e3de0bee1894da0b2cb71f8000000000000000000000000ad34a66bf6db18e858f6b686557075568c6e031c", - "isProxy": false - }, - { - "name": "HelloWorld", - "address": "0x6c13643B3927C57DB92c790E4E3E7Ee81e13f78C", - "constructorArguments": "000000000000000000000000598face78a4302f11e3de0bee1894da0b2cb71f80000000000000000000000000000000000000000000000000000000000000000", - "isProxy": false - }, - { - "name": "HelloWorld", - "address": "0x20c44b1E3BeaDA1e9826CFd48BeEDABeE9871cE9", - "constructorArguments": "000000000000000000000000598face78a4302f11e3de0bee1894da0b2cb71f80000000000000000000000000000000000000000000000000000000000000000", - "isProxy": false - }, - { - "name": "HelloWorld", - "address": "0x783c4a0bB6663359281aD4a637D5af68F83ae213", - "constructorArguments": "000000000000000000000000598face78a4302f11e3de0bee1894da0b2cb71f80000000000000000000000000000000000000000000000000000000000000000", - "isProxy": false - } ] } diff --git a/typescript/infra/config/environments/testnet4/helloworld/rc/addresses.json b/typescript/infra/config/environments/testnet4/helloworld/rc/addresses.json index a358fa851..fcf613741 100644 --- a/typescript/infra/config/environments/testnet4/helloworld/rc/addresses.json +++ b/typescript/infra/config/environments/testnet4/helloworld/rc/addresses.json @@ -1,19 +1,10 @@ { - "arbitrumgoerli": { - "router": "0xEAb4d0A8ba9F1d3a3A665b3F1DE05890A72135D3" - }, - "optimismgoerli": { - "router": "0x7A4A358bF134a55920B4E2cdEbB62961C7a48D19" - }, "scrollsepolia": { "router": "0xA9425D5cBcD2c83EB2a5BF453EAA18968db3ef77" }, "alfajores": { "router": "0x4D1d8394cBb445A75aE63fDd24421A353B73FF25" }, - "polygonzkevmtestnet": { - "router": "0xb3D796584fDeBE2321894eeF31e0C3ec52169C61" - }, "sepolia": { "router": "0xEB25e6e42B743a815E5C0409007993a828a0565f" }, @@ -23,9 +14,6 @@ "bsctestnet": { "router": "0x643C7A37FB191A8a63BAB40264B251714F527AED" }, - "goerli": { - "router": "0x916e550aF85E0Ee7A28FAf54b3E1d87f8f4c0Cdd" - }, "mumbai": { "router": "0x4d8323Bb5cD72148e826fCAb9B4A9dd09f77C905" } diff --git a/typescript/infra/config/environments/testnet4/helloworld/rc/verification.json b/typescript/infra/config/environments/testnet4/helloworld/rc/verification.json index b6aa669e8..db68e9755 100644 --- a/typescript/infra/config/environments/testnet4/helloworld/rc/verification.json +++ b/typescript/infra/config/environments/testnet4/helloworld/rc/verification.json @@ -1,20 +1,4 @@ { - "arbitrumgoerli": [ - { - "name": "HelloWorld", - "address": "0xEAb4d0A8ba9F1d3a3A665b3F1DE05890A72135D3", - "constructorArguments": "00000000000000000000000013dabc0351407d5aaa0a50003a166a73b4febfdc0000000000000000000000000000000000000000000000000000000000000000", - "isProxy": false - } - ], - "optimismgoerli": [ - { - "name": "HelloWorld", - "address": "0x7A4A358bF134a55920B4E2cdEbB62961C7a48D19", - "constructorArguments": "000000000000000000000000b5f021728ea6223e3948db2da61d612307945ea20000000000000000000000000000000000000000000000000000000000000000", - "isProxy": false - } - ], "scrollsepolia": [ { "name": "HelloWorld", @@ -31,14 +15,6 @@ "isProxy": false } ], - "polygonzkevmtestnet": [ - { - "name": "HelloWorld", - "address": "0xb3D796584fDeBE2321894eeF31e0C3ec52169C61", - "constructorArguments": "000000000000000000000000598face78a4302f11e3de0bee1894da0b2cb71f80000000000000000000000000000000000000000000000000000000000000000", - "isProxy": false - } - ], "sepolia": [ { "name": "HelloWorld", @@ -63,14 +39,6 @@ "isProxy": false } ], - "goerli": [ - { - "name": "HelloWorld", - "address": "0x916e550aF85E0Ee7A28FAf54b3E1d87f8f4c0Cdd", - "constructorArguments": "00000000000000000000000049cfd6ef774acab14814d699e3f7ee36fdfba9320000000000000000000000000000000000000000000000000000000000000000", - "isProxy": false - } - ], "moonbasealpha": [ { "name": "HelloWorld", diff --git a/typescript/infra/config/environments/testnet4/hooks.ts b/typescript/infra/config/environments/testnet4/hooks.ts deleted file mode 100644 index 81f8b9655..000000000 --- a/typescript/infra/config/environments/testnet4/hooks.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { Chains, HookType, OpStackHookConfig } from '@hyperlane-xyz/sdk'; - -export const opHookConfig: OpStackHookConfig = { - type: HookType.OP_STACK, - nativeBridge: '0xDa2332D0a7608919Cd331B1304Cd179129a90495', - destinationChain: Chains.optimismgoerli, -}; diff --git a/typescript/infra/config/environments/testnet4/ism/verification.json b/typescript/infra/config/environments/testnet4/ism/verification.json index 11b9163cf..9769ccad2 100644 --- a/typescript/infra/config/environments/testnet4/ism/verification.json +++ b/typescript/infra/config/environments/testnet4/ism/verification.json @@ -1067,204 +1067,6 @@ "isProxy": true } ], - "goerli": [ - { - "name": "StaticMultisigIsmFactory", - "address": "0xFa13bd2BD45644bAF0797e41D1a4D56601a4059a", - "constructorArguments": "", - "isProxy": false - }, - { - "name": "StaticAggregationIsmFactory", - "address": "0x11413a6Ea76a55eAec950894ba8fdd7683E41b06", - "constructorArguments": "", - "isProxy": false - }, - { - "name": "DomainRoutingIsmFactory", - "address": "0x129A80Fe557153B5F48B4292F8C177bACdcf7dB3", - "constructorArguments": "", - "isProxy": false - }, - { - "name": "MerkleRootMultisigIsmFactory", - "address": "0x4dD7716b876441355657a18c7E7b02129F88E3c0", - "constructorArguments": "", - "isProxy": false - }, - { - "name": "MessageIdMultisigIsmFactory", - "address": "0x14b0F0c0a59704E92f95252cE24Ef6aB1d679733", - "constructorArguments": "", - "isProxy": false - }, - { - "name": "MerkleRootMultisigIsmFactory", - "address": "0x8e43aCfb338B137A3befd9b92BfD84E128adE0B8", - "constructorArguments": "", - "isProxy": false - }, - { - "name": "StaticMerkleRootMultisigIsm", - "address": "0xcc493EB29FC244004436a69354771F2C38aFC4c9" - }, - { - "name": "MessageIdMultisigIsmFactory", - "address": "0xDdB54502A8e2a31C48148C62A8a9E83a693d6173", - "constructorArguments": "", - "isProxy": false - }, - { - "name": "StaticMessageIdMultisigIsm", - "address": "0x6A995F21a74332BCc280597807DF6Af3e4833f83" - }, - { - "name": "AggregationIsmFactory", - "address": "0x8a176773d54292123d271FA0B9C7C8Def4c3a31b", - "constructorArguments": "", - "isProxy": false - }, - { - "name": "StaticAggregationIsm", - "address": "0x8D090384691b7a5ED7f418Ddf8135438913EFDcc" - }, - { - "name": "AggregationHookFactory", - "address": "0x6bc243963f80AEa80948e8538bB114d4122DD9c5", - "constructorArguments": "", - "isProxy": false - }, - { - "name": "StaticAggregationHook", - "address": "0xDd4b9980b52A5e786fA903b2190aaFDdA461dED5" - }, - { - "name": "RoutingIsmFactory", - "address": "0xd16c3f34d6A2e62185aC61f76F83D3AA1E969018", - "constructorArguments": "", - "isProxy": false - }, - { - "name": "DomaingRoutingIsm", - "address": "0x84e9B533555E76a8E9B95daCCbdeE8d3cFA2F5D4" - }, - { - "name": "StaticMerkleRootMultisigIsm", - "address": "0xcc493EB29FC244004436a69354771F2C38aFC4c9" - }, - { - "name": "StaticMessageIdMultisigIsm", - "address": "0x6A995F21a74332BCc280597807DF6Af3e4833f83" - }, - { - "name": "StaticAggregationIsm", - "address": "0x8D090384691b7a5ED7f418Ddf8135438913EFDcc" - }, - { - "name": "StaticAggregationHook", - "address": "0xDd4b9980b52A5e786fA903b2190aaFDdA461dED5" - }, - { - "name": "DomaingRoutingIsm", - "address": "0x84e9B533555E76a8E9B95daCCbdeE8d3cFA2F5D4" - }, - { - "name": "StaticMerkleRootMultisigIsm", - "address": "0xcc493EB29FC244004436a69354771F2C38aFC4c9" - }, - { - "name": "StaticMessageIdMultisigIsm", - "address": "0x6A995F21a74332BCc280597807DF6Af3e4833f83" - }, - { - "name": "StaticAggregationIsm", - "address": "0x8D090384691b7a5ED7f418Ddf8135438913EFDcc" - }, - { - "name": "StaticAggregationHook", - "address": "0xDd4b9980b52A5e786fA903b2190aaFDdA461dED5" - }, - { - "name": "DomaingRoutingIsm", - "address": "0x84e9B533555E76a8E9B95daCCbdeE8d3cFA2F5D4" - }, - { - "name": "StaticMerkleRootMultisigIsm", - "address": "0xcc493EB29FC244004436a69354771F2C38aFC4c9" - }, - { - "name": "StaticMessageIdMultisigIsm", - "address": "0x6A995F21a74332BCc280597807DF6Af3e4833f83" - }, - { - "name": "StaticAggregationIsm", - "address": "0x8D090384691b7a5ED7f418Ddf8135438913EFDcc" - }, - { - "name": "StaticAggregationHook", - "address": "0xDd4b9980b52A5e786fA903b2190aaFDdA461dED5" - }, - { - "name": "DomaingRoutingIsm", - "address": "0x84e9B533555E76a8E9B95daCCbdeE8d3cFA2F5D4" - }, - { - "name": "StaticMerkleRootMultisigIsm", - "address": "0xcc493EB29FC244004436a69354771F2C38aFC4c9" - }, - { - "name": "StaticMessageIdMultisigIsm", - "address": "0x6A995F21a74332BCc280597807DF6Af3e4833f83" - }, - { - "name": "StaticAggregationIsm", - "address": "0x8D090384691b7a5ED7f418Ddf8135438913EFDcc" - }, - { - "name": "StaticAggregationHook", - "address": "0xDd4b9980b52A5e786fA903b2190aaFDdA461dED5" - }, - { - "name": "DomaingRoutingIsm", - "address": "0x84e9B533555E76a8E9B95daCCbdeE8d3cFA2F5D4" - }, - { - "name": "StaticMerkleRootMultisigIsm", - "address": "0xcc493EB29FC244004436a69354771F2C38aFC4c9", - "constructorArguments": "", - "isProxy": true - }, - { - "name": "StaticMessageIdMultisigIsm", - "address": "0x6A995F21a74332BCc280597807DF6Af3e4833f83", - "constructorArguments": "", - "isProxy": true - }, - { - "name": "StaticAggregationIsm", - "address": "0x8D090384691b7a5ED7f418Ddf8135438913EFDcc", - "constructorArguments": "", - "isProxy": true - }, - { - "name": "StaticAggregationHook", - "address": "0xDd4b9980b52A5e786fA903b2190aaFDdA461dED5", - "constructorArguments": "", - "isProxy": true - }, - { - "name": "RoutingIsmFactory", - "address": "0xeB998dC788E2c1e772d198d32e50890544776e75", - "constructorArguments": "", - "isProxy": false - }, - { - "name": "DomaingRoutingIsm", - "address": "0xDF3dbca700227925C39cAF902919f94571A50755", - "constructorArguments": "", - "isProxy": true - } - ], "sepolia": [ { "name": "StaticMultisigIsmFactory", @@ -1661,600 +1463,6 @@ "isProxy": true } ], - "optimismgoerli": [ - { - "name": "StaticMultisigIsmFactory", - "address": "0x0bA75fBC56FEb7e4F5EF4a8F042272cfec152ABc", - "constructorArguments": "", - "isProxy": false - }, - { - "name": "StaticAggregationIsmFactory", - "address": "0x919AD6f6DFE1C17b89DAC2eE526F153C08afE305", - "constructorArguments": "", - "isProxy": false - }, - { - "name": "DomainRoutingIsmFactory", - "address": "0x1D7b8aBa2494Ec82e80D6206d2B3df9f8C3F1862", - "constructorArguments": "", - "isProxy": false - }, - { - "name": "MerkleRootMultisigIsmFactory", - "address": "0xC5Bb8CDD44B6c56695df45c7AA8012a97dD6ED13", - "constructorArguments": "", - "isProxy": false - }, - { - "name": "MessageIdMultisigIsmFactory", - "address": "0x39a8711BF44165A2292Cb5cB43229659c2Bb11c9", - "constructorArguments": "", - "isProxy": false - }, - { - "name": "MerkleRootMultisigIsmFactory", - "address": "0x8a02315924C172e8bb558E39e3DF5bfDD6270648", - "constructorArguments": "", - "isProxy": false - }, - { - "name": "StaticMerkleRootMultisigIsm", - "address": "0x738b1071c86a747834619Ca710c694E4Dc1646B9" - }, - { - "name": "MerkleRootMultisigIsmFactory", - "address": "0xAbC25d7daDD748948F5cC912A807b0f8FcBb56a9", - "constructorArguments": "", - "isProxy": false - }, - { - "name": "StaticMerkleRootMultisigIsm", - "address": "0x76E4295E6d4bB5Be6314da5759fD0a9003BA522E" - }, - { - "name": "MessageIdMultisigIsmFactory", - "address": "0x7868B6026E36C4b6E2ca6a0CaBDb1A6D0CcC443B", - "constructorArguments": "", - "isProxy": false - }, - { - "name": "StaticMessageIdMultisigIsm", - "address": "0x12D2e2B9bB44a34eb6a284861be742EE852b4Fc1" - }, - { - "name": "AggregationIsmFactory", - "address": "0xf666A33C451E8371907aD22dd545E1678fCa1582", - "constructorArguments": "", - "isProxy": false - }, - { - "name": "StaticAggregationIsm", - "address": "0x4287827a2F143ab05B708D54f1c47585D4F2aFaB" - }, - { - "name": "AggregationHookFactory", - "address": "0x00cE81F7B02e0673815a8b0A54e62AeabDE78685", - "constructorArguments": "", - "isProxy": false - }, - { - "name": "StaticAggregationHook", - "address": "0xAA3A04799E5Fb6daf989d952802FC8d0dADA44fe" - }, - { - "name": "RoutingIsmFactory", - "address": "0x1807e7d67F00393a49c445E367face82D65d86c7", - "constructorArguments": "", - "isProxy": false - }, - { - "name": "DomaingRoutingIsm", - "address": "0xE2B83e0E3fd5Cd37b969aB3cA4Fcb92b9bc59612" - }, - { - "name": "StaticMerkleRootMultisigIsm", - "address": "0x76E4295E6d4bB5Be6314da5759fD0a9003BA522E" - }, - { - "name": "StaticMessageIdMultisigIsm", - "address": "0x12D2e2B9bB44a34eb6a284861be742EE852b4Fc1" - }, - { - "name": "StaticAggregationIsm", - "address": "0x4287827a2F143ab05B708D54f1c47585D4F2aFaB" - }, - { - "name": "StaticAggregationHook", - "address": "0xAA3A04799E5Fb6daf989d952802FC8d0dADA44fe" - }, - { - "name": "DomaingRoutingIsm", - "address": "0xE2B83e0E3fd5Cd37b969aB3cA4Fcb92b9bc59612" - }, - { - "name": "StaticMerkleRootMultisigIsm", - "address": "0x76E4295E6d4bB5Be6314da5759fD0a9003BA522E" - }, - { - "name": "StaticMessageIdMultisigIsm", - "address": "0x12D2e2B9bB44a34eb6a284861be742EE852b4Fc1" - }, - { - "name": "StaticAggregationIsm", - "address": "0x4287827a2F143ab05B708D54f1c47585D4F2aFaB" - }, - { - "name": "StaticAggregationHook", - "address": "0xAA3A04799E5Fb6daf989d952802FC8d0dADA44fe" - }, - { - "name": "DomaingRoutingIsm", - "address": "0xE2B83e0E3fd5Cd37b969aB3cA4Fcb92b9bc59612" - }, - { - "name": "StaticMerkleRootMultisigIsm", - "address": "0x76E4295E6d4bB5Be6314da5759fD0a9003BA522E" - }, - { - "name": "StaticMessageIdMultisigIsm", - "address": "0x12D2e2B9bB44a34eb6a284861be742EE852b4Fc1" - }, - { - "name": "StaticAggregationIsm", - "address": "0x4287827a2F143ab05B708D54f1c47585D4F2aFaB" - }, - { - "name": "StaticAggregationHook", - "address": "0xAA3A04799E5Fb6daf989d952802FC8d0dADA44fe" - }, - { - "name": "DomaingRoutingIsm", - "address": "0xE2B83e0E3fd5Cd37b969aB3cA4Fcb92b9bc59612" - }, - { - "name": "StaticMerkleRootMultisigIsm", - "address": "0x76E4295E6d4bB5Be6314da5759fD0a9003BA522E" - }, - { - "name": "StaticMessageIdMultisigIsm", - "address": "0x12D2e2B9bB44a34eb6a284861be742EE852b4Fc1" - }, - { - "name": "StaticAggregationIsm", - "address": "0x4287827a2F143ab05B708D54f1c47585D4F2aFaB" - }, - { - "name": "StaticAggregationHook", - "address": "0xAA3A04799E5Fb6daf989d952802FC8d0dADA44fe" - }, - { - "name": "DomaingRoutingIsm", - "address": "0xE2B83e0E3fd5Cd37b969aB3cA4Fcb92b9bc59612" - }, - { - "name": "StaticMerkleRootMultisigIsm", - "address": "0x76E4295E6d4bB5Be6314da5759fD0a9003BA522E", - "constructorArguments": "", - "isProxy": true - }, - { - "name": "StaticMessageIdMultisigIsm", - "address": "0x12D2e2B9bB44a34eb6a284861be742EE852b4Fc1", - "constructorArguments": "", - "isProxy": true - }, - { - "name": "StaticAggregationIsm", - "address": "0x4287827a2F143ab05B708D54f1c47585D4F2aFaB", - "constructorArguments": "", - "isProxy": true - }, - { - "name": "StaticAggregationHook", - "address": "0xAA3A04799E5Fb6daf989d952802FC8d0dADA44fe", - "constructorArguments": "", - "isProxy": true - }, - { - "name": "RoutingIsmFactory", - "address": "0xce8E9D701A1DFfe672c1d8dB20De2B3fa6F4437D", - "constructorArguments": "", - "isProxy": false - }, - { - "name": "DomaingRoutingIsm", - "address": "0xEDff0A731Fb99a85181d84F46a473d5754dA236C", - "constructorArguments": "", - "isProxy": true - } - ], - "arbitrumgoerli": [ - { - "name": "StaticMultisigIsmFactory", - "address": "0x71cCc98689B48Dd50Fd5950815A56d76477349B2", - "constructorArguments": "", - "isProxy": false - }, - { - "name": "StaticAggregationIsmFactory", - "address": "0xa27F4a2bD624CF1cB3605c532E95E27BB0AC0BB3", - "constructorArguments": "", - "isProxy": false - }, - { - "name": "DomainRoutingIsmFactory", - "address": "0xa68022e53Fd28119D07C8336a8eC84A298Fd38Fd", - "constructorArguments": "", - "isProxy": false - }, - { - "name": "MerkleRootMultisigIsmFactory", - "address": "0x0502Be39aE255D022013DC0aeAa52fDBCD5f0331", - "constructorArguments": "", - "isProxy": false - }, - { - "name": "MessageIdMultisigIsmFactory", - "address": "0x71eAD731EBdd1334d80a89a572fDFA67830C504c", - "constructorArguments": "", - "isProxy": false - }, - { - "name": "MerkleRootMultisigIsmFactory", - "address": "0xaa5Bc1EF4Ead69e8ef7Ca40e55b7cf68E457226a", - "constructorArguments": "", - "isProxy": false - }, - { - "name": "StaticMerkleRootMultisigIsm", - "address": "0xA9c27a55B879E184ad4CAF34DB166231a60Bc39C" - }, - { - "name": "MerkleRootMultisigIsmFactory", - "address": "0x17D58eBb5Ea0E2d360c877E119FAef4C4052e6B9", - "constructorArguments": "", - "isProxy": false - }, - { - "name": "StaticMerkleRootMultisigIsm", - "address": "0x4186a6C7aa0D0be93Eda994279974CD2a1E59aE2" - }, - { - "name": "MessageIdMultisigIsmFactory", - "address": "0x922CeEe9e8832a047e6aD68Df4F079F271b73Ac3", - "constructorArguments": "", - "isProxy": false - }, - { - "name": "StaticMessageIdMultisigIsm", - "address": "0x2f0354820d0Da451be63D20D63AbE028DF3cb9A0" - }, - { - "name": "AggregationIsmFactory", - "address": "0xC5Bb8CDD44B6c56695df45c7AA8012a97dD6ED13", - "constructorArguments": "", - "isProxy": false - }, - { - "name": "StaticAggregationIsm", - "address": "0xc5a060a9aC418FafD4eF03334A9973762157C867" - }, - { - "name": "AggregationHookFactory", - "address": "0x39a8711BF44165A2292Cb5cB43229659c2Bb11c9", - "constructorArguments": "", - "isProxy": false - }, - { - "name": "StaticAggregationHook", - "address": "0x4e2F4E576b622E3246df8430CeeCb63eA28749Ef" - }, - { - "name": "RoutingIsmFactory", - "address": "0x735491727b9a1206E16AF4964aF68d5BB9122333", - "constructorArguments": "", - "isProxy": false - }, - { - "name": "DomaingRoutingIsm", - "address": "0xC204a9864A10d52995E71FE5cc1fDaAA9f7D6FCB" - }, - { - "name": "StaticMerkleRootMultisigIsm", - "address": "0x4186a6C7aa0D0be93Eda994279974CD2a1E59aE2" - }, - { - "name": "StaticMessageIdMultisigIsm", - "address": "0x2f0354820d0Da451be63D20D63AbE028DF3cb9A0" - }, - { - "name": "StaticAggregationIsm", - "address": "0xc5a060a9aC418FafD4eF03334A9973762157C867" - }, - { - "name": "StaticAggregationHook", - "address": "0x4e2F4E576b622E3246df8430CeeCb63eA28749Ef" - }, - { - "name": "DomaingRoutingIsm", - "address": "0xC204a9864A10d52995E71FE5cc1fDaAA9f7D6FCB" - }, - { - "name": "StaticMerkleRootMultisigIsm", - "address": "0x4186a6C7aa0D0be93Eda994279974CD2a1E59aE2" - }, - { - "name": "StaticMessageIdMultisigIsm", - "address": "0x2f0354820d0Da451be63D20D63AbE028DF3cb9A0" - }, - { - "name": "StaticAggregationIsm", - "address": "0xc5a060a9aC418FafD4eF03334A9973762157C867" - }, - { - "name": "StaticAggregationHook", - "address": "0x4e2F4E576b622E3246df8430CeeCb63eA28749Ef" - }, - { - "name": "DomaingRoutingIsm", - "address": "0xC204a9864A10d52995E71FE5cc1fDaAA9f7D6FCB" - }, - { - "name": "StaticMerkleRootMultisigIsm", - "address": "0x4186a6C7aa0D0be93Eda994279974CD2a1E59aE2" - }, - { - "name": "StaticMessageIdMultisigIsm", - "address": "0x2f0354820d0Da451be63D20D63AbE028DF3cb9A0" - }, - { - "name": "StaticAggregationIsm", - "address": "0xc5a060a9aC418FafD4eF03334A9973762157C867" - }, - { - "name": "StaticAggregationHook", - "address": "0x4e2F4E576b622E3246df8430CeeCb63eA28749Ef" - }, - { - "name": "DomaingRoutingIsm", - "address": "0xC204a9864A10d52995E71FE5cc1fDaAA9f7D6FCB" - }, - { - "name": "StaticMerkleRootMultisigIsm", - "address": "0x4186a6C7aa0D0be93Eda994279974CD2a1E59aE2" - }, - { - "name": "StaticMessageIdMultisigIsm", - "address": "0x2f0354820d0Da451be63D20D63AbE028DF3cb9A0" - }, - { - "name": "StaticAggregationIsm", - "address": "0xc5a060a9aC418FafD4eF03334A9973762157C867" - }, - { - "name": "StaticAggregationHook", - "address": "0x4e2F4E576b622E3246df8430CeeCb63eA28749Ef" - }, - { - "name": "DomaingRoutingIsm", - "address": "0xC204a9864A10d52995E71FE5cc1fDaAA9f7D6FCB" - }, - { - "name": "StaticMerkleRootMultisigIsm", - "address": "0x4186a6C7aa0D0be93Eda994279974CD2a1E59aE2", - "constructorArguments": "", - "isProxy": true - }, - { - "name": "StaticMessageIdMultisigIsm", - "address": "0x2f0354820d0Da451be63D20D63AbE028DF3cb9A0", - "constructorArguments": "", - "isProxy": true - }, - { - "name": "StaticAggregationIsm", - "address": "0xc5a060a9aC418FafD4eF03334A9973762157C867", - "constructorArguments": "", - "isProxy": true - }, - { - "name": "StaticAggregationHook", - "address": "0x4e2F4E576b622E3246df8430CeeCb63eA28749Ef", - "constructorArguments": "", - "isProxy": true - }, - { - "name": "DomaingRoutingIsm", - "address": "0x6bc6101acBFD309d7B9540c1d6B50c9985742399", - "constructorArguments": "", - "isProxy": true - } - ], - "polygonzkevmtestnet": [ - { - "name": "MerkleRootMultisigIsmFactory", - "address": "0x6E7b29CB2A7617405B4d30C6f84bBD51b4Bb4be8", - "constructorArguments": "", - "isProxy": false - }, - { - "name": "StaticMerkleRootMultisigIsm", - "address": "0x209e7F9d40954E230008B9bb076a0901d32695e5" - }, - { - "name": "MerkleRootMultisigIsmFactory", - "address": "0xfc6e546510dC9d76057F1f76633FCFfC188CB213", - "constructorArguments": "", - "isProxy": false - }, - { - "name": "MerkleRootMultisigIsmFactory", - "address": "0xfc6e546510dC9d76057F1f76633FCFfC188CB213", - "constructorArguments": "", - "isProxy": false - }, - { - "name": "StaticMerkleRootMultisigIsm", - "address": "0x99B304925A08aba9305bC0A8FccBf71B4290c5EF" - }, - { - "name": "MessageIdMultisigIsmFactory", - "address": "0x275aCcCa81cAD931dC6fB6E49ED233Bc99Bed4A7", - "constructorArguments": "", - "isProxy": false - }, - { - "name": "StaticMessageIdMultisigIsm", - "address": "0x33999AB153F68D481AAB1B238368Ffd1Fe81F360" - }, - { - "name": "AggregationIsmFactory", - "address": "0xeb6f11189197223c656807a83B0DD374f9A6dF44", - "constructorArguments": "", - "isProxy": false - }, - { - "name": "StaticAggregationIsm", - "address": "0x3e6F45B03314bD21BcE4201666d483291575E391" - }, - { - "name": "AggregationHookFactory", - "address": "0x16B710b86CAd07E6F1C531861a16F5feC29dba37", - "constructorArguments": "", - "isProxy": false - }, - { - "name": "StaticAggregationHook", - "address": "0x87935eB971eaA9826060261b07a919451dfd0409" - }, - { - "name": "RoutingIsmFactory", - "address": "0x44b764045BfDC68517e10e783E69B376cef196B2", - "constructorArguments": "", - "isProxy": false - }, - { - "name": "DomaingRoutingIsm", - "address": "0xE5cA56294dA5Bd490D5Bc489B177B002ad16AF83" - }, - { - "name": "StaticMerkleRootMultisigIsm", - "address": "0x99B304925A08aba9305bC0A8FccBf71B4290c5EF" - }, - { - "name": "StaticMessageIdMultisigIsm", - "address": "0x33999AB153F68D481AAB1B238368Ffd1Fe81F360" - }, - { - "name": "StaticAggregationIsm", - "address": "0x3e6F45B03314bD21BcE4201666d483291575E391" - }, - { - "name": "StaticAggregationHook", - "address": "0x87935eB971eaA9826060261b07a919451dfd0409" - }, - { - "name": "DomaingRoutingIsm", - "address": "0xE5cA56294dA5Bd490D5Bc489B177B002ad16AF83" - }, - { - "name": "StaticMerkleRootMultisigIsm", - "address": "0x99B304925A08aba9305bC0A8FccBf71B4290c5EF" - }, - { - "name": "StaticMessageIdMultisigIsm", - "address": "0x33999AB153F68D481AAB1B238368Ffd1Fe81F360" - }, - { - "name": "StaticAggregationIsm", - "address": "0x3e6F45B03314bD21BcE4201666d483291575E391" - }, - { - "name": "StaticAggregationHook", - "address": "0x87935eB971eaA9826060261b07a919451dfd0409" - }, - { - "name": "DomaingRoutingIsm", - "address": "0xE5cA56294dA5Bd490D5Bc489B177B002ad16AF83" - }, - { - "name": "StaticMerkleRootMultisigIsm", - "address": "0x99B304925A08aba9305bC0A8FccBf71B4290c5EF" - }, - { - "name": "StaticMessageIdMultisigIsm", - "address": "0x33999AB153F68D481AAB1B238368Ffd1Fe81F360" - }, - { - "name": "StaticAggregationIsm", - "address": "0x3e6F45B03314bD21BcE4201666d483291575E391" - }, - { - "name": "StaticAggregationHook", - "address": "0x87935eB971eaA9826060261b07a919451dfd0409" - }, - { - "name": "DomaingRoutingIsm", - "address": "0xE5cA56294dA5Bd490D5Bc489B177B002ad16AF83" - }, - { - "name": "StaticMerkleRootMultisigIsm", - "address": "0x99B304925A08aba9305bC0A8FccBf71B4290c5EF" - }, - { - "name": "StaticMessageIdMultisigIsm", - "address": "0x33999AB153F68D481AAB1B238368Ffd1Fe81F360" - }, - { - "name": "StaticAggregationIsm", - "address": "0x3e6F45B03314bD21BcE4201666d483291575E391" - }, - { - "name": "StaticAggregationHook", - "address": "0x87935eB971eaA9826060261b07a919451dfd0409" - }, - { - "name": "DomaingRoutingIsm", - "address": "0xE5cA56294dA5Bd490D5Bc489B177B002ad16AF83" - }, - { - "name": "StaticMerkleRootMultisigIsm", - "address": "0x99B304925A08aba9305bC0A8FccBf71B4290c5EF", - "constructorArguments": "", - "isProxy": true - }, - { - "name": "StaticMessageIdMultisigIsm", - "address": "0x33999AB153F68D481AAB1B238368Ffd1Fe81F360", - "constructorArguments": "", - "isProxy": true - }, - { - "name": "StaticAggregationIsm", - "address": "0x3e6F45B03314bD21BcE4201666d483291575E391", - "constructorArguments": "", - "isProxy": true - }, - { - "name": "StaticAggregationHook", - "address": "0x87935eB971eaA9826060261b07a919451dfd0409", - "constructorArguments": "", - "isProxy": true - }, - { - "name": "RoutingIsmFactory", - "address": "0xc08675806BA844467E559E45E4bB59e66778bDcd", - "constructorArguments": "", - "isProxy": false - }, - { - "name": "DomaingRoutingIsm", - "address": "0x772E6fa7a868C94e6031683AD13E821e6649d60C", - "constructorArguments": "", - "isProxy": true - } - ], "scrollsepolia": [ { "name": "MerkleRootMultisigIsmFactory", diff --git a/typescript/infra/config/environments/testnet4/liquidityLayer.ts b/typescript/infra/config/environments/testnet4/liquidityLayer.ts index 0ae83c4a0..9f0960b4d 100644 --- a/typescript/infra/config/environments/testnet4/liquidityLayer.ts +++ b/typescript/infra/config/environments/testnet4/liquidityLayer.ts @@ -8,18 +8,10 @@ import { } from '@hyperlane-xyz/sdk'; const circleDomainMapping = [ - { - hyperlaneDomain: getDomainId(chainMetadata[Chains.goerli]), - circleDomain: 0, - }, { hyperlaneDomain: getDomainId(chainMetadata[Chains.fuji]), circleDomain: 1 }, ]; const wormholeDomainMapping = [ - { - hyperlaneDomain: getDomainId(chainMetadata[Chains.goerli]), - wormholeDomain: 2, - }, { hyperlaneDomain: getDomainId(chainMetadata[Chains.fuji]), wormholeDomain: 6, @@ -39,20 +31,6 @@ const wormholeDomainMapping = [ ]; export const bridgeAdapterConfigs: ChainMap = { - [Chains.goerli]: { - portal: { - type: BridgeAdapterType.Portal, - portalBridgeAddress: '0xF890982f9310df57d00f659cf4fd87e65adEd8d7', - wormholeDomainMapping, - }, - circle: { - type: BridgeAdapterType.Circle, - tokenMessengerAddress: '0xd0c3da58f55358142b8d3e06c1c30c5c6114efe8', - messageTransmitterAddress: '0x26413e8157cd32011e726065a5462e97dd4d03d9', - usdcAddress: '0x07865c6e87b9f70255377e024ace6630c1eaa37f', - circleDomainMapping, - }, - }, [Chains.fuji]: { portal: { type: BridgeAdapterType.Portal, diff --git a/typescript/infra/config/environments/testnet4/middleware/accounts/verification.json b/typescript/infra/config/environments/testnet4/middleware/accounts/verification.json index 8e545d46e..6504acc5b 100644 --- a/typescript/infra/config/environments/testnet4/middleware/accounts/verification.json +++ b/typescript/infra/config/environments/testnet4/middleware/accounts/verification.json @@ -199,74 +199,6 @@ "isProxy": false } ], - "goerli": [ - { - "name": "InterchainAccountRouter", - "address": "0xc61Bbf8eAb0b748Ecb532A7ffC49Ab7ca6D3a39D", - "isProxy": false, - "constructorArguments": "0x" - }, - { - "name": "TransparentUpgradeableProxy", - "address": "0xCb0ba89F564e31180A101Df54b7971206e03ee9b", - "constructorArguments": "0000000000000000000000008f919348f9c4619a196acb5e377f49e5e2c0b569000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000", - "isProxy": true - }, - { - "name": "InterchainAccountRouter", - "address": "0xA748586f78dD2a4A90b02aD72ddc014Cc05C19b1", - "constructorArguments": "0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000cb0ba89f564e31180a101df54b7971206e03ee9b", - "isProxy": false - }, - { - "name": "InterchainAccountIsm", - "address": "0x70835F3C2845394842DEA9f40cbe8087b2cE5712", - "constructorArguments": "000000000000000000000000cc737a94fecaec165abcf12ded095bb13f037685", - "isProxy": false - }, - { - "name": "InterchainAccountIsm", - "address": "0xA65d03C7FE8a9C3aAb17638CA64aB892263a3140", - "constructorArguments": "000000000000000000000000cc737a94fecaec165abcf12ded095bb13f037685", - "isProxy": false - }, - { - "name": "TransparentUpgradeableProxy", - "address": "0xfC326F5104559772b851c75942a4Daa8A50be771", - "constructorArguments": "0000000000000000000000008f919348f9c4619a196acb5e377f49e5e2c0b569000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000", - "isProxy": true - }, - { - "name": "InterchainAccountRouter", - "address": "0x069D0E4f0E69041c2E73Fc11fB386a082854D58a", - "constructorArguments": "0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000fc326f5104559772b851c75942a4daa8a50be771", - "isProxy": false - }, - { - "name": "TransparentUpgradeableProxy", - "address": "0xA65d03C7FE8a9C3aAb17638CA64aB892263a3140", - "constructorArguments": "0000000000000000000000008f919348f9c4619a196acb5e377f49e5e2c0b569000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000", - "isProxy": true - }, - { - "name": "InterchainAccountRouter", - "address": "0xfC326F5104559772b851c75942a4Daa8A50be771", - "constructorArguments": "0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000a65d03c7fe8a9c3aab17638ca64ab892263a3140", - "isProxy": false - }, - { - "name": "TransparentUpgradeableProxy", - "address": "0x55486284a85d7b51a7bBfd343702414D65276fa6", - "constructorArguments": "0000000000000000000000008f919348f9c4619a196acb5e377f49e5e2c0b569000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000", - "isProxy": true - }, - { - "name": "InterchainAccountRouter", - "address": "0x72fBCe5Ed460D462B0B434210f6591e4A816D3Af", - "constructorArguments": "0000000000000000000000000000000000000000000000000000000000000005", - "isProxy": false - } - ], "moonbasealpha": [ { "name": "InterchainAccountRouter", @@ -323,106 +255,6 @@ "isProxy": false } ], - "optimismgoerli": [ - { - "name": "InterchainAccountRouter", - "address": "0xc61Bbf8eAb0b748Ecb532A7ffC49Ab7ca6D3a39D", - "isProxy": false, - "constructorArguments": "0x" - }, - { - "name": "TransparentUpgradeableProxy", - "address": "0x12EBd8cb561c68b587C392e0c5405B9866FD5820", - "constructorArguments": "000000000000000000000000cd19ff7306e04ea6b8f4b5ab1c5a198c186aab42000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000", - "isProxy": true - }, - { - "name": "InterchainAccountRouter", - "address": "0x860EDf9C38875ad7444BD6e6331866450c9589e4", - "constructorArguments": "00000000000000000000000000000000000000000000000000000000000001a400000000000000000000000012ebd8cb561c68b587c392e0c5405b9866fd5820", - "isProxy": false - }, - { - "name": "InterchainAccountIsm", - "address": "0x82F5a960a4e4Cc0614253e4977bb3BE10344a30C", - "constructorArguments": "000000000000000000000000cc737a94fecaec165abcf12ded095bb13f037685", - "isProxy": false - }, - { - "name": "TransparentUpgradeableProxy", - "address": "0x4Ba215ECFb198fa2B63b57Eea19978E493EdaA0c", - "constructorArguments": "000000000000000000000000cd19ff7306e04ea6b8f4b5ab1c5a198c186aab42000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000", - "isProxy": true - }, - { - "name": "InterchainAccountRouter", - "address": "0x8a557D004d50A95466C508b61EB68768c8371e30", - "constructorArguments": "00000000000000000000000000000000000000000000000000000000000001a40000000000000000000000004ba215ecfb198fa2b63b57eea19978e493edaa0c", - "isProxy": false - }, - { - "name": "TransparentUpgradeableProxy", - "address": "0x6f393F8Dfb327d99c946e0Dd2f39F51B1aB446bf", - "constructorArguments": "000000000000000000000000cd19ff7306e04ea6b8f4b5ab1c5a198c186aab42000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000", - "isProxy": true - }, - { - "name": "InterchainAccountRouter", - "address": "0xa6B288C520B06EcF2492F8d690616ea0027D1Ce8", - "constructorArguments": "00000000000000000000000000000000000000000000000000000000000001a4", - "isProxy": false - } - ], - "arbitrumgoerli": [ - { - "name": "InterchainAccountRouter", - "address": "0xc61Bbf8eAb0b748Ecb532A7ffC49Ab7ca6D3a39D", - "isProxy": false, - "constructorArguments": "0x" - }, - { - "name": "TransparentUpgradeableProxy", - "address": "0x4266D8Dd66D8Eb3934c8942968d1e54214D072d3", - "constructorArguments": "000000000000000000000000cd19ff7306e04ea6b8f4b5ab1c5a198c186aab42000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000", - "isProxy": true - }, - { - "name": "InterchainAccountRouter", - "address": "0x759c4Eb4575B651a9f0Fb46653dd7B2F32fD7310", - "constructorArguments": "0000000000000000000000000000000000000000000000000000000000066eed0000000000000000000000004266d8dd66d8eb3934c8942968d1e54214d072d3", - "isProxy": false - }, - { - "name": "InterchainAccountIsm", - "address": "0xA8978fdB093b1C5b892291A36e8527b34B749d6f", - "constructorArguments": "000000000000000000000000cc737a94fecaec165abcf12ded095bb13f037685", - "isProxy": false - }, - { - "name": "TransparentUpgradeableProxy", - "address": "0xbF3055Ae229A241113BeF54f9A4Dd748A326cf85", - "constructorArguments": "000000000000000000000000cd19ff7306e04ea6b8f4b5ab1c5a198c186aab42000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000", - "isProxy": true - }, - { - "name": "InterchainAccountRouter", - "address": "0xc1709b3861E348678DAea51A7ce4b5859F2C99B6", - "constructorArguments": "0000000000000000000000000000000000000000000000000000000000066eed000000000000000000000000bf3055ae229a241113bef54f9a4dd748a326cf85", - "isProxy": false - }, - { - "name": "TransparentUpgradeableProxy", - "address": "0x3C636ccC50222a9eb54849C7a622D60a40928a5E", - "constructorArguments": "000000000000000000000000cd19ff7306e04ea6b8f4b5ab1c5a198c186aab42000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000", - "isProxy": true - }, - { - "name": "InterchainAccountRouter", - "address": "0xa4B02F68588C0A36Fc6bD4ce0Db2E7c2e8506156", - "constructorArguments": "0000000000000000000000000000000000000000000000000000000000066eed", - "isProxy": false - } - ], "sepolia": [ { "name": "TransparentUpgradeableProxy", diff --git a/typescript/infra/config/environments/testnet4/middleware/liquidity-layer/addresses.json b/typescript/infra/config/environments/testnet4/middleware/liquidity-layer/addresses.json index 2497ed4a7..14fe439e3 100644 --- a/typescript/infra/config/environments/testnet4/middleware/liquidity-layer/addresses.json +++ b/typescript/infra/config/environments/testnet4/middleware/liquidity-layer/addresses.json @@ -1,10 +1,4 @@ { - "goerli": { - "circleBridgeAdapter": "0xfe9d88aA85c5917822C804b949BcEDE832C02ce2", - "portalAdapter": "0x68D753982e89CC083917863F6dc9738448B91ef9", - "proxyAdmin": "0x8f919348F9C4619A196Acb5e377f49E5E2C0B569", - "liquidityLayerRouter": "0x2abe0860D81FB4242C748132bD69D125D88eaE26" - }, "fuji": { "circleBridgeAdapter": "0xfe9d88aA85c5917822C804b949BcEDE832C02ce2", "portalAdapter": "0x68D753982e89CC083917863F6dc9738448B91ef9", diff --git a/typescript/infra/config/environments/testnet4/middleware/liquidity-layer/verification.json b/typescript/infra/config/environments/testnet4/middleware/liquidity-layer/verification.json index 1cf821896..58b148be7 100644 --- a/typescript/infra/config/environments/testnet4/middleware/liquidity-layer/verification.json +++ b/typescript/infra/config/environments/testnet4/middleware/liquidity-layer/verification.json @@ -1,24 +1,4 @@ { - "goerli": [ - { - "name": "LiquidityLayerRouter", - "address": "0x2abe0860D81FB4242C748132bD69D125D88eaE26", - "isProxy": false, - "constructorArguments": "0x" - }, - { - "name": "CircleBridgeAdapter", - "address": "0xfe9d88aA85c5917822C804b949BcEDE832C02ce2", - "isProxy": false, - "constructorArguments": "0x" - }, - { - "name": "PortalAdapter", - "address": "0x68D753982e89CC083917863F6dc9738448B91ef9", - "isProxy": false, - "constructorArguments": "0x" - } - ], "fuji": [ { "name": "LiquidityLayerRouter", diff --git a/typescript/infra/config/environments/testnet4/middleware/queries/verification.json b/typescript/infra/config/environments/testnet4/middleware/queries/verification.json index 1412f7e32..252f1b63b 100644 --- a/typescript/infra/config/environments/testnet4/middleware/queries/verification.json +++ b/typescript/infra/config/environments/testnet4/middleware/queries/verification.json @@ -103,32 +103,6 @@ "isProxy": true } ], - "goerli": [ - { - "name": "InterchainQueryRouter", - "address": "0xfFf9dB6C772525B17cd4eB863A09DcD43e085F59", - "constructorArguments": "0x", - "isProxy": false - }, - { - "name": "TransparentUpgradeableProxy", - "address": "0xC87F9a6cADF77995b18FddE5049b6274695Dd559", - "constructorArguments": "0x000000000000000000000000c97d8e6f57b0d64971453ddc6eb8483fec9d163a000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000", - "isProxy": true - }, - { - "name": "InterchainQueryRouter", - "address": "0x1a90f8575462aF25B4fA957ecDdFe5738D1a1D36", - "constructorArguments": "", - "isProxy": false - }, - { - "name": "TransparentUpgradeableProxy", - "address": "0x46A2B1C3E8a93C3613Ebf326235FbD3e2f65660F", - "constructorArguments": "0000000000000000000000001a90f8575462af25b4fa957ecddfe5738d1a1d360000000000000000000000008f919348f9c4619a196acb5e377f49e5e2c0b56900000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000084f8c8765e000000000000000000000000cc737a94fecaec165abcf12ded095bb13f037685000000000000000000000000f90cb82a76492614d07b82a7658917f3ac811ac10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c00000000000000000000000000000000000000000000000000000000", - "isProxy": true - } - ], "moonbasealpha": [ { "name": "InterchainQueryRouter", @@ -143,58 +117,6 @@ "isProxy": true } ], - "optimismgoerli": [ - { - "name": "InterchainQueryRouter", - "address": "0xfFf9dB6C772525B17cd4eB863A09DcD43e085F59", - "constructorArguments": "0x", - "isProxy": false - }, - { - "name": "TransparentUpgradeableProxy", - "address": "0xC87F9a6cADF77995b18FddE5049b6274695Dd559", - "constructorArguments": "0x000000000000000000000000c97d8e6f57b0d64971453ddc6eb8483fec9d163a000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000", - "isProxy": true - }, - { - "name": "InterchainQueryRouter", - "address": "0x347C63AA547676C6f98f40348FEd0413523C9f85", - "constructorArguments": "", - "isProxy": false - }, - { - "name": "TransparentUpgradeableProxy", - "address": "0x6385E09099d889f912F90c47F10E903fe4feBF69", - "constructorArguments": "000000000000000000000000347c63aa547676c6f98f40348fed0413523c9f85000000000000000000000000cd19ff7306e04ea6b8f4b5ab1c5a198c186aab4200000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000084f8c8765e000000000000000000000000cc737a94fecaec165abcf12ded095bb13f037685000000000000000000000000f90cb82a76492614d07b82a7658917f3ac811ac10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c00000000000000000000000000000000000000000000000000000000", - "isProxy": true - } - ], - "arbitrumgoerli": [ - { - "name": "InterchainQueryRouter", - "address": "0xfFf9dB6C772525B17cd4eB863A09DcD43e085F59", - "constructorArguments": "0x", - "isProxy": false - }, - { - "name": "TransparentUpgradeableProxy", - "address": "0xC87F9a6cADF77995b18FddE5049b6274695Dd559", - "constructorArguments": "0x000000000000000000000000c97d8e6f57b0d64971453ddc6eb8483fec9d163a000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000", - "isProxy": true - }, - { - "name": "InterchainQueryRouter", - "address": "0x942A026b33FEe502AfdF37890D19A6A78b2C4b15", - "constructorArguments": "", - "isProxy": false - }, - { - "name": "TransparentUpgradeableProxy", - "address": "0x5b1E05e1fdDBc0f3d31c4E634ff4D5d84A56deEe", - "constructorArguments": "000000000000000000000000942a026b33fee502afdf37890d19a6a78b2c4b15000000000000000000000000cd19ff7306e04ea6b8f4b5ab1c5a198c186aab4200000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000084f8c8765e000000000000000000000000cc737a94fecaec165abcf12ded095bb13f037685000000000000000000000000f90cb82a76492614d07b82a7658917f3ac811ac10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c00000000000000000000000000000000000000000000000000000000", - "isProxy": true - } - ], "sepolia": [ { "name": "InterchainQueryRouter", diff --git a/typescript/infra/config/environments/testnet4/testquerysender/addresses.json b/typescript/infra/config/environments/testnet4/testquerysender/addresses.json index fd5455812..9f05f6c4e 100644 --- a/typescript/infra/config/environments/testnet4/testquerysender/addresses.json +++ b/typescript/infra/config/environments/testnet4/testquerysender/addresses.json @@ -10,14 +10,5 @@ }, "bsctestnet": { "TestQuerySender": "0x96D7D6Eba6C635e3EaC12b593Ef8B2eE1F6E6683" - }, - "goerli": { - "TestQuerySender": "0x96D7D6Eba6C635e3EaC12b593Ef8B2eE1F6E6683" - }, - "optimismgoerli": { - "TestQuerySender": "0x96D7D6Eba6C635e3EaC12b593Ef8B2eE1F6E6683" - }, - "arbitrumgoerli": { - "TestQuerySender": "0x96D7D6Eba6C635e3EaC12b593Ef8B2eE1F6E6683" } } diff --git a/typescript/infra/config/environments/testnet4/testquerysender/verification.json b/typescript/infra/config/environments/testnet4/testquerysender/verification.json index 440029f9f..2c579379b 100644 --- a/typescript/infra/config/environments/testnet4/testquerysender/verification.json +++ b/typescript/infra/config/environments/testnet4/testquerysender/verification.json @@ -31,14 +31,6 @@ "constructorArguments": "0x" } ], - "goerli": [ - { - "name": "TestQuerySender", - "address": "0x96D7D6Eba6C635e3EaC12b593Ef8B2eE1F6E6683", - "isProxy": false, - "constructorArguments": "0x" - } - ], "moonbasealpha": [ { "name": "TestQuerySender", @@ -46,21 +38,5 @@ "isProxy": false, "constructorArguments": "0x" } - ], - "optimismgoerli": [ - { - "name": "TestQuerySender", - "address": "0x96D7D6Eba6C635e3EaC12b593Ef8B2eE1F6E6683", - "isProxy": false, - "constructorArguments": "0x" - } - ], - "arbitrumgoerli": [ - { - "name": "TestQuerySender", - "address": "0x96D7D6Eba6C635e3EaC12b593Ef8B2eE1F6E6683", - "isProxy": false, - "constructorArguments": "0x" - } ] } diff --git a/typescript/infra/config/environments/testnet4/token-bridge.ts b/typescript/infra/config/environments/testnet4/token-bridge.ts index 0ae83c4a0..9f0960b4d 100644 --- a/typescript/infra/config/environments/testnet4/token-bridge.ts +++ b/typescript/infra/config/environments/testnet4/token-bridge.ts @@ -8,18 +8,10 @@ import { } from '@hyperlane-xyz/sdk'; const circleDomainMapping = [ - { - hyperlaneDomain: getDomainId(chainMetadata[Chains.goerli]), - circleDomain: 0, - }, { hyperlaneDomain: getDomainId(chainMetadata[Chains.fuji]), circleDomain: 1 }, ]; const wormholeDomainMapping = [ - { - hyperlaneDomain: getDomainId(chainMetadata[Chains.goerli]), - wormholeDomain: 2, - }, { hyperlaneDomain: getDomainId(chainMetadata[Chains.fuji]), wormholeDomain: 6, @@ -39,20 +31,6 @@ const wormholeDomainMapping = [ ]; export const bridgeAdapterConfigs: ChainMap = { - [Chains.goerli]: { - portal: { - type: BridgeAdapterType.Portal, - portalBridgeAddress: '0xF890982f9310df57d00f659cf4fd87e65adEd8d7', - wormholeDomainMapping, - }, - circle: { - type: BridgeAdapterType.Circle, - tokenMessengerAddress: '0xd0c3da58f55358142b8d3e06c1c30c5c6114efe8', - messageTransmitterAddress: '0x26413e8157cd32011e726065a5462e97dd4d03d9', - usdcAddress: '0x07865c6e87b9f70255377e024ace6630c1eaa37f', - circleDomainMapping, - }, - }, [Chains.fuji]: { portal: { type: BridgeAdapterType.Portal, diff --git a/typescript/infra/config/environments/testnet4/validators.ts b/typescript/infra/config/environments/testnet4/validators.ts index ea008d6b4..936784cd1 100644 --- a/typescript/infra/config/environments/testnet4/validators.ts +++ b/typescript/infra/config/environments/testnet4/validators.ts @@ -51,44 +51,6 @@ export const validatorChainConfig = ( 'fuji', ), }, - // chiado: { - // interval: 5, - // reorgPeriod: getReorgPeriod(chainMetadata.chiado), - // validators: validatorsConfig( - // { - // [Contexts.Hyperlane]: [ - // '0x12b1d1354441b900e0a36659ae54c3a9d5d22c57', - // '0x06c3757a4b7a912828e523bb8a5f980ddc297356', - // '0x0874967a145d70b799ebe9ed861ab7c93faef95a', - // ], - // [Contexts.ReleaseCandidate]: [ - // '0x7572ffd8af1abc02cc1d234ac750d387fd6768a0', - // '0x31b37a32657cf2915d434b409ee86978058fa91c', - // '0x32495780512fce64a45aca55ccc02202e9018dc5', - // ], - // }, - // 'chiado', - // ), - // }, - // lineagoerli: { - // interval: 5, - // reorgPeriod: getReorgPeriod(chainMetadata.lineagoerli), - // validators: validatorsConfig( - // { - // [Contexts.Hyperlane]: [ - // '0xd767ea1206b8295d7e1267ddd00e56d34f278db6', - // '0x4a5d7085ca93c22fbc994dd97857c98fcc745674', - // '0x8327779c3c31fa1ffc7f0c9ffae33e4d804bbd8f', - // ], - // [Contexts.ReleaseCandidate]: [ - // '0x52e2c6db923124e646011d172dea644e1cafe583', - // '0x48d540e94ff1acb886df6bfed2b7a92568639364', - // '0xe99e3acc543a535b8eeae98f3d6f39015efe0cd0', - // ], - // }, - // 'lineagoerli', - // ), - // }, mumbai: { interval: 5, reorgPeriod: getReorgPeriod(chainMetadata.mumbai), @@ -129,26 +91,6 @@ export const validatorChainConfig = ( 'bsctestnet', ), }, - goerli: { - interval: 5, - reorgPeriod: getReorgPeriod(chainMetadata.goerli), - validators: validatorsConfig( - { - [Contexts.Hyperlane]: [ - '0x05a9b5efe9f61f9142453d8e9f61565f333c6768', - '0x43a96c7dfbd8187c95013d6ee8665650cbdb2673', - '0x7940a12c050e24e1839c21ecb12f65afd84e8c5b', - ], - [Contexts.ReleaseCandidate]: [ - '0x6b32af7592948cbec6893363f77c08252d0ce0d7', - '0x4711d476a5929840196def397a156c5253b44b96', - '0xb0add42f2a4b824ba5fab2628f930dc1dcfc40f8', - ], - [Contexts.Neutron]: [], - }, - 'goerli', - ), - }, scrollsepolia: { interval: 5, reorgPeriod: getReorgPeriod(chainMetadata.scrollsepolia), @@ -189,66 +131,6 @@ export const validatorChainConfig = ( 'sepolia', ), }, - optimismgoerli: { - interval: 5, - reorgPeriod: getReorgPeriod(chainMetadata.optimismgoerli), - validators: validatorsConfig( - { - [Contexts.Hyperlane]: [ - '0x79e58546e2faca865c6732ad5f6c4951051c4d67', - '0x7bbfe1bb7146aad7df309c637987d856179ebbc1', - '0xf3d2fb4d53c2bb6a88cec040e0d87430fcee4e40', - ], - [Contexts.ReleaseCandidate]: [ - '0xed4cf9bf144457c927d7a39613c812c53f296283', - '0xec6b5ddfd20ee64ff0dcbc7472ad757dce151685', - '0x4acd2983a51f1c33c2ab41669184c7679e0316f1', - ], - [Contexts.Neutron]: [], - }, - 'optimismgoerli', - ), - }, - arbitrumgoerli: { - interval: 5, - reorgPeriod: getReorgPeriod(chainMetadata.arbitrumgoerli), - validators: validatorsConfig( - { - [Contexts.Hyperlane]: [ - '0x071c8d135845ae5a2cb73f98d681d519014c0a8b', - '0x1bcf03360989f15cbeb174c188288f2c6d2760d7', - '0xc1590eaaeaf380e7859564c5ebcdcc87e8369e0d', - ], - [Contexts.ReleaseCandidate]: [ - '0x869f67e89b5c0826a3c2f2ba72e6ae1d8a1952ff', - '0x9be82c7a063b47b2d04c890daabcb666b670a9a4', - '0x92c62f4b9cd60a7fe4216d1f12134d34cf827c41', - ], - [Contexts.Neutron]: [], - }, - 'arbitrumgoerli', - ), - }, - polygonzkevmtestnet: { - interval: 5, - reorgPeriod: getReorgPeriod(chainMetadata.polygonzkevmtestnet), - validators: validatorsConfig( - { - [Contexts.Hyperlane]: [ - '0x3f06b725bc9648917eb11c414e9f8d76fd959550', - '0x27bfc57679d9dd4ab2e870f5ed7ec0b339a0b636', - '0xd476548222f43206d0abaa30e46e28670aa7859c', - ], - [Contexts.ReleaseCandidate]: [ - '0x2d0214068e5d8e49c638b5a4c70c75080204be21', - '0x989bbbfa753431169556f69be1b0a496b252e8a6', - '0x292d5788587bb5efd5c2c911115527e57f50cd05', - ], - [Contexts.Neutron]: [], - }, - 'polygonzkevmtestnet', - ), - }, plumetestnet: { interval: 5, reorgPeriod: getReorgPeriod(chainMetadata.plumetestnet), diff --git a/typescript/infra/config/environments/testnet4/warp/verification.json b/typescript/infra/config/environments/testnet4/warp/verification.json index 079337cee..cda68c826 100644 --- a/typescript/infra/config/environments/testnet4/warp/verification.json +++ b/typescript/infra/config/environments/testnet4/warp/verification.json @@ -1,18 +1,4 @@ { - "goerli": [ - { - "name": "HypERC20Collateral", - "address": "0xEF2a1f411d919878159303D9E3fe00D001F7D1D0", - "constructorArguments": "00000000000000000000000007865c6e87b9f70255377e024ace6630c1eaa37f00000000000000000000000049cfd6ef774acab14814d699e3f7ee36fdfba932", - "isProxy": false - }, - { - "name": "HypNative", - "address": "0x0918293aadfa13F8c9F2cdE415811b6AD9ff4a2d", - "constructorArguments": "00000000000000000000000049cfd6ef774acab14814d699e3f7ee36fdfba932", - "isProxy": false - } - ], "plumetestnet": [ { "name": "HypERC20", diff --git a/typescript/infra/config/rcMultisigIsmConfigs.ts b/typescript/infra/config/rcMultisigIsmConfigs.ts index d26ba0644..6a2b2ebf5 100644 --- a/typescript/infra/config/rcMultisigIsmConfigs.ts +++ b/typescript/infra/config/rcMultisigIsmConfigs.ts @@ -69,10 +69,6 @@ export const rcMultisigIsmConfigs: ChainMap = { threshold: 1, validators: ['0x7572ffd8af1abc02cc1d234ac750d387fd6768a0'], }, - lineagoerli: { - threshold: 1, - validators: ['0x52e2c6db923124e646011d172dea644e1cafe583'], - }, mumbai: { threshold: 1, validators: ['0x7fc2981964427f09e317eda559f506bfd37f1ccb'], @@ -81,10 +77,6 @@ export const rcMultisigIsmConfigs: ChainMap = { threshold: 1, validators: ['0x6353c7402626054c824bd0eca721f82b725e2b4d'], }, - goerli: { - threshold: 1, - validators: ['0x6b32af7592948cbec6893363f77c08252d0ce0d7'], - }, scrollsepolia: { threshold: 1, validators: ['0x50d939d66f114350f322eb8b2e9f01fbc401d4c9'], @@ -93,16 +85,4 @@ export const rcMultisigIsmConfigs: ChainMap = { threshold: 1, validators: ['0x49f253c0dab33be1573d6c2769b3d9e584d91f82'], }, - optimismgoerli: { - threshold: 1, - validators: ['0xed4cf9bf144457c927d7a39613c812c53f296283'], - }, - arbitrumgoerli: { - threshold: 1, - validators: ['0x869f67e89b5c0826a3c2f2ba72e6ae1d8a1952ff'], - }, - polygonzkevmtestnet: { - threshold: 1, - validators: ['0x2d0214068e5d8e49c638b5a4c70c75080204be21'], - }, }; diff --git a/typescript/infra/scripts/announce-validators.ts b/typescript/infra/scripts/announce-validators.ts index 05cb607f9..10e6f6181 100644 --- a/typescript/infra/scripts/announce-validators.ts +++ b/typescript/infra/scripts/announce-validators.ts @@ -23,7 +23,7 @@ function getArgs() { .choices('chain', AllChains) .describe( 'location', - 'location, e.g. s3://hyperlane-testnet4-goerli-validator-0/us-east-1', + 'location, e.g. s3://hyperlane-testnet4-sepolia-validator-0/us-east-1', ) .string('location') .check(({ context, chain, location }) => { diff --git a/typescript/infra/scripts/funding/fund-keys-from-deployer.ts b/typescript/infra/scripts/funding/fund-keys-from-deployer.ts index ee4c2da3d..1e50276b2 100644 --- a/typescript/infra/scripts/funding/fund-keys-from-deployer.ts +++ b/typescript/infra/scripts/funding/fund-keys-from-deployer.ts @@ -60,34 +60,16 @@ const nativeBridges = { l1ETHGateway: '0x8A54A2347Da2562917304141ab67324615e9866d', l1Messenger: '0x50c7d3e7f7c656493D1D76aaa1a836CedfCBB16A', }, - polygonzkevmtestnet: { - l1EVMBridge: '0xF6BEEeBB578e214CA9E23B0e9683454Ff88Ed2A7', - }, }; -type L2Chain = - | Chains.optimism - | Chains.optimismgoerli - | Chains.arbitrum - | Chains.arbitrumgoerli - | Chains.base; - -const L2Chains: ChainName[] = [ - Chains.optimism, - Chains.optimismgoerli, - Chains.arbitrum, - Chains.arbitrumgoerli, - Chains.base, - Chains.polygonzkevmtestnet, -]; +type L2Chain = Chains.optimism | Chains.arbitrum | Chains.base; + +const L2Chains: ChainName[] = [Chains.optimism, Chains.arbitrum, Chains.base]; const L2ToL1: ChainMap = { - optimismgoerli: 'goerli', - arbitrumgoerli: 'goerli', optimism: 'ethereum', arbitrum: 'ethereum', base: 'ethereum', - polygonzkevmtestnet: 'goerli', }; // Missing types declaration for bufio @@ -140,14 +122,10 @@ const igpClaimThresholdPerChain: ChainMap = { arbitrum: '0.1', bsc: '0.3', bsctestnet: '1', - goerli: '1', sepolia: '1', moonbeam: '5', - optimismgoerli: '1', - arbitrumgoerli: '1', gnosis: '5', scrollsepolia: '0.1', - polygonzkevmtestnet: '0.1', base: '0.1', scroll: '0.1', polygonzkevm: '0.1', @@ -704,8 +682,6 @@ class ContextFunder { tx = await this.bridgeToArbitrum(l2Chain, amount); } else if (l2Chain.includes('scroll')) { tx = await this.bridgeToScroll(l2Chain, amount, to); - } else if (l2Chain.includes('zkevm')) { - tx = await this.bridgeToPolygonCDK(l2Chain, amount, to); } else { throw new Error(`${l2Chain} is not an L2`); } @@ -781,31 +757,6 @@ class ContextFunder { ); } - private async bridgeToPolygonCDK( - l2Chain: L2Chain, - amount: BigNumber, - to: Address, - ) { - const l1Chain = L2ToL1[l2Chain]; - const l1ChainSigner = this.multiProvider.getSigner(l1Chain); - const polygonZkEVMbridge = new ethers.Contract( - nativeBridges.polygonzkevmtestnet.l1EVMBridge, - PolygonZkEVMBridge.abi, - l1ChainSigner, - ); - return polygonZkEVMbridge.bridgeAsset( - 1, // 0 is mainnet, 1 is l2 - to, - amount, - ethers.constants.AddressZero, - true, - [], - { - value: amount, - }, - ); - } - private async updateWalletBalanceGauge(chain: ChainName) { const funderAddress = await this.multiProvider.getSignerAddress(chain); walletBalanceGauge diff --git a/typescript/sdk/src/consts/chainMetadata.ts b/typescript/sdk/src/consts/chainMetadata.ts index 53bbc38f4..fec47e06e 100644 --- a/typescript/sdk/src/consts/chainMetadata.ts +++ b/typescript/sdk/src/consts/chainMetadata.ts @@ -78,24 +78,6 @@ export const arbitrum: ChainMetadata = { technicalStack: ChainTechnicalStack.ArbitrumNitro, }; -export const arbitrumgoerli: ChainMetadata = { - blocks: { - confirmations: 1, - estimateBlockTime: 3, - reorgPeriod: 1, - }, - chainId: 421613, - displayName: 'Arbitrum Goerli', - displayNameShort: 'Arb. Goerli', - domainId: 421613, - isTestnet: true, - name: Chains.arbitrumgoerli, - nativeToken: etherToken, - protocol: ProtocolType.Ethereum, - rpcUrls: [{ http: 'https://goerli-rollup.arbitrum.io/rpc' }], - technicalStack: ChainTechnicalStack.ArbitrumNitro, -}; - export const avalanche: ChainMetadata = { blockExplorers: [ { @@ -339,33 +321,6 @@ export const fuji: ChainMetadata = { ], }; -export const goerli: ChainMetadata = { - blockExplorers: [ - { - apiUrl: 'https://api-goerli.etherscan.io/api', - family: ExplorerFamily.Etherscan, - name: 'Etherscan', - url: 'https://goerli.etherscan.io', - }, - ], - blocks: { - confirmations: 1, - estimateBlockTime: 13, - reorgPeriod: 2, - }, - chainId: 5, - displayName: 'Goerli', - domainId: 5, - isTestnet: true, - name: Chains.goerli, - nativeToken: etherToken, - protocol: ProtocolType.Ethereum, - rpcUrls: [ - { http: 'https://goerli.infura.io/v3/9aa3d95b3bc440fa88ea12eaa4456161' }, - { http: 'https://rpc.ankr.com/eth_goerli' }, - ], -}; - export const gnosis: ChainMetadata = { blockExplorers: [ { @@ -455,30 +410,6 @@ export const injective: ChainMetadata = { slip44: 118, }; -export const lineagoerli: ChainMetadata = { - blockExplorers: [ - { - apiUrl: 'https://explorer.goerli.linea.build/api', - family: ExplorerFamily.Blockscout, - name: 'Linea Explorer', - url: 'https://explorer.goerli.linea.build', - }, - ], - blocks: { - confirmations: 1, - estimateBlockTime: 12, - reorgPeriod: 2, - }, - chainId: 59140, - displayName: 'Linea Goerli', - domainId: 59140, - isTestnet: true, - name: Chains.lineagoerli, - nativeToken: etherToken, - protocol: ProtocolType.Ethereum, - rpcUrls: [{ http: 'https://rpc.goerli.linea.build' }], -}; - export const mantapacific: ChainMetadata = { blockExplorers: [ { @@ -656,31 +587,6 @@ export const optimism: ChainMetadata = { rpcUrls: [{ http: 'https://mainnet.optimism.io' }], }; -export const optimismgoerli: ChainMetadata = { - blockExplorers: [ - { - apiUrl: 'https://api-goerli-optimism.etherscan.io/api', - family: ExplorerFamily.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: Chains.optimismgoerli, - nativeToken: etherToken, - protocol: ProtocolType.Ethereum, - rpcUrls: [{ http: 'https://goerli.optimism.io' }], -}; - export const plumetestnet: ChainMetadata = { blockExplorers: [ { @@ -770,31 +676,6 @@ export const polygonzkevm: ChainMetadata = { ], }; -export const polygonzkevmtestnet: ChainMetadata = { - blockExplorers: [ - { - apiUrl: 'https://api-testnet-zkevm.polygonscan.com/api', - family: ExplorerFamily.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: Chains.polygonzkevmtestnet, - nativeToken: etherToken, - protocol: ProtocolType.Ethereum, - rpcUrls: [{ http: 'https://rpc.public.zkevm-test.net' }], -}; - // Testnet for Nautilus export const proteustestnet: ChainMetadata = { blocks: { @@ -1084,7 +965,6 @@ export const viction: ChainMetadata = { export const chainMetadata: ChainMap = { alfajores, arbitrum, - arbitrumgoerli, avalanche, base, bsc, @@ -1095,21 +975,17 @@ export const chainMetadata: ChainMap = { ethereum, fuji, gnosis, - goerli, inevm, injective, - lineagoerli, mantapacific, moonbeam, mumbai, nautilus, neutron, optimism, - optimismgoerli, plumetestnet, polygon, polygonzkevm, - polygonzkevmtestnet, proteustestnet, scroll, scrollsepolia, diff --git a/typescript/sdk/src/consts/chains.ts b/typescript/sdk/src/consts/chains.ts index 8142a2189..5f40016db 100644 --- a/typescript/sdk/src/consts/chains.ts +++ b/typescript/sdk/src/consts/chains.ts @@ -5,7 +5,6 @@ export enum Chains { alfajores = 'alfajores', arbitrum = 'arbitrum', - arbitrumgoerli = 'arbitrumgoerli', avalanche = 'avalanche', base = 'base', bsc = 'bsc', @@ -15,21 +14,17 @@ export enum Chains { ethereum = 'ethereum', fuji = 'fuji', gnosis = 'gnosis', - goerli = 'goerli', inevm = 'inevm', injective = 'injective', - lineagoerli = 'lineagoerli', mantapacific = 'mantapacific', moonbeam = 'moonbeam', mumbai = 'mumbai', nautilus = 'nautilus', neutron = 'neutron', optimism = 'optimism', - optimismgoerli = 'optimismgoerli', plumetestnet = 'plumetestnet', polygon = 'polygon', polygonzkevm = 'polygonzkevm', - polygonzkevmtestnet = 'polygonzkevmtestnet', proteustestnet = 'proteustestnet', scroll = 'scroll', scrollsepolia = 'scrollsepolia', @@ -80,16 +75,11 @@ export const Mainnets: Array = [ export const Testnets: Array = [ Chains.alfajores, - Chains.arbitrumgoerli, Chains.bsctestnet, Chains.chiado, Chains.fuji, - Chains.goerli, - Chains.lineagoerli, Chains.mumbai, - Chains.optimismgoerli, Chains.plumetestnet, - Chains.polygonzkevmtestnet, Chains.scrollsepolia, Chains.sepolia, Chains.solanadevnet, diff --git a/typescript/sdk/src/consts/environments/testnet.json b/typescript/sdk/src/consts/environments/testnet.json index e4e676510..1757affe7 100644 --- a/typescript/sdk/src/consts/environments/testnet.json +++ b/typescript/sdk/src/consts/environments/testnet.json @@ -17,24 +17,6 @@ "testTokenRecipient": "0x92dC0a76452a9D9358D2d2dEd8CddA209DF67c45", "validatorAnnounce": "0x3726EE36a2A9e11a40d1ffD7D9A1A16e0154cDA0" }, - "arbitrumgoerli": { - "aggregationHook": "0xf852EB6b98d84A4296754043a56759a0Ae0E06df", - "aggregationHookFactory": "0x39a8711BF44165A2292Cb5cB43229659c2Bb11c9", - "aggregationIsmFactory": "0xC5Bb8CDD44B6c56695df45c7AA8012a97dD6ED13", - "fallbackRoutingHook": "0xEdA6f85f4761A1f9e42FD40CA5a4E8Ce1C764015", - "interchainGasPaymaster": "0x76189acFA212298d7022624a4633411eE0d2f26F", - "mailbox": "0x13dABc0351407d5aAa0A50003a166A73b4febfDc", - "merkleRootMultisigIsmFactory": "0x17D58eBb5Ea0E2d360c877E119FAef4C4052e6B9", - "merkleTreeHook": "0xf0A38e1eEA49dAc7968F470c3aA0BDE2565A5d80", - "messageIdMultisigIsmFactory": "0x922CeEe9e8832a047e6aD68Df4F079F271b73Ac3", - "protocolFee": "0x0358ba0D90ED2d90fB8cBb610F27C274D8077a0B", - "proxyAdmin": "0x00DFB81Bfc45fa03060b605273147F274ea807E5", - "routingIsmFactory": "0x4D6b4fe86cA1B49ea9CcDFA92F97e4EA0C27Cef2", - "storageGasOracle": "0xFc8229ADB46D96056A6e451Fb3c55d60FFeD056f", - "testRecipient": "0x07543860AE9E72aBcF2Bae9827b23621A64Fa416", - "testTokenRecipient": "0x207db41AB053213451f1a71d936353C9056A0205", - "validatorAnnounce": "0x4a01EEBa1CC20F47A2e60aE4ec932051601FcB9e" - }, "bsctestnet": { "aggregationHook": "0x3d675bB93250Ab7603F40cbb9194bae210784627", "aggregationHookFactory": "0xa1145B39F1c7Ef9aA593BC1DB1634b00CC020942", @@ -70,24 +52,6 @@ "testTokenRecipient": "0x9CC10c844B3Bbae2444E39991aB027C4A05D1F2e", "validatorAnnounce": "0x4f7179A691F8a684f56cF7Fed65171877d30739a" }, - "goerli": { - "aggregationHook": "0x2dF77b3efe9B8f9aEDf7bFC86f40B048178d8116", - "aggregationHookFactory": "0x6bc243963f80AEa80948e8538bB114d4122DD9c5", - "aggregationIsmFactory": "0x8a176773d54292123d271FA0B9C7C8Def4c3a31b", - "fallbackRoutingHook": "0xd9E546CBB9577dC6346EdB40b24E86aE52487ab8", - "interchainGasPaymaster": "0x0cD26594ea6c6526927C0F5225AC09F6288e7140", - "mailbox": "0x49cfd6Ef774AcAb14814D699e3F7eE36Fdfba932", - "merkleRootMultisigIsmFactory": "0x8e43aCfb338B137A3befd9b92BfD84E128adE0B8", - "merkleTreeHook": "0x28c294C61D3dE053462d2Cfa5d5f8c8D70605A59", - "messageIdMultisigIsmFactory": "0xDdB54502A8e2a31C48148C62A8a9E83a693d6173", - "protocolFee": "0x9293B8dAcA7933765de499C992B0Fa86Bb104b0f", - "proxyAdmin": "0x0EdB3604D230963ecE9d83963164CFe2fDef576B", - "routingIsmFactory": "0xeB998dC788E2c1e772d198d32e50890544776e75", - "storageGasOracle": "0xeC34c715ee6d050b2172E8aF650Db779561266C1", - "testRecipient": "0x4fC0Ac163eFFEb7890937cB89275B2C231880F22", - "testTokenRecipient": "0xd8958706B33E20C88679a22203F0AFa6158c834d", - "validatorAnnounce": "0x3c182AD9cA8A71bc107Ef440C2667E8360e1158E" - }, "mumbai": { "aggregationHook": "0xD546273418733AcEC8c7A67EfB881c9Ea83851bf", "aggregationHookFactory": "0x54CA9De95B37365909364672D363D2ecFC4e1Af4", @@ -106,24 +70,6 @@ "testTokenRecipient": "0x57d098e6952B6C1c85Ce0B68C9Deada3dCf7D05A", "validatorAnnounce": "0x99303EFF09332cDd93E8BC8b2F07b2416e4501e5" }, - "optimismgoerli": { - "aggregationHook": "0x1C8A2588b8038BF9B7b1b60dD0EdF5b995A45599", - "aggregationHookFactory": "0x00cE81F7B02e0673815a8b0A54e62AeabDE78685", - "aggregationIsmFactory": "0xf666A33C451E8371907aD22dd545E1678fCa1582", - "fallbackRoutingHook": "0xc775c748F8c9F5443151Fd989e8B61375657474d", - "interchainGasPaymaster": "0x02A7661273528EfF3d78CBE7CbD1a717b28B89fC", - "mailbox": "0xB5f021728Ea6223E3948Db2da61d612307945eA2", - "merkleRootMultisigIsmFactory": "0xAbC25d7daDD748948F5cC912A807b0f8FcBb56a9", - "merkleTreeHook": "0xFEe074B31B5B259eB3109737bE13D39B853b47b9", - "messageIdMultisigIsmFactory": "0x7868B6026E36C4b6E2ca6a0CaBDb1A6D0CcC443B", - "protocolFee": "0x962e30F6A3ECDA85c7fa1FcF38cD04efA991Ee20", - "proxyAdmin": "0x800b4be4Dc91E56DE934D9f16888d113eFf89Ebb", - "routingIsmFactory": "0xce8E9D701A1DFfe672c1d8dB20De2B3fa6F4437D", - "storageGasOracle": "0x4927C33299091033D935C15DE6b6073164e99BE0", - "testRecipient": "0x518eA1802407b4b5AAF3aA92c1A803FfbA9FB7fe", - "testTokenRecipient": "0xB9E45eA920DE14e95A16Ed5e1275F893552f2e32", - "validatorAnnounce": "0x24D31e12E4d3bc2C46C994FcE0c828b218A1aeAb" - }, "plumetestnet": { "aggregationHook": "0x31dF0EEE7Dc7565665468698a0da221225619a1B", "aggregationHookFactory": "0x6966b0E55883d49BFB24539356a2f8A673E02039", @@ -143,24 +89,6 @@ "testRecipient": "0xe0B988062A0C6492177d64823Ab95a9c256c2a5F", "validatorAnnounce": "0x20c44b1E3BeaDA1e9826CFd48BeEDABeE9871cE9" }, - "polygonzkevmtestnet": { - "aggregationHook": "0x0Fd2C6F0Ad45e766660b9fDebCF36a2AD69536D1", - "aggregationHookFactory": "0x16B710b86CAd07E6F1C531861a16F5feC29dba37", - "aggregationIsmFactory": "0xeb6f11189197223c656807a83B0DD374f9A6dF44", - "fallbackRoutingHook": "0xBF2C366530C1269d531707154948494D3fF4AcA7", - "interchainGasPaymaster": "0xAD34A66Bf6dB18E858F6B686557075568c6E031C", - "mailbox": "0x598facE78a4302f11E3de0bee1894Da0b2Cb71F8", - "merkleRootMultisigIsmFactory": "0xfc6e546510dC9d76057F1f76633FCFfC188CB213", - "merkleTreeHook": "0x68311418D79fE8d96599384ED767d225635d88a8", - "messageIdMultisigIsmFactory": "0x275aCcCa81cAD931dC6fB6E49ED233Bc99Bed4A7", - "protocolFee": "0xddf4C3e791caCaFd26D7fb275549739B38ae6e75", - "proxyAdmin": "0x666a24F62f7A97BA33c151776Eb3D9441a059eB8", - "routingIsmFactory": "0xc08675806BA844467E559E45E4bB59e66778bDcd", - "storageGasOracle": "0x3707bc8C7342aA6f693bCe1Bd7671Fca146F7F0A", - "testRecipient": "0x11918DC33E067C5DA83EEF58E50F856398b8Df4C", - "testTokenRecipient": "0x04438ef7622f5412f82915F59caD4f704C61eA48", - "validatorAnnounce": "0x7914A3349107A7295Bbf2374db5A973d73D1b324" - }, "scrollsepolia": { "aggregationHook": "0x7b63Aa270335F8896717c2A809205F4b650E4268", "aggregationHookFactory": "0x44b764045BfDC68517e10e783E69B376cef196B2", diff --git a/typescript/sdk/src/consts/multisigIsm.ts b/typescript/sdk/src/consts/multisigIsm.ts index 74de5c62f..e19fad5b9 100644 --- a/typescript/sdk/src/consts/multisigIsm.ts +++ b/typescript/sdk/src/consts/multisigIsm.ts @@ -22,15 +22,6 @@ export const defaultMultisigConfigs: ChainMap = { ], }, - arbitrumgoerli: { - threshold: 2, - validators: [ - '0x071c8d135845ae5a2cb73f98d681d519014c0a8b', - '0x1bcf03360989f15cbeb174c188288f2c6d2760d7', - '0xc1590eaaeaf380e7859564c5ebcdcc87e8369e0d', - ], - }, - avalanche: { threshold: 2, validators: [ @@ -125,15 +116,6 @@ export const defaultMultisigConfigs: ChainMap = { ], }, - goerli: { - threshold: 2, - validators: [ - '0x05a9b5efe9f61f9142453d8e9f61565f333c6768', - '0x43a96c7dfbd8187c95013d6ee8665650cbdb2673', - '0x7940a12c050e24e1839c21ecb12f65afd84e8c5b', - ], - }, - inevm: { threshold: 2, validators: [ @@ -152,15 +134,6 @@ export const defaultMultisigConfigs: ChainMap = { ], }, - lineagoerli: { - threshold: 2, - validators: [ - '0xd767ea1206b8295d7e1267ddd00e56d34f278db6', - '0x4a5d7085ca93c22fbc994dd97857c98fcc745674', - '0x8327779c3c31fa1ffc7f0c9ffae33e4d804bbd8f', - ], - }, - mantapacific: { threshold: 5, validators: [ @@ -217,15 +190,6 @@ export const defaultMultisigConfigs: ChainMap = { ], }, - optimismgoerli: { - threshold: 2, - validators: [ - '0x79e58546e2faca865c6732ad5f6c4951051c4d67', - '0x7bbfe1bb7146aad7df309c637987d856179ebbc1', - '0xf3d2fb4d53c2bb6a88cec040e0d87430fcee4e40', - ], - }, - plumetestnet: { threshold: 1, validators: ['0xe765a214849f3ecdf00793b97d00422f2d408ea6'], @@ -250,15 +214,6 @@ export const defaultMultisigConfigs: ChainMap = { ], }, - polygonzkevmtestnet: { - threshold: 2, - validators: [ - '0x3f06b725bc9648917eb11c414e9f8d76fd959550', - '0x27bfc57679d9dd4ab2e870f5ed7ec0b339a0b636', - '0xd476548222f43206d0abaa30e46e28670aa7859c', - ], - }, - scroll: { threshold: 2, validators: [ diff --git a/typescript/sdk/src/metadata/chainMetadata.test.ts b/typescript/sdk/src/metadata/chainMetadata.test.ts index ed0c403fd..210480f87 100644 --- a/typescript/sdk/src/metadata/chainMetadata.test.ts +++ b/typescript/sdk/src/metadata/chainMetadata.test.ts @@ -9,7 +9,7 @@ import { ChainMetadata, isValidChainMetadata } from './chainMetadataTypes'; const minimalSchema: ChainMetadata = { chainId: 5, domainId: 5, - name: 'goerli', + name: 'sepolia', protocol: ProtocolType.Ethereum, rpcUrls: [{ http: 'https://foobar.com' }], }; diff --git a/typescript/sdk/src/providers/SmartProvider/SmartProvider.test.ts b/typescript/sdk/src/providers/SmartProvider/SmartProvider.test.ts index 64f2ec6a7..6ce1178f6 100644 --- a/typescript/sdk/src/providers/SmartProvider/SmartProvider.test.ts +++ b/typescript/sdk/src/providers/SmartProvider/SmartProvider.test.ts @@ -10,30 +10,30 @@ import { ChainMetadata } from '../../metadata/chainMetadataTypes'; import { ProviderMethod } from './ProviderMethods'; import { HyperlaneSmartProvider } from './SmartProvider'; -const DEFAULT_ACCOUNT = '0x9d525E28Fe5830eE92d7Aa799c4D21590567B595'; -const WETH_CONTRACT = '0xb4fbf271143f4fbf7b91a5ded31805e42b2208d6'; +const DEFAULT_ACCOUNT = '0xfaD1C94469700833717Fa8a3017278BC1cA8031C'; +const WETH_CONTRACT = '0x7b79995e5f793A07Bc00c21412e50Ecae098E7f9'; const WETH_TRANSFER_TOPIC0 = '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef'; const WETH_CALL_DATA = '0x70a082310000000000000000000000004f7a67464b5976d7547c860109e4432d50afb38e'; const TRANSFER_TX_HASH = - '0x45a586f90ffd5d0f8e618f0f3703b14c2c9e4611af6231d6fed32c62776b6c1b'; + '0x7a975792c023733b3013ada23e1f556f5a06443765ec576e56d0b0aa3c4bdc74'; const pagination = { maxBlockRange: 1000 }; -const goerliRpcConfig1 = { ...chainMetadata.goerli.rpcUrls[0], pagination }; -const goerliRpcConfig2 = { ...chainMetadata.goerli.rpcUrls[1], pagination }; +const sepoliaRpcConfig1 = { ...chainMetadata.sepolia.rpcUrls[0], pagination }; +const sepoliaRpcConfig2 = { ...chainMetadata.sepolia.rpcUrls[1], pagination }; const justExplorersConfig: ChainMetadata = { - ...chainMetadata.goerli, + ...chainMetadata.sepolia, rpcUrls: [] as any, }; const justRpcsConfig: ChainMetadata = { - ...chainMetadata.goerli, - rpcUrls: [goerliRpcConfig1, goerliRpcConfig2], + ...chainMetadata.sepolia, + rpcUrls: [sepoliaRpcConfig1, sepoliaRpcConfig2], blockExplorers: [], }; const combinedConfig: ChainMetadata = { - ...chainMetadata.goerli, - rpcUrls: [goerliRpcConfig1], + ...chainMetadata.sepolia, + rpcUrls: [sepoliaRpcConfig1], }; const configs: [string, ChainMetadata][] = [ ['Just Explorers', justExplorersConfig], diff --git a/typescript/sdk/src/token/Token.test.ts b/typescript/sdk/src/token/Token.test.ts index 41ac8170b..edaedcab9 100644 --- a/typescript/sdk/src/token/Token.test.ts +++ b/typescript/sdk/src/token/Token.test.ts @@ -36,13 +36,13 @@ const STANDARD_TO_TOKEN: Record = { name: 'Injective Coin', }, [TokenStandard.EvmHypCollateral]: { - chainName: Chains.goerli, + chainName: Chains.bsctestnet, standard: TokenStandard.EvmHypCollateral, - addressOrDenom: '0x145de8760021c4ac6676376691b78038d3DE9097', - collateralAddressOrDenom: '0xb4fbf271143f4fbf7b91a5ded31805e42b2208d6', + addressOrDenom: '0x31b5234A896FbC4b3e2F7237592D054716762131', + collateralAddressOrDenom: '0x64544969ed7ebf5f083679233325356ebe738930', decimals: 18, - symbol: 'WETH', - name: 'Weth', + symbol: 'USDC', + name: 'USDC', }, [TokenStandard.EvmHypSynthetic]: { chainName: Chains.inevm,