chore: enable citreatestnet + testnet igp fixes (#4583)

chore: enable citreatestnet + igp fixes - enable citreatestnet - set chunk size to 999 - flat price for testnet tokens - avoids problem where chains that have a non-eth native gas token end up paying way higher IGP fees than required
hyperlane-xyz · Sep 27, 2024 · 330b058 · 330b058
1 parent 6e787a9
commit 330b058
Show file tree

Hide file tree

Showing 10 changed files with 59 additions and 61 deletions.
diff --git a/.registryrc b/.registryrc
@@ -1 +1 @@
-3df435f02b4787a58faf3e3c7411e62959b6db38
+a87a555d19834d6d3dada72ccdcb3661ba9ff003
diff --git a/rust/main/config/testnet_config.json b/rust/main/config/testnet_config.json
@@ -37,7 +37,7 @@
       "interchainAccountIsm": "0x6895d3916B94b386fAA6ec9276756e16dAe7480E",
       "interchainAccountRouter": "0xEbA64c8a9b4a61a9210d5fe7E4375380999C821b",
       "interchainGasPaymaster": "0x44769b0f4a6f01339e131a691cc2eebbb519d297",
-      "interchainSecurityModule": "0x0a89d18D16Fd969b1f864B3354290d9c4aD91C4c",
+      "interchainSecurityModule": "0x83D62A2cA5609bA703c2685c557d72A64CB52173",
       "isTestnet": true,
       "mailbox": "0xEf9F292fcEBC3848bF4bB92a96a04F9ECBb78E59",
       "merkleTreeHook": "0x221FA9CBaFcd6c1C3d206571Cf4427703e023FFa",
@@ -100,7 +100,7 @@
         "from": 49690504
       },
       "interchainGasPaymaster": "0xc756cFc1b7d0d4646589EDf10eD54b201237F5e8",
-      "interchainSecurityModule": "0xB071d45FFDB9c6BC3D6d91dA6565786D93eB2D6f",
+      "interchainSecurityModule": "0xf6e44F2c394Bd4db6757a858BCF231BE8779D73D",
       "isTestnet": true,
       "mailbox": "0x598facE78a4302f11E3de0bee1894Da0b2Cb71F8",
       "merkleTreeHook": "0xAD34A66Bf6dB18E858F6B686557075568c6E031C",
@@ -165,7 +165,7 @@
         "from": 13851043
       },
       "interchainGasPaymaster": "0x28B02B97a850872C4D33C3E024fab6499ad96564",
-      "interchainSecurityModule": "0x8fE91D229bb2d4872E94D5130246A3E287E77c47",
+      "interchainSecurityModule": "0x85f5aE8393c3051057444eEaB78bA9567C95BCD1",
       "isTestnet": true,
       "mailbox": "0x6966b0E55883d49BFB24539356a2f8A673E02039",
       "merkleTreeHook": "0x86fb9F1c124fB20ff130C41a79a432F770f67AFD",
@@ -232,7 +232,7 @@
       "interchainAccountIsm": "0xa9D8Ec959F34272B1a56D09AF00eeee58970d3AE",
       "interchainAccountRouter": "0x6d2B3e304E58c2a19f1492E7cf15CaF63Ce6e0d2",
       "interchainGasPaymaster": "0x0dD20e410bdB95404f71c5a4e7Fa67B892A5f949",
-      "interchainSecurityModule": "0x8842eDc6080e6A37F72eEe64cdae9fE0bCa9AeB8",
+      "interchainSecurityModule": "0x07c5B572D29A70C308Ef96fA98a635fA22dA44c9",
       "isTestnet": true,
       "mailbox": "0xF9F6F5646F478d5ab4e20B0F910C92F1CCC9Cc6D",
       "merkleTreeHook": "0xc6cbF39A747f5E28d1bDc8D9dfDAb2960Abd5A8f",
@@ -301,7 +301,7 @@
         "from": 4950
       },
       "interchainGasPaymaster": "0xeC7eb4196Bd601DEa7585A744FbFB4CF11278450",
