@aztec/archiver 0.0.1-commit.0dc957cde → 0.0.1-commit.0ec55a70b

package/dest/modules/data_source_base.js

@@ -4,131 +4,142 @@ import { isDefined } from '@aztec/foundation/types';
 import { Checkpoint, PublishedCheckpoint } from '@aztec/stdlib/checkpoint';
 import { getSlotRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
 /**
- * Abstract base class implementing ArchiverDataSource using a KVArchiverDataStore.
- * Provides implementations for all store-delegating methods and declares abstract methods
- * for L1-dependent functionality that subclasses must implement.
+ * Abstract base class implementing ArchiverDataSource using a bundle of archiver substores.
+ * Provides implementations for all read-side methods and declares abstract methods for
+ * L1-dependent functionality that subclasses must implement.
  */ export class ArchiverDataSourceBase {
-    store;
+    stores;
     l1Constants;
-    constructor(store, l1Constants){
-        this.store = store;
+    constructor(stores, l1Constants){
+        this.stores = stores;
         this.l1Constants = l1Constants;
     }
     getCheckpointNumber() {
-        return this.store.getSynchedCheckpointNumber();
+        return this.stores.blocks.getLatestCheckpointNumber();
     }
     getSynchedCheckpointNumber() {
-        return this.store.getSynchedCheckpointNumber();
+        return this.stores.blocks.getLatestCheckpointNumber();
     }
     getProvenCheckpointNumber() {
-        return this.store.getProvenCheckpointNumber();
+        return this.stores.blocks.getProvenCheckpointNumber();
     }
     getBlockNumber() {
-        return this.store.getLatestBlockNumber();
+        return this.stores.blocks.getLatestL2BlockNumber();
     }
     getProvenBlockNumber() {
-        return this.store.getProvenBlockNumber();
+        return this.stores.blocks.getProvenBlockNumber();
     }
     async getBlockHeader(number) {
-        const blockNumber = number === 'latest' ? await this.store.getLatestBlockNumber() : number;
+        const blockNumber = number === 'latest' ? await this.stores.blocks.getLatestL2BlockNumber() : number;
         if (blockNumber === 0) {
             return undefined;
         }
-        const headers = await this.store.getBlockHeaders(blockNumber, 1);
+        const headers = await this.stores.blocks.getBlockHeaders(blockNumber, 1);
         return headers.length === 0 ? undefined : headers[0];
     }
     getCheckpointedBlock(number) {
-        return this.store.getCheckpointedBlock(number);
+        return this.stores.blocks.getCheckpointedBlock(number);
     }
     getCheckpointedL2BlockNumber() {
-        return this.store.getCheckpointedL2BlockNumber();
+        return this.stores.blocks.getCheckpointedL2BlockNumber();
     }
     getFinalizedL2BlockNumber() {
-        return this.store.getFinalizedL2BlockNumber();
+        return this.stores.blocks.getFinalizedL2BlockNumber();
     }
     async getCheckpointHeader(number) {
         if (number === 'latest') {
-            number = await this.store.getSynchedCheckpointNumber();
+            number = await this.stores.blocks.getLatestCheckpointNumber();
         }
         if (number === 0) {
             return undefined;
         }
-        const checkpoint = await this.store.getCheckpointData(number);
+        const checkpoint = await this.stores.blocks.getCheckpointData(number);
         if (!checkpoint) {
             return undefined;
         }
         return checkpoint.header;
     }
     async getLastBlockNumberInCheckpoint(checkpointNumber) {
-        const checkpointData = await this.store.getCheckpointData(checkpointNumber);
+        const checkpointData = await this.stores.blocks.getCheckpointData(checkpointNumber);
         if (!checkpointData) {
             return undefined;
         }
         return BlockNumber(checkpointData.startBlock + checkpointData.blockCount - 1);
     }
     getCheckpointedBlocks(from, limit) {
-        return this.store.getCheckpointedBlocks(from, limit);
+        return this.stores.blocks.getCheckpointedBlocks(from, limit);
+    }
+    getCheckpointData(checkpointNumber) {
+        return this.stores.blocks.getCheckpointData(checkpointNumber);
+    }
+    getCheckpointDataRange(from, limit) {
+        return this.stores.blocks.getRangeOfCheckpoints(from, limit);
+    }
+    getCheckpointNumberBySlot(slot) {
+        return this.stores.blocks.getCheckpointNumberBySlot(slot);
+    }
+    getBlockDataWithCheckpointContext(blockNumber) {
+        return this.stores.blocks.getBlockDataWithCheckpointContext(blockNumber);
     }
     getBlockHeaderByHash(blockHash) {
-        return this.store.getBlockHeaderByHash(blockHash);
+        return this.stores.blocks.getBlockHeaderByHash(blockHash);
     }
     getBlockHeaderByArchive(archive) {
-        return this.store.getBlockHeaderByArchive(archive);
+        return this.stores.blocks.getBlockHeaderByArchive(archive);
     }
     getBlockData(number) {
-        return this.store.getBlockData(number);
+        return this.stores.blocks.getBlockData(number);
     }
     getBlockDataByArchive(archive) {
-        return this.store.getBlockDataByArchive(archive);
+        return this.stores.blocks.getBlockDataByArchive(archive);
     }
     async getL2Block(number) {
         // If the number provided is -ve, then return the latest block.
         if (number < 0) {
-            number = await this.store.getLatestBlockNumber();
+            number = await this.stores.blocks.getLatestL2BlockNumber();
         }
         if (number === 0) {
             return undefined;
         }
-        const publishedBlock = await this.store.getBlock(number);
-        return publishedBlock;
+        return this.stores.blocks.getBlock(number);
     }
     getTxEffect(txHash) {
-        return this.store.getTxEffect(txHash);
+        return this.stores.blocks.getTxEffect(txHash);
     }
     getSettledTxReceipt(txHash) {
-        return this.store.getSettledTxReceipt(txHash, this.l1Constants);
+        return this.stores.blocks.getSettledTxReceipt(txHash, this.l1Constants);
     }
-    getProposedCheckpoint() {
-        return this.store.getProposedCheckpoint();
+    getLastCheckpoint() {
+        return this.stores.blocks.getLastCheckpoint();
     }
-    getProposedCheckpointOnly() {
-        return this.store.getProposedCheckpointOnly();
+    getLastProposedCheckpoint() {
+        return this.stores.blocks.getLastProposedCheckpoint();
     }
     isPendingChainInvalid() {
         return this.getPendingChainValidationStatus().then((status)=>!status.valid);
     }
     async getPendingChainValidationStatus() {
-        return await this.store.getPendingChainValidationStatus() ?? {
+        return await this.stores.blocks.getPendingChainValidationStatus() ?? {
             valid: true
         };
     }
     getPrivateLogsByTags(tags, page, upToBlockNumber) {
-        return this.store.getPrivateLogsByTags(tags, page, upToBlockNumber);
+        return this.stores.logs.getPrivateLogsByTags(tags, page, upToBlockNumber);
     }
     getPublicLogsByTagsFromContract(contractAddress, tags, page, upToBlockNumber) {
-        return this.store.getPublicLogsByTagsFromContract(contractAddress, tags, page, upToBlockNumber);
+        return this.stores.logs.getPublicLogsByTagsFromContract(contractAddress, tags, page, upToBlockNumber);
     }
     getPublicLogs(filter) {
-        return this.store.getPublicLogs(filter);
+        return this.stores.logs.getPublicLogs(filter);
     }
     getContractClassLogs(filter) {
-        return this.store.getContractClassLogs(filter);
+        return this.stores.logs.getContractClassLogs(filter);
     }
     getContractClass(id) {
-        return this.store.getContractClass(id);
+        return this.stores.contractClasses.getContractClass(id);
     }
     getBytecodeCommitment(id) {
-        return this.store.getBytecodeCommitment(id);
+        return this.stores.contractClasses.getBytecodeCommitment(id);
     }
     async getContract(address, maybeTimestamp) {
         let timestamp;
@@ -139,37 +150,37 @@ import { getSlotRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
         } else {
             timestamp = maybeTimestamp;
         }
-        return this.store.getContractInstance(address, timestamp);
+        return this.stores.contractInstances.getContractInstance(address, timestamp);
     }
     getContractClassIds() {
-        return this.store.getContractClassIds();
+        return this.stores.contractClasses.getContractClassIds();
     }
-    getDebugFunctionName(address, selector) {
-        return this.store.getDebugFunctionName(address, selector);
+    /** Looks up a public function name given a selector. */ getDebugFunctionName(_address, selector) {
+        return Promise.resolve(this.stores.functionNames.get(selector));
     }
-    registerContractFunctionSignatures(signatures) {
-        return this.store.registerContractFunctionSignatures(signatures);
+    /** Register public function signatures so they can be looked up by selector. */ registerContractFunctionSignatures(signatures) {
+        return this.stores.functionNames.register(signatures);
     }
     getL1ToL2Messages(checkpointNumber) {
-        return this.store.getL1ToL2Messages(checkpointNumber);
+        return this.stores.messages.getL1ToL2Messages(checkpointNumber);
     }
     getL1ToL2MessageIndex(l1ToL2Message) {
-        return this.store.getL1ToL2MessageIndex(l1ToL2Message);
+        return this.stores.messages.getL1ToL2MessageIndex(l1ToL2Message);
     }
     async getCheckpoints(checkpointNumber, limit) {
-        const checkpoints = await this.store.getRangeOfCheckpoints(checkpointNumber, limit);
+        const checkpoints = await this.stores.blocks.getRangeOfCheckpoints(checkpointNumber, limit);
         return Promise.all(checkpoints.map((ch)=>this.getPublishedCheckpointFromCheckpointData(ch)));
     }
     async getPublishedCheckpointFromCheckpointData(checkpoint) {
-        const blocksForCheckpoint = await this.store.getBlocksForCheckpoint(checkpoint.checkpointNumber);
+        const blocksForCheckpoint = await this.stores.blocks.getBlocksForCheckpoint(checkpoint.checkpointNumber);
         if (!blocksForCheckpoint) {
             throw new Error(`Blocks for checkpoint ${checkpoint.checkpointNumber} not found`);
         }
-        const fullCheckpoint = new Checkpoint(checkpoint.archive, checkpoint.header, blocksForCheckpoint, checkpoint.checkpointNumber);
+        const fullCheckpoint = new Checkpoint(checkpoint.archive, checkpoint.header, blocksForCheckpoint, checkpoint.checkpointNumber, checkpoint.feeAssetPriceModifier);
         return new PublishedCheckpoint(fullCheckpoint, checkpoint.l1, checkpoint.attestations);
     }
     getBlocksForSlot(slotNumber) {
-        return this.store.getBlocksForSlot(slotNumber);
+        return this.stores.blocks.getBlocksForSlot(slotNumber);
     }
     async getCheckpointedBlocksForEpoch(epochNumber) {
         const checkpointsData = await this.getCheckpointsDataForEpoch(epochNumber);
@@ -190,33 +201,33 @@ import { getSlotRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
             throw new Error('L1 constants not set');
         }
         const [start, end] = getSlotRangeForEpoch(epochNumber, this.l1Constants);
-        return this.store.getCheckpointDataForSlotRange(start, end);
+        return this.stores.blocks.getCheckpointDataForSlotRange(start, end);
     }
     async getBlock(number) {
         // If the number provided is -ve, then return the latest block.
         if (number < 0) {
-            number = await this.store.getLatestBlockNumber();
+            number = await this.stores.blocks.getLatestL2BlockNumber();
         }
         if (number === 0) {
             return undefined;
         }
-        return this.store.getBlock(number);
+        return this.stores.blocks.getBlock(number);
     }
     getBlocks(from, limit) {
-        return this.store.getBlocks(from, limit);
+        return this.stores.blocks.getBlocks(from, limit);
     }
     getCheckpointedBlockByHash(blockHash) {
-        return this.store.getCheckpointedBlockByHash(blockHash);
+        return this.stores.blocks.getCheckpointedBlockByHash(blockHash);
     }
     getCheckpointedBlockByArchive(archive) {
-        return this.store.getCheckpointedBlockByArchive(archive);
+        return this.stores.blocks.getCheckpointedBlockByArchive(archive);
     }
     async getL2BlockByHash(blockHash) {
-        const checkpointedBlock = await this.store.getCheckpointedBlockByHash(blockHash);
+        const checkpointedBlock = await this.stores.blocks.getCheckpointedBlockByHash(blockHash);
         return checkpointedBlock?.block;
     }
     async getL2BlockByArchive(archive) {
-        const checkpointedBlock = await this.store.getCheckpointedBlockByArchive(archive);
+        const checkpointedBlock = await this.stores.blocks.getCheckpointedBlockByArchive(archive);
         return checkpointedBlock?.block;
     }
 }

package/dest/modules/data_store_updater.d.ts

@@ -1,7 +1,7 @@
 import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
 import type { CommitteeAttestation, L2Block, ValidateCheckpointResult } from '@aztec/stdlib/block';
 import { type L1PublishedData, type ProposedCheckpointInput, type PublishedCheckpoint } from '@aztec/stdlib/checkpoint';
-import type { KVArchiverDataStore } from '../store/kv_archiver_store.js';
+import type { ArchiverDataStores } from '../store/data_stores.js';
 import type { L2TipsCache } from '../store/l2_tips_cache.js';
 /** Result of adding checkpoints with information about any pruned blocks. */
 type ReconcileCheckpointsResult = {
@@ -12,11 +12,11 @@ type ReconcileCheckpointsResult = {
 };
 /** Archiver helper module to handle updates to the data store. */
 export declare class ArchiverDataStoreUpdater {
-    private store;
+    private stores;
     private l2TipsCache?;
     private opts;
     private readonly log;
-    constructor(store: KVArchiverDataStore, l2TipsCache?: L2TipsCache | undefined, opts?: {
+    constructor(stores: ArchiverDataStores, l2TipsCache?: L2TipsCache | undefined, opts?: {
         rollupManaLimit?: number;
     });
     /**
@@ -46,8 +46,8 @@ export declare class ArchiverDataStoreUpdater {
         l1: L1PublishedData;
         attestations: CommitteeAttestation[];
         checkpoint: PublishedCheckpoint;
-    }): Promise<ReconcileCheckpointsResult>;
-    setProposedCheckpoint(proposedCheckpoint: ProposedCheckpointInput): Promise<void>;
+    }, evictProposedFrom?: CheckpointNumber): Promise<ReconcileCheckpointsResult>;
+    addProposedCheckpoint(proposedCheckpoint: ProposedCheckpointInput): Promise<void>;
     private pruneMismatchingLocalBlocks;
     /**
      * Removes all uncheckpointed blocks strictly after the specified block number and cleans up associated contract data.
@@ -90,4 +90,4 @@ export declare class ArchiverDataStoreUpdater {
     private updateUpdatedContractInstances;
 }
 export {};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGF0YV9zdG9yZV91cGRhdGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbW9kdWxlcy9kYXRhX3N0b3JlX3VwZGF0ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFdBQVcsRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBUWhGLE9BQU8sS0FBSyxFQUFFLG9CQUFvQixFQUFFLE9BQU8sRUFBRSx3QkFBd0IsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ25HLE9BQU8sRUFDTCxLQUFLLGVBQWUsRUFDcEIsS0FBSyx1QkFBdUIsRUFDNUIsS0FBSyxtQkFBbUIsRUFFekIsTUFBTSwwQkFBMEIsQ0FBQztBQVNsQyxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQ3pFLE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBUTdELDZFQUE2RTtBQUM3RSxLQUFLLDBCQUEwQixHQUFHO0lBQ2hDLG1FQUFtRTtJQUNuRSxZQUFZLEVBQUUsT0FBTyxFQUFFLEdBQUcsU0FBUyxDQUFDO0lBQ3BDLGlGQUFpRjtJQUNqRiw4QkFBOEIsRUFBRSxXQUFXLEdBQUcsU0FBUyxDQUFDO0NBQ3pELENBQUM7QUFFRixrRUFBa0U7QUFDbEUscUJBQWEsd0JBQXdCO0lBSWpDLE9BQU8sQ0FBQyxLQUFLO0lBQ2IsT0FBTyxDQUFDLFdBQVcsQ0FBQztJQUNwQixPQUFPLENBQUMsSUFBSTtJQUxkLE9BQU8sQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUEwQztJQUU5RCxZQUNVLEtBQUssRUFBRSxtQkFBbUIsRUFDMUIsV0FBVyxDQUFDLHlCQUFhLEVBQ3pCLElBQUksR0FBRTtRQUFFLGVBQWUsQ0FBQyxFQUFFLE1BQU0sQ0FBQTtLQUFPLEVBQzdDO0lBRUo7Ozs7Ozs7O09BUUc7SUFDVSxnQkFBZ0IsQ0FDM0IsS0FBSyxFQUFFLE9BQU8sRUFDZCw0QkFBNEIsQ0FBQyxFQUFFLHdCQUF3QixHQUN0RCxPQUFPLENBQUMsT0FBTyxDQUFDLENBaUJsQjtJQUVEOzs7Ozs7Ozs7Ozs7T0FZRztJQUNVLGNBQWMsQ0FDekIsV0FBVyxFQUFFLG1CQUFtQixFQUFFLEVBQ2xDLDRCQUE0QixDQUFDLEVBQUUsd0JBQXdCLEVBQ3ZELGVBQWUsQ0FBQyxFQUFFO1FBQ2hCLEVBQUUsRUFBRSxlQUFlLENBQUM7UUFDcEIsWUFBWSxFQUFFLG9CQUFvQixFQUFFLENBQUM7UUFDckMsVUFBVSxFQUFFLG1CQUFtQixDQUFDO0tBQ2pDLEdBQ0EsT0FBTyxDQUFDLDBCQUEwQixDQUFDLENBd0NyQztJQUVZLHFCQUFxQixDQUFDLGtCQUFrQixFQUFFLHVCQUF1QixpQkFPN0U7WUFRYSwyQkFBMkI7SUFtRXpDOzs7Ozs7OztPQVFHO0lBQ1UsK0JBQStCLENBQUMsV0FBVyxFQUFFLFdBQVcsR0FBRyxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FtQnpGO1lBTWEsaUJBQWlCO0lBYS9COzs7Ozs7OztPQVFHO0lBQ1Usc0JBQXNCLENBQUMsZ0JBQWdCLEVBQUUsZ0JBQWdCLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQWV4RjtJQUVEOzs7T0FHRztJQUNVLHlCQUF5QixDQUFDLGdCQUFnQixFQUFFLGdCQUFnQixHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FLeEY7SUFFRDs7O09BR0c7SUFDVSw0QkFBNEIsQ0FBQyxnQkFBZ0IsRUFBRSxnQkFBZ0IsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBSzNGO0lBRUQsNkRBQTZEO0lBQzdELE9BQU8sQ0FBQyxtQkFBbUI7SUFJM0IscURBQXFEO0lBQ3JELE9BQU8sQ0FBQyx3QkFBd0I7WUFLbEIsc0JBQXNCO1lBaUJ0Qiw4QkFBOEI7WUErQzlCLCtCQUErQjtZQTBDL0IsOEJBQThCO0NBc0I3QyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGF0YV9zdG9yZV91cGRhdGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbW9kdWxlcy9kYXRhX3N0b3JlX3VwZGF0ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFdBQVcsRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBUWhGLE9BQU8sS0FBSyxFQUFFLG9CQUFvQixFQUFFLE9BQU8sRUFBRSx3QkFBd0IsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ25HLE9BQU8sRUFDTCxLQUFLLGVBQWUsRUFDcEIsS0FBSyx1QkFBdUIsRUFDNUIsS0FBSyxtQkFBbUIsRUFFekIsTUFBTSwwQkFBMEIsQ0FBQztBQVNsQyxPQUFPLEtBQUssRUFBRSxrQkFBa0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ2xFLE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBUTdELDZFQUE2RTtBQUM3RSxLQUFLLDBCQUEwQixHQUFHO0lBQ2hDLG1FQUFtRTtJQUNuRSxZQUFZLEVBQUUsT0FBTyxFQUFFLEdBQUcsU0FBUyxDQUFDO0lBQ3BDLGlGQUFpRjtJQUNqRiw4QkFBOEIsRUFBRSxXQUFXLEdBQUcsU0FBUyxDQUFDO0NBQ3pELENBQUM7QUFFRixrRUFBa0U7QUFDbEUscUJBQWEsd0JBQXdCO0lBSWpDLE9BQU8sQ0FBQyxNQUFNO0lBQ2QsT0FBTyxDQUFDLFdBQVcsQ0FBQztJQUNwQixPQUFPLENBQUMsSUFBSTtJQUxkLE9BQU8sQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUEwQztJQUU5RCxZQUNVLE1BQU0sRUFBRSxrQkFBa0IsRUFDMUIsV0FBVyxDQUFDLHlCQUFhLEVBQ3pCLElBQUksR0FBRTtRQUFFLGVBQWUsQ0FBQyxFQUFFLE1BQU0sQ0FBQTtLQUFPLEVBQzdDO0lBRUo7Ozs7Ozs7O09BUUc7SUFDVSxnQkFBZ0IsQ0FDM0IsS0FBSyxFQUFFLE9BQU8sRUFDZCw0QkFBNEIsQ0FBQyxFQUFFLHdCQUF3QixHQUN0RCxPQUFPLENBQUMsT0FBTyxDQUFDLENBa0JsQjtJQUVEOzs7Ozs7Ozs7Ozs7T0FZRztJQUNVLGNBQWMsQ0FDekIsV0FBVyxFQUFFLG1CQUFtQixFQUFFLEVBQ2xDLDRCQUE0QixDQUFDLEVBQUUsd0JBQXdCLEVBQ3ZELGVBQWUsQ0FBQyxFQUFFO1FBQ2hCLEVBQUUsRUFBRSxlQUFlLENBQUM7UUFDcEIsWUFBWSxFQUFFLG9CQUFvQixFQUFFLENBQUM7UUFDckMsVUFBVSxFQUFFLG1CQUFtQixDQUFDO0tBQ2pDLEVBQ0QsaUJBQWlCLENBQUMsRUFBRSxnQkFBZ0IsR0FDbkMsT0FBTyxDQUFDLDBCQUEwQixDQUFDLENBOENyQztJQUVZLHFCQUFxQixDQUFDLGtCQUFrQixFQUFFLHVCQUF1QixpQkFPN0U7WUFRYSwyQkFBMkI7SUFtRXpDOzs7Ozs7OztPQVFHO0lBQ1UsK0JBQStCLENBQUMsV0FBVyxFQUFFLFdBQVcsR0FBRyxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FtQnpGO1lBTWEsaUJBQWlCO0lBYS9COzs7Ozs7OztPQVFHO0lBQ1Usc0JBQXNCLENBQUMsZ0JBQWdCLEVBQUUsZ0JBQWdCLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQWV4RjtJQUVEOzs7T0FHRztJQUNVLHlCQUF5QixDQUFDLGdCQUFnQixFQUFFLGdCQUFnQixHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FLeEY7SUFFRDs7O09BR0c7SUFDVSw0QkFBNEIsQ0FBQyxnQkFBZ0IsRUFBRSxnQkFBZ0IsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBSzNGO0lBRUQsNkRBQTZEO0lBQzdELE9BQU8sQ0FBQyxtQkFBbUI7SUFJM0IscURBQXFEO0lBQ3JELE9BQU8sQ0FBQyx3QkFBd0I7WUFLbEIsc0JBQXNCO1lBaUJ0Qiw4QkFBOEI7WUErQzlCLCtCQUErQjtZQTBDL0IsOEJBQThCO0NBc0I3QyJ9

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;AAQhF,OAAO,KAAK,EAAE,oBAAoB,EAAE,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AACnG,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,uBAAuB,EAC5B,KAAK,mBAAmB,EAEzB,MAAM,0BAA0B,CAAC;AASlC,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;;;;;;;;;;;;OAYG;IACU,cAAc,CACzB,WAAW,EAAE,mBAAmB,EAAE,EAClC,4BAA4B,CAAC,EAAE,wBAAwB,EACvD,eAAe,CAAC,EAAE;QAChB,EAAE,EAAE,eAAe,CAAC;QACpB,YAAY,EAAE,oBAAoB,EAAE,CAAC;QACrC,UAAU,EAAE,mBAAmB,CAAC;KACjC,GACA,OAAO,CAAC,0BAA0B,CAAC,CAwCrC;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"}
+{"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,oBAAoB,EAAE,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AACnG,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,uBAAuB,EAC5B,KAAK,mBAAmB,EAEzB,MAAM,0BAA0B,CAAC;AASlC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,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,MAAM;IACd,OAAO,CAAC,WAAW,CAAC;IACpB,OAAO,CAAC,IAAI;IALd,OAAO,CAAC,QAAQ,CAAC,GAAG,CAA0C;IAE9D,YACU,MAAM,EAAE,kBAAkB,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,CAkBlB;IAED;;;;;;;;;;;;OAYG;IACU,cAAc,CACzB,WAAW,EAAE,mBAAmB,EAAE,EAClC,4BAA4B,CAAC,EAAE,wBAAwB,EACvD,eAAe,CAAC,EAAE;QAChB,EAAE,EAAE,eAAe,CAAC;QACpB,YAAY,EAAE,oBAAoB,EAAE,CAAC;QACrC,UAAU,EAAE,mBAAmB,CAAC;KACjC,EACD,iBAAiB,CAAC,EAAE,gBAAgB,GACnC,OAAO,CAAC,0BAA0B,CAAC,CA8CrC;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

@@ -11,12 +11,12 @@ import { computeContractAddressFromInstance, computeContractClassId } from '@azt
     return Operation;
 }(Operation || {});
 /** Archiver helper module to handle updates to the data store. */ export class ArchiverDataStoreUpdater {
-    store;
+    stores;
     l2TipsCache;
     opts;
     log;
-    constructor(store, l2TipsCache, opts = {}){
-        this.store = store;
+    constructor(stores, l2TipsCache, opts = {}){
+        this.stores = stores;
         this.l2TipsCache = l2TipsCache;
         this.opts = opts;
         this.log = createLogger('archiver:store_updater');
@@ -30,13 +30,13 @@ import { computeContractAddressFromInstance, computeContractClassId } from '@azt
    * @param pendingChainValidationStatus - Optional validation status to set.
    * @returns True if the operation is successful.
    */ async addProposedBlock(block, pendingChainValidationStatus) {
-        const result = await this.store.transactionAsync(async ()=>{
-            await this.store.addProposedBlock(block);
+        const result = await this.stores.db.transactionAsync(async ()=>{
+            await this.stores.blocks.addProposedBlock(block);
             const opResults = await Promise.all([
                 // Update the pending chain validation status if provided
-                pendingChainValidationStatus && this.store.setPendingChainValidationStatus(pendingChainValidationStatus),
+                pendingChainValidationStatus && this.stores.blocks.setPendingChainValidationStatus(pendingChainValidationStatus),
                 // Add any logs emitted during the retrieved block
-                this.store.addLogs([
+                this.stores.logs.addLogs([
                     block
                 ]),
                 // Unroll all logs emitted during the retrieved block and extract any contract classes and instances from it
@@ -59,7 +59,7 @@ import { computeContractAddressFromInstance, computeContractClassId } from '@azt
    * @param pendingChainValidationStatus - Optional validation status to set.
    * @param promoteProposed - Optional promotion of the current proposed checkpoint (fast path when blocks are already local).
    * @returns Result with information about any pruned blocks.
-   */ async addCheckpoints(checkpoints, pendingChainValidationStatus, promoteProposed) {
+   */ async addCheckpoints(checkpoints, pendingChainValidationStatus, promoteProposed, evictProposedFrom) {
         for (const checkpoint of checkpoints){
             validateCheckpoint(checkpoint.checkpoint, {
                 rollupManaLimit: this.opts?.rollupManaLimit
@@ -70,21 +70,23 @@ import { computeContractAddressFromInstance, computeContractClassId } from '@azt
                 rollupManaLimit: this.opts?.rollupManaLimit
             });
         }
-        const result = await this.store.transactionAsync(async ()=>{
+        const result = await this.stores.db.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);
+            await this.stores.blocks.addCheckpoints(checkpoints);
             // 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
-                pendingChainValidationStatus && this.store.setPendingChainValidationStatus(pendingChainValidationStatus),
+                pendingChainValidationStatus && this.stores.blocks.setPendingChainValidationStatus(pendingChainValidationStatus),
                 // Add any logs emitted during the retrieved blocks
-                this.store.addLogs(newBlocks),
+                this.stores.logs.addLogs(newBlocks),
                 // Unroll all logs emitted during the retrieved blocks and extract any contract classes and instances from them
                 ...newBlocks.map((block)=>this.addContractDataToDb(block)),
-                // Promote the proposed checkpoint if requested
-                promoteProposed ? this.store.promoteProposedToCheckpointed(promoteProposed.l1, promoteProposed.attestations, promoteProposed.checkpoint.checkpoint.archive.root) : undefined
+                // Promote the proposed checkpoint if requested (uses explicit checkpoint number)
+                promoteProposed ? this.stores.blocks.promoteProposedToCheckpointed(promoteProposed.checkpoint.checkpoint.number, promoteProposed.l1, promoteProposed.attestations, promoteProposed.checkpoint.checkpoint.archive.root) : undefined,
+                // Evict pending checkpoints that diverged from what L1 mined
+                evictProposedFrom !== undefined ? this.stores.blocks.evictProposedCheckpointsFrom(evictProposedFrom) : undefined
             ]);
             await this.l2TipsCache?.refresh();
             return {
@@ -94,9 +96,9 @@ import { computeContractAddressFromInstance, computeContractClassId } from '@azt
         });
         return result;
     }
-    async setProposedCheckpoint(proposedCheckpoint) {
-        const result = await this.store.transactionAsync(async ()=>{
-            await this.store.setProposedCheckpoint(proposedCheckpoint);
+    async addProposedCheckpoint(proposedCheckpoint) {
+        const result = await this.stores.db.transactionAsync(async ()=>{
+            await this.stores.blocks.addProposedCheckpoint(proposedCheckpoint);
             await this.l2TipsCache?.refresh();
         });
         return result;
@@ -108,8 +110,8 @@ import { computeContractAddressFromInstance, computeContractClassId } from '@azt
    * 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()
+            this.stores.blocks.getCheckpointedL2BlockNumber(),
+            this.stores.blocks.getLatestL2BlockNumber()
         ]);
         // Exit early if there are no local uncheckpointed blocks
         if (lastBlockNumber === lastCheckpointedBlockNumber) {
@@ -119,7 +121,7 @@ import { computeContractAddressFromInstance, computeContractClassId } from '@azt
             };
         }
         // Get all uncheckpointed local blocks
-        const uncheckpointedLocalBlocks = await this.store.getBlocks(BlockNumber.add(lastCheckpointedBlockNumber, 1), lastBlockNumber - lastCheckpointedBlockNumber);
+        const uncheckpointedLocalBlocks = await this.stores.blocks.getBlocks(BlockNumber.add(lastCheckpointedBlockNumber, 1), lastBlockNumber - lastCheckpointedBlockNumber);
         let lastAlreadyInsertedBlockNumber;
         for (const publishedCheckpoint of checkpoints){
             const checkpointBlocks = publishedCheckpoint.checkpoint.blocks;
@@ -178,15 +180,15 @@ import { computeContractAddressFromInstance, computeContractClassId } from '@azt
    * @returns The removed blocks.
    * @throws Error if any block to be removed is checkpointed.
    */ async removeUncheckpointedBlocksAfter(blockNumber) {
-        const result = await this.store.transactionAsync(async ()=>{
+        const result = await this.stores.db.transactionAsync(async ()=>{
             // Verify we're only removing uncheckpointed blocks
-            const lastCheckpointedBlockNumber = await this.store.getCheckpointedL2BlockNumber();
+            const lastCheckpointedBlockNumber = await this.stores.blocks.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);
-            // Clear the proposed checkpoint if it exists, since its blocks have been pruned
-            await this.store.deleteProposedCheckpoint();
+            // Clear all pending proposed checkpoints since their blocks have been pruned
+            await this.stores.blocks.deleteProposedCheckpoints();
             await this.l2TipsCache?.refresh();
             return result;
         });
@@ -197,10 +199,10 @@ import { computeContractAddressFromInstance, computeContractClassId } from '@azt
    * 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);
+        const removedBlocks = await this.stores.blocks.removeBlocksAfter(blockNumber);
         // Clean up contract data and logs for the removed blocks
         await Promise.all([
-            this.store.deleteLogs(removedBlocks),
+            this.stores.logs.deleteLogs(removedBlocks),
             ...removedBlocks.map((block)=>this.removeContractDataFromDb(block))
         ]);
         return removedBlocks;
@@ -214,16 +216,16 @@ import { computeContractAddressFromInstance, computeContractClassId } from '@azt
    * @param checkpointNumber - Remove all checkpoints strictly after this one.
    * @returns True if the operation is successful.
    */ async removeCheckpointsAfter(checkpointNumber) {
-        return await this.store.transactionAsync(async ()=>{
-            const { blocksRemoved = [] } = await this.store.removeCheckpointsAfter(checkpointNumber);
+        return await this.stores.db.transactionAsync(async ()=>{
+            const { blocksRemoved = [] } = await this.stores.blocks.removeCheckpointsAfter(checkpointNumber);
             const opResults = await Promise.all([
                 // Prune rolls back to the last proven block, which is by definition valid
-                this.store.setPendingChainValidationStatus({
+                this.stores.blocks.setPendingChainValidationStatus({
                     valid: true
                 }),
                 // Remove contract data for all blocks being removed
                 ...blocksRemoved.map((block)=>this.removeContractDataFromDb(block)),
-                this.store.deleteLogs(blocksRemoved)
+                this.stores.logs.deleteLogs(blocksRemoved)
             ]);
             await this.l2TipsCache?.refresh();
             return opResults.every(Boolean);
@@ -233,8 +235,8 @@ import { computeContractAddressFromInstance, computeContractClassId } from '@azt
    * 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.stores.db.transactionAsync(async ()=>{
+            await this.stores.blocks.setProvenCheckpointNumber(checkpointNumber);
             await this.l2TipsCache?.refresh();
         });
     }
@@ -242,8 +244,8 @@ import { computeContractAddressFromInstance, computeContractClassId } from '@azt
    * 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.stores.db.transactionAsync(async ()=>{
+            await this.stores.blocks.setFinalizedCheckpointNumber(checkpointNumber);
             await this.l2TipsCache?.refresh();
         });
     }
@@ -271,7 +273,7 @@ import { computeContractAddressFromInstance, computeContractClassId } from '@azt
             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 await this.stores.contractClasses.deleteContractClasses(contractClasses, blockNum);
             }
             return true;
         }
@@ -295,7 +297,7 @@ import { computeContractAddressFromInstance, computeContractClassId } from '@azt
         }
         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 await this.stores.contractClasses.addContractClasses(contractClasses, blockNum);
         }
         return true;
     }
@@ -319,9 +321,9 @@ import { computeContractAddressFromInstance, computeContractClassId } from '@azt
         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);
+                return await this.stores.contractInstances.addContractInstances(contractInstances, blockNum);
             } else if (operation == 1) {
-                return await this.store.deleteContractInstances(contractInstances, blockNum);
+                return await this.stores.contractInstances.deleteContractInstances(contractInstances);
             }
         }
         return true;
@@ -333,9 +335,9 @@ import { computeContractAddressFromInstance, computeContractClassId } from '@azt
         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);
+                return await this.stores.contractInstances.addContractInstanceUpdates(contractUpdates, timestamp);
             } else if (operation == 1) {
-                return await this.store.deleteContractInstanceUpdates(contractUpdates, timestamp);
+                return await this.stores.contractInstances.deleteContractInstanceUpdates(contractUpdates, timestamp);
             }
         }
         return true;

package/dest/modules/l1_synchronizer.d.ts

@@ -9,7 +9,7 @@ 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 ArchiverDataStores } from '../store/data_stores.js';
 import type { L2TipsCache } from '../store/l2_tips_cache.js';
 import type { ArchiverInstrumentation } from './instrumentation.js';
 /**
@@ -21,7 +21,7 @@ export declare class ArchiverL1Synchronizer implements Traceable {
     private readonly debugClient;
     private readonly rollup;
     private readonly inbox;
-    private readonly store;
+    private readonly stores;
     private config;
     private readonly blobClient;
     private readonly epochCache;
@@ -35,7 +35,7 @@ export declare class ArchiverL1Synchronizer implements Traceable {
     private l1Timestamp;
     private readonly updater;
     readonly tracer: Tracer;
-    constructor(publicClient: ViemPublicClient, debugClient: ViemPublicDebugClient, rollup: RollupContract, inbox: InboxContract, store: KVArchiverDataStore, config: {
+    constructor(publicClient: ViemPublicClient, debugClient: ViemPublicDebugClient, rollup: RollupContract, inbox: InboxContract, stores: ArchiverDataStores, config: {
         batchSize: number;
         skipValidateCheckpointAttestations?: boolean;
         skipPromoteProposedCheckpointDuringL1Sync?: boolean;
@@ -55,6 +55,7 @@ export declare class ArchiverL1Synchronizer implements Traceable {
     getL1BlockNumber(): bigint | undefined;
     /** Returns the last L1 timestamp that was synced. */
     getL1Timestamp(): bigint | undefined;
+    private getSignatureContext;
     /** 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>;
@@ -73,4 +74,4 @@ export declare class ArchiverL1Synchronizer implements Traceable {
     private checkForNewCheckpointsBeforeL1SyncPoint;
     private getCheckpointHeader;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfc3luY2hyb25pemVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbW9kdWxlcy9sMV9zeW5jaHJvbml6ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUNyRSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDaEQsT0FBTyxFQUFFLGFBQWEsRUFBMkIsY0FBYyxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFHbkcsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUscUJBQXFCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUlyRixPQUFPLEVBQVksUUFBUSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFOUQsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3BELE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBZ0IsTUFBTSx1QkFBdUIsQ0FBQztBQUdsRSxPQUFPLEVBQUUsWUFBWSxFQUFrQixNQUFNLHlCQUF5QixDQUFDO0FBRXZFLE9BQU8sRUFBRSxLQUFLLGVBQWUsRUFBc0QsTUFBTSxxQkFBcUIsQ0FBQztBQUUvRyxPQUFPLEVBQUUsS0FBSyxpQkFBaUIsRUFBd0MsTUFBTSw2QkFBNkIsQ0FBQztBQUUzRyxPQUFPLEVBQUUsS0FBSyxTQUFTLEVBQUUsS0FBSyxNQUFNLEVBQXlCLE1BQU0seUJBQXlCLENBQUM7QUFXN0YsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUN6RSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUk3RCxPQUFPLEtBQUssRUFBRSx1QkFBdUIsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBYXBFOzs7R0FHRztBQUNILHFCQUFhLHNCQUF1QixZQUFXLFNBQVM7SUFTcEQsT0FBTyxDQUFDLFFBQVEsQ0FBQyxZ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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfc3luY2hyb25pemVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbW9kdWxlcy9sMV9zeW5jaHJvbml6ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUNyRSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDaEQsT0FBTyxFQUFFLGFBQWEsRUFBMkIsY0FBYyxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFHbkcsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUscUJBQXFCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUlyRixPQUFPLEVBQVksUUFBUSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFOUQsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXBELE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBZ0IsTUFBTSx1QkFBdUIsQ0FBQztBQUdsRSxPQUFPLEVBQUUsWUFBWSxFQUFrQixNQUFNLHlCQUF5QixDQUFDO0FBRXZFLE9BQU8sRUFBRSxLQUFLLGVBQWUsRUFBc0QsTUFBTSxxQkFBcUIsQ0FBQztBQUUvRyxPQUFPLEVBQUUsS0FBSyxpQkFBaUIsRUFBd0MsTUFBTSw2QkFBNkIsQ0FBQztBQUczRyxPQUFPLEVBQUUsS0FBSyxTQUFTLEVBQUUsS0FBSyxNQUFNLEVBQXlCLE1BQU0seUJBQXlCLENBQUM7QUFXN0YsT0FBTyxFQUFFLEtBQUssa0JBQWtCLEVBQXlCLE1BQU0seUJBQXlCLENBQUM7QUFDekYsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFJN0QsT0FBTyxLQUFLLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQWFwRTs7O0dBR0c7QUFDSCxxQkFBYSxzQkFBdUIsWUFBVyxTQUFTO0lBU3BELE9BQU8sQ0FBQyxRQUFRLENBQUMs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

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

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