@aztec/archiver 0.0.0-test.0 → 0.0.1-commit.24de95ac

package/dest/archiver/config.d.ts

@@ -1,32 +1,16 @@
 import { type BlobSinkConfig } from '@aztec/blob-sink/client';
-import { type L1ContractAddresses, type L1ContractsConfig, type L1ReaderConfig } from '@aztec/ethereum';
+import { type L1ContractsConfig, type L1ReaderConfig } from '@aztec/ethereum';
 import { type ConfigMappingsType } from '@aztec/foundation/config';
 import { type ChainConfig } from '@aztec/stdlib/config';
+import type { ArchiverSpecificConfig } from '@aztec/stdlib/interfaces/server';
 /**
+ * The archiver configuration.
  * There are 2 polling intervals used in this configuration. The first is the archiver polling interval, archiverPollingIntervalMS.
  * This is the interval between successive calls to eth_blockNumber via viem.
  * Results of calls to eth_blockNumber are cached by viem with this cache being updated periodically at the interval specified by viemPollingIntervalMS.
  * As a result the maximum observed polling time for new blocks will be viemPollingIntervalMS + archiverPollingIntervalMS.
  */
-/**
- * The archiver configuration.
- */
-export type ArchiverConfig = {
-    /** URL for an archiver service. If set, will return an archiver client as opposed to starting a new one. */
-    archiverUrl?: string;
-    /** URL for an L1 consensus client */
-    l1ConsensusHostUrl?: string;
-    /** The polling interval in ms for retrieving new L2 blocks and encrypted logs. */
-    archiverPollingIntervalMS?: number;
-    /** The number of L2 blocks the archiver will attempt to download at a time. */
-    archiverBatchSize?: number;
-    /** The polling interval viem uses in ms */
-    viemPollingIntervalMS?: number;
-    /** The deployed L1 contract addresses */
-    l1Contracts: L1ContractAddresses;
-    /** The max number of logs that can be obtained in 1 "getPublicLogs" call. */
-    maxLogs?: number;
-} & L1ReaderConfig & L1ContractsConfig & BlobSinkConfig & ChainConfig;
+export type ArchiverConfig = ArchiverSpecificConfig & L1ReaderConfig & L1ContractsConfig & BlobSinkConfig & ChainConfig;
 export declare const archiverConfigMappings: ConfigMappingsType<ArchiverConfig>;
 /**
  * Returns the archiver configuration from the environment variables.

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

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/archiver/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAyB,MAAM,yBAAyB,CAAC;AACrF,OAAO,EACL,KAAK,mBAAmB,EACxB,KAAK,iBAAiB,EACtB,KAAK,cAAc,EAGpB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,KAAK,kBAAkB,EAA6C,MAAM,0BAA0B,CAAC;AAC9G,OAAO,EAAE,KAAK,WAAW,EAAuB,MAAM,sBAAsB,CAAC;AAE7E;;;;;GAKG;AAEH;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B,4GAA4G;IAC5G,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,qCAAqC;IACrC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAE5B,kFAAkF;IAClF,yBAAyB,CAAC,EAAE,MAAM,CAAC;IAEnC,+EAA+E;IAC/E,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B,2CAA2C;IAC3C,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAE/B,yCAAyC;IACzC,WAAW,EAAE,mBAAmB,CAAC;IAEjC,6EAA6E;IAC7E,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,GAAG,cAAc,GAChB,iBAAiB,GACjB,cAAc,GACd,WAAW,CAAC;AAEd,eAAO,MAAM,sBAAsB,EAAE,kBAAkB,CAAC,cAAc,CAmCrE,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,wBAAwB,IAAI,cAAc,CAEzD"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/archiver/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAyB,MAAM,yBAAyB,CAAC;AACrF,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,cAAc,EAIpB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,KAAK,kBAAkB,EAIxB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,KAAK,WAAW,EAAuB,MAAM,sBAAsB,CAAC;AAC7E,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAE9E;;;;;;GAMG;AACH,MAAM,MAAM,cAAc,GAAG,sBAAsB,GAAG,cAAc,GAAG,iBAAiB,GAAG,cAAc,GAAG,WAAW,CAAC;AAExH,eAAO,MAAM,sBAAsB,EAAE,kBAAkB,CAAC,cAAc,CAsCrE,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,wBAAwB,IAAI,cAAc,CAEzD"}

package/dest/archiver/config.js

@@ -1,18 +1,9 @@
 import { blobSinkConfigMapping } from '@aztec/blob-sink/client';
-import { l1ContractsConfigMappings, l1ReaderConfigMappings } from '@aztec/ethereum';
-import { getConfigFromMappings, numberConfigHelper } from '@aztec/foundation/config';
+import { l1ContractAddressesMapping, l1ContractsConfigMappings, l1ReaderConfigMappings } from '@aztec/ethereum';
+import { booleanConfigHelper, getConfigFromMappings, numberConfigHelper } from '@aztec/foundation/config';
 import { chainConfigMappings } from '@aztec/stdlib/config';
 export const archiverConfigMappings = {
     ...blobSinkConfigMapping,
-    archiverUrl: {
-        env: 'ARCHIVER_URL',
-        description: 'URL for an archiver service. If set, will return an archiver client as opposed to starting a new one.'
-    },
-    l1ConsensusHostUrl: {
-        env: 'L1_CONSENSUS_HOST_URL',
-        description: 'URL for an L1 consensus client.',
-        parseEnv: (val)=>val
-    },
     archiverPollingIntervalMS: {
         env: 'ARCHIVER_POLLING_INTERVAL_MS',
         description: 'The polling interval in ms for retrieving new L2 blocks and encrypted logs.',
@@ -28,6 +19,15 @@ export const archiverConfigMappings = {
         description: 'The max number of logs that can be obtained in 1 "getPublicLogs" call.',
         ...numberConfigHelper(1_000)
     },
+    archiverStoreMapSizeKb: {
+        env: 'ARCHIVER_STORE_MAP_SIZE_KB',
+        parseEnv: (val)=>val ? +val : undefined,
+        description: 'The maximum possible size of the archiver DB in KB. Overwrites the general dataStoreMapSizeKb.'
+    },
+    skipValidateBlockAttestations: {
+        description: 'Whether to skip validating block attestations (use only for testing).',
+        ...booleanConfigHelper(false)
+    },
     ...chainConfigMappings,
     ...l1ReaderConfigMappings,
     viemPollingIntervalMS: {
@@ -35,7 +35,11 @@ export const archiverConfigMappings = {
         description: 'The polling interval viem uses in ms',
         ...numberConfigHelper(1000)
     },
-    ...l1ContractsConfigMappings
+    ...l1ContractsConfigMappings,
+    l1Contracts: {
+        description: 'The deployed L1 contract addresses',
+        nested: l1ContractAddressesMapping
+    }
 };
 /**
  * Returns the archiver configuration from the environment variables.

package/dest/archiver/data_retrieval.d.ts

@@ -1,17 +1,29 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import type { BlobSinkClientInterface } from '@aztec/blob-sink/client';
-import type { ViemPublicClient } from '@aztec/ethereum';
+import type { ViemClient, ViemPublicClient } from '@aztec/ethereum';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
 import { type Logger } from '@aztec/foundation/log';
 import { type InboxAbi, RollupAbi } from '@aztec/l1-artifacts';
-import { L2Block } from '@aztec/stdlib/block';
-import { InboxLeaf } from '@aztec/stdlib/messaging';
+import { CommitteeAttestation, PublishedL2Block } from '@aztec/stdlib/block';
 import { Proof } from '@aztec/stdlib/proofs';
-import { type GetContractEventsReturnType, type GetContractReturnType, type Hex } from 'viem';
+import { CheckpointHeader } from '@aztec/stdlib/rollup';
+import { StateReference } from '@aztec/stdlib/tx';
+import { type GetContractReturnType, type Hex } from 'viem';
 import type { DataRetrieval } from './structs/data_retrieval.js';
-import type { L1Published } from './structs/published.js';
+import type { InboxMessage } from './structs/inbox_message.js';
+import type { L1PublishedData } from './structs/published.js';
+export type RetrievedL2Block = {
+    l2BlockNumber: number;
+    archiveRoot: Fr;
+    stateReference: StateReference;
+    header: CheckpointHeader;
+    blobFields: Fr[];
+    l1: L1PublishedData;
+    chainId: Fr;
+    version: Fr;
+    attestations: CommitteeAttestation[];
+};
+export declare function retrievedBlockToPublishedL2Block(retrievedBlock: RetrievedL2Block): Promise<PublishedL2Block>;
 /**
  * Fetches new L2 blocks.
  * @param publicClient - The viem public client to use for transaction retrieval.
@@ -21,16 +33,10 @@ import type { L1Published } from './structs/published.js';
  * @param expectedNextL2BlockNum - The next L2 block number that we expect to find.
  * @returns An array of block; as well as the next eth block to search from.
  */
