@aztec/archiver 0.0.1-commit.e6bd8901 → 0.0.1-commit.ec7ac5448

package/dest/modules/data_source_base.js

@@ -1,6 +1,6 @@
-import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
+import { range } from '@aztec/foundation/array';
+import { BlockNumber } from '@aztec/foundation/branded-types';
 import { isDefined } from '@aztec/foundation/types';
-import { CommitteeAttestation } from '@aztec/stdlib/block';
 import { Checkpoint, PublishedCheckpoint } from '@aztec/stdlib/checkpoint';
 import { getSlotRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
 /**
@@ -64,7 +64,7 @@ import { getSlotRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
         if (!checkpointData) {
             return undefined;
         }
-        return BlockNumber(checkpointData.startBlock + checkpointData.numBlocks - 1);
+        return BlockNumber(checkpointData.startBlock + checkpointData.blockCount - 1);
     }
     getCheckpointedBlocks(from, limit) {
         return this.store.getCheckpointedBlocks(from, limit);
@@ -75,6 +75,12 @@ import { getSlotRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
     getBlockHeaderByArchive(archive) {
         return this.store.getBlockHeaderByArchive(archive);
     }
+    getBlockData(number) {
+        return this.store.getBlockData(number);
+    }
+    getBlockDataByArchive(archive) {
+        return this.store.getBlockDataByArchive(archive);
+    }
     async getL2Block(number) {
         // If the number provided is -ve, then return the latest block.
         if (number < 0) {
@@ -90,7 +96,13 @@ import { getSlotRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
         return this.store.getTxEffect(txHash);
     }
     getSettledTxReceipt(txHash) {
-        return this.store.getSettledTxReceipt(txHash);
+        return this.store.getSettledTxReceipt(txHash, this.l1Constants);
+    }
+    getProposedCheckpoint() {
+        return this.store.getProposedCheckpoint();
+    }
+    getProposedCheckpointOnly() {
+        return this.store.getProposedCheckpointOnly();
     }
     isPendingChainInvalid() {
         return this.getPendingChainValidationStatus().then((status)=>!status.valid);
@@ -100,11 +112,11 @@ import { getSlotRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
             valid: true
         };
     }
-    getPrivateLogsByTags(tags, page) {
-        return this.store.getPrivateLogsByTags(tags, page);
+    getPrivateLogsByTags(tags, page, upToBlockNumber) {
+        return this.store.getPrivateLogsByTags(tags, page, upToBlockNumber);
     }
-    getPublicLogsByTagsFromContract(contractAddress, tags, page) {
-        return this.store.getPublicLogsByTagsFromContract(contractAddress, tags, page);
+    getPublicLogsByTagsFromContract(contractAddress, tags, page, upToBlockNumber) {
+        return this.store.getPublicLogsByTagsFromContract(contractAddress, tags, page, upToBlockNumber);
     }
     getPublicLogs(filter) {
         return this.store.getPublicLogs(filter);
@@ -146,89 +158,39 @@ import { getSlotRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
     }
     async getCheckpoints(checkpointNumber, limit) {
         const checkpoints = await this.store.getRangeOfCheckpoints(checkpointNumber, limit);
-        const blocks = (await Promise.all(checkpoints.map((ch)=>this.store.getBlocksForCheckpoint(ch.checkpointNumber)))).filter(isDefined);
-        const fullCheckpoints = [];
-        for(let i = 0; i < checkpoints.length; i++){
-            const blocksForCheckpoint = blocks[i];
-            const checkpoint = checkpoints[i];
-            const fullCheckpoint = new Checkpoint(checkpoint.archive, checkpoint.header, blocksForCheckpoint, checkpoint.checkpointNumber);
-            const publishedCheckpoint = new PublishedCheckpoint(fullCheckpoint, checkpoint.l1, checkpoint.attestations.map((x)=>CommitteeAttestation.fromBuffer(x)));
-            fullCheckpoints.push(publishedCheckpoint);
+        return Promise.all(checkpoints.map((ch)=>this.getPublishedCheckpointFromCheckpointData(ch)));
+    }
+    async getPublishedCheckpointFromCheckpointData(checkpoint) {
+        const blocksForCheckpoint = await this.store.getBlocksForCheckpoint(checkpoint.checkpointNumber);
+        if (!blocksForCheckpoint) {
+            throw new Error(`Blocks for checkpoint ${checkpoint.checkpointNumber} not found`);
         }
-        return fullCheckpoints;
+        const fullCheckpoint = new Checkpoint(checkpoint.archive, checkpoint.header, blocksForCheckpoint, checkpoint.checkpointNumber);
+        return new PublishedCheckpoint(fullCheckpoint, checkpoint.l1, checkpoint.attestations);
     }
     getBlocksForSlot(slotNumber) {
         return this.store.getBlocksForSlot(slotNumber);
     }
     async getCheckpointedBlocksForEpoch(epochNumber) {
-        if (!this.l1Constants) {
-            throw new Error('L1 constants not set');
-        }
-        const [start, end] = getSlotRangeForEpoch(epochNumber, this.l1Constants);
-        const blocks = [];
-        // Walk the list of checkpoints backwards and filter by slots matching the requested epoch.
-        // We'll typically ask for checkpoints for a very recent epoch, so we shouldn't need an index here.
-        let checkpoint = await this.store.getCheckpointData(await this.store.getSynchedCheckpointNumber());
-        const slot = (b)=>b.header.slotNumber;
-        while(checkpoint && slot(checkpoint) >= start){
-            if (slot(checkpoint) <= end) {
-                // push the blocks on backwards
-                const endBlock = checkpoint.startBlock + checkpoint.numBlocks - 1;
-                for(let i = endBlock; i >= checkpoint.startBlock; i--){
-                    const checkpointedBlock = await this.getCheckpointedBlock(BlockNumber(i));
-                    if (checkpointedBlock) {
-                        blocks.push(checkpointedBlock);
-                    }
-                }
-            }
-            checkpoint = await this.store.getCheckpointData(CheckpointNumber(checkpoint.checkpointNumber - 1));
-        }
-        return blocks.reverse();
+        const checkpointsData = await this.getCheckpointsDataForEpoch(epochNumber);
+        const blocks = await Promise.all(checkpointsData.flatMap((checkpoint)=>range(checkpoint.blockCount, checkpoint.startBlock).map((blockNumber)=>this.getCheckpointedBlock(BlockNumber(blockNumber)))));
+        return blocks.filter(isDefined);
     }
     async getCheckpointedBlockHeadersForEpoch(epochNumber) {
-        if (!this.l1Constants) {
-            throw new Error('L1 constants not set');
-        }
-        const [start, end] = getSlotRangeForEpoch(epochNumber, this.l1Constants);
-        const blocks = [];
-        // Walk the list of checkpoints backwards and filter by slots matching the requested epoch.
-        // We'll typically ask for checkpoints for a very recent epoch, so we shouldn't need an index here.
-        let checkpoint = await this.store.getCheckpointData(await this.store.getSynchedCheckpointNumber());
-        const slot = (b)=>b.header.slotNumber;
-        while(checkpoint && slot(checkpoint) >= start){
-            if (slot(checkpoint) <= end) {
-                // push the blocks on backwards
-                const endBlock = checkpoint.startBlock + checkpoint.numBlocks - 1;
-                for(let i = endBlock; i >= checkpoint.startBlock; i--){
-                    const block = await this.getBlockHeader(BlockNumber(i));
-                    if (block) {
-                        blocks.push(block);
-                    }
-                }
-            }
-            checkpoint = await this.store.getCheckpointData(CheckpointNumber(checkpoint.checkpointNumber - 1));
-        }
-        return blocks.reverse();
+        const checkpointsData = await this.getCheckpointsDataForEpoch(epochNumber);
+        const blocks = await Promise.all(checkpointsData.flatMap((checkpoint)=>range(checkpoint.blockCount, checkpoint.startBlock).map((blockNumber)=>this.getBlockHeader(BlockNumber(blockNumber)))));
+        return blocks.filter(isDefined);
     }
     async getCheckpointsForEpoch(epochNumber) {
+        const checkpointsData = await this.getCheckpointsDataForEpoch(epochNumber);
+        return Promise.all(checkpointsData.map((data)=>this.getPublishedCheckpointFromCheckpointData(data).then((p)=>p.checkpoint)));
+    }
+    /** Returns checkpoint data for all checkpoints whose slot falls within the given epoch. */ getCheckpointsDataForEpoch(epochNumber) {
         if (!this.l1Constants) {
             throw new Error('L1 constants not set');
         }
         const [start, end] = getSlotRangeForEpoch(epochNumber, this.l1Constants);
-        const checkpoints = [];
-        // Walk the list of checkpoints backwards and filter by slots matching the requested epoch.
-        // We'll typically ask for checkpoints for a very recent epoch, so we shouldn't need an index here.
-        let checkpointData = await this.store.getCheckpointData(await this.store.getSynchedCheckpointNumber());
-        const slot = (b)=>b.header.slotNumber;
-        while(checkpointData && slot(checkpointData) >= start){
-            if (slot(checkpointData) <= end) {
-                // push the checkpoints on backwards
-                const [checkpoint] = await this.getCheckpoints(checkpointData.checkpointNumber, 1);
-                checkpoints.push(checkpoint.checkpoint);
-            }
-            checkpointData = await this.store.getCheckpointData(CheckpointNumber(checkpointData.checkpointNumber - 1));
-        }
-        return checkpoints.reverse();
+        return this.store.getCheckpointDataForSlotRange(start, end);
     }
     async getBlock(number) {
         // If the number provided is -ve, then return the latest block.

package/dest/modules/data_store_updater.d.ts

@@ -1,7 +1,8 @@
 import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
 import type { L2Block, ValidateCheckpointResult } from '@aztec/stdlib/block';
-import type { PublishedCheckpoint } from '@aztec/stdlib/checkpoint';
+import { type ProposedCheckpointInput, type PublishedCheckpoint } from '@aztec/stdlib/checkpoint';
 import type { KVArchiverDataStore } from '../store/kv_archiver_store.js';
+import type { L2TipsCache } from '../store/l2_tips_cache.js';
 /** Result of adding checkpoints with information about any pruned blocks. */
 type ReconcileCheckpointsResult = {
     /** Blocks that were pruned due to conflict with L1 checkpoints. */
@@ -12,31 +13,34 @@ type ReconcileCheckpointsResult = {
 /** Archiver helper module to handle updates to the data store. */
 export declare class ArchiverDataStoreUpdater {
     private store;
+    private l2TipsCache?;
+    private opts;
     private readonly log;
-    constructor(store: KVArchiverDataStore);
+    constructor(store: KVArchiverDataStore, l2TipsCache?: L2TipsCache | undefined, opts?: {
+        rollupManaLimit?: number;
+    });
     /**
-     * Adds proposed blocks to the store with contract class/instance extraction from logs.
-     * These are uncheckpointed blocks that have been proposed by the sequencer but not yet included in a checkpoint on L1.
-     * Extracts ContractClassPublished, ContractInstancePublished, ContractInstanceUpdated events,
-     * and individually broadcasted functions from the block logs.
+     * Adds a proposed block to the store with contract class/instance extraction from logs.
+     * This is an uncheckpointed block that has been proposed by the sequencer but not yet included in a checkpoint on L1.
+     * Extracts ContractClassPublished, ContractInstancePublished, ContractInstanceUpdated events from the block logs.
      *
-     * @param blocks - The proposed L2 blocks to add.
+     * @param block - The proposed L2 block to add.
      * @param pendingChainValidationStatus - Optional validation status to set.
      * @returns True if the operation is successful.
      */
-    addProposedBlocks(blocks: L2Block[], pendingChainValidationStatus?: ValidateCheckpointResult): Promise<boolean>;
+    addProposedBlock(block: L2Block, pendingChainValidationStatus?: ValidateCheckpointResult): Promise<boolean>;
     /**
      * Reconciles local blocks with incoming checkpoints from L1.
      * Adds new 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.
+     * Extracts ContractClassPublished, ContractInstancePublished, ContractInstanceUpdated events 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.
      */
     addCheckpoints(checkpoints: PublishedCheckpoint[], pendingChainValidationStatus?: ValidateCheckpointResult): Promise<ReconcileCheckpointsResult>;
+    setProposedCheckpoint(proposedCheckpoint: ProposedCheckpointInput): Promise<void>;
     private pruneMismatchingLocalBlocks;
     /**
      * Removes all uncheckpointed blocks strictly after the specified block number and cleans up associated contract data.
@@ -59,6 +63,16 @@ export declare class ArchiverDataStoreUpdater {
      * @returns True if the operation is successful.
      */
     removeCheckpointsAfter(checkpointNumber: CheckpointNumber): Promise<boolean>;
+    /**
+     * Updates the proven checkpoint number and refreshes the L2 tips cache.
+     * @param checkpointNumber - The checkpoint number to set as proven.
+     */
+    setProvenCheckpointNumber(checkpointNumber: CheckpointNumber): Promise<void>;
+    /**
+     * Updates the finalized checkpoint number and refreshes the L2 tips cache.
+     * @param checkpointNumber - The checkpoint number to set as finalized.
+     */
+    setFinalizedCheckpointNumber(checkpointNumber: CheckpointNumber): Promise<void>;
     /** Extracts and stores contract data from a single block. */
     private addContractDataToDb;
     /** Removes contract data associated with a block. */
@@ -67,7 +81,6 @@ export declare class ArchiverDataStoreUpdater {
     private updatePublishedContractClasses;
     private updateDeployedContractInstances;
     private updateUpdatedContractInstances;
-    private storeBroadcastedIndividualFunctions;
 }
 export {};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGF0YV9zdG9yZV91cGRhdGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbW9kdWxlcy9kYXRhX3N0b3JlX3VwZGF0ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFdBQVcsRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBWWhGLE9BQU8sS0FBSyxFQUFFLE9BQU8sRUFBRSx3QkFBd0IsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQzdFLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFhcEUsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQVF6RSw2RUFBNkU7QUFDN0UsS0FBSywwQkFBMEIsR0FBRztJQUNoQyxtRUFBbUU7SUFDbkUsWUFBWSxFQUFFLE9BQU8sRUFBRSxHQUFHLFNBQVMsQ0FBQztJQUNwQyxpRkFBaUY7SUFDakYsOEJBQThCLEVBQUUsV0FBVyxHQUFHLFNBQVMsQ0FBQztDQUN6RCxDQUFDO0FBRUYsa0VBQWtFO0FBQ2xFLHFCQUFhLHdCQUF3QjtJQUd2QixPQUFPLENBQUMsS0FBSztJQUZ6QixPQUFPLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBMEM7SUFFOUQsWUFBb0IsS0FBSyxFQUFFLG1CQUFtQixFQUFJO0lBRWxEOzs7Ozs7Ozs7T0FTRztJQUNJLGlCQUFpQixDQUN0QixNQUFNLEVBQUUsT0FBTyxFQUFFLEVBQ2pCLDRCQUE0QixDQUFDLEVBQUUsd0JBQXdCLEdBQ3RELE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FlbEI7SUFFRDs7Ozs7Ozs7OztPQVVHO0lBQ0ksY0FBYyxDQUNuQixXQUFXLEVBQUUsbUJBQW1CLEVBQUUsRUFDbEMsNEJBQTRCLENBQUMsRUFBRSx3QkFBd0IsR0FDdEQsT0FBTyxDQUFDLDBCQUEwQixDQUFDLENBdUJyQztZQVFhLDJCQUEyQjtJQW1FekM7Ozs7Ozs7O09BUUc7SUFDSSwrQkFBK0IsQ0FBQyxXQUFXLEVBQUUsV0FBVyxHQUFHLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQVluRjtZQU1hLGlCQUFpQjtJQWEvQjs7Ozs7Ozs7T0FRRztJQUNVLHNCQUFzQixDQUFDLGdCQUFnQixFQUFFLGdCQUFnQixHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FZeEY7SUFFRCw2REFBNkQ7SUFDN0QsT0FBTyxDQUFDLG1CQUFtQjtJQUkzQixxREFBcUQ7SUFDckQsT0FBTyxDQUFDLHdCQUF3QjtZQUtsQixzQkFBc0I7WUFvQnRCLDhCQUE4QjtZQTRCOUIsK0JBQStCO1lBeUIvQiw4QkFBOEI7WUE2QjlCLG1DQUFtQztDQXdEbEQifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGF0YV9zdG9yZV91cGRhdGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbW9kdWxlcy9kYXRhX3N0b3JlX3VwZGF0ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFdBQVcsRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBUWhGLE9BQU8sS0FBSyxFQUFFLE9BQU8sRUFBRSx3QkFBd0IsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQzdFLE9BQU8sRUFBRSxLQUFLLHVCQUF1QixFQUFFLEtBQUssbUJBQW1CLEVBQXNCLE1BQU0sMEJBQTBCLENBQUM7QUFTdEgsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUN6RSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQVE3RCw2RUFBNkU7QUFDN0UsS0FBSywwQkFBMEIsR0FBRztJQUNoQyxtRUFBbUU7SUFDbkUsWUFBWSxFQUFFLE9BQU8sRUFBRSxHQUFHLFNBQVMsQ0FBQztJQUNwQyxpRkFBaUY7SUFDakYsOEJBQThCLEVBQUUsV0FBVyxHQUFHLFNBQVMsQ0FBQztDQUN6RCxDQUFDO0FBRUYsa0VBQWtFO0FBQ2xFLHFCQUFhLHdCQUF3QjtJQUlqQyxPQUFPLENBQUMsS0FBSztJQUNiLE9BQU8sQ0FBQyxXQUFXLENBQUM7SUFDcEIsT0FBTyxDQUFDLElBQUk7SUFMZCxPQUFPLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBMEM7SUFFOUQsWUFDVSxLQUFLLEVBQUUsbUJBQW1CLEVBQzFCLFdBQVcsQ0FBQyx5QkFBYSxFQUN6QixJQUFJLEdBQUU7UUFBRSxlQUFlLENBQUMsRUFBRSxNQUFNLENBQUE7S0FBTyxFQUM3QztJQUVKOzs7Ozs7OztPQVFHO0lBQ1UsZ0JBQWdCLENBQzNCLEtBQUssRUFBRSxPQUFPLEVBQ2QsNEJBQTRCLENBQUMsRUFBRSx3QkFBd0IsR0FDdEQsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQWlCbEI7SUFFRDs7Ozs7Ozs7O09BU0c7SUFDVSxjQUFjLENBQ3pCLFdBQVcsRUFBRSxtQkFBbUIsRUFBRSxFQUNsQyw0QkFBNEIsQ0FBQyxFQUFFLHdCQUF3QixHQUN0RCxPQUFPLENBQUMsMEJBQTBCLENBQUMsQ0E2QnJDO0lBRVkscUJBQXFCLENBQUMsa0JBQWtCLEVBQUUsdUJBQXVCLGlCQU83RTtZQVFhLDJCQUEyQjtJQW1FekM7Ozs7Ozs7O09BUUc7SUFDVSwrQkFBK0IsQ0FBQyxXQUFXLEVBQUUsV0FBVyxHQUFHLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQW1CekY7WUFNYSxpQkFBaUI7SUFhL0I7Ozs7Ozs7O09BUUc7SUFDVSxzQkFBc0IsQ0FBQyxnQkFBZ0IsRUFBRSxnQkFBZ0IsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBZXhGO0lBRUQ7OztPQUdHO0lBQ1UseUJBQXlCLENBQUMsZ0JBQWdCLEVBQUUsZ0JBQWdCLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUt4RjtJQUVEOzs7T0FHRztJQUNVLDRCQUE0QixDQUFDLGdCQUFnQixFQUFFLGdCQUFnQixHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FLM0Y7SUFFRCw2REFBNkQ7SUFDN0QsT0FBTyxDQUFDLG1CQUFtQjtJQUkzQixxREFBcUQ7SUFDckQsT0FBTyxDQUFDLHdCQUF3QjtZQUtsQixzQkFBc0I7WUFpQnRCLDhCQUE4QjtZQStDOUIsK0JBQStCO1lBMEMvQiw4QkFBOEI7Q0FzQjdDIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"data_store_updater.d.ts","sourceRoot":"","sources":["../../src/modules/data_store_updater.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAYhF,OAAO,KAAK,EAAE,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAC7E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAapE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAQzE,6EAA6E;AAC7E,KAAK,0BAA0B,GAAG;IAChC,mEAAmE;IACnE,YAAY,EAAE,OAAO,EAAE,GAAG,SAAS,CAAC;IACpC,iFAAiF;IACjF,8BAA8B,EAAE,WAAW,GAAG,SAAS,CAAC;CACzD,CAAC;AAEF,kEAAkE;AAClE,qBAAa,wBAAwB;IAGvB,OAAO,CAAC,KAAK;IAFzB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAA0C;IAE9D,YAAoB,KAAK,EAAE,mBAAmB,EAAI;IAElD;;;;;;;;;OASG;IACI,iBAAiB,CACtB,MAAM,EAAE,OAAO,EAAE,EACjB,4BAA4B,CAAC,EAAE,wBAAwB,GACtD,OAAO,CAAC,OAAO,CAAC,CAelB;IAED;;;;;;;;;;OAUG;IACI,cAAc,CACnB,WAAW,EAAE,mBAAmB,EAAE,EAClC,4BAA4B,CAAC,EAAE,wBAAwB,GACtD,OAAO,CAAC,0BAA0B,CAAC,CAuBrC;YAQa,2BAA2B;IAmEzC;;;;;;;;OAQG;IACI,+BAA+B,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAYnF;YAMa,iBAAiB;IAa/B;;;;;;;;OAQG;IACU,sBAAsB,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC,CAYxF;IAED,6DAA6D;IAC7D,OAAO,CAAC,mBAAmB;IAI3B,qDAAqD;IACrD,OAAO,CAAC,wBAAwB;YAKlB,sBAAsB;YAoBtB,8BAA8B;YA4B9B,+BAA+B;YAyB/B,8BAA8B;YA6B9B,mCAAmC;CAwDlD"}
+{"version":3,"file":"data_store_updater.d.ts","sourceRoot":"","sources":["../../src/modules/data_store_updater.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAQhF,OAAO,KAAK,EAAE,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAC7E,OAAO,EAAE,KAAK,uBAAuB,EAAE,KAAK,mBAAmB,EAAsB,MAAM,0BAA0B,CAAC;AAStH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAQ7D,6EAA6E;AAC7E,KAAK,0BAA0B,GAAG;IAChC,mEAAmE;IACnE,YAAY,EAAE,OAAO,EAAE,GAAG,SAAS,CAAC;IACpC,iFAAiF;IACjF,8BAA8B,EAAE,WAAW,GAAG,SAAS,CAAC;CACzD,CAAC;AAEF,kEAAkE;AAClE,qBAAa,wBAAwB;IAIjC,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,WAAW,CAAC;IACpB,OAAO,CAAC,IAAI;IALd,OAAO,CAAC,QAAQ,CAAC,GAAG,CAA0C;IAE9D,YACU,KAAK,EAAE,mBAAmB,EAC1B,WAAW,CAAC,yBAAa,EACzB,IAAI,GAAE;QAAE,eAAe,CAAC,EAAE,MAAM,CAAA;KAAO,EAC7C;IAEJ;;;;;;;;OAQG;IACU,gBAAgB,CAC3B,KAAK,EAAE,OAAO,EACd,4BAA4B,CAAC,EAAE,wBAAwB,GACtD,OAAO,CAAC,OAAO,CAAC,CAiBlB;IAED;;;;;;;;;OASG;IACU,cAAc,CACzB,WAAW,EAAE,mBAAmB,EAAE,EAClC,4BAA4B,CAAC,EAAE,wBAAwB,GACtD,OAAO,CAAC,0BAA0B,CAAC,CA6BrC;IAEY,qBAAqB,CAAC,kBAAkB,EAAE,uBAAuB,iBAO7E;YAQa,2BAA2B;IAmEzC;;;;;;;;OAQG;IACU,+BAA+B,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAmBzF;YAMa,iBAAiB;IAa/B;;;;;;;;OAQG;IACU,sBAAsB,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC,CAexF;IAED;;;OAGG;IACU,yBAAyB,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAKxF;IAED;;;OAGG;IACU,4BAA4B,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAK3F;IAED,6DAA6D;IAC7D,OAAO,CAAC,mBAAmB;IAI3B,qDAAqD;IACrD,OAAO,CAAC,wBAAwB;YAKlB,sBAAsB;YAiBtB,8BAA8B;YA+C9B,+BAA+B;YA0C/B,8BAA8B;CAsB7C"}

package/dest/modules/data_store_updater.js

@@ -1,10 +1,10 @@
 import { BlockNumber } from '@aztec/foundation/branded-types';
-import { Fr } from '@aztec/foundation/curves/bn254';
+import { filterAsync } from '@aztec/foundation/collection';
 import { createLogger } from '@aztec/foundation/log';
-import { ContractClassPublishedEvent, PrivateFunctionBroadcastedEvent, UtilityFunctionBroadcastedEvent } from '@aztec/protocol-contracts/class-registry';
+import { ContractClassPublishedEvent } 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';
+import { validateCheckpoint } from '@aztec/stdlib/checkpoint';
+import { computeContractAddressFromInstance, computeContractClassId } from '@aztec/stdlib/contract';
 /** Operation type for contract data updates. */ var Operation = /*#__PURE__*/ function(Operation) {
     Operation[Operation["Store"] = 0] = "Store";
     Operation[Operation["Delete"] = 1] = "Delete";
@@ -12,50 +12,61 @@ import groupBy from 'lodash.groupby';
 }(Operation || {});
 /** Archiver helper module to handle updates to the data store. */ export class ArchiverDataStoreUpdater {
     store;
+    l2TipsCache;
+    opts;
     log;
-    constructor(store){
+    constructor(store, l2TipsCache, opts = {}){
         this.store = store;
+        this.l2TipsCache = l2TipsCache;
+        this.opts = opts;
         this.log = createLogger('archiver:store_updater');
     }
     /**
-   * Adds proposed blocks to the store with contract class/instance extraction from logs.
-   * These are uncheckpointed blocks that have been proposed by the sequencer but not yet included in a checkpoint on L1.
-   * Extracts ContractClassPublished, ContractInstancePublished, ContractInstanceUpdated events,
-   * and individually broadcasted functions from the block logs.
+   * Adds a proposed block to the store with contract class/instance extraction from logs.
+   * This is an uncheckpointed block that has been proposed by the sequencer but not yet included in a checkpoint on L1.
+   * Extracts ContractClassPublished, ContractInstancePublished, ContractInstanceUpdated events from the block logs.
    *
-   * @param blocks - The proposed L2 blocks to add.
+   * @param block - The proposed L2 block to add.
    * @param pendingChainValidationStatus - Optional validation status to set.
    * @returns True if the operation is successful.
-   */ addProposedBlocks(blocks, pendingChainValidationStatus) {
-        return this.store.transactionAsync(async ()=>{
-            await this.store.addProposedBlocks(blocks);
+   */ async addProposedBlock(block, pendingChainValidationStatus) {
+        const result = await this.store.transactionAsync(async ()=>{
+            await this.store.addProposedBlock(block);
             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.addContractDataToDb(block))
+                // Add any logs emitted during the retrieved block
+                this.store.addLogs([
+                    block
+                ]),
+                // Unroll all logs emitted during the retrieved block and extract any contract classes and instances from it
+                this.addContractDataToDb(block)
             ]);
+            await this.l2TipsCache?.refresh();
             return opResults.every(Boolean);
         });
+        return result;
     }
     /**
    * Reconciles local blocks with incoming checkpoints from L1.
    * Adds new 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.
+   * Extracts ContractClassPublished, ContractInstancePublished, ContractInstanceUpdated events 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.
-   */ addCheckpoints(checkpoints, pendingChainValidationStatus) {
-        return this.store.transactionAsync(async ()=>{
+   */ async addCheckpoints(checkpoints, pendingChainValidationStatus) {
+        for (const checkpoint of checkpoints){
+            validateCheckpoint(checkpoint.checkpoint, {
+                rollupManaLimit: this.opts?.rollupManaLimit
+            });
+        }
+        const result = await 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 addProposedBlocks() to avoid duplicating logs/contract data
+            // Filter out blocks that were already inserted via addProposedBlock() 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
@@ -65,11 +76,20 @@ import groupBy from 'lodash.groupby';
                 // Unroll all logs emitted during the retrieved blocks and extract any contract classes and instances from them
                 ...newBlocks.map((block)=>this.addContractDataToDb(block))
             ]);
+            await this.l2TipsCache?.refresh();
             return {
                 prunedBlocks,
                 lastAlreadyInsertedBlockNumber
             };
         });
+        return result;
+    }
+    async setProposedCheckpoint(proposedCheckpoint) {
+        const result = await this.store.transactionAsync(async ()=>{
+            await this.store.setProposedCheckpoint(proposedCheckpoint);
+            await this.l2TipsCache?.refresh();
+        });
+        return result;
     }
     /**
    * Checks for local proposed blocks that do not match the ones to be checkpointed and prunes them.
@@ -113,7 +133,7 @@ import groupBy from 'lodash.groupby';
                     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);
+                    this.log.info(`Conflict detected at block ${blockNumber} between checkpointed and local block`, blockInfos);
                     const prunedBlocks = await this.removeBlocksAfter(BlockNumber(blockNumber - 1));
                     return {
                         prunedBlocks,
@@ -147,15 +167,20 @@ import groupBy from 'lodash.groupby';
    * @param blockNumber - Remove all blocks with number greater than this.
    * @returns The removed blocks.
    * @throws Error if any block to be removed is checkpointed.
-   */ removeUncheckpointedBlocksAfter(blockNumber) {
-        return this.store.transactionAsync(async ()=>{
+   */ async removeUncheckpointedBlocksAfter(blockNumber) {
+        const result = await this.store.transactionAsync(async ()=>{
             // Verify we're only removing uncheckpointed blocks
             const lastCheckpointedBlockNumber = await this.store.getCheckpointedL2BlockNumber();
             if (blockNumber < lastCheckpointedBlockNumber) {
                 throw new Error(`Cannot remove blocks after ${blockNumber} because checkpointed blocks exist up to ${lastCheckpointedBlockNumber}`);
             }
-            return await this.removeBlocksAfter(blockNumber);
+            const result = await this.removeBlocksAfter(blockNumber);
+            // Clear the proposed checkpoint if it exists, since its blocks have been pruned
+            await this.store.deleteProposedCheckpoint();
+            await this.l2TipsCache?.refresh();
+            return result;
         });
+        return result;
     }
     /**
    * Removes all blocks strictly after the given block number along with any logs and contract data.
@@ -179,17 +204,38 @@ import groupBy from 'lodash.groupby';
    * @param checkpointNumber - Remove all checkpoints strictly after this one.
    * @returns True if the operation is successful.
    */ async removeCheckpointsAfter(checkpointNumber) {
-        const { blocksRemoved = [] } = await this.store.removeCheckpointsAfter(checkpointNumber);
-        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 removed
-            ...blocksRemoved.map((block)=>this.removeContractDataFromDb(block)),
-            this.store.deleteLogs(blocksRemoved)
-        ]);
-        return opResults.every(Boolean);
+        return await this.store.transactionAsync(async ()=>{
+            const { blocksRemoved = [] } = await this.store.removeCheckpointsAfter(checkpointNumber);
+            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 removed
+                ...blocksRemoved.map((block)=>this.removeContractDataFromDb(block)),
+                this.store.deleteLogs(blocksRemoved)
+            ]);
+            await this.l2TipsCache?.refresh();
+            return opResults.every(Boolean);
+        });
+    }
+    /**
+   * Updates the proven checkpoint number and refreshes the L2 tips cache.
+   * @param checkpointNumber - The checkpoint number to set as proven.
+   */ async setProvenCheckpointNumber(checkpointNumber) {
+        await this.store.transactionAsync(async ()=>{
+            await this.store.setProvenCheckpointNumber(checkpointNumber);
+            await this.l2TipsCache?.refresh();
+        });
+    }
+    /**
+   * Updates the finalized checkpoint number and refreshes the L2 tips cache.
+   * @param checkpointNumber - The checkpoint number to set as finalized.
+   */ async setFinalizedCheckpointNumber(checkpointNumber) {
+        await this.store.transactionAsync(async ()=>{
+            await this.store.setFinalizedCheckpointNumber(checkpointNumber);
+            await this.l2TipsCache?.refresh();
+        });
     }
     /** Extracts and stores contract data from a single block. */ addContractDataToDb(block) {
         return this.updateContractDataOnDb(block, 0);
@@ -204,31 +250,62 @@ import groupBy from 'lodash.groupby';
         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)
+            this.updateUpdatedContractInstances(publicLogs, block.header.globalVariables.timestamp, operation)
         ])).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) {
+        if (operation == 1) {
+            const contractClasses = contractClassPublishedEvents.map((e)=>e.toContractClassPublic());
+            if (contractClasses.length > 0) {
+                contractClasses.forEach((c)=>this.log.verbose(`${Operation[operation]} contract class ${c.id.toString()}`));
                 return await this.store.deleteContractClasses(contractClasses, blockNum);
             }
+            return true;
+        }
+        // Compute bytecode commitments and validate class IDs in a single pass.
+        const contractClasses = [];
+        for (const event of contractClassPublishedEvents){
+            const contractClass = await event.toContractClassPublicWithBytecodeCommitment();
+            const computedClassId = await computeContractClassId({
+                artifactHash: contractClass.artifactHash,
+                privateFunctionsRoot: contractClass.privateFunctionsRoot,
+                publicBytecodeCommitment: contractClass.publicBytecodeCommitment
+            });
+            if (!computedClassId.equals(contractClass.id)) {
+                this.log.warn(`Skipping contract class with mismatched id at block ${blockNum}. Claimed ${contractClass.id}, computed ${computedClassId}`, {
+                    blockNum,
+                    contractClassId: event.contractClassId.toString()
+                });
+                continue;
+            }
+            contractClasses.push(contractClass);
+        }
+        if (contractClasses.length > 0) {
+            contractClasses.forEach((c)=>this.log.verbose(`${Operation[operation]} contract class ${c.id.toString()}`));
+            return await this.store.addContractClasses(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());
+        const allInstances = allLogs.filter((log)=>ContractInstancePublishedEvent.isContractInstancePublishedEvent(log)).map((log)=>ContractInstancePublishedEvent.fromLog(log)).map((e)=>e.toContractInstance());
+        // Verify that each instance's address matches the one derived from its fields if we're adding
+        const contractInstances = operation === 1 ? allInstances : await filterAsync(allInstances, async (instance)=>{
+            const computedAddress = await computeContractAddressFromInstance(instance);
+            if (!computedAddress.equals(instance.address)) {
+                this.log.warn(`Found contract instance with mismatched address at block ${blockNum}. Claimed ${instance.address} but computed ${computedAddress}.`, {
+                    instanceAddress: instance.address.toString(),
+                    computedAddress: computedAddress.toString(),
+                    blockNum
+                });
+                return false;
+            }
+            return true;
+        });
         if (contractInstances.length > 0) {
             contractInstances.forEach((c)=>this.log.verbose(`${Operation[operation]} contract instance at ${c.address.toString()}`));
             if (operation == 0) {
@@ -253,50 +330,4 @@ import groupBy from 'lodash.groupby';
         }
         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;
-    }
 }