feat(sdk): use L2 chain ID as source of truth (#2799)

Updates the SDK to use the L2 chain ID, instead of the L1 chain ID, as
the source of truth when loading chain-specific data. We're going to
need this now that we're planning to have multiple L2s attached to the
same L1 (goerli) during our Bedrock testing plan. Part of a series of
PRs meant to simplify the SDK and prepare it for Bedrock.
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Mark Tyneway <mark.tyneway@gmail.com>

.changeset/fresh-cycles-suffer.md

+---
+'@eth-optimism/sdk': minor
+---
+
+Have SDK use L2 chain ID as the source of truth.

.changeset/rare-wasps-play.md

+---
+'@eth-optimism/integration-tests': patch
+'@eth-optimism/contracts-governance': patch
+'@eth-optimism/fault-detector': patch
+'@eth-optimism/message-relayer': patch
+---
+
+Update SDK version and usage to account for new constructor

integration-tests/test/shared/env.ts

@@ -4,7 +4,7 @@ import {
   TransactionResponse,
   TransactionReceipt,
 } from '@ethersproject/providers'
-import { sleep } from '@eth-optimism/core-utils'
+import { getChainId, sleep } from '@eth-optimism/core-utils'
 import {
   CrossChainMessenger,
   MessageStatus,
@@ -58,8 +58,6 @@ export class OptimismEnv {
   }
 
   static async new(): Promise<OptimismEnv> {
-    const network = await l1Provider.getNetwork()
-
     let bridgeOverrides: BridgeAdapterData
     if (envConfig.L1_STANDARD_BRIDGE) {
       bridgeOverrides = {
@@ -79,7 +77,8 @@ export class OptimismEnv {
     const messenger = new CrossChainMessenger({
       l1SignerOrProvider: l1Wallet,
       l2SignerOrProvider: l2Wallet,
-      l1ChainId: network.chainId,
+      l1ChainId: await getChainId(l1Provider),
+      l2ChainId: await getChainId(l2Provider),
       contracts: {
         l1: {
           AddressManager: envConfig.ADDRESS_MANAGER,

packages/contracts-governance/hardhat.config.ts

@@ -7,6 +7,7 @@ import 'solidity-coverage'
 import { task, types } from 'hardhat/config'
 import { providers, utils, Wallet } from 'ethers'
 import { CrossChainMessenger } from '@eth-optimism/sdk'
+import { getChainId } from '@eth-optimism/core-utils'
 
 import './scripts/deploy-token'
 import './scripts/multi-send'
@@ -42,11 +43,13 @@ task('deposit', 'Deposits funds onto Optimism.')
     }
 
     const l1Provider = new providers.JsonRpcProvider(l1ProviderUrl)
+    const l2Provider = new providers.JsonRpcProvider(l2ProviderUrl)
     const l1Wallet = new Wallet(privateKey, l1Provider)
     const messenger = new CrossChainMessenger({
       l1SignerOrProvider: l1Wallet,
-      l2SignerOrProvider: l2ProviderUrl,
-      l1ChainId: (await l1Provider.getNetwork()).chainId,
+      l2SignerOrProvider: l2Provider,
+      l1ChainId: await getChainId(l1Provider),
+      l2ChainId: await getChainId(l2Provider),
     })
 
     const amountWei = utils.parseEther(amountEth)
@@ -57,8 +60,6 @@ task('deposit', 'Deposits funds onto Optimism.')
     console.log(`Got TX hash ${tx.hash}. Waiting...`)
     await tx.wait()
 
-    const l2Provider = new providers.JsonRpcProvider(l2ProviderUrl)
-
     const l1WalletOnL2 = new Wallet(privateKey, l2Provider)
     await l1WalletOnL2.sendTransaction({
       to,

packages/contracts-governance/package.json

@@ -28,6 +28,7 @@
     "deploy:mainnet": "hardhat deploy-token --network 'optimism-mainnet'"
   },
   "dependencies": {
+    "@eth-optimism/core-utils": "^0.8.7",
     "@eth-optimism/sdk": "^1.1.9",
     "@ethersproject/hardware-wallets": "^5.6.1",
     "@nomiclabs/hardhat-ethers": "^2.0.2",
@@ -37,8 +38,8 @@
     "@openzeppelin/contracts": "4.5.0",
     "commander": "^9.3.0",
     "csv-parse": "^5.0.4",
-    "ethereumjs-util": "^7.1.4",
     "eth-sig-util": "^3.0.1",
+    "ethereumjs-util": "^7.1.4",
     "ethers": "^5.6.8",
     "hardhat": "^2.9.6"
   },

packages/fault-detector/src/service.ts

@@ -81,6 +81,7 @@ export class FaultDetector extends BaseServiceV2<Options, Metrics, State> {
       l1SignerOrProvider: this.options.l1RpcProvider,
       l2SignerOrProvider: this.options.l2RpcProvider,
       l1ChainId: await getChainId(this.options.l1RpcProvider),
+      l2ChainId: await getChainId(this.options.l2RpcProvider),
     })
 
     // We use this a lot, a bit cleaner to pull out to the top level of the state object.

packages/message-relayer/src/service.ts

@@ -89,6 +89,7 @@ export class MessageRelayerService extends BaseServiceV2<
       l1SignerOrProvider: this.state.wallet,
       l2SignerOrProvider: this.options.l2RpcProvider,
       l1ChainId: await getChainId(this.state.wallet.provider),
+      l2ChainId: await getChainId(this.options.l2RpcProvider),
     })
 
     this.state.highestCheckedL2Tx = this.options.fromL2TransactionIndex || 1

packages/sdk/src/cross-chain-messenger.ts

@@ -54,6 +54,7 @@ export class CrossChainMessenger implements ICrossChainMessenger {
   public l1SignerOrProvider: Signer | Provider
   public l2SignerOrProvider: Signer | Provider
   public l1ChainId: number
+  public l2ChainId: number
   public contracts: OEContracts
   public bridges: BridgeAdapters
   public depositConfirmationBlocks: number
@@ -66,6 +67,7 @@ export class CrossChainMessenger implements ICrossChainMessenger {
    * @param opts.l1SignerOrProvider Signer or Provider for the L1 chain, or a JSON-RPC url.
    * @param opts.l2SignerOrProvider Signer or Provider for the L2 chain, or a JSON-RPC url.
    * @param opts.l1ChainId Chain ID for the L1 chain.
+   * @param opts.l2ChainId Chain ID for the L2 chain.
    * @param opts.depositConfirmationBlocks Optional number of blocks before a deposit is confirmed.
    * @param opts.l1BlockTimeSeconds Optional estimated block time in seconds for the L1 chain.
    * @param opts.contracts Optional contract address overrides.
@@ -75,6 +77,7 @@ export class CrossChainMessenger implements ICrossChainMessenger {
     l1SignerOrProvider: SignerOrProviderLike
     l2SignerOrProvider: SignerOrProviderLike
     l1ChainId: NumberLike
+    l2ChainId: NumberLike
     depositConfirmationBlocks?: NumberLike
     l1BlockTimeSeconds?: NumberLike
     contracts?: DeepPartial<OEContractsLike>
@@ -83,24 +86,25 @@ export class CrossChainMessenger implements ICrossChainMessenger {
     this.l1SignerOrProvider = toSignerOrProvider(opts.l1SignerOrProvider)
     this.l2SignerOrProvider = toSignerOrProvider(opts.l2SignerOrProvider)
     this.l1ChainId = toNumber(opts.l1ChainId)
+    this.l2ChainId = toNumber(opts.l2ChainId)
 
     this.depositConfirmationBlocks =
       opts?.depositConfirmationBlocks !== undefined
         ? toNumber(opts.depositConfirmationBlocks)
-        : DEPOSIT_CONFIRMATION_BLOCKS[this.l1ChainId] || 0
+        : DEPOSIT_CONFIRMATION_BLOCKS[this.l2ChainId] || 0
 
     this.l1BlockTimeSeconds =
       opts?.l1BlockTimeSeconds !== undefined
         ? toNumber(opts.l1BlockTimeSeconds)
         : CHAIN_BLOCK_TIMES[this.l1ChainId] || 1
 
-    this.contracts = getAllOEContracts(this.l1ChainId, {
+    this.contracts = getAllOEContracts(this.l2ChainId, {
       l1SignerOrProvider: this.l1SignerOrProvider,
       l2SignerOrProvider: this.l2SignerOrProvider,
       overrides: opts.contracts,
     })
 
-    this.bridges = getBridgeAdapters(this.l1ChainId, this, {
+    this.bridges = getBridgeAdapters(this.l2ChainId, this, {
       overrides: opts.bridges,
     })
   }

packages/sdk/src/interfaces/cross-chain-messenger.ts

@@ -46,6 +46,11 @@ export interface ICrossChainMessenger {
    */
   l1ChainId: number
 
+  /**
+   * Chain ID for the L2 network.
+   */
+  l2ChainId: number
+
   /**
    * Contract objects attached to their respective providers and addresses.
    */

packages/sdk/src/interfaces/types.ts

@@ -10,15 +10,26 @@ import { ICrossChainMessenger } from './cross-chain-messenger'
 import { IBridgeAdapter } from './bridge-adapter'
 
 /**
- * Commonly used Chain IDs
+ * L1 network chain IDs
  */
-export enum Chain {
+export enum L1ChainID {
   MAINNET = 1,
   GOERLI = 5,
   KOVAN = 42,
   HARDHAT_LOCAL = 31337,
 }
 
+/**
+ * L2 network chain IDs
+ */
+export enum L2ChainID {
+  OPTIMISM = 10,
+  OPTIMISM_GOERLI = 420,
+  OPTIMISM_KOVAN = 69,
+  OPTIMISM_HARDHAT_LOCAL = 31337,
+  OPTIMISM_HARDHAT_DEVNET = 17,
+}
+
 /**
  * L1 contract references.
  */

packages/sdk/src/utils/chain-constants.ts

-import { Chain } from '../interfaces'
+import { L1ChainID, L2ChainID } from '../interfaces'
 
-export const DEPOSIT_CONFIRMATION_BLOCKS = {
-  [Chain.MAINNET]: 50 as const,
-  [Chain.GOERLI]: 12 as const,
-  [Chain.KOVAN]: 12 as const,
-  // 2 just for testing purposes
-  [Chain.HARDHAT_LOCAL]: 2 as const,
+export const DEPOSIT_CONFIRMATION_BLOCKS: {
+  [ChainID in L2ChainID]: number
+} = {
+  [L2ChainID.OPTIMISM]: 50 as const,
+  [L2ChainID.OPTIMISM_GOERLI]: 12 as const,
+  [L2ChainID.OPTIMISM_KOVAN]: 12 as const,
+  [L2ChainID.OPTIMISM_HARDHAT_LOCAL]: 2 as const,
+  [L2ChainID.OPTIMISM_HARDHAT_DEVNET]: 2 as const,
 }
 
-export const CHAIN_BLOCK_TIMES = {
-  [Chain.MAINNET]: 13 as const,
-  [Chain.GOERLI]: 15 as const,
-  [Chain.KOVAN]: 4 as const,
-  [Chain.HARDHAT_LOCAL]: 1 as const,
+export const CHAIN_BLOCK_TIMES: {
+  [ChainID in L1ChainID]: number
+} = {
+  [L1ChainID.MAINNET]: 13 as const,
+  [L1ChainID.GOERLI]: 15 as const,
+  [L1ChainID.KOVAN]: 4 as const,
+  [L1ChainID.HARDHAT_LOCAL]: 1 as const,
 }

packages/sdk/test/cross-chain-messenger.spec.ts

@@ -15,6 +15,8 @@ import {
   CrossChainMessenger,
   StandardBridgeAdapter,
   ETHBridgeAdapter,
+  L1ChainID,
+  L2ChainID,
 } from '../src'
 import { DUMMY_MESSAGE } from './helpers'
 
@@ -31,7 +33,8 @@ describe('CrossChainMessenger', () => {
         const messenger = new CrossChainMessenger({
           l1SignerOrProvider: ethers.provider,
           l2SignerOrProvider: ethers.provider,
-          l1ChainId: 1,
+          l1ChainId: L1ChainID.MAINNET,
+          l2ChainId: L2ChainID.OPTIMISM,
         })
 
         expect(messenger.l1Provider).to.equal(ethers.provider)
@@ -43,7 +46,8 @@ describe('CrossChainMessenger', () => {
         const messenger = new CrossChainMessenger({
           l1SignerOrProvider: ethers.provider,
           l2SignerOrProvider: ethers.provider,
-          l1ChainId: 1,
+          l1ChainId: L1ChainID.MAINNET,
+          l2ChainId: L2ChainID.OPTIMISM,
         })
 
         expect(messenger.l2Provider).to.equal(ethers.provider)
@@ -55,7 +59,8 @@ describe('CrossChainMessenger', () => {
         const messenger = new CrossChainMessenger({
           l1SignerOrProvider: 'https://localhost:8545',
           l2SignerOrProvider: ethers.provider,
-          l1ChainId: 1,
+          l1ChainId: L1ChainID.MAINNET,
+          l2ChainId: L2ChainID.OPTIMISM,
         })
 
         expect(Provider.isProvider(messenger.l1Provider)).to.be.true
@@ -67,7 +72,8 @@ describe('CrossChainMessenger', () => {
         const messenger = new CrossChainMessenger({
           l1SignerOrProvider: ethers.provider,
           l2SignerOrProvider: 'https://localhost:8545',
-          l1ChainId: 1,
+          l1ChainId: L1ChainID.MAINNET,
+          l2ChainId: L2ChainID.OPTIMISM,
         })
 
         expect(Provider.isProvider(messenger.l2Provider)).to.be.true
@@ -80,10 +86,11 @@ describe('CrossChainMessenger', () => {
           const messenger = new CrossChainMessenger({
             l1SignerOrProvider: ethers.provider,
             l2SignerOrProvider: 'https://localhost:8545',
-            l1ChainId: 1,
+            l1ChainId: L1ChainID.MAINNET,
+            l2ChainId: L2ChainID.OPTIMISM,
           })
 
-          const addresses = CONTRACT_ADDRESSES[1]
+          const addresses = CONTRACT_ADDRESSES[messenger.l2ChainId]
           for (const [contractName, contractAddress] of Object.entries(
             addresses.l1
           )) {
@@ -99,13 +106,14 @@ describe('CrossChainMessenger', () => {
         })
       })
 
-      describe('when given an unknown chain ID', () => {
+      describe('when given an unknown L2 chain ID', () => {
         it('should throw an error', () => {
           expect(() => {
             new CrossChainMessenger({
               l1SignerOrProvider: ethers.provider,
               l2SignerOrProvider: 'https://localhost:8545',
-              l1ChainId: 1234,
+              l1ChainId: L1ChainID.MAINNET,
+              l2ChainId: 1234,
             })
           }).to.throw()
         })
@@ -126,11 +134,12 @@ describe('CrossChainMessenger', () => {
           const messenger = new CrossChainMessenger({
             l1SignerOrProvider: ethers.provider,
             l2SignerOrProvider: 'https://localhost:8545',
-            l1ChainId: 1,
+            l1ChainId: L1ChainID.MAINNET,
+            l2ChainId: L2ChainID.OPTIMISM,
             contracts: overrides,
           })
 
-          const addresses = CONTRACT_ADDRESSES[1]
+          const addresses = CONTRACT_ADDRESSES[messenger.l2ChainId]
           for (const [contractName, contractAddress] of Object.entries(
             addresses.l1
           )) {
@@ -156,7 +165,7 @@ describe('CrossChainMessenger', () => {
         })
       })
 
-      describe('when given an unknown chain ID', () => {
+      describe('when given an unknown L2 chain ID', () => {
         describe('when all L1 addresses are provided', () => {
           it('should use custom addresses where provided', () => {
             const overrides = {
@@ -172,14 +181,16 @@ describe('CrossChainMessenger', () => {
                 L2CrossDomainMessenger: '0x' + '22'.repeat(20),
               },
             }
+
             const messenger = new CrossChainMessenger({
               l1SignerOrProvider: ethers.provider,
               l2SignerOrProvider: 'https://localhost:8545',
-              l1ChainId: 1234,
+              l1ChainId: L1ChainID.MAINNET,
+              l2ChainId: 1234,
               contracts: overrides,
             })
 
-            const addresses = CONTRACT_ADDRESSES[1]
+            const addresses = CONTRACT_ADDRESSES[L2ChainID.OPTIMISM]
             for (const [contractName, contractAddress] of Object.entries(
               addresses.l1
             )) {
@@ -211,7 +222,8 @@ describe('CrossChainMessenger', () => {
               new CrossChainMessenger({
                 l1SignerOrProvider: ethers.provider,
                 l2SignerOrProvider: 'https://localhost:8545',
-                l1ChainId: 1234,
+                l1ChainId: L1ChainID.MAINNET,
+                l2ChainId: 1234,
                 contracts: {
                   l1: {
                     // Missing some required L1 addresses
@@ -246,7 +258,8 @@ describe('CrossChainMessenger', () => {
       messenger = new CrossChainMessenger({
         l1SignerOrProvider: ethers.provider,
         l2SignerOrProvider: ethers.provider,
-        l1ChainId: 31337,
+        l1ChainId: L1ChainID.HARDHAT_LOCAL,
+        l2ChainId: L2ChainID.OPTIMISM_HARDHAT_LOCAL,
         contracts: {
           l1: {
             L1CrossDomainMessenger: l1Messenger.address,
@@ -433,7 +446,8 @@ describe('CrossChainMessenger', () => {
       messenger = new CrossChainMessenger({
         l1SignerOrProvider: ethers.provider,
         l2SignerOrProvider: ethers.provider,
-        l1ChainId: 31337,
+        l1ChainId: L1ChainID.HARDHAT_LOCAL,
+        l2ChainId: L2ChainID.OPTIMISM_HARDHAT_LOCAL,
         contracts: {
           l1: {
             L1CrossDomainMessenger: l1Messenger.address,
@@ -557,7 +571,8 @@ describe('CrossChainMessenger', () => {
       messenger = new CrossChainMessenger({
         l1SignerOrProvider: ethers.provider,
         l2SignerOrProvider: ethers.provider,
-        l1ChainId: 31337,
+        l1ChainId: L1ChainID.HARDHAT_LOCAL,
+        l2ChainId: L2ChainID.OPTIMISM_HARDHAT_LOCAL,
         contracts: {
           l1: {
             L1CrossDomainMessenger: l1Messenger.address,
@@ -761,7 +776,8 @@ describe('CrossChainMessenger', () => {
       messenger = new CrossChainMessenger({
         l1SignerOrProvider: ethers.provider,
         l2SignerOrProvider: ethers.provider,
-        l1ChainId: 31337,
+        l1ChainId: L1ChainID.HARDHAT_LOCAL,
+        l2ChainId: L2ChainID.OPTIMISM_HARDHAT_LOCAL,
         contracts: {
           l1: {
             L1CrossDomainMessenger: l1Messenger.address,
@@ -910,7 +926,8 @@ describe('CrossChainMessenger', () => {
       messenger = new CrossChainMessenger({
         l1SignerOrProvider: ethers.provider,
         l2SignerOrProvider: ethers.provider,
-        l1ChainId: 31337,
+        l1ChainId: L1ChainID.HARDHAT_LOCAL,
+        l2ChainId: L2ChainID.OPTIMISM_HARDHAT_LOCAL,
         contracts: {
           l2: {
             L2CrossDomainMessenger: l2Messenger.address,
@@ -1014,7 +1031,8 @@ describe('CrossChainMessenger', () => {
       messenger = new CrossChainMessenger({
         l1SignerOrProvider: ethers.provider,
         l2SignerOrProvider: ethers.provider,
-        l1ChainId: 31337,
+        l1ChainId: L1ChainID.HARDHAT_LOCAL,
+        l2ChainId: L2ChainID.OPTIMISM_HARDHAT_LOCAL,
       })
     })
 
@@ -1117,7 +1135,8 @@ describe('CrossChainMessenger', () => {
       messenger = new CrossChainMessenger({
         l1SignerOrProvider: ethers.provider,
         l2SignerOrProvider: ethers.provider,
-        l1ChainId: 31337,
+        l1ChainId: L1ChainID.HARDHAT_LOCAL,
+        l2ChainId: L2ChainID.OPTIMISM_HARDHAT_LOCAL,
         contracts: {
           l1: {
             L1CrossDomainMessenger: l1Messenger.address,
@@ -1275,7 +1294,8 @@ describe('CrossChainMessenger', () => {
       messenger = new CrossChainMessenger({
         l1SignerOrProvider: l1Signer,
         l2SignerOrProvider: l2Signer,
-        l1ChainId: 31337,
+        l1ChainId: L1ChainID.HARDHAT_LOCAL,
+        l2ChainId: L2ChainID.OPTIMISM_HARDHAT_LOCAL,
         contracts: {
           l1: {
             L1CrossDomainMessenger: l1Messenger.address,
@@ -1370,7 +1390,8 @@ describe('CrossChainMessenger', () => {
       messenger = new CrossChainMessenger({
         l1SignerOrProvider: l1Signer,
         l2SignerOrProvider: l2Signer,
-        l1ChainId: 31337,
+        l1ChainId: L1ChainID.HARDHAT_LOCAL,
+        l2ChainId: L2ChainID.OPTIMISM_HARDHAT_LOCAL,
         contracts: {
           l1: {
             L1CrossDomainMessenger: l1Messenger.address,
@@ -1466,7 +1487,8 @@ describe('CrossChainMessenger', () => {
       messenger = new CrossChainMessenger({
         l1SignerOrProvider: l1Signer,
         l2SignerOrProvider: l2Signer,
-        l1ChainId: 31337,
+        l1ChainId: L1ChainID.HARDHAT_LOCAL,
+        l2ChainId: L2ChainID.OPTIMISM_HARDHAT_LOCAL,
         contracts: {
           l1: {
             L1CrossDomainMessenger: l1Messenger.address,
@@ -1522,7 +1544,8 @@ describe('CrossChainMessenger', () => {
       messenger = new CrossChainMessenger({
         l1SignerOrProvider: l1Signer,
         l2SignerOrProvider: l2Signer,
-        l1ChainId: 31337,
+        l1ChainId: L1ChainID.HARDHAT_LOCAL,
+        l2ChainId: L2ChainID.OPTIMISM_HARDHAT_LOCAL,
         contracts: {
           l1: {
             L1CrossDomainMessenger: l1Messenger.address,

packages/sdk/test/utils/contracts.spec.ts

@@ -8,6 +8,7 @@ import {
   getAllOEContracts,
   CONTRACT_ADDRESSES,
   DEFAULT_L2_CONTRACT_ADDRESSES,
+  L2ChainID,
 } from '../../src'
 
 describe('contract connection utils', () => {
@@ -20,12 +21,15 @@ describe('contract connection utils', () => {
     describe('when given a known chain ID', () => {
       describe('when not given an address override', () => {
         it('should use the address for the given contract name and chain ID', () => {
-          const addresses = CONTRACT_ADDRESSES[1]
+          const addresses = CONTRACT_ADDRESSES[L2ChainID.OPTIMISM]
           for (const [contractName, contractAddress] of [
             ...Object.entries(addresses.l1),
             ...Object.entries(addresses.l2),
           ]) {
-            const contract = getOEContract(contractName as any, 1)
+            const contract = getOEContract(
+              contractName as any,
+              L2ChainID.OPTIMISM
+            )
             expect(contract.address).to.equal(contractAddress)
           }
         })
@@ -33,7 +37,7 @@ describe('contract connection utils', () => {
 
       describe('when given an address override', () => {
         it('should use the custom address', () => {
-          const addresses = CONTRACT_ADDRESSES[1]
+          const addresses = CONTRACT_ADDRESSES[L2ChainID.OPTIMISM]
           for (const contractName of [
             ...Object.keys(addresses.l1),
             ...Object.keys(addresses.l2),
@@ -68,13 +72,19 @@ describe('contract connection utils', () => {
 
     describe('when connected to a valid address', () => {
       it('should have the correct interface for the contract name', () => {
-        const contract = getOEContract('L1CrossDomainMessenger', 1)
+        const contract = getOEContract(
+          'L1CrossDomainMessenger',
+          L2ChainID.OPTIMISM
+        )
         expect(contract.sendMessage).to.not.be.undefined
       })
 
       describe('when not given a signer or provider', () => {
         it('should not have a signer or provider', () => {
-          const contract = getOEContract('L1CrossDomainMessenger', 1)
+          const contract = getOEContract(
+            'L1CrossDomainMessenger',
+            L2ChainID.OPTIMISM
+          )
           expect(contract.signer).to.be.null
           expect(contract.provider).to.be.null
         })
@@ -82,18 +92,26 @@ describe('contract connection utils', () => {
 
       describe('when given a signer', () => {
         it('should attach the given signer', () => {
-          const contract = getOEContract('L1CrossDomainMessenger', 1, {
-            signerOrProvider: signers[0],
-          })
+          const contract = getOEContract(
+            'L1CrossDomainMessenger',
+            L2ChainID.OPTIMISM,
+            {
+              signerOrProvider: signers[0],
+            }
+          )
           expect(contract.signer).to.deep.equal(signers[0])
         })
       })
 
       describe('when given a provider', () => {
         it('should attach the given provider', () => {
-          const contract = getOEContract('L1CrossDomainMessenger', 1, {
-            signerOrProvider: ethers.provider as any,
-          })
+          const contract = getOEContract(
+            'L1CrossDomainMessenger',
+            L2ChainID.OPTIMISM,
+            {
+              signerOrProvider: ethers.provider as any,
+            }
+          )
           expect(contract.signer).to.be.null
           expect(contract.provider).to.deep.equal(ethers.provider)
         })
@@ -105,8 +123,8 @@ describe('contract connection utils', () => {
     describe('when given a known chain ID', () => {
       describe('when not given any address overrides', () => {
         it('should return all contracts connected to the default addresses', () => {
-          const contracts = getAllOEContracts(1)
-          const addresses = CONTRACT_ADDRESSES[1]
+          const contracts = getAllOEContracts(L2ChainID.OPTIMISM)
+          const addresses = CONTRACT_ADDRESSES[L2ChainID.OPTIMISM]
           for (const [contractName, contractAddress] of Object.entries(
             addresses.l1
           )) {
@@ -132,8 +150,8 @@ describe('contract connection utils', () => {
               L2CrossDomainMessenger: '0x' + '22'.repeat(20),
             },
           }
-          const contracts = getAllOEContracts(1, { overrides })
-          const addresses = CONTRACT_ADDRESSES[1]
+          const contracts = getAllOEContracts(L2ChainID.OPTIMISM, { overrides })
+          const addresses = CONTRACT_ADDRESSES[L2ChainID.OPTIMISM]
           for (const [contractName, contractAddress] of Object.entries(
             addresses.l1
           )) {
@@ -163,7 +181,9 @@ describe('contract connection utils', () => {
         describe('when given address overrides for L2 contracts', () => {
           it('should return contracts connected to the overridden addresses where given', () => {
             const l1Overrides = {}
-            for (const contractName of Object.keys(CONTRACT_ADDRESSES[1].l1)) {
+            for (const contractName of Object.keys(
+              CONTRACT_ADDRESSES[L2ChainID.OPTIMISM].l1
+            )) {
               l1Overrides[contractName] = '0x' + '11'.repeat(20)
             }
 
@@ -191,7 +211,9 @@ describe('contract connection utils', () => {
         describe('when not given address overrides for L2 contracts', () => {
           it('should return contracts connected to the default L2 addresses and custom L1 addresses', () => {
             const l1Overrides = {}
-            for (const contractName of Object.keys(CONTRACT_ADDRESSES[1].l1)) {
+            for (const contractName of Object.keys(
+              CONTRACT_ADDRESSES[L2ChainID.OPTIMISM].l1
+            )) {
               l1Overrides[contractName] = '0x' + '11'.repeat(20)
             }
 
@@ -241,7 +263,7 @@ describe('contract connection utils', () => {
 
     describe('when not given a signer or provider', () => {
       it('should not attach a signer or provider to any contracts', () => {
-        const contracts = getAllOEContracts(1)
+        const contracts = getAllOEContracts(L2ChainID.OPTIMISM)
         for (const contract of Object.values(contracts.l1)) {
           expect(contract.signer).to.be.null
           expect(contract.provider).to.be.null
@@ -255,7 +277,7 @@ describe('contract connection utils', () => {
 
     describe('when given an L1 signer', () => {
       it('should attach the signer to the L1 contracts only', () => {
-        const contracts = getAllOEContracts(1, {
+        const contracts = getAllOEContracts(L2ChainID.OPTIMISM, {
           l1SignerOrProvider: signers[0],
         })
         for (const contract of Object.values(contracts.l1)) {
@@ -270,7 +292,7 @@ describe('contract connection utils', () => {
 
     describe('when given an L2 signer', () => {
       it('should attach the signer to the L2 contracts only', () => {
-        const contracts = getAllOEContracts(1, {
+        const contracts = getAllOEContracts(L2ChainID.OPTIMISM, {
           l2SignerOrProvider: signers[0],
         })
         for (const contract of Object.values(contracts.l1)) {
@@ -285,7 +307,7 @@ describe('contract connection utils', () => {
 
     describe('when given an L1 signer and an L2 signer', () => {
       it('should attach the signer to both sets of contracts', () => {
-        const contracts = getAllOEContracts(1, {
+        const contracts = getAllOEContracts(L2ChainID.OPTIMISM, {
           l1SignerOrProvider: signers[0],
           l2SignerOrProvider: signers[1],
         })
@@ -300,7 +322,7 @@ describe('contract connection utils', () => {
 
     describe('when given an L1 provider', () => {
       it('should attach the provider to the L1 contracts only', () => {
-        const contracts = getAllOEContracts(1, {
+        const contracts = getAllOEContracts(L2ChainID.OPTIMISM, {
           l1SignerOrProvider: ethers.provider as any,
         })
         for (const contract of Object.values(contracts.l1)) {
@@ -316,7 +338,7 @@ describe('contract connection utils', () => {
 
     describe('when given an L2 provider', () => {
       it('should attach the provider to the L2 contracts only', () => {
-        const contracts = getAllOEContracts(1, {
+        const contracts = getAllOEContracts(L2ChainID.OPTIMISM, {
           l2SignerOrProvider: ethers.provider as any,
         })
         for (const contract of Object.values(contracts.l1)) {
@@ -332,7 +354,7 @@ describe('contract connection utils', () => {
 
     describe('when given an L1 provider and an L2 provider', () => {
       it('should attach the provider to both sets of contracts', () => {
-        const contracts = getAllOEContracts(1, {
+        const contracts = getAllOEContracts(L2ChainID.OPTIMISM, {
           l1SignerOrProvider: ethers.provider as any,
           l2SignerOrProvider: ethers.provider as any,
         })