-export declare function retrieveBlocksFromRollup(rollup: GetContractReturnType<typeof RollupAbi, ViemPublicClient>, publicClient: ViemPublicClient, blobSinkClient: BlobSinkClientInterface, searchStartBlock: bigint, searchEndBlock: bigint, logger?: Logger): Promise<L1Published<L2Block>[]>;
-/**
- * Processes newly received L2BlockProposed logs.
- * @param rollup - The rollup contract
- * @param publicClient - The viem public client to use for transaction retrieval.
- * @param logs - L2BlockProposed logs.
- * @returns - An array blocks.
- */
-export declare function processL2BlockProposedLogs(rollup: GetContractReturnType<typeof RollupAbi, ViemPublicClient>, publicClient: ViemPublicClient, blobSinkClient: BlobSinkClientInterface, logs: GetContractEventsReturnType<typeof RollupAbi, 'L2BlockProposed'>, logger: Logger): Promise<L1Published<L2Block>[]>;
+export declare function retrieveBlocksFromRollup(rollup: GetContractReturnType<typeof RollupAbi, ViemPublicClient>, publicClient: ViemPublicClient, blobSinkClient: BlobSinkClientInterface, searchStartBlock: bigint, searchEndBlock: bigint, logger?: Logger): Promise<RetrievedL2Block[]>;
 export declare function getL1BlockTime(publicClient: ViemPublicClient, blockNumber: bigint): Promise<bigint>;
