@aztec/archiver 0.0.1-commit.d431d1c → 0.0.1-commit.db765a8

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 { CheckpointedL2Block, CommitteeAttestation } from '@aztec/stdlib/block';
 import { Checkpoint, PublishedCheckpoint } from '@aztec/stdlib/checkpoint';
 import { getSlotRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
 /**
@@ -40,9 +40,12 @@ import { getSlotRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
     getCheckpointedBlock(number) {
         return this.store.getCheckpointedBlock(number);
     }
-    getCheckpointedBlockNumber() {
+    getCheckpointedL2BlockNumber() {
         return this.store.getCheckpointedL2BlockNumber();
     }
+    getFinalizedL2BlockNumber() {
+        return this.store.getFinalizedL2BlockNumber();
+    }
     async getCheckpointHeader(number) {
         if (number === 'latest') {
             number = await this.store.getSynchedCheckpointNumber();
@@ -61,15 +64,10 @@ 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);
     }
-    async getCheckpointedBlocks(from, limit, proven) {
-        const blocks = await this.store.getCheckpointedBlocks(from, limit);
-        if (proven === true) {
-            const provenBlockNumber = await this.store.getProvenBlockNumber();
-            return blocks.filter((b)=>b.block.number <= provenBlockNumber);
-        }
-        return blocks;
+    getCheckpointedBlocks(from, limit) {
+        return this.store.getCheckpointedBlocks(from, limit);
     }
     getBlockHeaderByHash(blockHash) {
         return this.store.getBlockHeaderByHash(blockHash);
@@ -77,7 +75,13 @@ import { getSlotRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
     getBlockHeaderByArchive(archive) {
         return this.store.getBlockHeaderByArchive(archive);
     }
-    async getL2BlockNew(number) {
+    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) {
             number = await this.store.getLatestBlockNumber();
@@ -102,14 +106,6 @@ import { getSlotRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
             valid: true
         };
     }
-    async getL2BlocksNew(from, limit, proven) {
-        const blocks = await this.store.getBlocks(from, limit);
-        if (proven === true) {
-            const provenBlockNumber = await this.store.getProvenBlockNumber();
-            return blocks.filter((b)=>b.number <= provenBlockNumber);
-        }
-        return blocks;
-    }
     getPrivateLogsByTags(tags, page) {
         return this.store.getPrivateLogsByTags(tags, page);
     }
@@ -154,107 +150,41 @@ import { getSlotRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
     getL1ToL2MessageIndex(l1ToL2Message) {
         return this.store.getL1ToL2MessageIndex(l1ToL2Message);
     }
-    async getPublishedCheckpoints(checkpointNumber, limit) {
+    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 getBlocksForEpoch(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.getBlock(BlockNumber(i));
-                    if (block) {
-                        blocks.push(block);
-                    }
-                }
-            }
-            checkpoint = await this.store.getCheckpointData(CheckpointNumber(checkpoint.checkpointNumber - 1));
-        }
-        return blocks.reverse();
+    async getCheckpointedBlocksForEpoch(epochNumber) {
+        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 getBlockHeadersForEpoch(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();
+    async getCheckpointedBlockHeadersForEpoch(epochNumber) {
+        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.getPublishedCheckpoints(checkpointData.checkpointNumber, 1);
-                checkpoints.push(checkpoint.checkpoint);
-            }
-            checkpointData = await this.store.getCheckpointData(CheckpointNumber(checkpointData.checkpointNumber - 1));
-        }
-        return checkpoints.reverse();
-    }
-    async getPublishedBlocks(from, limit, proven) {
-        const checkpoints = await this.store.getRangeOfCheckpoints(CheckpointNumber(from), limit);
-        const provenCheckpointNumber = await this.store.getProvenCheckpointNumber();
-        const blocks = (await Promise.all(checkpoints.map((ch)=>this.store.getBlocksForCheckpoint(ch.checkpointNumber)))).filter(isDefined);
-        const publishedBlocks = [];
-        for(let i = 0; i < checkpoints.length; i++){
-            const blockForCheckpoint = blocks[i][0];
-            const checkpoint = checkpoints[i];
-            if (checkpoint.checkpointNumber > provenCheckpointNumber && proven === true) {
-                continue;
-            }
-            const publishedBlock = new CheckpointedL2Block(checkpoint.checkpointNumber, blockForCheckpoint, checkpoint.l1, checkpoint.attestations.map((x)=>CommitteeAttestation.fromBuffer(x)));
-            publishedBlocks.push(publishedBlock);
-        }
-        return publishedBlocks;
+        return this.store.getCheckpointDataForSlotRange(start, end);
     }
     async getBlock(number) {
         // If the number provided is -ve, then return the latest block.
@@ -266,25 +196,20 @@ import { getSlotRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
         }
         return this.store.getBlock(number);
     }
-    async getBlocks(from, limit, proven) {
-        const blocks = await this.store.getBlocks(from, limit);
-        if (proven === true) {
-            const provenBlockNumber = await this.store.getProvenBlockNumber();
-            return blocks.filter((b)=>b.number <= provenBlockNumber);
-        }
-        return blocks;
+    getBlocks(from, limit) {
+        return this.store.getBlocks(from, limit);
     }
-    getPublishedBlockByHash(blockHash) {
+    getCheckpointedBlockByHash(blockHash) {
         return this.store.getCheckpointedBlockByHash(blockHash);
     }
-    getPublishedBlockByArchive(archive) {
+    getCheckpointedBlockByArchive(archive) {
         return this.store.getCheckpointedBlockByArchive(archive);
     }
-    async getL2BlockNewByHash(blockHash) {
+    async getL2BlockByHash(blockHash) {
         const checkpointedBlock = await this.store.getCheckpointedBlockByHash(blockHash);
         return checkpointedBlock?.block;
     }
-    async getL2BlockNewByArchive(archive) {
+    async getL2BlockByArchive(archive) {
         const checkpointedBlock = await this.store.getCheckpointedBlockByArchive(archive);
         return checkpointedBlock?.block;
     }

package/dest/modules/data_store_updater.d.ts

@@ -1,32 +1,35 @@
-import { BlockNumber, type CheckpointNumber } from '@aztec/foundation/branded-types';
-import type { L2BlockNew, ValidateCheckpointResult } from '@aztec/stdlib/block';
+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 { 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. */
-    prunedBlocks: L2BlockNew[] | undefined;
+    prunedBlocks: L2Block[] | undefined;
     /** Last block number that was already inserted locally, or undefined if none. */
     lastAlreadyInsertedBlockNumber: BlockNumber | undefined;
 };
 /** Archiver helper module to handle updates to the data store. */
 export declare class ArchiverDataStoreUpdater {
     private store;
+    private l2TipsCache?;
     private readonly log;
-    constructor(store: KVArchiverDataStore);
+    constructor(store: KVArchiverDataStore, l2TipsCache?: L2TipsCache | undefined);
     /**
-     * Adds blocks to the store with contract class/instance extraction from logs.
+     * 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.
      *
-     * @param blocks - The L2 blocks to add.
+     * @param blocks - The proposed L2 blocks to add.
      * @param pendingChainValidationStatus - Optional validation status to set.
      * @returns True if the operation is successful.
      */
-    addBlocks(blocks: L2BlockNew[], pendingChainValidationStatus?: ValidateCheckpointResult): Promise<boolean>;
+    addProposedBlocks(blocks: L2Block[], pendingChainValidationStatus?: ValidateCheckpointResult): Promise<boolean>;
     /**
      * Reconciles local blocks with incoming checkpoints from L1.
-     * Adds checkpoints to the store with contract class/instance extraction from logs.
+     * 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.
@@ -35,35 +38,43 @@ export declare class ArchiverDataStoreUpdater {
      * @param pendingChainValidationStatus - Optional validation status to set.
      * @returns Result with information about any pruned blocks.
      */
-    setNewCheckpointData(checkpoints: PublishedCheckpoint[], pendingChainValidationStatus?: ValidateCheckpointResult): Promise<ReconcileCheckpointsResult>;
+    addCheckpoints(checkpoints: PublishedCheckpoint[], pendingChainValidationStatus?: ValidateCheckpointResult): Promise<ReconcileCheckpointsResult>;
     private pruneMismatchingLocalBlocks;
     /**
-     * Removes all blocks strictly after the specified block number and cleans up associated contract data.
+     * Removes all uncheckpointed 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.
+     * Verifies that each block being removed is not part of a stored checkpoint.
      *
      * @param blockNumber - Remove all blocks with number greater than this.
      * @returns The removed blocks.
+     * @throws Error if any block to be removed is checkpointed.
      */
-    removeBlocksAfter(blockNumber: BlockNumber): Promise<L2BlockNew[]>;
+    removeUncheckpointedBlocksAfter(blockNumber: BlockNumber): Promise<L2Block[]>;
+    private removeBlocksAfter;
     /**
-     * Unwinds checkpoints from the store with reverse contract extraction.
+     * Removes all checkpoints after the given checkpoint number.
      * Deletes ContractClassPublished, ContractInstancePublished, ContractInstanceUpdated data
-     * that was stored for the unwound checkpoints.
+     * that was stored for the removed checkpoints. Also removes ALL blocks (both checkpointed
+     * and uncheckpointed) after the last block of the given checkpoint.
      *
-     * @param from - The checkpoint number to unwind from (must be the current tip).
-     * @param checkpointsToUnwind - The number of checkpoints to unwind.
+     * @param checkpointNumber - Remove all checkpoints strictly after this one.
      * @returns True if the operation is successful.
      */
-    unwindCheckpoints(from: CheckpointNumber, checkpointsToUnwind: number): Promise<boolean>;
+    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>;
     /** Extracts and stores contract data from a single block. */
-    private addBlockDataToDB;
+    private addContractDataToDb;
     /** Removes contract data associated with a block. */
-    private removeBlockDataFromDB;
-    private editContractBlockData;
+    private removeContractDataFromDb;
+    private updateContractDataOnDb;
     private updatePublishedContractClasses;
     private updateDeployedContractInstances;
     private updateUpdatedContractInstances;
     private storeBroadcastedIndividualFunctions;
 }
 export {};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGF0YV9zdG9yZV91cGRhdGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbW9kdWxlcy9kYXRhX3N0b3JlX3VwZGF0ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFdBQVcsRUFBRSxLQUFLLGdCQUFnQixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFZckYsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLHdCQUF3QixFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDaEYsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQWFwRSxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBUXpFLDZFQUE2RTtBQUM3RSxLQUFLLDBCQUEwQixHQUFHO0lBQ2hDLG1FQUFtRTtJQUNuRSxZQUFZLEVBQUUsVUFBVSxFQUFFLEdBQUcsU0FBUyxDQUFDO0lBQ3ZDLGlGQUFpRjtJQUNqRiw4QkFBOEIsRUFBRSxXQUFXLEdBQUcsU0FBUyxDQUFDO0NBQ3pELENBQUM7QUFFRixrRUFBa0U7QUFDbEUscUJBQWEsd0JBQXdCO0lBR3ZCLE9BQU8sQ0FBQyxLQUFLO0lBRnpCLE9BQU8sQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUEwQztJQUU5RCxZQUFvQixLQUFLLEVBQUUsbUJBQW1CLEVBQUk7SUFFbEQ7Ozs7Ozs7O09BUUc7SUFDSSxTQUFTLENBQUMsTUFBTSxFQUFFLFVBQVUsRUFBRSxFQUFFLDRCQUE0QixDQUFDLEVBQUUsd0JBQXdCLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQWVoSDtJQUVEOzs7Ozs7Ozs7O09BVUc7SUFDSSxvQkFBb0IsQ0FDekIsV0FBVyxFQUFFLG1CQUFtQixFQUFFLEVBQ2xDLDRCQUE0QixDQUFDLEVBQUUsd0JBQXdCLEdBQ3RELE9BQU8sQ0FBQywwQkFBMEIsQ0FBQyxDQXVCckM7WUFRYSwyQkFBMkI7SUFtRXpDOzs7Ozs7T0FNRztJQUNJLGlCQUFpQixDQUFDLFdBQVcsRUFBRSxXQUFXLEdBQUcsT0FBTyxDQUFDLFVBQVUsRUFBRSxDQUFDLENBYXhFO0lBRUQ7Ozs7Ozs7O09BUUc7SUFDVSxpQkFBaUIsQ0FBQyxJQUFJLEVBQUUsZ0JBQWdCLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0E4QnBHO0lBRUQsNkRBQTZEO0lBQzdELE9BQU8sQ0FBQyxnQkFBZ0I7SUFJeEIscURBQXFEO0lBQ3JELE9BQU8sQ0FBQyxxQkFBcUI7WUFLZixxQkFBcUI7WUFvQnJCLDhCQUE4QjtZQTRCOUIsK0JBQStCO1lBeUIvQiw4QkFBOEI7WUE2QjlCLG1DQUFtQztDQXdEbEQifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGF0YV9zdG9yZV91cGRhdGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbW9kdWxlcy9kYXRhX3N0b3JlX3VwZGF0ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFdBQVcsRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBWWhGLE9BQU8sS0FBSyxFQUFFLE9BQU8sRUFBRSx3QkFBd0IsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQzdFLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFhcEUsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUN6RSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQVE3RCw2RUFBNkU7QUFDN0UsS0FBSywwQkFBMEIsR0FBRztJQUNoQyxtRUFBbUU7SUFDbkUsWUFBWSxFQUFFLE9BQU8sRUFBRSxHQUFHLFNBQVMsQ0FBQztJQUNwQyxpRkFBaUY7SUFDakYsOEJBQThCLEVBQUUsV0FBVyxHQUFHLFNBQVMsQ0FBQztDQUN6RCxDQUFDO0FBRUYsa0VBQWtFO0FBQ2xFLHFCQUFhLHdCQUF3QjtJQUlqQyxPQUFPLENBQUMsS0FBSztJQUNiLE9BQU8sQ0FBQyxXQUFXLENBQUM7SUFKdEIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQTBDO0lBRTlELFlBQ1UsS0FBSyxFQUFFLG1CQUFtQixFQUMxQixXQUFXLENBQUMseUJBQWEsRUFDL0I7SUFFSjs7Ozs7Ozs7O09BU0c7SUFDVSxpQkFBaUIsQ0FDNUIsTUFBTSxFQUFFLE9BQU8sRUFBRSxFQUNqQiw0QkFBNEIsQ0FBQyxFQUFFLHdCQUF3QixHQUN0RCxPQUFPLENBQUMsT0FBTyxDQUFDLENBaUJsQjtJQUVEOzs7Ozs7Ozs7O09BVUc7SUFDVSxjQUFjLENBQ3pCLFdBQVcsRUFBRSxtQkFBbUIsRUFBRSxFQUNsQyw0QkFBNEIsQ0FBQyxFQUFFLHdCQUF3QixHQUN0RCxPQUFPLENBQUMsMEJBQTBCLENBQUMsQ0F5QnJDO1lBUWEsMkJBQTJCO0lBbUV6Qzs7Ozs7Ozs7T0FRRztJQUNVLCtCQUErQixDQUFDLFdBQVcsRUFBRSxXQUFXLEdBQUcsT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFDLENBZXpGO1lBTWEsaUJBQWlCO0lBYS9COzs7Ozs7OztPQVFHO0lBQ1Usc0JBQXNCLENBQUMsZ0JBQWdCLEVBQUUsZ0JBQWdCLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQWV4RjtJQUVEOzs7T0FHRztJQUNVLHlCQUF5QixDQUFDLGdCQUFnQixFQUFFLGdCQUFnQixHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FLeEY7SUFFRCw2REFBNkQ7SUFDN0QsT0FBTyxDQUFDLG1CQUFtQjtJQUkzQixxREFBcUQ7SUFDckQsT0FBTyxDQUFDLHdCQUF3QjtZQUtsQixzQkFBc0I7WUFvQnRCLDhCQUE4QjtZQTRCOUIsK0JBQStCO1lBeUIvQiw4QkFBOEI7WUE2QjlCLG1DQUFtQztDQXdEbEQifQ==

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,KAAK,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAYrF,OAAO,KAAK,EAAE,UAAU,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAChF,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,UAAU,EAAE,GAAG,SAAS,CAAC;IACvC,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;;;;;;;;OAQG;IACI,SAAS,CAAC,MAAM,EAAE,UAAU,EAAE,EAAE,4BAA4B,CAAC,EAAE,wBAAwB,GAAG,OAAO,CAAC,OAAO,CAAC,CAehH;IAED;;;;;;;;;;OAUG;IACI,oBAAoB,CACzB,WAAW,EAAE,mBAAmB,EAAE,EAClC,4BAA4B,CAAC,EAAE,wBAAwB,GACtD,OAAO,CAAC,0BAA0B,CAAC,CAuBrC;YAQa,2BAA2B;IAmEzC;;;;;;OAMG;IACI,iBAAiB,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC,CAaxE;IAED;;;;;;;;OAQG;IACU,iBAAiB,CAAC,IAAI,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CA8BpG;IAED,6DAA6D;IAC7D,OAAO,CAAC,gBAAgB;IAIxB,qDAAqD;IACrD,OAAO,CAAC,qBAAqB;YAKf,qBAAqB;YAoBrB,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;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;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;IAJtB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAA0C;IAE9D,YACU,KAAK,EAAE,mBAAmB,EAC1B,WAAW,CAAC,yBAAa,EAC/B;IAEJ;;;;;;;;;OASG;IACU,iBAAiB,CAC5B,MAAM,EAAE,OAAO,EAAE,EACjB,4BAA4B,CAAC,EAAE,wBAAwB,GACtD,OAAO,CAAC,OAAO,CAAC,CAiBlB;IAED;;;;;;;;;;OAUG;IACU,cAAc,CACzB,WAAW,EAAE,mBAAmB,EAAE,EAClC,4BAA4B,CAAC,EAAE,wBAAwB,GACtD,OAAO,CAAC,0BAA0B,CAAC,CAyBrC;YAQa,2BAA2B;IAmEzC;;;;;;;;OAQG;IACU,+BAA+B,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAezF;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,6DAA6D;IAC7D,OAAO,CAAC,mBAAmB;IAI3B,qDAAqD;IACrD,OAAO,CAAC,wBAAwB;YAKlB,sBAAsB;YAoBtB,8BAA8B;YA4B9B,+BAA+B;YAyB/B,8BAA8B;YA6B9B,mCAAmC;CAwDlD"}

