@aztec/archiver 0.0.0-test.0 → 0.0.1-commit.21caa21

package/dest/archiver/data_retrieval.js

@@ -1,81 +1,165 @@
-import { Blob, BlobDeserializationError } from '@aztec/blob-lib';
+import { BlobDeserializationError, SpongeBlob, decodeCheckpointBlobDataFromBlobs, encodeBlockBlobData } 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, L2BlockNew } from '@aztec/stdlib/block';
+import { Checkpoint, PublishedCheckpoint } from '@aztec/stdlib/checkpoint';
 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 { BlockHeader, GlobalVariables, PartialStateReference, StateReference } from '@aztec/stdlib/tx';
+import { decodeFunctionData, getAbiItem, hexToBytes, multicall3Abi } from 'viem';
 import { NoBlobBodiesFoundError } from './errors.js';
+export async function retrievedToPublishedCheckpoint({ checkpointNumber, archiveRoot, header: checkpointHeader, checkpointBlobData, l1, chainId, version, attestations }) {
+    const { blocks: blocksBlobData } = checkpointBlobData;
+    // The lastArchiveRoot of a block is the new archive for the previous block.
+    const newArchiveRoots = blocksBlobData.map((b)=>b.lastArchiveRoot).slice(1).concat([
+        archiveRoot
+    ]);
+    // `blocksBlobData` is created from `decodeCheckpointBlobDataFromBlobs`. An error will be thrown if it can't read a
+    // field for the `l1ToL2MessageRoot` of the first block. So below we can safely assume it exists:
+    const l1toL2MessageTreeRoot = blocksBlobData[0].l1ToL2MessageRoot;
+    const spongeBlob = SpongeBlob.init();
+    const l2Blocks = [];
+    for(let i = 0; i < blocksBlobData.length; i++){
+        const blockBlobData = blocksBlobData[i];
+        const { blockEndMarker, blockEndStateField, lastArchiveRoot, noteHashRoot, nullifierRoot, publicDataRoot } = blockBlobData;
+        const l2BlockNumber = blockEndMarker.blockNumber;
+        const globalVariables = GlobalVariables.from({
+            chainId,
+            version,
+            blockNumber: l2BlockNumber,
+            slotNumber: checkpointHeader.slotNumber,
+            timestamp: blockEndMarker.timestamp,
+            coinbase: checkpointHeader.coinbase,
+            feeRecipient: checkpointHeader.feeRecipient,
+            gasFees: checkpointHeader.gasFees
+        });
+        const state = StateReference.from({
+            l1ToL2MessageTree: new AppendOnlyTreeSnapshot(l1toL2MessageTreeRoot, blockEndStateField.l1ToL2MessageNextAvailableLeafIndex),
+            partial: PartialStateReference.from({
+                noteHashTree: new AppendOnlyTreeSnapshot(noteHashRoot, blockEndStateField.noteHashNextAvailableLeafIndex),
+                nullifierTree: new AppendOnlyTreeSnapshot(nullifierRoot, blockEndStateField.nullifierNextAvailableLeafIndex),
+                publicDataTree: new AppendOnlyTreeSnapshot(publicDataRoot, blockEndStateField.publicDataNextAvailableLeafIndex)
+            })
+        });
+        const body = Body.fromTxBlobData(checkpointBlobData.blocks[0].txs);
+        const blobFields = encodeBlockBlobData(blockBlobData);
+        await spongeBlob.absorb(blobFields);
+        const clonedSpongeBlob = spongeBlob.clone();
+        const spongeBlobHash = await clonedSpongeBlob.squeeze();
+        const header = BlockHeader.from({
+            lastArchive: new AppendOnlyTreeSnapshot(lastArchiveRoot, l2BlockNumber),
+            state,
+            spongeBlobHash,
+            globalVariables,
+            totalFees: body.txEffects.reduce((accum, txEffect)=>accum.add(txEffect.transactionFee), Fr.ZERO),
+            totalManaUsed: new Fr(blockEndStateField.totalManaUsed)
+        });
+        const newArchive = new AppendOnlyTreeSnapshot(newArchiveRoots[i], l2BlockNumber + 1);
+        l2Blocks.push(new L2BlockNew(newArchive, header, body));
+    }
+    const lastBlock = l2Blocks.at(-1);
+    const checkpoint = Checkpoint.from({
+        archive: new AppendOnlyTreeSnapshot(archiveRoot, lastBlock.number + 1),
+        header: checkpointHeader,
+        blocks: l2Blocks,
+        number: checkpointNumber
+    });
+    return PublishedCheckpoint.from({
+        checkpoint,
+        l1,
+        attestations
+    });
+}
 /**
- * Fetches new L2 blocks.
+ * Fetches new checkpoints.
  * @param publicClient - The viem public client to use for transaction retrieval.
  * @param rollupAddress - The address of the rollup contract.
  * @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 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 = [];
+ */ export async function retrieveCheckpointsFromRollup(rollup, publicClient, blobSinkClient, searchStartBlock, searchEndBlock, logger = createLogger('archiver')) {
+    const retrievedCheckpoints = [];
+    let rollupConstants;
     do {
         if (searchStartBlock > searchEndBlock) {
             break;
         }
-        const l2BlockProposedLogs = (await rollup.getEvents.L2BlockProposed({}, {
+        const checkpointProposedLogs = (await rollup.getEvents.CheckpointProposed({}, {
             fromBlock: searchStartBlock,
             toBlock: searchEndBlock
         })).filter((log)=>log.blockNumber >= searchStartBlock && log.blockNumber <= searchEndBlock);
-        if (l2BlockProposedLogs.length === 0) {
+        if (checkpointProposedLogs.length === 0) {
             break;
         }
-        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);
-        retrievedBlocks.push(...newBlocks);
+        const lastLog = checkpointProposedLogs.at(-1);
+        logger.debug(`Got ${checkpointProposedLogs.length} processed logs for checkpoints  ${checkpointProposedLogs[0].args.checkpointNumber}-${lastLog.args.checkpointNumber} between L1 blocks ${searchStartBlock}-${searchEndBlock}`);
+        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 newCheckpoints = await processCheckpointProposedLogs(rollup, publicClient, blobSinkClient, checkpointProposedLogs, rollupConstants, logger);
+        retrievedCheckpoints.push(...newCheckpoints);
         searchStartBlock = lastLog.blockNumber + 1n;
     }while (searchStartBlock <= searchEndBlock)
-    // The asyncpool from processL2BlockProposedLogs will not necessarily return the blocks in order, so we sort them before returning.
-    return retrievedBlocks.sort((a, b)=>Number(a.l1.blockNumber - b.l1.blockNumber));
+    // The asyncPool from processCheckpointProposedLogs will not necessarily return the checkpoints in order, so we sort them before returning.
+    return retrievedCheckpoints.sort((a, b)=>Number(a.l1.blockNumber - b.l1.blockNumber));
 }
 /**
- * Processes newly received L2BlockProposed logs.
+ * Processes newly received CheckpointProposed 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 async function processL2BlockProposedLogs(rollup, publicClient, blobSinkClient, logs, logger) {
-    const retrievedBlocks = [];
+ * @param logs - CheckpointProposed logs.
+ * @returns - An array of checkpoints.
+ */ async function processCheckpointProposedLogs(rollup, publicClient, blobSinkClient, logs, { chainId, version, targetCommitteeSize }, logger) {
+    const retrievedCheckpoints = [];
     await asyncPool(10, logs, async (log)=>{
-        const l2BlockNumber = log.args.blockNumber;
+        const checkpointNumber = Number(log.args.checkpointNumber);
         const archive = log.args.archive;
         const archiveFromChain = await rollup.read.archiveAt([
-            l2BlockNumber
+            BigInt(checkpointNumber)
         ]);
         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.
+        // The value from the event and contract will match only if the checkpoint is in the chain.
         if (archive === archiveFromChain) {
-            const block = await getBlockFromRollupTx(publicClient, blobSinkClient, log.transactionHash, blobHashes, l2BlockNumber, rollup.address, logger);
+            const checkpoint = await getCheckpointFromRollupTx(publicClient, blobSinkClient, log.transactionHash, blobHashes, checkpointNumber, rollup.address, targetCommitteeSize, logger);
             const l1 = {
                 blockNumber: log.blockNumber,
                 blockHash: log.blockHash,
                 timestamp: await getL1BlockTime(publicClient, log.blockNumber)
             };
-            retrievedBlocks.push({
-                data: block,
-                l1
+            retrievedCheckpoints.push({
+                ...checkpoint,
+                l1,
+                chainId,
+                version
+            });
+            logger.trace(`Retrieved checkpoint ${checkpointNumber} from L1 tx ${log.transactionHash}`, {
+                l1BlockNumber: log.blockNumber,
+                checkpointNumber,
+                archive: archive.toString(),
+                attestations: checkpoint.attestations
             });
         } else {
-            logger.warn(`Ignoring L2 block ${l2BlockNumber} due to archive root mismatch`, {
+            logger.warn(`Ignoring checkpoint ${checkpointNumber} due to archive root mismatch`, {
                 actual: archive,
                 expected: archiveFromChain
             });
         }
     });
-    return retrievedBlocks;
+    return retrievedCheckpoints;
 }
 export async function getL1BlockTime(publicClient, blockNumber) {
     const block = await publicClient.getBlock({
@@ -85,31 +169,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,21 +201,22 @@ 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.
- * Assumes that the block was published from an EOA.
+ * Gets checkpoint from the calldata of an L1 transaction.
+ * Assumes that the checkpoint 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 L2 block from the calldata, deserialized
- */ async function getBlockFromRollupTx(publicClient, blobSinkClient, txHash, blobHashes, l2BlockNum, rollupAddress, logger) {
+ * @param checkpointNumber - Checkpoint number.
+ * @returns Checkpoint from the calldata, deserialized
+ */ async function getCheckpointFromRollupTx(publicClient, blobSinkClient, txHash, blobHashes, checkpointNumber, rollupAddress, targetCommitteeSize, logger) {
+    logger.trace(`Fetching checkpoint ${checkpointNumber} from rollup tx ${txHash}`);
     const { input: forwarderData, blockHash } = await publicClient.getTransaction({
         hash: txHash
     });
@@ -144,15 +228,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}`, {
+        checkpointNumber,
+        archive: decodedArgs.archive,
+        header: decodedArgs.header,
+        l1BlockHash: blockHash,
+        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(checkpointNumber);
     }
-    let blockFields;
+    let checkpointBlobData;
     try {
-        blockFields = Blob.toEncodedFields(blobBodies);
+        // Attempt to decode the checkpoint blob data.
+        checkpointBlobData = decodeCheckpointBlobDataFromBlobs(blobBodies.map((b)=>b.blob));
     } catch (err) {
         if (err instanceof BlobDeserializationError) {
             logger.fatal(err.message);
@@ -161,17 +257,24 @@ 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)));
+    return {
+        checkpointNumber,
+        archiveRoot,
+        header,
+        checkpointBlobData,
+        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 +286,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 +294,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, checkpointNumber, rollingHash } = log.args;
+        return {
+            index: index,
+            leaf: Fr.fromHexString(hash),
+            l1BlockNumber: log.blockNumber,
+            l1BlockHash: Buffer32.fromString(log.blockHash),
+            l2BlockNumber: Number(checkpointNumber),
+            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 +325,7 @@ export async function getL1BlockTime(publicClient, blockNumber) {
     });
     return logs.map((log)=>({
             l1BlockNumber: log.blockNumber,
-            l2BlockNumber: log.args.blockNumber,
+            checkpointNumber: Number(log.args.checkpointNumber),
             proverId: Fr.fromHexString(log.args.proverId),
             txHash: log.transactionHash
         }));
@@ -228,12 +334,12 @@ export async function getL1BlockTime(publicClient, blockNumber) {
     const logs = await retrieveL2ProofVerifiedEvents(publicClient, rollupAddress, searchStartBlock, searchEndBlock);
     const retrievedData = [];
     const lastProcessedL1BlockNumber = logs.length > 0 ? logs.at(-1).l1BlockNumber : searchStartBlock - 1n;
-    for (const { txHash, proverId, l2BlockNumber } of logs){
+    for (const { txHash, proverId, checkpointNumber } of logs){
         const proofData = await getProofFromSubmitProofTx(publicClient, txHash, proverId);
         retrievedData.push({
             proof: proofData.proof,
             proverId: proofData.proverId,
-            l2BlockNumber,
+            checkpointNumber,
             txHash
         });
     }
@@ -243,13 +349,13 @@ export async function getL1BlockTime(publicClient, blockNumber) {
     };
 }
 /**
- * Gets block metadata (header and archive snapshot) from the calldata of an L1 transaction.
+ * Gets epoch proof metadata (archive root and proof) 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 L2 block metadata (header and archive) from the calldata, deserialized
+ * @param expectedProverId - Expected prover ID.
+ * @returns Epoch proof metadata from the calldata, deserialized.
  */ export async function getProofFromSubmitProofTx(publicClient, txHash, expectedProverId) {
     const { input: data } = await publicClient.getTransaction({
         hash: txHash
@@ -260,11 +366,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 +380,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);
 }
-//# sourceMappingURL=errors.d.ts.map
+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=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXJyb3JzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYXJjaGl2ZXIvZXJyb3JzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLHFCQUFhLHNCQUF1QixTQUFRLEtBQUs7SUFDL0MsWUFBWSxVQUFVLEVBQUUsTUFBTSxFQUU3QjtDQUNGO0FBRUQscUJBQWEsb0NBQXFDLFNBQVEsS0FBSzthQUUzQyxjQUFjLEVBQUUsTUFBTTthQUN0QixtQkFBbUIsRUFBRSxNQUFNLEdBQUcsU0FBUztJQUZ6RCxZQUNrQixjQUFjLEVBQUUsTUFBTSxFQUN0QixtQkFBbUIsRUFBRSxNQUFNLEdBQUcsU0FBUyxFQU94RDtDQUNGO0FBRUQscUJBQWEsNkJBQThCLFNBQVEsS0FBSztJQUN0RCxZQUFZLGNBQWMsRUFBRSxNQUFNLEVBQUUsUUFBUSxFQUFFLE1BQU0sR0FBRyxTQUFTLEVBSS9EO0NBQ0YifQ==

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;IAC/C,YAAY,UAAU,EAAE,MAAM,EAE7B;CACF;AAED,qBAAa,oCAAqC,SAAQ,KAAK;aAE3C,cAAc,EAAE,MAAM;aACtB,mBAAmB,EAAE,MAAM,GAAG,SAAS;IAFzD,YACkB,cAAc,EAAE,MAAM,EACtB,mBAAmB,EAAE,MAAM,GAAG,SAAS,EAOxD;CACF;AAED,qBAAa,6BAA8B,SAAQ,KAAK;IACtD,YAAY,cAAc,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,EAI/D;CACF"}

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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hcmNoaXZlci9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLGVBQWUsQ0FBQztBQUM5QixjQUFjLGFBQWEsQ0FBQztBQUM1QixPQUFPLEVBQUUsS0FBSyxnQkFBZ0IsRUFBRSxLQUFLLGVBQWUsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQ3JGLFlBQVksRUFBRSxpQkFBaUIsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQzdELE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxtQkFBbUIsRUFBRSxNQUFNLDBDQUEwQyxDQUFDO0FBQ3BHLE9BQU8sRUFBRSxxQkFBcUIsRUFBRSxNQUFNLGdEQUFnRCxDQUFDIn0=

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

@@ -1,23 +1,29 @@
-import type { L2Block } from '@aztec/stdlib/block';
+import type { L2BlockNew } from '@aztec/stdlib/block';
 import { type LmdbStatsCallback, type TelemetryClient, type Tracer } from '@aztec/telemetry-client';
 export declare class ArchiverInstrumentation {
     private telemetry;
     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;
+    processNewBlocks(syncTimePerBlock: number, blocks: L2BlockNew[]): void;
+    processNewMessages(count: number, syncPerMessageMs: number): void;
+    processPrune(duration: number): void;
     updateLastProvenBlock(blockNumber: number): void;
     processProofsVerified(logs: {
         proverId: string;
@@ -26,4 +32,4 @@ export declare class ArchiverInstrumentation {
     }[]): void;
     updateL1BlockHeight(blockNumber: bigint): void;
 }
-//# sourceMappingURL=instrumentation.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5zdHJ1bWVudGF0aW9uLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYXJjaGl2ZXIvaW5zdHJ1bWVudGF0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ3RELE9BQU8sRUFLTCxLQUFLLGlCQUFpQixFQUV0QixLQUFLLGVBQWUsRUFDcEIsS0FBSyxNQUFNLEVBR1osTUFBTSx5QkFBeUIsQ0FBQztBQUVqQyxxQkFBYSx1QkFBdUI7SUF3QmhDLE9BQU8sQ0FBQyxTQUFTO0lBdkJuQixTQUFnQixNQUFNLEVBQUUsTUFBTSxDQUFDO0lBRS9CLE9BQU8sQ0FBQyxXQUFXLENBQVE7SUFDM0IsT0FBTyxDQUFDLE9BQU8sQ0FBZ0I7SUFDL0IsT0FBTyxDQUFDLGFBQWEsQ0FBUTtJQUM3QixPQUFPLENBQUMsb0JBQW9CLENBQVk7SUFDeEMsT0FBTyxDQUFDLG9CQUFvQixDQUFnQjtJQUM1QyxPQUFPLENBQUMsU0FBUyxDQUFjO0lBRS9CLE9BQU8sQ0FBQyxhQUFhLENBQVk7SUFDakMsT0FBTyxDQUFDLFVBQVUsQ0FBZ0I7SUFFbEMsT0FBTyxDQUFDLG9CQUFvQixDQUFZO0lBQ3hDLE9BQU8sQ0FBQyxjQUFjLENBQWdCO0lBQ3RDLE9BQU8sQ0FBQyxZQUFZLENBQVk7SUFDaEMsT0FBTyxDQUFDLFdBQVcsQ0FBWTtJQUUvQixPQUFPLENBQUMsc0JBQXNCLENBQVk7SUFDMUMsT0FBTyxDQUFDLGdCQUFnQixDQUFnQjtJQUV4QyxPQUFPLENBQUMsR0FBRyxDQUE0QztJQUV2RCxPQUFPLGVBcUZOO0lBRUQsT0FBb0IsR0FBRyxDQUFDLFNBQVMsRUFBRSxlQUFlLEVBQUUsU0FBUyxDQUFDLEVBQUUsaUJBQWlCLG9DQVVoRjtJQUVNLFNBQVMsSUFBSSxPQUFPLENBRTFCO0lBRU0sZ0JBQWdCLENBQUMsZ0JBQWdCLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxVQUFVLEVBQUUsUUFVckU7SUFFTSxrQkFBa0IsQ0FBQyxLQUFLLEVBQUUsTUFBTSxFQUFFLGdCQUFnQixFQUFFLE1BQU0sUUFNaEU7SUFFTSxZQUFZLENBQUMsUUFBUSxFQUFFLE1BQU0sUUFHbkM7SUFFTSxxQkFBcUIsQ0FBQyxXQUFXLEVBQUUsTUFBTSxRQUUvQztJQUVNLHFCQUFxQixDQUFDLElBQUksRUFBRTtRQUFFLFFBQVEsRUFBRSxNQUFNLENBQUM7UUFBQyxhQUFhLEVBQUUsTUFBTSxDQUFDO1FBQUMsS0FBSyxFQUFFLE1BQU0sQ0FBQTtLQUFFLEVBQUUsUUFXOUY7SUFFTSxtQkFBbUIsQ0FBQyxXQUFXLEVBQUUsTUFBTSxRQUU3QztDQUNGIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"instrumentation.d.ts","sourceRoot":"","sources":["../../src/archiver/instrumentation.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAKL,KAAK,iBAAiB,EAEtB,KAAK,eAAe,EACpB,KAAK,MAAM,EAGZ,MAAM,yBAAyB,CAAC;AAEjC,qBAAa,uBAAuB;IAed,OAAO,CAAC,SAAS;IAdrC,SAAgB,MAAM,EAAE,MAAM,CAAC;IAE/B,OAAO,CAAC,WAAW,CAAQ;IAC3B,OAAO,CAAC,OAAO,CAAgB;IAC/B,OAAO,CAAC,YAAY,CAAY;IAChC,OAAO,CAAC,cAAc,CAAgB;IACtC,OAAO,CAAC,aAAa,CAAQ;IAC7B,OAAO,CAAC,oBAAoB,CAAY;IACxC,OAAO,CAAC,oBAAoB,CAAgB;IAC5C,OAAO,CAAC,SAAS,CAAc;IAC/B,OAAO,CAAC,UAAU,CAAgB;IAElC,OAAO,CAAC,GAAG,CAA4C;IAEvD,OAAO;WAsDa,GAAG,CAAC,SAAS,EAAE,eAAe,EAAE,SAAS,CAAC,EAAE,iBAAiB;IAU1E,SAAS,IAAI,OAAO;IAIpB,gBAAgB,CAAC,gBAAgB,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE;IAS5D,YAAY;IAIZ,qBAAqB,CAAC,WAAW,EAAE,MAAM;IAIzC,qBAAqB,CAAC,IAAI,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE;IAaxF,mBAAmB,CAAC,WAAW,EAAE,MAAM;CAG/C"}
+{"version":3,"file":"instrumentation.d.ts","sourceRoot":"","sources":["../../src/archiver/instrumentation.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAKL,KAAK,iBAAiB,EAEtB,KAAK,eAAe,EACpB,KAAK,MAAM,EAGZ,MAAM,yBAAyB,CAAC;AAEjC,qBAAa,uBAAuB;IAwBhC,OAAO,CAAC,SAAS;IAvBnB,SAAgB,MAAM,EAAE,MAAM,CAAC;IAE/B,OAAO,CAAC,WAAW,CAAQ;IAC3B,OAAO,CAAC,OAAO,CAAgB;IAC/B,OAAO,CAAC,aAAa,CAAQ;IAC7B,OAAO,CAAC,oBAAoB,CAAY;IACxC,OAAO,CAAC,oBAAoB,CAAgB;IAC5C,OAAO,CAAC,SAAS,CAAc;IAE/B,OAAO,CAAC,aAAa,CAAY;IACjC,OAAO,CAAC,UAAU,CAAgB;IAElC,OAAO,CAAC,oBAAoB,CAAY;IACxC,OAAO,CAAC,cAAc,CAAgB;IACtC,OAAO,CAAC,YAAY,CAAY;IAChC,OAAO,CAAC,WAAW,CAAY;IAE/B,OAAO,CAAC,sBAAsB,CAAY;IAC1C,OAAO,CAAC,gBAAgB,CAAgB;IAExC,OAAO,CAAC,GAAG,CAA4C;IAEvD,OAAO,eAqFN;IAED,OAAoB,GAAG,CAAC,SAAS,EAAE,eAAe,EAAE,SAAS,CAAC,EAAE,iBAAiB,oCAUhF;IAEM,SAAS,IAAI,OAAO,CAE1B;IAEM,gBAAgB,CAAC,gBAAgB,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,QAUrE;IAEM,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,QAMhE;IAEM,YAAY,CAAC,QAAQ,EAAE,MAAM,QAGnC;IAEM,qBAAqB,CAAC,WAAW,EAAE,MAAM,QAE/C;IAEM,qBAAqB,CAAC,IAAI,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,QAW9F;IAEM,mBAAmB,CAAC,WAAW,EAAE,MAAM,QAE7C;CACF"}