+/** Given an L1 to L2 message, retrieves its corresponding event from the Inbox within a specific block range. */
+export declare function retrieveL1ToL2Message(inbox: GetContractReturnType<typeof InboxAbi, ViemClient>, leaf: Fr, fromBlock: bigint, toBlock: bigint): Promise<InboxMessage | undefined>;
 /**
  * Fetch L1 to L2 messages.
  * @param publicClient - The viem public client to use for transaction retrieval.
@@ -40,11 +46,11 @@ export declare function getL1BlockTime(publicClient: ViemPublicClient, blockNumb
  * @param searchEndBlock - The highest block number that we should search up to.
  * @returns An array of InboxLeaf and next eth block to search from.
  */
-export declare function retrieveL1ToL2Messages(inbox: GetContractReturnType<typeof InboxAbi, ViemPublicClient>, searchStartBlock: bigint, searchEndBlock: bigint): Promise<DataRetrieval<InboxLeaf>>;
+export declare function retrieveL1ToL2Messages(inbox: GetContractReturnType<typeof InboxAbi, ViemClient>, searchStartBlock: bigint, searchEndBlock: bigint): Promise<InboxMessage[]>;
 /** Retrieves L2ProofVerified events from the rollup contract. */
 export declare function retrieveL2ProofVerifiedEvents(publicClient: ViemPublicClient, rollupAddress: EthAddress, searchStartBlock: bigint, searchEndBlock?: bigint): Promise<{
     l1BlockNumber: bigint;
-    l2BlockNumber: bigint;
+    l2BlockNumber: number;
     proverId: Fr;
     txHash: Hex;
 }[]>;
