Commit 53fac1df authored by Murphy Law's avatar Murphy Law Committed by GitHub

integration-tests: Facilitate actor tests on nightly (#2518)

The nightly testnet environment must override the Optimism contracts addresses on L1.
Otherwise, it defaults to the prod contracts deployed on goerli which
isn't compatible with the nightly setup.
parent 102bee78
---
'@eth-optimism/integration-tests': patch
---
Facilitate actor testing on nightly
...@@ -3,6 +3,11 @@ PRIVATE_KEY= ...@@ -3,6 +3,11 @@ PRIVATE_KEY=
L1_URL= L1_URL=
L2_URL= L2_URL=
ADDRESS_MANAGER= ADDRESS_MANAGER=
L1_CROSS_DOMAIN_MESSENGER=
L1_STANDARD_BRIDGE=
STATE_COMMITMENT_CHAIN=
CANONICAL_TRANSACTION_CHAIN=
BOND_MANAGER=
L2_CHAINID= L2_CHAINID=
DTL_ENQUEUE_CONFIRMATIONS= DTL_ENQUEUE_CONFIRMATIONS=
OVMCONTEXT_SPEC_NUM_TXS=1 OVMCONTEXT_SPEC_NUM_TXS=1
......
...@@ -60,6 +60,16 @@ export class OptimismEnv { ...@@ -60,6 +60,16 @@ export class OptimismEnv {
l1SignerOrProvider: l1Wallet, l1SignerOrProvider: l1Wallet,
l2SignerOrProvider: l2Wallet, l2SignerOrProvider: l2Wallet,
l1ChainId: network.chainId, l1ChainId: network.chainId,
contracts: {
l1: {
AddressManager: envConfig.ADDRESS_MANAGER,
L1CrossDomainMessenger: envConfig.L1_CROSS_DOMAIN_MESSENGER,
L1StandardBridge: envConfig.L1_STANDARD_BRIDGE,
StateCommitmentChain: envConfig.STATE_COMMITMENT_CHAIN,
CanonicalTransactionChain: envConfig.CANONICAL_TRANSACTION_CHAIN,
BondManager: envConfig.BOND_MANAGER,
}
}
}) })
// fund the user if needed // fund the user if needed
......
...@@ -31,6 +31,12 @@ const gasPriceValidator = makeValidator((gasPrice) => { ...@@ -31,6 +31,12 @@ const gasPriceValidator = makeValidator((gasPrice) => {
return num()._parse(gasPrice).toString() return num()._parse(gasPrice).toString()
}) })
const addressValidator = makeValidator((addr) => {
if (!addr) { return '' }
else if (utils.isAddress(addr)) { return addr }
else { throw new Error('Expected an address') }
})
const procEnv = cleanEnv(process.env, { const procEnv = cleanEnv(process.env, {
L1_GAS_PRICE: gasPriceValidator({ L1_GAS_PRICE: gasPriceValidator({
default: '0', default: '0',
...@@ -105,6 +111,25 @@ const procEnv = cleanEnv(process.env, { ...@@ -105,6 +111,25 @@ const procEnv = cleanEnv(process.env, {
BATCH_SUBMITTER_SEQUENCER_BATCH_TYPE: str({ BATCH_SUBMITTER_SEQUENCER_BATCH_TYPE: str({
default: 'zlib', default: 'zlib',
}), }),
ADDRESS_MANAGER: addressValidator({
default: '',
}),
L1_CROSS_DOMAIN_MESSENGER: addressValidator({
default: '',
}),
L1_STANDARD_BRIDGE: addressValidator({
default: '',
}),
STATE_COMMITMENT_CHAIN: addressValidator({
default: '',
}),
CANONICAL_TRANSACTION_CHAIN: addressValidator({
default: '',
}),
BOND_MANAGER: addressValidator({
default: '',
}),
}) })
export const envConfig = procEnv export const envConfig = procEnv
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment