@aztec/archiver 0.24.0 → 0.26.2

package/dest/archiver/data_retrieval.js

@@ -1,16 +1,16 @@
-import { getContractDeploymentLogs, getL1ToL2MessageCancelledLogs, getL2BlockProcessedLogs, getPendingL1ToL2MessageLogs, processBlockLogs, processCancelledL1ToL2MessagesLogs, processContractDeploymentLogs, processPendingL1ToL2MessageAddedLogs, } from './eth_log_handlers.js';
+import { getContractDeploymentLogs, getL1ToL2MessageCancelledLogs, getL2BlockProcessedLogs, getPendingL1ToL2MessageLogs, getTxsPublishedLogs, processCancelledL1ToL2MessagesLogs, processContractDeploymentLogs, processL2BlockProcessedLogs, processPendingL1ToL2MessageAddedLogs, processTxsPublishedLogs, } from './eth_log_handlers.js';
 /**
- * Fetches new L2 Blocks.
+ * Fetches new L2 block metadata (header, archive snapshot).
  * @param publicClient - The viem public client to use for transaction retrieval.
  * @param rollupAddress - The address of the rollup contract.
  * @param blockUntilSynced - If true, blocks until the archiver has fully synced.
  * @param searchStartBlock - The block number to use for starting the search.
  * @param searchEndBlock - The highest block number that we should search up to.
  * @param expectedNextL2BlockNum - The next L2 block number that we expect to find.
- * @returns An array of L2 Blocks and the next eth block to search from
+ * @returns An array of tuples representing block metadata including the header, archive tree snapshot, and associated l1 block number; as well as the next eth block to search from.
  */
