Merge remote-tracking branch 'hl/main' into pb/zksync

hyperlane-xyz · Nov 6, 2024 · 464beec · 464beec
2 parents 1a5aae1 + 0264f70
commit 464beec
Show file tree

Hide file tree

Showing 15 changed files with 698 additions and 85 deletions.
diff --git a/.changeset/hip-mugs-fold.md b/.changeset/hip-mugs-fold.md
@@ -0,0 +1,5 @@
+---
+'@hyperlane-xyz/sdk': minor
+---
+
+Deploy to alephzeroevmtestnet, update deployment for arcadiatestnet2.
diff --git a/.registryrc b/.registryrc
@@ -1 +1 @@
-1ea2849e2fc1e750bac67e35827c9d682c7fd4bf
+4e52093acfe3dc75a35771905f3a7757b368ac50
diff --git a/rust/main/config/testnet_config.json b/rust/main/config/testnet_config.json
diff --git a/typescript/infra/config/environments/testnet4/agent.ts b/typescript/infra/config/environments/testnet4/agent.ts
@@ -41,9 +41,10 @@ export const hyperlaneContextAgentChainConfig: AgentChainConfig<
   typeof testnet4SupportedChainNames
 > = {
   [Role.Validator]: {
+    alephzeroevmtestnet: true,
     alfajores: true,
     arbitrumsepolia: true,
-    // arcadiatestnet: true,
+    arcadiatestnet2: true,
     basesepolia: true,
     berabartio: true,
     bsctestnet: true,
@@ -56,6 +57,7 @@ export const hyperlaneContextAgentChainConfig: AgentChainConfig<
     fuji: true,
     holesky: true,
     // hyperliquidevmtestnet: false,
+    inksepolia: true,
     odysseytestnet: true,
     optimismsepolia: true,
     // Disabling plumetestnet on Sept 16, 2024: chain is paused for "airplane mode"
@@ -71,9 +73,10 @@ export const hyperlaneContextAgentChainConfig: AgentChainConfig<
     unichaintestnet: true,
   },
   [Role.Relayer]: {
+    alephzeroevmtestnet: true,
     alfajores: true,
     arbitrumsepolia: true,
-    // arcadiatestnet: true,
+    arcadiatestnet2: true,
     basesepolia: true,
     berabartio: true,
     bsctestnet: true,
@@ -86,6 +89,7 @@ export const hyperlaneContextAgentChainConfig: AgentChainConfig<
     fuji: true,
     holesky: true,
     // hyperliquidevmtestnet: false,
+    inksepolia: true,
     odysseytestnet: true,
     optimismsepolia: true,
     // Disabling plumetestnet on Sept 16, 2024: chain is paused for "airplane mode"
@@ -101,9 +105,10 @@ export const hyperlaneContextAgentChainConfig: AgentChainConfig<
     unichaintestnet: true,
   },
   [Role.Scraper]: {
+    alephzeroevmtestnet: true,
     alfajores: true,
     arbitrumsepolia: true,
-    // arcadiatestnet: true,
+    arcadiatestnet2: true,
     basesepolia: true,
     berabartio: true,
     bsctestnet: true,
@@ -117,6 +122,7 @@ export const hyperlaneContextAgentChainConfig: AgentChainConfig<
     fuji: true,
     holesky: true,
     // hyperliquidevmtestnet: false,
+    inksepolia: true,
     odysseytestnet: true,
     optimismsepolia: true,
     // Disabling plumetestnet on Sept 16, 2024: chain is paused for "airplane mode"
@@ -209,7 +215,7 @@ const hyperlane: RootAgentConfig = {
     rpcConsensusType: RpcConsensusType.Fallback,
     docker: {
       repo,
-      tag: '463b35b-20241011-161150',
+      tag: 'b8add3c-20241106-190246',
     },
     blacklist: [...releaseCandidateHelloworldMatchingList, ...relayBlacklist],
     gasPaymentEnforcement,
@@ -231,7 +237,7 @@ const hyperlane: RootAgentConfig = {
     rpcConsensusType: RpcConsensusType.Fallback,
     docker: {
       repo,
-      tag: '463b35b-20241011-161150',
+      tag: 'b8add3c-20241106-190246',
     },
     chains: validatorChainConfig(Contexts.Hyperlane),
     resources: validatorResources,
@@ -240,7 +246,7 @@ const hyperlane: RootAgentConfig = {
     rpcConsensusType: RpcConsensusType.Fallback,
     docker: {
       repo,
-      tag: '463b35b-20241011-161150',
+      tag: 'b8add3c-20241106-190246',
     },
     resources: scraperResources,
   },

diff --git a/typescript/infra/config/environments/testnet4/aw-validators/hyperlane.json b/typescript/infra/config/environments/testnet4/aw-validators/hyperlane.json
@@ -1,4 +1,7 @@
 {
+  "alephzeroevmtestnet": {
+    "validators": ["0x556cd94bcb6e5773e8df75e7eb3f91909d266a26"]
+  },
   "alfajores": {
     "validators": [
       "0x2233a5ce12f814bd64c9cdd73410bb8693124d40",
@@ -9,6 +12,9 @@
   "arbitrumsepolia": {
     "validators": ["0x09fabfbca0b8bf042e2a1161ee5010d147b0f603"]
   },
+  "arcadiatestnet2": {
+    "validators": ["0xd39cd388ce3f616bc81be6dd3ec9348d7cdf4dff"]
+  },
   "basesepolia": {
     "validators": ["0x82e3b437a2944e3ff00258c93e72cd1ba5e0e921"]
   },
@@ -47,6 +53,9 @@
   "holesky": {
     "validators": ["0x7ab28ad88bb45867137ea823af88e2cb02359c03"]
   },
+  "inksepolia": {
+    "validators": ["0xe61c846aee275070207fcbf43674eb254f06097a"]
+  },
   "odysseytestnet": {
     "validators": ["0xcc0a6e2d6aa8560b45b384ced7aa049870b66ea3"]
   },

diff --git a/typescript/infra/config/environments/testnet4/chains.ts b/typescript/infra/config/environments/testnet4/chains.ts
@@ -18,6 +18,12 @@ export const chainMetadataOverrides: ChainMap<Partial<ChainMetadata>> = {
       gasPrice: 8 * 10 ** 9, // 8 gwei
     },
   },
+  // deploy-only overrides
+  // scrollsepolia: {
+  //   transactionOverrides: {
+  //     gasPrice: 0.5 * 10 ** 9, // 0.5 gwei
+  //   },
+  // },
 };
 
 export const getRegistry = async (useSecrets = true): Promise<IRegistry> =>

diff --git a/typescript/infra/config/environments/testnet4/core/verification.json b/typescript/infra/config/environments/testnet4/core/verification.json
@@ -1789,7 +1789,7 @@
       "isProxy": false
     }
   ],
-  "arcadiatestnet": [
+  "arcadiatestnet2": [
     {
       "name": "ProxyAdmin",
       "address": "0x54148470292C24345fb828B003461a9444414517",
@@ -1863,6 +1863,56 @@
       "address": "0x867f2089D09903f208AeCac84E599B90E5a4A821",
       "constructorArguments": "000000000000000000000000ddcfecf17586d08a5740b7d91735fcce3dfe3eed",
       "isProxy": false
+    },
+    {
+      "name": "TransparentUpgradeableProxy",
+      "address": "0x33dB966328Ea213b0f76eF96CA368AB37779F065",
+      "constructorArguments": "000000000000000000000000ddcfecf17586d08a5740b7d91735fcce3dfe3eed000000000000000000000000589c201a07c26b4725a4a829d772f24423da480b00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000",
+      "isProxy": true,
+      "expectedimplementation": "0xDDcFEcF17586D08A5740B7D91735fcCE3dfe3eeD"
+    },
+    {
+      "name": "FallbackRoutingHook",
+      "address": "0x7483faD0Bc297667664A43A064bA7c9911659f57",
+      "constructorArguments": "00000000000000000000000033db966328ea213b0f76ef96ca368ab37779f065000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c000000000000000000000000ea7e618bee8927fbb2fa20bc41ee8dea51838aad",
+      "isProxy": false
+    },
+    {
+      "name": "PausableHook",
+      "address": "0x4fE19d49F45854Da50b6009258929613EC92C147",
+      "constructorArguments": "",
+      "isProxy": false
+    },
+    {
+      "name": "StorageGasOracle",
+      "address": "0xD356C996277eFb7f75Ee8bd61b31cC781A12F54f",
+      "constructorArguments": "",
+      "isProxy": false
+    },
+    {
+      "name": "InterchainGasPaymaster",
+      "address": "0xE67CfA164cDa449Ae38a0a09391eF6bCDf8e4e2c",
+      "constructorArguments": "",
+      "isProxy": false
+    },
+    {
+      "name": "TransparentUpgradeableProxy",
+      "address": "0xfBeaF07855181f8476B235Cf746A7DF3F9e386Fb",
+      "constructorArguments": "000000000000000000000000e67cfa164cda449ae38a0a09391ef6bcdf8e4e2c000000000000000000000000589c201a07c26b4725a4a829d772f24423da480b00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000044485cc955000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c00000000000000000000000000000000000000000000000000000000",
+      "isProxy": true,
+      "expectedimplementation": "0xE67CfA164cDa449Ae38a0a09391eF6bCDf8e4e2c"
+    },
+    {
+      "name": "ProtocolFee",
+      "address": "0xA0aB1750b4F68AE5E8C42d936fa78871eae52643",
+      "constructorArguments": "000000000000000000000000000000000000000000000000000000003b9aca000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c",
+      "isProxy": false
+    },
+    {
+      "name": "ValidatorAnnounce",
+      "address": "0x843908541D24d9F6Fa30C8Bb1c39038C947D08fC",
+      "constructorArguments": "00000000000000000000000033db966328ea213b0f76ef96ca368ab37779f065",
+      "isProxy": false
     }
   ],
   "odysseytestnet": [
@@ -1940,5 +1990,145 @@
       "constructorArguments": "000000000000000000000000ddcfecf17586d08a5740b7d91735fcce3dfe3eed",
       "isProxy": false
     }
+  ],
+  "alephzeroevmtestnet": [
+    {
+      "name": "ProxyAdmin",
+      "address": "0x54148470292C24345fb828B003461a9444414517",
+      "constructorArguments": "",
+      "isProxy": false
+    },
+    {
+      "name": "Mailbox",
+      "address": "0x589C201a07c26b4725A4A829d772f24423da480B",
+      "constructorArguments": "00000000000000000000000000000000000000000000000000000000000007f7",
+      "isProxy": false
+    },
+    {
+      "name": "TransparentUpgradeableProxy",
+      "address": "0xDDcFEcF17586D08A5740B7D91735fcCE3dfe3eeD",
+      "constructorArguments": "000000000000000000000000589c201a07c26b4725a4a829d772f24423da480b00000000000000000000000054148470292c24345fb828b003461a944441451700000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000",
+      "isProxy": true,
+      "expectedimplementation": "0x589C201a07c26b4725A4A829d772f24423da480B"
+    },
+    {
+      "name": "MerkleTreeHook",
+      "address": "0xB5fB1F5410a2c2b7deD462d018541383968cB01c",
+      "constructorArguments": "000000000000000000000000ddcfecf17586d08a5740b7d91735fcce3dfe3eed",
+      "isProxy": false
+    },
+    {
+      "name": "FallbackRoutingHook",
+      "address": "0xEa7e618Bee8927fBb2fA20Bc41eE8DEA51838aAD",
+      "constructorArguments": "000000000000000000000000ddcfecf17586d08a5740b7d91735fcce3dfe3eed000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c000000000000000000000000b5fb1f5410a2c2b7ded462d018541383968cb01c",
+      "isProxy": false
+    },
+    {
+      "name": "PausableHook",
+      "address": "0x7483faD0Bc297667664A43A064bA7c9911659f57",
+      "constructorArguments": "",
+      "isProxy": false
+    },
+    {
+      "name": "StorageGasOracle",
+      "address": "0x4fE19d49F45854Da50b6009258929613EC92C147",
+      "constructorArguments": "",
+      "isProxy": false
+    },
+    {
+      "name": "InterchainGasPaymaster",
+      "address": "0x01812D60958798695391dacF092BAc4a715B1718",
+      "constructorArguments": "",
+      "isProxy": false
+    },
+    {
+      "name": "TransparentUpgradeableProxy",
+      "address": "0x867f2089D09903f208AeCac84E599B90E5a4A821",
+      "constructorArguments": "00000000000000000000000001812d60958798695391dacf092bac4a715b171800000000000000000000000054148470292c24345fb828b003461a944441451700000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000044485cc955000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c00000000000000000000000000000000000000000000000000000000",
+      "isProxy": true,
+      "expectedimplementation": "0x01812D60958798695391dacF092BAc4a715B1718"
+    },
+    {
+      "name": "ProtocolFee",
+      "address": "0x5e65279Fb7293a058776e37587398fcc3E9184b1",
+      "constructorArguments": "000000000000000000000000000000000000000000000000000000003b9aca000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c",
+      "isProxy": false
+    },
+    {
+      "name": "ValidatorAnnounce",
+      "address": "0xBF2C366530C1269d531707154948494D3fF4AcA7",
+      "constructorArguments": "000000000000000000000000ddcfecf17586d08a5740b7d91735fcce3dfe3eed",
+      "isProxy": false
+    }
+  ],
+  "inksepolia": [
+    {
+      "name": "ProxyAdmin",
+      "address": "0x54148470292C24345fb828B003461a9444414517",
+      "constructorArguments": "",
+      "isProxy": false
+    },
+    {
+      "name": "Mailbox",
+      "address": "0x589C201a07c26b4725A4A829d772f24423da480B",
+      "constructorArguments": "00000000000000000000000000000000000000000000000000000000000ba5ed",
+      "isProxy": false
+    },
+    {
+      "name": "TransparentUpgradeableProxy",
+      "address": "0xDDcFEcF17586D08A5740B7D91735fcCE3dfe3eeD",
+      "constructorArguments": "000000000000000000000000589c201a07c26b4725a4a829d772f24423da480b00000000000000000000000054148470292c24345fb828b003461a944441451700000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000",
+      "isProxy": true,
+      "expectedimplementation": "0x589C201a07c26b4725A4A829d772f24423da480B"
+    },
+    {
+      "name": "MerkleTreeHook",
+      "address": "0x4fE19d49F45854Da50b6009258929613EC92C147",
+      "constructorArguments": "000000000000000000000000ddcfecf17586d08a5740b7d91735fcce3dfe3eed",
+      "isProxy": false
+    },
+    {
+      "name": "FallbackRoutingHook",
+      "address": "0xD356C996277eFb7f75Ee8bd61b31cC781A12F54f",
+      "constructorArguments": "000000000000000000000000ddcfecf17586d08a5740b7d91735fcce3dfe3eed000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c0000000000000000000000004fe19d49f45854da50b6009258929613ec92c147",
+      "isProxy": false
+    },
+    {
+      "name": "PausableHook",
+      "address": "0x01812D60958798695391dacF092BAc4a715B1718",
+      "constructorArguments": "",
+      "isProxy": false
+    },
+    {
+      "name": "StorageGasOracle",
+      "address": "0xE67CfA164cDa449Ae38a0a09391eF6bCDf8e4e2c",
+      "constructorArguments": "",
+      "isProxy": false
+    },
+    {
+      "name": "InterchainGasPaymaster",
+      "address": "0xfBeaF07855181f8476B235Cf746A7DF3F9e386Fb",
+      "constructorArguments": "",
+      "isProxy": false
+    },
+    {
+      "name": "TransparentUpgradeableProxy",
+      "address": "0x54Bd02f0f20677e9846F8E9FdB1Abc7315C49C38",
+      "constructorArguments": "000000000000000000000000fbeaf07855181f8476b235cf746a7df3f9e386fb00000000000000000000000054148470292c24345fb828b003461a944441451700000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000044485cc955000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c00000000000000000000000000000000000000000000000000000000",
+      "isProxy": true,
+      "expectedimplementation": "0xfBeaF07855181f8476B235Cf746A7DF3F9e386Fb"
+    },
+    {
+      "name": "ProtocolFee",
+      "address": "0x843908541D24d9F6Fa30C8Bb1c39038C947D08fC",
+      "constructorArguments": "000000000000000000000000000000000000000000000000000000003b9aca000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c000000000000000000000000fad1c94469700833717fa8a3017278bc1ca8031c",
+      "isProxy": false
+    },
+    {
+      "name": "ValidatorAnnounce",
+      "address": "0xBdf49bE2201A1c4B13023F0a407196C6Adb32680",
+      "constructorArguments": "000000000000000000000000ddcfecf17586d08a5740b7d91735fcce3dfe3eed",
+      "isProxy": false
+    }
   ]
 }
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: '463b35b-20241011-161139',
+    tag: 'b8add3c-20241106-190239',
   },
   // We're currently using the same deployer key as testnet2.
   // To minimize nonce clobbering we offset the key funder cron
@@ -26,9 +26,10 @@ export const keyFunderConfig: KeyFunderConfig<
   },
   // desired balance config
   desiredBalancePerChain: {
+    alephzeroevmtestnet: '2',
     alfajores: '5',
     arbitrumsepolia: '0.1',
-    // arcadiatestnet: '0.1',
+    arcadiatestnet2: '0.1',
     basesepolia: '0.1',
     berabartio: '0.1',
     bsctestnet: '5',
@@ -42,6 +43,7 @@ export const keyFunderConfig: KeyFunderConfig<
     fuji: '5',
     holesky: '5',
     // hyperliquidevmtestnet: '0.1',
+    inksepolia: '0.1',
     odysseytestnet: '0.1',
     optimismsepolia: '0.1',
     // Disabling plumetestnet on Sept 16, 2024: chain is paused for "airplane mode"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		1ea2849e2fc1e750bac67e35827c9d682c7fd4bf
		4e52093acfe3dc75a35771905f3a7757b368ac50