-      "interchainSecurityModule": "0xBD64f3dd712Ef0c372A8F9410c2296ff3AB7C3A4",
+      "interchainSecurityModule": "0xc6B9CA04fDB54E63Aff6B3617C2E0A1228a19C67",
       "isTestnet": true,
       "mailbox": "0x6966b0E55883d49BFB24539356a2f8A673E02039",
       "merkleTreeHook": "0x4926a10788306D84202A2aDbd290b7743146Cc17",
@@ -399,7 +399,7 @@
         "from": 1606754
       },
       "interchainGasPaymaster": "0x28B02B97a850872C4D33C3E024fab6499ad96564",
-      "interchainSecurityModule": "0x85f5aE8393c3051057444eEaB78bA9567C95BCD1",
+      "interchainSecurityModule": "0x6Cf48F7b26374a741EE5290ECB58b23cCA171baa",
       "isTestnet": true,
       "mailbox": "0x6966b0E55883d49BFB24539356a2f8A673E02039",
       "merkleTreeHook": "0x86fb9F1c124fB20ff130C41a79a432F770f67AFD",
@@ -462,7 +462,7 @@
       "interchainAccountIsm": "0xfaB4815BDC5c60c6bD625459C8577aFdD79D9311",
       "interchainAccountRouter": "0xeEF6933122894fF217a7dd07510b3D64b747e29b",
       "interchainGasPaymaster": "0x6895d3916B94b386fAA6ec9276756e16dAe7480E",
-      "interchainSecurityModule": "0x6E1eAddcA9708Af27c17b86DA132A27F316fF126",
+      "interchainSecurityModule": "0xd0FBdaEC5b7Beba18E23492F1d3A8a15f8685E6E",
       "isTestnet": true,
       "mailbox": "0x5b6CFf85442B851A8e6eaBd2A4E4507B5135B3B0",
       "merkleTreeHook": "0x9ff6ac3dAf63103620BBf76136eA1AFf43c2F612",
@@ -528,7 +528,7 @@
         "from": 1543015
       },
       "interchainGasPaymaster": "0x5CBf4e70448Ed46c2616b04e9ebc72D29FF0cfA9",
-      "interchainSecurityModule": "0x4F893EbE13724C6A2d2Cd34FAE509116c25b9B62",
+      "interchainSecurityModule": "0xa5A3004174cd16AB6C4e69a7558f4f84a51D2cfB",
       "isTestnet": true,
       "mailbox": "0x46f7C5D896bbeC89bE1B19e4485e59b4Be49e9Cc",
       "merkleTreeHook": "0x98AAE089CaD930C64a76dD2247a2aC5773a4B8cE",
@@ -590,7 +590,7 @@
         "from": 15833917
       },
       "interchainGasPaymaster": "0x28B02B97a850872C4D33C3E024fab6499ad96564",
-      "interchainSecurityModule": "0x85f5aE8393c3051057444eEaB78bA9567C95BCD1",
+      "interchainSecurityModule": "0x6Cf48F7b26374a741EE5290ECB58b23cCA171baa",
       "isTestnet": true,
       "mailbox": "0x6966b0E55883d49BFB24539356a2f8A673E02039",
       "merkleTreeHook": "0x86fb9F1c124fB20ff130C41a79a432F770f67AFD",
@@ -715,7 +715,7 @@
         "from": 10634605
       },
       "interchainGasPaymaster": "0x6c13643B3927C57DB92c790E4E3E7Ee81e13f78C",
-      "interchainSecurityModule": "0x32247eBC716c3B8bB5710c0b7CEb4D3a2A9A6205",
+      "interchainSecurityModule": "0x782Dc499C9b9EE59e79D243322beC5b03e017819",
       "isTestnet": true,
       "mailbox": "0x54148470292C24345fb828B003461a9444414517",
       "merkleTreeHook": "0xddf4C3e791caCaFd26D7fb275549739B38ae6e75",
@@ -787,7 +787,7 @@
       "interchainAccountIsm": "0xE023239c8dfc172FF008D8087E7442d3eBEd9350",
       "interchainAccountRouter": "0xe17c37212d785760E8331D4A4395B17b34Ba8cDF",
       "interchainGasPaymaster": "0x86fb9F1c124fB20ff130C41a79a432F770f67AFD",