@@ -52,13 +58,12 @@ export declare function retrieveL2ProofVerifiedEvents(publicClient: ViemPublicCl
 export declare function retrieveL2ProofsFromRollup(publicClient: ViemPublicClient, rollupAddress: EthAddress, searchStartBlock: bigint, searchEndBlock?: bigint): Promise<DataRetrieval<{
     proof: Proof;
     proverId: Fr;
-    l2BlockNumber: bigint;
+    l2BlockNumber: number;
     txHash: `0x${string}`;
 }>>;
 export type SubmitBlockProof = {
     archiveRoot: Fr;
     proverId: Fr;
-    aggregationObject: Buffer;
     proof: Proof;
 };
 /**

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

package/dest/archiver/data_retrieval.js

@@ -1,16 +1,54 @@
-import { Blob, BlobDeserializationError } from '@aztec/blob-lib';
+import { BlobDeserializationError, SpongeBlob, getBlobFieldsInCheckpoint } from '@aztec/blob-lib';
 import { asyncPool } from '@aztec/foundation/async-pool';
+import { Buffer16, Buffer32 } from '@aztec/foundation/buffer';
 import { Fr } from '@aztec/foundation/fields';
 import { createLogger } from '@aztec/foundation/log';
-import { numToUInt32BE } from '@aztec/foundation/serialize';
-import { ForwarderAbi, RollupAbi } from '@aztec/l1-artifacts';
-import { Body, L2Block } from '@aztec/stdlib/block';
-import { InboxLeaf } from '@aztec/stdlib/messaging';
+import { RollupAbi } from '@aztec/l1-artifacts';
+import { Body, CommitteeAttestation, L2Block, L2BlockHeader, PublishedL2Block } from '@aztec/stdlib/block';
 import { Proof } from '@aztec/stdlib/proofs';
+import { CheckpointHeader } from '@aztec/stdlib/rollup';
 import { AppendOnlyTreeSnapshot } from '@aztec/stdlib/trees';
-import { BlockHeader } from '@aztec/stdlib/tx';
-import { decodeFunctionData, getAbiItem, hexToBytes } from 'viem';
+import { GlobalVariables, StateReference } from '@aztec/stdlib/tx';
+import { decodeFunctionData, getAbiItem, hexToBytes, multicall3Abi } from 'viem';
 import { NoBlobBodiesFoundError } from './errors.js';
+export async function retrievedBlockToPublishedL2Block(retrievedBlock) {
+    const { l2BlockNumber, archiveRoot, stateReference, header: checkpointHeader, blobFields, l1, chainId, version, attestations } = retrievedBlock;
+    const archive = new AppendOnlyTreeSnapshot(archiveRoot, l2BlockNumber + 1);
+    const globalVariables = GlobalVariables.from({
+        chainId,
+        version,
+        blockNumber: l2BlockNumber,
+        slotNumber: checkpointHeader.slotNumber,
+        timestamp: checkpointHeader.timestamp,
+        coinbase: checkpointHeader.coinbase,
+        feeRecipient: checkpointHeader.feeRecipient,
+        gasFees: checkpointHeader.gasFees
+    });
+    // TODO(#17027)
+    // This works when there's only one block in the checkpoint.
+    // If there's more than one block, we need to build the spongeBlob from the endSpongeBlob of the previous block.
+    const spongeBlob = await SpongeBlob.init(blobFields.length);
+    // Skip the first field which is the checkpoint prefix indicating the number of total blob fields in a checkpoint.
+    const blockBlobFields = blobFields.slice(1);
+    await spongeBlob.absorb(blockBlobFields);
+    const spongeBlobHash = await spongeBlob.squeeze();
+    const body = Body.fromBlobFields(blockBlobFields);
+    const header = L2BlockHeader.from({
+        lastArchive: new AppendOnlyTreeSnapshot(checkpointHeader.lastArchiveRoot, l2BlockNumber),
+        contentCommitment: checkpointHeader.contentCommitment,
+        state: stateReference,
+        globalVariables,
+        totalFees: body.txEffects.reduce((accum, txEffect)=>accum.add(txEffect.transactionFee), Fr.ZERO),
+        totalManaUsed: checkpointHeader.totalManaUsed,
+        spongeBlobHash
+    });
+    const block = new L2Block(archive, header, body);
+    return PublishedL2Block.fromFields({
+        block,
+        l1,
+        attestations
+    });
+}
 /**
  * Fetches new L2 blocks.
  * @param publicClient - The viem public client to use for transaction retrieval.
@@ -21,6 +59,7 @@ import { NoBlobBodiesFoundError } from './errors.js';
  * @returns An array of block; as well as the next eth block to search from.
  */ export async function retrieveBlocksFromRollup(rollup, publicClient, blobSinkClient, searchStartBlock, searchEndBlock, logger = createLogger('archiver')) {
     const retrievedBlocks = [];
+    let rollupConstants;
     do {
         if (searchStartBlock > searchEndBlock) {
             break;
@@ -34,7 +73,19 @@ import { NoBlobBodiesFoundError } from './errors.js';
         }
         const lastLog = l2BlockProposedLogs[l2BlockProposedLogs.length - 1];
         logger.debug(`Got ${l2BlockProposedLogs.length} L2 block processed logs for L2 blocks ${l2BlockProposedLogs[0].args.blockNumber}-${lastLog.args.blockNumber} between L1 blocks ${searchStartBlock}-${searchEndBlock}`);
-        const newBlocks = await processL2BlockProposedLogs(rollup, publicClient, blobSinkClient, l2BlockProposedLogs, logger);
+        if (rollupConstants === undefined) {
+            const [chainId, version, targetCommitteeSize] = await Promise.all([
+                publicClient.getChainId(),
+                rollup.read.getVersion(),
+                rollup.read.getTargetCommitteeSize()
+            ]);
+            rollupConstants = {
+                chainId: new Fr(chainId),
+                version: new Fr(version),
+                targetCommitteeSize: Number(targetCommitteeSize)
+            };
+        }
+        const newBlocks = await processL2BlockProposedLogs(rollup, publicClient, blobSinkClient, l2BlockProposedLogs, rollupConstants, logger);
         retrievedBlocks.push(...newBlocks);
         searchStartBlock = lastLog.blockNumber + 1n;
     }while (searchStartBlock <= searchEndBlock)
@@ -47,26 +98,34 @@ import { NoBlobBodiesFoundError } from './errors.js';
  * @param publicClient - The viem public client to use for transaction retrieval.
  * @param logs - L2BlockProposed logs.
  * @returns - An array blocks.
- */ export async function processL2BlockProposedLogs(rollup, publicClient, blobSinkClient, logs, logger) {
+ */ async function processL2BlockProposedLogs(rollup, publicClient, blobSinkClient, logs, { chainId, version, targetCommitteeSize }, logger) {
     const retrievedBlocks = [];
     await asyncPool(10, logs, async (log)=>{
-        const l2BlockNumber = log.args.blockNumber;
+        const l2BlockNumber = Number(log.args.blockNumber);
         const archive = log.args.archive;
         const archiveFromChain = await rollup.read.archiveAt([
-            l2BlockNumber
+            BigInt(l2BlockNumber)
         ]);
         const blobHashes = log.args.versionedBlobHashes.map((blobHash)=>Buffer.from(blobHash.slice(2), 'hex'));
         // The value from the event and contract will match only if the block is in the chain.
         if (archive === archiveFromChain) {
-            const block = await getBlockFromRollupTx(publicClient, blobSinkClient, log.transactionHash, blobHashes, l2BlockNumber, rollup.address, logger);
+            const block = await getBlockFromRollupTx(publicClient, blobSinkClient, log.transactionHash, blobHashes, l2BlockNumber, rollup.address, targetCommitteeSize, logger);
             const l1 = {
                 blockNumber: log.blockNumber,
                 blockHash: log.blockHash,
                 timestamp: await getL1BlockTime(publicClient, log.blockNumber)
             };
             retrievedBlocks.push({
-                data: block,
-                l1
+                ...block,
+                l1,
+                chainId,
+                version
+            });
+            logger.trace(`Retrieved L2 block ${l2BlockNumber} from L1 tx ${log.transactionHash}`, {
+                l1BlockNumber: log.blockNumber,
+                l2BlockNumber,
+                archive: archive.toString(),
+                attestations: block.attestations
             });
         } else {
             logger.warn(`Ignoring L2 block ${l2BlockNumber} due to archive root mismatch`, {
@@ -85,31 +144,30 @@ export async function getL1BlockTime(publicClient, blockNumber) {
     return block.timestamp;
 }
 /**
- * Extracts the first 'propose' method calldata from a forwarder transaction's data.
- * @param forwarderData - The forwarder transaction input data
+ * Extracts the first 'propose' method calldata from a multicall3 transaction's data.
+ * @param multicall3Data - The multicall3 transaction input data
  * @param rollupAddress - The address of the rollup contract
  * @returns The calldata for the first 'propose' method call to the rollup contract
- */ function extractRollupProposeCalldata(forwarderData, rollupAddress) {
-    // TODO(#11451): custom forwarders
-    const { functionName: forwarderFunctionName, args: forwarderArgs } = decodeFunctionData({
-        abi: ForwarderAbi,
-        data: forwarderData
+ */ function extractRollupProposeCalldata(multicall3Data, rollupAddress) {
+    const { functionName: multicall3FunctionName, args: multicall3Args } = decodeFunctionData({
+        abi: multicall3Abi,
+        data: multicall3Data
     });
-    if (forwarderFunctionName !== 'forward') {
-        throw new Error(`Unexpected forwarder method called ${forwarderFunctionName}`);
+    if (multicall3FunctionName !== 'aggregate3') {
+        throw new Error(`Unexpected multicall3 method called ${multicall3FunctionName}`);
     }
-    if (forwarderArgs.length !== 2) {
-        throw new Error(`Unexpected number of arguments for forwarder`);
+    if (multicall3Args.length !== 1) {
+        throw new Error(`Unexpected number of arguments for multicall3`);
     }
-    const [to, data] = forwarderArgs;
+    const [calls] = multicall3Args;
     // Find all rollup calls
     const rollupAddressLower = rollupAddress.toLowerCase();
-    for(let i = 0; i < to.length; i++){
-        const addr = to[i];
+    for(let i = 0; i < calls.length; i++){
+        const addr = calls[i].target;
         if (addr.toLowerCase() !== rollupAddressLower) {
             continue;
         }
-        const callData = data[i];
+        const callData = calls[i].callData;
         try {
             const { functionName: rollupFunctionName } = decodeFunctionData({
                 abi: RollupAbi,
@@ -118,11 +176,11 @@ export async function getL1BlockTime(publicClient, blockNumber) {
             if (rollupFunctionName === 'propose') {
                 return callData;
             }
-        } catch (err) {
+        } catch  {
             continue;
         }
     }
-    throw new Error(`Rollup address not found in forwarder args`);
+    throw new Error(`Rollup address not found in multicall3 args`);
 }
 /**
  * Gets block from the calldata of an L1 transaction.
@@ -130,9 +188,9 @@ export async function getL1BlockTime(publicClient, blockNumber) {
  * 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.
+ * @param l2BlockNumber - L2 block number.
  * @returns L2 block from the calldata, deserialized
- */ async function getBlockFromRollupTx(publicClient, blobSinkClient, txHash, blobHashes, l2BlockNum, rollupAddress, logger) {
+ */ async function getBlockFromRollupTx(publicClient, blobSinkClient, txHash, blobHashes, l2BlockNumber, rollupAddress, targetCommitteeSize, logger) {
     const { input: forwarderData, blockHash } = await publicClient.getTransaction({
         hash: txHash
     });
@@ -144,15 +202,27 @@ export async function getL1BlockTime(publicClient, blockNumber) {
     if (rollupFunctionName !== 'propose') {
         throw new Error(`Unexpected rollup method called ${rollupFunctionName}`);
     }
-    const [decodedArgs] = rollupArgs;
-    const header = BlockHeader.fromBuffer(Buffer.from(hexToBytes(decodedArgs.header)));
+    const [decodedArgs, packedAttestations, _signers, _blobInput] = rollupArgs;
+    const attestations = CommitteeAttestation.fromPacked(packedAttestations, targetCommitteeSize);
+    logger.trace(`Recovered propose calldata from tx ${txHash}`, {
+        l2BlockNumber,
+        archive: decodedArgs.archive,
+        stateReference: decodedArgs.stateReference,
+        header: decodedArgs.header,
+        blobHashes,
+        attestations,
+        packedAttestations,
+        targetCommitteeSize
+    });
+    const header = CheckpointHeader.fromViem(decodedArgs.header);
     const blobBodies = await blobSinkClient.getBlobSidecar(blockHash, blobHashes);
     if (blobBodies.length === 0) {
-        throw new NoBlobBodiesFoundError(Number(l2BlockNum));
+        throw new NoBlobBodiesFoundError(l2BlockNumber);
     }
-    let blockFields;
+    let blobFields;
     try {
-        blockFields = Blob.toEncodedFields(blobBodies);
+        // Get the fields that were actually added in the checkpoint. And check the encoding of the fields.
+        blobFields = getBlobFieldsInCheckpoint(blobBodies.map((b)=>b.blob), true);
     } catch (err) {
         if (err instanceof BlobDeserializationError) {
             logger.fatal(err.message);
@@ -161,17 +231,26 @@ export async function getL1BlockTime(publicClient, blockNumber) {
         }
         throw err;
     }
-    // The blob source gives us blockFields, and we must construct the body from them:
-    const blockBody = Body.fromBlobFields(blockFields);
-    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(decodedArgs.archive)),
-        numToUInt32BE(Number(l2BlockNum + 1n))
-    ]));
-    return new L2Block(archive, header, blockBody);
+    const archiveRoot = new Fr(Buffer.from(hexToBytes(decodedArgs.archive)));
+    const stateReference = StateReference.fromViem(decodedArgs.stateReference);
+    return {
+        l2BlockNumber,
+        archiveRoot,
+        stateReference,
+        header,
+        blobFields,
+        attestations
+    };
+}
+/** Given an L1 to L2 message, retrieves its corresponding event from the Inbox within a specific block range. */ export async function retrieveL1ToL2Message(inbox, leaf, fromBlock, toBlock) {
+    const logs = await inbox.getEvents.MessageSent({
+        hash: leaf.toString()
+    }, {
+        fromBlock,
+        toBlock
+    });
+    const messages = mapLogsInboxMessage(logs);
+    return messages.length > 0 ? messages[0] : undefined;
 }
 /**
  * Fetch L1 to L2 messages.
@@ -183,10 +262,7 @@ export async function getL1BlockTime(publicClient, blockNumber) {
  * @returns An array of InboxLeaf and next eth block to search from.
  */ export async function retrieveL1ToL2Messages(inbox, searchStartBlock, searchEndBlock) {
     const retrievedL1ToL2Messages = [];
-    do {
-        if (searchStartBlock > searchEndBlock) {
-            break;
-        }
+    while(searchStartBlock <= searchEndBlock){
         const messageSentLogs = (await inbox.getEvents.MessageSent({}, {
             fromBlock: searchStartBlock,
             toBlock: searchEndBlock
@@ -194,17 +270,23 @@ export async function getL1BlockTime(publicClient, blockNumber) {
         if (messageSentLogs.length === 0) {
             break;
         }
-        for (const log of messageSentLogs){
-            const { index, hash } = log.args;
-            retrievedL1ToL2Messages.push(new InboxLeaf(index, Fr.fromHexString(hash)));
-        }
-        // handles the case when there are no new messages:
-        searchStartBlock = (messageSentLogs.findLast((msgLog)=>!!msgLog)?.blockNumber || searchStartBlock) + 1n;
-    }while (searchStartBlock <= searchEndBlock)
-    return {
-        lastProcessedL1BlockNumber: searchStartBlock - 1n,
-        retrievedData: retrievedL1ToL2Messages
-    };
+        retrievedL1ToL2Messages.push(...mapLogsInboxMessage(messageSentLogs));
+        searchStartBlock = messageSentLogs.at(-1).blockNumber + 1n;
+    }
+    return retrievedL1ToL2Messages;
+}
+function mapLogsInboxMessage(logs) {
+    return logs.map((log)=>{
+        const { index, hash, l2BlockNumber, rollingHash } = log.args;
+        return {
+            index: index,
+            leaf: Fr.fromHexString(hash),
+            l1BlockNumber: log.blockNumber,
+            l1BlockHash: Buffer32.fromString(log.blockHash),
+            l2BlockNumber: Number(l2BlockNumber),
+            rollingHash: Buffer16.fromString(rollingHash)
+        };
+    });
 }
 /** Retrieves L2ProofVerified events from the rollup contract. */ export async function retrieveL2ProofVerifiedEvents(publicClient, rollupAddress, searchStartBlock, searchEndBlock) {
     const logs = await publicClient.getLogs({
@@ -219,7 +301,7 @@ export async function getL1BlockTime(publicClient, blockNumber) {
     });
     return logs.map((log)=>({
             l1BlockNumber: log.blockNumber,
-            l2BlockNumber: log.args.blockNumber,
+            l2BlockNumber: Number(log.args.blockNumber),
             proverId: Fr.fromHexString(log.args.proverId),
             txHash: log.transactionHash
         }));
@@ -260,11 +342,9 @@ export async function getL1BlockTime(publicClient, blockNumber) {
     });
     let proverId;
     let archiveRoot;
-    let aggregationObject;
     let proof;
     if (functionName === 'submitEpochRootProof') {
         const [decodedArgs] = args;
-        aggregationObject = Buffer.from(hexToBytes(decodedArgs.aggregationObject));
         proverId = Fr.fromHexString(decodedArgs.args.proverId);
         archiveRoot = Fr.fromHexString(decodedArgs.args.endArchive);
         proof = Proof.fromBuffer(Buffer.from(hexToBytes(decodedArgs.proof)));
@@ -276,7 +356,6 @@ export async function getL1BlockTime(publicClient, blockNumber) {
     }
     return {
         proverId,
-        aggregationObject,
         archiveRoot,
         proof
     };

package/dest/archiver/errors.d.ts

@@ -1,4 +1,12 @@
 export declare class NoBlobBodiesFoundError extends Error {
     constructor(l2BlockNum: number);
 }
+export declare class InitialBlockNumberNotSequentialError extends Error {
+    readonly newBlockNumber: number;
+    readonly previousBlockNumber: number | undefined;
+    constructor(newBlockNumber: number, previousBlockNumber: number | undefined);
+}
+export declare class BlockNumberNotSequentialError extends Error {
+    constructor(newBlockNumber: number, previous: number | undefined);
+}
 //# sourceMappingURL=errors.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../src/archiver/errors.ts"],"names":[],"mappings":"AAAA,qBAAa,sBAAuB,SAAQ,KAAK;gBACnC,UAAU,EAAE,MAAM;CAG/B"}
+{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../src/archiver/errors.ts"],"names":[],"mappings":"AAAA,qBAAa,sBAAuB,SAAQ,KAAK;gBACnC,UAAU,EAAE,MAAM;CAG/B;AAED,qBAAa,oCAAqC,SAAQ,KAAK;aAE3C,cAAc,EAAE,MAAM;aACtB,mBAAmB,EAAE,MAAM,GAAG,SAAS;gBADvC,cAAc,EAAE,MAAM,EACtB,mBAAmB,EAAE,MAAM,GAAG,SAAS;CAQ1D;AAED,qBAAa,6BAA8B,SAAQ,KAAK;gBAC1C,cAAc,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS;CAKjE"}

package/dest/archiver/errors.js

@@ -3,3 +3,15 @@ export class NoBlobBodiesFoundError extends Error {
         super(`No blob bodies found for block ${l2BlockNum}`);
     }
 }
+export class InitialBlockNumberNotSequentialError extends Error {
+    newBlockNumber;
+    previousBlockNumber;
+    constructor(newBlockNumber, previousBlockNumber){
+        super(`Cannot insert new block ${newBlockNumber} given previous block number in store is ${previousBlockNumber ?? 'undefined'}`), this.newBlockNumber = newBlockNumber, this.previousBlockNumber = previousBlockNumber;
+    }
+}
+export class BlockNumberNotSequentialError extends Error {
+    constructor(newBlockNumber, previous){
+        super(`Cannot insert new block ${newBlockNumber} given previous block number in batch is ${previous ?? 'undefined'}`);
+    }
+}

package/dest/archiver/index.d.ts

@@ -1,8 +1,7 @@
 export * from './archiver.js';
 export * from './config.js';
-export { type L1Published, type L1PublishedData } from './structs/published.js';
-export { MemoryArchiverStore } from './memory_archiver_store/memory_archiver_store.js';
+export { type PublishedL2Block, type L1PublishedData } from './structs/published.js';
 export type { ArchiverDataStore } from './archiver_store.js';
-export { KVArchiverDataStore } from './kv_archiver_store/kv_archiver_store.js';
+export { KVArchiverDataStore, ARCHIVER_DB_VERSION } from './kv_archiver_store/kv_archiver_store.js';
 export { ContractInstanceStore } from './kv_archiver_store/contract_instance_store.js';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/archiver/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAChF,OAAO,EAAE,mBAAmB,EAAE,MAAM,kDAAkD,CAAC;AACvF,YAAY,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAC/E,OAAO,EAAE,qBAAqB,EAAE,MAAM,gDAAgD,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/archiver/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,OAAO,EAAE,KAAK,gBAAgB,EAAE,KAAK,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACrF,YAAY,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AACpG,OAAO,EAAE,qBAAqB,EAAE,MAAM,gDAAgD,CAAC"}

package/dest/archiver/index.js

@@ -1,5 +1,4 @@
 export * from './archiver.js';
 export * from './config.js';
-export { MemoryArchiverStore } from './memory_archiver_store/memory_archiver_store.js';
-export { KVArchiverDataStore } from './kv_archiver_store/kv_archiver_store.js';
+export { KVArchiverDataStore, ARCHIVER_DB_VERSION } from './kv_archiver_store/kv_archiver_store.js';
 export { ContractInstanceStore } from './kv_archiver_store/contract_instance_store.js';

package/dest/archiver/instrumentation.d.ts

@@ -5,19 +5,25 @@ export declare class ArchiverInstrumentation {
     readonly tracer: Tracer;
     private blockHeight;
     private txCount;
-    private syncDuration;
-    private l1BlocksSynced;
     private l1BlockHeight;
     private proofsSubmittedDelay;
     private proofsSubmittedCount;
     private dbMetrics;
+    private pruneDuration;
     private pruneCount;
+    private syncDurationPerBlock;
+    private syncBlockCount;
+    private manaPerBlock;
+    private txsPerBlock;
+    private syncDurationPerMessage;
+    private syncMessageCount;
     private log;
     private constructor();
     static new(telemetry: TelemetryClient, lmdbStats?: LmdbStatsCallback): Promise<ArchiverInstrumentation>;
     isEnabled(): boolean;
     processNewBlocks(syncTimePerBlock: number, blocks: L2Block[]): void;
-    processPrune(): void;
+    processNewMessages(count: number, syncPerMessageMs: number): void;
+    processPrune(duration: number): void;
     updateLastProvenBlock(blockNumber: number): void;
     processProofsVerified(logs: {
         proverId: string;