@aztec/archiver 0.1.0-alpha47 → 0.1.0-alpha49

package/dest/archiver/archiver.d.ts

@@ -3,7 +3,7 @@ import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
 import { DebugLogger } from '@aztec/foundation/log';
-import { ContractData, ContractDataAndBytecode, ContractDataSource, EncodedContractFunction, L1ToL2Message, L1ToL2MessageSource, L2Block, L2BlockL2Logs, L2BlockSource, L2LogsSource, LogType } from '@aztec/types';
+import { ContractData, ContractDataSource, EncodedContractFunction, ExtendedContractData, L1ToL2Message, L1ToL2MessageSource, L2Block, L2BlockL2Logs, L2BlockSource, L2LogsSource, L2Tx, LogType, TxHash } from '@aztec/types';
 import { Chain, HttpTransport, PublicClient } from 'viem';
 import { ArchiverDataStore } from './archiver_store.js';
 import { ArchiverConfig } from './config.js';
@@ -84,19 +84,19 @@ export declare class Archiver implements L2BlockSource, L2LogsSource, ContractDa
      * @returns The requested L2 block.
      */
     getL2Block(number: number): Promise<L2Block | undefined>;
+    getL2Tx(txHash: TxHash): Promise<L2Tx | undefined>;
     /**
-     * Lookup the L2 contract data for this contract.
-     * Contains the contract's public function bytecode.
+     * Get the extended contract data for this contract.
      * @param contractAddress - The contract data address.
-     * @returns The contract data.
+     * @returns The extended contract data or undefined if not found.
      */
-    getContractDataAndBytecode(contractAddress: AztecAddress): Promise<ContractDataAndBytecode | undefined>;
+    getExtendedContractData(contractAddress: AztecAddress): Promise<ExtendedContractData | undefined>;
     /**
      * 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).
      */
-    getContractDataAndBytecodeInBlock(blockNum: number): Promise<ContractDataAndBytecode[]>;
+    getExtendedContractDataInBlock(blockNum: number): Promise<ExtendedContractData[]>;
     /**
      * Lookup the contract data for this contract.
      * Contains contract address & the ethereum portal address.

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

@@ -1 +1 @@
-{"version":3,"file":"archiver.d.ts","sourceRoot":"","sources":["../../src/archiver/archiver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"archiver.d.ts","sourceRoot":"","sources":["../../src/archiver/archiver.ts"],"names":[],"mappings":"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"}

package/dest/archiver/archiver.js

@@ -134,9 +134,9 @@ export class Archiver {
         // store contracts for which we have retrieved L2 blocks
         const lastKnownL2BlockNum = retrievedBlocks.retrievedData[retrievedBlocks.retrievedData.length - 1].number;
         retrievedContracts.retrievedData.forEach(async ([contracts, l2BlockNum], index) => {
-            this.log(`Retrieved contract data and bytecode for l2 block number: ${index}`);
+            this.log(`Retrieved extended contract data for l2 block number: ${index}`);
             if (l2BlockNum <= lastKnownL2BlockNum) {
-                await this.store.addContractDataAndBytecode(contracts, l2BlockNum);
+                await this.store.addExtendedContractData(contracts, l2BlockNum);
             }
         });
         // from retrieved L2Blocks, confirm L1 to L2 messages that have been published
@@ -146,7 +146,7 @@ export class Archiver {
         await this.store.confirmL1ToL2Messages(messageKeysToRemove);
         // store retrieved L2 blocks after removing new logs information.
         // remove logs to serve "lightweight" block information. Logs can be fetched separately if needed.
-        await this.store.addL2Blocks(retrievedBlocks.retrievedData.map(block => L2Block.fromFields(omit(block, ['newEncryptedLogs', 'newUnencryptedLogs']))));
+        await this.store.addL2Blocks(retrievedBlocks.retrievedData.map(block => L2Block.fromFields(omit(block, ['newEncryptedLogs', 'newUnencryptedLogs']), block.getBlockHash())));
         // set the L1 block for the next search
         this.nextL2BlockFromBlock = retrievedBlocks.nextEthBlockNumber;
     }
@@ -185,22 +185,24 @@ export class Archiver {
         const blocks = await this.store.getL2Blocks(number, 1);
         return blocks.length === 0 ? undefined : blocks[0];
     }
+    getL2Tx(txHash) {
+        return this.store.getL2Tx(txHash);
+    }
     /**
-     * Lookup the L2 contract data for this contract.
-     * Contains the contract's public function bytecode.
+     * Get the extended contract data for this contract.
      * @param contractAddress - The contract data address.
-     * @returns The contract data.
+     * @returns The extended contract data or undefined if not found.
      */
