tmp

OffchainLabs · Jan 13, 2025 · fe22afa · fe22afa
1 parent a383cf1
commit fe22afa
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 6 deletions.
diff --git a/packages/arb-token-bridge-ui/src/types/ChainId.ts b/packages/arb-token-bridge-ui/src/types/ChainId.ts
@@ -0,0 +1,18 @@
+export enum ChainId {
+  // L1
+  Ethereum = 1,
+  // L1 Testnets
+  Local = 1337,
+  Sepolia = 11155111,
+  Holesky = 17000,
+  // L2
+  ArbitrumOne = 42161,
+  ArbitrumNova = 42170,
+  Base = 8453,
+  // L2 Testnets
+  ArbitrumSepolia = 421614,
+  ArbitrumLocal = 412346,
+  BaseSepolia = 84532,
+  // L3 Testnets
+  L3Local = 333333
+}
diff --git a/packages/arb-token-bridge-ui/src/util/rpc/alchemy.ts b/packages/arb-token-bridge-ui/src/util/rpc/alchemy.ts
@@ -1,5 +1,5 @@
 import { loadEnvironmentVariableWithFallback } from '..'
-import { ChainId } from '../networks'
+import { ChainId } from '../../types/ChainId'
 import { ProductionChainId } from './getRpcUrl'
 
 export function getAlchemyRpcUrl(

diff --git a/packages/arb-token-bridge-ui/src/util/rpc/getRpcUrl.test.ts b/packages/arb-token-bridge-ui/src/util/rpc/getRpcUrl.test.ts
@@ -0,0 +1,21 @@
+import { ChainId } from '../../types/ChainId'
+import { getRpcUrl } from './getRpcUrl'
+import { getInfuraRpcUrl, InfuraSupportedChainId } from './infura'
+
+it('(infura) returns rpc for ethereum mainnet', () => {
+  expect(getRpcUrl(1, 'infura', '123456')).toEqual(
+    'https://mainnet.infura.io/v3/123456'
+  )
+})
+
+it('(infura) returns public rpc for arbitrum nova', () => {
+  expect(getRpcUrl(ChainId.ArbitrumNova, 'infura', '654321')).toEqual(
+    'https://nova.arbitrum.io/rpc'
+  )
+})
+
+it('(alchemy) returns rpc for ethereum mainnet', () => {
+  expect(getRpcUrl(1, 'alchemy', '123456')).toEqual(
+    'https://eth-mainnet.g.alchemy.com/v2/123456'
+  )
+})
diff --git a/packages/arb-token-bridge-ui/src/util/rpc/getRpcUrl.ts b/packages/arb-token-bridge-ui/src/util/rpc/getRpcUrl.ts
@@ -1,4 +1,4 @@
-import { ChainId } from '../networks'
+import { ChainId } from '../../types/ChainId'
 
 import { getInfuraRpcUrl } from './infura'
 import { getAlchemyRpcUrl } from './alchemy'
@@ -17,7 +17,7 @@ function getRpcProvider(): RpcProvider {
 
 export function getRpcUrl(
   chainId: ProductionChainId,
-  rpcProvider: string = getRpcProvider(),
+  rpcProvider: RpcProvider = getRpcProvider(),
   rpcProviderKey?: string
 ): string | undefined {
   switch (rpcProvider) {

diff --git a/packages/arb-token-bridge-ui/src/util/rpc/infura.ts b/packages/arb-token-bridge-ui/src/util/rpc/infura.ts
@@ -1,5 +1,5 @@
 import { loadEnvironmentVariableWithFallback } from '..'
-import { ChainId } from '../networks'
+import { ChainId } from '../../types/ChainId'
 import { ProductionChainId } from './getRpcUrl'
 
 export type InfuraSupportedChainId = Exclude<
@@ -8,7 +8,7 @@ export type InfuraSupportedChainId = Exclude<
   ChainId.ArbitrumNova
 >
 
-export function getInfuraKey(chainId: InfuraSupportedChainId): string {
+export function getInfuraKeyFromEnv(chainId: InfuraSupportedChainId): string {
   const defaultInfuraKey = process.env.NEXT_PUBLIC_INFURA_KEY
 
   switch (chainId) {
@@ -59,7 +59,7 @@ export function getInfuraKey(chainId: InfuraSupportedChainId): string {
 
 export function getInfuraRpcUrl(
   chainId: InfuraSupportedChainId,
-  infuraKey: string = getInfuraKey(chainId)
+  infuraKey: string = getInfuraKeyFromEnv(chainId)
 ): string {
   switch (chainId) {
     // L1 Mainnet