@aztec/archiver 0.1.0-alpha23 → 0.1.0-alpha40

package/dest/archiver/archiver.d.ts

@@ -1,13 +1,12 @@
 /// <reference types="node" resolution-mode="require"/>
-import { DebugLogger } from '@aztec/foundation/log';
-import { EthAddress } from '@aztec/foundation/eth-address';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
-import { L1ToL2Message, L1ToL2MessageSource, L2BlockL2Logs, LogType } from '@aztec/types';
-import { ContractData, ContractPublicData, ContractDataSource, EncodedContractFunction, L2Block, L2BlockSource, L2LogsSource } from '@aztec/types';
-import { Chain, HttpTransport, PublicClient } from 'viem';
+import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
-import { ArchiverConfig } from './config.js';
+import { DebugLogger } from '@aztec/foundation/log';
+import { ContractData, ContractDataAndBytecode, ContractDataSource, EncodedContractFunction, L1ToL2Message, L1ToL2MessageSource, L2Block, L2BlockL2Logs, L2BlockSource, L2LogsSource, LogType } from '@aztec/types';
+import { Chain, HttpTransport, PublicClient } from 'viem';
 import { ArchiverDataStore } from './archiver_store.js';
+import { ArchiverConfig } from './config.js';
 /**
  * Pulls L2 blocks in a non-blocking manner and provides interface for their retrieval.
  * Responsible for handling robust L1 polling so that other components do not need to
@@ -71,40 +70,47 @@ export declare class Archiver implements L2BlockSource, L2LogsSource, ContractDa
      * @returns A promise signalling completion of the stop process.
      */
     stop(): Promise<void>;
+    getRollupAddress(): Promise<EthAddress>;
     /**
-     * Gets the `take` amount of L2 blocks starting from `from`.
+     * Gets up to `limit` amount of L2 blocks starting from `from`.
      * @param from - Number of the first block to return (inclusive).
-     * @param take - The number of blocks to return.
+     * @param limit - The number of blocks to return.
      * @returns The requested L2 blocks.
      */
-    getL2Blocks(from: number, take: number): Promise<L2Block[]>;
+    getL2Blocks(from: number, limit: number): Promise<L2Block[]>;
+    /**
+     * Gets an l2 block.
+     * @param number - The block number to return (inclusive).
+     * @returns The requested L2 block.
+     */
+    getL2Block(number: number): Promise<L2Block | undefined>;
     /**
      * Lookup the L2 contract data for this contract.
      * Contains the contract's public function bytecode.
      * @param contractAddress - The contract data address.
      * @returns The contract data.
      */
-    getL2ContractPublicData(contractAddress: AztecAddress): Promise<ContractPublicData | undefined>;
+    getContractDataAndBytecode(contractAddress: AztecAddress): Promise<ContractDataAndBytecode | 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).
      */
-    getL2ContractPublicDataInBlock(blockNum: number): Promise<ContractPublicData[]>;
+    getContractDataAndBytecodeInBlock(blockNum: number): Promise<ContractDataAndBytecode[]>;
     /**
-     * Lookup the L2 contract info for this contract.
+     * 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).
      */
-    getL2ContractInfo(contractAddress: AztecAddress): Promise<ContractData | undefined>;
+    getContractData(contractAddress: AztecAddress): Promise<ContractData | undefined>;
     /**
-     * Lookup the L2 contract info inside a block.
+     * 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).
      */
-    getL2ContractInfoInBlock(l2BlockNum: number): Promise<ContractData[] | undefined>;
+    getContractDataInBlock(l2BlockNum: number): Promise<ContractData[] | undefined>;
     /**
      * Gets the public function data for a contract.
      * @param contractAddress - The contract address containing the function to fetch.
@@ -113,24 +119,24 @@ export declare class Archiver implements L2BlockSource, L2LogsSource, ContractDa
      */
     getPublicFunction(contractAddress: AztecAddress, functionSelector: Buffer): Promise<EncodedContractFunction | undefined>;
     /**
-     * Gets the `take` amount of logs starting from `from`.
+     * 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.
-     * @param take - The number of logs to return.
+     * @param limit - The number of logs to return.
      * @param logType - Specifies whether to return encrypted or unencrypted logs.
      * @returns The requested logs.
      */
