@aztec/archiver 0.28.0 → 0.29.0

package/src/archiver/memory_archiver_store/memory_archiver_store.ts

@@ -1,28 +1,26 @@
 import {
   Body,
-  ExtendedContractData,
   ExtendedUnencryptedL2Log,
   GetUnencryptedLogsResponse,
-  L1ToL2Message,
+  InboxLeaf,
   L2Block,
   L2BlockContext,
   L2BlockL2Logs,
   LogFilter,
   LogId,
   LogType,
-  NewInboxLeaf,
   TxEffect,
   TxHash,
   TxReceipt,
   TxStatus,
   UnencryptedL2Log,
 } from '@aztec/circuit-types';
-import { Fr, INITIAL_L2_BLOCK_NUM, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP } from '@aztec/circuits.js';
+import { Fr, INITIAL_L2_BLOCK_NUM } from '@aztec/circuits.js';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { ContractClassPublic, ContractInstanceWithAddress } from '@aztec/types/contracts';
 
-import { ArchiverDataStore } from '../archiver_store.js';
-import { L1ToL2MessageStore, NewL1ToL2MessageStore, PendingL1ToL2MessageStore } from './l1_to_l2_message_store.js';
+import { ArchiverDataStore, ArchiverL1SynchPoint } from '../archiver_store.js';
+import { L1ToL2MessageStore } from './l1_to_l2_message_store.js';
 
 /**
  * Simple, in-memory implementation of an archiver data store.
@@ -56,36 +54,15 @@ export class MemoryArchiverStore implements ArchiverDataStore {
   private unencryptedLogsPerBlock: L2BlockL2Logs[] = [];
 
   /**
-   * A sparse array containing all the extended contract data that have been fetched so far.
+   * Contains all L1 to L2 messages.
    */
-  private extendedContractDataByBlock: (ExtendedContractData[] | undefined)[] = [];
-
-  /**
-   * A mapping of contract address to extended contract data.
-   */
-  private extendedContractData: Map<string, ExtendedContractData> = new Map();
-
-  // TODO(#4492): Nuke the other message stores
-  private newL1ToL2Messages = new NewL1ToL2MessageStore();
-
-  /**
-   * Contains all the confirmed L1 to L2 messages (i.e. messages that were consumed in an L2 block)
-   * It is a map of entryKey to the corresponding L1 to L2 message and the number of times it has appeared
-   */
-  private confirmedL1ToL2Messages: L1ToL2MessageStore = new L1ToL2MessageStore();
-
-  /**
-   * Contains all the pending L1 to L2 messages (accounts for duplication of messages)
-   */
-  private pendingL1ToL2Messages: PendingL1ToL2MessageStore = new PendingL1ToL2MessageStore();
+  private l1ToL2Messages = new L1ToL2MessageStore();
 
   private contractClasses: Map<string, ContractClassPublic> = new Map();
 
   private contractInstances: Map<string, ContractInstanceWithAddress> = new Map();
 
   private lastL1BlockNewMessages: bigint = 0n;
