From 8417abf1427bc81fb4ff17cabcc0df352c9c6065 Mon Sep 17 00:00:00 2001
From: xeno097 <xeno097.cp@gmail.com>
Date: Tue, 19 Nov 2024 11:57:59 -0500
Subject: [PATCH] chore: tk pr review changes

---
 ...lygonScrollZeroNetworkZoraMainnetETHWarpConfig.ts |  9 +++------
 ...hereumOptimismPolygonZeroNetworkUSDCWarpConfig.ts | 12 ++++--------
 ...ntleModePolygonScrollZeronetworkUSDTWarpConfig.ts |  9 +++------
 .../getBaseZeroNetworkCBBTCWarpConfig.ts             |  9 +++------
 typescript/infra/src/config/warp.ts                  |  3 +++
 5 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/typescript/infra/config/environments/mainnet3/warp/configGetters/getArbitrumBaseBlastBscEthereumGnosisMantleModeOptimismPolygonScrollZeroNetworkZoraMainnetETHWarpConfig.ts b/typescript/infra/config/environments/mainnet3/warp/configGetters/getArbitrumBaseBlastBscEthereumGnosisMantleModeOptimismPolygonScrollZeroNetworkZoraMainnetETHWarpConfig.ts
index 5ad23a0b2..70dec0492 100644
--- a/typescript/infra/config/environments/mainnet3/warp/configGetters/getArbitrumBaseBlastBscEthereumGnosisMantleModeOptimismPolygonScrollZeroNetworkZoraMainnetETHWarpConfig.ts
+++ b/typescript/infra/config/environments/mainnet3/warp/configGetters/getArbitrumBaseBlastBscEthereumGnosisMantleModeOptimismPolygonScrollZeroNetworkZoraMainnetETHWarpConfig.ts
@@ -1,7 +1,8 @@
+import { ethers } from 'ethers';
+
 import {
   ChainMap,
   IsmConfig,
-  IsmType,
   RouterConfig,
   TokenRouterConfig,
   TokenType,
@@ -13,11 +14,7 @@ export const getArbitrumBaseBlastBscEthereumGnosisMantleModeOptimismPolygonScrol
   async (
     routerConfig: ChainMap<RouterConfig>,
   ): Promise<ChainMap<TokenRouterConfig>> => {
-    const ISM_CONFIG: IsmConfig = {
-      type: IsmType.FALLBACK_ROUTING,
-      owner: '0x3f13C1351AC66ca0f4827c607a94c93c82AD0913',
-      domains: {},
-    };
+    const ISM_CONFIG: IsmConfig = ethers.constants.AddressZero;
 
     const arbitrum: TokenRouterConfig = {
       ...routerConfig.arbitrum,
diff --git a/typescript/infra/config/environments/mainnet3/warp/configGetters/getArbitrumBaseEthereumOptimismPolygonZeroNetworkUSDCWarpConfig.ts b/typescript/infra/config/environments/mainnet3/warp/configGetters/getArbitrumBaseEthereumOptimismPolygonZeroNetworkUSDCWarpConfig.ts
index 5b3a32bc8..a603874ff 100644
--- a/typescript/infra/config/environments/mainnet3/warp/configGetters/getArbitrumBaseEthereumOptimismPolygonZeroNetworkUSDCWarpConfig.ts
+++ b/typescript/infra/config/environments/mainnet3/warp/configGetters/getArbitrumBaseEthereumOptimismPolygonZeroNetworkUSDCWarpConfig.ts
@@ -1,7 +1,7 @@
+import { ethers } from 'ethers';
+
 import {
   ChainMap,
-  IsmConfig,
-  IsmType,
   RouterConfig,
   TokenRouterConfig,
   TokenType,
@@ -12,11 +12,7 @@ import { tokens } from '../../../../../src/config/warp.js';
 export const getArbitrumBaseEthereumOptimismPolygonZeroNetworkUSDC = async (
   routerConfig: ChainMap<RouterConfig>,
 ): Promise<ChainMap<TokenRouterConfig>> => {
-  const ISM_CONFIG: IsmConfig = {
-    type: IsmType.FALLBACK_ROUTING,
-    owner: '0x3f13C1351AC66ca0f4827c607a94c93c82AD0913',
-    domains: {},
-  };
+  const ISM_CONFIG = ethers.constants.AddressZero;
 
   const arbitrum: TokenRouterConfig = {
     ...routerConfig.arbitrum,
@@ -49,7 +45,7 @@ export const getArbitrumBaseEthereumOptimismPolygonZeroNetworkUSDC = async (
   const zeronetwork: TokenRouterConfig = {
     ...routerConfig.zeronetwork,
     type: TokenType.collateral,
-    token: '0x6a6394F47DD0BAF794808F2749C09bd4Ee874E70',
+    token: tokens.zeronetwork.USDC,
     interchainSecurityModule: ISM_CONFIG,
   };
 
diff --git a/typescript/infra/config/environments/mainnet3/warp/configGetters/getArbitrumBscEthereumMantleModePolygonScrollZeronetworkUSDTWarpConfig.ts b/typescript/infra/config/environments/mainnet3/warp/configGetters/getArbitrumBscEthereumMantleModePolygonScrollZeronetworkUSDTWarpConfig.ts
index 78c31da8e..40f8debf6 100644
--- a/typescript/infra/config/environments/mainnet3/warp/configGetters/getArbitrumBscEthereumMantleModePolygonScrollZeronetworkUSDTWarpConfig.ts
+++ b/typescript/infra/config/environments/mainnet3/warp/configGetters/getArbitrumBscEthereumMantleModePolygonScrollZeronetworkUSDTWarpConfig.ts
@@ -1,7 +1,8 @@
+import { ethers } from 'ethers';
+
 import {
   ChainMap,
   IsmConfig,
-  IsmType,
   RouterConfig,
   TokenRouterConfig,
   TokenType,
@@ -13,11 +14,7 @@ export const getArbitrumBscEthereumMantleModePolygonScrollZeroNetworkUSDTWarpCon
   async (
     routerConfig: ChainMap<RouterConfig>,
   ): Promise<ChainMap<TokenRouterConfig>> => {
-    const ISM_CONFIG: IsmConfig = {
-      type: IsmType.FALLBACK_ROUTING,
-      owner: '0x3f13C1351AC66ca0f4827c607a94c93c82AD0913',
-      domains: {},
-    };
+    const ISM_CONFIG: IsmConfig = ethers.constants.AddressZero;
 
     const arbitrum: TokenRouterConfig = {
       ...routerConfig.arbitrum,
diff --git a/typescript/infra/config/environments/mainnet3/warp/configGetters/getBaseZeroNetworkCBBTCWarpConfig.ts b/typescript/infra/config/environments/mainnet3/warp/configGetters/getBaseZeroNetworkCBBTCWarpConfig.ts
index 2797b4d96..8e10d8bc9 100644
--- a/typescript/infra/config/environments/mainnet3/warp/configGetters/getBaseZeroNetworkCBBTCWarpConfig.ts
+++ b/typescript/infra/config/environments/mainnet3/warp/configGetters/getBaseZeroNetworkCBBTCWarpConfig.ts
@@ -1,7 +1,8 @@
+import { ethers } from 'ethers';
+
 import {
   ChainMap,
   IsmConfig,
-  IsmType,
   RouterConfig,
   TokenRouterConfig,
   TokenType,
@@ -12,11 +13,7 @@ import { tokens } from '../../../../../src/config/warp.js';
 export const getBaseZeroNetworkCBBTCWarpConfig = async (
   routerConfig: ChainMap<RouterConfig>,
 ): Promise<ChainMap<TokenRouterConfig>> => {
-  const ISM_CONFIG: IsmConfig = {
-    type: IsmType.FALLBACK_ROUTING,
-    owner: '0x3f13C1351AC66ca0f4827c607a94c93c82AD0913',
-    domains: {},
-  };
+  const ISM_CONFIG: IsmConfig = ethers.constants.AddressZero;
 
   const base: TokenRouterConfig = {
     ...routerConfig.base,
diff --git a/typescript/infra/src/config/warp.ts b/typescript/infra/src/config/warp.ts
index c15a5434c..73d9f9c6a 100644
--- a/typescript/infra/src/config/warp.ts
+++ b/typescript/infra/src/config/warp.ts
@@ -47,4 +47,7 @@ export const tokens: ChainMap<Record<string, Address>> = {
   gnosis: {
     WETH: '0x6A023CCd1ff6F2045C3309768eAd9E68F978f6e1',
   },
+  zeronetwork: {
+    USDC: '0x6a6394F47DD0BAF794808F2749C09bd4Ee874E70',
+  },
 };