-    getLogs(from: number, take: number, logType: LogType): Promise<L2BlockL2Logs[]>;
+    getLogs(from: number, limit: number, logType: LogType): Promise<L2BlockL2Logs[]>;
     /**
      * Gets the number of the latest L2 block processed by the block source implementation.
      * @returns The number of the latest L2 block processed by the block source implementation.
      */
     getBlockHeight(): Promise<number>;
     /**
-     * Gets the `take` amount of pending L1 to L2 messages.
-     * @param take - The number of messages to return.
+     * Gets up to `limit` amount of pending L1 to L2 messages.
+     * @param limit - The number of messages to return.
      * @returns The requested L1 to L2 messages' keys.
      */
-    getPendingL1ToL2Messages(take: number): Promise<Fr[]>;
+    getPendingL1ToL2Messages(limit: number): Promise<Fr[]>;
     /**
      * Gets the confirmed/consumed L1 to L2 message associated with the given message key
      * @param messageKey - The message key.

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

@@ -1 +1 @@
-{"version":3,"file":"archiver.d.ts","sourceRoot":"","sources":["../../src/archiver/archiver.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,WAAW,EAAqB,MAAM,uBAAuB,CAAC;AAEvE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAwB,aAAa,EAAE,mBAAmB,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAChH,OAAO,EACL,YAAY,EACZ,kBAAkB,EAClB,kBAAkB,EAClB,uBAAuB,EACvB,OAAO,EACP,aAAa,EACb,YAAY,EACb,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,YAAY,EAA4B,MAAM,MAAM,CAAC;AAEpF,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAO7C,OAAO,EAAE,iBAAiB,EAAuB,MAAM,qBAAqB,CAAC;AAE7E;;;;GAIG;AACH,qBAAa,QAAS,YAAW,aAAa,EAAE,YAAY,EAAE,kBAAkB,EAAE,mBAAmB;IAiCjG,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,gCAAgC;IAEjD,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,GAAG;IAvCtB;;OAEG;IACH,OAAO,CAAC,cAAc,CAAC,CAAiB;IAExC;;OAEG;IACH,OAAO,CAAC,oBAAoB,CAAM;IAElC;;OAEG;IACH,OAAO,CAAC,wBAAwB,CAAM;IAEtC;;OAEG;IACH,OAAO,CAAC,qBAAqB,CAAM;IAEnC;;;;;;;;;;OAUG;gBAEgB,YAAY,EAAE,YAAY,CAAC,aAAa,EAAE,KAAK,CAAC,EAChD,aAAa,EAAE,UAAU,EACzB,YAAY,EAAE,UAAU,EACxB,gCAAgC,EAAE,UAAU,EAC7D,gBAAgB,EAAE,MAAM,EACP,KAAK,EAAE,iBAAiB,EACxB,iBAAiB,SAAS,EAC1B,GAAG,GAAE,WAAiD;IAMzE;;;;;OAKG;WACiB,aAAa,CAAC,MAAM,EAAE,cAAc,EAAE,gBAAgB,UAAO,GAAG,OAAO,CAAC,QAAQ,CAAC;IAoBrG;;;OAGG;IACU,KAAK,CAAC,gBAAgB,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAc5D;;;OAGG;YACW,IAAI;IAkHlB;;;OAGG;IACU,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAQlC;;;;;OAKG;IACI,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAIlE;;;;;OAKG;IACI,uBAAuB,CAAC,eAAe,EAAE,YAAY,GAAG,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC;IAItG;;;;OAIG;IACI,8BAA8B,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;IAItF;;;;;OAKG;IACI,iBAAiB,CAAC,eAAe,EAAE,YAAY,GAAG,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;IAI1F;;;;;OAKG;IACI,wBAAwB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,EAAE,GAAG,SAAS,CAAC;IAIxF;;;;;OAKG;IACU,iBAAiB,CAC5B,eAAe,EAAE,YAAY,EAC7B,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC,uBAAuB,GAAG,SAAS,CAAC;IAM/C;;;;;;OAMG;IACI,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAItF;;;OAGG;IACI,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC;IAIxC;;;;OAIG;IACH,wBAAwB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC;IAIrD;;;;OAIG;IACH,yBAAyB,CAAC,UAAU,EAAE,EAAE,GAAG,OAAO,CAAC,aAAa,CAAC;CAGlE"}
+{"version":3,"file":"archiver.d.ts","sourceRoot":"","sources":["../../src/archiver/archiver.ts"],"names":[],"mappings":"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"}

package/dest/archiver/archiver.js

@@ -1,12 +1,11 @@
-import omit from 'lodash.omit';
+import { createEthereumChain } from '@aztec/ethereum';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
-import { INITIAL_L2_BLOCK_NUM, LogType } from '@aztec/types';
-import { L2Block, } from '@aztec/types';
+import { INITIAL_L2_BLOCK_NUM, L2Block, LogType, } from '@aztec/types';
+import omit from 'lodash.omit';
 import { createPublicClient, http } from 'viem';
-import { createEthereumChain } from '@aztec/ethereum';
-import { retrieveBlocks, retrieveNewContractData, retrieveNewPendingL1ToL2Messages, retrieveNewCancelledL1ToL2Messages, } from './data_retrieval.js';
 import { MemoryArchiverStore } from './archiver_store.js';
+import { retrieveBlocks, retrieveNewCancelledL1ToL2Messages, retrieveNewContractData, retrieveNewPendingL1ToL2Messages, } from './data_retrieval.js';
 /**
  * Pulls L2 blocks in a non-blocking manner and provides interface for their retrieval.
  * Responsible for handling robust L1 polling so that other components do not need to
@@ -58,9 +57,10 @@ export class Archiver {
         const publicClient = createPublicClient({
             chain: chain.chainInfo,
             transport: http(chain.rpcUrl),
+            pollingInterval: config.viemPollingIntervalMS,
         });
         const archiverStore = new MemoryArchiverStore();
-        const archiver = new Archiver(publicClient, config.rollupContract, config.inboxContract, config.contractDeploymentEmitterContract, config.searchStartBlock, archiverStore, config.archiverPollingInterval);
+        const archiver = new Archiver(publicClient, config.rollupContract, config.inboxContract, config.contractDeploymentEmitterContract, config.searchStartBlock, archiverStore, config.archiverPollingIntervalMS);
         await archiver.start(blockUntilSynced);
         return archiver;
     }
@@ -93,7 +93,7 @@ export class Archiver {
             }
             return;
         }
-        // ********** Events that are processed inbetween blocks **********
+        // ********** Events that are processed in between blocks **********
         // Process l1ToL2Messages, these are consumed as time passes, not each block
         const retrievedPendingL1ToL2Messages = await retrieveNewPendingL1ToL2Messages(this.publicClient, this.inboxAddress, blockUntilSynced, currentBlockNumber, this.lastProcessedBlockNumber + 1n);
         const retrievedCancelledL1ToL2Messages = await retrieveNewCancelledL1ToL2Messages(this.publicClient, this.inboxAddress, blockUntilSynced, currentBlockNumber, this.lastProcessedBlockNumber + 1n);
@@ -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 public data for l2 block number: ${index}`);
+            this.log(`Retrieved contract data and bytecode for l2 block number: ${index}`);
             if (l2BlockNum <= lastKnownL2BlockNum) {
-                await this.store.addL2ContractPublicData(contracts, l2BlockNum);
+                await this.store.addContractDataAndBytecode(contracts, l2BlockNum);
             }
         });
         // from retrieved L2Blocks, confirm L1 to L2 messages that have been published
@@ -160,14 +160,30 @@ export class Archiver {
         this.log('Stopped.');
         return Promise.resolve();
     }
+    getRollupAddress() {
+        return Promise.resolve(this.rollupAddress);
+    }
     /**
-     * Gets the `take` amount of L2 blocks starting from `from`.
+     * Gets up to `limit` amount of L2 blocks starting from `from`.
      * @param from - Number of the first block to return (inclusive).
-     * @param take - The number of blocks to return.
+     * @param limit - The number of blocks to return.
      * @returns The requested L2 blocks.
      */
