From f19dacfd199da0838176196dad12b1922e5c7e6b Mon Sep 17 00:00:00 2001 From: xeno097 Date: Tue, 19 Nov 2024 10:03:23 -0500 Subject: [PATCH] chore: updated USDC and ETH zero network routes to add lisk network connection --- ...rollZeroNetworkZoraMainnetETHWarpConfig.ts | 98 ++++++------------- ...ptimismPolygonZeroNetworkUSDCWarpConfig.ts | 50 ++++------ ...PolygonScrollZeronetworkUSDTWarpConfig.ts} | 57 +++-------- ...s => getBaseZeroNetworkCBBTCWarpConfig.ts} | 19 ++-- .../environments/mainnet3/warp/warpIds.ts | 4 +- typescript/infra/config/warp.ts | 10 +- 6 files changed, 82 insertions(+), 156 deletions(-) rename typescript/infra/config/environments/mainnet3/warp/configGetters/{getArbitrumBscEthereumMantleModePolygonScrollZeronetworkUSDT.ts => getArbitrumBscEthereumMantleModePolygonScrollZeronetworkUSDTWarpConfig.ts} (54%) rename typescript/infra/config/environments/mainnet3/warp/configGetters/{getBaseZeroCBBTCWarpConfig.ts => getBaseZeroNetworkCBBTCWarpConfig.ts} (66%) diff --git a/typescript/infra/config/environments/mainnet3/warp/configGetters/getArbitrumBaseBlastBscEthereumGnosisMantleModeOptimismPolygonScrollZeroNetworkZoraMainnetETHWarpConfig.ts b/typescript/infra/config/environments/mainnet3/warp/configGetters/getArbitrumBaseBlastBscEthereumGnosisMantleModeOptimismPolygonScrollZeroNetworkZoraMainnetETHWarpConfig.ts index 7b853503b..5ad23a0b2 100644 --- a/typescript/infra/config/environments/mainnet3/warp/configGetters/getArbitrumBaseBlastBscEthereumGnosisMantleModeOptimismPolygonScrollZeroNetworkZoraMainnetETHWarpConfig.ts +++ b/typescript/infra/config/environments/mainnet3/warp/configGetters/getArbitrumBaseBlastBscEthereumGnosisMantleModeOptimismPolygonScrollZeroNetworkZoraMainnetETHWarpConfig.ts @@ -1,5 +1,6 @@ import { ChainMap, + IsmConfig, IsmType, RouterConfig, TokenRouterConfig, @@ -12,138 +13,98 @@ export const getArbitrumBaseBlastBscEthereumGnosisMantleModeOptimismPolygonScrol async ( routerConfig: ChainMap, ): Promise> => { + const ISM_CONFIG: IsmConfig = { + type: IsmType.FALLBACK_ROUTING, + owner: '0x3f13C1351AC66ca0f4827c607a94c93c82AD0913', + domains: {}, + }; + const arbitrum: TokenRouterConfig = { ...routerConfig.arbitrum, type: TokenType.native, - interchainSecurityModule: { - type: IsmType.FALLBACK_ROUTING, - owner: '0x3f13C1351AC66ca0f4827c607a94c93c82AD0913', - domains: {}, - }, + interchainSecurityModule: ISM_CONFIG, }; const base: TokenRouterConfig = { ...routerConfig.base, type: TokenType.native, - interchainSecurityModule: { - type: IsmType.FALLBACK_ROUTING, - owner: '0x3f13C1351AC66ca0f4827c607a94c93c82AD0913', - domains: {}, - }, + interchainSecurityModule: ISM_CONFIG, }; const blast: TokenRouterConfig = { ...routerConfig.blast, type: TokenType.native, - interchainSecurityModule: { - type: IsmType.FALLBACK_ROUTING, - owner: '0x3f13C1351AC66ca0f4827c607a94c93c82AD0913', - domains: {}, - }, + interchainSecurityModule: ISM_CONFIG, }; const bsc: TokenRouterConfig = { ...routerConfig.bsc, type: TokenType.collateral, token: tokens.bsc.WETH, - interchainSecurityModule: { - type: IsmType.FALLBACK_ROUTING, - owner: '0x3f13C1351AC66ca0f4827c607a94c93c82AD0913', - domains: {}, - }, + interchainSecurityModule: ISM_CONFIG, + }; + + const ethereum: TokenRouterConfig = { + ...routerConfig.ethereum, + type: TokenType.native, + interchainSecurityModule: ISM_CONFIG, }; const gnosis: TokenRouterConfig = { ...routerConfig.gnosis, type: TokenType.collateral, token: tokens.gnosis.WETH, - interchainSecurityModule: { - type: IsmType.FALLBACK_ROUTING, - owner: '0x3f13C1351AC66ca0f4827c607a94c93c82AD0913', - domains: {}, - }, + interchainSecurityModule: ISM_CONFIG, }; const mantle: TokenRouterConfig = { ...routerConfig.mantle, type: TokenType.collateral, token: tokens.mantle.WETH, - interchainSecurityModule: { - type: IsmType.FALLBACK_ROUTING, - owner: '0x3f13C1351AC66ca0f4827c607a94c93c82AD0913', - domains: {}, - }, + interchainSecurityModule: ISM_CONFIG, }; const mode: TokenRouterConfig = { ...routerConfig.mode, type: TokenType.native, - interchainSecurityModule: { - type: IsmType.FALLBACK_ROUTING, - owner: '0x3f13C1351AC66ca0f4827c607a94c93c82AD0913', - domains: {}, - }, + interchainSecurityModule: ISM_CONFIG, }; const optimism: TokenRouterConfig = { ...routerConfig.optimism, type: TokenType.native, - interchainSecurityModule: { - type: IsmType.FALLBACK_ROUTING, - owner: '0x3f13C1351AC66ca0f4827c607a94c93c82AD0913', - domains: {}, - }, + interchainSecurityModule: ISM_CONFIG, }; const polygon: TokenRouterConfig = { ...routerConfig.polygon, type: TokenType.collateral, token: tokens.polygon.WETH, - interchainSecurityModule: { - type: IsmType.FALLBACK_ROUTING, - owner: '0x3f13C1351AC66ca0f4827c607a94c93c82AD0913', - domains: {}, - }, + interchainSecurityModule: ISM_CONFIG, }; const scroll: TokenRouterConfig = { ...routerConfig.scroll, type: TokenType.native, - interchainSecurityModule: { - type: IsmType.FALLBACK_ROUTING, - owner: '0x3f13C1351AC66ca0f4827c607a94c93c82AD0913', - domains: {}, - }, + interchainSecurityModule: ISM_CONFIG, }; const zeronetwork: TokenRouterConfig = { ...routerConfig.zeronetwork, type: TokenType.native, - interchainSecurityModule: { - type: IsmType.FALLBACK_ROUTING, - owner: '0x3f13C1351AC66ca0f4827c607a94c93c82AD0913', - domains: {}, - }, + interchainSecurityModule: ISM_CONFIG, }; const zoramainnet: TokenRouterConfig = { ...routerConfig.zoramainnet, type: TokenType.native, - interchainSecurityModule: { - type: IsmType.FALLBACK_ROUTING, - owner: '0x3f13C1351AC66ca0f4827c607a94c93c82AD0913', - domains: {}, - }, + interchainSecurityModule: ISM_CONFIG, }; - const ethereum: TokenRouterConfig = { - ...routerConfig.ethereum, - type: TokenType.native, - interchainSecurityModule: { - type: IsmType.FALLBACK_ROUTING, - owner: '0x3f13C1351AC66ca0f4827c607a94c93c82AD0913', - domains: {}, - }, + const lisk: TokenRouterConfig = { + ...routerConfig.lisk, + type: TokenType.synthetic, + interchainSecurityModule: ISM_CONFIG, }; return { @@ -160,5 +121,6 @@ export const getArbitrumBaseBlastBscEthereumGnosisMantleModeOptimismPolygonScrol zeronetwork, zoramainnet, ethereum, + lisk, }; }; diff --git a/typescript/infra/config/environments/mainnet3/warp/configGetters/getArbitrumBaseEthereumOptimismPolygonZeroNetworkUSDCWarpConfig.ts b/typescript/infra/config/environments/mainnet3/warp/configGetters/getArbitrumBaseEthereumOptimismPolygonZeroNetworkUSDCWarpConfig.ts index 51663b1e7..5b3a32bc8 100644 --- a/typescript/infra/config/environments/mainnet3/warp/configGetters/getArbitrumBaseEthereumOptimismPolygonZeroNetworkUSDCWarpConfig.ts +++ b/typescript/infra/config/environments/mainnet3/warp/configGetters/getArbitrumBaseEthereumOptimismPolygonZeroNetworkUSDCWarpConfig.ts @@ -1,5 +1,6 @@ import { ChainMap, + IsmConfig, IsmType, RouterConfig, TokenRouterConfig, @@ -11,70 +12,58 @@ import { tokens } from '../../../../../src/config/warp.js'; export const getArbitrumBaseEthereumOptimismPolygonZeroNetworkUSDC = async ( routerConfig: ChainMap, ): Promise> => { + const ISM_CONFIG: IsmConfig = { + type: IsmType.FALLBACK_ROUTING, + owner: '0x3f13C1351AC66ca0f4827c607a94c93c82AD0913', + domains: {}, + }; + const arbitrum: TokenRouterConfig = { ...routerConfig.arbitrum, type: TokenType.collateral, token: tokens.arbitrum.USDC, - interchainSecurityModule: { - type: IsmType.FALLBACK_ROUTING, - owner: '0x3f13C1351AC66ca0f4827c607a94c93c82AD0913', - domains: {}, - }, + interchainSecurityModule: ISM_CONFIG, }; const base: TokenRouterConfig = { ...routerConfig.base, type: TokenType.collateral, token: tokens.base.USDC, - interchainSecurityModule: { - type: IsmType.FALLBACK_ROUTING, - owner: '0x3f13C1351AC66ca0f4827c607a94c93c82AD0913', - domains: {}, - }, + interchainSecurityModule: ISM_CONFIG, }; const optimism: TokenRouterConfig = { ...routerConfig.optimism, type: TokenType.collateral, token: tokens.optimism.USDC, - interchainSecurityModule: { - type: IsmType.FALLBACK_ROUTING, - owner: '0x3f13C1351AC66ca0f4827c607a94c93c82AD0913', - domains: {}, - }, + interchainSecurityModule: ISM_CONFIG, }; const polygon: TokenRouterConfig = { ...routerConfig.polygon, type: TokenType.collateral, token: tokens.polygon.USDC, - interchainSecurityModule: { - type: IsmType.FALLBACK_ROUTING, - owner: '0x3f13C1351AC66ca0f4827c607a94c93c82AD0913', - domains: {}, - }, + interchainSecurityModule: ISM_CONFIG, }; const zeronetwork: TokenRouterConfig = { ...routerConfig.zeronetwork, type: TokenType.collateral, token: '0x6a6394F47DD0BAF794808F2749C09bd4Ee874E70', - interchainSecurityModule: { - type: IsmType.FALLBACK_ROUTING, - owner: '0x3f13C1351AC66ca0f4827c607a94c93c82AD0913', - domains: {}, - }, + interchainSecurityModule: ISM_CONFIG, }; const ethereum: TokenRouterConfig = { ...routerConfig.ethereum, type: TokenType.collateral, token: tokens.ethereum.USDC, - interchainSecurityModule: { - type: IsmType.FALLBACK_ROUTING, - owner: '0x3f13C1351AC66ca0f4827c607a94c93c82AD0913', - domains: {}, - }, + interchainSecurityModule: ISM_CONFIG, + }; + + const lisk: TokenRouterConfig = { + ...routerConfig.lisk, + type: TokenType.synthetic, + interchainSecurityModule: ISM_CONFIG, }; return { @@ -84,5 +73,6 @@ export const getArbitrumBaseEthereumOptimismPolygonZeroNetworkUSDC = async ( optimism, polygon, zeronetwork, + lisk, }; }; diff --git a/typescript/infra/config/environments/mainnet3/warp/configGetters/getArbitrumBscEthereumMantleModePolygonScrollZeronetworkUSDT.ts b/typescript/infra/config/environments/mainnet3/warp/configGetters/getArbitrumBscEthereumMantleModePolygonScrollZeronetworkUSDTWarpConfig.ts similarity index 54% rename from typescript/infra/config/environments/mainnet3/warp/configGetters/getArbitrumBscEthereumMantleModePolygonScrollZeronetworkUSDT.ts rename to typescript/infra/config/environments/mainnet3/warp/configGetters/getArbitrumBscEthereumMantleModePolygonScrollZeronetworkUSDTWarpConfig.ts index b87fe9675..78c31da8e 100644 --- a/typescript/infra/config/environments/mainnet3/warp/configGetters/getArbitrumBscEthereumMantleModePolygonScrollZeronetworkUSDT.ts +++ b/typescript/infra/config/environments/mainnet3/warp/configGetters/getArbitrumBscEthereumMantleModePolygonScrollZeronetworkUSDTWarpConfig.ts @@ -1,5 +1,6 @@ import { ChainMap, + IsmConfig, IsmType, RouterConfig, TokenRouterConfig, @@ -8,95 +9,69 @@ import { import { tokens } from '../../../../../src/config/warp.js'; -export const getArbitrumBscEthereumMantleModePolygonScrollZeroNetworkUSDT = +export const getArbitrumBscEthereumMantleModePolygonScrollZeroNetworkUSDTWarpConfig = async ( routerConfig: ChainMap, ): Promise> => { + const ISM_CONFIG: IsmConfig = { + type: IsmType.FALLBACK_ROUTING, + owner: '0x3f13C1351AC66ca0f4827c607a94c93c82AD0913', + domains: {}, + }; + const arbitrum: TokenRouterConfig = { ...routerConfig.arbitrum, type: TokenType.collateral, token: tokens.arbitrum.USDT, - interchainSecurityModule: { - type: IsmType.FALLBACK_ROUTING, - owner: '0x3f13C1351AC66ca0f4827c607a94c93c82AD0913', - domains: {}, - }, + interchainSecurityModule: ISM_CONFIG, }; const bsc: TokenRouterConfig = { ...routerConfig.bsc, type: TokenType.collateral, token: tokens.bsc.USDT, - interchainSecurityModule: { - type: IsmType.FALLBACK_ROUTING, - owner: '0x3f13C1351AC66ca0f4827c607a94c93c82AD0913', - domains: {}, - }, + interchainSecurityModule: ISM_CONFIG, }; const ethereum: TokenRouterConfig = { ...routerConfig.ethereum, type: TokenType.collateral, token: tokens.ethereum.USDT, - interchainSecurityModule: { - type: IsmType.FALLBACK_ROUTING, - owner: '0x3f13C1351AC66ca0f4827c607a94c93c82AD0913', - domains: {}, - }, + interchainSecurityModule: ISM_CONFIG, }; const mantle: TokenRouterConfig = { ...routerConfig.mantle, type: TokenType.collateral, token: tokens.mantle.USDT, - interchainSecurityModule: { - type: IsmType.FALLBACK_ROUTING, - owner: '0x3f13C1351AC66ca0f4827c607a94c93c82AD0913', - domains: {}, - }, + interchainSecurityModule: ISM_CONFIG, }; const mode: TokenRouterConfig = { ...routerConfig.mode, type: TokenType.collateral, token: tokens.mode.USDT, - interchainSecurityModule: { - type: IsmType.FALLBACK_ROUTING, - owner: '0x3f13C1351AC66ca0f4827c607a94c93c82AD0913', - domains: {}, - }, + interchainSecurityModule: ISM_CONFIG, }; const polygon: TokenRouterConfig = { ...routerConfig.polygon, type: TokenType.collateral, token: tokens.polygon.USDT, - interchainSecurityModule: { - type: IsmType.FALLBACK_ROUTING, - owner: '0x3f13C1351AC66ca0f4827c607a94c93c82AD0913', - domains: {}, - }, + interchainSecurityModule: ISM_CONFIG, }; const scroll: TokenRouterConfig = { ...routerConfig.scroll, type: TokenType.collateral, token: tokens.scroll.USDT, - interchainSecurityModule: { - type: IsmType.FALLBACK_ROUTING, - owner: '0x3f13C1351AC66ca0f4827c607a94c93c82AD0913', - domains: {}, - }, + interchainSecurityModule: ISM_CONFIG, }; const zeronetwork: TokenRouterConfig = { ...routerConfig.zeronetwork, type: TokenType.synthetic, - interchainSecurityModule: { - type: IsmType.FALLBACK_ROUTING, - owner: '0x3f13C1351AC66ca0f4827c607a94c93c82AD0913', - domains: {}, - }, + interchainSecurityModule: ISM_CONFIG, }; return { diff --git a/typescript/infra/config/environments/mainnet3/warp/configGetters/getBaseZeroCBBTCWarpConfig.ts b/typescript/infra/config/environments/mainnet3/warp/configGetters/getBaseZeroNetworkCBBTCWarpConfig.ts similarity index 66% rename from typescript/infra/config/environments/mainnet3/warp/configGetters/getBaseZeroCBBTCWarpConfig.ts rename to typescript/infra/config/environments/mainnet3/warp/configGetters/getBaseZeroNetworkCBBTCWarpConfig.ts index 28766ea8b..2797b4d96 100644 --- a/typescript/infra/config/environments/mainnet3/warp/configGetters/getBaseZeroCBBTCWarpConfig.ts +++ b/typescript/infra/config/environments/mainnet3/warp/configGetters/getBaseZeroNetworkCBBTCWarpConfig.ts @@ -1,5 +1,6 @@ import { ChainMap, + IsmConfig, IsmType, RouterConfig, TokenRouterConfig, @@ -11,25 +12,23 @@ import { tokens } from '../../../../../src/config/warp.js'; export const getBaseZeroNetworkCBBTCWarpConfig = async ( routerConfig: ChainMap, ): Promise> => { + const ISM_CONFIG: IsmConfig = { + type: IsmType.FALLBACK_ROUTING, + owner: '0x3f13C1351AC66ca0f4827c607a94c93c82AD0913', + domains: {}, + }; + const base: TokenRouterConfig = { ...routerConfig.base, type: TokenType.collateral, token: tokens.base.cbBTC, - interchainSecurityModule: { - type: IsmType.FALLBACK_ROUTING, - owner: '0x3f13C1351AC66ca0f4827c607a94c93c82AD0913', - domains: {}, - }, + interchainSecurityModule: ISM_CONFIG, }; const zeronetwork: TokenRouterConfig = { ...routerConfig.zeronetwork, type: TokenType.synthetic, - interchainSecurityModule: { - type: IsmType.FALLBACK_ROUTING, - owner: '0x3f13C1351AC66ca0f4827c607a94c93c82AD0913', - domains: {}, - }, + interchainSecurityModule: ISM_CONFIG, }; return { diff --git a/typescript/infra/config/environments/mainnet3/warp/warpIds.ts b/typescript/infra/config/environments/mainnet3/warp/warpIds.ts index 68630ad12..21fb92e50 100644 --- a/typescript/infra/config/environments/mainnet3/warp/warpIds.ts +++ b/typescript/infra/config/environments/mainnet3/warp/warpIds.ts @@ -26,6 +26,6 @@ export enum WarpRouteIds { MantapacificNeutronTIA = 'TIA/mantapacific-neutron', BaseZeroNetworkCBBTC = 'CBBTC/base-zeronetwork', ArbitrumBscEthereumMantleModePolygonScrollZeroNetworkUSDT = 'USDT/arbitrum-bsc-ethereum-mantle-mode-polygon-scroll-zeronetwork', - ArbitrumBaseEthereumOptimismPolygonZeroNetworkUSDC = 'USDC/arbitrum-base-ethereum-optimism-polygon-zeronetwork', - ArbitrumBaseBlastBscEthereumGnosisMantleModeOptimismPolygonScrollZeroNetworkZoraMainnet = 'ETH/arbitrum-base-blast-bsc-ethereum-gnosis-mantle-mode-optimism-polygon-scroll-zeronetwork-zoramainnet', + ArbitrumBaseEthereumLiskOptimismPolygonZeroNetworkUSDC = 'USDC/arbitrum-base-ethereum-lisk-optimism-polygon-zeronetwork', + ArbitrumBaseBlastBscEthereumGnosisLiskMantleModeOptimismPolygonScrollZeroNetworkZoraMainnet = 'ETH/arbitrum-base-blast-bsc-ethereum-gnosis-lisk-mantle-mode-optimism-polygon-scroll-zeronetwork-zoramainnet', } diff --git a/typescript/infra/config/warp.ts b/typescript/infra/config/warp.ts index 6b0928f14..9e7852931 100644 --- a/typescript/infra/config/warp.ts +++ b/typescript/infra/config/warp.ts @@ -13,11 +13,11 @@ import { import { getAncient8EthereumUSDCWarpConfig } from './environments/mainnet3/warp/configGetters/getAncient8EthereumUSDCWarpConfig.js'; import { getArbitrumBaseBlastBscEthereumGnosisMantleModeOptimismPolygonScrollZeroNetworkZoraMainnetETHWarpConfig } from './environments/mainnet3/warp/configGetters/getArbitrumBaseBlastBscEthereumGnosisMantleModeOptimismPolygonScrollZeroNetworkZoraMainnetETHWarpConfig.js'; import { getArbitrumBaseEthereumOptimismPolygonZeroNetworkUSDC } from './environments/mainnet3/warp/configGetters/getArbitrumBaseEthereumOptimismPolygonZeroNetworkUSDCWarpConfig.js'; -import { getArbitrumBscEthereumMantleModePolygonScrollZeroNetworkUSDT } from './environments/mainnet3/warp/configGetters/getArbitrumBscEthereumMantleModePolygonScrollZeronetworkUSDT.js'; +import { getArbitrumBscEthereumMantleModePolygonScrollZeroNetworkUSDTWarpConfig } from './environments/mainnet3/warp/configGetters/getArbitrumBscEthereumMantleModePolygonScrollZeronetworkUSDTWarpConfig.js'; import { getArbitrumEthereumZircuitAmphrETHWarpConfig } from './environments/mainnet3/warp/configGetters/getArbitrumEthereumZircuitAmphrETHWarpConfig.js'; import { getArbitrumNeutronEclipWarpConfig } from './environments/mainnet3/warp/configGetters/getArbitrumNeutronEclipWarpConfig.js'; import { getArbitrumNeutronTiaWarpConfig } from './environments/mainnet3/warp/configGetters/getArbitrumNeutronTiaWarpConfig.js'; -import { getBaseZeroNetworkCBBTCWarpConfig } from './environments/mainnet3/warp/configGetters/getBaseZeroCBBTCWarpConfig.js'; +import { getBaseZeroNetworkCBBTCWarpConfig } from './environments/mainnet3/warp/configGetters/getBaseZeroNetworkCBBTCWarpConfig.js'; import { getEclipseEthereumSolanaUSDTWarpConfig } from './environments/mainnet3/warp/configGetters/getEclipseEthereumSolanaUSDTWarpConfig.js'; import { getEclipseEthereumWBTCWarpConfig } from './environments/mainnet3/warp/configGetters/getEclipseEthereumWBTCWarpConfig.js'; import { getEclipseEthereumWeEthsWarpConfig } from './environments/mainnet3/warp/configGetters/getEclipseEthereumWeETHsWarpConfig.js'; @@ -71,10 +71,10 @@ export const warpConfigGetterMap: Record< [WarpRouteIds.EclipseEthereumWeETHs]: getEclipseEthereumWeEthsWarpConfig, [WarpRouteIds.BaseZeroNetworkCBBTC]: getBaseZeroNetworkCBBTCWarpConfig, [WarpRouteIds.ArbitrumBscEthereumMantleModePolygonScrollZeroNetworkUSDT]: - getArbitrumBscEthereumMantleModePolygonScrollZeroNetworkUSDT, - [WarpRouteIds.ArbitrumBaseEthereumOptimismPolygonZeroNetworkUSDC]: + getArbitrumBscEthereumMantleModePolygonScrollZeroNetworkUSDTWarpConfig, + [WarpRouteIds.ArbitrumBaseEthereumLiskOptimismPolygonZeroNetworkUSDC]: getArbitrumBaseEthereumOptimismPolygonZeroNetworkUSDC, - [WarpRouteIds.ArbitrumBaseBlastBscEthereumGnosisMantleModeOptimismPolygonScrollZeroNetworkZoraMainnet]: + [WarpRouteIds.ArbitrumBaseBlastBscEthereumGnosisLiskMantleModeOptimismPolygonScrollZeroNetworkZoraMainnet]: getArbitrumBaseBlastBscEthereumGnosisMantleModeOptimismPolygonScrollZeroNetworkZoraMainnetETHWarpConfig, };