package/dest/modules/data_store_updater.js

@@ -12,36 +12,41 @@ import groupBy from 'lodash.groupby';
 }(Operation || {});
 /** Archiver helper module to handle updates to the data store. */ export class ArchiverDataStoreUpdater {
     store;
+    l2TipsCache;
     log;
-    constructor(store){
+    constructor(store, l2TipsCache){
         this.store = store;
+        this.l2TipsCache = l2TipsCache;
         this.log = createLogger('archiver:store_updater');
     }
     /**
-   * Adds blocks to the store with contract class/instance extraction from logs.
+   * 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.
    *
-   * @param blocks - The L2 blocks to add.
+   * @param blocks - The proposed 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);
+   */ async addProposedBlocks(blocks, pendingChainValidationStatus) {
+        const result = await this.store.transactionAsync(async ()=>{
+            await this.store.addProposedBlocks(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))
+                ...blocks.map((block)=>this.addContractDataToDb(block))
             ]);
+            await this.l2TipsCache?.refresh();
             return opResults.every(Boolean);
         });
+        return result;
     }
     /**
    * Reconciles local blocks with incoming checkpoints from L1.
-   * Adds checkpoints to the store with contract class/instance extraction from logs.
+   * 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.
@@ -49,12 +54,12 @@ import groupBy from 'lodash.groupby';
    * @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 ()=>{
+   */ async addCheckpoints(checkpoints, pendingChainValidationStatus) {
+        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 addBlocks() to avoid duplicating logs/contract data
+            // Filter out blocks that were already inserted via addProposedBlocks() 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
@@ -62,13 +67,15 @@ import groupBy from 'lodash.groupby';
                 // 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))
+                ...newBlocks.map((block)=>this.addContractDataToDb(block))
             ]);
