diff --git a/.changeset/giant-eels-fold.md b/.changeset/giant-eels-fold.md new file mode 100644 index 0000000000000..1e9b0f76f568e --- /dev/null +++ b/.changeset/giant-eels-fold.md @@ -0,0 +1,5 @@ +--- +'@eth-optimism/integration-tests': patch +--- + +integration-tests: Override default bridge adapters diff --git a/integration-tests/actor-tests/deposits.test.ts b/integration-tests/actor-tests/deposits.test.ts index 310cc65ec981c..60a8b1f7753b5 100644 --- a/integration-tests/actor-tests/deposits.test.ts +++ b/integration-tests/actor-tests/deposits.test.ts @@ -37,18 +37,18 @@ actor('Funds depositor', () => { const balBefore = await l2Wallet.getBalance() await b.bench('deposit', async () => { await env.waitForXDomainTransaction( - env.messenger.contracts.l1.L1StandardBridge - .connect(l1Wallet) - .depositETH(DEFAULT_TEST_GAS_L2, '0xFFFF', { - value: 0x42, - gasLimit: DEFAULT_TEST_GAS_L1, - }) + env.messenger.contracts.l1.L1StandardBridge.connect( + l1Wallet + ).depositETH(DEFAULT_TEST_GAS_L2, '0xFFFF', { + value: 0x42, + gasLimit: DEFAULT_TEST_GAS_L1, + }) ) }) // Converting BigNumber to hex string prevents chai from incorrectly considering inherited properties // for strict equality - https://github.com/chaijs/chai/issues/948 - expect((await l2Wallet.getBalance()).sub(balBefore).toString()).to.deep.equal( - BigNumber.from(0x42).toString() - ) + expect( + (await l2Wallet.getBalance()).sub(balBefore).toString() + ).to.deep.equal(BigNumber.from(0x42).toString()) }) }) diff --git a/integration-tests/test/shared/env.ts b/integration-tests/test/shared/env.ts index ad3d06f3a9484..7acb54b27d8e7 100644 --- a/integration-tests/test/shared/env.ts +++ b/integration-tests/test/shared/env.ts @@ -9,7 +9,11 @@ import { CrossChainMessenger, MessageStatus, MessageDirection, + StandardBridgeAdapter, + ETHBridgeAdapter, + BridgeAdapterData, } from '@eth-optimism/sdk' +import { predeploys } from '@eth-optimism/contracts' /* Imports: Internal */ import { @@ -56,6 +60,22 @@ export class OptimismEnv { static async new(): Promise { const network = await l1Provider.getNetwork() + let bridgeOverrides: BridgeAdapterData + if (envConfig.L1_STANDARD_BRIDGE) { + bridgeOverrides = { + Standard: { + Adapter: StandardBridgeAdapter, + l1Bridge: envConfig.L1_STANDARD_BRIDGE, + l2Bridge: predeploys.L2StandardBridge, + }, + ETH: { + Adapter: ETHBridgeAdapter, + l1Bridge: envConfig.L1_STANDARD_BRIDGE, + l2Bridge: predeploys.L2StandardBridge, + }, + } + } + const messenger = new CrossChainMessenger({ l1SignerOrProvider: l1Wallet, l2SignerOrProvider: l2Wallet, @@ -68,8 +88,9 @@ export class OptimismEnv { StateCommitmentChain: envConfig.STATE_COMMITMENT_CHAIN, CanonicalTransactionChain: envConfig.CANONICAL_TRANSACTION_CHAIN, BondManager: envConfig.BOND_MANAGER, - } - } + }, + }, + bridges: bridgeOverrides, }) // fund the user if needed diff --git a/integration-tests/test/shared/utils.ts b/integration-tests/test/shared/utils.ts index 33b4df38ca0dd..dd69bce375b18 100644 --- a/integration-tests/test/shared/utils.ts +++ b/integration-tests/test/shared/utils.ts @@ -32,9 +32,13 @@ const gasPriceValidator = makeValidator((gasPrice) => { }) const addressValidator = makeValidator((addr) => { - if (!addr) { return '' } - else if (utils.isAddress(addr)) { return addr } - else { throw new Error('Expected an address') } + if (!addr) { + return '' + } else if (utils.isAddress(addr)) { + return addr + } else { + throw new Error('Expected an address') + } }) const procEnv = cleanEnv(process.env, {