From 9962c969e1695f9f4ad6de7a836146c33db8abc7 Mon Sep 17 00:00:00 2001 From: Nam Chu Hoai Date: Wed, 5 Oct 2022 16:17:55 -0400 Subject: [PATCH] Remove deprecated networks (#1136) * Remove rust config files for deprecated networks * Remove chains from infra/sdk --- rust/config/testnet2/alfajores_config.json | 42 -- .../testnet2/arbitrumrinkeby_config.json | 140 ------ rust/config/testnet2/bsctestnet_config.json | 42 -- rust/config/testnet2/fuji_config.json | 42 -- rust/config/testnet2/goerli_config.json | 42 -- rust/config/testnet2/kovan_config.json | 140 ------ .../config/testnet2/moonbasealpha_config.json | 42 -- rust/config/testnet2/mumbai_config.json | 42 -- .../config/testnet2/optimismkovan_config.json | 140 ------ .../config/environments/testnet2/agent.ts | 17 +- .../config/environments/testnet2/chains.ts | 8 +- .../config/environments/testnet2/core.ts | 33 -- .../environments/testnet2/helloworld.ts | 4 +- .../environments/testnet2/validators.ts | 123 ----- .../funding/fund-keys-from-deployer.ts | 3 - .../sdk/src/consts/chainConnectionConfigs.ts | 33 -- typescript/sdk/src/consts/chains.ts | 3 - .../sdk/src/consts/environments/testnet2.json | 435 ------------------ .../src/deploy/core/HyperlaneCoreChecker.ts | 4 +- 19 files changed, 10 insertions(+), 1325 deletions(-) delete mode 100644 rust/config/testnet2/arbitrumrinkeby_config.json delete mode 100644 rust/config/testnet2/kovan_config.json delete mode 100644 rust/config/testnet2/optimismkovan_config.json diff --git a/rust/config/testnet2/alfajores_config.json b/rust/config/testnet2/alfajores_config.json index 00bd05b15..c762ea63e 100644 --- a/rust/config/testnet2/alfajores_config.json +++ b/rust/config/testnet2/alfajores_config.json @@ -2,20 +2,6 @@ "environment": "testnet2", "signers": {}, "inboxes": { - "kovan": { - "domain": "3000", - "name": "kovan", - "rpcStyle": "ethereum", - "finalityBlocks": "15", - "connection": { - "type": "http", - "url": "" - }, - "addresses": { - "inbox": "0x339B46496D60b1b6B42e9715DeD8B3D2154dA0Bb", - "validatorManager": "0x4b6fb57de2DE643bEFBa13F46149A765FCd2DD09" - } - }, "fuji": { "domain": "43113", "name": "fuji", @@ -58,34 +44,6 @@ "validatorManager": "0x5B30De0c322F7720D144df2AB2e82b160Eba0EBF" } }, - "arbitrumrinkeby": { - "domain": "1634872690", - "name": "arbitrumrinkeby", - "rpcStyle": "ethereum", - "finalityBlocks": "0", - "connection": { - "type": "http", - "url": "" - }, - "addresses": { - "inbox": "0xcE4D149Db78729E8b52a9D79A36E64C5429dD39a", - "validatorManager": "0x6202f54B22b72526dEC5364F6b7bE2bd0abEd8A6" - } - }, - "optimismkovan": { - "domain": "1869622635", - "name": "optimismkovan", - "rpcStyle": "ethereum", - "finalityBlocks": "0", - "connection": { - "type": "http", - "url": "" - }, - "addresses": { - "inbox": "0xF8E6c1222049AAb68E410E43242449994Cb64996", - "validatorManager": "0x413c74F3D034dB54A1ecfFbd0Ad74Cb25E59f579" - } - }, "goerli": { "domain": "5", "name": "goerli", diff --git a/rust/config/testnet2/arbitrumrinkeby_config.json b/rust/config/testnet2/arbitrumrinkeby_config.json deleted file mode 100644 index d8dd7561d..000000000 --- a/rust/config/testnet2/arbitrumrinkeby_config.json +++ /dev/null @@ -1,140 +0,0 @@ -{ - "environment": "testnet2", - "signers": {}, - "inboxes": { - "alfajores": { - "domain": "1000", - "name": "alfajores", - "rpcStyle": "ethereum", - "finalityBlocks": "0", - "connection": { - "type": "http", - "url": "" - }, - "addresses": { - "inbox": "0x90C85cEB1D7CEaD73914FC57dd14ea5115b27a32", - "validatorManager": "0x0d772404D3a6De86F7263D82E055686f73f55Ba8" - } - }, - "kovan": { - "domain": "3000", - "name": "kovan", - "rpcStyle": "ethereum", - "finalityBlocks": "15", - "connection": { - "type": "http", - "url": "" - }, - "addresses": { - "inbox": "0x78f135365794892b3b6bB589Db5340715126E32f", - "validatorManager": "0xce25Bc319913BE39d1469ab6c4f0443d94d96d81" - } - }, - "fuji": { - "domain": "43113", - "name": "fuji", - "rpcStyle": "ethereum", - "finalityBlocks": "0", - "connection": { - "type": "http", - "url": "" - }, - "addresses": { - "inbox": "0x3f09709b9865993f0320C3e836f3a3F4ff83eA9b", - "validatorManager": "0x71775B071F77F1ce52Ece810ce084451a3045FFe" - } - }, - "mumbai": { - "domain": "80001", - "name": "mumbai", - "rpcStyle": "ethereum", - "finalityBlocks": "32", - "connection": { - "type": "http", - "url": "" - }, - "addresses": { - "inbox": "0x4C434bC53B0527Df7D12F2cFF17716199C3b36D8", - "validatorManager": "0x26b1C86221dA5Fa24C508dCeD1C86749F2Bdf4F0" - } - }, - "bsctestnet": { - "domain": "1651715444", - "name": "bsctestnet", - "rpcStyle": "ethereum", - "finalityBlocks": "9", - "connection": { - "type": "http", - "url": "" - }, - "addresses": { - "inbox": "0xF61322936D80cd87B49df48F3DE24fD5c02dE9D1", - "validatorManager": "0xd876C01aB40e8cE42Db417fBC79c726d45504dE4" - } - }, - "optimismkovan": { - "domain": "1869622635", - "name": "optimismkovan", - "rpcStyle": "ethereum", - "finalityBlocks": "0", - "connection": { - "type": "http", - "url": "" - }, - "addresses": { - "inbox": "0xB6a4129c305056d80fFfea96DdbDCf1F58BC8240", - "validatorManager": "0xe63844Ca06Ce8E6D4097Cb33E9b3d62704122307" - } - }, - "goerli": { - "domain": "5", - "name": "goerli", - "rpcStyle": "ethereum", - "finalityBlocks": "7", - "connection": { - "type": "http", - "url": "" - }, - "addresses": { - "inbox": "0x5d56B8a669F50193b54319442c6EEE5edD662381", - "validatorManager": "0x527768930D889662Fe7ACF64294871e86e4C2381" - } - }, - "moonbasealpha": { - "domain": "1836002657", - "name": "moonbasealpha", - "rpcStyle": "ethereum", - "finalityBlocks": "1", - "connection": { - "type": "http", - "url": "" - }, - "addresses": { - "inbox": "0x3C5154a193D6e2955650f9305c8d80c18C814A68", - "validatorManager": "0x7914A3349107A7295Bbf2374db5A973d73D1b324" - } - } - }, - "outbox": { - "addresses": { - "outbox": "0xB6a4129c305056d80fFfea96DdbDCf1F58BC8240", - "interchainGasPaymaster": "0x76D20943b68985dF999C5bb13d6E7AdF3CFc276F" - }, - "domain": "1634872690", - "name": "arbitrumrinkeby", - "rpcStyle": "ethereum", - "finalityBlocks": "0", - "connection": { - "type": "http", - "url": "" - } - }, - "tracing": { - "level": "debug", - "fmt": "json" - }, - "db": "db_path", - "index": { - "from": "12652433" - } -} diff --git a/rust/config/testnet2/bsctestnet_config.json b/rust/config/testnet2/bsctestnet_config.json index 78684100c..3f343078c 100644 --- a/rust/config/testnet2/bsctestnet_config.json +++ b/rust/config/testnet2/bsctestnet_config.json @@ -16,20 +16,6 @@ "validatorManager": "0x0AfCCF2ffc1D7A42b3F8616C4270Da27f2729F5F" } }, - "kovan": { - "domain": "3000", - "name": "kovan", - "rpcStyle": "ethereum", - "finalityBlocks": "15", - "connection": { - "type": "http", - "url": "" - }, - "addresses": { - "inbox": "0xAFbc8Fc9649188B0EC89D09F06113d5D9702A77C", - "validatorManager": "0x1710F4F05955da2645CE8E5B6AaEfa6A2109F030" - } - }, "fuji": { "domain": "43113", "name": "fuji", @@ -58,34 +44,6 @@ "validatorManager": "0x3572a9d808738922194921b275B2A55414BcDA57" } }, - "arbitrumrinkeby": { - "domain": "1634872690", - "name": "arbitrumrinkeby", - "rpcStyle": "ethereum", - "finalityBlocks": "0", - "connection": { - "type": "http", - "url": "" - }, - "addresses": { - "inbox": "0x603d9041D636CD3218888F1C6F18A4BfeDcdB7F0", - "validatorManager": "0xa1C91dd4F3050DE9C4184BD8B4403A0C81D5463C" - } - }, - "optimismkovan": { - "domain": "1869622635", - "name": "optimismkovan", - "rpcStyle": "ethereum", - "finalityBlocks": "0", - "connection": { - "type": "http", - "url": "" - }, - "addresses": { - "inbox": "0x0E18b28D98C2efDb59252c021320F203305b1B66", - "validatorManager": "0xFb55597F07417b08195Ba674f4dd58aeC9B89FBB" - } - }, "goerli": { "domain": "5", "name": "goerli", diff --git a/rust/config/testnet2/fuji_config.json b/rust/config/testnet2/fuji_config.json index 9dbb1c5d8..d83e17264 100644 --- a/rust/config/testnet2/fuji_config.json +++ b/rust/config/testnet2/fuji_config.json @@ -16,20 +16,6 @@ "validatorManager": "0x793b4c911362c8900372cE6Da5f9dA96457E8c1B" } }, - "kovan": { - "domain": "3000", - "name": "kovan", - "rpcStyle": "ethereum", - "finalityBlocks": "15", - "connection": { - "type": "http", - "url": "" - }, - "addresses": { - "inbox": "0x3d26cd5dD9F08e17D21EB7ac65BdBAbb5f9FE7Fc", - "validatorManager": "0x506aDc3Ff4E70da42BB9Fc5ca9fa4A89f30D64a4" - } - }, "mumbai": { "domain": "80001", "name": "mumbai", @@ -58,34 +44,6 @@ "validatorManager": "0x6d6a9bDDea1456673062633b7a4823dB13bDB9fb" } }, - "arbitrumrinkeby": { - "domain": "1634872690", - "name": "arbitrumrinkeby", - "rpcStyle": "ethereum", - "finalityBlocks": "0", - "connection": { - "type": "http", - "url": "" - }, - "addresses": { - "inbox": "0x69181Ea49C2F5F7904cEb7299a75620bAd0954FA", - "validatorManager": "0xE43CEb0771DB31C8658F446441F3d5F451b42954" - } - }, - "optimismkovan": { - "domain": "1869622635", - "name": "optimismkovan", - "rpcStyle": "ethereum", - "finalityBlocks": "0", - "connection": { - "type": "http", - "url": "" - }, - "addresses": { - "inbox": "0x2A9E9188C7e76f3345e91fD4650aC654A9FE355C", - "validatorManager": "0xe18Bc753aa53E938315f57B13EDB6E1b168f0d26" - } - }, "goerli": { "domain": "5", "name": "goerli", diff --git a/rust/config/testnet2/goerli_config.json b/rust/config/testnet2/goerli_config.json index 00ed74d1a..9c2ea570f 100644 --- a/rust/config/testnet2/goerli_config.json +++ b/rust/config/testnet2/goerli_config.json @@ -16,20 +16,6 @@ "validatorManager": "0x80B24aFeC7dD9B67CaEF0f06592753ed5e52783F" } }, - "kovan": { - "domain": "3000", - "name": "kovan", - "rpcStyle": "ethereum", - "finalityBlocks": "7", - "connection": { - "type": "http", - "url": "" - }, - "addresses": { - "inbox": "0x27C8C1f9cf9CB89E0a7729690502C2e3c3c5eb3d", - "validatorManager": "0x936eA9Bcf465A5b8da94FC66cdbFe1FD2e72A315" - } - }, "fuji": { "domain": "43113", "name": "fuji", @@ -72,34 +58,6 @@ "validatorManager": "0xEd23982947054CfeDD759163cbbC5CDA911A43d5" } }, - "arbitrumrinkeby": { - "domain": "1634872690", - "name": "arbitrumrinkeby", - "rpcStyle": "ethereum", - "finalityBlocks": "0", - "connection": { - "type": "http", - "url": "" - }, - "addresses": { - "inbox": "0xcf17C5F836fe8d162eF8d3F3D09D7794b3F3ACc7", - "validatorManager": "0x750af13E04b5294daBFF36C61A587f4a153ab853" - } - }, - "optimismkovan": { - "domain": "1869622635", - "name": "optimismkovan", - "rpcStyle": "ethereum", - "finalityBlocks": "0", - "connection": { - "type": "http", - "url": "" - }, - "addresses": { - "inbox": "0xFCfc6653cc65d5F85Ecbc21be40eaA45Bee107B4", - "validatorManager": "0x665A25Ea86fB782BCb26657e806f709b423E48eF" - } - }, "moonbasealpha": { "domain": "1836002657", "name": "moonbasealpha", diff --git a/rust/config/testnet2/kovan_config.json b/rust/config/testnet2/kovan_config.json deleted file mode 100644 index f9518a02c..000000000 --- a/rust/config/testnet2/kovan_config.json +++ /dev/null @@ -1,140 +0,0 @@ -{ - "environment": "testnet2", - "signers": {}, - "inboxes": { - "alfajores": { - "domain": "1000", - "name": "alfajores", - "rpcStyle": "ethereum", - "finalityBlocks": "0", - "connection": { - "type": "http", - "url": "" - }, - "addresses": { - "inbox": "0x443f8614728327Ce0cAb864DD463Fe2702b57597", - "validatorManager": "0x6B3fA33fE951D5b2Dca82B64aD4c283187FD881D" - } - }, - "fuji": { - "domain": "43113", - "name": "fuji", - "rpcStyle": "ethereum", - "finalityBlocks": "0", - "connection": { - "type": "http", - "url": "" - }, - "addresses": { - "inbox": "0x93DF36E1b8186eAE960f08A75D26Fc7767A71218", - "validatorManager": "0x892D9cD6D2DB86a15863b4EA1431F77330b23FDf" - } - }, - "mumbai": { - "domain": "80001", - "name": "mumbai", - "rpcStyle": "ethereum", - "finalityBlocks": "32", - "connection": { - "type": "http", - "url": "" - }, - "addresses": { - "inbox": "0x1b0d4c88288258D57998F0bdb30489007A42B834", - "validatorManager": "0x2b51361F4E49A78b57b5561d87Cb49784c1720A6" - } - }, - "bsctestnet": { - "domain": "1651715444", - "name": "bsctestnet", - "rpcStyle": "ethereum", - "finalityBlocks": "9", - "connection": { - "type": "http", - "url": "" - }, - "addresses": { - "inbox": "0xe0c5bDAfEe7F7065402337040E426A42b5C33650", - "validatorManager": "0xC9f8Ab1f8b5F58B09317b93c07BfF44e4c01E66F" - } - }, - "arbitrumrinkeby": { - "domain": "1634872690", - "name": "arbitrumrinkeby", - "rpcStyle": "ethereum", - "finalityBlocks": "0", - "connection": { - "type": "http", - "url": "" - }, - "addresses": { - "inbox": "0x08911d73b443309081d66A878227E20d6DF0f64C", - "validatorManager": "0x8921Adb6B2e365545CCF3EDfc04a7199164e0E0e" - } - }, - "optimismkovan": { - "domain": "1869622635", - "name": "optimismkovan", - "rpcStyle": "ethereum", - "finalityBlocks": "0", - "connection": { - "type": "http", - "url": "" - }, - "addresses": { - "inbox": "0x9667EfF1556A9D092fdbeC09244CB99b677E9D1E", - "validatorManager": "0x6916690816a1aE1F6D9163dA9e691124737B5f5b" - } - }, - "goerli": { - "domain": "5", - "name": "goerli", - "rpcStyle": "ethereum", - "finalityBlocks": "7", - "connection": { - "type": "http", - "url": "" - }, - "addresses": { - "inbox": "0x7FE7EA170cf08A25C2ff315814D96D93C311E692", - "validatorManager": "0x7d498740A4572f2B5c6b0A1Ba9d1d9DbE207e89E" - } - }, - "moonbasealpha": { - "domain": "1836002657", - "name": "moonbasealpha", - "rpcStyle": "ethereum", - "finalityBlocks": "1", - "connection": { - "type": "http", - "url": "" - }, - "addresses": { - "inbox": "0x304cAb315c93B87AAdb2B826A791b2c1Bf749996", - "validatorManager": "0xD3d062a5dcBA85ae863618d4c264d2358300c283" - } - } - }, - "outbox": { - "addresses": { - "outbox": "0xE199902fb97726e3D924bF6606382af11a954c85", - "interchainGasPaymaster": "0x74234D5EEb6229fD75fF5370fab7D9819295F0D5" - }, - "domain": "3000", - "name": "kovan", - "rpcStyle": "ethereum", - "finalityBlocks": "15", - "connection": { - "type": "http", - "url": "" - } - }, - "tracing": { - "level": "debug", - "fmt": "json" - }, - "db": "db_path", - "index": { - "from": "32080902" - } -} diff --git a/rust/config/testnet2/moonbasealpha_config.json b/rust/config/testnet2/moonbasealpha_config.json index 13c310c21..b05e731f5 100644 --- a/rust/config/testnet2/moonbasealpha_config.json +++ b/rust/config/testnet2/moonbasealpha_config.json @@ -16,20 +16,6 @@ "validatorManager": "0xdE1a1f41871ebD2D1B8ddac6BAC3a2F4898a1747" } }, - "kovan": { - "domain": "3000", - "name": "kovan", - "rpcStyle": "ethereum", - "finalityBlocks": "7", - "connection": { - "type": "http", - "url": "" - }, - "addresses": { - "inbox": "0xA9f54B5160e7Dc949a77cc0c51B2c9de1e4282D8", - "validatorManager": "0x4d8E450e5F510f46261D28247860BEE854928477" - } - }, "fuji": { "domain": "43113", "name": "fuji", @@ -72,34 +58,6 @@ "validatorManager": "0x5F3aA4De5132688c2c1750D3780AdD49d72FAaBC" } }, - "arbitrumrinkeby": { - "domain": "1634872690", - "name": "arbitrumrinkeby", - "rpcStyle": "ethereum", - "finalityBlocks": "0", - "connection": { - "type": "http", - "url": "" - }, - "addresses": { - "inbox": "0x636bcE43104Ef1E61e93E84F0A324d037C258308", - "validatorManager": "0x3ab3Da824d4fcfd0e477ae1ADD55A04259cD140E" - } - }, - "optimismkovan": { - "domain": "1869622635", - "name": "optimismkovan", - "rpcStyle": "ethereum", - "finalityBlocks": "0", - "connection": { - "type": "http", - "url": "" - }, - "addresses": { - "inbox": "0xe30515624b1318a2BDB63bAB64dba09026361b0C", - "validatorManager": "0xb26fE3032f4943FcD2E34CF67E92D1e636E30F8e" - } - }, "goerli": { "domain": "5", "name": "goerli", diff --git a/rust/config/testnet2/mumbai_config.json b/rust/config/testnet2/mumbai_config.json index 4d2224cb3..6fc57401b 100644 --- a/rust/config/testnet2/mumbai_config.json +++ b/rust/config/testnet2/mumbai_config.json @@ -16,20 +16,6 @@ "validatorManager": "0x50d45EEe9C2903Ad204d393F5411Aa75A6CB02c4" } }, - "kovan": { - "domain": "3000", - "name": "kovan", - "rpcStyle": "ethereum", - "finalityBlocks": "15", - "connection": { - "type": "http", - "url": "" - }, - "addresses": { - "inbox": "0x2E822b77f02F47A4D2452572ec74e3D6d19D7A64", - "validatorManager": "0x17Dc724B7a2F09141C13b8AC33B396073785c2BC" - } - }, "fuji": { "domain": "43113", "name": "fuji", @@ -58,34 +44,6 @@ "validatorManager": "0xDa5177080f7fC5d9255eB32cC64B9b4e5136A716" } }, - "arbitrumrinkeby": { - "domain": "1634872690", - "name": "arbitrumrinkeby", - "rpcStyle": "ethereum", - "finalityBlocks": "0", - "connection": { - "type": "http", - "url": "" - }, - "addresses": { - "inbox": "0x62A3fC7873AC96fFF1975663Aa41Ab9100cDe2FB", - "validatorManager": "0x5f2fFCF69c58AcA2b521690400756FAe8CC99117" - } - }, - "optimismkovan": { - "domain": "1869622635", - "name": "optimismkovan", - "rpcStyle": "ethereum", - "finalityBlocks": "0", - "connection": { - "type": "http", - "url": "" - }, - "addresses": { - "inbox": "0xA9425D5cBcD2c83EB2a5BF453EAA18968db3ef77", - "validatorManager": "0xF78deCe5Cf97e1bd61C202A5ba1af33b87454878" - } - }, "goerli": { "domain": "5", "name": "goerli", diff --git a/rust/config/testnet2/optimismkovan_config.json b/rust/config/testnet2/optimismkovan_config.json deleted file mode 100644 index 8d87b2eba..000000000 --- a/rust/config/testnet2/optimismkovan_config.json +++ /dev/null @@ -1,140 +0,0 @@ -{ - "environment": "testnet2", - "signers": {}, - "inboxes": { - "alfajores": { - "domain": "1000", - "name": "alfajores", - "rpcStyle": "ethereum", - "finalityBlocks": "0", - "connection": { - "type": "http", - "url": "" - }, - "addresses": { - "inbox": "0x5939e17FE19669Ba22f06603CA2eBE18C836c6Ab", - "validatorManager": "0xAf4778deef817E02c63076d803D687596067179d" - } - }, - "kovan": { - "domain": "3000", - "name": "kovan", - "rpcStyle": "ethereum", - "finalityBlocks": "15", - "connection": { - "type": "http", - "url": "" - }, - "addresses": { - "inbox": "0xA16f90576244dCAA274DEdeEF6FEb07a03a6064D", - "validatorManager": "0x8705bc838b7EB06FB330CaA1e807CDFCe52Be2b6" - } - }, - "fuji": { - "domain": "43113", - "name": "fuji", - "rpcStyle": "ethereum", - "finalityBlocks": "0", - "connection": { - "type": "http", - "url": "" - }, - "addresses": { - "inbox": "0x4D24f47e3fa67fA4f0c3f980EbE7871e9d4964d3", - "validatorManager": "0x6f2756380FD49228ae25Aa7F2817993cB74Ecc56" - } - }, - "mumbai": { - "domain": "80001", - "name": "mumbai", - "rpcStyle": "ethereum", - "finalityBlocks": "32", - "connection": { - "type": "http", - "url": "" - }, - "addresses": { - "inbox": "0xB7C51c5fc8D2deA2563370aaC6993c8893098442", - "validatorManager": "0x4D40f433F2f89cBa4BB9D994FD18D8302C378D26" - } - }, - "bsctestnet": { - "domain": "1651715444", - "name": "bsctestnet", - "rpcStyle": "ethereum", - "finalityBlocks": "9", - "connection": { - "type": "http", - "url": "" - }, - "addresses": { - "inbox": "0x957ff8ca77Af405D620e47350327fDA24b83070b", - "validatorManager": "0xC60C145f1e1904f9d6483A611BF1416697CCc1FE" - } - }, - "arbitrumrinkeby": { - "domain": "1634872690", - "name": "arbitrumrinkeby", - "rpcStyle": "ethereum", - "finalityBlocks": "0", - "connection": { - "type": "http", - "url": "" - }, - "addresses": { - "inbox": "0xBA3f3A84F149842529993bc38A7b4cF8131c17c2", - "validatorManager": "0x890eB21B76DCB165A1807cBE279f883716eA47D4" - } - }, - "goerli": { - "domain": "5", - "name": "goerli", - "rpcStyle": "ethereum", - "finalityBlocks": "7", - "connection": { - "type": "http", - "url": "" - }, - "addresses": { - "inbox": "0x58483b754Abb1E8947BE63d6b95DF75b8249543A", - "validatorManager": "0xcf5BaaF976C80a66Fa7839715C45788f60041A33" - } - }, - "moonbasealpha": { - "domain": "1836002657", - "name": "moonbasealpha", - "rpcStyle": "ethereum", - "finalityBlocks": "1", - "connection": { - "type": "http", - "url": "" - }, - "addresses": { - "inbox": "0x05Ea36Caee7d92C173334C9D97DcD39ABdCB2b69", - "validatorManager": "0x5d56B8a669F50193b54319442c6EEE5edD662381" - } - } - }, - "outbox": { - "addresses": { - "outbox": "0x981f5C4070bC048186CDE1CcB61Ea5c969194b54", - "interchainGasPaymaster": "0xD7D2B0f61B834D98772e938Fa64425587C0f3481" - }, - "domain": "1869622635", - "name": "optimismkovan", - "rpcStyle": "ethereum", - "finalityBlocks": "0", - "connection": { - "type": "http", - "url": "" - } - }, - "tracing": { - "level": "debug", - "fmt": "json" - }, - "db": "db_path", - "index": { - "from": "3810531" - } -} diff --git a/typescript/infra/config/environments/testnet2/agent.ts b/typescript/infra/config/environments/testnet2/agent.ts index 88a28fe7a..7f3e76b8e 100644 --- a/typescript/infra/config/environments/testnet2/agent.ts +++ b/typescript/infra/config/environments/testnet2/agent.ts @@ -26,7 +26,7 @@ export const abacus: AgentConfig = { context: Contexts.Abacus, docker: { repo: 'gcr.io/abacus-labs-dev/abacus-agent', - tag: 'sha-986b531', + tag: 'sha-25f4882', }, aws: { region: 'us-east-1', @@ -50,21 +50,12 @@ export const abacus: AgentConfig = { fuji: { reorgPeriod: 3, }, - kovan: { - reorgPeriod: 7, - }, mumbai: { reorgPeriod: 32, }, bsctestnet: { reorgPeriod: 9, }, - arbitrumrinkeby: { - reorgPeriod: 0, - }, - optimismkovan: { - reorgPeriod: 0, - }, goerli: { reorgPeriod: 7, }, @@ -92,13 +83,13 @@ export const flowcarbon: AgentConfig = { context: Contexts.Flowcarbon, docker: { repo: 'gcr.io/abacus-labs-dev/abacus-agent', - tag: 'sha-986b531', + tag: 'sha-25f4882', }, aws: { region: 'us-east-1', }, environmentChainNames: chainNames, - contextChainNames: ['alfajores', 'kovan'], + contextChainNames: ['alfajores'], validatorSets: validators, gelato: { enabledChains: ['alfajores'], @@ -124,7 +115,7 @@ export const releaseCandidate: AgentConfig = { context: Contexts.ReleaseCandidate, docker: { repo: 'gcr.io/abacus-labs-dev/abacus-agent', - tag: 'sha-986b531', + tag: 'sha-25f4882', }, aws: { region: 'us-east-1', diff --git a/typescript/infra/config/environments/testnet2/chains.ts b/typescript/infra/config/environments/testnet2/chains.ts index 756bd1496..fac7b9d4a 100644 --- a/typescript/infra/config/environments/testnet2/chains.ts +++ b/typescript/infra/config/environments/testnet2/chains.ts @@ -2,18 +2,16 @@ import { chainConnectionConfigs } from '@hyperlane-xyz/sdk'; export const testnetConfigs = { alfajores: chainConnectionConfigs.alfajores, - kovan: chainConnectionConfigs.kovan, fuji: chainConnectionConfigs.fuji, mumbai: { ...chainConnectionConfigs.mumbai, + confirmations: 3, overrides: { - maxFeePerGas: 1000 * 10 ** 9, // 1000 gwei - maxPriorityFeePerGas: 40 * 10 ** 9, // 40 gwei + maxFeePerGas: 2 * 10 ** 9, // 1000 gwei + maxPriorityFeePerGas: 1 * 10 ** 9, // 40 gwei }, }, bsctestnet: chainConnectionConfigs.bsctestnet, - arbitrumrinkeby: chainConnectionConfigs.arbitrumrinkeby, - optimismkovan: chainConnectionConfigs.optimismkovan, goerli: chainConnectionConfigs.goerli, moonbasealpha: chainConnectionConfigs.moonbasealpha, }; diff --git a/typescript/infra/config/environments/testnet2/core.ts b/typescript/infra/config/environments/testnet2/core.ts index 554376465..2becb9ffb 100644 --- a/typescript/infra/config/environments/testnet2/core.ts +++ b/typescript/infra/config/environments/testnet2/core.ts @@ -14,17 +14,6 @@ export const core: ChainMap = { threshold: 3, }, }, - kovan: { - validatorManager: { - validators: [ - '0x1ee94e776cbe4bf74d2f80dae551758efbc21887', - '0xf2af10d9fd08eead8c6724a7feb679b5c900a38c', - '0xf3b7d58acfbff1fd64f173607101f611034e4f5f', - '0xff94c7660e857ba3f35ee248ae461feea266a504', - ], - threshold: 3, - }, - }, fuji: { validatorManager: { validators: [ @@ -58,28 +47,6 @@ export const core: ChainMap = { threshold: 3, }, }, - arbitrumrinkeby: { - validatorManager: { - validators: [ - '0xf5a871bcb9d6dfa2d3519caf396e7ab3c5a7a2ee', - '0xa6773fc38b023a512106e104a4f2cad2e68d802d', - '0x42f7b994720463eff351186f83d683efa5e2ed49', - '0x49649a8708f45171f5439ec71dc83baafd98b01c', - ], - threshold: 3, - }, - }, - optimismkovan: { - validatorManager: { - validators: [ - '0xef0d7bbb9c71fef7dc148722060afd78d0ff09d8', - '0x8e64ff3936aeadacc23a76cf2c96466927ed758f', - '0x13a3cd962ce99d6a6509f8d5b63a4498db329323', - '0x85f8286a8ee13aecc227e99b75375826cdb512dd', - ], - threshold: 3, - }, - }, goerli: { validatorManager: { validators: [ diff --git a/typescript/infra/config/environments/testnet2/helloworld.ts b/typescript/infra/config/environments/testnet2/helloworld.ts index 1f79204ea..71a752e38 100644 --- a/typescript/infra/config/environments/testnet2/helloworld.ts +++ b/typescript/infra/config/environments/testnet2/helloworld.ts @@ -14,7 +14,7 @@ export const abacus: HelloWorldConfig = { repo: 'gcr.io/abacus-labs-dev/hyperlane-monorepo', tag: 'sha-dcc84ea', }, - chainsToSkip: ['kovan', 'optimismkovan', 'arbitrumrinkeby'], + chainsToSkip: [], runEnv: environment, namespace: environment, runConfig: { @@ -34,7 +34,7 @@ export const releaseCandidate: HelloWorldConfig = { repo: 'gcr.io/abacus-labs-dev/hyperlane-monorepo', tag: 'sha-dcc84ea', }, - chainsToSkip: ['kovan', 'optimismkovan', 'arbitrumrinkeby'], + chainsToSkip: [], runEnv: environment, namespace: environment, runConfig: { diff --git a/typescript/infra/config/environments/testnet2/validators.ts b/typescript/infra/config/environments/testnet2/validators.ts index c37ec1b5d..75ddad833 100644 --- a/typescript/infra/config/environments/testnet2/validators.ts +++ b/typescript/infra/config/environments/testnet2/validators.ts @@ -56,47 +56,6 @@ export const validators: ChainValidatorSets = { }, ], }, - kovan: { - threshold: 3, - validators: [ - { - address: '0x1ee94e776cbe4bf74d2f80dae551758efbc21887', - name: s3BucketName('kovan', 0), - checkpointSyncer: { - type: CheckpointSyncerType.S3, - bucket: s3BucketName('kovan', 0), - region: s3BucketRegion, - }, - }, - { - address: '0xf2af10d9fd08eead8c6724a7feb679b5c900a38c', - name: s3BucketName('kovan', 1), - checkpointSyncer: { - type: CheckpointSyncerType.S3, - bucket: s3BucketName('kovan', 1), - region: s3BucketRegion, - }, - }, - { - address: '0xf3b7d58acfbff1fd64f173607101f611034e4f5f', - name: s3BucketName('kovan', 2), - checkpointSyncer: { - type: CheckpointSyncerType.S3, - bucket: s3BucketName('kovan', 2), - region: s3BucketRegion, - }, - }, - { - address: '0xff94c7660e857ba3f35ee248ae461feea266a504', - name: s3BucketName('kovan', 3), - checkpointSyncer: { - type: CheckpointSyncerType.S3, - bucket: s3BucketName('kovan', 3), - region: s3BucketRegion, - }, - }, - ], - }, fuji: { threshold: 3, validators: [ @@ -220,88 +179,6 @@ export const validators: ChainValidatorSets = { }, ], }, - arbitrumrinkeby: { - threshold: 3, - validators: [ - { - address: '0xf5a871bcb9d6dfa2d3519caf396e7ab3c5a7a2ee', - name: s3BucketName('arbitrumrinkeby', 0), - checkpointSyncer: { - type: CheckpointSyncerType.S3, - bucket: s3BucketName('arbitrumrinkeby', 0), - region: s3BucketRegion, - }, - }, - { - address: '0xa6773fc38b023a512106e104a4f2cad2e68d802d', - name: s3BucketName('arbitrumrinkeby', 1), - checkpointSyncer: { - type: CheckpointSyncerType.S3, - bucket: s3BucketName('arbitrumrinkeby', 1), - region: s3BucketRegion, - }, - }, - { - address: '0x42f7b994720463eff351186f83d683efa5e2ed49', - name: s3BucketName('arbitrumrinkeby', 2), - checkpointSyncer: { - type: CheckpointSyncerType.S3, - bucket: s3BucketName('arbitrumrinkeby', 2), - region: s3BucketRegion, - }, - }, - { - address: '0x49649a8708f45171f5439ec71dc83baafd98b01c', - name: s3BucketName('arbitrumrinkeby', 3), - checkpointSyncer: { - type: CheckpointSyncerType.S3, - bucket: s3BucketName('arbitrumrinkeby', 3), - region: s3BucketRegion, - }, - }, - ], - }, - optimismkovan: { - threshold: 3, - validators: [ - { - address: '0xef0d7bbb9c71fef7dc148722060afd78d0ff09d8', - name: s3BucketName('optimismkovan', 0), - checkpointSyncer: { - type: CheckpointSyncerType.S3, - bucket: s3BucketName('optimismkovan', 0), - region: s3BucketRegion, - }, - }, - { - address: '0x8e64ff3936aeadacc23a76cf2c96466927ed758f', - name: s3BucketName('optimismkovan', 1), - checkpointSyncer: { - type: CheckpointSyncerType.S3, - bucket: s3BucketName('optimismkovan', 1), - region: s3BucketRegion, - }, - }, - { - address: '0x13a3cd962ce99d6a6509f8d5b63a4498db329323', - name: s3BucketName('optimismkovan', 2), - checkpointSyncer: { - type: CheckpointSyncerType.S3, - bucket: s3BucketName('optimismkovan', 2), - region: s3BucketRegion, - }, - }, - { - address: '0x85f8286a8ee13aecc227e99b75375826cdb512dd', - name: s3BucketName('optimismkovan', 3), - checkpointSyncer: { - type: CheckpointSyncerType.S3, - bucket: s3BucketName('optimismkovan', 3), - region: s3BucketRegion, - }, - }, - ], - }, goerli: { threshold: 2, validators: [ diff --git a/typescript/infra/scripts/funding/fund-keys-from-deployer.ts b/typescript/infra/scripts/funding/fund-keys-from-deployer.ts index 677e1ce70..d2c4efbc3 100644 --- a/typescript/infra/scripts/funding/fund-keys-from-deployer.ts +++ b/typescript/infra/scripts/funding/fund-keys-from-deployer.ts @@ -69,13 +69,10 @@ const desiredBalancePerChain: CompleteChainMap = { avalanche: '0.1', fuji: '1', ethereum: '0.2', - kovan: '0.1', polygon: '1', mumbai: '0.5', optimism: '0.05', - optimismkovan: '0.1', arbitrum: '0.01', - arbitrumrinkeby: '0.1', bsc: '0.01', bsctestnet: '1', goerli: '0.1', diff --git a/typescript/sdk/src/consts/chainConnectionConfigs.ts b/typescript/sdk/src/consts/chainConnectionConfigs.ts index fd5e668ee..007c17379 100644 --- a/typescript/sdk/src/consts/chainConnectionConfigs.ts +++ b/typescript/sdk/src/consts/chainConnectionConfigs.ts @@ -103,16 +103,6 @@ export const goerli: IChainConnection = { apiPrefix: 'api-', }; -export const kovan: IChainConnection = { - provider: new ethers.providers.JsonRpcProvider( - 'https://kovan.infura.io/v3/9aa3d95b3bc440fa88ea12eaa4456161', - 42, - ), - confirmations: 1, - blockExplorerUrl: 'https://kovan.etherscan.io', - apiPrefix: 'api-', -}; - export const mumbai: IChainConnection = { provider: new ethers.providers.JsonRpcProvider( 'https://rpc-mumbai.maticvigil.com', @@ -133,26 +123,6 @@ export const bsctestnet: IChainConnection = { apiPrefix: 'api-', }; -export const arbitrumrinkeby: IChainConnection = { - provider: new ethers.providers.JsonRpcProvider( - 'https://rinkeby.arbitrum.io/rpc', - 421611, - ), - confirmations: 1, - blockExplorerUrl: 'https://testnet.arbiscan.io', - apiPrefix: 'api-', -}; - -export const optimismkovan: IChainConnection = { - provider: new ethers.providers.JsonRpcProvider( - 'https://kovan.optimism.io', - 69, - ), - confirmations: 1, - blockExplorerUrl: 'https://kovan-optimistic.etherscan.io', - apiPrefix: 'api-', -}; - export const moonbasealpha: IChainConnection = { provider: new ethers.providers.JsonRpcProvider( 'https://rpc.api.moonbase.moonbeam.network', @@ -198,12 +168,9 @@ export const chainConnectionConfigs: ChainMap = { alfajores, fuji, goerli, - kovan, mumbai, bsctestnet, - arbitrumrinkeby, optimism, - optimismkovan, moonbasealpha, test1, test2, diff --git a/typescript/sdk/src/consts/chains.ts b/typescript/sdk/src/consts/chains.ts index bf5ee62a0..d3324ff03 100644 --- a/typescript/sdk/src/consts/chains.ts +++ b/typescript/sdk/src/consts/chains.ts @@ -8,7 +8,6 @@ export enum Chains { // must be string type to be used with Object.keys alfajores = 'alfajores', bsc = 'bsc', mumbai = 'mumbai', - kovan = 'kovan', goerli = 'goerli', fuji = 'fuji', celo = 'celo', @@ -17,8 +16,6 @@ export enum Chains { // must be string type to be used with Object.keys optimism = 'optimism', polygon = 'polygon', bsctestnet = 'bsctestnet', - arbitrumrinkeby = 'arbitrumrinkeby', - optimismkovan = 'optimismkovan', auroratestnet = 'auroratestnet', moonbasealpha = 'moonbasealpha', test1 = 'test1', diff --git a/typescript/sdk/src/consts/environments/testnet2.json b/typescript/sdk/src/consts/environments/testnet2.json index 7e7914830..f3f2178f3 100644 --- a/typescript/sdk/src/consts/environments/testnet2.json +++ b/typescript/sdk/src/consts/environments/testnet2.json @@ -9,15 +9,6 @@ "beacon": "0xd95091C1c1A7E0e5DdD7d44568A04588e76e4dDe" }, "inboxes": { - "kovan": { - "inbox": { - "kind": "UpgradeBeacon", - "proxy": "0x443f8614728327Ce0cAb864DD463Fe2702b57597", - "implementation": "0x09a7167BD6d44Ba500f77dd45C693443C4d7dEC0", - "beacon": "0x209Ccdbe13BB913104117B1D6f7801684e98FA1F" - }, - "inboxValidatorManager": "0x6B3fA33fE951D5b2Dca82B64aD4c283187FD881D" - }, "fuji": { "inbox": { "kind": "UpgradeBeacon", @@ -45,24 +36,6 @@ }, "inboxValidatorManager": "0x0AfCCF2ffc1D7A42b3F8616C4270Da27f2729F5F" }, - "arbitrumrinkeby": { - "inbox": { - "kind": "UpgradeBeacon", - "proxy": "0x90C85cEB1D7CEaD73914FC57dd14ea5115b27a32", - "implementation": "0x09a7167BD6d44Ba500f77dd45C693443C4d7dEC0", - "beacon": "0x209Ccdbe13BB913104117B1D6f7801684e98FA1F" - }, - "inboxValidatorManager": "0x0d772404D3a6De86F7263D82E055686f73f55Ba8" - }, - "optimismkovan": { - "inbox": { - "kind": "UpgradeBeacon", - "proxy": "0x5939e17FE19669Ba22f06603CA2eBE18C836c6Ab", - "implementation": "0x09a7167BD6d44Ba500f77dd45C693443C4d7dEC0", - "beacon": "0x209Ccdbe13BB913104117B1D6f7801684e98FA1F" - }, - "inboxValidatorManager": "0xAf4778deef817E02c63076d803D687596067179d" - }, "goerli": { "inbox": { "kind": "UpgradeBeacon", @@ -90,97 +63,6 @@ }, "outboxValidatorManager": "0xEB25e6e42B743a815E5C0409007993a828a0565f" }, - "kovan": { - "upgradeBeaconController": "0x38030040C09B213ec47F121c9B8a396D7FC2636b", - "connectionManager": "0xfA1fBF362144ae1bEf2E33409948dA1FB812bb41", - "interchainGasPaymaster": { - "kind": "UpgradeBeacon", - "proxy": "0x74234D5EEb6229fD75fF5370fab7D9819295F0D5", - "implementation": "0x1c554e54745aeaA7cf33c9Df17A70b9B258279e1", - "beacon": "0xA07b287Bd5Bb8101D28b331Bcd499aea949BC6dc" - }, - "inboxes": { - "alfajores": { - "inbox": { - "kind": "UpgradeBeacon", - "proxy": "0x339B46496D60b1b6B42e9715DeD8B3D2154dA0Bb", - "implementation": "0x1b530F53fa7aeb2E36FD76DCc951908DBFc8c460", - "beacon": "0x786bBdD9a8472F9428D7E5D80Db8C34C2d4fCB66" - }, - "inboxValidatorManager": "0x4b6fb57de2DE643bEFBa13F46149A765FCd2DD09" - }, - "fuji": { - "inbox": { - "kind": "UpgradeBeacon", - "proxy": "0x3d26cd5dD9F08e17D21EB7ac65BdBAbb5f9FE7Fc", - "implementation": "0x1b530F53fa7aeb2E36FD76DCc951908DBFc8c460", - "beacon": "0x786bBdD9a8472F9428D7E5D80Db8C34C2d4fCB66" - }, - "inboxValidatorManager": "0x506aDc3Ff4E70da42BB9Fc5ca9fa4A89f30D64a4" - }, - "mumbai": { - "inbox": { - "kind": "UpgradeBeacon", - "proxy": "0x2E822b77f02F47A4D2452572ec74e3D6d19D7A64", - "implementation": "0x1b530F53fa7aeb2E36FD76DCc951908DBFc8c460", - "beacon": "0x786bBdD9a8472F9428D7E5D80Db8C34C2d4fCB66" - }, - "inboxValidatorManager": "0x17Dc724B7a2F09141C13b8AC33B396073785c2BC" - }, - "bsctestnet": { - "inbox": { - "kind": "UpgradeBeacon", - "proxy": "0xAFbc8Fc9649188B0EC89D09F06113d5D9702A77C", - "implementation": "0x1b530F53fa7aeb2E36FD76DCc951908DBFc8c460", - "beacon": "0x786bBdD9a8472F9428D7E5D80Db8C34C2d4fCB66" - }, - "inboxValidatorManager": "0x1710F4F05955da2645CE8E5B6AaEfa6A2109F030" - }, - "arbitrumrinkeby": { - "inbox": { - "kind": "UpgradeBeacon", - "proxy": "0x78f135365794892b3b6bB589Db5340715126E32f", - "implementation": "0x1b530F53fa7aeb2E36FD76DCc951908DBFc8c460", - "beacon": "0x786bBdD9a8472F9428D7E5D80Db8C34C2d4fCB66" - }, - "inboxValidatorManager": "0xce25Bc319913BE39d1469ab6c4f0443d94d96d81" - }, - "optimismkovan": { - "inbox": { - "kind": "UpgradeBeacon", - "proxy": "0xA16f90576244dCAA274DEdeEF6FEb07a03a6064D", - "implementation": "0x1b530F53fa7aeb2E36FD76DCc951908DBFc8c460", - "beacon": "0x786bBdD9a8472F9428D7E5D80Db8C34C2d4fCB66" - }, - "inboxValidatorManager": "0x8705bc838b7EB06FB330CaA1e807CDFCe52Be2b6" - }, - "goerli": { - "inbox": { - "kind": "UpgradeBeacon", - "proxy": "0x27C8C1f9cf9CB89E0a7729690502C2e3c3c5eb3d", - "implementation": "0x1b530F53fa7aeb2E36FD76DCc951908DBFc8c460", - "beacon": "0x786bBdD9a8472F9428D7E5D80Db8C34C2d4fCB66" - }, - "inboxValidatorManager": "0x936eA9Bcf465A5b8da94FC66cdbFe1FD2e72A315" - }, - "moonbasealpha": { - "inbox": { - "kind": "UpgradeBeacon", - "proxy": "0xA9f54B5160e7Dc949a77cc0c51B2c9de1e4282D8", - "implementation": "0x1b530F53fa7aeb2E36FD76DCc951908DBFc8c460", - "beacon": "0x786bBdD9a8472F9428D7E5D80Db8C34C2d4fCB66" - }, - "inboxValidatorManager": "0x4d8E450e5F510f46261D28247860BEE854928477" - } - }, - "outbox": { - "kind": "UpgradeBeacon", - "proxy": "0xE199902fb97726e3D924bF6606382af11a954c85", - "implementation": "0xFF214d77Ac42592b6E44B8d6C7c70565D5d72AB9", - "beacon": "0xa088193B63413A03b533a9aeABdc37F90c0929Db" - }, - "outboxValidatorManager": "0x81e53D200FAB5eFfaC369D9255d82EFe4A2d43bF" - }, "fuji": { "upgradeBeaconController": "0x97Bbc6bBaFa5Ce3b2FA966c121Af63bD09e940f8", "connectionManager": "0x33AbaF6708be03Bdf0595DA0745A7111b01dB8c7", @@ -200,15 +82,6 @@ }, "inboxValidatorManager": "0x4904f38433583f0F72609C0bb8788d3296bd0E3B" }, - "kovan": { - "inbox": { - "kind": "UpgradeBeacon", - "proxy": "0x93DF36E1b8186eAE960f08A75D26Fc7767A71218", - "implementation": "0x657A78E8c129Ee54105151FD03cc295f3470A235", - "beacon": "0x593834864f540db61025Bdc6463F6eb4B6075ce7" - }, - "inboxValidatorManager": "0x892D9cD6D2DB86a15863b4EA1431F77330b23FDf" - }, "mumbai": { "inbox": { "kind": "UpgradeBeacon", @@ -227,24 +100,6 @@ }, "inboxValidatorManager": "0x15569bE4B03593A9eA93Bd519bB74928B1eF5fB2" }, - "arbitrumrinkeby": { - "inbox": { - "kind": "UpgradeBeacon", - "proxy": "0x3f09709b9865993f0320C3e836f3a3F4ff83eA9b", - "implementation": "0x657A78E8c129Ee54105151FD03cc295f3470A235", - "beacon": "0x593834864f540db61025Bdc6463F6eb4B6075ce7" - }, - "inboxValidatorManager": "0x71775B071F77F1ce52Ece810ce084451a3045FFe" - }, - "optimismkovan": { - "inbox": { - "kind": "UpgradeBeacon", - "proxy": "0x4D24f47e3fa67fA4f0c3f980EbE7871e9d4964d3", - "implementation": "0x657A78E8c129Ee54105151FD03cc295f3470A235", - "beacon": "0x593834864f540db61025Bdc6463F6eb4B6075ce7" - }, - "inboxValidatorManager": "0x6f2756380FD49228ae25Aa7F2817993cB74Ecc56" - }, "goerli": { "inbox": { "kind": "UpgradeBeacon", @@ -291,15 +146,6 @@ }, "inboxValidatorManager": "0x99A42d6Bf191127667f55297Af0259708bd8c59e" }, - "kovan": { - "inbox": { - "kind": "UpgradeBeacon", - "proxy": "0x1b0d4c88288258D57998F0bdb30489007A42B834", - "implementation": "0xfBe9FEE52abe170Ef4e1dc0CECF4409Dcd2AA4a7", - "beacon": "0xb6242d549d4b19a20684397790AFa555b16Bc979" - }, - "inboxValidatorManager": "0x2b51361F4E49A78b57b5561d87Cb49784c1720A6" - }, "fuji": { "inbox": { "kind": "UpgradeBeacon", @@ -318,24 +164,6 @@ }, "inboxValidatorManager": "0x3572a9d808738922194921b275B2A55414BcDA57" }, - "arbitrumrinkeby": { - "inbox": { - "kind": "UpgradeBeacon", - "proxy": "0x4C434bC53B0527Df7D12F2cFF17716199C3b36D8", - "implementation": "0xfBe9FEE52abe170Ef4e1dc0CECF4409Dcd2AA4a7", - "beacon": "0xb6242d549d4b19a20684397790AFa555b16Bc979" - }, - "inboxValidatorManager": "0x26b1C86221dA5Fa24C508dCeD1C86749F2Bdf4F0" - }, - "optimismkovan": { - "inbox": { - "kind": "UpgradeBeacon", - "proxy": "0xB7C51c5fc8D2deA2563370aaC6993c8893098442", - "implementation": "0xfBe9FEE52abe170Ef4e1dc0CECF4409Dcd2AA4a7", - "beacon": "0xb6242d549d4b19a20684397790AFa555b16Bc979" - }, - "inboxValidatorManager": "0x4D40f433F2f89cBa4BB9D994FD18D8302C378D26" - }, "goerli": { "inbox": { "kind": "UpgradeBeacon", @@ -382,15 +210,6 @@ }, "inboxValidatorManager": "0x5B30De0c322F7720D144df2AB2e82b160Eba0EBF" }, - "kovan": { - "inbox": { - "kind": "UpgradeBeacon", - "proxy": "0xe0c5bDAfEe7F7065402337040E426A42b5C33650", - "implementation": "0x062dF6670d8F4E1dB8C1caaFf590e9c290147bba", - "beacon": "0x7398C64259ee12861D43fD5D302c28CA96182133" - }, - "inboxValidatorManager": "0xC9f8Ab1f8b5F58B09317b93c07BfF44e4c01E66F" - }, "fuji": { "inbox": { "kind": "UpgradeBeacon", @@ -409,24 +228,6 @@ }, "inboxValidatorManager": "0xDa5177080f7fC5d9255eB32cC64B9b4e5136A716" }, - "arbitrumrinkeby": { - "inbox": { - "kind": "UpgradeBeacon", - "proxy": "0xF61322936D80cd87B49df48F3DE24fD5c02dE9D1", - "implementation": "0x062dF6670d8F4E1dB8C1caaFf590e9c290147bba", - "beacon": "0x7398C64259ee12861D43fD5D302c28CA96182133" - }, - "inboxValidatorManager": "0xd876C01aB40e8cE42Db417fBC79c726d45504dE4" - }, - "optimismkovan": { - "inbox": { - "kind": "UpgradeBeacon", - "proxy": "0x957ff8ca77Af405D620e47350327fDA24b83070b", - "implementation": "0x062dF6670d8F4E1dB8C1caaFf590e9c290147bba", - "beacon": "0x7398C64259ee12861D43fD5D302c28CA96182133" - }, - "inboxValidatorManager": "0xC60C145f1e1904f9d6483A611BF1416697CCc1FE" - }, "goerli": { "inbox": { "kind": "UpgradeBeacon", @@ -454,188 +255,6 @@ }, "outboxValidatorManager": "0xE0745955baF7e614707E22c90EA14d329C38941D" }, - "arbitrumrinkeby": { - "upgradeBeaconController": "0xA6cb9B457d1670bb5cDa4AAADA56a2d010E49bb9", - "connectionManager": "0xFb55597F07417b08195Ba674f4dd58aeC9B89FBB", - "interchainGasPaymaster": { - "kind": "UpgradeBeacon", - "proxy": "0x76D20943b68985dF999C5bb13d6E7AdF3CFc276F", - "implementation": "0xAFd1f0E77555A835987B1b8A683bA7C67105DFDc", - "beacon": "0x3e1420105177FED86Cd55762fd21b14278E1e93e" - }, - "inboxes": { - "alfajores": { - "inbox": { - "kind": "UpgradeBeacon", - "proxy": "0xcE4D149Db78729E8b52a9D79A36E64C5429dD39a", - "implementation": "0x3212977FBE6464c2bB60Fdb85ab0a5E06e25cdFB", - "beacon": "0xfc0da0E35Bba1F49318B2207ecaE86eb088dd3Bb" - }, - "inboxValidatorManager": "0x6202f54B22b72526dEC5364F6b7bE2bd0abEd8A6" - }, - "kovan": { - "inbox": { - "kind": "UpgradeBeacon", - "proxy": "0x08911d73b443309081d66A878227E20d6DF0f64C", - "implementation": "0x3212977FBE6464c2bB60Fdb85ab0a5E06e25cdFB", - "beacon": "0xfc0da0E35Bba1F49318B2207ecaE86eb088dd3Bb" - }, - "inboxValidatorManager": "0x8921Adb6B2e365545CCF3EDfc04a7199164e0E0e" - }, - "fuji": { - "inbox": { - "kind": "UpgradeBeacon", - "proxy": "0x69181Ea49C2F5F7904cEb7299a75620bAd0954FA", - "implementation": "0x3212977FBE6464c2bB60Fdb85ab0a5E06e25cdFB", - "beacon": "0xfc0da0E35Bba1F49318B2207ecaE86eb088dd3Bb" - }, - "inboxValidatorManager": "0xE43CEb0771DB31C8658F446441F3d5F451b42954" - }, - "mumbai": { - "inbox": { - "kind": "UpgradeBeacon", - "proxy": "0x62A3fC7873AC96fFF1975663Aa41Ab9100cDe2FB", - "implementation": "0x3212977FBE6464c2bB60Fdb85ab0a5E06e25cdFB", - "beacon": "0xfc0da0E35Bba1F49318B2207ecaE86eb088dd3Bb" - }, - "inboxValidatorManager": "0x5f2fFCF69c58AcA2b521690400756FAe8CC99117" - }, - "bsctestnet": { - "inbox": { - "kind": "UpgradeBeacon", - "proxy": "0x603d9041D636CD3218888F1C6F18A4BfeDcdB7F0", - "implementation": "0x3212977FBE6464c2bB60Fdb85ab0a5E06e25cdFB", - "beacon": "0xfc0da0E35Bba1F49318B2207ecaE86eb088dd3Bb" - }, - "inboxValidatorManager": "0xa1C91dd4F3050DE9C4184BD8B4403A0C81D5463C" - }, - "optimismkovan": { - "inbox": { - "kind": "UpgradeBeacon", - "proxy": "0xBA3f3A84F149842529993bc38A7b4cF8131c17c2", - "implementation": "0x3212977FBE6464c2bB60Fdb85ab0a5E06e25cdFB", - "beacon": "0xfc0da0E35Bba1F49318B2207ecaE86eb088dd3Bb" - }, - "inboxValidatorManager": "0x890eB21B76DCB165A1807cBE279f883716eA47D4" - }, - "goerli": { - "inbox": { - "kind": "UpgradeBeacon", - "proxy": "0xcf17C5F836fe8d162eF8d3F3D09D7794b3F3ACc7", - "implementation": "0x3212977FBE6464c2bB60Fdb85ab0a5E06e25cdFB", - "beacon": "0xfc0da0E35Bba1F49318B2207ecaE86eb088dd3Bb" - }, - "inboxValidatorManager": "0x750af13E04b5294daBFF36C61A587f4a153ab853" - }, - "moonbasealpha": { - "inbox": { - "kind": "UpgradeBeacon", - "proxy": "0x636bcE43104Ef1E61e93E84F0A324d037C258308", - "implementation": "0x3212977FBE6464c2bB60Fdb85ab0a5E06e25cdFB", - "beacon": "0xfc0da0E35Bba1F49318B2207ecaE86eb088dd3Bb" - }, - "inboxValidatorManager": "0x3ab3Da824d4fcfd0e477ae1ADD55A04259cD140E" - } - }, - "outbox": { - "kind": "UpgradeBeacon", - "proxy": "0xB6a4129c305056d80fFfea96DdbDCf1F58BC8240", - "implementation": "0x6C3132f78260EdD1cE88Ea4FeEB8C2D6309ecc75", - "beacon": "0xe63844Ca06Ce8E6D4097Cb33E9b3d62704122307" - }, - "outboxValidatorManager": "0x0E18b28D98C2efDb59252c021320F203305b1B66" - }, - "optimismkovan": { - "upgradeBeaconController": "0xc0Ce04851bF6Ea149fA06bf7a4808c9db81af189", - "connectionManager": "0x740bEd6E4eEc7c57a2818177Fba3f9E896D5DE1c", - "interchainGasPaymaster": { - "kind": "UpgradeBeacon", - "proxy": "0xD7D2B0f61B834D98772e938Fa64425587C0f3481", - "implementation": "0xE48fb6dAF7e7a71856dAA7d5728BE2132175d256", - "beacon": "0x07eCE1601749a4813f293F54ec9507DF5e926B10" - }, - "inboxes": { - "alfajores": { - "inbox": { - "kind": "UpgradeBeacon", - "proxy": "0xF8E6c1222049AAb68E410E43242449994Cb64996", - "implementation": "0xE6C0740b6aB7C060e197a7bd2952A27bB219c62A", - "beacon": "0x6AD4DEBA8A147d000C09de6465267a9047d1c217" - }, - "inboxValidatorManager": "0x413c74F3D034dB54A1ecfFbd0Ad74Cb25E59f579" - }, - "kovan": { - "inbox": { - "kind": "UpgradeBeacon", - "proxy": "0x9667EfF1556A9D092fdbeC09244CB99b677E9D1E", - "implementation": "0xE6C0740b6aB7C060e197a7bd2952A27bB219c62A", - "beacon": "0x6AD4DEBA8A147d000C09de6465267a9047d1c217" - }, - "inboxValidatorManager": "0x6916690816a1aE1F6D9163dA9e691124737B5f5b" - }, - "fuji": { - "inbox": { - "kind": "UpgradeBeacon", - "proxy": "0x2A9E9188C7e76f3345e91fD4650aC654A9FE355C", - "implementation": "0xE6C0740b6aB7C060e197a7bd2952A27bB219c62A", - "beacon": "0x6AD4DEBA8A147d000C09de6465267a9047d1c217" - }, - "inboxValidatorManager": "0xe18Bc753aa53E938315f57B13EDB6E1b168f0d26" - }, - "mumbai": { - "inbox": { - "kind": "UpgradeBeacon", - "proxy": "0xA9425D5cBcD2c83EB2a5BF453EAA18968db3ef77", - "implementation": "0xE6C0740b6aB7C060e197a7bd2952A27bB219c62A", - "beacon": "0x6AD4DEBA8A147d000C09de6465267a9047d1c217" - }, - "inboxValidatorManager": "0xF78deCe5Cf97e1bd61C202A5ba1af33b87454878" - }, - "bsctestnet": { - "inbox": { - "kind": "UpgradeBeacon", - "proxy": "0x0E18b28D98C2efDb59252c021320F203305b1B66", - "implementation": "0xE6C0740b6aB7C060e197a7bd2952A27bB219c62A", - "beacon": "0x6AD4DEBA8A147d000C09de6465267a9047d1c217" - }, - "inboxValidatorManager": "0xFb55597F07417b08195Ba674f4dd58aeC9B89FBB" - }, - "arbitrumrinkeby": { - "inbox": { - "kind": "UpgradeBeacon", - "proxy": "0xB6a4129c305056d80fFfea96DdbDCf1F58BC8240", - "implementation": "0xE6C0740b6aB7C060e197a7bd2952A27bB219c62A", - "beacon": "0x6AD4DEBA8A147d000C09de6465267a9047d1c217" - }, - "inboxValidatorManager": "0xe63844Ca06Ce8E6D4097Cb33E9b3d62704122307" - }, - "goerli": { - "inbox": { - "kind": "UpgradeBeacon", - "proxy": "0xFCfc6653cc65d5F85Ecbc21be40eaA45Bee107B4", - "implementation": "0xE6C0740b6aB7C060e197a7bd2952A27bB219c62A", - "beacon": "0x6AD4DEBA8A147d000C09de6465267a9047d1c217" - }, - "inboxValidatorManager": "0x665A25Ea86fB782BCb26657e806f709b423E48eF" - }, - "moonbasealpha": { - "inbox": { - "kind": "UpgradeBeacon", - "proxy": "0xe30515624b1318a2BDB63bAB64dba09026361b0C", - "implementation": "0xE6C0740b6aB7C060e197a7bd2952A27bB219c62A", - "beacon": "0x6AD4DEBA8A147d000C09de6465267a9047d1c217" - }, - "inboxValidatorManager": "0xb26fE3032f4943FcD2E34CF67E92D1e636E30F8e" - } - }, - "outbox": { - "kind": "UpgradeBeacon", - "proxy": "0x981f5C4070bC048186CDE1CcB61Ea5c969194b54", - "implementation": "0xB261C52241E133f957630AeeFEd48a82963AC33e", - "beacon": "0xD5B70f7Da85F98A5197E55114A38f3eDcDCf020e" - }, - "outboxValidatorManager": "0x45AEBD45B5Bb1C3A0bDBDf6094e8adA5712e1b74" - }, "goerli": { "upgradeBeaconController": "0x275aCcCa81cAD931dC6fB6E49ED233Bc99Bed4A7", "connectionManager": "0x01812D60958798695391dacF092BAc4a715B1718", @@ -655,15 +274,6 @@ }, "inboxValidatorManager": "0xB08d78F439e55D02C398519eef61606A5926245F" }, - "kovan": { - "inbox": { - "kind": "UpgradeBeacon", - "proxy": "0x7FE7EA170cf08A25C2ff315814D96D93C311E692", - "implementation": "0x46f7C5D896bbeC89bE1B19e4485e59b4Be49e9Cc", - "beacon": "0x833Dad7FF66884389D5F0cEcba446ffaa7d2837e" - }, - "inboxValidatorManager": "0x7d498740A4572f2B5c6b0A1Ba9d1d9DbE207e89E" - }, "fuji": { "inbox": { "kind": "UpgradeBeacon", @@ -691,24 +301,6 @@ }, "inboxValidatorManager": "0x598facE78a4302f11E3de0bee1894Da0b2Cb71F8" }, - "arbitrumrinkeby": { - "inbox": { - "kind": "UpgradeBeacon", - "proxy": "0x5d56B8a669F50193b54319442c6EEE5edD662381", - "implementation": "0x46f7C5D896bbeC89bE1B19e4485e59b4Be49e9Cc", - "beacon": "0x833Dad7FF66884389D5F0cEcba446ffaa7d2837e" - }, - "inboxValidatorManager": "0x527768930D889662Fe7ACF64294871e86e4C2381" - }, - "optimismkovan": { - "inbox": { - "kind": "UpgradeBeacon", - "proxy": "0x58483b754Abb1E8947BE63d6b95DF75b8249543A", - "implementation": "0x46f7C5D896bbeC89bE1B19e4485e59b4Be49e9Cc", - "beacon": "0x833Dad7FF66884389D5F0cEcba446ffaa7d2837e" - }, - "inboxValidatorManager": "0xcf5BaaF976C80a66Fa7839715C45788f60041A33" - }, "moonbasealpha": { "inbox": { "kind": "UpgradeBeacon", @@ -746,15 +338,6 @@ }, "inboxValidatorManager": "0xDDcFEcF17586D08A5740B7D91735fcCE3dfe3eeD" }, - "kovan": { - "inbox": { - "kind": "UpgradeBeacon", - "proxy": "0x304cAb315c93B87AAdb2B826A791b2c1Bf749996", - "implementation": "0x33dB966328Ea213b0f76eF96CA368AB37779F065", - "beacon": "0xB08d78F439e55D02C398519eef61606A5926245F" - }, - "inboxValidatorManager": "0xD3d062a5dcBA85ae863618d4c264d2358300c283" - }, "fuji": { "inbox": { "kind": "UpgradeBeacon", @@ -782,24 +365,6 @@ }, "inboxValidatorManager": "0x666a24F62f7A97BA33c151776Eb3D9441a059eB8" }, - "arbitrumrinkeby": { - "inbox": { - "kind": "UpgradeBeacon", - "proxy": "0x3C5154a193D6e2955650f9305c8d80c18C814A68", - "implementation": "0x33dB966328Ea213b0f76eF96CA368AB37779F065", - "beacon": "0xB08d78F439e55D02C398519eef61606A5926245F" - }, - "inboxValidatorManager": "0x7914A3349107A7295Bbf2374db5A973d73D1b324" - }, - "optimismkovan": { - "inbox": { - "kind": "UpgradeBeacon", - "proxy": "0x05Ea36Caee7d92C173334C9D97DcD39ABdCB2b69", - "implementation": "0x33dB966328Ea213b0f76eF96CA368AB37779F065", - "beacon": "0xB08d78F439e55D02C398519eef61606A5926245F" - }, - "inboxValidatorManager": "0x5d56B8a669F50193b54319442c6EEE5edD662381" - }, "goerli": { "inbox": { "kind": "UpgradeBeacon", diff --git a/typescript/sdk/src/deploy/core/HyperlaneCoreChecker.ts b/typescript/sdk/src/deploy/core/HyperlaneCoreChecker.ts index f6d63042e..96bb077a3 100644 --- a/typescript/sdk/src/deploy/core/HyperlaneCoreChecker.ts +++ b/typescript/sdk/src/deploy/core/HyperlaneCoreChecker.ts @@ -110,9 +110,7 @@ export class HyperlaneCoreChecker< const config = this.configMap[remote]; const validatorManagerConfig = config.validatorManager; - const expectedValidators = config.remove - ? [] - : validatorManagerConfig.validators; + const expectedValidators = validatorManagerConfig.validators; const actualValidators = await validatorManager.validators(); const expectedSet = new Set(