@aztec/archiver 0.0.1-commit.d3ec352c → 0.0.1-commit.f295ac2

package/dest/modules/data_store_updater.js

@@ -0,0 +1,304 @@
+import { BlockNumber } from '@aztec/foundation/branded-types';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { createLogger } from '@aztec/foundation/log';
+import { ContractClassPublishedEvent, PrivateFunctionBroadcastedEvent, UtilityFunctionBroadcastedEvent } from '@aztec/protocol-contracts/class-registry';
+import { ContractInstancePublishedEvent, ContractInstanceUpdatedEvent } from '@aztec/protocol-contracts/instance-registry';
+import { computePublicBytecodeCommitment, isValidPrivateFunctionMembershipProof, isValidUtilityFunctionMembershipProof } from '@aztec/stdlib/contract';
+import groupBy from 'lodash.groupby';
+/** Operation type for contract data updates. */ var Operation = /*#__PURE__*/ function(Operation) {
+    Operation[Operation["Store"] = 0] = "Store";
+    Operation[Operation["Delete"] = 1] = "Delete";
+    return Operation;
+}(Operation || {});
+/** Archiver helper module to handle updates to the data store. */ export class ArchiverDataStoreUpdater {
+    store;
+    log;
+    constructor(store){
+        this.store = store;
+        this.log = createLogger('archiver:store_updater');
+    }
+    /**
+   * Adds blocks to the store with contract class/instance extraction from logs.
+   * Extracts ContractClassPublished, ContractInstancePublished, ContractInstanceUpdated events,
+   * and individually broadcasted functions from the block logs.
+   *
+   * @param blocks - The L2 blocks to add.
+   * @param pendingChainValidationStatus - Optional validation status to set.
+   * @returns True if the operation is successful.
+   */ addBlocks(blocks, pendingChainValidationStatus) {
+        return this.store.transactionAsync(async ()=>{
+            await this.store.addBlocks(blocks);
+            const opResults = await Promise.all([
+                // Update the pending chain validation status if provided
+                pendingChainValidationStatus && this.store.setPendingChainValidationStatus(pendingChainValidationStatus),
+                // Add any logs emitted during the retrieved blocks
+                this.store.addLogs(blocks),
+                // Unroll all logs emitted during the retrieved blocks and extract any contract classes and instances from them
+                ...blocks.map((block)=>this.addBlockDataToDB(block))
+            ]);
+            return opResults.every(Boolean);
+        });
+    }
+    /**
+   * Reconciles local blocks with incoming checkpoints from L1.
+   * Adds checkpoints to the store with contract class/instance extraction from logs.
+   * Prunes any local blocks that conflict with checkpoint data (by comparing archive roots).
+   * Extracts ContractClassPublished, ContractInstancePublished, ContractInstanceUpdated events,
+   * and individually broadcasted functions from the checkpoint block logs.
+   *
+   * @param checkpoints - The published checkpoints to add.
+   * @param pendingChainValidationStatus - Optional validation status to set.
+   * @returns Result with information about any pruned blocks.
+   */ setNewCheckpointData(checkpoints, pendingChainValidationStatus) {
+        return this.store.transactionAsync(async ()=>{
+            // Before adding checkpoints, check for conflicts with local blocks if any
+            const { prunedBlocks, lastAlreadyInsertedBlockNumber } = await this.pruneMismatchingLocalBlocks(checkpoints);
+            await this.store.addCheckpoints(checkpoints);
+            // Filter out blocks that were already inserted via addBlocks() to avoid duplicating logs/contract data
+            const newBlocks = checkpoints.flatMap((ch)=>ch.checkpoint.blocks).filter((b)=>lastAlreadyInsertedBlockNumber === undefined || b.number > lastAlreadyInsertedBlockNumber);
+            await Promise.all([
+                // Update the pending chain validation status if provided
+                pendingChainValidationStatus && this.store.setPendingChainValidationStatus(pendingChainValidationStatus),
+                // Add any logs emitted during the retrieved blocks
+                this.store.addLogs(newBlocks),
+                // Unroll all logs emitted during the retrieved blocks and extract any contract classes and instances from them
+                ...newBlocks.map((block)=>this.addBlockDataToDB(block))
+            ]);
+            return {
+                prunedBlocks,
+                lastAlreadyInsertedBlockNumber
+            };
+        });
+    }
+    /**
+   * Checks for local proposed blocks that do not match the ones to be checkpointed and prunes them.
+   * This method handles multiple checkpoints but returns after pruning the first conflict found.
+   * This is correct because pruning from the first conflict point removes all subsequent blocks,
+   * and when checkpoints are added afterward, they include all the correct blocks.
+   */ async pruneMismatchingLocalBlocks(checkpoints) {
+        const [lastCheckpointedBlockNumber, lastBlockNumber] = await Promise.all([
+            this.store.getCheckpointedL2BlockNumber(),
+            this.store.getLatestBlockNumber()
+        ]);
+        // Exit early if there are no local uncheckpointed blocks
+        if (lastBlockNumber === lastCheckpointedBlockNumber) {
+            return {
+                prunedBlocks: undefined,
+                lastAlreadyInsertedBlockNumber: undefined
+            };
+        }
+        // Get all uncheckpointed local blocks
+        const uncheckpointedLocalBlocks = await this.store.getBlocks(BlockNumber.add(lastCheckpointedBlockNumber, 1), lastBlockNumber - lastCheckpointedBlockNumber);
+        let lastAlreadyInsertedBlockNumber;
+        for (const publishedCheckpoint of checkpoints){
+            const checkpointBlocks = publishedCheckpoint.checkpoint.blocks;
+            const slot = publishedCheckpoint.checkpoint.slot;
+            const localBlocksInSlot = uncheckpointedLocalBlocks.filter((b)=>b.slot === slot);
+            if (checkpointBlocks.length === 0) {
+                this.log.warn(`Checkpoint ${publishedCheckpoint.checkpoint.number} for slot ${slot} has no blocks`);
+                continue;
+            }
+            // Find the first checkpoint block that conflicts with an existing local block and prune local afterwards
+            for (const checkpointBlock of checkpointBlocks){
+                const blockNumber = checkpointBlock.number;
+                const existingBlock = localBlocksInSlot.find((b)=>b.number === blockNumber);
+                const blockInfos = {
+                    existingBlock: existingBlock?.toBlockInfo(),
+                    checkpointBlock: checkpointBlock.toBlockInfo()
+                };
+                if (!existingBlock) {
+                    this.log.verbose(`No local block found for checkpointed block number ${blockNumber}`, blockInfos);
+                } else if (existingBlock.archive.root.equals(checkpointBlock.archive.root)) {
+                    this.log.verbose(`Block number ${blockNumber} already inserted and matches checkpoint`, blockInfos);
+                    lastAlreadyInsertedBlockNumber = blockNumber;
+                } else {
+                    this.log.warn(`Conflict detected at block ${blockNumber} between checkpointed and local block`, blockInfos);
+                    const prunedBlocks = await this.removeBlocksAfter(BlockNumber(blockNumber - 1));
+                    return {
+                        prunedBlocks,
+                        lastAlreadyInsertedBlockNumber
+                    };
+                }
+            }
+            // If local has more blocks than the checkpoint (e.g., local has [2,3,4] but checkpoint has [2,3]),
+            // we need to prune the extra local blocks so they match what was checkpointed
+            const lastCheckpointBlockNumber = checkpointBlocks.at(-1).number;
+            const lastLocalBlockNumber = localBlocksInSlot.at(-1)?.number;
+            if (lastLocalBlockNumber !== undefined && lastLocalBlockNumber > lastCheckpointBlockNumber) {
+                this.log.warn(`Local chain for slot ${slot} ends at block ${lastLocalBlockNumber} but checkpoint ends at ${lastCheckpointBlockNumber}. Pruning blocks after block ${lastCheckpointBlockNumber}.`);
+                const prunedBlocks = await this.removeBlocksAfter(lastCheckpointBlockNumber);
+                return {
+                    prunedBlocks,
+                    lastAlreadyInsertedBlockNumber
+                };
+            }
+        }
+        return {
+            prunedBlocks: undefined,
+            lastAlreadyInsertedBlockNumber
+        };
+    }
+    /**
+   * Removes all blocks strictly after the specified block number and cleans up associated contract data.
+   * This handles removal of provisionally added blocks along with their contract classes/instances.
+   *
+   * @param blockNumber - Remove all blocks with number greater than this.
+   * @returns The removed blocks.
+   */ removeBlocksAfter(blockNumber) {
+        return this.store.transactionAsync(async ()=>{
+            // First get the blocks to be removed so we can clean up contract data
+            const removedBlocks = await this.store.removeBlocksAfter(blockNumber);
+            // Clean up contract data and logs for the removed blocks
+            await Promise.all([
+                this.store.deleteLogs(removedBlocks),
+                ...removedBlocks.map((block)=>this.removeBlockDataFromDB(block))
+            ]);
+            return removedBlocks;
+        });
+    }
+    /**
+   * Unwinds checkpoints from the store with reverse contract extraction.
+   * Deletes ContractClassPublished, ContractInstancePublished, ContractInstanceUpdated data
+   * that was stored for the unwound checkpoints.
+   *
+   * @param from - The checkpoint number to unwind from (must be the current tip).
+   * @param checkpointsToUnwind - The number of checkpoints to unwind.
+   * @returns True if the operation is successful.
+   */ async unwindCheckpoints(from, checkpointsToUnwind) {
+        if (checkpointsToUnwind <= 0) {
+            throw new Error(`Cannot unwind ${checkpointsToUnwind} blocks`);
+        }
+        const last = await this.store.getSynchedCheckpointNumber();
+        if (from != last) {
+            throw new Error(`Cannot unwind checkpoints from checkpoint ${from} when the last checkpoint is ${last}`);
+        }
+        const blocks = [];
+        const lastCheckpointNumber = from + checkpointsToUnwind - 1;
+        for(let checkpointNumber = from; checkpointNumber <= lastCheckpointNumber; checkpointNumber++){
+            const blocksForCheckpoint = await this.store.getBlocksForCheckpoint(checkpointNumber);
+            if (!blocksForCheckpoint) {
+                continue;
+            }
+            blocks.push(...blocksForCheckpoint);
+        }
+        const opResults = await Promise.all([
+            // Prune rolls back to the last proven block, which is by definition valid
+            this.store.setPendingChainValidationStatus({
+                valid: true
+            }),
+            // Remove contract data for all blocks being unwound
+            ...blocks.map((block)=>this.removeBlockDataFromDB(block)),
+            this.store.deleteLogs(blocks),
+            this.store.unwindCheckpoints(from, checkpointsToUnwind)
+        ]);
+        return opResults.every(Boolean);
+    }
+    /** Extracts and stores contract data from a single block. */ addBlockDataToDB(block) {
+        return this.editContractBlockData(block, 0);
+    }
+    /** Removes contract data associated with a block. */ removeBlockDataFromDB(block) {
+        return this.editContractBlockData(block, 1);
+    }
+    /** Adds or remove contract data associated with a block. */ async editContractBlockData(block, operation) {
+        const contractClassLogs = block.body.txEffects.flatMap((txEffect)=>txEffect.contractClassLogs);
+        const privateLogs = block.body.txEffects.flatMap((txEffect)=>txEffect.privateLogs);
+        const publicLogs = block.body.txEffects.flatMap((txEffect)=>txEffect.publicLogs);
+        return (await Promise.all([
+            this.updatePublishedContractClasses(contractClassLogs, block.number, operation),
+            this.updateDeployedContractInstances(privateLogs, block.number, operation),
+            this.updateUpdatedContractInstances(publicLogs, block.header.globalVariables.timestamp, operation),
+            operation === 0 ? this.storeBroadcastedIndividualFunctions(contractClassLogs, block.number) : Promise.resolve(true)
+        ])).every(Boolean);
+    }
+    /**
+   * Extracts and stores contract classes out of ContractClassPublished events emitted by the class registry contract.
+   */ async updatePublishedContractClasses(allLogs, blockNum, operation) {
+        const contractClassPublishedEvents = allLogs.filter((log)=>ContractClassPublishedEvent.isContractClassPublishedEvent(log)).map((log)=>ContractClassPublishedEvent.fromLog(log));
+        const contractClasses = await Promise.all(contractClassPublishedEvents.map((e)=>e.toContractClassPublic()));
+        if (contractClasses.length > 0) {
+            contractClasses.forEach((c)=>this.log.verbose(`${Operation[operation]} contract class ${c.id.toString()}`));
+            if (operation == 0) {
+                // TODO: Will probably want to create some worker threads to compute these bytecode commitments as they are expensive
+                const commitments = await Promise.all(contractClasses.map((c)=>computePublicBytecodeCommitment(c.packedBytecode)));
+                return await this.store.addContractClasses(contractClasses, commitments, blockNum);
+            } else if (operation == 1) {
+                return await this.store.deleteContractClasses(contractClasses, blockNum);
+            }
+        }
+        return true;
+    }
+    /**
+   * Extracts and stores contract instances out of ContractInstancePublished events emitted by the canonical deployer contract.
+   */ async updateDeployedContractInstances(allLogs, blockNum, operation) {
+        const contractInstances = allLogs.filter((log)=>ContractInstancePublishedEvent.isContractInstancePublishedEvent(log)).map((log)=>ContractInstancePublishedEvent.fromLog(log)).map((e)=>e.toContractInstance());
+        if (contractInstances.length > 0) {
+            contractInstances.forEach((c)=>this.log.verbose(`${Operation[operation]} contract instance at ${c.address.toString()}`));
+            if (operation == 0) {
+                return await this.store.addContractInstances(contractInstances, blockNum);
+            } else if (operation == 1) {
+                return await this.store.deleteContractInstances(contractInstances, blockNum);
+            }
+        }
+        return true;
+    }
+    /**
+   * Extracts and stores contract instance updates out of ContractInstanceUpdated events.
+   */ async updateUpdatedContractInstances(allLogs, timestamp, operation) {
+        const contractUpdates = allLogs.filter((log)=>ContractInstanceUpdatedEvent.isContractInstanceUpdatedEvent(log)).map((log)=>ContractInstanceUpdatedEvent.fromLog(log)).map((e)=>e.toContractInstanceUpdate());
+        if (contractUpdates.length > 0) {
+            contractUpdates.forEach((c)=>this.log.verbose(`${Operation[operation]} contract instance update at ${c.address.toString()}`));
+            if (operation == 0) {
+                return await this.store.addContractInstanceUpdates(contractUpdates, timestamp);
+            } else if (operation == 1) {
+                return await this.store.deleteContractInstanceUpdates(contractUpdates, timestamp);
+            }
+        }
+        return true;
+    }
+    /**
+   * Stores the functions that were broadcasted individually.
+   *
+   * @dev Beware that there is not a delete variant of this, since they are added to contract classes
+   *      and will be deleted as part of the class if needed.
+   */ async storeBroadcastedIndividualFunctions(allLogs, _blockNum) {
+        // Filter out private and utility function broadcast events
+        const privateFnEvents = allLogs.filter((log)=>PrivateFunctionBroadcastedEvent.isPrivateFunctionBroadcastedEvent(log)).map((log)=>PrivateFunctionBroadcastedEvent.fromLog(log));
+        const utilityFnEvents = allLogs.filter((log)=>UtilityFunctionBroadcastedEvent.isUtilityFunctionBroadcastedEvent(log)).map((log)=>UtilityFunctionBroadcastedEvent.fromLog(log));
+        // Group all events by contract class id
+        for (const [classIdString, classEvents] of Object.entries(groupBy([
+            ...privateFnEvents,
+            ...utilityFnEvents
+        ], (e)=>e.contractClassId.toString()))){
+            const contractClassId = Fr.fromHexString(classIdString);
+            const contractClass = await this.store.getContractClass(contractClassId);
+            if (!contractClass) {
+                this.log.warn(`Skipping broadcasted functions as contract class ${contractClassId.toString()} was not found`);
+                continue;
+            }
+            // Split private and utility functions, and filter out invalid ones
+            const allFns = classEvents.map((e)=>e.toFunctionWithMembershipProof());
+            const privateFns = allFns.filter((fn)=>'utilityFunctionsTreeRoot' in fn);
+            const utilityFns = allFns.filter((fn)=>'privateFunctionsArtifactTreeRoot' in fn);
+            const privateFunctionsWithValidity = await Promise.all(privateFns.map(async (fn)=>({
+                    fn,
+                    valid: await isValidPrivateFunctionMembershipProof(fn, contractClass)
+                })));
+            const validPrivateFns = privateFunctionsWithValidity.filter(({ valid })=>valid).map(({ fn })=>fn);
+            const utilityFunctionsWithValidity = await Promise.all(utilityFns.map(async (fn)=>({
+                    fn,
+                    valid: await isValidUtilityFunctionMembershipProof(fn, contractClass)
+                })));
+            const validUtilityFns = utilityFunctionsWithValidity.filter(({ valid })=>valid).map(({ fn })=>fn);
+            const validFnCount = validPrivateFns.length + validUtilityFns.length;
+            if (validFnCount !== allFns.length) {
+                this.log.warn(`Skipping ${allFns.length - validFnCount} invalid functions`);
+            }
+            // Store the functions in the contract class in a single operation
+            if (validFnCount > 0) {
+                this.log.verbose(`Storing ${validFnCount} functions for contract class ${contractClassId.toString()}`);
+            }
+            return await this.store.addFunctions(contractClassId, validPrivateFns, validUtilityFns);
+        }
+        return true;
+    }
+}

