getChainByChainId

OffchainLabs · Dec 11, 2023 · 5ba97a4 · 5ba97a4
1 parent 15fd50c
commit 5ba97a4
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 80 deletions.
diff --git a/packages/arb-token-bridge-ui/src/components/TransferPanel/TransferPanelMain.tsx b/packages/arb-token-bridge-ui/src/components/TransferPanel/TransferPanelMain.tsx
@@ -15,7 +15,7 @@ import {
   getL2ChainIds,
   isNetwork
 } from '../../util/networks'
-import { getWagmiChain } from '../../util/wagmi/getWagmiChain'
+import { getChainByChainId } from '../../util/wagmi/getChainByChainId'
 import {
   AdvancedSettings,
   useDestinationAddressStore
@@ -110,7 +110,7 @@ export function SwitchNetworksButton(
 }
 
 function getListboxOptionsFromL1Network(network: Chain) {
-  return getL2ChainIds(network.id).map(chainId => getWagmiChain(chainId))
+  return getL2ChainIds(network.id).map(chainId => getChainByChainId(chainId))
 }
 
 function CustomAddressBanner({

diff --git a/packages/arb-token-bridge-ui/src/hooks/useNetworksAndSigners.tsx b/packages/arb-token-bridge-ui/src/hooks/useNetworksAndSigners.tsx
@@ -36,7 +36,7 @@ import {
   isNetwork,
   rpcURLs
 } from '../util/networks'
-import { getWagmiChain } from '../util/wagmi/getWagmiChain'
+import { getChainByChainId } from '../util/wagmi/getChainByChainId'
 import { useArbQueryParams } from './useArbQueryParams'
 import { trackEvent } from '../util/AnalyticsUtils'
 import { errorToast } from '../components/common/atoms/Toast'
@@ -335,11 +335,11 @@ export function NetworksAndSignersProvider(
         setResult({
           status: UseNetworksAndSignersStatus.CONNECTED,
           l1: {
-            network: getWagmiChain(parentChain.chainID),
+            network: getChainByChainId(parentChain.chainID),
             provider: parentProvider
           },
           l2: {
-            network: getWagmiChain(chain.chainID),
+            network: getChainByChainId(chain.chainID),
             provider: chainProvider
           }
         })
@@ -388,11 +388,11 @@ export function NetworksAndSignersProvider(
             setResult({
               status: UseNetworksAndSignersStatus.CONNECTED,
               l1: {
-                network: getWagmiChain(parentChain.chainID),
+                network: getChainByChainId(parentChain.chainID),
                 provider: parentProvider
               },
               l2: {
-                network: getWagmiChain(chain.chainID),
+                network: getChainByChainId(chain.chainID),
                 provider: chainProvider
               }
             })

diff --git a/packages/arb-token-bridge-ui/src/util/wagmi/getChainByChainId.ts b/packages/arb-token-bridge-ui/src/util/wagmi/getChainByChainId.ts
@@ -0,0 +1,12 @@
+import { Chain } from 'wagmi'
+import { chainList } from './setup'
+
+export function getChainByChainId(chainId: number): Chain {
+  const chain = chainList.find(chain => chain.id === chainId)
+
+  if (!chain) {
+    throw new Error(`[getWagmiChain] Unexpected chain id: ${chainId}`)
+  }
+
+  return chain
+}
diff --git a/packages/arb-token-bridge-ui/src/util/wagmi/getWagmiChain.ts b/packages/arb-token-bridge-ui/src/util/wagmi/getWagmiChain.ts
diff --git a/packages/arb-token-bridge-ui/src/util/wagmi/setup.ts b/packages/arb-token-bridge-ui/src/util/wagmi/setup.ts
@@ -27,7 +27,7 @@ const customChains = getCustomChainsFromLocalStorage().map(chain =>
   chainToWagmiChain(chain)
 )
 
-const chainList = isTestingEnvironment
+export const chainList = isTestingEnvironment
   ? [
       // mainnet, arb1, & arb nova are for network switch tests
       mainnet,
@@ -61,10 +61,6 @@ const chainList = isTestingEnvironment
       ...customChains
     ]
 
-export function getChainByChainId(chainId: ChainId) {
-  return chainList.find(chain => chain.id === chainId)
-}
-
 const projectId = process.env.NEXT_PUBLIC_WALLETCONNECT_PROJECT_ID!
 
 if (!projectId) {