Merge branch 'main' into kunal/recover-warp-routers

hyperlane-xyz · Mar 7, 2024 · b41199e · b41199e
2 parents 87ddcce + 78f43c1
commit b41199e
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 20 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -305,6 +305,9 @@ jobs:
           - environment: testnet4
             chain: sepolia
             module: core
+          - environment: mainnet3
+            chain: inevm
+            module: warp
 
     steps:
       - uses: actions/checkout@v3

diff --git a/typescript/infra/config/environments/mainnet3/warp/addresses.json b/typescript/infra/config/environments/mainnet3/warp/addresses.json
@@ -1,8 +1,9 @@
 {
-  "inevm": {
-    "HypERC20": "0x8358D8291e3bEDb04804975eEa0fe9fe0fAfB147"
+  "injective": {
+    "router": "inj1mv9tjvkaw7x8w8y9vds8pkfq46g2vcfkjehc6k"
   },
-  "ethereum": {
-    "HypERC20Collateral": "0xED56728fb977b0bBdacf65bCdD5e17Bb7e84504f"
+  "inevm": {
+    "HypNative": "0x26f32245fCF5Ad53159E875d5Cae62aEcf19c2d4",
+    "router": "0x26f32245fCF5Ad53159E875d5Cae62aEcf19c2d4"
   }
 }
diff --git a/typescript/infra/scripts/deploy.ts b/typescript/infra/scripts/deploy.ts
@@ -23,7 +23,7 @@ import {
 import { objMap } from '@hyperlane-xyz/utils';
 
 import { Contexts } from '../config/contexts';
-import { aggregationIsm } from '../config/routingIsm';
+import { safes } from '../config/environments/mainnet3/owners';
 import { deployEnvToSdkEnv } from '../src/config/environment';
 import { deployWithArtifacts } from '../src/deployment/deploy';
 import { TestQuerySenderDeployer } from '../src/deployment/testcontracts/testquerysender';
@@ -121,25 +121,19 @@ async function main() {
       multiProvider,
     );
     const routerConfig = core.getRouterConfig(envConfig.owners);
-    const plumetestnet = {
-      ...routerConfig.plumetestnet,
-      type: TokenType.synthetic,
-      name: 'Wrapped Ether',
-      symbol: 'WETH',
-      decimals: 18,
-      totalSupply: '0',
+    const inevm = {
+      ...routerConfig.inevm,
+      type: TokenType.native,
+      interchainSecurityModule: ethers.constants.AddressZero,
+      owner: safes.inevm,
     };
-    const sepolia = {
-      ...routerConfig.sepolia,
+    const injective = {
+      ...routerConfig.injective,
       type: TokenType.native,
-      interchainSecurityModule: aggregationIsm(
-        'plumetestnet',
-        Contexts.Hyperlane,
-      ),
     };
     config = {
-      plumetestnet,
-      sepolia,
+      inevm,
+      injective,
     };
     deployer = new HypERC20Deployer(
       multiProvider,