-      "interchainSecurityModule": "0xacc87264e624bA17d4116800BbA6178a3378A9C8",
+      "interchainSecurityModule": "0xb0ED7B7CD2572D45f1439069a2B973d8Dc0C5970",
       "isTestnet": true,
       "mailbox": "0x3C5154a193D6e2955650f9305c8d80c18C814A68",
       "merkleTreeHook": "0x863E8c26621c52ACa1849C53500606e73BA272F0",
@@ -828,9 +828,6 @@
       "testRecipient": "0xa3AB7E6cE24E6293bD5320A53329Ef2f4DE73fCA",
       "testTokenRecipient": "0xc76E477437065093D353b7d56c81ff54D167B0Ab",
       "timelockController": "0x0000000000000000000000000000000000000000",
-      "transactionOverrides": {
-        "gasPrice": 500000000
-      },
       "validatorAnnounce": "0x527768930D889662Fe7ACF64294871e86e4C2381",
       "staticMerkleRootWeightedMultisigIsmFactory": "0x339B46496D60b1b6B42e9715DeD8B3D2154dA0Bb",
       "staticMessageIdWeightedMultisigIsmFactory": "0x63dFf524F1c7361f4F1bf07D658Bf7f2d5Dd5B20",
@@ -868,7 +865,7 @@
       "interchainAccountIsm": "0x83a3068B719F764d413625dA77468ED74789ae02",
       "interchainAccountRouter": "0x8e131c8aE5BF1Ed38D05a00892b6001a7d37739d",
       "interchainGasPaymaster": "0x6f2756380FD49228ae25Aa7F2817993cB74Ecc56",
-      "interchainSecurityModule": "0x932C1D184b3A792c5470f700fBB60c35FB86D9eD",
+      "interchainSecurityModule": "0x5E01E8FEc4733a8e113c21EF75f5bd793B7eE8fe",
       "isTestnet": true,
       "mailbox": "0xfFAEF09B3cd11D9b20d1a19bECca54EEC2884766",
       "merkleTreeHook": "0x4917a9746A7B6E0A57159cCb7F5a6744247f2d0d",
@@ -978,7 +975,7 @@
         "from": 3111622
       },
       "interchainGasPaymaster": "0xeC7eb4196Bd601DEa7585A744FbFB4CF11278450",
-      "interchainSecurityModule": "0xBD64f3dd712Ef0c372A8F9410c2296ff3AB7C3A4",
+      "interchainSecurityModule": "0xc6B9CA04fDB54E63Aff6B3617C2E0A1228a19C67",
       "isTestnet": true,
       "mailbox": "0x6966b0E55883d49BFB24539356a2f8A673E02039",
       "merkleTreeHook": "0x4926a10788306D84202A2aDbd290b7743146Cc17",
@@ -1059,7 +1056,7 @@
       "interchainAccountIsm": "0xA2cf52064c921C11adCd83588CbEa08cc3bfF5d8",
       "interchainAccountRouter": "0xa3AB7E6cE24E6293bD5320A53329Ef2f4DE73fCA",
       "interchainGasPaymaster": "0x04438ef7622f5412f82915F59caD4f704C61eA48",
-      "interchainSecurityModule": "0xd38BAC111B9C96953fddBA8fA52C90a2bD99dC45",
+      "interchainSecurityModule": "0x58B923EE9F79479E3cf226fCC32EdF42079A56b1",
       "mailbox": "0xDDcFEcF17586D08A5740B7D91735fcCE3dfe3eeD",
       "merkleTreeHook": "0x6c13643B3927C57DB92c790E4E3E7Ee81e13f78C",
       "pausableHook": "0x783c4a0bB6663359281aD4a637D5af68F83ae213",
@@ -1119,7 +1116,7 @@
       "interchainAccountIsm": "0xD356C996277eFb7f75Ee8bd61b31cC781A12F54f",
       "interchainAccountRouter": "0x867f2089D09903f208AeCac84E599B90E5a4A821",
       "interchainGasPaymaster": "0xA2cf52064c921C11adCd83588CbEa08cc3bfF5d8",