-  private lastL1BlockAddedMessages: bigint = 0n;
-  private lastL1BlockCancelledMessages: bigint = 0n;
 
   constructor(
     /** The max number of logs that can be obtained in 1 "getUnencryptedLogs" call. */
@@ -178,97 +155,30 @@ export class MemoryArchiverStore implements ArchiverDataStore {
   }
 
   /**
-   * Append new L1 to L2 messages to the store.
+   * Append 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.
    */
-  public addNewL1ToL2Messages(messages: NewInboxLeaf[], lastMessageL1BlockNumber: bigint): Promise<boolean> {
+  public addL1ToL2Messages(messages: InboxLeaf[], lastMessageL1BlockNumber: bigint): Promise<boolean> {
     if (lastMessageL1BlockNumber <= this.lastL1BlockNewMessages) {
       return Promise.resolve(false);
     }
 
     this.lastL1BlockNewMessages = lastMessageL1BlockNumber;
     for (const message of messages) {
-      this.newL1ToL2Messages.addMessage(message);
-    }
-    return Promise.resolve(true);
-  }
-
-  /**
-   * 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 L1 block number for which to add the messages.
-   * @returns True if the operation is successful (always in this implementation).
-   */
-  public addPendingL1ToL2Messages(messages: L1ToL2Message[], l1BlockNumber: bigint): Promise<boolean> {
-    if (l1BlockNumber <= this.lastL1BlockAddedMessages) {
-      return Promise.resolve(false);
-    }
-
-    this.lastL1BlockAddedMessages = l1BlockNumber;
-    for (const message of messages) {
-      this.pendingL1ToL2Messages.addMessage(message.entryKey!, message);
-    }
-    return Promise.resolve(true);
-  }
-
-  /**
-   * Remove pending L1 to L2 messages from the store (if they were cancelled).
-   * @param messages - The entry keys to be removed from the store.
-   * @param l1BlockNumber - The L1 block number for which to remove the messages.
-   * @returns True if the operation is successful (always in this implementation).
-   */
-  public cancelPendingL1ToL2EntryKeys(messages: Fr[], l1BlockNumber: bigint): Promise<boolean> {
-    if (l1BlockNumber <= this.lastL1BlockCancelledMessages) {
-      return Promise.resolve(false);
+      this.l1ToL2Messages.addMessage(message);
     }
-
-    this.lastL1BlockCancelledMessages = l1BlockNumber;
-    messages.forEach(entryKey => {
-      this.pendingL1ToL2Messages.removeMessage(entryKey);
-    });
     return Promise.resolve(true);
   }
 
   /**
-   * Messages that have been published in an L2 block are confirmed.
-   * Add them to the confirmed store, also remove them from the pending store.
-   * @param entryKeys - The entry keys to be removed from the store.
-   * @returns True if the operation is successful (always in this implementation).
+   * Gets the L1 to L2 message index in the L1 to L2 message tree.
+   * @param l1ToL2Message - The L1 to L2 message.
+   * @returns The index of the L1 to L2 message in the L1 to L2 message tree.
    */
-  public confirmL1ToL2EntryKeys(entryKeys: Fr[]): Promise<boolean> {
-    entryKeys.forEach(entryKey => {
-      if (entryKey.equals(Fr.ZERO)) {
-        return;
-      }
-
-      this.confirmedL1ToL2Messages.addMessage(entryKey, this.pendingL1ToL2Messages.getMessage(entryKey)!);
-      this.pendingL1ToL2Messages.removeMessage(entryKey);
-    });
-    return Promise.resolve(true);
-  }
-
-  /**
-   * Store new extended contract data from an L2 block to the store's list.
-   * @param data - List of contracts' data to be added.
-   * @param blockNum - Number of the L2 block the contract data was deployed in.
-   * @returns True if the operation is successful (always in this implementation).
-   */
-  public addExtendedContractData(data: ExtendedContractData[], blockNum: number): Promise<boolean> {
-    // Add to the contracts mapping
-    for (const contractData of data) {
-      const key = contractData.contractData.contractAddress.toString();
-      this.extendedContractData.set(key, contractData);
-    }
-
-    // Add the index per block
-    if (this.extendedContractDataByBlock[blockNum]?.length) {
-      this.extendedContractDataByBlock[blockNum]?.push(...data);
-    } else {
-      this.extendedContractDataByBlock[blockNum] = [...data];
-    }
-    return Promise.resolve(true);
+  public getL1ToL2MessageIndex(l1ToL2Message: Fr): Promise<bigint> {
+    return Promise.resolve(this.l1ToL2Messages.getMessageIndex(l1ToL2Message));
   }
 
   /**
@@ -322,34 +232,12 @@ export class MemoryArchiverStore implements ArchiverDataStore {
   }
 
   /**
-   * Gets up to `limit` amount of pending L1 to L2 messages, sorted by fee
-   * @param limit - The number of messages to return (by default NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP).
-   * @returns The requested L1 to L2 entry keys.
-   */
-  public getPendingL1ToL2EntryKeys(limit: number = NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP): Promise<Fr[]> {
-    return Promise.resolve(this.pendingL1ToL2Messages.getEntryKeys(limit));
-  }
-
-  /**
-   * Gets the confirmed L1 to L2 message corresponding to the given entry key.
-   * @param entryKey - The entry key to look up.
-   * @returns The requested L1 to L2 message or throws if not found.
-   */
-  public getConfirmedL1ToL2Message(entryKey: Fr): Promise<L1ToL2Message> {
-    const message = this.confirmedL1ToL2Messages.getMessage(entryKey);
-    if (!message) {
-      throw new Error(`L1 to L2 Message with key ${entryKey.toString()} not found in the confirmed messages store`);
-    }
-    return Promise.resolve(message);
-  }
-
-  /**
-   * Gets new L1 to L2 message (to be) included in a given block.
+   * Gets 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<Fr[]> {
-    return Promise.resolve(this.newL1ToL2Messages.getMessages(blockNumber));
+  getL1ToL2Messages(blockNumber: bigint): Promise<Fr[]> {
+    return Promise.resolve(this.l1ToL2Messages.getMessages(blockNumber));
   }
 
   /**
@@ -456,39 +344,24 @@ export class MemoryArchiverStore implements ArchiverDataStore {
     });
   }
 
-  /**
-   * Get the extended contract data for this contract.
-   * TODO(palla/purge-old-contract-deploy): Delete me?
-   * @param contractAddress - The contract data address.
-   * @returns The extended contract data or undefined if not found.
-   */
-  getExtendedContractData(contractAddress: AztecAddress): Promise<ExtendedContractData | undefined> {
-    const result = this.extendedContractData.get(contractAddress.toString());
-    return Promise.resolve(result);
-  }
-
   /**
    * Gets the number of the latest L2 block processed.
    * @returns The number of the latest L2 block processed.
    */
-  public getBlockNumber(): Promise<number> {
+  public getSynchedL2BlockNumber(): Promise<number> {
     if (this.l2BlockContexts.length === 0) {
       return Promise.resolve(INITIAL_L2_BLOCK_NUM - 1);
     }
     return Promise.resolve(this.l2BlockContexts[this.l2BlockContexts.length - 1].block.number);
   }
 
-  public getL1BlockNumber() {
-    const addedBlock = this.l2BlockContexts[this.l2BlockContexts.length - 1]?.block?.getL1BlockNumber() ?? 0n;
-    const newMessages = this.lastL1BlockNewMessages;
-    const addedMessages = this.lastL1BlockAddedMessages;
-    const cancelledMessages = this.lastL1BlockCancelledMessages;
+  public getSynchedL1BlockNumbers(): Promise<ArchiverL1SynchPoint> {
+    const blocks = this.l2BlockContexts[this.l2BlockContexts.length - 1]?.block?.getL1BlockNumber() ?? 0n;
+    const messages = this.lastL1BlockNewMessages;
 
     return Promise.resolve({
-      addedBlock,
-      newMessages,
-      addedMessages,
-      cancelledMessages,
+      blocks,
+      messages,
     });
   }
 }

package/src/index.ts

@@ -1,9 +1,7 @@
-import { EthAddress } from '@aztec/foundation/eth-address';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { fileURLToPath } from '@aztec/foundation/url';
-import { RollupAbi } from '@aztec/l1-artifacts';
 
-import { createPublicClient, getAddress, getContract, http } from 'viem';
+import { createPublicClient, http } from 'viem';
 import { localhost } from 'viem/chains';
 
 import { Archiver, getConfigEnvVars } from './archiver/index.js';
@@ -29,23 +27,11 @@ async function main() {
 
   const archiverStore = new MemoryArchiverStore(1000);
 
-  // TODO(#4492): Nuke this once the old inbox is purged
-  let newInboxAddress!: EthAddress;
-  {
-    const rollup = getContract({
-      address: getAddress(l1Contracts.rollupAddress.toString()),
-      abi: RollupAbi,
-      client: publicClient,
-    });
-    newInboxAddress = EthAddress.fromString(await rollup.read.NEW_INBOX());
-  }
-
   const archiver = new Archiver(
     publicClient,
     l1Contracts.rollupAddress,
     l1Contracts.availabilityOracleAddress,
     l1Contracts.inboxAddress,
-    newInboxAddress,
     l1Contracts.registryAddress,
     archiverStore,
   );

package/src/rpc/archiver_client.ts

@@ -1,9 +1,5 @@
 import {
-  ContractData,
-  EncodedContractFunction,
-  ExtendedContractData,
   ExtendedUnencryptedL2Log,
-  L1ToL2Message,
   L2Block,
   L2BlockL2Logs,
   NullifierMembershipWitness,
@@ -18,13 +14,9 @@ export const createArchiverClient = (url: string, fetch = makeFetch([1, 2, 3], t
   createJsonRpcClient<ArchiveSource>(
     url,
     {
-      ContractData,
-      EncodedContractFunction,
       EthAddress,
-      ExtendedContractData,
       ExtendedUnencryptedL2Log,
       Fr,
-      L1ToL2Message,
       L2Block,
       L2BlockL2Logs,
     },

package/src/rpc/archiver_server.ts

@@ -1,9 +1,5 @@
 import {
-  ContractData,
-  EncodedContractFunction,
-  ExtendedContractData,
   ExtendedUnencryptedL2Log,
-  L1ToL2Message,
   L2Block,
   L2BlockL2Logs,
   NullifierMembershipWitness,
@@ -24,13 +20,9 @@ export function createArchiverRpcServer(archiverService: Archiver): JsonRpcServe
   return new JsonRpcServer(
     archiverService,
     {
-      ContractData,
-      EncodedContractFunction,
       EthAddress,
-      ExtendedContractData,
       ExtendedUnencryptedL2Log,
       Fr,
-      L1ToL2Message,
       L2Block,
       L2BlockL2Logs,
       TxEffect,

package/dest/archiver/kv_archiver_store/contract_store.d.ts

@@ -1,26 +0,0 @@
-import { ExtendedContractData } from '@aztec/circuit-types';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
-import { AztecKVStore } from '@aztec/kv-store';
-import { BlockStore } from './block_store.js';
-/**
- * LMDB implementation of the ArchiverDataStore interface.
- */
-export declare class ContractStore {
-    #private;
-    private db;
-    constructor(db: AztecKVStore, blockStore: BlockStore);
-    /**
-     * Add new extended contract data from an L2 block to the store's list.
-     * @param data - List of contracts' data to be added.
-     * @param blockNum - Number of the L2 block the contract data was deployed in.
-     * @returns True if the operation is successful.
-     */
-    addExtendedContractData(data: ExtendedContractData[], blockNum: number): Promise<boolean>;
-    /**
-     * Get the extended contract data for this contract.
-     * @param contractAddress - The contract data address.
-     * @returns The extended contract data or undefined if not found.
-     */
-    getExtendedContractData(contractAddress: AztecAddress): ExtendedContractData | undefined;
-}
-//# sourceMappingURL=contract_store.d.ts.map

package/dest/archiver/kv_archiver_store/contract_store.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"contract_store.d.ts","sourceRoot":"","sources":["../../../src/archiver/kv_archiver_store/contract_store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D,OAAO,EAAE,YAAY,EAAY,MAAM,iBAAiB,CAAC;AAEzD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C;;GAEG;AACH,qBAAa,aAAa;;IAKZ,OAAO,CAAC,EAAE;gBAAF,EAAE,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU;IAK5D;;;;;OAKG;IACH,uBAAuB,CAAC,IAAI,EAAE,oBAAoB,EAAE,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAOzF;;;;OAIG;IACH,uBAAuB,CAAC,eAAe,EAAE,YAAY,GAAG,oBAAoB,GAAG,SAAS;CAgBzF"}

package/dest/archiver/kv_archiver_store/contract_store.js

@@ -1,49 +0,0 @@
-var _ContractStore_blockStore, _ContractStore_extendedContractData, _ContractStore_log;
-import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
-import { ExtendedContractData } from '@aztec/circuit-types';
-import { createDebugLogger } from '@aztec/foundation/log';
-/**
- * LMDB implementation of the ArchiverDataStore interface.
- */
-export class ContractStore {
-    constructor(db, blockStore) {
-        this.db = db;
-        _ContractStore_blockStore.set(this, void 0);
-        _ContractStore_extendedContractData.set(this, void 0);
-        _ContractStore_log.set(this, createDebugLogger('aztec:archiver:contract_store'));
-        __classPrivateFieldSet(this, _ContractStore_extendedContractData, db.openMap('archiver_extended_contract_data'), "f");
-        __classPrivateFieldSet(this, _ContractStore_blockStore, blockStore, "f");
-    }
-    /**
-     * Add new extended contract data from an L2 block to the store's list.
-     * @param data - List of contracts' data to be added.
-     * @param blockNum - Number of the L2 block the contract data was deployed in.
-     * @returns True if the operation is successful.
-     */
-    addExtendedContractData(data, blockNum) {
-        return __classPrivateFieldGet(this, _ContractStore_extendedContractData, "f").swap(blockNum, (existingData = []) => {
-            existingData.push(...data.map(d => d.toBuffer()));
-            return existingData;
-        });
-    }
-    /**
-     * Get the extended contract data for this contract.
-     * @param contractAddress - The contract data address.
-     * @returns The extended contract data or undefined if not found.
-     */
-    getExtendedContractData(contractAddress) {
-        const [blockNumber, _] = __classPrivateFieldGet(this, _ContractStore_blockStore, "f").getContractLocation(contractAddress) ?? [];
-        if (typeof blockNumber !== 'number') {
-            return undefined;
-        }
-        for (const contract of __classPrivateFieldGet(this, _ContractStore_extendedContractData, "f").get(blockNumber) ?? []) {
-            const extendedContractData = ExtendedContractData.fromBuffer(contract);
-            if (extendedContractData.contractData.contractAddress.equals(contractAddress)) {
-                return extendedContractData;
-            }
-        }
-        return undefined;
-    }
-}
-_ContractStore_blockStore = new WeakMap(), _ContractStore_extendedContractData = new WeakMap(), _ContractStore_log = new WeakMap();
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3Rfc3RvcmUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvYXJjaGl2ZXIva3ZfYXJjaGl2ZXJfc3RvcmUvY29udHJhY3Rfc3RvcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUU1RCxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUsxRDs7R0FFRztBQUNILE1BQU0sT0FBTyxhQUFhO0lBS3hCLFlBQW9CLEVBQWdCLEVBQUUsVUFBc0I7UUFBeEMsT0FBRSxHQUFGLEVBQUUsQ0FBYztRQUpwQyw0Q0FBd0I7UUFDeEIsc0RBQWtEO1FBQ2xELDZCQUFPLGlCQUFpQixDQUFDLCtCQUErQixDQUFDLEVBQUM7UUFHeEQsdUJBQUEsSUFBSSx1Q0FBeUIsRUFBRSxDQUFDLE9BQU8sQ0FBQyxpQ0FBaUMsQ0FBQyxNQUFBLENBQUM7UUFDM0UsdUJBQUEsSUFBSSw2QkFBZSxVQUFVLE1BQUEsQ0FBQztJQUNoQyxDQUFDO0lBRUQ7Ozs7O09BS0c7SUFDSCx1QkFBdUIsQ0FBQyxJQUE0QixFQUFFLFFBQWdCO1FBQ3BFLE9BQU8sdUJBQUEsSUFBSSwyQ0FBc0IsQ0FBQyxJQUFJLENBQUMsUUFBUSxFQUFFLENBQUMsWUFBWSxHQUFHLEVBQUUsRUFBRSxFQUFFO1lBQ3JFLFlBQVksQ0FBQyxJQUFJLENBQUMsR0FBRyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUMsQ0FBQztZQUNsRCxPQUFPLFlBQVksQ0FBQztRQUN0QixDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRDs7OztPQUlHO0lBQ0gsdUJBQXVCLENBQUMsZUFBNkI7UUFDbkQsTUFBTSxDQUFDLFdBQVcsRUFBRSxDQUFDLENBQUMsR0FBRyx1QkFBQSxJQUFJLGlDQUFZLENBQUMsbUJBQW1CLENBQUMsZUFBZSxDQUFDLElBQUksRUFBRSxDQUFDO1FBRXJGLElBQUksT0FBTyxXQUFXLEtBQUssUUFBUSxFQUFFLENBQUM7WUFDcEMsT0FBTyxTQUFTLENBQUM7UUFDbkIsQ0FBQztRQUVELEtBQUssTUFBTSxRQUFRLElBQUksdUJBQUEsSUFBSSwyQ0FBc0IsQ0FBQyxHQUFHLENBQUMsV0FBVyxDQUFDLElBQUksRUFBRSxFQUFFLENBQUM7WUFDekUsTUFBTSxvQkFBb0IsR0FBRyxvQkFBb0IsQ0FBQyxVQUFVLENBQUMsUUFBUSxDQUFDLENBQUM7WUFDdkUsSUFBSSxvQkFBb0IsQ0FBQyxZQUFZLENBQUMsZUFBZSxDQUFDLE1BQU0sQ0FBQyxlQUFlLENBQUMsRUFBRSxDQUFDO2dCQUM5RSxPQUFPLG9CQUFvQixDQUFDO1lBQzlCLENBQUM7UUFDSCxDQUFDO1FBRUQsT0FBTyxTQUFTLENBQUM7SUFDbkIsQ0FBQztDQUNGIn0=

package/src/archiver/kv_archiver_store/contract_store.ts

@@ -1,55 +0,0 @@
-import { ExtendedContractData } from '@aztec/circuit-types';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
-import { createDebugLogger } from '@aztec/foundation/log';
-import { AztecKVStore, AztecMap } from '@aztec/kv-store';
-
-import { BlockStore } from './block_store.js';
-
-/**
- * LMDB implementation of the ArchiverDataStore interface.
- */
-export class ContractStore {
-  #blockStore: BlockStore;
-  #extendedContractData: AztecMap<number, Buffer[]>;
-  #log = createDebugLogger('aztec:archiver:contract_store');
-
-  constructor(private db: AztecKVStore, blockStore: BlockStore) {
-    this.#extendedContractData = db.openMap('archiver_extended_contract_data');
-    this.#blockStore = blockStore;
-  }
-
-  /**
-   * Add new extended contract data from an L2 block to the store's list.
-   * @param data - List of contracts' data to be added.
-   * @param blockNum - Number of the L2 block the contract data was deployed in.
-   * @returns True if the operation is successful.
-   */
-  addExtendedContractData(data: ExtendedContractData[], blockNum: number): Promise<boolean> {
-    return this.#extendedContractData.swap(blockNum, (existingData = []) => {
-      existingData.push(...data.map(d => d.toBuffer()));
-      return existingData;
-    });
-  }
-
-  /**
-   * Get the extended contract data for this contract.
-   * @param contractAddress - The contract data address.
-   * @returns The extended contract data or undefined if not found.
-   */
-  getExtendedContractData(contractAddress: AztecAddress): ExtendedContractData | undefined {
-    const [blockNumber, _] = this.#blockStore.getContractLocation(contractAddress) ?? [];
-
-    if (typeof blockNumber !== 'number') {
-      return undefined;
-    }
-
-    for (const contract of this.#extendedContractData.get(blockNumber) ?? []) {
-      const extendedContractData = ExtendedContractData.fromBuffer(contract);
-      if (extendedContractData.contractData.contractAddress.equals(contractAddress)) {
-        return extendedContractData;
-      }
-    }
-
-    return undefined;
-  }
-}