+            await this.l2TipsCache?.refresh();
             return {
                 prunedBlocks,
                 lastAlreadyInsertedBlockNumber
             };
         });
+        return result;
     }
     /**
    * Checks for local proposed blocks that do not match the ones to be checkpointed and prunes them.
@@ -139,67 +146,79 @@ import groupBy from 'lodash.groupby';
         };
     }
     /**
-   * Removes all blocks strictly after the specified block number and cleans up associated contract data.
+   * Removes all uncheckpointed 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.
+   * Verifies that each block being removed is not part of a stored checkpoint.
    *
    * @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;
+   * @throws Error if any block to be removed is checkpointed.
+   */ 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}`);
+            }
+            const result = await this.removeBlocksAfter(blockNumber);
+            await this.l2TipsCache?.refresh();
+            return result;
         });
+        return result;
+    }
+    /**
+   * Removes all blocks strictly after the given block number along with any logs and contract data.
+   * Does not remove their checkpoints.
+   */ async removeBlocksAfter(blockNumber) {
+        // 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.removeContractDataFromDb(block))
+        ]);
+        return removedBlocks;
     }
     /**
-   * Unwinds checkpoints from the store with reverse contract extraction.
+   * Removes all checkpoints after the given checkpoint number.
    * Deletes ContractClassPublished, ContractInstancePublished, ContractInstanceUpdated data
-   * that was stored for the unwound checkpoints.
+   * that was stored for the removed checkpoints. Also removes ALL blocks (both checkpointed
+   * and uncheckpointed) after the last block of the given checkpoint.
    *
-   * @param from - The checkpoint number to unwind from (must be the current tip).
-   * @param checkpointsToUnwind - The number of checkpoints to unwind.
+   * @param checkpointNumber - Remove all checkpoints strictly after this one.
    * @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);
+   */ async removeCheckpointsAfter(checkpointNumber) {
+        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();
+        });
     }
-    /** Extracts and stores contract data from a single block. */ addBlockDataToDB(block) {
-        return this.editContractBlockData(block, 0);
+    /** Extracts and stores contract data from a single block. */ addContractDataToDb(block) {
+        return this.updateContractDataOnDb(block, 0);
     }
-    /** Removes contract data associated with a block. */ removeBlockDataFromDB(block) {
-        return this.editContractBlockData(block, 1);
+    /** Removes contract data associated with a block. */ removeContractDataFromDb(block) {
+        return this.updateContractDataOnDb(block, 1);
     }
-    /** Adds or remove contract data associated with a block. */ async editContractBlockData(block, operation) {
+    /** Adds or remove contract data associated with a block. */ async updateContractDataOnDb(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);

package/dest/modules/instrumentation.d.ts

@@ -1,9 +1,13 @@
-import type { L2BlockNew } from '@aztec/stdlib/block';
+import type { SlotNumber } from '@aztec/foundation/branded-types';
+import type { L2Block } from '@aztec/stdlib/block';
+import type { CheckpointData } from '@aztec/stdlib/checkpoint';
+import type { L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
 import { type LmdbStatsCallback, type TelemetryClient, type Tracer } from '@aztec/telemetry-client';
 export declare class ArchiverInstrumentation {
     private telemetry;
     readonly tracer: Tracer;
     private blockHeight;
+    private checkpointHeight;
     private txCount;
     private l1BlockHeight;
     private proofsSubmittedDelay;
@@ -18,14 +22,15 @@ export declare class ArchiverInstrumentation {
     private syncDurationPerMessage;
     private syncMessageCount;
     private blockProposalTxTargetCount;
+    private checkpointL1InclusionDelay;
     private log;
     private constructor();
     static new(telemetry: TelemetryClient, lmdbStats?: LmdbStatsCallback): Promise<ArchiverInstrumentation>;
     isEnabled(): boolean;
-    processNewBlocks(syncTimePerBlock: number, blocks: L2BlockNew[]): void;
+    processNewBlocks(syncTimePerBlock: number, blocks: L2Block[]): void;
     processNewMessages(count: number, syncPerMessageMs: number): void;
     processPrune(duration: number): void;
-    updateLastProvenBlock(blockNumber: number): void;
+    updateLastProvenCheckpoint(checkpoint: CheckpointData): void;
     processProofsVerified(logs: {
         proverId: string;
         l2BlockNumber: bigint;
@@ -33,5 +38,13 @@ export declare class ArchiverInstrumentation {
     }[]): void;
     updateL1BlockHeight(blockNumber: bigint): void;
     recordBlockProposalTxTarget(target: string, usedTrace: boolean): void;
+    /**
+     * Records L1 inclusion timing for a checkpoint observed on L1 (seconds into the L2 slot).
+     */
+    processCheckpointL1Timing(data: {
+        slotNumber: SlotNumber;
+        l1Timestamp: bigint;
+        l1Constants: Pick<L1RollupConstants, 'l1GenesisTime' | 'slotDuration'>;
+    }): void;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5zdHJ1bWVudGF0aW9uLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbW9kdWxlcy9pbnN0cnVtZW50YXRpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDdEQsT0FBTyxFQUtMLEtBQUssaUJBQWlCLEVBRXRCLEtBQUssZUFBZSxFQUNwQixLQUFLLE1BQU0sRUFFWixNQUFNLHlCQUF5QixDQUFDO0FBRWpDLHFCQUFhLHVCQUF1QjtJQTBCaEMsT0FBTyxDQUFDLFNBQVM7SUF6Qm5CLFNBQWdCLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFFL0IsT0FBTyxDQUFDLFdBQVcsQ0FBUTtJQUMzQixPQUFPLENBQUMsT0FBTyxDQUFnQjtJQUMvQixPQUFPLENBQUMsYUFBYSxDQUFRO0lBQzdCLE9BQU8sQ0FBQyxvQkFBb0IsQ0FBWTtJQUN4QyxPQUFPLENBQUMsb0JBQW9CLENBQWdCO0lBQzVDLE9BQU8sQ0FBQyxTQUFTLENBQWM7SUFFL0IsT0FBTyxDQUFDLGFBQWEsQ0FBWTtJQUNqQyxPQUFPLENBQUMsVUFBVSxDQUFnQjtJQUVsQyxPQUFPLENBQUMsb0JBQW9CLENBQVk7SUFDeEMsT0FBTyxDQUFDLGNBQWMsQ0FBZ0I7SUFDdEMsT0FBTyxDQUFDLFlBQVksQ0FBWTtJQUNoQyxPQUFPLENBQUMsV0FBVyxDQUFZO0lBRS9CLE9BQU8sQ0FBQyxzQkFBc0IsQ0FBWTtJQUMxQyxPQUFPLENBQUMsZ0JBQWdCLENBQWdCO0lBRXhDLE9BQU8sQ0FBQywwQkFBMEIsQ0FBZ0I7SUFFbEQsT0FBTyxDQUFDLEdBQUcsQ0FBNEM7SUFFdkQsT0FBTyxlQTBDTjtJQUVELE9BQW9CLEdBQUcsQ0FBQyxTQUFTLEVBQUUsZUFBZSxFQUFFLFNBQVMsQ0FBQyxFQUFFLGlCQUFpQixvQ0FVaEY7SUFFTSxTQUFTLElBQUksT0FBTyxDQUUxQjtJQUVNLGdCQUFnQixDQUFDLGdCQUFnQixFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsVUFBVSxFQUFFLFFBVXJFO0lBRU0sa0JBQWtCLENBQUMsS0FBSyxFQUFFLE1BQU0sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLFFBTWhFO0lBRU0sWUFBWSxDQUFDLFFBQVEsRUFBRSxNQUFNLFFBR25DO0lBRU0scUJBQXFCLENBQUMsV0FBVyxFQUFFLE1BQU0sUUFFL0M7SUFFTSxxQkFBcUIsQ0FBQyxJQUFJLEVBQUU7UUFBRSxRQUFRLEVBQUUsTUFBTSxDQUFDO1FBQUMsYUFBYSxFQUFFLE1BQU0sQ0FBQztRQUFDLEtBQUssRUFBRSxNQUFNLENBQUE7S0FBRSxFQUFFLFFBVzlGO0lBRU0sbUJBQW1CLENBQUMsV0FBVyxFQUFFLE1BQU0sUUFFN0M7SUFFTSwyQkFBMkIsQ0FBQyxNQUFNLEVBQUUsTUFBTSxFQUFFLFNBQVMsRUFBRSxPQUFPLFFBS3BFO0NBQ0YifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5zdHJ1bWVudGF0aW9uLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbW9kdWxlcy9pbnN0cnVtZW50YXRpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFbEUsT0FBTyxLQUFLLEVBQUUsT0FBTyxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDbkQsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDL0QsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUVyRSxPQUFPLEVBS0wsS0FBSyxpQkFBaUIsRUFFdEIsS0FBSyxlQUFlLEVBQ3BCLEtBQUssTUFBTSxFQUdaLE1BQU0seUJBQXlCLENBQUM7QUFFakMscUJBQWEsdUJBQXVCO0lBNkJoQyxPQUFPLENBQUMsU0FBUztJQTVCbkIsU0FBZ0IsTUFBTSxFQUFFLE1BQU0sQ0FBQztJQUUvQixPQUFPLENBQUMsV0FBVyxDQUFRO0lBQzNCLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBUTtJQUNoQyxPQUFPLENBQUMsT0FBTyxDQUFnQjtJQUMvQixPQUFPLENBQUMsYUFBYSxDQUFRO0lBQzdCLE9BQU8sQ0FBQyxvQkFBb0IsQ0FBWTtJQUN4QyxPQUFPLENBQUMsb0JBQW9CLENBQWdCO0lBQzVDLE9BQU8sQ0FBQyxTQUFTLENBQWM7SUFFL0IsT0FBTyxDQUFDLGFBQWEsQ0FBWTtJQUNqQyxPQUFPLENBQUMsVUFBVSxDQUFnQjtJQUVsQyxPQUFPLENBQUMsb0JBQW9CLENBQVk7SUFDeEMsT0FBTyxDQUFDLGNBQWMsQ0FBZ0I7SUFDdEMsT0FBTyxDQUFDLFlBQVksQ0FBWTtJQUNoQyxPQUFPLENBQUMsV0FBVyxDQUFZO0lBRS9CLE9BQU8sQ0FBQyxzQkFBc0IsQ0FBWTtJQUMxQyxPQUFPLENBQUMsZ0JBQWdCLENBQWdCO0lBRXhDLE9BQU8sQ0FBQywwQkFBMEIsQ0FBZ0I7SUFFbEQsT0FBTyxDQUFDLDBCQUEwQixDQUFZO0lBRTlDLE9BQU8sQ0FBQyxHQUFHLENBQTRDO0lBRXZELE9BQU8sZUFzRE47SUFFRCxPQUFvQixHQUFHLENBQUMsU0FBUyxFQUFFLGVBQWUsRUFBRSxTQUFTLENBQUMsRUFBRSxpQkFBaUIsb0NBTWhGO0lBRU0sU0FBUyxJQUFJLE9BQU8sQ0FFMUI7SUFFTSxnQkFBZ0IsQ0FBQyxnQkFBZ0IsRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLE9BQU8sRUFBRSxRQVdsRTtJQUVNLGtCQUFrQixDQUFDLEtBQUssRUFBRSxNQUFNLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxRQU1oRTtJQUVNLFlBQVksQ0FBQyxRQUFRLEVBQUUsTUFBTSxRQUduQztJQUVNLDBCQUEwQixDQUFDLFVBQVUsRUFBRSxjQUFjLFFBSTNEO0lBRU0scUJBQXFCLENBQUMsSUFBSSxFQUFFO1FBQUUsUUFBUSxFQUFFLE1BQU0sQ0FBQztRQUFDLGFBQWEsRUFBRSxNQUFNLENBQUM7UUFBQyxLQUFLLEVBQUUsTUFBTSxDQUFBO0tBQUUsRUFBRSxRQVc5RjtJQUVNLG1CQUFtQixDQUFDLFdBQVcsRUFBRSxNQUFNLFFBRTdDO0lBRU0sMkJBQTJCLENBQUMsTUFBTSxFQUFFLE1BQU0sRUFBRSxTQUFTLEVBQUUsT0FBTyxRQUtwRTtJQUVEOztPQUVHO0lBQ0kseUJBQXlCLENBQUMsSUFBSSxFQUFFO1FBQ3JDLFVBQVUsRUFBRSxVQUFVLENBQUM7UUFDdkIsV0FBVyxFQUFFLE1BQU0sQ0FBQztRQUNwQixXQUFXLEVBQUUsSUFBSSxDQUFDLGlCQUFpQixFQUFFLGVBQWUsR0FBRyxjQUFjLENBQUMsQ0FBQztLQUN4RSxHQUFHLElBQUksQ0FJUDtDQUNGIn0=

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

@@ -1 +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"}
+{"version":3,"file":"instrumentation.d.ts","sourceRoot":"","sources":["../../src/modules/instrumentation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAElE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAErE,OAAO,EAKL,KAAK,iBAAiB,EAEtB,KAAK,eAAe,EACpB,KAAK,MAAM,EAGZ,MAAM,yBAAyB,CAAC;AAEjC,qBAAa,uBAAuB;IA6BhC,OAAO,CAAC,SAAS;IA5BnB,SAAgB,MAAM,EAAE,MAAM,CAAC;IAE/B,OAAO,CAAC,WAAW,CAAQ;IAC3B,OAAO,CAAC,gBAAgB,CAAQ;IAChC,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,0BAA0B,CAAY;IAE9C,OAAO,CAAC,GAAG,CAA4C;IAEvD,OAAO,eAsDN;IAED,OAAoB,GAAG,CAAC,SAAS,EAAE,eAAe,EAAE,SAAS,CAAC,EAAE,iBAAiB,oCAMhF;IAEM,SAAS,IAAI,OAAO,CAE1B;IAEM,gBAAgB,CAAC,gBAAgB,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,QAWlE;IAEM,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,QAMhE;IAEM,YAAY,CAAC,QAAQ,EAAE,MAAM,QAGnC;IAEM,0BAA0B,CAAC,UAAU,EAAE,cAAc,QAI3D;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;IAED;;OAEG;IACI,yBAAyB,CAAC,IAAI,EAAE;QACrC,UAAU,EAAE,UAAU,CAAC;QACvB,WAAW,EAAE,MAAM,CAAC;QACpB,WAAW,EAAE,IAAI,CAAC,iBAAiB,EAAE,eAAe,GAAG,cAAc,CAAC,CAAC;KACxE,GAAG,IAAI,CAIP;CACF"}