-    getContractDataAndBytecode(contractAddress) {
-        return this.store.getContractDataAndBytecode(contractAddress);
+    getExtendedContractData(contractAddress) {
+        return this.store.getExtendedContractData(contractAddress);
     }
     /**
      * 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).
      */
-    getContractDataAndBytecodeInBlock(blockNum) {
-        return this.store.getContractDataAndBytecodeInBlock(blockNum);
+    getExtendedContractDataInBlock(blockNum) {
+        return this.store.getExtendedContractDataInBlock(blockNum);
     }
     /**
      * Lookup the contract data for this contract.
@@ -227,7 +229,7 @@ export class Archiver {
      * @returns The public function data (if found).
      */
     async getPublicFunction(contractAddress, selector) {
-        const contractData = await this.getContractDataAndBytecode(contractAddress);
+        const contractData = await this.getExtendedContractData(contractAddress);
         return contractData?.getPublicFunction(selector);
     }
     /**
@@ -264,4 +266,4 @@ export class Archiver {
         return this.store.getConfirmedL1ToL2Message(messageKey);
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"archiver.js","sourceRoot":"","sources":["../../src/archiver/archiver.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"archiver.js","sourceRoot":"","sources":["../../src/archiver/archiver.ts"],"names":[],"mappings":"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"}

package/dest/archiver/archiver.test.js

@@ -3,7 +3,7 @@ import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
 import { sleep } from '@aztec/foundation/sleep';
 import { RollupAbi } from '@aztec/l1-artifacts';
-import { ContractData, ContractDataAndBytecode, EncodedContractFunction, L2Block, L2BlockL2Logs, LogType, } from '@aztec/types';
+import { ExtendedContractData, L2Block, L2BlockL2Logs, LogType } from '@aztec/types';
 import { mock } from 'jest-mock-extended';
 import { encodeFunctionData, toHex } from 'viem';
 import { Archiver } from './archiver.js';
@@ -111,21 +111,18 @@ function makeL2BlockProcessedEvent(l1BlockNum, l2BlockNum) {
  * @returns An ContractDeployment event.
  */
 function makeContractDeploymentEvent(l1BlockNum, l2Block) {
-    // const contractData = ContractData.random();
-    const aztecAddress = AztecAddress.random();
-    const portalAddress = EthAddress.random();
-    const contractData = new ContractDataAndBytecode(new ContractData(aztecAddress, portalAddress), [
-        EncodedContractFunction.random(),
-        EncodedContractFunction.random(),
-    ]);
-    const acir = contractData.bytecode?.toString('hex');
+    const extendedContractData = ExtendedContractData.random();
+    const acir = extendedContractData.bytecode?.toString('hex');
     return {
         blockNumber: l1BlockNum,
         args: {
             l2BlockNum: BigInt(l2Block.number),
-            aztecAddress: aztecAddress.toString(),
-            portalAddress: portalAddress.toString(),
+            aztecAddress: extendedContractData.contractData.contractAddress.toString(),
+            portalAddress: extendedContractData.contractData.portalContractAddress.toString(),
             l2BlockHash: `0x${l2Block.getCalldataHash().toString('hex')}`,
+            partialAddress: extendedContractData.partialAddress.toString(true),
+            pubKeyX: extendedContractData.publicKey.x.toString(true),
+            pubKeyY: extendedContractData.publicKey.y.toString(true),
             acir: '0x' + acir,
         },
         transactionHash: `0x${l2Block.number}`,
@@ -184,4 +181,4 @@ function makeRollupTx(l2Block) {
     const input = encodeFunctionData({ abi: RollupAbi, functionName: 'process', args: [proof, block] });
     return { input };
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"archiver.test.js","sourceRoot":"","sources":["../../src/archiver/archiver.test.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"archiver.test.js","sourceRoot":"","sources":["../../src/archiver/archiver.test.ts"],"names":[],"mappings":"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"}

package/dest/archiver/archiver_store.d.ts

@@ -1,9 +1,9 @@
 import { Fr } from '@aztec/circuits.js';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
-import { ContractData, ContractDataAndBytecode, L1ToL2Message, L2Block, L2BlockL2Logs, LogType } from '@aztec/types';
+import { ContractData, ExtendedContractData, L1ToL2Message, L2Block, L2BlockL2Logs, L2Tx, LogType, TxHash } from '@aztec/types';
 /**
  * Interface describing a data store to be used by the archiver to store all its relevant data
- * (blocks, encrypted logs, aztec contract data and bytecode).
+ * (blocks, encrypted logs, aztec contract data extended contract data).
  */
 export interface ArchiverDataStore {
     /**
@@ -19,6 +19,12 @@ export interface ArchiverDataStore {
      * @returns The requested L2 blocks.
      */
     getL2Blocks(from: number, limit: number): Promise<L2Block[]>;
+    /**
+     * Gets an l2 tx.
+     * @param txHash - The txHash of the l2 tx.
+     * @returns The requested L2 tx.
+     */
+    getL2Tx(txHash: TxHash): Promise<L2Tx | undefined>;
     /**
      * Append new logs to the store's list.
      * @param data - The logs to be added to the store.
@@ -66,24 +72,24 @@ export interface ArchiverDataStore {
      */
     getLogs(from: number, limit: number, logType: LogType): Promise<L2BlockL2Logs[]>;
     /**
-     * Store new Contract data and bytecode from an L2 block to the store's list.
+     * 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.
      */
-    addContractDataAndBytecode(data: ContractDataAndBytecode[], blockNum: number): Promise<boolean>;
+    addExtendedContractData(data: ExtendedContractData[], blockNum: number): Promise<boolean>;
     /**
-     * Lookup the L2 contract data for a contract address.
+     * Get the extended contract data for this contract.
      * @param contractAddress - The contract data address.
-     * @returns The contract's public data.
+     * @returns The extended contract data or undefined if not found.
      */
-    getContractDataAndBytecode(contractAddress: AztecAddress): Promise<ContractDataAndBytecode | undefined>;
+    getExtendedContractData(contractAddress: AztecAddress): Promise<ExtendedContractData | undefined>;
     /**
-     * Lookup all contract data and bytecode in an L2 block.
+     * Lookup all extended contract data in an L2 block.
      * @param blockNum - The block number to get all contract data from.
-     * @returns All contract data and bytecode in the block (if found).
+     * @returns All extended contract data in the block (if found).
      */
-    getContractDataAndBytecodeInBlock(blockNum: number): Promise<ContractDataAndBytecode[]>;
+    getExtendedContractDataInBlock(blockNum: number): Promise<ExtendedContractData[]>;
     /**
      * Get basic info for an L2 contract.
      * Contains contract address & the ethereum portal address.
@@ -117,6 +123,10 @@ export declare class MemoryArchiverStore implements ArchiverDataStore {
      * An array containing all the L2 blocks that have been fetched so far.
      */
     private l2Blocks;
+    /**
+     * An array containing all the L2 Txs in the L2 blocks that have been fetched so far.
+     */
+    private l2Txs;
     /**
      * An array containing all the encrypted logs that have been fetched so far.
      * Note: Index in the "outer" array equals to (corresponding L2 block's number - INITIAL_L2_BLOCK_NUM).
@@ -128,13 +138,13 @@ export declare class MemoryArchiverStore implements ArchiverDataStore {
      */
     private unencryptedLogs;
     /**
-     * A sparse array containing all the contract data and bytecode that have been fetched so far.
+     * A sparse array containing all the extended contract data that have been fetched so far.
      */
-    private contractDataAndBytecodeByBlock;
+    private extendedContractDataByBlock;
     /**
-     * A mapping of contract address to contract data and bytecode.
+     * A mapping of contract address to extended contract data.
      */
-    private contractDataAndBytecode;
+    private extendedContractData;
     /**
      * 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
@@ -178,12 +188,12 @@ export declare class MemoryArchiverStore implements ArchiverDataStore {
      */
     confirmL1ToL2Messages(messageKeys: Fr[]): Promise<boolean>;
     /**
-     * Store new Contract data and bytecode from an L2 block to the store's list.
+     * 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).
      */
-    addContractDataAndBytecode(data: ContractDataAndBytecode[], blockNum: number): Promise<boolean>;
+    addExtendedContractData(data: ExtendedContractData[], blockNum: number): Promise<boolean>;
     /**
      * Gets up to `limit` amount of L2 blocks starting from `from`.
      * @param from - Number of the first block to return (inclusive).
@@ -191,6 +201,12 @@ export declare class MemoryArchiverStore implements ArchiverDataStore {
      * @returns The requested L2 blocks.
      */
     getL2Blocks(from: number, limit: number): Promise<L2Block[]>;
+    /**
+     * Gets an l2 tx.
+     * @param txHash - The txHash of the l2 tx.
+     * @returns The requested L2 tx.
+     */
+    getL2Tx(txHash: TxHash): Promise<L2Tx | undefined>;
     /**
      * 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).
@@ -212,17 +228,17 @@ export declare class MemoryArchiverStore implements ArchiverDataStore {
      */
     getLogs(from: number, limit: number, logType: LogType): Promise<L2BlockL2Logs[]>;
     /**
-     * Lookup the L2 contract data for a contract address.
+     * Get the extended contract data for this contract.
      * @param contractAddress - The contract data address.
-     * @returns The contract's public data.
+     * @returns The extended contract data or undefined if not found.
      */
-    getContractDataAndBytecode(contractAddress: AztecAddress): Promise<ContractDataAndBytecode | undefined>;
+    getExtendedContractData(contractAddress: AztecAddress): Promise<ExtendedContractData | undefined>;
     /**
      * Lookup all contract data in an L2 block.
      * @param blockNum - The block number to get all contract data from.
-     * @returns All contract data and bytecode in the block (if found).
+     * @returns All extended contract data in the block (if found).
      */
-    getContractDataAndBytecodeInBlock(blockNum: number): Promise<ContractDataAndBytecode[]>;
+    getExtendedContractDataInBlock(blockNum: number): Promise<ExtendedContractData[]>;
     /**
      * Get basic info for an L2 contract.
      * Contains contract address & the ethereum portal address.

package/dest/archiver/archiver_store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"archiver_store.d.ts","sourceRoot":"","sources":["../../src/archiver/archiver_store.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"archiver_store.d.ts","sourceRoot":"","sources":["../../src/archiver/archiver_store.ts"],"names":[],"mappings":"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"}

package/dest/archiver/archiver_store.js

@@ -10,6 +10,10 @@ export class MemoryArchiverStore {
          * An array containing all the L2 blocks that have been fetched so far.
          */
         this.l2Blocks = [];
+        /**
+         * An array containing all the L2 Txs in the L2 blocks that have been fetched so far.
+         */
+        this.l2Txs = [];
         /**
          * An array containing all the encrypted logs that have been fetched so far.
          * Note: Index in the "outer" array equals to (corresponding L2 block's number - INITIAL_L2_BLOCK_NUM).
@@ -21,13 +25,13 @@ export class MemoryArchiverStore {
          */
         this.unencryptedLogs = [];
         /**
-         * A sparse array containing all the contract data and bytecode that have been fetched so far.
+         * A sparse array containing all the extended contract data that have been fetched so far.
          */
-        this.contractDataAndBytecodeByBlock = [];
+        this.extendedContractDataByBlock = [];
         /**
-         * A mapping of contract address to contract data and bytecode.
+         * A mapping of contract address to extended contract data.
          */
-        this.contractDataAndBytecode = new Map();
+        this.extendedContractData = new Map();
         /**
          * 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
@@ -45,6 +49,7 @@ export class MemoryArchiverStore {
      */
     addL2Blocks(blocks) {
         this.l2Blocks.push(...blocks);
+        this.l2Txs.push(...blocks.flatMap(b => b.getTxs()));
         return Promise.resolve(true);
     }
     /**
@@ -93,23 +98,23 @@ export class MemoryArchiverStore {
         return Promise.resolve(true);
     }
     /**
-     * Store new Contract data and bytecode from an L2 block to the store's list.
+     * 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).
      */
-    addContractDataAndBytecode(data, blockNum) {
+    addExtendedContractData(data, blockNum) {
         // Add to the contracts mapping
         for (const contractData of data) {
             const key = contractData.contractData.contractAddress.toString();
-            this.contractDataAndBytecode.set(key, contractData);
+            this.extendedContractData.set(key, contractData);
         }
         // Add the index per block
-        if (this.contractDataAndBytecodeByBlock[blockNum]?.length) {
-            this.contractDataAndBytecodeByBlock[blockNum]?.push(...data);
+        if (this.extendedContractDataByBlock[blockNum]?.length) {
+            this.extendedContractDataByBlock[blockNum]?.push(...data);
         }
         else {
-            this.contractDataAndBytecodeByBlock[blockNum] = [...data];
+            this.extendedContractDataByBlock[blockNum] = [...data];
         }
         return Promise.resolve(true);
     }
@@ -131,6 +136,15 @@ export class MemoryArchiverStore {
         const endIndex = startIndex + limit;
         return Promise.resolve(this.l2Blocks.slice(startIndex, endIndex));
     }
+    /**
+     * Gets an l2 tx.
+     * @param txHash - The txHash of the l2 tx.
+     * @returns The requested L2 tx.
+     */
+    getL2Tx(txHash) {
+        const l2Tx = this.l2Txs.find(tx => tx.txHash.equals(txHash));
+        return Promise.resolve(l2Tx);
+    }
     /**
      * 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).
@@ -171,24 +185,24 @@ export class MemoryArchiverStore {
         return Promise.resolve(logs.slice(startIndex, endIndex));
     }
     /**
-     * Lookup the L2 contract data for a contract address.
+     * Get the extended contract data for this contract.
      * @param contractAddress - The contract data address.
-     * @returns The contract's public data.
+     * @returns The extended contract data or undefined if not found.
      */
-    getContractDataAndBytecode(contractAddress) {
-        const result = this.contractDataAndBytecode.get(contractAddress.toString());
+    getExtendedContractData(contractAddress) {
+        const result = this.extendedContractData.get(contractAddress.toString());
         return Promise.resolve(result);
     }
     /**
      * Lookup all contract data in an L2 block.
      * @param blockNum - The block number to get all contract data from.
-     * @returns All contract data and bytecode in the block (if found).
+     * @returns All extended contract data in the block (if found).
      */
-    getContractDataAndBytecodeInBlock(blockNum) {
+    getExtendedContractDataInBlock(blockNum) {
         if (blockNum > this.l2Blocks.length) {
             return Promise.resolve([]);
         }
-        return Promise.resolve(this.contractDataAndBytecodeByBlock[blockNum] || []);
+        return Promise.resolve(this.extendedContractDataByBlock[blockNum] || []);
     }
     /**
      * Get basic info for an L2 contract.
@@ -239,4 +253,4 @@ export class MemoryArchiverStore {
         return this.l2Blocks.length;
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXJjaGl2ZXJfc3RvcmUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYXJjaGl2ZXIvYXJjaGl2ZXJfc3RvcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFNLG1DQUFtQyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFN0UsT0FBTyxFQUdMLG9CQUFvQixFQUlwQixPQUFPLEdBQ1IsTUFBTSxjQUFjLENBQUM7QUFFdEIsT0FBTyxFQUFFLGtCQUFrQixFQUFFLHlCQUF5QixFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUE4SDVGOztHQUVHO0FBQ0gsTUFBTSxPQUFPLG1CQUFtQjtJQXVDOUI7UUF0Q0E7O1dBRUc7UUFDSyxhQUFRLEdBQWMsRUFBRSxDQUFDO1FBRWpDOzs7V0FHRztRQUNLLGtCQUFhLEdBQW9CLEVBQUUsQ0FBQztRQUU1Qzs7O1dBR0c7UUFDSyxvQkFBZSxHQUFvQixFQUFFLENBQUM7UUFFOUM7O1dBRUc7UUFDSyxtQ0FBOEIsR0FBOEMsRUFBRSxDQUFDO1FBRXZGOztXQUVHO1FBQ0ssNEJBQXVCLEdBQXlDLElBQUksR0FBRyxFQUFFLENBQUM7UUFFbEY7OztXQUdHO1FBQ0ssNEJBQXVCLEdBQXVCLElBQUksa0JBQWtCLEVBQUUsQ0FBQztRQUUvRTs7V0FFRztRQUNLLDBCQUFxQixHQUE4QixJQUFJLHlCQUF5QixFQUFFLENBQUM7SUFFNUUsQ0FBQztJQUVoQjs7OztPQUlHO0lBQ0ksV0FBVyxDQUFDLE1BQWlCO1FBQ2xDLElBQUksQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLEdBQUcsTUFBTSxDQUFDLENBQUM7UUFDOUIsT0FBTyxPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQy9CLENBQUM7SUFFRDs7Ozs7T0FLRztJQUNILE9BQU8sQ0FBQyxJQUFxQixFQUFFLE9BQWdCO1FBQzdDLE9BQU8sS0FBSyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLElBQUksQ0FBQyxHQUFHLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsZUFBZSxDQUFDLElBQUksQ0FBQyxHQUFHLElBQUksQ0FBQyxDQUFDO1FBQ3RHLE9BQU8sT0FBTyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUMvQixDQUFDO0lBRUQ7Ozs7T0FJRztJQUNJLHdCQUF3QixDQUFDLFFBQXlCO1FBQ3ZELEtBQUssTUFBTSxHQUFHLElBQUksUUFBUSxFQUFFO1lBQzFCLElBQUksQ0FBQyxxQkFBcUIsQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLFFBQVMsRUFBRSxHQUFHLENBQUMsQ0FBQztTQUMzRDtRQUNELE9BQU8sT0FBTyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUMvQixDQUFDO0lBRUQ7Ozs7T0FJRztJQUNJLDJCQUEyQixDQUFDLFdBQWlCO1FBQ2xELFdBQVcsQ0FBQyxPQUFPLENBQUMsVUFBVSxDQUFDLEVBQUU7WUFDL0IsSUFBSSxDQUFDLHFCQUFxQixDQUFDLGFBQWEsQ0FBQyxVQUFVLENBQUMsQ0FBQztRQUN2RCxDQUFDLENBQUMsQ0FBQztRQUNILE9BQU8sT0FBTyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUMvQixDQUFDO0lBRUQ7Ozs7O09BS0c7SUFDSSxxQkFBcUIsQ0FBQyxXQUFpQjtRQUM1QyxXQUFXLENBQUMsT0FBTyxDQUFDLFVBQVUsQ0FBQyxFQUFFO1lBQy9CLElBQUksQ0FBQyx1QkFBdUIsQ0FBQyxVQUFVLENBQUMsVUFBVSxFQUFFLElBQUksQ0FBQyxxQkFBcUIsQ0FBQyxVQUFVLENBQUMsVUFBVSxDQUFFLENBQUMsQ0FBQztZQUN4RyxJQUFJLENBQUMscUJBQXFCLENBQUMsYUFBYSxDQUFDLFVBQVUsQ0FBQyxDQUFDO1FBQ3ZELENBQUMsQ0FBQyxDQUFDO1FBQ0gsT0FBTyxPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQy9CLENBQUM7SUFFRDs7Ozs7T0FLRztJQUNJLDBCQUEwQixDQUFDLElBQStCLEVBQUUsUUFBZ0I7UUFDakYsK0JBQStCO1FBQy9CLEtBQUssTUFBTSxZQUFZLElBQUksSUFBSSxFQUFFO1lBQy9CLE1BQU0sR0FBRyxHQUFHLFlBQVksQ0FBQyxZQUFZLENBQUMsZUFBZSxDQUFDLFFBQVEsRUFBRSxDQUFDO1lBQ2pFLElBQUksQ0FBQyx1QkFBdUIsQ0FBQyxHQUFHLENBQUMsR0FBRyxFQUFFLFlBQVksQ0FBQyxDQUFDO1NBQ3JEO1FBRUQsMEJBQTBCO1FBQzFCLElBQUksSUFBSSxDQUFDLDhCQUE4QixDQUFDLFFBQVEsQ0FBQyxFQUFFLE1BQU0sRUFBRTtZQUN6RCxJQUFJLENBQUMsOEJBQThCLENBQUMsUUFBUSxDQUFDLEVBQUUsSUFBSSxDQUFDLEdBQUcsSUFBSSxDQUFDLENBQUM7U0FDOUQ7YUFBTTtZQUNMLElBQUksQ0FBQyw4QkFBOEIsQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLEdBQUcsSUFBSSxDQUFDLENBQUM7U0FDM0Q7UUFDRCxPQUFPLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDL0IsQ0FBQztJQUVEOzs7OztPQUtHO0lBQ0ksV0FBVyxDQUFDLElBQVksRUFBRSxLQUFhO1FBQzVDLG1EQUFtRDtRQUNuRCxJQUFJLEtBQUssR0FBRyxDQUFDLEVBQUU7WUFDYixNQUFNLElBQUksS0FBSyxDQUFDLDZCQUE2QixJQUFJLFlBQVksS0FBSyxFQUFFLENBQUMsQ0FBQztTQUN2RTtRQUNELElBQUksSUFBSSxHQUFHLG9CQUFvQixJQUFJLElBQUksR0FBRyxJQUFJLENBQUMsUUFBUSxDQUFDLE1BQU0sRUFBRTtZQUM5RCxPQUFPLE9BQU8sQ0FBQyxPQUFPLENBQUMsRUFBRSxDQUFDLENBQUM7U0FDNUI7UUFDRCxNQUFNLFVBQVUsR0FBRyxJQUFJLEdBQUcsb0JBQW9CLENBQUM7UUFDL0MsTUFBTSxRQUFRLEdBQUcsVUFBVSxHQUFHLEtBQUssQ0FBQztRQUNwQyxPQUFPLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsVUFBVSxFQUFFLFFBQVEsQ0FBQyxDQUFDLENBQUM7SUFDcEUsQ0FBQztJQUVEOzs7O09BSUc7SUFDSSwyQkFBMkIsQ0FBQyxRQUFnQixtQ0FBbUM7UUFDcEYsT0FBTyxPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxxQkFBcUIsQ0FBQyxjQUFjLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQztJQUMzRSxDQUFDO0lBRUQ7Ozs7T0FJRztJQUNJLHlCQUF5QixDQUFDLFVBQWM7UUFDN0MsTUFBTSxPQUFPLEdBQUcsSUFBSSxDQUFDLHVCQUF1QixDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUMsQ0FBQztRQUNwRSxJQUFJLENBQUMsT0FBTyxFQUFFO1lBQ1osTUFBTSxJQUFJLEtBQUssQ0FBQyw2QkFBNkIsVUFBVSxDQUFDLFFBQVEsRUFBRSw0Q0FBNEMsQ0FBQyxDQUFDO1NBQ2pIO1FBQ0QsT0FBTyxPQUFPLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQ2xDLENBQUM7SUFFRDs7Ozs7O09BTUc7SUFDSCxPQUFPLENBQUMsSUFBWSxFQUFFLEtBQWEsRUFBRSxPQUFnQjtRQUNuRCxJQUFJLElBQUksR0FBRyxvQkFBb0IsSUFBSSxLQUFLLEdBQUcsQ0FBQyxFQUFFO1lBQzVDLE1BQU0sSUFBSSxLQUFLLENBQUMsNkJBQTZCLElBQUksWUFBWSxLQUFLLEVBQUUsQ0FBQyxDQUFDO1NBQ3ZFO1FBQ0QsTUFBTSxJQUFJLEdBQUcsT0FBTyxLQUFLLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxlQUFlLENBQUM7UUFDdkYsSUFBSSxJQUFJLEdBQUcsSUFBSSxDQUFDLE1BQU0sRUFBRTtZQUN0QixPQUFPLE9BQU8sQ0FBQyxPQUFPLENBQUMsRUFBRSxDQUFDLENBQUM7U0FDNUI7UUFDRCxNQUFNLFVBQVUsR0FBRyxJQUFJLEdBQUcsb0JBQW9CLENBQUM7UUFDL0MsTUFBTSxRQUFRLEdBQUcsVUFBVSxHQUFHLEtBQUssQ0FBQztRQUNwQyxPQUFPLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxVQUFVLEVBQUUsUUFBUSxDQUFDLENBQUMsQ0FBQztJQUMzRCxDQUFDO0lBRUQ7Ozs7T0FJRztJQUNJLDBCQUEwQixDQUFDLGVBQTZCO1FBQzdELE1BQU0sTUFBTSxHQUFHLElBQUksQ0FBQyx1QkFBdUIsQ0FBQyxHQUFHLENBQUMsZUFBZSxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7UUFDNUUsT0FBTyxPQUFPLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQ2pDLENBQUM7SUFFRDs7OztPQUlHO0lBQ0ksaUNBQWlDLENBQUMsUUFBZ0I7UUFDdkQsSUFBSSxRQUFRLEdBQUcsSUFBSSxDQUFDLFFBQVEsQ0FBQyxNQUFNLEVBQUU7WUFDbkMsT0FBTyxPQUFPLENBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQUFDO1NBQzVCO1FBQ0QsT0FBTyxPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyw4QkFBOEIsQ0FBQyxRQUFRLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQztJQUM5RSxDQUFDO0lBRUQ7Ozs7O09BS0c7SUFDSSxlQUFlLENBQUMsZUFBNkI7UUFDbEQsSUFBSSxlQUFlLENBQUMsTUFBTSxFQUFFLEVBQUU7WUFDNUIsT0FBTyxPQUFPLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDO1NBQ25DO1FBQ0QsS0FBSyxNQUFNLEtBQUssSUFBSSxJQUFJLENBQUMsUUFBUSxFQUFFO1lBQ2pDLEtBQUssTUFBTSxZQUFZLElBQUksS0FBSyxDQUFDLGVBQWUsRUFBRTtnQkFDaEQsSUFBSSxZQUFZLENBQUMsZUFBZSxDQUFDLE1BQU0sQ0FBQyxlQUFlLENBQUMsRUFBRTtvQkFDeEQsT0FBTyxPQUFPLENBQUMsT0FBTyxDQUFDLFlBQVksQ0FBQyxDQUFDO2lCQUN0QzthQUNGO1NBQ0Y7UUFDRCxPQUFPLE9BQU8sQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUM7SUFDcEMsQ0FBQztJQUVEOzs7OztPQUtHO0lBQ0ksc0JBQXNCLENBQUMsVUFBa0I7UUFDOUMsSUFBSSxVQUFVLEdBQUcsSUFBSSxDQUFDLFFBQVEsQ0FBQyxNQUFNLEVBQUU7WUFDckMsT0FBTyxPQUFPLENBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQUFDO1NBQzVCO1FBQ0QsTUFBTSxLQUFLLEdBQUcsSUFBSSxDQUFDLFFBQVEsQ0FBQyxVQUFVLENBQUMsQ0FBQztRQUN4QyxPQUFPLE9BQU8sQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLGVBQWUsQ0FBQyxDQUFDO0lBQ2hELENBQUM7SUFFRDs7O09BR0c7SUFDSSxjQUFjO1FBQ25CLElBQUksSUFBSSxDQUFDLFFBQVEsQ0FBQyxNQUFNLEtBQUssQ0FBQztZQUFFLE9BQU8sT0FBTyxDQUFDLE9BQU8sQ0FBQyxvQkFBb0IsR0FBRyxDQUFDLENBQUMsQ0FBQztRQUNqRixPQUFPLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLE1BQU0sR0FBRyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUN6RSxDQUFDO0lBRUQ7OztPQUdHO0lBQ0ksZUFBZTtRQUNwQixPQUFPLElBQUksQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDO0lBQzlCLENBQUM7Q0FDRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXJjaGl2ZXJfc3RvcmUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYXJjaGl2ZXIvYXJjaGl2ZXJfc3RvcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFNLG1DQUFtQyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFN0UsT0FBTyxFQUdMLG9CQUFvQixFQUtwQixPQUFPLEdBRVIsTUFBTSxjQUFjLENBQUM7QUFFdEIsT0FBTyxFQUFFLGtCQUFrQixFQUFFLHlCQUF5QixFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFxSTVGOztHQUVHO0FBQ0gsTUFBTSxPQUFPLG1CQUFtQjtJQTRDOUI7UUEzQ0E7O1dBRUc7UUFDSyxhQUFRLEdBQWMsRUFBRSxDQUFDO1FBRWpDOztXQUVHO1FBQ0ssVUFBSyxHQUFXLEVBQUUsQ0FBQztRQUUzQjs7O1dBR0c7UUFDSyxrQkFBYSxHQUFvQixFQUFFLENBQUM7UUFFNUM7OztXQUdHO1FBQ0ssb0JBQWUsR0FBb0IsRUFBRSxDQUFDO1FBRTlDOztXQUVHO1FBQ0ssZ0NBQTJCLEdBQTJDLEVBQUUsQ0FBQztRQUVqRjs7V0FFRztRQUNLLHlCQUFvQixHQUFzQyxJQUFJLEdBQUcsRUFBRSxDQUFDO1FBRTVFOzs7V0FHRztRQUNLLDRCQUF1QixHQUF1QixJQUFJLGtCQUFrQixFQUFFLENBQUM7UUFFL0U7O1dBRUc7UUFDSywwQkFBcUIsR0FBOEIsSUFBSSx5QkFBeUIsRUFBRSxDQUFDO0lBRTVFLENBQUM7SUFFaEI7Ozs7T0FJRztJQUNJLFdBQVcsQ0FBQyxNQUFpQjtRQUNsQyxJQUFJLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxHQUFHLE1BQU0sQ0FBQyxDQUFDO1FBQzlCLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLEdBQUcsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUFDLENBQUM7UUFDcEQs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

package/dest/archiver/data_retrieval.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" resolution-mode="require"/>
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
-import { ContractDataAndBytecode, L1ToL2Message, L2Block } from '@aztec/types';
+import { ExtendedContractData, L1ToL2Message, L2Block } from '@aztec/types';
 import { PublicClient } from 'viem';
 /**
  * Data retrieved from logs
@@ -35,11 +35,11 @@ export declare function retrieveBlocks(publicClient: PublicClient, rollupAddress
  * @param currentBlockNumber - Latest available block number in the ETH node.
  * @param searchStartBlock - The block number to use for starting the search.
  * @param blockHashMapping - A mapping from block number to relevant block hash.
- * @returns An array of ContractDataAndBytecode and their equivalent L2 Block number along with the next eth block to search from..
+ * @returns An array of ExtendedContractData and their equivalent L2 Block number along with the next eth block to search from..
  */
 export declare function retrieveNewContractData(publicClient: PublicClient, contractDeploymentEmitterAddress: EthAddress, blockUntilSynced: boolean, currentBlockNumber: bigint, searchStartBlock: bigint, blockHashMapping: {
     [key: number]: Buffer | undefined;
-}): Promise<DataRetrieval<[ContractDataAndBytecode[], number]>>;
+}): Promise<DataRetrieval<[ExtendedContractData[], number]>>;
 /**
  * Fetch new pending L1 to L2 messages.
  * @param publicClient - The viem public client to use for transaction retrieval.

package/dest/archiver/data_retrieval.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data_retrieval.d.ts","sourceRoot":"","sources":["../../src/archiver/data_retrieval.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,uBAAuB,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAE/E,OAAO,EAAE,YAAY,EAAE,MAAM,MAAM,CAAC;AAapC;;GAEG;AACH,KAAK,aAAa,CAAC,CAAC,IAAI;IACtB;;OAEG;IACH,kBAAkB,EAAE,MAAM,CAAC;IAC3B;;OAEG;IACH,aAAa,EAAE,CAAC,EAAE,CAAC;CACpB,CAAC;AAEF;;;;;;;;;GASG;AACH,wBAAsB,cAAc,CAClC,YAAY,EAAE,YAAY,EAC1B,aAAa,EAAE,UAAU,EACzB,gBAAgB,EAAE,OAAO,EACzB,iBAAiB,EAAE,MAAM,EACzB,gBAAgB,EAAE,MAAM,EACxB,sBAAsB,EAAE,MAAM,GAC7B,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAiBjC;AAED;;;;;;;;;GASG;AACH,wBAAsB,uBAAuB,CAC3C,YAAY,EAAE,YAAY,EAC1B,gCAAgC,EAAE,UAAU,EAC5C,gBAAgB,EAAE,OAAO,EACzB,kBAAkB,EAAE,MAAM,EAC1B,gBAAgB,EAAE,MAAM,EACxB,gBAAgB,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAA;CAAE,GACtD,OAAO,CAAC,aAAa,CAAC,CAAC,uBAAuB,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC,CAmB7D;AAED;;;;;;;;GAQG;AACH,wBAAsB,gCAAgC,CACpD,YAAY,EAAE,YAAY,EAC1B,YAAY,EAAE,UAAU,EACxB,gBAAgB,EAAE,OAAO,EACzB,kBAAkB,EAAE,MAAM,EAC1B,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC,CAavC;AAED;;;;;;;;GAQG;AACH,wBAAsB,kCAAkC,CACtD,YAAY,EAAE,YAAY,EAC1B,YAAY,EAAE,UAAU,EACxB,gBAAgB,EAAE,OAAO,EACzB,kBAAkB,EAAE,MAAM,EAC1B,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC,CAkB5B"}
+{"version":3,"file":"data_retrieval.d.ts","sourceRoot":"","sources":["../../src/archiver/data_retrieval.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,oBAAoB,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAE5E,OAAO,EAAE,YAAY,EAAE,MAAM,MAAM,CAAC;AAapC;;GAEG;AACH,KAAK,aAAa,CAAC,CAAC,IAAI;IACtB;;OAEG;IACH,kBAAkB,EAAE,MAAM,CAAC;IAC3B;;OAEG;IACH,aAAa,EAAE,CAAC,EAAE,CAAC;CACpB,CAAC;AAEF;;;;;;;;;GASG;AACH,wBAAsB,cAAc,CAClC,YAAY,EAAE,YAAY,EAC1B,aAAa,EAAE,UAAU,EACzB,gBAAgB,EAAE,OAAO,EACzB,iBAAiB,EAAE,MAAM,EACzB,gBAAgB,EAAE,MAAM,EACxB,sBAAsB,EAAE,MAAM,GAC7B,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAiBjC;AAED;;;;;;;;;GASG;AACH,wBAAsB,uBAAuB,CAC3C,YAAY,EAAE,YAAY,EAC1B,gCAAgC,EAAE,UAAU,EAC5C,gBAAgB,EAAE,OAAO,EACzB,kBAAkB,EAAE,MAAM,EAC1B,gBAAgB,EAAE,MAAM,EACxB,gBAAgB,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAA;CAAE,GACtD,OAAO,CAAC,aAAa,CAAC,CAAC,oBAAoB,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC,CAmB1D;AAED;;;;;;;;GAQG;AACH,wBAAsB,gCAAgC,CACpD,YAAY,EAAE,YAAY,EAC1B,YAAY,EAAE,UAAU,EACxB,gBAAgB,EAAE,OAAO,EACzB,kBAAkB,EAAE,MAAM,EAC1B,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC,CAavC;AAED;;;;;;;;GAQG;AACH,wBAAsB,kCAAkC,CACtD,YAAY,EAAE,YAAY,EAC1B,YAAY,EAAE,UAAU,EACxB,gBAAgB,EAAE,OAAO,EACzB,kBAAkB,EAAE,MAAM,EAC1B,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC,CAkB5B"}

package/dest/archiver/data_retrieval.js

@@ -34,7 +34,7 @@ export async function retrieveBlocks(publicClient, rollupAddress, blockUntilSync
  * @param currentBlockNumber - Latest available block number in the ETH node.
  * @param searchStartBlock - The block number to use for starting the search.
  * @param blockHashMapping - A mapping from block number to relevant block hash.
- * @returns An array of ContractDataAndBytecode and their equivalent L2 Block number along with the next eth block to search from..
+ * @returns An array of ExtendedContractData and their equivalent L2 Block number along with the next eth block to search from..
  */
 export async function retrieveNewContractData(publicClient, contractDeploymentEmitterAddress, blockUntilSynced, currentBlockNumber, searchStartBlock, blockHashMapping) {
     let retrievedNewContracts = [];
@@ -99,4 +99,4 @@ export async function retrieveNewCancelledL1ToL2Messages(publicClient, inboxAddr
     } while (blockUntilSynced && searchStartBlock <= currentBlockNumber);
     return { nextEthBlockNumber: searchStartBlock, retrievedData: retrievedNewCancelledL1ToL2Messages };
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGF0YV9yZXRyaWV2YWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYXJjaGl2ZXIvZGF0YV9yZXRyaWV2YWwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBTUEsT0FBTyxFQUNMLHlCQUF5QixFQUN6Qiw2QkFBNkIsRUFDN0IsdUJBQXVCLEVBQ3ZCLDJCQUEyQixFQUMzQixnQkFBZ0IsRUFDaEIsa0NBQWtDLEVBQ2xDLDZCQUE2QixFQUM3QixvQ0FBb0MsR0FDckMsTUFBTSx1QkFBdUIsQ0FBQztBQWdCL0I7Ozs7Ozs7OztHQVNHO0FBQ0gsTUFBTSxDQUFDLEtBQUssVUFBVSxjQUFjLENBQ2xDLFlBQTBCLEVBQzFCLGFBQXlCLEVBQ3pCLGdCQUF5QixFQUN6QixpQkFBeUIsRUFDekIsZ0JBQXdCLEVBQ3hCLHNCQUE4QjtJQUU5QixNQUFNLGVBQWUsR0FBYyxFQUFFLENBQUM7SUFDdEMsR0FBRztRQUNELElBQUksZ0JBQWdCLEdBQUcsaUJBQWlCLEVBQUU7WUFDeEMsTUFBTTtTQUNQO1FBQ0QsTUFBTSxvQkFBb0IsR0FBRyxNQUFNLHVCQUF1QixDQUFDLFlBQVksRUFBRSxhQUFhLEVBQUUsZ0JBQWdCLENBQUMsQ0FBQztRQUMxRyxJQUFJLG9CQUFvQixDQUFDLE1BQU0sS0FBSyxDQUFDLEVBQUU7WUFDckMsTUFBTTtTQUNQO1FBRUQsTUFBTSxTQUFTLEdBQUcsTUFBTSxnQkFBZ0IsQ0FBQyxZQUFZLEVBQUUsc0JBQXNCLEVBQUUsb0JBQW9CLENBQUMsQ0FBQztRQUNyRyxlQUFlLENBQUMsSUFBSSxDQUFDLEdBQUcsU0FBUyxDQUFDLENBQUM7UUFDbkMsZ0JBQWdCLEdBQUcsb0JBQW9CLENBQUMsb0JBQW9CLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQyxDQUFDLFdBQVksR0FBRyxFQUFFLENBQUM7UUFDM0Ysc0JBQXNCLElBQUksTUFBTSxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUMsQ0FBQztLQUNwRCxRQUFRLGdCQUFnQixJ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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGF0YV9yZXRyaWV2YWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYXJjaGl2ZXIvZGF0YV9yZXRyaWV2YWwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBTUEsT0FBTyxFQUNMLHlCQUF5QixFQUN6Qiw2QkFBNkIsRUFDN0IsdUJBQXVCLEVBQ3ZCLDJCQUEyQixFQUMzQixnQkFBZ0IsRUFDaEIsa0NBQWtDLEVBQ2xDLDZCQUE2QixFQUM3QixvQ0FBb0MsR0FDckMsTUFBTSx1QkFBdUIsQ0FBQztBQWdCL0I7Ozs7Ozs7OztHQVNHO0FBQ0gsTUFBTSxDQUFDLEtBQUssVUFBVSxjQUFjLENBQ2xDLFlBQTBCLEVBQzFCLGFBQXlCLEVBQ3pCLGdCQUF5QixFQUN6QixpQkFBeUIsRUFDekIsZ0JBQXdCLEVBQ3hCLHNCQUE4QjtJQUU5QixNQUFNLGVBQWUsR0FBYyxFQUFFLENBQUM7SUFDdEMsR0FBRztRQUNELElBQUksZ0JBQWdCLEdBQUcsaUJBQWlCLEVBQUU7WUFDeEMsTUFBTTtTQUNQO1FBQ0QsTUFBTSxvQkFBb0IsR0FBRyxNQUFNLHVCQUF1QixDQUFDLFlBQVksRUFBRSxhQUFhLEVBQUUsZ0JBQWdCLENBQUMsQ0FBQztRQUMxRyxJQUFJLG9CQUFvQixDQUFDLE1BQU0sS0FBSyxDQUFDLEVBQUU7WUFDckMsTUFBTTtTQUNQO1FBRUQsTUFBTSxTQUFTLEdBQUcsTUFBTSxnQkFBZ0IsQ0FBQyxZQUFZLEVBQUUsc0JBQXNCLEVBQUUsb0JBQW9CLENBQUMsQ0FBQztRQUNyRyxlQUFlLENBQUMsSUFBSSxDQUFDLEdBQUcsU0FBUyxDQUFDLENBQUM7UUFDbkMsZ0JBQWdCLEdBQUcsb0JBQW9CLENBQUMsb0JBQW9CLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQyxDQUFDLFdBQVksR0FBRyxFQUFFLENBQUM7UUFDM0Ysc0JBQXNCLElBQUksTUFBTSxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUMsQ0FBQztLQUNwRCxRQUFRLGdCQUFnQixJ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