package/dest/modules/instrumentation.d.ts

@@ -0,0 +1,37 @@
+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 l1BlockHeight;
+    private proofsSubmittedDelay;
+    private proofsSubmittedCount;
+    private dbMetrics;
+    private pruneDuration;
+    private pruneCount;
+    private syncDurationPerBlock;
+    private syncBlockCount;
+    private manaPerBlock;
+    private txsPerBlock;
+    private syncDurationPerMessage;
+    private syncMessageCount;
+    private blockProposalTxTargetCount;
+    private log;
+    private constructor();
+    static new(telemetry: TelemetryClient, lmdbStats?: LmdbStatsCallback): Promise<ArchiverInstrumentation>;
+    isEnabled(): boolean;
+    processNewBlocks(syncTimePerBlock: number, blocks: L2BlockNew[]): void;
+    processNewMessages(count: number, syncPerMessageMs: number): void;
+    processPrune(duration: number): void;
+    updateLastProvenBlock(blockNumber: number): void;
+    processProofsVerified(logs: {
+        proverId: string;
+        l2BlockNumber: bigint;
+        delay: bigint;
+    }[]): void;
+    updateL1BlockHeight(blockNumber: bigint): void;
+    recordBlockProposalTxTarget(target: string, usedTrace: boolean): void;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5zdHJ1bWVudGF0aW9uLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbW9kdWxlcy9pbnN0cnVtZW50YXRpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDdEQsT0FBTyxFQUtMLEtBQUssaUJBQWlCLEVBRXRCLEtBQUssZUFBZSxFQUNwQixLQUFLLE1BQU0sRUFFWixNQUFNLHlCQUF5QixDQUFDO0FBRWpDLHFCQUFhLHVCQUF1QjtJQTBCaEMsT0FBTyxDQUFDLFNBQVM7SUF6Qm5CLFNBQWdCLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFFL0IsT0FBTyxDQUFDLFdBQVcsQ0FBUTtJQUMzQixPQUFPLENBQUMsT0FBTyxDQUFnQjtJQUMvQixPQUFPLENBQUMsYUFBYSxDQUFRO0lBQzdCLE9BQU8sQ0FBQyxvQkFBb0IsQ0FBWTtJQUN4QyxPQUFPLENBQUMsb0JBQW9CLENBQWdCO0lBQzVDLE9BQU8sQ0FBQyxTQUFTLENBQWM7SUFFL0IsT0FBTyxDQUFDLGFBQWEsQ0FBWTtJQUNqQyxPQUFPLENBQUMsVUFBVSxDQUFnQjtJQUVsQyxPQUFPLENBQUMsb0JBQW9CLENBQVk7SUFDeEMsT0FBTyxDQUFDLGNBQWMsQ0FBZ0I7SUFDdEMsT0FBTyxDQUFDLFlBQVksQ0FBWTtJQUNoQyxPQUFPLENBQUMsV0FBVyxDQUFZO0lBRS9CLE9BQU8sQ0FBQyxzQkFBc0IsQ0FBWTtJQUMxQyxPQUFPLENBQUMsZ0JBQWdCLENBQWdCO0lBRXhDLE9BQU8sQ0FBQywwQkFBMEIsQ0FBZ0I7SUFFbEQsT0FBTyxDQUFDLEdBQUcsQ0FBNEM7SUFFdkQsT0FBTyxlQTBDTjtJQUVELE9BQW9CLEdBQUcsQ0FBQyxTQUFTLEVBQUUsZUFBZSxFQUFFLFNBQVMsQ0FBQyxFQUFFLGlCQUFpQixvQ0FVaEY7SUFFTSxTQUFTLElBQUksT0FBTyxDQUUxQjtJQUVNLGdCQUFnQixDQUFDLGdCQUFnQixFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsVUFBVSxFQUFFLFFBVXJFO0lBRU0sa0JBQWtCLENBQUMsS0FBSyxFQUFFLE1BQU0sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLFFBTWhFO0lBRU0sWUFBWSxDQUFDLFFBQVEsRUFBRSxNQUFNLFFBR25DO0lBRU0scUJBQXFCLENBQUMsV0FBVyxFQUFFLE1BQU0sUUFFL0M7SUFFTSxxQkFBcUIsQ0FBQyxJQUFJLEVBQUU7UUFBRSxRQUFRLEVBQUUsTUFBTSxDQUFDO1FBQUMsYUFBYSxFQUFFLE1BQU0sQ0FBQztRQUFDLEtBQUssRUFBRSxNQUFNLENBQUE7S0FBRSxFQUFFLFFBVzlGO0lBRU0sbUJBQW1CLENBQUMsV0FBVyxFQUFFLE1BQU0sUUFFN0M7SUFFTSwyQkFBMkIsQ0FBQyxNQUFNLEVBQUUsTUFBTSxFQUFFLFNBQVMsRUFBRSxPQUFPLFFBS3BFO0NBQ0YifQ==

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