-export async function retrieveBlocks(publicClient, rollupAddress, blockUntilSynced, searchStartBlock, searchEndBlock, expectedNextL2BlockNum) {
-    const retrievedBlocks = [];
+export async function retrieveBlockMetadataFromRollup(publicClient, rollupAddress, blockUntilSynced, searchStartBlock, searchEndBlock, expectedNextL2BlockNum) {
+    const retrievedBlockMetadata = [];
     do {
         if (searchStartBlock > searchEndBlock) {
             break;
@@ -19,12 +19,37 @@ export async function retrieveBlocks(publicClient, rollupAddress, blockUntilSync
         if (l2BlockProcessedLogs.length === 0) {
             break;
         }
-        const newBlocks = await processBlockLogs(publicClient, expectedNextL2BlockNum, l2BlockProcessedLogs);
-        retrievedBlocks.push(...newBlocks);
+        const newBlockMetadata = await processL2BlockProcessedLogs(publicClient, expectedNextL2BlockNum, l2BlockProcessedLogs);
+        retrievedBlockMetadata.push(...newBlockMetadata);
         searchStartBlock = l2BlockProcessedLogs[l2BlockProcessedLogs.length - 1].blockNumber + 1n;
-        expectedNextL2BlockNum += BigInt(newBlocks.length);
+        expectedNextL2BlockNum += BigInt(newBlockMetadata.length);
     } while (blockUntilSynced && searchStartBlock <= searchEndBlock);
-    return { nextEthBlockNumber: searchStartBlock, retrievedData: retrievedBlocks };
+    return { nextEthBlockNumber: searchStartBlock, retrievedData: retrievedBlockMetadata };
+}
+/**
+ * Fetches new L2 block bodies and their hashes.
+ * @param publicClient - The viem public client to use for transaction retrieval.
+ * @param availabilityOracleAddress - The address of the availability oracle contract.
+ * @param blockUntilSynced - If true, blocks until the archiver has fully synced.
+ * @param searchStartBlock - The block number to use for starting the search.
+ * @param searchEndBlock - The highest block number that we should search up to.
+ * @returns A array of tuples of L2 block bodies and their associated hash as well as the next eth block to search from
+ */
+export async function retrieveBlockBodiesFromAvailabilityOracle(publicClient, availabilityOracleAddress, blockUntilSynced, searchStartBlock, searchEndBlock) {
+    const retrievedBlockBodies = [];
+    do {
+        if (searchStartBlock > searchEndBlock) {
+            break;
+        }
+        const l2TxsPublishedLogs = await getTxsPublishedLogs(publicClient, availabilityOracleAddress, searchStartBlock, searchEndBlock);
+        if (l2TxsPublishedLogs.length === 0) {
+            break;
+        }
+        const newBlockBodies = await processTxsPublishedLogs(publicClient, l2TxsPublishedLogs);
+        retrievedBlockBodies.push(...newBlockBodies);
+        searchStartBlock = l2TxsPublishedLogs[l2TxsPublishedLogs.length - 1].blockNumber + 1n;
+    } while (blockUntilSynced && searchStartBlock <= searchEndBlock);
+    return { nextEthBlockNumber: searchStartBlock, retrievedData: retrievedBlockBodies };
 }
 /**
  * Fetches new contract data.
@@ -33,10 +58,10 @@ export async function retrieveBlocks(publicClient, rollupAddress, blockUntilSync
  * @param blockUntilSynced - If true, blocks until the archiver has fully synced.
  * @param searchStartBlock - The block number to use for starting the search.
  * @param searchEndBlock - The highest block number that we should search up to.
- * @param blockHashMapping - A mapping from block number to relevant block hash.
+ * @param blockNumberToBodyHash - A mapping from block number to relevant body hash.
  * @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, searchStartBlock, searchEndBlock, blockHashMapping) {
+export async function retrieveNewContractData(publicClient, contractDeploymentEmitterAddress, blockUntilSynced, searchStartBlock, searchEndBlock, blockNumberToBodyHash) {
     let retrievedNewContracts = [];
     do {
         if (searchStartBlock > searchEndBlock) {
@@ -46,7 +71,7 @@ export async function retrieveNewContractData(publicClient, contractDeploymentEm
         if (contractDataLogs.length === 0) {
             break;
         }
-        const newContracts = processContractDeploymentLogs(blockHashMapping, contractDataLogs);
+        const newContracts = processContractDeploymentLogs(blockNumberToBodyHash, contractDataLogs);
         retrievedNewContracts = retrievedNewContracts.concat(newContracts);
         searchStartBlock = (contractDataLogs.findLast(cd => !!cd)?.blockNumber || searchStartBlock) + 1n;
     } while (blockUntilSynced && searchStartBlock <= searchEndBlock);
@@ -85,7 +110,7 @@ export async function retrieveNewPendingL1ToL2Messages(publicClient, inboxAddres
  * @param blockUntilSynced - If true, blocks until the archiver has fully synced.
  * @param searchStartBlock - The block number to use for starting the search.
  * @param searchEndBlock - The highest block number that we should search up to.
- * @returns An array of message keys that were cancelled and next eth block to search from.
+ * @returns An array of entry keys that were cancelled and next eth block to search from.
  */
 export async function retrieveNewCancelledL1ToL2Messages(publicClient, inboxAddress, blockUntilSynced, searchStartBlock, searchEndBlock) {
     const retrievedNewCancelledL1ToL2Messages = [];
@@ -105,4 +130,4 @@ export async function retrieveNewCancelledL1ToL2Messages(publicClient, inboxAddr
     } while (blockUntilSynced && searchStartBlock <= searchEndBlock);
     return { nextEthBlockNumber: searchStartBlock, retrievedData: retrievedNewCancelledL1ToL2Messages };
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGF0YV9yZXRyaWV2YWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYXJjaGl2ZXIvZGF0YV9yZXRyaWV2YWwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBTUEsT0FBTyxFQUNMLHlCQUF5QixFQUN6Qiw2QkFBNkIsRUFDN0IsdUJBQXVCLEVBQ3ZCLDJCQUEyQixFQUMzQixnQkFBZ0IsRUFDaEIsa0NBQWtDLEVBQ2xDLDZCQUE2QixFQUM3QixvQ0FBb0MsR0FDckMsTUFBTSx1QkFBdUIsQ0FBQztBQWdCL0I7Ozs7Ozs7OztHQVNHO0FBQ0gsTUFBTSxDQUFDLEtBQUssVUFBVSxjQUFjLENBQ2xDLFlBQTBCLEVBQzFCLGFBQXlCLEVBQ3pCLGdCQUF5QixFQUN6QixnQkFBd0IsRUFDeEIsY0FBc0IsRUFDdEIsc0JBQThCO0lBRTlCLE1BQU0sZUFBZSxHQUFjLEVBQUUsQ0FBQztJQUN0QyxHQUFHLENBQUM7UUFDRixJQUFJLGdCQUFnQixHQUFHLGNBQWMsRUFBRSxDQUFDO1lBQ3RDLE1BQU07UUFDUixDQUFDO1FBQ0QsTUFBTSxvQkFBb0IsR0FBRyxNQUFNLHVCQUF1QixDQUN4RCxZQUFZLEVBQ1osYUFBYSxFQUNiLGdCQUFnQixFQUNoQixjQUFjLENBQ2YsQ0FBQztRQUNGLElBQUksb0JBQW9CLENBQUMsTUFBTSxLQUFLLENBQUMsRUFBRSxDQUFDO1lBQ3RDLE1BQU07UUFDUixDQUFDO1FBRUQsTUFBTSxTQUFTLEdBQUcsTUFBTSxnQkFBZ0IsQ0FBQyxZQUFZLEVBQUUsc0JBQXNCLEVBQUUsb0JBQW9CLENBQUMsQ0FBQztRQUNyRyxlQUFlLENBQUMsSUFBSSxDQUFDLEdBQUcsU0FBUyxDQUFDLENBQUM7UUFDbkMsZ0JBQWdCLEdBQUcsb0JBQW9CLENBQUMsb0JBQW9CLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQyxDQUFDLFdBQVksR0FBRyxFQUFFLENBQUM7UUFDM0Ysc0JBQXNCLElBQUksTUFBTSxDQUFDLFNBQVMsQ0FBQyxN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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGF0YV9yZXRyaWV2YWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYXJjaGl2ZXIvZGF0YV9yZXRyaWV2YWwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBTUEsT0FBTyxFQUNMLHlCQUF5QixFQUN6Qiw2QkFBNkIsRUFDN0IsdUJBQXVCLEVBQ3ZCLDJCQUEyQixFQUMzQixtQkFBbUIsRUFDbkIsa0NBQWtDLEVBQ2xDLDZCQUE2QixFQUM3QiwyQkFBMkIsRUFDM0Isb0NBQW9DLEVBQ3BDLHVCQUF1QixHQUN4QixNQUFNLHVCQUF1QixDQUFDO0FBZ0IvQjs7Ozs7Ozs7O0dBU0c7QUFDSCxNQUFNLENBQUMsS0FBSyxVQUFVLCtCQUErQixDQUNuRCxZQUEwQixFQUMxQixhQUF5QixFQUN6QixnQkFBeUIsRUFDekIsZ0JBQXdCLEVBQ3hCLGNBQXNCLEVBQ3RCLHNCQUE4QjtJQUU5QixNQUFNLHNCQUFzQixHQUErQyxFQUFFLENBQUM7SUFDOUUsR0FBRyxDQUFDO1FBQ0YsSUFBSSxnQkFBZ0IsR0FBRyxjQUFjLEVBQUUsQ0FBQztZQUN0QyxNQUFNO1FBQ1IsQ0FBQztRQUNELE1BQU0sb0JBQW9CLEdBQUcsTUFBTSx1QkFBdUIsQ0FDeEQsWUFBWSxFQUNaLGFBQWEsRUFDYixnQkFBZ0IsRUFDaEIsY0FBYyxDQUNmLENBQUM7UUFDRixJQUFJLG9CQUFvQixDQUFDLE1BQU0sS0FBSyxDQUFDLEVBQUUsQ0FBQztZQUN0QyxNQUFNO1FBQ1IsQ0FBQztRQUVELE1BQU0sZ0JBQWdCLEdBQUcsTUFBTSwyQkFBMkIsQ0FDeEQsWUFBWSxFQUNaLHNCQUFzQixFQUN0QixvQkFBb0IsQ0FDckIsQ0FBQztRQUNGLHNCQUFzQixDQUFDLElBQUksQ0FBQyxHQUFHLGdCQUFnQixDQUFDLENBQUM7UUFDakQsZ0JBQWdCLEdBQUcsb0JBQW9CLENBQUMsb0JBQW9CLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQyxDQUFDLFdBQVksR0FBRyxFQUFFLENBQUM7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

package/dest/archiver/eth_log_handlers.d.ts

@@ -1,28 +1,31 @@
 /// <reference types="node" resolution-mode="require"/>
-import { ExtendedContractData, L1ToL2Message, L2Block } from '@aztec/circuit-types';
+import { Body, ExtendedContractData, L1ToL2Message } from '@aztec/circuit-types';
+import { AppendOnlyTreeSnapshot, Header } from '@aztec/circuits.js';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
-import { ContractDeploymentEmitterAbi, InboxAbi, RollupAbi } from '@aztec/l1-artifacts';
+import { AvailabilityOracleAbi, ContractDeploymentEmitterAbi, InboxAbi, RollupAbi } from '@aztec/l1-artifacts';
 import { Log, PublicClient } from 'viem';
 /**
  * Processes newly received MessageAdded (L1 to L2) logs.
  * @param logs - MessageAdded logs.
  * @returns Array of all Pending L1 to L2 messages that were processed
  */
-export declare function processPendingL1ToL2MessageAddedLogs(logs: Log<bigint, number, undefined, true, typeof InboxAbi, 'MessageAdded'>[]): [L1ToL2Message, bigint][];
+export declare function processPendingL1ToL2MessageAddedLogs(logs: Log<bigint, number, false, undefined, true, typeof InboxAbi, 'MessageAdded'>[]): [L1ToL2Message, bigint][];
 /**
  * Process newly received L1ToL2MessageCancelled logs.
  * @param logs - L1ToL2MessageCancelled logs.
- * @returns Array of message keys of the L1 to L2 messages that were cancelled
+ * @returns Array of entry keys of the L1 to L2 messages that were cancelled
  */
-export declare function processCancelledL1ToL2MessagesLogs(logs: Log<bigint, number, undefined, true, typeof InboxAbi, 'L1ToL2MessageCancelled'>[]): [Fr, bigint][];
+export declare function processCancelledL1ToL2MessagesLogs(logs: Log<bigint, number, false, undefined, true, typeof InboxAbi, 'L1ToL2MessageCancelled'>[]): [Fr, bigint][];
 /**
  * Processes newly received L2BlockProcessed logs.
  * @param publicClient - The viem public client to use for transaction retrieval.
  * @param expectedL2BlockNumber - The next expected L2 block number.
  * @param logs - L2BlockProcessed logs.
+ * @returns - An array of tuples representing block metadata including the header, archive tree snapshot, and associated l1 block number.
  */
-export declare function processBlockLogs(publicClient: PublicClient, expectedL2BlockNumber: bigint, logs: Log<bigint, number, undefined, true, typeof RollupAbi, 'L2BlockProcessed'>[]): Promise<L2Block[]>;
+export declare function processL2BlockProcessedLogs(publicClient: PublicClient, expectedL2BlockNumber: bigint, logs: Log<bigint, number, false, undefined, true, typeof RollupAbi, 'L2BlockProcessed'>[]): Promise<[Header, AppendOnlyTreeSnapshot, bigint][]>;
+export declare function processTxsPublishedLogs(publicClient: PublicClient, logs: Log<bigint, number, false, undefined, true, typeof AvailabilityOracleAbi, 'TxsPublished'>[]): Promise<[Body, Buffer][]>;
 /**
  * Gets relevant `L2BlockProcessed` logs from chain.
  * @param publicClient - The viem public client to use for transaction retrieval.
@@ -31,17 +34,16 @@ export declare function processBlockLogs(publicClient: PublicClient, expectedL2B
  * @param toBlock - Last block to get logs from (inclusive).
  * @returns An array of `L2BlockProcessed` logs.
  */
-export declare function getL2BlockProcessedLogs(publicClient: PublicClient, rollupAddress: EthAddress, fromBlock: bigint, toBlock: bigint): Promise<import("viem").GetLogsReturnType<{
-    readonly type: "event";
-    readonly name: "L2BlockProcessed";
-    readonly inputs: readonly [{
-        readonly name: "blockNumber";
-        readonly type: "uint256";
-        readonly indexed: true;
-        readonly internalType: "uint256";
-    }];
-    readonly anonymous: false;
-}, true>>;
+export declare function getL2BlockProcessedLogs(publicClient: PublicClient, rollupAddress: EthAddress, fromBlock: bigint, toBlock: bigint): Promise<Log<bigint, number, false, undefined, true, typeof RollupAbi, 'L2BlockProcessed'>[]>;
+/**
+ * Gets relevant `TxsPublished` logs from chain.
+ * @param publicClient - The viem public client to use for transaction retrieval.
+ * @param dataAvailabilityOracleAddress - The address of the availability oracle contract.
+ * @param fromBlock - First block to get logs from (inclusive).
+ * @param toBlock - Last block to get logs from (inclusive).
+ * @returns An array of `TxsPublished` logs.
+ */
+export declare function getTxsPublishedLogs(publicClient: PublicClient, dataAvailabilityOracleAddress: EthAddress, fromBlock: bigint, toBlock: bigint): Promise<Log<bigint, number, false, undefined, true, typeof AvailabilityOracleAbi, 'TxsPublished'>[]>;
 /**
  * Gets relevant `ContractDeployment` logs from chain.
  * @param publicClient - The viem public client to use for transaction retrieval.
@@ -50,16 +52,16 @@ export declare function getL2BlockProcessedLogs(publicClient: PublicClient, roll
  * @param toBlock - Last block to get logs from (inclusive).
  * @returns An array of `ContractDeployment` logs.
  */
-export declare function getContractDeploymentLogs(publicClient: PublicClient, contractDeploymentEmitterAddress: EthAddress, fromBlock: bigint, toBlock: bigint): Promise<Log<bigint, number, undefined, true, typeof ContractDeploymentEmitterAbi, 'ContractDeployment'>[]>;
+export declare function getContractDeploymentLogs(publicClient: PublicClient, contractDeploymentEmitterAddress: EthAddress, fromBlock: bigint, toBlock: bigint): Promise<Log<bigint, number, false, undefined, true, typeof ContractDeploymentEmitterAbi, 'ContractDeployment'>[]>;
 /**
  * Processes newly received ContractDeployment logs.
- * @param blockHashMapping - A mapping from block number to relevant block hash.
+ * @param blockNumberToBodyHash - A mapping from block number to relevant body hash.
  * @param logs - ContractDeployment logs.
  * @returns The set of retrieved extended contract data items.
  */
-export declare function processContractDeploymentLogs(blockHashMapping: {
+export declare function processContractDeploymentLogs(blockNumberToBodyHash: {
     [key: number]: Buffer | undefined;
-}, logs: Log<bigint, number, undefined, true, typeof ContractDeploymentEmitterAbi, 'ContractDeployment'>[]): [ExtendedContractData[], number][];
+}, logs: Log<bigint, number, false, undefined, true, typeof ContractDeploymentEmitterAbi, 'ContractDeployment'>[]): [ExtendedContractData[], number][];
 /**
  * Get relevant `MessageAdded` logs emitted by Inbox on chain.
  * @param publicClient - The viem public client to use for transaction retrieval.
@@ -68,7 +70,7 @@ export declare function processContractDeploymentLogs(blockHashMapping: {
  * @param toBlock - Last block to get logs from (inclusive).
  * @returns An array of `MessageAdded` logs.
  */
-export declare function getPendingL1ToL2MessageLogs(publicClient: PublicClient, inboxAddress: EthAddress, fromBlock: bigint, toBlock: bigint): Promise<Log<bigint, number, undefined, true, typeof InboxAbi, 'MessageAdded'>[]>;
+export declare function getPendingL1ToL2MessageLogs(publicClient: PublicClient, inboxAddress: EthAddress, fromBlock: bigint, toBlock: bigint): Promise<Log<bigint, number, false, undefined, true, typeof InboxAbi, 'MessageAdded'>[]>;
 /**
  * Get relevant `L1ToL2MessageCancelled` logs emitted by Inbox on chain when pending messages are cancelled
  * @param publicClient - The viem public client to use for transaction retrieval.
@@ -77,5 +79,5 @@ export declare function getPendingL1ToL2MessageLogs(publicClient: PublicClient,
  * @param toBlock - Last block to get logs from (inclusive).
  * @returns An array of `L1ToL2MessageCancelled` logs.
  */
-export declare function getL1ToL2MessageCancelledLogs(publicClient: PublicClient, inboxAddress: EthAddress, fromBlock: bigint, toBlock: bigint): Promise<Log<bigint, number, undefined, true, typeof InboxAbi, 'L1ToL2MessageCancelled'>[]>;
+export declare function getL1ToL2MessageCancelledLogs(publicClient: PublicClient, inboxAddress: EthAddress, fromBlock: bigint, toBlock: bigint): Promise<Log<bigint, number, false, undefined, true, typeof InboxAbi, 'L1ToL2MessageCancelled'>[]>;
 //# sourceMappingURL=eth_log_handlers.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"eth_log_handlers.d.ts","sourceRoot":"","sources":["../../src/archiver/eth_log_handlers.ts"],"names":[],"mappings":";AAAA,OAAO,EAGL,oBAAoB,EAEpB,aAAa,EAEb,OAAO,EACR,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,4BAA4B,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAExF,OAAO,EAAO,GAAG,EAAE,YAAY,EAA0D,MAAM,MAAM,CAAC;AAEtG;;;;GAIG;AACH,wBAAgB,oCAAoC,CAClD,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,QAAQ,EAAE,cAAc,CAAC,EAAE,GAC5E,CAAC,aAAa,EAAE,MAAM,CAAC,EAAE,CAmB3B;AAED;;;;GAIG;AACH,wBAAgB,kCAAkC,CAChD,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,QAAQ,EAAE,wBAAwB,CAAC,EAAE,GACtF,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,CAMhB;AAED;;;;;GAKG;AACH,wBAAsB,gBAAgB,CACpC,YAAY,EAAE,YAAY,EAC1B,qBAAqB,EAAE,MAAM,EAC7B,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,SAAS,EAAE,kBAAkB,CAAC,EAAE,GACjF,OAAO,CAAC,OAAO,EAAE,CAAC,CAcpB;AAuCD;;;;;;;GAOG;AACH,wBAAsB,uBAAuB,CAC3C,YAAY,EAAE,YAAY,EAC1B,aAAa,EAAE,UAAU,EACzB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM;;;;;;;;;;UAchB;AAED;;;;;;;GAOG;AACH,wBAAsB,yBAAyB,CAC7C,YAAY,EAAE,YAAY,EAC1B,gCAAgC,EAAE,UAAU,EAC5C,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,4BAA4B,EAAE,oBAAoB,CAAC,EAAE,CAAC,CAW5G;AAED;;;;;GAKG;AACH,wBAAgB,6BAA6B,CAC3C,gBAAgB,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAA;CAAE,EACvD,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,4BAA4B,EAAE,oBAAoB,CAAC,EAAE,GACtG,CAAC,oBAAoB,EAAE,EAAE,MAAM,CAAC,EAAE,CA6BpC;AAED;;;;;;;GAOG;AACH,wBAAsB,2BAA2B,CAC/C,YAAY,EAAE,YAAY,EAC1B,YAAY,EAAE,UAAU,EACxB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,QAAQ,EAAE,cAAc,CAAC,EAAE,CAAC,CAWlF;AAED;;;;;;;GAOG;AACH,wBAAsB,6BAA6B,CACjD,YAAY,EAAE,YAAY,EAC1B,YAAY,EAAE,UAAU,EACxB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,QAAQ,EAAE,wBAAwB,CAAC,EAAE,CAAC,CAW5F"}
+{"version":3,"file":"eth_log_handlers.d.ts","sourceRoot":"","sources":["../../src/archiver/eth_log_handlers.ts"],"names":[],"mappings":"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"}

package/dest/archiver/eth_log_handlers.js

@@ -1,9 +1,10 @@
-import { ContractData, EncodedContractFunction, ExtendedContractData, L1Actor, L1ToL2Message, L2Actor, L2Block, } from '@aztec/circuit-types';
+import { Body, ContractData, EncodedContractFunction, ExtendedContractData, L1Actor, L1ToL2Message, L2Actor, } from '@aztec/circuit-types';
+import { AppendOnlyTreeSnapshot, Header } from '@aztec/circuits.js';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, numToUInt32BE } from '@aztec/foundation/serialize';
-import { ContractDeploymentEmitterAbi, InboxAbi, RollupAbi } from '@aztec/l1-artifacts';
+import { AvailabilityOracleAbi, ContractDeploymentEmitterAbi, InboxAbi, RollupAbi } from '@aztec/l1-artifacts';
 import { decodeFunctionData, getAbiItem, getAddress, hexToBytes } from 'viem';
 /**
  * Processes newly received MessageAdded (L1 to L2) logs.
@@ -24,7 +25,7 @@ export function processPendingL1ToL2MessageAddedLogs(logs) {
 /**
  * Process newly received L1ToL2MessageCancelled logs.
  * @param logs - L1ToL2MessageCancelled logs.
- * @returns Array of message keys of the L1 to L2 messages that were cancelled
+ * @returns Array of entry keys of the L1 to L2 messages that were cancelled
  */
 export function processCancelledL1ToL2MessagesLogs(logs) {
     const cancelledL1ToL2Messages = [];
@@ -38,53 +39,80 @@ export function processCancelledL1ToL2MessagesLogs(logs) {
  * @param publicClient - The viem public client to use for transaction retrieval.
  * @param expectedL2BlockNumber - The next expected L2 block number.
  * @param logs - L2BlockProcessed logs.
+ * @returns - An array of tuples representing block metadata including the header, archive tree snapshot, and associated l1 block number.
  */
-export async function processBlockLogs(publicClient, expectedL2BlockNumber, logs) {
-    const retrievedBlocks = [];
+export async function processL2BlockProcessedLogs(publicClient, expectedL2BlockNumber, logs) {
+    const retrievedBlockMetadata = [];
     for (const log of logs) {
         const blockNum = log.args.blockNumber;
         if (blockNum !== expectedL2BlockNumber) {
             throw new Error('Block number mismatch. Expected: ' + expectedL2BlockNumber + ' but got: ' + blockNum + '.');
         }
         // TODO: Fetch blocks from calldata in parallel
-        const newBlock = await getBlockFromCallData(publicClient, log.transactionHash, log.args.blockNumber);
-        newBlock.setL1BlockNumber(log.blockNumber);
-        retrievedBlocks.push(newBlock);
+        const [header, archive] = await getBlockMetadataFromRollupTx(publicClient, log.transactionHash, log.args.blockNumber);
+        retrievedBlockMetadata.push([header, archive, log.blockNumber]);
         expectedL2BlockNumber++;
     }
-    return retrievedBlocks;
+    return retrievedBlockMetadata;
+}
+export async function processTxsPublishedLogs(publicClient, logs) {
+    const retrievedBlockBodies = [];
+    for (const log of logs) {
+        const newBlockBody = await getBlockBodiesFromAvailabilityOracleTx(publicClient, log.transactionHash);
+        retrievedBlockBodies.push([newBlockBody, Buffer.from(hexToBytes(log.args.txsHash))]);
+    }
+    return retrievedBlockBodies;
 }
 /**
- * Builds an L2 block out of calldata from the tx that published it.
+ * Gets block metadata (header and archive snapshot) from the calldata of an L1 transaction.
  * Assumes that the block was published from an EOA.
  * TODO: Add retries and error management.
  * @param publicClient - The viem public client to use for transaction retrieval.
  * @param txHash - Hash of the tx that published it.
  * @param l2BlockNum - L2 block number.
- * @returns An L2 block deserialized from the calldata.
+ * @returns L2 block metadata (header and archive) from the calldata, deserialized
  */
-async function getBlockFromCallData(publicClient, txHash, l2BlockNum) {
+async function getBlockMetadataFromRollupTx(publicClient, txHash, l2BlockNum) {
     const { input: data } = await publicClient.getTransaction({ hash: txHash });
-    // TODO: File a bug in viem who complains if we dont remove the ctor from the abi here
     const { functionName, args } = decodeFunctionData({
-        abi: RollupAbi.filter(item => item.type.toString() !== 'constructor'),
+        abi: RollupAbi,
         data,
     });
     if (functionName !== 'process') {
         throw new Error(`Unexpected method called ${functionName}`);
     }
-    const [headerHex, archiveRootHex, , bodyHex] = args;
-    const blockBuffer = Buffer.concat([
-        Buffer.from(hexToBytes(headerHex)),
+    const [headerHex, archiveRootHex] = args;
+    const header = Header.fromBuffer(Buffer.from(hexToBytes(headerHex)));
+    const blockNumberFromHeader = header.globalVariables.blockNumber.toBigInt();
+    if (blockNumberFromHeader !== l2BlockNum) {
+        throw new Error(`Block number mismatch: expected ${l2BlockNum} but got ${blockNumberFromHeader}`);
+    }
+    const archive = AppendOnlyTreeSnapshot.fromBuffer(Buffer.concat([
         Buffer.from(hexToBytes(archiveRootHex)), // L2Block.archive.root
         numToUInt32BE(Number(l2BlockNum)), // L2Block.archive.nextAvailableLeafIndex
-        Buffer.from(hexToBytes(bodyHex)),
-    ]);
-    const block = L2Block.fromBufferWithLogs(blockBuffer);
-    if (BigInt(block.number) !== l2BlockNum) {
-        throw new Error(`Block number mismatch: expected ${l2BlockNum} but got ${block.number}`);
+    ]));
+    return [header, archive];
+}
+/**
+ * Gets block bodies from calldata of an L1 transaction, and deserializes them into Body objects.
+ * Assumes that the block was published from an EOA.
+ * TODO: Add retries and error management.
+ * @param publicClient - The viem public client to use for transaction retrieval.
+ * @param txHash - Hash of the tx that published it.
+ * @returns An L2 block body from the calldata, deserialized
+ */
+async function getBlockBodiesFromAvailabilityOracleTx(publicClient, txHash) {
+    const { input: data } = await publicClient.getTransaction({ hash: txHash });
+    const { functionName, args } = decodeFunctionData({
+        abi: AvailabilityOracleAbi,
+        data,
+    });
+    if (functionName !== 'publish') {
+        throw new Error(`Unexpected method called ${functionName}`);
     }
-    return block;
+    const [bodyHex] = args;
+    const blockBody = Body.fromBuffer(Buffer.from(hexToBytes(bodyHex)));
+    return blockBody;
 }
 /**
  * Gets relevant `L2BlockProcessed` logs from chain.
@@ -94,16 +122,32 @@ async function getBlockFromCallData(publicClient, txHash, l2BlockNum) {
  * @param toBlock - Last block to get logs from (inclusive).
  * @returns An array of `L2BlockProcessed` logs.
  */
-export async function getL2BlockProcessedLogs(publicClient, rollupAddress, fromBlock, toBlock) {
-    // Note: For some reason the return type of `getLogs` would not get correctly derived if I didn't set the abiItem
-    //       as a standalone constant.
-    const abiItem = getAbiItem({
-        abi: RollupAbi,
-        name: 'L2BlockProcessed',
-    });
-    return await publicClient.getLogs({
+export function getL2BlockProcessedLogs(publicClient, rollupAddress, fromBlock, toBlock) {
+    return publicClient.getLogs({
         address: getAddress(rollupAddress.toString()),
-        event: abiItem,
+        event: getAbiItem({
+            abi: RollupAbi,
+            name: 'L2BlockProcessed',
+        }),
+        fromBlock,
+        toBlock: toBlock + 1n, // the toBlock argument in getLogs is exclusive
+    });
+}
+/**
+ * Gets relevant `TxsPublished` logs from chain.
+ * @param publicClient - The viem public client to use for transaction retrieval.
+ * @param dataAvailabilityOracleAddress - The address of the availability oracle contract.
+ * @param fromBlock - First block to get logs from (inclusive).
+ * @param toBlock - Last block to get logs from (inclusive).
+ * @returns An array of `TxsPublished` logs.
+ */
+export function getTxsPublishedLogs(publicClient, dataAvailabilityOracleAddress, fromBlock, toBlock) {
+    return publicClient.getLogs({
+        address: getAddress(dataAvailabilityOracleAddress.toString()),
+        event: getAbiItem({
+            abi: AvailabilityOracleAbi,
+            name: 'TxsPublished',
+        }),
         fromBlock,
         toBlock: toBlock + 1n, // the toBlock argument in getLogs is exclusive
     });
@@ -116,31 +160,30 @@ export async function getL2BlockProcessedLogs(publicClient, rollupAddress, fromB
  * @param toBlock - Last block to get logs from (inclusive).
  * @returns An array of `ContractDeployment` logs.
  */
-export async function getContractDeploymentLogs(publicClient, contractDeploymentEmitterAddress, fromBlock, toBlock) {
-    const abiItem = getAbiItem({
-        abi: ContractDeploymentEmitterAbi,
-        name: 'ContractDeployment',
-    });
-    return await publicClient.getLogs({
+export function getContractDeploymentLogs(publicClient, contractDeploymentEmitterAddress, fromBlock, toBlock) {
+    return publicClient.getLogs({
         address: getAddress(contractDeploymentEmitterAddress.toString()),
-        event: abiItem,
+        event: getAbiItem({
+            abi: ContractDeploymentEmitterAbi,
+            name: 'ContractDeployment',
+        }),
         fromBlock,
         toBlock: toBlock + 1n, // the toBlock argument in getLogs is exclusive
     });
 }
 /**
  * Processes newly received ContractDeployment logs.
- * @param blockHashMapping - A mapping from block number to relevant block hash.
+ * @param blockNumberToBodyHash - A mapping from block number to relevant body hash.
  * @param logs - ContractDeployment logs.
  * @returns The set of retrieved extended contract data items.
  */
-export function processContractDeploymentLogs(blockHashMapping, logs) {
+export function processContractDeploymentLogs(blockNumberToBodyHash, logs) {
     const extendedContractData = [];
     for (let i = 0; i < logs.length; i++) {
         const log = logs[i];
         const l2BlockNum = Number(log.args.l2BlockNum);
         const blockHash = Buffer.from(hexToBytes(log.args.l2BlockHash));
-        const expectedBlockHash = blockHashMapping[l2BlockNum];
+        const expectedBlockHash = blockNumberToBodyHash[l2BlockNum];
         if (expectedBlockHash === undefined || !blockHash.equals(expectedBlockHash)) {
             continue;
         }
@@ -166,14 +209,13 @@ export function processContractDeploymentLogs(blockHashMapping, logs) {
  * @param toBlock - Last block to get logs from (inclusive).
  * @returns An array of `MessageAdded` logs.
  */
-export async function getPendingL1ToL2MessageLogs(publicClient, inboxAddress, fromBlock, toBlock) {
-    const abiItem = getAbiItem({
-        abi: InboxAbi,
-        name: 'MessageAdded',
-    });
-    return await publicClient.getLogs({
+export function getPendingL1ToL2MessageLogs(publicClient, inboxAddress, fromBlock, toBlock) {
+    return publicClient.getLogs({
         address: getAddress(inboxAddress.toString()),
-        event: abiItem,
+        event: getAbiItem({
+            abi: InboxAbi,
+            name: 'MessageAdded',
+        }),
         fromBlock,
         toBlock: toBlock + 1n, // the toBlock argument in getLogs is exclusive
     });
@@ -186,16 +228,15 @@ export async function getPendingL1ToL2MessageLogs(publicClient, inboxAddress, fr
  * @param toBlock - Last block to get logs from (inclusive).
  * @returns An array of `L1ToL2MessageCancelled` logs.
  */
-export async function getL1ToL2MessageCancelledLogs(publicClient, inboxAddress, fromBlock, toBlock) {
-    const abiItem = getAbiItem({
-        abi: InboxAbi,
-        name: 'L1ToL2MessageCancelled',
-    });
-    return await publicClient.getLogs({
+export function getL1ToL2MessageCancelledLogs(publicClient, inboxAddress, fromBlock, toBlock) {
+    return publicClient.getLogs({
         address: getAddress(inboxAddress.toString()),
-        event: abiItem,
+        event: getAbiItem({
+            abi: InboxAbi,
+            name: 'L1ToL2MessageCancelled',
+        }),
         fromBlock,
         toBlock: toBlock + 1n, // the toBlock argument in getLogs is exclusive
     });
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"eth_log_handlers.js","sourceRoot":"","sources":["../../src/archiver/eth_log_handlers.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"eth_log_handlers.js","sourceRoot":"","sources":["../../src/archiver/eth_log_handlers.ts"],"names":[],"mappings":"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"}

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

@@ -0,0 +1,27 @@
+/// <reference types="node" resolution-mode="require"/>
+import { Body } from '@aztec/circuit-types';
+import { AztecKVStore } from '@aztec/kv-store';
+export declare class BlockBodyStore {
+    #private;
+    private db;
+    constructor(db: AztecKVStore);
+    /**
+     * Append new block bodies to the store's map.
+     * @param blockBodies - The L2 block bodies to be added to the store.
+     * @returns True if the operation is successful.
+     */
+    addBlockBodies(blockBodies: Body[]): Promise<boolean>;
+    /**
+     * Gets a list of L2 block bodies with its associated txsHashes
+     * @param txsHashes - The txsHashes list that corresponds to the blockBodies we want to retrieve
+     * @returns The requested L2 block bodies
+     */
+    getBlockBodies(txsHashes: Buffer[]): Promise<Body[]>;
+    /**
+     * Gets an L2 block body.
+     * @param txsHash - The txHash of the the block body to return
+     * @returns The requested L2 block body
+     */
+    getBlockBody(txsHash: Buffer): Body | undefined;
+}
+//# sourceMappingURL=block_body_store.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"block_body_store.d.ts","sourceRoot":"","sources":["../../../src/archiver/kv_archiver_store/block_body_store.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAY,MAAM,iBAAiB,CAAC;AAEzD,qBAAa,cAAc;;IAIb,OAAO,CAAC,EAAE;gBAAF,EAAE,EAAE,YAAY;IAIpC;;;;OAIG;IACH,cAAc,CAAC,WAAW,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAUrD;;;;OAIG;IACG,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAY1D;;;;OAIG;IACH,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS;CAKhD"}

package/dest/archiver/kv_archiver_store/block_body_store.js

@@ -0,0 +1,47 @@
+var _BlockBodyStore_blockBodies;
+import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
+import { Body } from '@aztec/circuit-types';
+export class BlockBodyStore {
+    constructor(db) {
+        this.db = db;
+        /** Map block body hash to block body */
+        _BlockBodyStore_blockBodies.set(this, void 0);
+        __classPrivateFieldSet(this, _BlockBodyStore_blockBodies, db.openMap('archiver_block_bodies'), "f");
+    }
+    /**
+     * Append new block bodies to the store's map.
+     * @param blockBodies - The L2 block bodies to be added to the store.
+     * @returns True if the operation is successful.
+     */
+    addBlockBodies(blockBodies) {
+        return this.db.transaction(() => {
+            for (const body of blockBodies) {
+                void __classPrivateFieldGet(this, _BlockBodyStore_blockBodies, "f").set(body.getCalldataHash().toString('hex'), body.toBuffer());
+            }
+            return true;
+        });
+    }
+    /**
+     * Gets a list of L2 block bodies with its associated txsHashes
+     * @param txsHashes - The txsHashes list that corresponds to the blockBodies we want to retrieve
+     * @returns The requested L2 block bodies
+     */
+    async getBlockBodies(txsHashes) {
+        const blockBodiesBuffer = await this.db.transaction(() => txsHashes.map(txsHash => __classPrivateFieldGet(this, _BlockBodyStore_blockBodies, "f").get(txsHash.toString('hex'))));
+        if (blockBodiesBuffer.some(bodyBuffer => bodyBuffer === undefined)) {
+            throw new Error('Block body buffer is undefined');
+        }
+        return blockBodiesBuffer.map(blockBodyBuffer => Body.fromBuffer(blockBodyBuffer));
+    }
+    /**
+     * Gets an L2 block body.
+     * @param txsHash - The txHash of the the block body to return
+     * @returns The requested L2 block body
+     */
+    getBlockBody(txsHash) {
+        const blockBody = __classPrivateFieldGet(this, _BlockBodyStore_blockBodies, "f").get(txsHash.toString('hex'));
+        return blockBody && Body.fromBuffer(blockBody);
+    }
+}
+_BlockBodyStore_blockBodies = new WeakMap();
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfYm9keV9zdG9yZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9hcmNoaXZlci9rdl9hcmNoaXZlcl9zdG9yZS9ibG9ja19ib2R5X3N0b3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsT0FBTyxFQUFFLElBQUksRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBRzVDLE1BQU0sT0FBTyxjQUFjO0lBSXpCLFlBQW9CLEVBQWdCO1FBQWhCLE9BQUUsR0FBRixFQUFFLENBQWM7UUFIcEMsd0NBQXdDO1FBQ3hDLDhDQUF1QztRQUdyQyx1QkFBQSxJQUFJLCtCQUFnQixFQUFFLENBQUMsT0FBTyxDQUFDLHVCQUF1QixDQUFDLE1BQUEsQ0FBQztJQUMxRCxDQUFDO0lBRUQ7Ozs7T0FJRztJQUNILGNBQWMsQ0FBQyxXQUFtQjtRQUNoQyxPQUFPLElBQUksQ0FBQyxFQUFFLENBQUMsV0FBVyxDQUFDLEdBQUcsRUFBRTtZQUM5QixLQUFLLE1BQU0sSUFBSSxJQUFJLFdBQVcsRUFBRSxDQUFDO2dCQUMvQixLQUFLLHVCQUFBLElBQUksbUNBQWEsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLGVBQWUsRUFBRSxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsRUFBRSxJQUFJLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQztZQUN0RixDQUFDO1lBRUQsT0FBTyxJQUFJLENBQUM7UUFDZCxDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRDs7OztPQUlHO0lBQ0gsS0FBSyxDQUFDLGNBQWMsQ0FBQyxTQUFtQjtRQUN0QyxNQUFNLGlCQUFpQixHQUFHLE1BQU0sSUFBSSxDQUFDLEVBQUUsQ0FBQyxXQUFXLENBQUMsR0FBRyxFQUFFLENBQ3ZELFNBQVMsQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQyx1QkFBQSxJQUFJLG1DQUFhLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUN6RSxDQUFDO1FBRUYsSUFBSSxpQkFBaUIsQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLEVBQUUsQ0FBQyxVQUFVLEtBQUssU0FBUyxDQUFDLEVBQUUsQ0FBQztZQUNuRSxNQUFNLElBQUksS0FBSyxDQUFDLGdDQUFnQyxDQUFDLENBQUM7UUFDcEQsQ0FBQztRQUVELE9BQU8saUJBQWlCLENBQUMsR0FBRyxDQUFDLGVBQWUsQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxlQUFnQixDQUFDLENBQUMsQ0FBQztJQUNyRixDQUFDO0lBRUQ7Ozs7T0FJRztJQUNILFlBQVksQ0FBQyxPQUFlO1FBQzFCLE1BQU0sU0FBUyxHQUFHLHVCQUFBLElBQUksbUNBQWEsQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDO1FBRWpFLE9BQU8sU0FBUyxJQUFJLElBQUksQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDLENBQUM7SUFDakQsQ0FBQztDQUNGIn0=