-    getL2Blocks(from, take) {
-        return this.store.getL2Blocks(from, take);
+    getL2Blocks(from, limit) {
+        return this.store.getL2Blocks(from, limit);
+    }
+    /**
+     * Gets an l2 block.
+     * @param number - The block number to return (inclusive).
+     * @returns The requested L2 block.
+     */
+    async getL2Block(number) {
+        // If the number provided is -ve, then return the latest block.
+        if (number < 0) {
+            number = this.store.getBlocksLength();
+        }
+        const blocks = await this.store.getL2Blocks(number, 1);
+        return blocks.length === 0 ? undefined : blocks[0];
     }
     /**
      * Lookup the L2 contract data for this contract.
@@ -175,34 +191,34 @@ export class Archiver {
      * @param contractAddress - The contract data address.
      * @returns The contract data.
      */
-    getL2ContractPublicData(contractAddress) {
-        return this.store.getL2ContractPublicData(contractAddress);
+    getContractDataAndBytecode(contractAddress) {
+        return this.store.getContractDataAndBytecode(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).
      */
-    getL2ContractPublicDataInBlock(blockNum) {
-        return this.store.getL2ContractPublicDataInBlock(blockNum);
+    getContractDataAndBytecodeInBlock(blockNum) {
+        return this.store.getContractDataAndBytecodeInBlock(blockNum);
     }
     /**
-     * Lookup the L2 contract info for this contract.
+     * 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).
      */
-    getL2ContractInfo(contractAddress) {
-        return this.store.getL2ContractInfo(contractAddress);
+    getContractData(contractAddress) {
+        return this.store.getContractData(contractAddress);
     }
     /**
-     * Lookup the L2 contract info inside a block.
+     * 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).
      */
-    getL2ContractInfoInBlock(l2BlockNum) {
-        return this.store.getL2ContractInfoInBlock(l2BlockNum);
+    getContractDataInBlock(l2BlockNum) {
+        return this.store.getContractDataInBlock(l2BlockNum);
     }
     /**
      * Gets the public function data for a contract.
@@ -211,19 +227,18 @@ export class Archiver {
      * @returns The public function data (if found).
      */
     async getPublicFunction(contractAddress, functionSelector) {
-        const contractData = await this.getL2ContractPublicData(contractAddress);
-        const result = contractData?.publicFunctions?.find(fn => fn.functionSelector.equals(functionSelector));
-        return result;
+        const contractData = await this.getContractDataAndBytecode(contractAddress);
+        return contractData?.getPublicFunction(functionSelector);
     }
     /**
-     * Gets the `take` amount of logs starting from `from`.
+     * 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.
-     * @param take - The number of logs to return.
+     * @param limit - The number of logs to return.
      * @param logType - Specifies whether to return encrypted or unencrypted logs.
      * @returns The requested logs.
      */
-    getLogs(from, take, logType) {
-        return this.store.getLogs(from, take, logType);
+    getLogs(from, limit, logType) {
+        return this.store.getLogs(from, limit, logType);
     }
     /**
      * Gets the number of the latest L2 block processed by the block source implementation.
@@ -233,12 +248,12 @@ export class Archiver {
         return this.store.getBlockHeight();
     }
     /**
-     * Gets the `take` amount of pending L1 to L2 messages.
-     * @param take - The number of messages to return.
+     * Gets up to `limit` amount of pending L1 to L2 messages.
+     * @param limit - The number of messages to return.
      * @returns The requested L1 to L2 messages' keys.
      */
-    getPendingL1ToL2Messages(take) {
-        return this.store.getPendingL1ToL2MessageKeys(take);
+    getPendingL1ToL2Messages(limit) {
+        return this.store.getPendingL1ToL2MessageKeys(limit);
     }
     /**
      * Gets the confirmed/consumed L1 to L2 message associated with the given message key
@@ -249,4 +264,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

@@ -1,14 +1,13 @@
+import { AztecAddress } from '@aztec/foundation/aztec-address';
+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, ContractPublicData, EncodedContractFunction, L2Block, L2BlockL2Logs, LogType, } from '@aztec/types';
+import { ContractData, ContractDataAndBytecode, EncodedContractFunction, L2Block, L2BlockL2Logs, LogType, } from '@aztec/types';
 import { mock } from 'jest-mock-extended';
 import { encodeFunctionData, toHex } from 'viem';
 import { Archiver } from './archiver.js';
-import { EthAddress } from '@aztec/foundation/eth-address';
-import { sleep } from '@aztec/foundation/sleep';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
-import { randomBytes } from '@aztec/foundation/crypto';
 import { MemoryArchiverStore } from './archiver_store.js';
-import { Fr } from '@aztec/foundation/fields';
 describe('Archiver', () => {
     const rollupAddress = '0x0000000000000000000000000000000000000000';
     const inboxAddress = '0x0000000000000000000000000000000000000000';
@@ -115,7 +114,7 @@ function makeContractDeploymentEvent(l1BlockNum, l2Block) {
     // const contractData = ContractData.random();
     const aztecAddress = AztecAddress.random();
     const portalAddress = EthAddress.random();
-    const contractData = new ContractPublicData(new ContractData(aztecAddress, portalAddress), [
+    const contractData = new ContractDataAndBytecode(new ContractData(aztecAddress, portalAddress), [
         EncodedContractFunction.random(),
         EncodedContractFunction.random(),
     ]);
@@ -147,8 +146,8 @@ function makeL1ToL2MessageAddedEvents(l1BlockNum, entryKeys) {
                 senderChainId: 1n,
                 recipient: AztecAddress.random().toString(),
                 recipientVersion: 1n,
-                content: '0x' + randomBytes(32).toString('hex'),
-                secretHash: '0x' + randomBytes(32).toString('hex'),
+                content: Fr.random().toString(true),
+                secretHash: Fr.random().toString(true),
                 deadline: 100,
                 fee: 1n,
                 entryKey: entryKey,
@@ -185,4 +184,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":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAChD,OAAO,EAA0C,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACxF,OAAO,EACL,YAAY,EACZ,uBAAuB,EACvB,uBAAuB,EACvB,OAAO,EACP,aAAa,EACb,OAAO,GACR,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAa,IAAI,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAwD,kBAAkB,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAEvG,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAqB,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAE7E,QAAQ,CAAC,UAAU,EAAE,GAAG,EAAE;IACxB,MAAM,aAAa,GAAG,4CAA4C,CAAC;IACnE,MAAM,YAAY,GAAG,4CAA4C,CAAC;IAClE,MAAM,gCAAgC,GAAG,4CAA4C,CAAC;IACtF,MAAM,SAAS,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAC5B,IAAI,YAA2D,CAAC;IAChE,IAAI,aAAgC,CAAC;IAErC,UAAU,CAAC,GAAG,EAAE;QACd,YAAY,GAAG,IAAI,EAAsC,CAAC;QAC1D,aAAa,GAAG,IAAI,mBAAmB,EAAE,CAAC;IAC5C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gEAAgE,EAAE,KAAK,IAAI,EAAE;QAC9E,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAC3B,YAAY,EACZ,UAAU,CAAC,UAAU,CAAC,aAAa,CAAC,EACpC,UAAU,CAAC,UAAU,CAAC,YAAY,CAAC,EACnC,UAAU,CAAC,UAAU,CAAC,gCAAgC,CAAC,EACvD,CAAC,EACD,aAAa,EACb,IAAI,CACL,CAAC;QAEF,IAAI,cAAc,GAAG,MAAM,QAAQ,CAAC,cAAc,EAAE,CAAC;QACrD,MAAM,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QAElC,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAChF,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QAC3C,oEAAoE;QACpE,iEAAiE;QACjE,qDAAqD;QACrD,4EAA4E;QAE5E,MAAM,gBAAgB,GAAG,EAAE,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACpD,MAAM,gBAAgB,GAAG,EAAE,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACpD,MAAM,sBAAsB,GAAG,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,CAAC;QACpE,MAAM,qBAAqB,GAAG,EAAE,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACzD,MAAM,qBAAqB,GAAG,EAAE,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAEzD,MAAM,wBAAwB,GAAG;YAC/B,4BAA4B,CAC1B,IAAI,EACJ,MAAM,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAC3D;YACD,4BAA4B,CAC1B,IAAI,EACJ,MAAM,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAC3D;YACD,4BAA4B,CAC1B,KAAK,EACL,MAAM,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAC3D;YACD,4BAA4B,CAAC,IAAI,EAAE;gBACjC,gBAAgB;gBAChB,gBAAgB;gBAChB,qBAAqB;gBACrB,qBAAqB;aACtB,CAAC;SACH,CAAC;QACF,YAAY,CAAC,cAAc,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC;QACnH,yDAAyD;QACzD,YAAY,CAAC,OAAO;aACjB,qBAAqB,CAAC,wBAAwB,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;aAClE,qBAAqB,CAAC,EAAE,CAAC,CAAC,wBAAwB;aAClD,qBAAqB,CAAC,CAAC,yBAAyB,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;aAC5D,qBAAqB,CAAC,CAAC,2BAA2B,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;aACrE,qBAAqB,CAAC,wBAAwB,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;aAClE,qBAAqB,CAAC,gCAAgC,CAAC,KAAK,EAAE,sBAAsB,CAAC,CAAC;aACtF,qBAAqB,CAAC,CAAC,yBAAyB,CAAC,KAAK,EAAE,EAAE,CAAC,EAAE,yBAAyB,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC;aACnG,qBAAqB,CAAC,CAAC,2BAA2B,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;aACtE,iBAAiB,CAAC,EAAE,CAAC,CAAC;QACzB,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,YAAY,CAAC,cAAc,CAAC,qBAAqB,CAAC,EAAE,CAAC,CAAC,CAAC;QAE/E,MAAM,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAE5B,yFAAyF;QACzF,OAAO,CAAC,MAAM,QAAQ,CAAC,cAAc,EAAE,CAAC,KAAK,CAAC,EAAE;YAC9C,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC;SAClB;QAED,cAAc,GAAG,MAAM,QAAQ,CAAC,cAAc,EAAE,CAAC;QACjD,MAAM,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QAElC,8GAA8G;QAC9G,0GAA0G;QAC1G,MAAM,0BAA0B,GAAG;YACjC,wBAAwB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ;YAC5C,wBAAwB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ;SAC7C,CAAC;QACF,MAAM,wBAAwB,GAAG,CAAC,MAAM,QAAQ,CAAC,wBAAwB,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;QAC9G,MAAM,CAAC,0BAA0B,CAAC,CAAC,OAAO,CAAC,wBAAwB,CAAC,CAAC;QAErE,kEAAkE;QAClE,MAAM,aAAa,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;QACxE,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAEvD,KAAK,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,SAAS,CAAC,OAAO,EAAE,EAAE;YAC5C,MAAM,6BAA6B,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YACtD,MAAM,qBAAqB,GAAG,aAAa,CAAC,UAAU,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;YACtF,MAAM,CAAC,qBAAqB,CAAC,CAAC,OAAO,CAAC,6BAA6B,CAAC,CAAC;SACtE;QAED,MAAM,eAAe,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;QAC5E,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAEzD,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;YAC7B,MAAM,+BAA+B,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YAC9D,MAAM,uBAAuB,GAAG,aAAa,CAAC,UAAU,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;YAC1F,MAAM,CAAC,uBAAuB,CAAC,CAAC,OAAO,CAAC,+BAA+B,CAAC,CAAC;QAC3E,CAAC,CAAC,CAAC;QAEH,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;IACxB,CAAC,EAAE,KAAM,CAAC,CAAC;AACb,CAAC,CAAC,CAAC;AAEH;;;;;GAKG;AACH,SAAS,yBAAyB,CAAC,UAAkB,EAAE,UAAkB;IACvE,OAAO;QACL,WAAW,EAAE,UAAU;QACvB,IAAI,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE;QAC9B,eAAe,EAAE,KAAK,UAAU,EAAE;KAC2C,CAAC;AAClF,CAAC;AAED;;;;;GAKG;AACH,SAAS,2BAA2B,CAAC,UAAkB,EAAE,OAAgB;IACvE,8CAA8C;IAC9C,MAAM,YAAY,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC;IAC3C,MAAM,aAAa,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC;IAC1C,MAAM,YAAY,GAAG,IAAI,uBAAuB,CAAC,IAAI,YAAY,CAAC,YAAY,EAAE,aAAa,CAAC,EAAE;QAC9F,uBAAuB,CAAC,MAAM,EAAE;QAChC,uBAAuB,CAAC,MAAM,EAAE;KACjC,CAAC,CAAC;IACH,MAAM,IAAI,GAAG,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;IACpD,OAAO;QACL,WAAW,EAAE,UAAU;QACvB,IAAI,EAAE;YACJ,UAAU,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;YAClC,YAAY,EAAE,YAAY,CAAC,QAAQ,EAAE;YACrC,aAAa,EAAE,aAAa,CAAC,QAAQ,EAAE;YACvC,WAAW,EAAE,KAAK,OAAO,CAAC,eAAe,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;YAC7D,IAAI,EAAE,IAAI,GAAG,IAAI;SAClB;QACD,eAAe,EAAE,KAAK,OAAO,CAAC,MAAM,EAAE;KAC4D,CAAC;AACvG,CAAC;AAED;;;;;GAKG;AACH,SAAS,4BAA4B,CAAC,UAAkB,EAAE,SAAmB;IAC3E,OAAO,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;QAC9B,OAAO;YACL,WAAW,EAAE,UAAU;YACvB,IAAI,EAAE;gBACJ,MAAM,EAAE,UAAU,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;gBACtC,aAAa,EAAE,EAAE;gBACjB,SAAS,EAAE,YAAY,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;gBAC3C,gBAAgB,EAAE,EAAE;gBACpB,OAAO,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC;gBACnC,UAAU,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC;gBACtC,QAAQ,EAAE,GAAG;gBACb,GAAG,EAAE,EAAE;gBACP,QAAQ,EAAE,QAAQ;aACnB;YACD,eAAe,EAAE,KAAK,UAAU,EAAE;SACsC,CAAC;IAC7E,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;;;GAKG;AACH,SAAS,gCAAgC,CAAC,UAAkB,EAAE,SAAmB;IAC/E,OAAO,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;QAC9B,OAAO;YACL,WAAW,EAAE,UAAU;YACvB,IAAI,EAAE;gBACJ,QAAQ;aACT;YACD,eAAe,EAAE,KAAK,UAAU,EAAE;SACgD,CAAC;IACvF,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;;GAIG;AACH,SAAS,YAAY,CAAC,OAAgB;IACpC,MAAM,KAAK,GAAG,IAAI,CAAC;IACnB,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IACtC,MAAM,KAAK,GAAG,kBAAkB,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;IACpG,OAAO,EAAE,KAAK,EAAiC,CAAC;AAClD,CAAC"}

package/dest/archiver/archiver_store.d.ts

@@ -1,9 +1,9 @@
-import { ContractPublicData, L2Block, ContractData, L1ToL2Message, L2BlockL2Logs, LogType } from '@aztec/types';
 import { Fr } from '@aztec/circuits.js';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
+import { ContractData, ContractDataAndBytecode, L1ToL2Message, L2Block, L2BlockL2Logs, LogType } 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 public data).
+ * (blocks, encrypted logs, aztec contract data and bytecode).
  */
 export interface ArchiverDataStore {
     /**
@@ -13,12 +13,12 @@ export interface ArchiverDataStore {
      */
     addL2Blocks(blocks: L2Block[]): Promise<boolean>;
     /**
-     * Gets the `take` amount of L2 blocks starting from `from`.
+     * Gets up to `limit` amount of L2 blocks starting from `from`.
      * @param from - Number of the first block to return (inclusive).
-     * @param take - The number of blocks to return.
+     * @param limit - The number of blocks to return.
      * @returns The requested L2 blocks.
      */
-    getL2Blocks(from: number, take: number): Promise<L2Block[]>;
+    getL2Blocks(from: number, limit: number): Promise<L2Block[]>;
     /**
      * Append new logs to the store's list.
      * @param data - The logs to be added to the store.
@@ -46,11 +46,11 @@ export interface ArchiverDataStore {
      */
     confirmL1ToL2Messages(messageKeys: Fr[]): Promise<boolean>;
     /**
-     * Gets the `take` amount of pending L1 to L2 messages, sorted by fee
-     * @param take - The number of messages to return (by default NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP).
+     * 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 message keys.
      */
-    getPendingL1ToL2MessageKeys(take: number): Promise<Fr[]>;
+    getPendingL1ToL2MessageKeys(limit: number): Promise<Fr[]>;
     /**
      * Gets the confirmed L1 to L2 message corresponding to the given message key.
      * @param messageKey - The message key to look up.
@@ -58,46 +58,46 @@ export interface ArchiverDataStore {
      */
     getConfirmedL1ToL2Message(messageKey: Fr): Promise<L1ToL2Message>;
     /**
-     * Gets the `take` amount of logs starting from `from`.
+     * 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.
-     * @param take - The number of logs to return.
+     * @param limit - The number of logs to return.
      * @param logType - Specifies whether to return encrypted or unencrypted logs.
      * @returns The requested logs.
      */
-    getLogs(from: number, take: number, logType: LogType): Promise<L2BlockL2Logs[]>;
+    getLogs(from: number, limit: number, logType: LogType): Promise<L2BlockL2Logs[]>;
     /**
-     * Store new Contract Public Data from an L2 block to the store's list.
+     * Store new Contract data and bytecode 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.
      */
-    addL2ContractPublicData(data: ContractPublicData[], blockNum: number): Promise<boolean>;
+    addContractDataAndBytecode(data: ContractDataAndBytecode[], blockNum: number): Promise<boolean>;
     /**
      * Lookup the L2 contract data for a contract address.
      * @param contractAddress - The contract data address.
      * @returns The contract's public data.
      */
-    getL2ContractPublicData(contractAddress: AztecAddress): Promise<ContractPublicData | undefined>;
+    getContractDataAndBytecode(contractAddress: AztecAddress): Promise<ContractDataAndBytecode | undefined>;
     /**
-     * Lookup all contract data in an L2 block.
+     * Lookup all contract data and bytecode in an L2 block.
      * @param blockNum - The block number to get all contract data from.
-     * @returns All contract public data in the block (if found).
+     * @returns All contract data and bytecode in the block (if found).
      */
-    getL2ContractPublicDataInBlock(blockNum: number): Promise<ContractPublicData[]>;
+    getContractDataAndBytecodeInBlock(blockNum: number): Promise<ContractDataAndBytecode[]>;
     /**
      * 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).
      */
-    getL2ContractInfo(contractAddress: AztecAddress): Promise<ContractData | undefined>;
+    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).
      */
-    getL2ContractInfoInBlock(l2BlockNum: number): Promise<ContractData[] | undefined>;
+    getContractDataInBlock(l2BlockNum: number): Promise<ContractData[] | undefined>;
     /**
      * Gets the number of the latest L2 block processed.
      * @returns The number of the latest L2 block processed.
@@ -128,9 +128,13 @@ export declare class MemoryArchiverStore implements ArchiverDataStore {
      */
     private unencryptedLogs;
     /**
-     * A sparse array containing all the contract data that have been fetched so far.
+     * A sparse array containing all the contract data and bytecode that have been fetched so far.
+     */
+    private contractDataAndBytecodeByBlock;
+    /**
+     * A mapping of contract address to contract data and bytecode.
      */
-    private contractPublicData;
+    private contractDataAndBytecode;
     /**
      * 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
@@ -174,25 +178,25 @@ export declare class MemoryArchiverStore implements ArchiverDataStore {
      */
     confirmL1ToL2Messages(messageKeys: Fr[]): Promise<boolean>;
     /**
-     * Store new Contract Public Data from an L2 block to the store's list.
+     * Store new Contract data and bytecode 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).
      */
-    addL2ContractPublicData(data: ContractPublicData[], blockNum: number): Promise<boolean>;
+    addContractDataAndBytecode(data: ContractDataAndBytecode[], blockNum: number): Promise<boolean>;
     /**
-     * Gets the `take` amount of L2 blocks starting from `from`.
+     * Gets up to `limit` amount of L2 blocks starting from `from`.
      * @param from - Number of the first block to return (inclusive).
-     * @param take - The number of blocks to return.
+     * @param limit - The number of blocks to return.
      * @returns The requested L2 blocks.
      */
-    getL2Blocks(from: number, take: number): Promise<L2Block[]>;
+    getL2Blocks(from: number, limit: number): Promise<L2Block[]>;
     /**
-     * Gets the `take` amount of pending L1 to L2 messages, sorted by fee
-     * @param take - The number of messages to return (by default NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP).
+     * 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 message keys.
      */
-    getPendingL1ToL2MessageKeys(take?: number): Promise<Fr[]>;
+    getPendingL1ToL2MessageKeys(limit?: number): Promise<Fr[]>;
     /**
      * Gets the confirmed L1 to L2 message corresponding to the given message key.
      * @param messageKey - The message key to look up.
@@ -200,39 +204,39 @@ export declare class MemoryArchiverStore implements ArchiverDataStore {
      */
     getConfirmedL1ToL2Message(messageKey: Fr): Promise<L1ToL2Message>;
     /**
-     * Gets the `take` amount of logs starting from `from`.
+     * 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.
-     * @param take - The number of logs to return.
+     * @param limit - The number of logs to return.
      * @param logType - Specifies whether to return encrypted or unencrypted logs.
      * @returns The requested logs.
      */
-    getLogs(from: number, take: number, logType: LogType): Promise<L2BlockL2Logs[]>;
+    getLogs(from: number, limit: number, logType: LogType): Promise<L2BlockL2Logs[]>;
     /**
      * Lookup the L2 contract data for a contract address.
      * @param contractAddress - The contract data address.
      * @returns The contract's public data.
      */
-    getL2ContractPublicData(contractAddress: AztecAddress): Promise<ContractPublicData | undefined>;
+    getContractDataAndBytecode(contractAddress: AztecAddress): Promise<ContractDataAndBytecode | undefined>;
     /**
      * Lookup all contract data in an L2 block.
      * @param blockNum - The block number to get all contract data from.
-     * @returns All contract public data in the block (if found).
+     * @returns All contract data and bytecode in the block (if found).
      */
-    getL2ContractPublicDataInBlock(blockNum: number): Promise<ContractPublicData[]>;
+    getContractDataAndBytecodeInBlock(blockNum: number): Promise<ContractDataAndBytecode[]>;
     /**
      * 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).
      */
-    getL2ContractInfo(contractAddress: AztecAddress): Promise<ContractData | undefined>;
+    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).
      */
-    getL2ContractInfoInBlock(l2BlockNum: number): Promise<ContractData[] | undefined>;
+    getContractDataInBlock(l2BlockNum: number): Promise<ContractData[] | undefined>;
     /**
      * Gets the number of the latest L2 block processed.
      * @returns The number of the latest L2 block processed.