diff --git a/yarn-project/archiver/src/archiver/config.ts b/yarn-project/archiver/src/archiver/config.ts index 46652800e26..292475dcdfb 100644 --- a/yarn-project/archiver/src/archiver/config.ts +++ b/yarn-project/archiver/src/archiver/config.ts @@ -63,6 +63,7 @@ export function getConfigEnvVars(): ArchiverConfig { SEARCH_START_BLOCK, API_KEY, INBOX_CONTRACT_ADDRESS, + OUTBOX_CONTRACT_ADDRESS, REGISTRY_CONTRACT_ADDRESS, DATA_DIRECTORY, } = process.env; @@ -71,7 +72,7 @@ export function getConfigEnvVars(): ArchiverConfig { rollupAddress: ROLLUP_CONTRACT_ADDRESS ? EthAddress.fromString(ROLLUP_CONTRACT_ADDRESS) : EthAddress.ZERO, registryAddress: REGISTRY_CONTRACT_ADDRESS ? EthAddress.fromString(REGISTRY_CONTRACT_ADDRESS) : EthAddress.ZERO, inboxAddress: INBOX_CONTRACT_ADDRESS ? EthAddress.fromString(INBOX_CONTRACT_ADDRESS) : EthAddress.ZERO, - outboxAddress: EthAddress.ZERO, + outboxAddress: OUTBOX_CONTRACT_ADDRESS ? EthAddress.fromString(OUTBOX_CONTRACT_ADDRESS) : EthAddress.ZERO, contractDeploymentEmitterAddress: CONTRACT_DEPLOYMENT_EMITTER_ADDRESS ? EthAddress.fromString(CONTRACT_DEPLOYMENT_EMITTER_ADDRESS) : EthAddress.ZERO, diff --git a/yarn-project/end-to-end/src/fixtures/cross_chain_test_harness.ts b/yarn-project/end-to-end/src/fixtures/cross_chain_test_harness.ts index b546c42196d..281f48a3a0f 100644 --- a/yarn-project/end-to-end/src/fixtures/cross_chain_test_harness.ts +++ b/yarn-project/end-to-end/src/fixtures/cross_chain_test_harness.ts @@ -26,9 +26,9 @@ export class CrossChainTestHarness { const ethAccount = EthAddress.fromString((await walletClient.getAddresses())[0]); const owner = wallet.getCompleteAddress(); const l1ContractAddresses = (await pxeService.getNodeInfo()).l1ContractAddresses; - + const outbox = getContract({ - address: l1ContractAddresses.outboxAddress!.toString(), + address: l1ContractAddresses.outboxAddress.toString(), abi: OutboxAbi, publicClient, }); diff --git a/yarn-project/end-to-end/src/fixtures/utils.ts b/yarn-project/end-to-end/src/fixtures/utils.ts index ea37f3056c5..be53fabf8c2 100644 --- a/yarn-project/end-to-end/src/fixtures/utils.ts +++ b/yarn-project/end-to-end/src/fixtures/utils.ts @@ -289,6 +289,7 @@ export async function setup(numberOfAccounts = 1, opts: SetupOptions = {}): Prom config.l1Contracts.contractDeploymentEmitterAddress = deployL1ContractsValues.l1ContractAddresses.contractDeploymentEmitterAddress; config.l1Contracts.inboxAddress = deployL1ContractsValues.l1ContractAddresses.inboxAddress; + config.l1Contracts.outboxAddress = deployL1ContractsValues.l1ContractAddresses.outboxAddress; logger('Creating and synching an aztec node...'); const aztecNode = await AztecNodeService.createAndSync(config);