From 10fefa30c110309813d19d61211546eba3c1ac1e Mon Sep 17 00:00:00 2001 From: doug <4741454+douglance@users.noreply.github.com> Date: Wed, 23 Oct 2024 07:50:01 -0400 Subject: [PATCH] chore: remove `retryableLifetimeSeconds` (#2011) --- .../src/components/common/AddCustomChain.tsx | 1 - .../src/hooks/__tests__/helpers.ts | 3 +-- .../src/util/__tests__/networks.test.ts | 1 - .../arb-token-bridge-ui/src/util/networks.ts | 2 -- .../src/util/orbitChainsData.json | 17 ----------------- packages/scripts/src/addOrbitChain/schemas.ts | 1 - .../tests/__mocks__/chainDataMocks.ts | 1 - .../tests/__snapshots__/transforms.test.ts.snap | 4 ---- .../scripts/src/addOrbitChain/transforms.ts | 1 - 9 files changed, 1 insertion(+), 30 deletions(-) diff --git a/packages/arb-token-bridge-ui/src/components/common/AddCustomChain.tsx b/packages/arb-token-bridge-ui/src/components/common/AddCustomChain.tsx index 3da98d1aac..e7a675e6ce 100644 --- a/packages/arb-token-bridge-ui/src/components/common/AddCustomChain.tsx +++ b/packages/arb-token-bridge-ui/src/components/common/AddCustomChain.tsx @@ -196,7 +196,6 @@ async function mapOrbitConfigToOrbitChain( isTestnet, name: data.chainInfo.chainName, parentChainId: data.chainInfo.parentChainId, - retryableLifetimeSeconds: 604800, nativeToken: data.chainInfo.nativeToken, tokenBridge: { parentCustomGateway: data.tokenBridgeContracts.l2Contracts.customGateway, diff --git a/packages/arb-token-bridge-ui/src/hooks/__tests__/helpers.ts b/packages/arb-token-bridge-ui/src/hooks/__tests__/helpers.ts index 3a5fcc65d7..56540ab95a 100644 --- a/packages/arb-token-bridge-ui/src/hooks/__tests__/helpers.ts +++ b/packages/arb-token-bridge-ui/src/hooks/__tests__/helpers.ts @@ -28,7 +28,6 @@ export function createMockOrbitChain({ isTestnet, name: `Mocked Orbit Chain ${chainId}`, slug: `mocked-orbit-chain-${chainId}`, - parentChainId, - retryableLifetimeSeconds: 604800 + parentChainId } } diff --git a/packages/arb-token-bridge-ui/src/util/__tests__/networks.test.ts b/packages/arb-token-bridge-ui/src/util/__tests__/networks.test.ts index 2dbeb6f3cb..02e3d92a03 100644 --- a/packages/arb-token-bridge-ui/src/util/__tests__/networks.test.ts +++ b/packages/arb-token-bridge-ui/src/util/__tests__/networks.test.ts @@ -32,7 +32,6 @@ beforeAll(() => { isTestnet: true, name: 'Arbitrum Local', parentChainId: 1337, - retryableLifetimeSeconds: 604800, tokenBridge: { parentCustomGateway: '0x75E0E92A79880Bd81A69F72983D03c75e2B33dC8', parentErc20Gateway: '0x4Af567288e68caD4aA93A272fe6139Ca53859C70', diff --git a/packages/arb-token-bridge-ui/src/util/networks.ts b/packages/arb-token-bridge-ui/src/util/networks.ts index 02d26cdeb3..c1003b61e8 100644 --- a/packages/arb-token-bridge-ui/src/util/networks.ts +++ b/packages/arb-token-bridge-ui/src/util/networks.ts @@ -333,7 +333,6 @@ export const defaultL2Network: ArbitrumNetwork = { isCustom: true, isTestnet: true, name: 'Arbitrum Local', - retryableLifetimeSeconds: 604800, tokenBridge: { parentCustomGateway: '0x8407E6180dC009D20D26D4BABB4790C1d4E6D2aA', parentErc20Gateway: '0x00D9fE1a2B67B8151aEdE8855c95E58D73FB4245', @@ -368,7 +367,6 @@ export const defaultL3Network: ArbitrumNetwork = { isCustom: true, isTestnet: true, name: 'L3 Local', - retryableLifetimeSeconds: 604800, tokenBridge: { parentCustomGateway: '0xA191D519260A06b32f8D04c84b9F457B8Caa0514', parentErc20Gateway: '0x6B0805Fc6e275ef66a0901D0CE68805631E271e5', diff --git a/packages/arb-token-bridge-ui/src/util/orbitChainsData.json b/packages/arb-token-bridge-ui/src/util/orbitChainsData.json index 6e7879dd77..77883b58b1 100644 --- a/packages/arb-token-bridge-ui/src/util/orbitChainsData.json +++ b/packages/arb-token-bridge-ui/src/util/orbitChainsData.json @@ -18,7 +18,6 @@ "name": "Xai", "slug": "xai", "parentChainId": 42161, - "retryableLifetimeSeconds": 604800, "tokenBridge": { "parentCustomGateway": "0xb15A0826d65bE4c2fDd961b72636168ee70Af030", "parentErc20Gateway": "0xb591cE747CF19cF30e11d656EB94134F523A9e77", @@ -67,7 +66,6 @@ "name": "RARI Mainnet", "slug": "rari-mainnet", "parentChainId": 42161, - "retryableLifetimeSeconds": 604800, "tokenBridge": { "parentCustomGateway": "0x8bE956aB42274056ef4471BEb211b33e258b7324", "parentErc20Gateway": "0x46406c88285AD9BE2fB23D9aD96Cb578d824cAb6", @@ -108,7 +106,6 @@ "rpcUrl": "https://muster.alt.technology", "name": "Muster", "slug": "muster", - "retryableLifetimeSeconds": 604800, "isCustom": true, "isTestnet": false, "tokenBridge": { @@ -235,7 +232,6 @@ "name": "L3X Network", "slug": "l3x-network", "parentChainId": 42161, - "retryableLifetimeSeconds": 604800, "isCustom": true, "isTestnet": false, "tokenBridge": { @@ -280,7 +276,6 @@ "name": "XCHAIN", "slug": "xchain", "parentChainId": 1, - "retryableLifetimeSeconds": 604800, "tokenBridge": { "parentCustomGateway": "0xEFb1F8ae759c595907782e9bD45F119c9814b308", "parentErc20Gateway": "0xFFb821ca61e823a884D79226B0fcD7a99A4d48aa", @@ -324,7 +319,6 @@ "name": "Sanko", "slug": "sanko", "parentChainId": 42161, - "retryableLifetimeSeconds": 604800, "tokenBridge": { "parentCustomGateway": "0x5414Dc7c8DB4BeDbf3c772768aE1F5e984bdf47a", "parentErc20Gateway": "0xb4951c0C41CFceB0D195A95FE66280457A80a990", @@ -373,7 +367,6 @@ "name": "Superposition", "slug": "superposition", "parentChainId": 42161, - "retryableLifetimeSeconds": 604800, "tokenBridge": { "parentCustomGateway": "0xacb51eA5b465692c889C36615a398BA14D42b619", "parentErc20Gateway": "0x62bEd4b862254789825Cd6F2352aa2b76B16145e", @@ -416,7 +409,6 @@ "name": "Mind Network", "slug": "mind-network", "parentChainId": 42161, - "retryableLifetimeSeconds": 604800, "tokenBridge": { "parentCustomGateway": "0xA6a623F64931Bcf1368B120e9Dc29254676D0D8E", "parentErc20Gateway": "0x281587c05DeA1a1ceCE83F6FFea23c5aFd287fb3", @@ -460,7 +452,6 @@ "name": "SX", "slug": "sx", "parentChainId": 1, - "retryableLifetimeSeconds": 604800, "tokenBridge": { "parentCustomGateway": "0x54F4853fDfC80F6bA4e66a7946c2B9086B1dE45F", "parentErc20Gateway": "0xB4968C66BECc8fb4f73b50354301c1aDb2Abaa91", @@ -510,7 +501,6 @@ "name": "ApeChain", "slug": "apechain", "parentChainId": 42161, - "retryableLifetimeSeconds": 604800, "tokenBridge": { "parentCustomGateway": "0xEd543dA6fE33cceE50DC024b78C27959235D0ab0", "parentErc20Gateway": "0xB603a1C07A11945bFe4855347c88583e31b8ddB0", @@ -561,7 +551,6 @@ "name": "Gravity Alpha", "slug": "gravity-alpha", "parentChainId": 1, - "retryableLifetimeSeconds": 604800, "tokenBridge": { "parentCustomGateway": "0xa26Fd1c23634870303e42311E114D5cc8301Ed1E", "parentErc20Gateway": "0xb23988D9728EF147EAa02D602D7e067B6131A1bB", @@ -611,7 +600,6 @@ "name": "Xai Testnet", "slug": "xai-testnet", "parentChainId": 421614, - "retryableLifetimeSeconds": 604800, "isCustom": true, "isTestnet": true, "tokenBridge": { @@ -663,7 +651,6 @@ "name": "DODOchain Testnet", "slug": "dodochain-testnet", "parentChainId": 421614, - "retryableLifetimeSeconds": 604800, "tokenBridge": { "parentCustomGateway": "0xeCa856BE0041184eeda8F2c98896AC4693b168EA", "parentErc20Gateway": "0xf57F874845CD652e69f69f020A4d46F4e427bb43", @@ -712,7 +699,6 @@ "name": "L3X Network Testnet", "slug": "l3x-network-testnet", "parentChainId": 421614, - "retryableLifetimeSeconds": 604800, "tokenBridge": { "parentCustomGateway": "0x00eE97A18A85a58fbfddA2CCa2Bdb3B88d1068b3", "parentErc20Gateway": "0xD2e9EA14CE4C61630a87bC652f5cD51deA7C66bA", @@ -755,7 +741,6 @@ "name": "RARI Testnet", "slug": "rari-testnet", "parentChainId": 421614, - "retryableLifetimeSeconds": 604800, "tokenBridge": { "parentCustomGateway": "0x7EDA0d4c14Af6B0920F4e3C0F0cA18d18212fB0A", "parentErc20Gateway": "0x2c9Dd2b2cd55266e3b5c3C95840F3c037fbCb856", @@ -799,7 +784,6 @@ "name": "XR Sepolia", "slug": "xr-sepolia", "parentChainId": 421614, - "retryableLifetimeSeconds": 604800, "tokenBridge": { "parentCustomGateway": "0x5F1ac3cd4553bA45fccF135d057795717b37B9Ef", "parentErc20Gateway": "0xd0CD7B9F4cB10B21abBfFA874F0d0ad1a41bD51C", @@ -849,7 +833,6 @@ "name": "Polter Testnet", "slug": "polter-testnet", "parentChainId": 84532, - "retryableLifetimeSeconds": 604800, "tokenBridge": { "parentCustomGateway": "0x24e1e6375f0f0Eecd38266357cADE57cA3A348F3", "parentErc20Gateway": "0x9014E7244116b965F0D1059f80e2bD8169957117", diff --git a/packages/scripts/src/addOrbitChain/schemas.ts b/packages/scripts/src/addOrbitChain/schemas.ts index 34a3768518..310f6fa0f6 100644 --- a/packages/scripts/src/addOrbitChain/schemas.ts +++ b/packages/scripts/src/addOrbitChain/schemas.ts @@ -86,7 +86,6 @@ export const chainSchema = z name: z.string().min(1), slug: z.string().min(1), parentChainId: z.number().int().positive(), - retryableLifetimeSeconds: z.number().int().positive().default(604800), tokenBridge: tokenBridgeSchema, bridgeUiConfig: bridgeUiConfigSchema, }) diff --git a/packages/scripts/src/addOrbitChain/tests/__mocks__/chainDataMocks.ts b/packages/scripts/src/addOrbitChain/tests/__mocks__/chainDataMocks.ts index 6b47b03366..eee89d6be3 100644 --- a/packages/scripts/src/addOrbitChain/tests/__mocks__/chainDataMocks.ts +++ b/packages/scripts/src/addOrbitChain/tests/__mocks__/chainDataMocks.ts @@ -228,7 +228,6 @@ export const mockOrbitChain: OrbitChain = { name: "Xai", slug: "xai", parentChainId: 42161, - retryableLifetimeSeconds: 604800, tokenBridge: { parentGatewayRouter: "0x22CCA5Dc96a4Ac1EC32c9c7C5ad4D66254a24C35", childGatewayRouter: "0xd096e8dE90D34de758B0E0bA4a796eA2e1e272cF", diff --git a/packages/scripts/src/addOrbitChain/tests/__snapshots__/transforms.test.ts.snap b/packages/scripts/src/addOrbitChain/tests/__snapshots__/transforms.test.ts.snap index 84d87c2798..fc204e9ebb 100644 --- a/packages/scripts/src/addOrbitChain/tests/__snapshots__/transforms.test.ts.snap +++ b/packages/scripts/src/addOrbitChain/tests/__snapshots__/transforms.test.ts.snap @@ -69,7 +69,6 @@ exports[`Transforms > transformIncomingDataToOrbitChain > should transform incom "name": "Test Chain", "nativeToken": "0x0000000000000000000000000000000000000006", "parentChainId": 421614, - "retryableLifetimeSeconds": 604800, "rpcUrl": "https://sepolia-rollup.arbitrum.io/rpc", "slug": "test-chain", "tokenBridge": { @@ -131,7 +130,6 @@ exports[`Transforms > updateOrbitChainsFile > should add a new testnet chain whi \\"name\\": \\"Xai\\", \\"slug\\": \\"xai\\", \\"parentChainId\\": 42161, - \\"retryableLifetimeSeconds\\": 604800, \\"tokenBridge\\": { \\"parentGatewayRouter\\": \\"0x22CCA5Dc96a4Ac1EC32c9c7C5ad4D66254a24C35\\", \\"childGatewayRouter\\": \\"0xd096e8dE90D34de758B0E0bA4a796eA2e1e272cF\\", @@ -189,7 +187,6 @@ exports[`Transforms > updateOrbitChainsFile > should handle updating an existing \\"name\\": \\"Updated Chain\\", \\"slug\\": \\"xai\\", \\"parentChainId\\": 42161, - \\"retryableLifetimeSeconds\\": 604800, \\"tokenBridge\\": { \\"parentGatewayRouter\\": \\"0x22CCA5Dc96a4Ac1EC32c9c7C5ad4D66254a24C35\\", \\"childGatewayRouter\\": \\"0xd096e8dE90D34de758B0E0bA4a796eA2e1e272cF\\", @@ -273,7 +270,6 @@ exports[`Transforms > updateOrbitChainsFile > should update the orbit chains fil \\"name\\": \\"Xai\\", \\"slug\\": \\"xai\\", \\"parentChainId\\": 42161, - \\"retryableLifetimeSeconds\\": 604800, \\"tokenBridge\\": { \\"parentGatewayRouter\\": \\"0x22CCA5Dc96a4Ac1EC32c9c7C5ad4D66254a24C35\\", \\"childGatewayRouter\\": \\"0xd096e8dE90D34de758B0E0bA4a796eA2e1e272cF\\", diff --git a/packages/scripts/src/addOrbitChain/transforms.ts b/packages/scripts/src/addOrbitChain/transforms.ts index 4a8c499a97..9543fdb164 100644 --- a/packages/scripts/src/addOrbitChain/transforms.ts +++ b/packages/scripts/src/addOrbitChain/transforms.ts @@ -369,7 +369,6 @@ export const transformIncomingDataToOrbitChain = async ( name: chainData.name, slug: nameToSlug(chainData.name), parentChainId, - retryableLifetimeSeconds: 604800, tokenBridge: { parentCustomGateway: chainData.parentCustomGateway, parentErc20Gateway: chainData.parentErc20Gateway,