@aztec/archiver 0.26.6 → 0.27.0

package/src/archiver/archiver.ts

@@ -25,6 +25,7 @@ import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
 import { DebugLogger, createDebugLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
+import { RollupAbi } from '@aztec/l1-artifacts';
 import { ClassRegistererAddress } from '@aztec/protocol-contracts/class-registerer';
 import { InstanceDeployerAddress } from '@aztec/protocol-contracts/instance-deployer';
 import {
@@ -34,7 +35,7 @@ import {
   ContractInstanceWithAddress,
 } from '@aztec/types/contracts';
 
-import { Chain, HttpTransport, PublicClient, createPublicClient, http } from 'viem';
+import { Chain, HttpTransport, PublicClient, createPublicClient, getAddress, getContract, http } from 'viem';
 
 import { ArchiverDataStore } from './archiver_store.js';
 import { ArchiverConfig } from './config.js';
@@ -42,7 +43,7 @@ import {
   retrieveBlockBodiesFromAvailabilityOracle,
   retrieveBlockMetadataFromRollup,
   retrieveNewCancelledL1ToL2Messages,
-  retrieveNewContractData,
+  retrieveNewL1ToL2Messages,
   retrieveNewPendingL1ToL2Messages,
 } from './data_retrieval.js';
 
@@ -72,8 +73,8 @@ export class Archiver implements ArchiveSource {
    * @param publicClient - A client for interacting with the Ethereum node.
    * @param rollupAddress - Ethereum address of the rollup contract.
    * @param inboxAddress - Ethereum address of the inbox contract.
+   * @param newInboxAddress - Ethereum address of the new inbox contract.
    * @param registryAddress - Ethereum address of the registry contract.
-   * @param contractDeploymentEmitterAddress - Ethereum address of the contractDeploymentEmitter contract.
    * @param pollingIntervalMs - The interval for polling for L1 logs (in milliseconds).
    * @param store - An archiver data store for storage & retrieval of blocks, encrypted logs & contract data.
    * @param log - A logger.
@@ -83,8 +84,8 @@ export class Archiver implements ArchiveSource {
     private readonly rollupAddress: EthAddress,
     private readonly availabilityOracleAddress: EthAddress,
     private readonly inboxAddress: EthAddress,
+    private readonly newInboxAddress: EthAddress,
     private readonly registryAddress: EthAddress,
-    private readonly contractDeploymentEmitterAddress: EthAddress,
     private readonly store: ArchiverDataStore,
     private readonly pollingIntervalMs = 10_000,
     private readonly log: DebugLogger = createDebugLogger('aztec:archiver'),
@@ -109,13 +110,24 @@ export class Archiver implements ArchiveSource {
       pollingInterval: config.viemPollingIntervalMS,
     });
 
+    // TODO(#4492): Nuke this once the old inbox is purged
+    let newInboxAddress!: EthAddress;
+    {
+      const rollup = getContract({
+        address: getAddress(config.l1Contracts.rollupAddress.toString()),
+        abi: RollupAbi,
+        client: publicClient,
+      });
+      newInboxAddress = EthAddress.fromString(await rollup.read.NEW_INBOX());
+    }
+
     const archiver = new Archiver(
       publicClient,
       config.l1Contracts.rollupAddress,
       config.l1Contracts.availabilityOracleAddress,
       config.l1Contracts.inboxAddress,
+      newInboxAddress,
       config.l1Contracts.registryAddress,
-      config.l1Contracts.contractDeploymentEmitterAddress,
       archiverStore,
       config.archiverPollingIntervalMS,
     );
@@ -163,6 +175,7 @@ export class Archiver implements ArchiveSource {
 
     if (
       currentL1BlockNumber <= lastL1Blocks.addedBlock &&
+      currentL1BlockNumber <= lastL1Blocks.newMessages &&
       currentL1BlockNumber <= lastL1Blocks.addedMessages &&
       currentL1BlockNumber <= lastL1Blocks.cancelledMessages
     ) {
@@ -192,6 +205,7 @@ export class Archiver implements ArchiveSource {
 
     // ********** Events that are processed per L1 block **********
 
+    // TODO(#4492): Nuke the following when purging the old inbox
     // Process l1ToL2Messages, these are consumed as time passes, not each block
     const retrievedPendingL1ToL2Messages = await retrieveNewPendingL1ToL2Messages(
       this.publicClient,
@@ -235,6 +249,20 @@ export class Archiver implements ArchiveSource {
 
     // ********** Events that are processed per L2 block **********
 
+    const retrievedNewL1ToL2Messages = await retrieveNewL1ToL2Messages(
+      this.publicClient,
+      this.newInboxAddress,
+      blockUntilSynced,
+      lastL1Blocks.newMessages + 1n,
+      currentL1BlockNumber,
+    );
+    await this.store.addNewL1ToL2Messages(
+      retrievedNewL1ToL2Messages.retrievedData,
+      // -1n because the function expects the last block in which the message was emitted and not the one after next
+      // TODO(#4492): Check whether this could be cleaned up - `nextEthBlockNumber` value doesn't seem to be used much
+      retrievedNewL1ToL2Messages.nextEthBlockNumber - 1n,
+    );
+
     // Read all data from chain and then write to our stores at the end
     const nextExpectedL2BlockNum = BigInt((await this.store.getBlockNumber()) + 1);
 
@@ -291,14 +319,6 @@ export class Archiver implements ArchiveSource {
     retrievedBlocks.retrievedData.forEach((block: L2Block) => {
       blockNumberToBodyHash[block.number] = block.header.contentCommitment.txsEffectsHash;
     });
-    const retrievedContracts = await retrieveNewContractData(
-      this.publicClient,
-      this.contractDeploymentEmitterAddress,
-      blockUntilSynced,
-      lastL1Blocks.addedBlock + 1n,
-      currentL1BlockNumber,
-      blockNumberToBodyHash,
-    );
 
     this.log(`Retrieved ${retrievedBlocks.retrievedData.length} block(s) from chain`);
 
@@ -323,18 +343,6 @@ export class Archiver implements ArchiveSource {
       }),
     );
 
-    // store contracts for which we have retrieved L2 blocks
-    const lastKnownL2BlockNum = retrievedBlocks.retrievedData[retrievedBlocks.retrievedData.length - 1].number;
-    await Promise.all(
-      retrievedContracts.retrievedData.map(async ([contracts, l2BlockNum]) => {
-        this.log(`Retrieved extended contract data for l2 block number: ${l2BlockNum}`);
-        if (l2BlockNum <= lastKnownL2BlockNum) {
-          await this.store.addExtendedContractData(contracts, l2BlockNum);
-          await this.storeContractDataAsClassesAndInstances(contracts, l2BlockNum);
-        }
-      }),
-    );
-
     // from retrieved L2Blocks, confirm L1 to L2 messages that have been published
     // from each l2block fetch all entryKeys in a flattened array:
     this.log(`Confirming l1 to l2 messages in store`);
@@ -378,6 +386,7 @@ export class Archiver implements ArchiveSource {
    * Temporary solution until we source this data from the contract class registerer and instance deployer.
    * @param contracts - The extended contract data to be stored.
    * @param l2BlockNum - The L2 block number to which the contract data corresponds.
+   * TODO(palla/purge-old-contract-deploy): Delete this method
    */
   async storeContractDataAsClassesAndInstances(contracts: ExtendedContractData[], l2BlockNum: number) {
     const classesAndInstances = contracts.map(extendedContractDataToContractClassAndInstance);
@@ -457,6 +466,7 @@ export class Archiver implements ArchiveSource {
   /**
    * Temporary method for creating a fake extended contract data out of classes and instances registered in the node.
    * Used as a fallback if the extended contract data is not found.
+   * TODO(palla/purge-old-contract-deploy): Use proper classes
    */
   private async makeExtendedContractDataFor(address: AztecAddress): Promise<ExtendedContractData | undefined> {
     const instance = await this.store.getContractInstance(address);
@@ -473,23 +483,14 @@ export class Archiver implements ArchiveSource {
     return ExtendedContractData.fromClassAndInstance(contractClass, instance);
   }
 
-  /**
-   * Lookup all contract data in an L2 block.
-   * @param blockNum - The block number to get all contract data from.
-   * @returns All new contract data in the block (if found).
-   */
-  public getExtendedContractDataInBlock(blockNum: number): Promise<ExtendedContractData[]> {
-    return this.store.getExtendedContractDataInBlock(blockNum);
-  }
-
   /**
    * Lookup the contract data for this contract.
    * Contains contract address & the ethereum portal address.
    * @param contractAddress - The contract data address.
    * @returns ContractData with the portal address (if we didn't throw an error).
    */
-  public async getContractData(contractAddress: AztecAddress): Promise<ContractData | undefined> {
-    return (await this.store.getContractData(contractAddress)) ?? this.makeContractDataFor(contractAddress);
+  public getContractData(contractAddress: AztecAddress): Promise<ContractData | undefined> {
+    return this.makeContractDataFor(contractAddress);
   }
 
   /**
@@ -505,16 +506,6 @@ export class Archiver implements ArchiveSource {
     return new ContractData(address, instance.portalContractAddress);
   }
 
-  /**
-   * Lookup the L2 contract data inside a block.
-   * Contains contract address & the ethereum portal address.
-   * @param l2BlockNum - The L2 block number to get the contract data from.
-   * @returns ContractData with the portal address (if we didn't throw an error).
-   */
-  public getContractDataInBlock(l2BlockNum: number): Promise<ContractData[] | undefined> {
-    return this.store.getContractDataInBlock(l2BlockNum);
-  }
-
   /**
    * Gets the public function data for a contract.
    * @param contractAddress - The contract address containing the function to fetch.
@@ -583,6 +574,15 @@ export class Archiver implements ArchiveSource {
     return this.store.getConfirmedL1ToL2Message(entryKey);
   }
 
+  /**
+   * Gets new L1 to L2 message (to be) included in a given block.
+   * @param blockNumber - L2 block number to get messages for.
+   * @returns The L1 to L2 messages/leaves of the messages subtree (throws if not found).
+   */
+  getNewL1ToL2Messages(blockNumber: bigint): Promise<Buffer[]> {
+    return this.store.getNewL1ToL2Messages(blockNumber);
+  }
+
   getContractClassIds(): Promise<Fr[]> {
     return this.store.getContractClassIds();
   }

package/src/archiver/archiver_store.ts

@@ -1,6 +1,5 @@
 import {
   Body,
-  ContractData,
   ExtendedContractData,
   GetUnencryptedLogsResponse,
   L1ToL2Message,
@@ -8,6 +7,7 @@ import {
   L2BlockL2Logs,
   LogFilter,
   LogType,
+  NewInboxLeaf,
   TxEffect,
   TxHash,
   TxReceipt,
@@ -22,6 +22,9 @@ import { ContractClassPublic, ContractInstanceWithAddress } from '@aztec/types/c
 export type ArchiverL1SynchPoint = {
   /** The last L1 block that added a new L2 block.  */
   addedBlock: bigint;
+  /** The last L1 block that added messages from the new inbox. */
+  // TODO(#4492): Clean this up and fix the naming
+  newMessages: bigint;
   /** The last L1 block that added pending messages */
   addedMessages: bigint;
   /** The last L1 block that cancelled messages */
@@ -90,11 +93,20 @@ export interface ArchiverDataStore {
     blockNumber: number,
   ): Promise<boolean>;
 
+  /**
+   * Append new L1 to L2 messages to the store.
+   * @param messages - The L1 to L2 messages to be added to the store.
+   * @param lastMessageL1BlockNumber - The L1 block number in which the last message was emitted.
+   * @returns True if the operation is successful.
+   */
+  addNewL1ToL2Messages(messages: NewInboxLeaf[], lastMessageL1BlockNumber: bigint): Promise<boolean>;
+
   /**
    * Append new pending L1 to L2 messages to the store.
    * @param messages - The L1 to L2 messages to be added to the store.
    * @param l1BlockNumber - The block number of the L1 block that added the messages.
    * @returns True if the operation is successful.
+   * TODO(#4492): Nuke the following when purging the old inbox
    */
   addPendingL1ToL2Messages(messages: L1ToL2Message[], l1BlockNumber: bigint): Promise<boolean>;
 
@@ -103,6 +115,7 @@ export interface ArchiverDataStore {
    * @param entryKeys - The entry keys to be removed from the store.
    * @param l1BlockNumber - The block number of the L1 block that cancelled the messages.
    * @returns True if the operation is successful.
+   * TODO(#4492): Nuke the following when purging the old inbox
    */
   cancelPendingL1ToL2EntryKeys(entryKeys: Fr[], l1BlockNumber: bigint): Promise<boolean>;
 
@@ -128,6 +141,13 @@ export interface ArchiverDataStore {
    */
   getConfirmedL1ToL2Message(entryKey: Fr): Promise<L1ToL2Message>;
 
+  /**
+   * Gets new L1 to L2 message (to be) included in a given block.
+   * @param blockNumber - L2 block number to get messages for.
+   * @returns The L1 to L2 messages/leaves of the messages subtree (throws if not found).
+   */
+  getNewL1ToL2Messages(blockNumber: bigint): Promise<Buffer[]>;
+
   /**
    * Gets up to `limit` amount of logs starting from `from`.
    * @param from - Number of the L2 block to which corresponds the first logs to be returned.
@@ -159,29 +179,6 @@ export interface ArchiverDataStore {
    */
   getExtendedContractData(contractAddress: AztecAddress): Promise<ExtendedContractData | undefined>;
 
-  /**
-   * Lookup all extended contract data in an L2 block.
-   * @param blockNum - The block number to get all contract data from.
-   * @returns All extended contract data in the block (if found).
-   */
-  getExtendedContractDataInBlock(blockNum: number): Promise<ExtendedContractData[]>;
-
-  /**
-   * Get basic info for an L2 contract.
-   * Contains contract address & the ethereum portal address.
-   * @param contractAddress - The contract data address.
-   * @returns ContractData with the portal address (if we didn't throw an error).
-   */
-  getContractData(contractAddress: AztecAddress): Promise<ContractData | undefined>;
-
-  /**
-   * Get basic info for an all L2 contracts deployed in a block.
-   * Contains contract address & the ethereum portal address.
-   * @param l2BlockNum - Number of the L2 block where contracts were deployed.
-   * @returns ContractData with the portal address (if we didn't throw an error).
-   */
-  getContractDataInBlock(l2BlockNum: number): Promise<ContractData[] | undefined>;
-
   /**
    * Gets the number of the latest L2 block processed.
    * @returns The number of the latest L2 block processed.

package/src/archiver/archiver_store_test_suite.ts

@@ -1,15 +1,15 @@
 import {
-  ExtendedContractData,
   L1ToL2Message,
   L2Block,
   L2BlockContext,
   LogId,
   LogType,
+  NewInboxLeaf,
   TxHash,
   UnencryptedL2Log,
 } from '@aztec/circuit-types';
 import '@aztec/circuit-types/jest';
-import { AztecAddress, Fr, INITIAL_L2_BLOCK_NUM } from '@aztec/circuits.js';
+import { AztecAddress, Fr, INITIAL_L2_BLOCK_NUM, L1_TO_L2_MSG_SUBTREE_HEIGHT } from '@aztec/circuits.js';
 import { makeContractClassPublic } from '@aztec/circuits.js/testing';
 import { randomBytes } from '@aztec/foundation/crypto';
 import { ContractClassPublic, ContractInstanceWithAddress, SerializableContractInstance } from '@aztec/types/contracts';
@@ -96,6 +96,7 @@ export function describeArchiverDataStore(testName: string, getStore: () => Arch
           addedBlock: 0n,
           addedMessages: 0n,
           cancelledMessages: 0n,
+          newMessages: 0n,
         });
       });
 
@@ -105,6 +106,7 @@ export function describeArchiverDataStore(testName: string, getStore: () => Arch
           addedBlock: blocks.at(-1)!.getL1BlockNumber(),
           addedMessages: 0n,
           cancelledMessages: 0n,
+          newMessages: 0n,
         });
       });
 
@@ -114,6 +116,16 @@ export function describeArchiverDataStore(testName: string, getStore: () => Arch
           addedBlock: 0n,
           addedMessages: 1n,
           cancelledMessages: 0n,
+          newMessages: 0n,
+        });
+      });
+      it('returns the L1 block number that most recently added messages from new inbox', async () => {
+        await store.addNewL1ToL2Messages([new NewInboxLeaf(0n, 0n, Buffer.alloc(32))], 1n);
+        await expect(store.getL1BlockNumber()).resolves.toEqual({
+          addedBlock: 0n,
+          addedMessages: 0n,
+          cancelledMessages: 0n,
+          newMessages: 1n,
         });
       });
       it('returns the L1 block number that most recently cancelled pending messages', async () => {
@@ -124,6 +136,7 @@ export function describeArchiverDataStore(testName: string, getStore: () => Arch
           addedBlock: 0n,
           addedMessages: 1n,
           cancelledMessages: 2n,
+          newMessages: 0n,
         });
       });
     });
@@ -209,6 +222,45 @@ export function describeArchiverDataStore(testName: string, getStore: () => Arch
       });
     });
 
+    // TODO(#4492): Drop the "New" below once the old inbox is purged
+    describe('New L1 to L2 Messages', () => {
+      const l2BlockNumber = 13n;
+      const l1ToL2MessageSubtreeSize = 2 ** L1_TO_L2_MSG_SUBTREE_HEIGHT;
+
+      const generateBlockMessages = (blockNumber: bigint, numMessages: number) =>
+        Array.from({ length: numMessages }, (_, i) => new NewInboxLeaf(blockNumber, BigInt(i), randomBytes(32)));
+
+      it('returns messages in correct order', async () => {
+        const msgs = generateBlockMessages(l2BlockNumber, l1ToL2MessageSubtreeSize);
+        const shuffledMessages = msgs.slice().sort(() => Math.random() - 0.5);
+        await store.addNewL1ToL2Messages(shuffledMessages, 100n);
+        const retrievedMessages = await store.getNewL1ToL2Messages(l2BlockNumber);
+
+        const expectedLeavesOrder = msgs.map(msg => msg.leaf);
+        expect(expectedLeavesOrder).toEqual(retrievedMessages);
+      });
+
+      it('throws if it is impossible to sequence messages correctly', async () => {
+        const msgs = generateBlockMessages(l2BlockNumber, l1ToL2MessageSubtreeSize - 1);
+        // We replace a message with index 4 with a message with index at the end of the tree
+        // --> with that there will be a gap and it will be impossible to sequence the messages
+        msgs[4] = new NewInboxLeaf(l2BlockNumber, BigInt(l1ToL2MessageSubtreeSize - 1), randomBytes(32));
+
+        await store.addNewL1ToL2Messages(msgs, 100n);
+        await expect(async () => {
+          await store.getNewL1ToL2Messages(l2BlockNumber);
+        }).rejects.toThrow(`L1 to L2 message gap found in block ${l2BlockNumber}`);
+      });
+
+      it('throws if adding more messages than fits into a block', async () => {
+        const msgs = generateBlockMessages(l2BlockNumber, l1ToL2MessageSubtreeSize + 1);
+
+        await expect(async () => {
+          await store.addNewL1ToL2Messages(msgs, 100n);
+        }).rejects.toThrow(`Message index ${l1ToL2MessageSubtreeSize} out of subtree range`);
+      });
+    });
+
     describe('getPendingL1ToL2EntryKeys', () => {
       it('returns previously stored pending L1 to L2 messages', async () => {
         const message = L1ToL2Message.random(Fr.random());
@@ -364,119 +416,6 @@ export function describeArchiverDataStore(testName: string, getStore: () => Arch
       });
     });
 
-    describe('getContractData', () => {
-      let block: L2Block;
-      beforeEach(async () => {
-        block = L2Block.random(1);
-        await store.addBlocks([block]);
-        await store.addBlockBodies([block.body]);
-      });
-
-      it('returns previously stored contract data', async () => {
-        await expect(store.getContractData(block.body.txEffects[0].contractData[0].contractAddress)).resolves.toEqual(
-          block.body.txEffects[0].contractData[0],
-        );
-      });
-
-      it('returns undefined if contract data is not found', async () => {
-        await expect(store.getContractData(AztecAddress.random())).resolves.toBeUndefined();
-      });
-    });
-
-    describe('getContractDataInBlock', () => {
-      let block: L2Block;
-      beforeEach(async () => {
-        block = L2Block.random(1);
-        await store.addBlocks([block]);
-        await store.addBlockBodies([block.body]);
-      });
-
-      it('returns the contract data for a known block', async () => {
-        await expect(store.getContractDataInBlock(block.number)).resolves.toEqual(
-          block.body.txEffects.flatMap(txEffect => txEffect.contractData),
-        );
-      });
-
-      it('returns an empty array if contract data is not found', async () => {
-        await expect(store.getContractDataInBlock(block.number + 1)).resolves.toEqual([]);
-      });
-    });
-
-    describe('addExtendedContractData', () => {
-      it('stores extended contract data', async () => {
-        const block = L2Block.random(1);
-        await store.addBlocks([block]);
-        await store.addBlockBodies([block.body]);
-        await expect(store.addExtendedContractData([ExtendedContractData.random()], block.number)).resolves.toEqual(
-          true,
-        );
-      });
-
-      it('stores extended contract data for an unknown block', async () => {
-        await expect(store.addExtendedContractData([ExtendedContractData.random()], 1)).resolves.toEqual(true);
-      });
-
-      it('"pushes" extended contract data and does not overwrite', async () => {
-        const block = L2Block.random(1);
-        await store.addBlocks([block]);
-        await store.addBlockBodies([block.body]);
-
-        // Assuming one contract per tx, and the first two txs
-        const firstContract = ExtendedContractData.random(block.body.txEffects[0].contractData[0]);
-        await store.addExtendedContractData([firstContract], block.number);
-
-        const secondContract = ExtendedContractData.random(block.body.txEffects[1].contractData[0]);
-        await store.addExtendedContractData([secondContract], block.number);
-
-        await expect(store.getExtendedContractDataInBlock(block.number)).resolves.toEqual([
-          firstContract,
-          secondContract,
-        ]);
-      });
-    });
-
-    describe('getExtendedContractData', () => {
-      let block: L2Block;
-      let extendedContractData: ExtendedContractData;
-      beforeEach(async () => {
-        block = L2Block.random(1);
-        extendedContractData = ExtendedContractData.random(block.body.txEffects[0].contractData[0]);
-        await store.addBlocks([block]);
-        await store.addBlockBodies([block.body]);
-        await store.addExtendedContractData([extendedContractData], block.number);
-      });
-
-      it('returns previously stored extended contract data', async () => {
-        await expect(store.getExtendedContractData(extendedContractData.contractData.contractAddress)).resolves.toEqual(
-          extendedContractData,
-        );
-      });
-
-      it('returns undefined if extended contract data is not found', async () => {
-        await expect(store.getExtendedContractData(AztecAddress.random())).resolves.toBeUndefined();
-      });
-    });
-
-    describe('getExtendedContractDataInBlock', () => {
-      let block: L2Block;
-      let extendedContractData: ExtendedContractData;
-      beforeEach(async () => {
-        block = L2Block.random(1);
-        extendedContractData = ExtendedContractData.random(block.body.txEffects[0].contractData[0]);
-        await store.addBlocks([block]);
-        await store.addBlockBodies([block.body]);
-        await store.addExtendedContractData([extendedContractData], block.number);
-      });
-
-      it('returns previously stored extended contract data', async () => {
-        await expect(store.getExtendedContractDataInBlock(block.number)).resolves.toEqual([extendedContractData]);
-      });
-
-      it('returns an empty array if extended contract data is not found for the block', async () => {
-        await expect(store.getExtendedContractDataInBlock(block.number + 1)).resolves.toEqual([]);
-      });
-    });
-
     describe('getUnencryptedLogs', () => {
       const txsPerBlock = 4;
       const numPublicFunctionCalls = 3;

package/src/archiver/config.ts

@@ -58,7 +58,6 @@ export function getConfigEnvVars(): ArchiverConfig {
     ARCHIVER_VIEM_POLLING_INTERVAL_MS,
     AVAILABILITY_ORACLE_CONTRACT_ADDRESS,
     ROLLUP_CONTRACT_ADDRESS,
-    CONTRACT_DEPLOYMENT_EMITTER_ADDRESS,
     API_KEY,
     INBOX_CONTRACT_ADDRESS,
     OUTBOX_CONTRACT_ADDRESS,
@@ -74,9 +73,6 @@ export function getConfigEnvVars(): ArchiverConfig {
     registryAddress: REGISTRY_CONTRACT_ADDRESS ? EthAddress.fromString(REGISTRY_CONTRACT_ADDRESS) : EthAddress.ZERO,
     inboxAddress: INBOX_CONTRACT_ADDRESS ? EthAddress.fromString(INBOX_CONTRACT_ADDRESS) : 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,
   };
   return {
     rpcUrl: ETHEREUM_HOST || 'http://127.0.0.1:8545/',