@@ -0,0 +1 @@
+{"version":3,"file":"instrumentation.d.ts","sourceRoot":"","sources":["../../src/modules/instrumentation.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAKL,KAAK,iBAAiB,EAEtB,KAAK,eAAe,EACpB,KAAK,MAAM,EAEZ,MAAM,yBAAyB,CAAC;AAEjC,qBAAa,uBAAuB;IA0BhC,OAAO,CAAC,SAAS;IAzBnB,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,0BAA0B,CAAgB;IAElD,OAAO,CAAC,GAAG,CAA4C;IAEvD,OAAO,eA0CN;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;IAEM,2BAA2B,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,QAKpE;CACF"}

package/dest/{archiver → modules}/instrumentation.js

@@ -1,5 +1,5 @@
 import { createLogger } from '@aztec/foundation/log';
-import { Attributes, LmdbMetrics, Metrics, ValueType } from '@aztec/telemetry-client';
+import { Attributes, LmdbMetrics, Metrics } from '@aztec/telemetry-client';
 export class ArchiverInstrumentation {
     telemetry;
     tracer;
@@ -17,70 +17,27 @@ export class ArchiverInstrumentation {
     txsPerBlock;
     syncDurationPerMessage;
     syncMessageCount;
+    blockProposalTxTargetCount;
     log;
     constructor(telemetry, lmdbStats){
         this.telemetry = telemetry;
         this.log = createLogger('archiver:instrumentation');
         this.tracer = telemetry.getTracer('Archiver');
         const meter = telemetry.getMeter('Archiver');
-        this.blockHeight = meter.createGauge(Metrics.ARCHIVER_BLOCK_HEIGHT, {
-            description: 'The height of the latest block processed by the archiver',
-            valueType: ValueType.INT
-        });
-        this.l1BlockHeight = meter.createGauge(Metrics.ARCHIVER_L1_BLOCK_HEIGHT, {
-            description: 'The height of the latest L1 block processed by the archiver',
-            valueType: ValueType.INT
-        });
-        this.txCount = meter.createUpDownCounter(Metrics.ARCHIVER_TOTAL_TXS, {
-            description: 'The total number of transactions',
-            valueType: ValueType.INT
-        });
-        this.proofsSubmittedCount = meter.createUpDownCounter(Metrics.ARCHIVER_ROLLUP_PROOF_COUNT, {
-            description: 'Number of proofs submitted',
-            valueType: ValueType.INT
-        });
-        this.proofsSubmittedDelay = meter.createHistogram(Metrics.ARCHIVER_ROLLUP_PROOF_DELAY, {
-            unit: 'ms',
-            description: 'Time after a block is submitted until its proof is published',
-            valueType: ValueType.INT
-        });
-        this.syncDurationPerBlock = meter.createHistogram(Metrics.ARCHIVER_SYNC_PER_BLOCK, {
-            unit: 'ms',
-            description: 'Duration to sync a block',
-            valueType: ValueType.INT
-        });
-        this.syncBlockCount = meter.createUpDownCounter(Metrics.ARCHIVER_SYNC_BLOCK_COUNT, {
-            description: 'Number of blocks synced from L1',
-            valueType: ValueType.INT
-        });
-        this.manaPerBlock = meter.createHistogram(Metrics.ARCHIVER_MANA_PER_BLOCK, {
-            description: 'The mana consumed by blocks',
-            valueType: ValueType.DOUBLE,
-            unit: 'Mmana'
-        });
-        this.txsPerBlock = meter.createHistogram(Metrics.ARCHIVER_TXS_PER_BLOCK, {
-            description: 'The block tx count',
-            valueType: ValueType.INT,
-            unit: 'tx'
-        });
-        this.syncDurationPerMessage = meter.createHistogram(Metrics.ARCHIVER_SYNC_PER_MESSAGE, {
-            unit: 'ms',
-            description: 'Duration to sync a message',
-            valueType: ValueType.INT
-        });
-        this.syncMessageCount = meter.createUpDownCounter(Metrics.ARCHIVER_SYNC_MESSAGE_COUNT, {
-            description: 'Number of L1 to L2 messages synced',
-            valueType: ValueType.INT
-        });
-        this.pruneDuration = meter.createHistogram(Metrics.ARCHIVER_PRUNE_DURATION, {
-            unit: 'ms',
-            description: 'Duration to sync a message',
-            valueType: ValueType.INT
-        });
-        this.pruneCount = meter.createUpDownCounter(Metrics.ARCHIVER_PRUNE_COUNT, {
-            description: 'Number of prunes detected',
-            valueType: ValueType.INT
-        });
+        this.blockHeight = meter.createGauge(Metrics.ARCHIVER_BLOCK_HEIGHT);
+        this.l1BlockHeight = meter.createGauge(Metrics.ARCHIVER_L1_BLOCK_HEIGHT);
+        this.txCount = meter.createUpDownCounter(Metrics.ARCHIVER_TOTAL_TXS);
+        this.proofsSubmittedCount = meter.createUpDownCounter(Metrics.ARCHIVER_ROLLUP_PROOF_COUNT);
+        this.proofsSubmittedDelay = meter.createHistogram(Metrics.ARCHIVER_ROLLUP_PROOF_DELAY);
+        this.syncDurationPerBlock = meter.createHistogram(Metrics.ARCHIVER_SYNC_PER_BLOCK);
+        this.syncBlockCount = meter.createUpDownCounter(Metrics.ARCHIVER_SYNC_BLOCK_COUNT);
+        this.manaPerBlock = meter.createHistogram(Metrics.ARCHIVER_MANA_PER_BLOCK);
+        this.txsPerBlock = meter.createHistogram(Metrics.ARCHIVER_TXS_PER_BLOCK);
+        this.syncDurationPerMessage = meter.createHistogram(Metrics.ARCHIVER_SYNC_PER_MESSAGE);
+        this.syncMessageCount = meter.createUpDownCounter(Metrics.ARCHIVER_SYNC_MESSAGE_COUNT);
+        this.pruneDuration = meter.createHistogram(Metrics.ARCHIVER_PRUNE_DURATION);
+        this.pruneCount = meter.createUpDownCounter(Metrics.ARCHIVER_PRUNE_COUNT);
+        this.blockProposalTxTargetCount = meter.createUpDownCounter(Metrics.ARCHIVER_BLOCK_PROPOSAL_TX_TARGET_COUNT);
         this.dbMetrics = new LmdbMetrics(meter, {
             [Attributes.DB_DATA_TYPE]: 'archiver'
         }, lmdbStats);
@@ -137,4 +94,10 @@ export class ArchiverInstrumentation {
     updateL1BlockHeight(blockNumber) {
         this.l1BlockHeight.record(Number(blockNumber));
     }
+    recordBlockProposalTxTarget(target, usedTrace) {
+        this.blockProposalTxTargetCount.add(1, {
+            [Attributes.L1_BLOCK_PROPOSAL_TX_TARGET]: target.toLowerCase(),
+            [Attributes.L1_BLOCK_PROPOSAL_USED_TRACE]: usedTrace
+        });
+    }
 }

package/dest/modules/l1_synchronizer.d.ts

@@ -0,0 +1,75 @@
+import type { BlobClientInterface } from '@aztec/blob-client/client';
+import { EpochCache } from '@aztec/epoch-cache';
+import { InboxContract, RollupContract } from '@aztec/ethereum/contracts';
+import type { L1ContractAddresses } from '@aztec/ethereum/l1-contract-addresses';
+import type { ViemPublicClient, ViemPublicDebugClient } from '@aztec/ethereum/types';
+import { Buffer32 } from '@aztec/foundation/buffer';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { EthAddress } from '@aztec/foundation/eth-address';
+import { type Logger } from '@aztec/foundation/log';
+import { DateProvider } from '@aztec/foundation/timer';
+import { type ArchiverEmitter } from '@aztec/stdlib/block';
+import { type L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
+import { type Traceable, type Tracer } from '@aztec/telemetry-client';
+import type { KVArchiverDataStore } from '../store/kv_archiver_store.js';
+import type { ArchiverInstrumentation } from './instrumentation.js';
+/**
+ * Handles L1 synchronization for the archiver.
+ * Responsible for fetching checkpoints, L1→L2 messages, and handling L1 reorgs.
+ */
+export declare class ArchiverL1Synchronizer implements Traceable {
+    private readonly publicClient;
+    private readonly debugClient;
+    private readonly rollup;
+    private readonly inbox;
+    private readonly l1Addresses;
+    private readonly store;
+    private config;
+    private readonly blobClient;
+    private readonly epochCache;
+    private readonly dateProvider;
+    private readonly instrumentation;
+    private readonly l1Constants;
+    private readonly events;
+    private readonly log;
+    private l1BlockNumber;
+    private l1BlockHash;
+    private l1Timestamp;
+    private readonly updater;
+    readonly tracer: Tracer;
+    constructor(publicClient: ViemPublicClient, debugClient: ViemPublicDebugClient, rollup: RollupContract, inbox: InboxContract, l1Addresses: Pick<L1ContractAddresses, 'registryAddress' | 'governanceProposerAddress' | 'slashFactoryAddress'> & {
+        slashingProposerAddress: EthAddress;
+    }, store: KVArchiverDataStore, config: {
+        batchSize: number;
+        skipValidateCheckpointAttestations?: boolean;
+        maxAllowedEthClientDriftSeconds: number;
+    }, blobClient: BlobClientInterface, epochCache: EpochCache, dateProvider: DateProvider, instrumentation: ArchiverInstrumentation, l1Constants: L1RollupConstants & {
+        l1StartBlockHash: Buffer32;
+        genesisArchiveRoot: Fr;
+    }, events: ArchiverEmitter, tracer: Tracer, log?: Logger);
+    /** Sets new config */
+    setConfig(newConfig: {
+        batchSize: number;
+        skipValidateCheckpointAttestations?: boolean;
+        maxAllowedEthClientDriftSeconds: number;
+    }): void;
+    /** Returns the last L1 block number that was synced. */
+    getL1BlockNumber(): bigint | undefined;
+    /** Returns the last L1 timestamp that was synced. */
+    getL1Timestamp(): bigint | undefined;
+    /** Checks that the ethereum node we are connected to has a latest timestamp no more than the allowed drift. Throw if not. */
+    testEthereumNodeSynced(): Promise<void>;
+    syncFromL1(initialSyncComplete: boolean): Promise<void>;
+    private pruneUncheckpointedBlocks;
+    private canPrune;
+    private handleEpochPrune;
+    private nextRange;
+    private handleL1ToL2Messages;
+    private retrieveL1ToL2Message;
+    private rollbackL1ToL2Messages;
+    private getL1BlockHash;
+    private handleCheckpoints;
+    private checkForNewCheckpointsBeforeL1SyncPoint;
+    private getCheckpointHeader;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfc3luY2hyb25pemVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbW9kdWxlcy9sMV9zeW5jaHJvbml6ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUNyRSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDaEQsT0FBTyxFQUFFLGFBQWEsRUFBRSxjQUFjLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUMxRSxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLHVDQUF1QyxDQUFDO0FBRWpGLE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLHFCQUFxQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFHckYsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBRXBELE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDM0QsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFnQixNQUFNLHVCQUF1QixDQUFDO0FBRWxFLE9BQU8sRUFBRSxZQUFZLEVBQWtCLE1BQU0seUJBQXlCLENBQUM7QUFFdkUsT0FBTyxFQUFFLEtBQUssZUFBZSxFQUFzRCxNQUFNLHFCQUFxQixDQUFDO0FBRS9HLE9BQU8sRUFBRSxLQUFLLGlCQUFpQixFQUFzQyxNQUFNLDZCQUE2QixDQUFDO0FBRXpHLE9BQU8sRUFBRSxLQUFLLFNBQVMsRUFBRSxLQUFLLE1BQU0sRUFBeUIsTUFBTSx5QkFBeUIsQ0FBQztBQVM3RixPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBR3pFLE9BQU8sS0FBSyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFhcEU7OztHQUdHO0FBQ0gscUJBQWEs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

package/dest/modules/l1_synchronizer.d.ts.map

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