-      "interchainSecurityModule": "0x77d4B4090B666d84b4451C7425682B8F51Dbd827",
+      "interchainSecurityModule": "0xc313b6C98D5CA1f9ee5beb4211BC87DA7ab7B5ED",
       "mailbox": "0xDDcFEcF17586D08A5740B7D91735fcCE3dfe3eeD",
       "merkleTreeHook": "0xD5eB5fa3f470eBBB93a4A58C644c87031268a04A",
       "pausableHook": "0x51A0a100e7BC63Ea7821A3a023B6F17fb94FF011",
@@ -1183,7 +1180,7 @@
       "interchainAccountIsm": "0xFfa913705484C9BAea32Ffe9945BeA099A1DFF72",
       "interchainAccountRouter": "0xB5fB1F5410a2c2b7deD462d018541383968cB01c",
       "interchainGasPaymaster": "0xD5eB5fa3f470eBBB93a4A58C644c87031268a04A",
-      "interchainSecurityModule": "0xb6D42522D79897d776966955fe4a2558BB1E0B7c",
+      "interchainSecurityModule": "0xe51dbFbD86a345a818dc93ab8589ab8dB94ab593",
       "mailbox": "0xB08d78F439e55D02C398519eef61606A5926245F",
       "merkleTreeHook": "0x783c4a0bB6663359281aD4a637D5af68F83ae213",
       "pausableHook": "0x66b71A4e18FbE09a6977A6520B47fEDdffA82a1c",
@@ -1202,6 +1199,7 @@
       "timelockController": "0x0000000000000000000000000000000000000000",
       "validatorAnnounce": "0x7c5B5bdA7F1d1F70A6678ABb4d894612Fc76498F",
       "index": {
+        "chunk": 999,
         "from": 334706
       }
     },
@@ -1243,7 +1241,7 @@
       "interchainAccountIsm": "0xD356C996277eFb7f75Ee8bd61b31cC781A12F54f",
       "interchainAccountRouter": "0x867f2089D09903f208AeCac84E599B90E5a4A821",
       "interchainGasPaymaster": "0xA2cf52064c921C11adCd83588CbEa08cc3bfF5d8",
-      "interchainSecurityModule": "0x77d4B4090B666d84b4451C7425682B8F51Dbd827",
+      "interchainSecurityModule": "0xc313b6C98D5CA1f9ee5beb4211BC87DA7ab7B5ED",
       "mailbox": "0xDDcFEcF17586D08A5740B7D91735fcCE3dfe3eeD",
       "merkleTreeHook": "0xD5eB5fa3f470eBBB93a4A58C644c87031268a04A",
       "pausableHook": "0x51A0a100e7BC63Ea7821A3a023B6F17fb94FF011",
@@ -1367,7 +1365,7 @@
       "interchainAccountIsm": "0xD356C996277eFb7f75Ee8bd61b31cC781A12F54f",
       "interchainAccountRouter": "0x867f2089D09903f208AeCac84E599B90E5a4A821",
       "interchainGasPaymaster": "0xA2cf52064c921C11adCd83588CbEa08cc3bfF5d8",
-      "interchainSecurityModule": "0x77d4B4090B666d84b4451C7425682B8F51Dbd827",
+      "interchainSecurityModule": "0xc313b6C98D5CA1f9ee5beb4211BC87DA7ab7B5ED",
       "mailbox": "0xDDcFEcF17586D08A5740B7D91735fcCE3dfe3eeD",
       "merkleTreeHook": "0xD5eB5fa3f470eBBB93a4A58C644c87031268a04A",
       "pausableHook": "0x51A0a100e7BC63Ea7821A3a023B6F17fb94FF011",
@@ -1427,7 +1425,7 @@
       "interchainAccountIsm": "0xD356C996277eFb7f75Ee8bd61b31cC781A12F54f",
       "interchainAccountRouter": "0x867f2089D09903f208AeCac84E599B90E5a4A821",
       "interchainGasPaymaster": "0xA2cf52064c921C11adCd83588CbEa08cc3bfF5d8",
-      "interchainSecurityModule": "0x77d4B4090B666d84b4451C7425682B8F51Dbd827",
+      "interchainSecurityModule": "0xc313b6C98D5CA1f9ee5beb4211BC87DA7ab7B5ED",
       "mailbox": "0xDDcFEcF17586D08A5740B7D91735fcCE3dfe3eeD",
       "merkleTreeHook": "0xD5eB5fa3f470eBBB93a4A58C644c87031268a04A",
       "pausableHook": "0x51A0a100e7BC63Ea7821A3a023B6F17fb94FF011",

diff --git a/typescript/infra/config/environments/testnet4/agent.ts b/typescript/infra/config/environments/testnet4/agent.ts
@@ -47,7 +47,7 @@ export const hyperlaneContextAgentChainConfig: AgentChainConfig<
     berabartio: true,
     bsctestnet: true,
     camptestnet: true,
-    // citreatestnet: false,
+    citreatestnet: true,
     connextsepolia: true,
     ecotestnet: true,
     eclipsetestnet: false,
@@ -73,7 +73,7 @@ export const hyperlaneContextAgentChainConfig: AgentChainConfig<
     berabartio: true,
     bsctestnet: true,
     camptestnet: true,
-    // citreatestnet: false,
+    citreatestnet: true,
     connextsepolia: true,
     ecotestnet: true,
     eclipsetestnet: false,
@@ -99,7 +99,7 @@ export const hyperlaneContextAgentChainConfig: AgentChainConfig<
     berabartio: true,
     bsctestnet: true,
     camptestnet: true,
-    // citreatestnet: false,
+    citreatestnet: true,
     connextsepolia: false,
     ecotestnet: true,
     // Cannot scrape non-EVM chains
@@ -197,7 +197,7 @@ const hyperlane: RootAgentConfig = {
     rpcConsensusType: RpcConsensusType.Fallback,
     docker: {
       repo,
-      tag: 'a436832-20240925-232333',
+      tag: '6c45a05-20240927-172800',
     },
     blacklist: [...releaseCandidateHelloworldMatchingList, ...relayBlacklist],
     gasPaymentEnforcement,
@@ -219,7 +219,7 @@ const hyperlane: RootAgentConfig = {
     rpcConsensusType: RpcConsensusType.Fallback,
     docker: {
       repo,
-      tag: 'a436832-20240925-232333',
+      tag: '6c45a05-20240927-172800',
     },
     chains: validatorChainConfig(Contexts.Hyperlane),
     resources: validatorResources,
@@ -228,7 +228,7 @@ const hyperlane: RootAgentConfig = {
     rpcConsensusType: RpcConsensusType.Fallback,
     docker: {
       repo,
-      tag: 'a436832-20240925-232333',
+      tag: '6c45a05-20240927-172800',
     },
     resources: scraperResources,
   },

diff --git a/typescript/infra/config/environments/testnet4/aw-validators/hyperlane.json b/typescript/infra/config/environments/testnet4/aw-validators/hyperlane.json
@@ -25,6 +25,9 @@
   "camptestnet": {
     "validators": ["0x238f40f055a7ff697ea6dbff3ae943c9eae7a38e"]
   },
+  "citreatestnet": {
+    "validators": ["0x60d7380a41eb95c49be18f141efd2fde5e3dba20"]
+  },
   "connextsepolia": {
     "validators": ["0xffbbec8c499585d80ef69eb613db624d27e089ab"]
   },

diff --git a/typescript/infra/config/environments/testnet4/funding.ts b/typescript/infra/config/environments/testnet4/funding.ts
@@ -10,7 +10,7 @@ export const keyFunderConfig: KeyFunderConfig<
 > = {
   docker: {
     repo: 'gcr.io/abacus-labs-dev/hyperlane-monorepo',
-    tag: 'a436832-20240925-232318',
+    tag: '2bb7168-20240927-154029',
   },
   // We're currently using the same deployer key as testnet2.
   // To minimize nonce clobbering we offset the key funder cron
@@ -32,7 +32,7 @@ export const keyFunderConfig: KeyFunderConfig<
     berabartio: '0.1',
     bsctestnet: '5',
     camptestnet: '0.1',
-    // citreatestnet: '0.001',
+    citreatestnet: '0.001',
     connextsepolia: '1',
     ecotestnet: '0.02',
     // no funding for solana

diff --git a/typescript/infra/config/environments/testnet4/gasPrices.json b/typescript/infra/config/environments/testnet4/gasPrices.json
@@ -12,7 +12,7 @@
     "decimals": 9
   },
   "berabartio": {
-    "amount": "0.001000009",
+    "amount": "0.010488335",
     "decimals": 9
   },
   "bsctestnet": {
@@ -24,7 +24,7 @@
     "decimals": 9
   },
   "citreatestnet": {
-    "amount": "1.01",
+    "amount": "1.0",
     "decimals": 9
   },
   "connextsepolia": {
@@ -48,11 +48,7 @@
     "decimals": 9
   },
   "holesky": {
-    "amount": "0.783743361",
-    "decimals": 9
-  },
-  "hyperliquidevmtestnet": {
-    "amount": "0.000000007",
+    "amount": "0.858734023",
     "decimals": 9
   },
   "optimismsepolia": {
@@ -64,11 +60,11 @@
     "decimals": 9
   },
   "scrollsepolia": {
-    "amount": "0.497427713",
+    "amount": "1",
     "decimals": 9
   },
   "sepolia": {
-    "amount": "148.376099624",
+    "amount": "277.866557179",
     "decimals": 9
   },
   "solanatestnet": {

diff --git a/typescript/infra/config/environments/testnet4/igp/verification.json b/typescript/infra/config/environments/testnet4/igp/verification.json
@@ -0,0 +1 @@
+{}
diff --git a/typescript/infra/config/environments/testnet4/supportedChainNames.ts b/typescript/infra/config/environments/testnet4/supportedChainNames.ts
@@ -6,7 +6,7 @@ export const testnet4SupportedChainNames = [
   'berabartio',
   'bsctestnet',
   'camptestnet',
-  // 'citreatestnet',
+  'citreatestnet',
   'connextsepolia',
   'ecotestnet',
   'eclipsetestnet',

diff --git a/typescript/infra/config/environments/testnet4/testrecipient/verification.json b/typescript/infra/config/environments/testnet4/testrecipient/verification.json
@@ -0,0 +1 @@
+{}
diff --git a/typescript/infra/config/environments/testnet4/tokenPrices.json b/typescript/infra/config/environments/testnet4/tokenPrices.json
@@ -1,24 +1,23 @@
 {
-  "alfajores": "0.672791",
-  "arbitrumsepolia": "2580.94",
-  "basesepolia": "2580.94",
+  "alfajores": "10",
+  "arbitrumsepolia": "10",
+  "basesepolia": "10",
   "berabartio": "10",
-  "bsctestnet": "589.38",
-  "camptestnet": "2580.94",
-  "citreatestnet": "63497",
-  "connextsepolia": "2580.94",
-  "ecotestnet": "2580.94",
-  "eclipsetestnet": "2580.94",
-  "formtestnet": "2580.94",
-  "fuji": "27.56",
-  "holesky": "2580.94",
-  "hyperliquidevmtestnet": "2580.94",
-  "optimismsepolia": "2580.94",
-  "polygonamoy": "0.412898",
-  "scrollsepolia": "2580.94",
-  "sepolia": "2580.94",
-  "solanatestnet": "150.38",
-  "soneiumtestnet": "2580.94",
-  "suavetoliman": "2580.94",
+  "bsctestnet": "10",
+  "camptestnet": "10",
+  "citreatestnet": "10",
+  "connextsepolia": "10",
+  "ecotestnet": "10",
+  "eclipsetestnet": "10",
+  "formtestnet": "10",
+  "fuji": "10",
+  "holesky": "10",
+  "optimismsepolia": "10",
+  "polygonamoy": "10",
+  "scrollsepolia": "10",
+  "sepolia": "10",
+  "solanatestnet": "10",
+  "soneiumtestnet": "10",
+  "suavetoliman": "10",
   "superpositiontestnet": "10"
 }