@aztec/archiver 0.0.1-commit.934299a21 → 0.0.1-commit.949a33fd8

package/dest/store/kv_archiver_store.js

@@ -7,7 +7,7 @@ import { ContractClassStore } from './contract_class_store.js';
 import { ContractInstanceStore } from './contract_instance_store.js';
 import { LogStore } from './log_store.js';
 import { MessageStore } from './message_store.js';
-export const ARCHIVER_DB_VERSION = 5;
+export const ARCHIVER_DB_VERSION = 6;
 export const MAX_FUNCTION_SIGNATURES = 1000;
 export const MAX_FUNCTION_NAME_LEN = 256;
 /**
@@ -23,11 +23,11 @@ export const MAX_FUNCTION_NAME_LEN = 256;
     #contractInstanceStore;
     functionNames;
     #log;
-    constructor(db, logsMaxPageSize = 1000, l1Constants){
+    constructor(db, logsMaxPageSize = 1000){
         this.db = db;
         this.functionNames = new Map();
         this.#log = createLogger('archiver:data-store');
-        this.#blockStore = new BlockStore(db, l1Constants);
+        this.#blockStore = new BlockStore(db);
         this.#logStore = new LogStore(db, this.#blockStore, logsMaxPageSize);
         this.#messageStore = new MessageStore(db);
         this.#contractClassStore = new ContractClassStore(db);
@@ -95,12 +95,11 @@ export const MAX_FUNCTION_NAME_LEN = 256;
     }
     /**
    * Add new contract classes from an L2 block to the store's list.
-   * @param data - List of contract classes to be added.
-   * @param bytecodeCommitments - Bytecode commitments for the contract classes.
+   * @param data - List of contract classes (with bytecode commitments) to be added.
    * @param blockNumber - Number of the L2 block the contracts were registered in.
    * @returns True if the operation is successful.
-   */ async addContractClasses(data, bytecodeCommitments, blockNumber) {
-        return (await Promise.all(data.map((c, i)=>this.#contractClassStore.addContractClass(c, bytecodeCommitments[i], blockNumber)))).every(Boolean);
+   */ async addContractClasses(data, blockNumber) {
+        return (await Promise.all(data.map((c)=>this.#contractClassStore.addContractClass(c, c.publicBytecodeCommitment, blockNumber)))).every(Boolean);
     }
     async deleteContractClasses(data, blockNumber) {
         return (await Promise.all(data.map((c)=>this.#contractClassStore.deleteContractClasses(c, blockNumber)))).every(Boolean);
@@ -108,9 +107,6 @@ export const MAX_FUNCTION_NAME_LEN = 256;
     getBytecodeCommitment(contractClassId) {
         return this.#contractClassStore.getBytecodeCommitment(contractClassId);
     }
-    /** Adds private functions to a contract class. */ addFunctions(contractClassId, privateFunctions, utilityFunctions) {
-        return this.#contractClassStore.addFunctions(contractClassId, privateFunctions, utilityFunctions);
-    }
     /**
    * Add new contract instances from an L2 block to the store's list.
    * @param data - List of contract instances to be added.
@@ -134,13 +130,13 @@ export const MAX_FUNCTION_NAME_LEN = 256;
         return (await Promise.all(data.map((update, logIndex)=>this.#contractInstanceStore.deleteContractInstanceUpdate(update, timestamp, logIndex)))).every(Boolean);
     }
     /**
-   * Append new proposed blocks to the store's list.
-   * These are uncheckpointed blocks that have been proposed by the sequencer but not yet included in a checkpoint on L1.
+   * Append a new proposed block to the store.
+   * This is an uncheckpointed block that has been proposed by the sequencer but not yet included in a checkpoint on L1.
    * For checkpointed blocks (already published to L1), use addCheckpoints() instead.
-   * @param blocks - The proposed L2 blocks to be added to the store.
+   * @param block - The proposed L2 block to be added to the store.
    * @returns True if the operation is successful.
-   */ addProposedBlocks(blocks, opts = {}) {
-        return this.#blockStore.addProposedBlocks(blocks, opts);
+   */ addProposedBlock(block, opts = {}) {
+        return this.#blockStore.addProposedBlock(block, opts);
     }
     /**
    * Returns an array of checkpoint objects
@@ -154,7 +150,7 @@ export const MAX_FUNCTION_NAME_LEN = 256;
    * Returns the number of the latest block
    * @returns The number of the latest block
    */ getLatestBlockNumber() {
-        return this.#blockStore.getLatestBlockNumber();
+        return this.#blockStore.getLatestL2BlockNumber();
     }
     /**
    * Removes all checkpoints with checkpoint number > checkpointNumber.
@@ -265,8 +261,8 @@ export const MAX_FUNCTION_NAME_LEN = 256;
    * Gets a receipt of a settled tx.
    * @param txHash - The hash of a tx we try to get the receipt for.
    * @returns The requested tx receipt (or undefined if not found).
-   */ getSettledTxReceipt(txHash) {
-        return this.#blockStore.getSettledTxReceipt(txHash);
+   */ getSettledTxReceipt(txHash, l1Constants) {
+        return this.#blockStore.getSettledTxReceipt(txHash, l1Constants);
     }
     /**
    * Append new logs to the store's list.
@@ -313,9 +309,10 @@ export const MAX_FUNCTION_NAME_LEN = 256;
    * array implies no logs match that tag.
    * @param tags - The tags to search for.
    * @param page - The page number (0-indexed) for pagination. Returns at most 10 logs per tag per page.
-   */ getPrivateLogsByTags(tags, page) {
+   * @param upToBlockNumber - If set, only return logs from blocks up to and including this block number.
+   */ getPrivateLogsByTags(tags, page, upToBlockNumber) {
         try {
-            return this.#logStore.getPrivateLogsByTags(tags, page);
+            return this.#logStore.getPrivateLogsByTags(tags, page, upToBlockNumber);
         } catch (err) {
             return Promise.reject(err);
         }
@@ -326,9 +323,10 @@ export const MAX_FUNCTION_NAME_LEN = 256;
    * @param contractAddress - The contract address to search logs for.
    * @param tags - The tags to search for.
    * @param page - The page number (0-indexed) for pagination. Returns at most 10 logs per tag per page.
-   */ getPublicLogsByTagsFromContract(contractAddress, tags, page) {
+   * @param upToBlockNumber - If set, only return logs from blocks up to and including this block number.
+   */ getPublicLogsByTagsFromContract(contractAddress, tags, page, upToBlockNumber) {
         try {
-            return this.#logStore.getPublicLogsByTagsFromContract(contractAddress, tags, page);
+            return this.#logStore.getPublicLogsByTagsFromContract(contractAddress, tags, page, upToBlockNumber);
         } catch (err) {
             return Promise.reject(err);
         }
@@ -367,13 +365,20 @@ export const MAX_FUNCTION_NAME_LEN = 256;
    */ async setProvenCheckpointNumber(checkpointNumber) {
         await this.#blockStore.setProvenCheckpointNumber(checkpointNumber);
     }
-    async setBlockSynchedL1BlockNumber(l1BlockNumber) {
-        await this.#blockStore.setSynchedL1BlockNumber(l1BlockNumber);
+    /**
+   * Gets the number of the latest finalized checkpoint processed.
+   * @returns The number of the latest finalized checkpoint processed.
+   */ getFinalizedCheckpointNumber() {
+        return this.#blockStore.getFinalizedCheckpointNumber();
     }
     /**
-   * Stores the l1 block that messages have been synched until
-   */ async setMessageSynchedL1Block(l1Block) {
-        await this.#messageStore.setSynchedL1Block(l1Block);
+   * Stores the number of the latest finalized checkpoint processed.
+   * @param checkpointNumber - The number of the latest finalized checkpoint processed.
+   */ async setFinalizedCheckpointNumber(checkpointNumber) {
+        await this.#blockStore.setFinalizedCheckpointNumber(checkpointNumber);
+    }
+    async setBlockSynchedL1BlockNumber(l1BlockNumber) {
+        await this.#blockStore.setSynchedL1BlockNumber(l1BlockNumber);
     }
     /**
    * Returns the number of the most recent proven block
@@ -399,6 +404,9 @@ export const MAX_FUNCTION_NAME_LEN = 256;
     /** Deletes all L1 to L2 messages up until (excluding) the target checkpoint number. */ rollbackL1ToL2MessagesToCheckpoint(targetCheckpointNumber) {
         return this.#messageStore.rollbackL1ToL2MessagesToCheckpoint(targetCheckpointNumber);
     }
+    /** Atomically updates the message sync state: the L1 sync point and the inbox tree-in-progress marker. */ setMessageSyncState(l1Block, treeInProgress) {
+        return this.#messageStore.setMessageSyncState(l1Block, treeInProgress);
+    }
     /** Returns an async iterator to all L1 to L2 messages on the range. */ iterateL1ToL2Messages(range = {}) {
         return this.#messageStore.iterateL1ToL2Messages(range);
     }
@@ -412,6 +420,50 @@ export const MAX_FUNCTION_NAME_LEN = 256;
         return this.#blockStore.setPendingChainValidationStatus(status);
     }
     /**
+   * Gets the L2 block number of the proposed checkpoint.
+   * @returns The block number of the proposed checkpoint, or the checkpointed block number if none.
+   */ getProposedCheckpointL2BlockNumber() {
+        return this.#blockStore.getProposedCheckpointL2BlockNumber();
+    }
+    /** Returns the checkpoint data at the proposed tip */ getLastCheckpoint() {
+        return this.#blockStore.getLastCheckpoint();
+    }
+    /** Returns the proposed checkpoint data, or undefined if no proposed checkpoint exists. No fallback to confirmed. */ getLastProposedCheckpoint() {
+        return this.#blockStore.getLastProposedCheckpoint();
+    }
+    /**
+   * Set proposed checkpoint
+   * @param proposedCheckpoint
+   * @returns
+   */ addProposedCheckpoint(proposedCheckpoint) {
+        return this.#blockStore.addProposedCheckpoint(proposedCheckpoint);
+    }
+    /** Deletes all pending proposed checkpoints from storage. */ deleteProposedCheckpoints() {
+        return this.#blockStore.deleteProposedCheckpoints();
+    }
+    /** Returns the pending checkpoint for a specific checkpoint number, or undefined if not found. */ getProposedCheckpointByNumber(n) {
+        return this.#blockStore.getProposedCheckpointByNumber(n);
+    }
+    /** Returns all pending checkpoints in ascending checkpoint-number order. */ getProposedCheckpoints() {
+        return this.#blockStore.getProposedCheckpoints();
+    }
+    /**
+   * Evicts all pending checkpoints with checkpoint number >= fromNumber.
+   * Used for divergent-mined-checkpoint cleanup.
+   */ evictProposedCheckpointsFrom(fromNumber) {
+        return this.#blockStore.evictProposedCheckpointsFrom(fromNumber);
+    }
+    /**
+   * Promotes a specific pending checkpoint to a confirmed checkpoint entry.
+   * Should only be called after the checkpoint has been validated.
+   * @param checkpointNumber - The checkpoint number to promote.
+   * @param l1 - L1 published data for the checkpoint.
+   * @param attestations - Committee attestations.
+   * @param expectedArchiveRoot - The archive root to match against the proposed checkpoint, to guard against races.
+   */ promoteProposedToCheckpointed(checkpointNumber, l1, attestations, expectedArchiveRoot) {
+        return this.#blockStore.promoteProposedToCheckpointed(checkpointNumber, l1, attestations, expectedArchiveRoot);
+    }
+    /**
    * Gets the number of the latest L2 block processed.
    * @returns The number of the latest L2 block processed.
    */ getCheckpointedL2BlockNumber() {
@@ -446,6 +498,15 @@ export const MAX_FUNCTION_NAME_LEN = 256;
     /** Returns checkpoint data for all checkpoints whose slot falls within the given range (inclusive). */ getCheckpointDataForSlotRange(startSlot, endSlot) {
         return this.#blockStore.getCheckpointDataForSlotRange(startSlot, endSlot);
     }
+    /** Returns lightweight checkpoint metadata for a range of checkpoints. */ getCheckpointDataRange(from, limit) {
+        return this.#blockStore.getRangeOfCheckpoints(from, limit);
+    }
+    /** Returns the checkpoint number for a given slot, if one exists. */ getCheckpointNumberBySlot(slot) {
+        return this.#blockStore.getCheckpointNumberBySlot(slot);
+    }
+    /** Returns block metadata plus checkpoint-derived context (L1 publish info, attestations). */ getBlockDataWithCheckpointContext(blockNumber) {
+        return this.#blockStore.getBlockDataWithCheckpointContext(blockNumber);
+    }
     /**
    * Gets all blocks that have the given slot number.
    * @param slotNumber - The slot number to search for.

package/dest/store/l2_tips_cache.d.ts

@@ -14,6 +14,7 @@ export declare class L2TipsCache {
     /** Reloads the L2 tips from the block store. Should be called within the store transaction that mutates data. */
     refresh(): Promise<void>;
     private loadFromStore;
+    private getCheckpointIdForProposedCheckpoint;
     private getCheckpointIdForBlock;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDJfdGlwc19jYWNoZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3N0b3JlL2wyX3RpcHNfY2FjaGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFxRSxLQUFLLE1BQU0sRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBRXJILE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRW5EOzs7O0dBSUc7QUFDSCxxQkFBYSxXQUFXOztJQUdWLE9BQU8sQ0FBQyxVQUFVO0lBQTlCLFlBQW9CLFVBQVUsRUFBRSxVQUFVLEVBQUk7SUFFOUMsNEVBQTRFO0lBQ3JFLFNBQVMsSUFBSSxPQUFPLENBQUMsTUFBTSxDQUFDLENBRWxDO0lBRUQsaUhBQWlIO0lBQ3BHLE9BQU8sSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLENBR3BDO1lBRWEsYUFBYTtZQWdEYix1QkFBdUI7Q0FhdEMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDJfdGlwc19jYWNoZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3N0b3JlL2wyX3RpcHNfY2FjaGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUtMLEtBQUssTUFBTSxFQUNaLE1BQU0scUJBQXFCLENBQUM7QUFFN0IsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFbkQ7Ozs7R0FJRztBQUNILHFCQUFhLFdBQVc7O0lBR1YsT0FBTyxDQUFDLFVBQVU7SUFBOUIsWUFBb0IsVUFBVSxFQUFFLFVBQVUsRUFBSTtJQUU5Qyw0RUFBNEU7SUFDckUsU0FBUyxJQUFJLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FFbEM7SUFFRCxpSEFBaUg7SUFDcEcsT0FBTyxJQUFJLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FHcEM7WUFFYSxhQUFhO1lBMEViLG9DQUFvQztZQWFwQyx1QkFBdUI7Q0FhdEMifQ==

package/dest/store/l2_tips_cache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"l2_tips_cache.d.ts","sourceRoot":"","sources":["../../src/store/l2_tips_cache.ts"],"names":[],"mappings":"AAEA,OAAO,EAAqE,KAAK,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAErH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnD;;;;GAIG;AACH,qBAAa,WAAW;;IAGV,OAAO,CAAC,UAAU;IAA9B,YAAoB,UAAU,EAAE,UAAU,EAAI;IAE9C,4EAA4E;IACrE,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC,CAElC;IAED,iHAAiH;IACpG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAGpC;YAEa,aAAa;YAgDb,uBAAuB;CAatC"}
+{"version":3,"file":"l2_tips_cache.d.ts","sourceRoot":"","sources":["../../src/store/l2_tips_cache.ts"],"names":[],"mappings":"AAEA,OAAO,EAKL,KAAK,MAAM,EACZ,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnD;;;;GAIG;AACH,qBAAa,WAAW;;IAGV,OAAO,CAAC,UAAU;IAA9B,YAAoB,UAAU,EAAE,UAAU,EAAI;IAE9C,4EAA4E;IACrE,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC,CAElC;IAED,iHAAiH;IACpG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAGpC;YAEa,aAAa;YA0Eb,oCAAoC;YAapC,uBAAuB;CAatC"}

package/dest/store/l2_tips_cache.js

@@ -1,6 +1,6 @@
-import { GENESIS_BLOCK_HEADER_HASH, INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
+import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
 import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
-import { GENESIS_CHECKPOINT_HEADER_HASH } from '@aztec/stdlib/block';
+import { GENESIS_BLOCK_HEADER_HASH, GENESIS_CHECKPOINT_HEADER_HASH } from '@aztec/stdlib/block';
 /**
  * In-memory cache for L2 chain tips (proposed, checkpointed, proven, finalized).
  * Populated from the BlockStore on first access, then kept up-to-date by the ArchiverDataStoreUpdater.
@@ -19,9 +19,10 @@ import { GENESIS_CHECKPOINT_HEADER_HASH } from '@aztec/stdlib/block';
         await this.#tipsPromise;
     }
     async loadFromStore() {
-        const [latestBlockNumber, provenBlockNumber, checkpointedBlockNumber, finalizedBlockNumber] = await Promise.all([
-            this.blockStore.getLatestBlockNumber(),
+        const [latestBlockNumber, provenBlockNumber, proposedCheckpointBlockNumber, checkpointedBlockNumber, finalizedBlockNumber] = await Promise.all([
+            this.blockStore.getLatestL2BlockNumber(),
             this.blockStore.getProvenBlockNumber(),
+            this.blockStore.getProposedCheckpointL2BlockNumber(),
             this.blockStore.getCheckpointedL2BlockNumber(),
             this.blockStore.getFinalizedL2BlockNumber()
         ]);
@@ -31,18 +32,20 @@ import { GENESIS_CHECKPOINT_HEADER_HASH } from '@aztec/stdlib/block';
         };
         const beforeInitialBlockNumber = BlockNumber(INITIAL_L2_BLOCK_NUM - 1);
         const getBlockData = (blockNumber)=>blockNumber > beforeInitialBlockNumber ? this.blockStore.getBlockData(blockNumber) : genesisBlockHeader;
-        const [latestBlockData, provenBlockData, checkpointedBlockData, finalizedBlockData] = await Promise.all([
+        const [latestBlockData, provenBlockData, proposedCheckpointBlockData, checkpointedBlockData, finalizedBlockData] = await Promise.all([
             latestBlockNumber,
             provenBlockNumber,
+            proposedCheckpointBlockNumber,
             checkpointedBlockNumber,
             finalizedBlockNumber
         ].map(getBlockData));
-        if (!latestBlockData || !provenBlockData || !finalizedBlockData || !checkpointedBlockData) {
+        if (!latestBlockData || !provenBlockData || !finalizedBlockData || !checkpointedBlockData || !proposedCheckpointBlockData) {
             throw new Error('Failed to load block data for L2 tips');
         }
-        const [provenCheckpointId, finalizedCheckpointId, checkpointedCheckpointId] = await Promise.all([
+        const [provenCheckpointId, finalizedCheckpointId, proposedCheckpointId, checkpointedCheckpointId] = await Promise.all([
             this.getCheckpointIdForBlock(provenBlockData),
             this.getCheckpointIdForBlock(finalizedBlockData),
+            this.getCheckpointIdForProposedCheckpoint(checkpointedBlockData),
             this.getCheckpointIdForBlock(checkpointedBlockData)
         ]);
         return {
@@ -57,6 +60,13 @@ import { GENESIS_CHECKPOINT_HEADER_HASH } from '@aztec/stdlib/block';
                 },
                 checkpoint: provenCheckpointId
             },
+            proposedCheckpoint: {
+                block: {
+                    number: proposedCheckpointBlockNumber,
+                    hash: proposedCheckpointBlockData.blockHash.toString()
+                },
+                checkpoint: proposedCheckpointId
+            },
             finalized: {
                 block: {
                     number: finalizedBlockNumber,
@@ -73,6 +83,16 @@ import { GENESIS_CHECKPOINT_HEADER_HASH } from '@aztec/stdlib/block';
             }
         };
     }
+    async getCheckpointIdForProposedCheckpoint(checkpointedBlockData) {
+        const checkpointData = await this.blockStore.getLastProposedCheckpoint();
+        if (!checkpointData) {
+            return this.getCheckpointIdForBlock(checkpointedBlockData);
+        }
+        return {
+            number: checkpointData.checkpointNumber,
+            hash: checkpointData.header.hash().toString()
+        };
+    }
     async getCheckpointIdForBlock(blockData) {
         const checkpointData = await this.blockStore.getCheckpointData(blockData.checkpointNumber);
         if (!checkpointData) {

package/dest/store/log_store.d.ts

@@ -1,3 +1,4 @@
+import { BlockNumber } from '@aztec/foundation/branded-types';
 import type { AztecAsyncKVStore } from '@aztec/kv-store';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { L2Block } from '@aztec/stdlib/block';
@@ -24,20 +25,22 @@ export declare class LogStore {
      * array implies no logs match that tag.
      * @param tags - The tags to search for.
      * @param page - The page number (0-indexed) for pagination.
+     * @param upToBlockNumber - If set, only return logs from blocks up to and including this block number.
      * @returns An array of log arrays, one per tag. Returns at most MAX_LOGS_PER_TAG logs per tag per page. If
      * MAX_LOGS_PER_TAG logs are returned for a tag, the caller should fetch the next page to check for more logs.
      */
-    getPrivateLogsByTags(tags: SiloedTag[], page?: number): Promise<TxScopedL2Log[][]>;
+    getPrivateLogsByTags(tags: SiloedTag[], page?: number, upToBlockNumber?: BlockNumber): Promise<TxScopedL2Log[][]>;
     /**
      * Gets public logs that match any of the `tags` from the specified contract. For each tag, an array of matching
      * logs is returned. An empty array implies no logs match that tag.
      * @param contractAddress - The contract address to search logs for.
      * @param tags - The tags to search for.
      * @param page - The page number (0-indexed) for pagination.
+     * @param upToBlockNumber - If set, only return logs from blocks up to and including this block number.
      * @returns An array of log arrays, one per tag. Returns at most MAX_LOGS_PER_TAG logs per tag per page. If
      * MAX_LOGS_PER_TAG logs are returned for a tag, the caller should fetch the next page to check for more logs.
      */
-    getPublicLogsByTagsFromContract(contractAddress: AztecAddress, tags: Tag[], page?: number): Promise<TxScopedL2Log[][]>;
+    getPublicLogsByTagsFromContract(contractAddress: AztecAddress, tags: Tag[], page?: number, upToBlockNumber?: BlockNumber): Promise<TxScopedL2Log[][]>;
     /**
      * Gets public logs based on the provided filter.
      * @param filter - The filter to apply to the logs.
@@ -51,4 +54,4 @@ export declare class LogStore {
      */
     getContractClassLogs(filter: LogFilter): Promise<GetContractClassLogsResponse>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nX3N0b3JlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc3RvcmUvbG9nX3N0b3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQU1BLE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFpQixNQUFNLGlCQUFpQixDQUFDO0FBQ3hFLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ2hFLE9BQU8sRUFBYSxPQUFPLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUV6RCxPQUFPLEtBQUssRUFBRSw0QkFBNEIsRUFBRSxxQkFBcUIsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQzNHLE9BQU8sRUFJTCxLQUFLLFNBQVMsRUFHZCxLQUFLLFNBQVMsRUFDZCxHQUFHLEVBQ0gsYUFBYSxFQUNkLE1BQU0sb0JBQW9CLENBQUM7QUFHNUIsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFbkQ7O0dBRUc7QUFDSCxxQkFBYSxRQUFROztJQWFqQixPQUFPLENBQUMsRUFBRTtJQUNWLE9BQU8sQ0FBQyxVQUFVO0lBRnBCLFlBQ1UsRUFBRSxFQUFFLGlCQUFpQixFQUNyQixVQUFVLEVBQUUsVUFBVSxFQUM5QixlQUFlLEdBQUUsTUFBYSxFQVUvQjtJQThNRDs7OztPQUlHO0lBQ0gsT0FBTyxDQUFDLE1BQU0sRUFBRSxPQUFPLEVBQUUsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBUzNDO0lBZ0JELFVBQVUsQ0FBQyxNQUFNLEVBQUUsT0FBTyxFQUFFLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQTJCOUM7SUFFRDs7Ozs7OztPQU9HO0lBQ0csb0JBQW9CLENBQUMsSUFBSSxFQUFFLFNBQVMsRUFBRSxFQUFFLElBQUksR0FBRSxNQUFVLEdBQUcsT0FBTyxDQUFDLGFBQWEsRUFBRSxFQUFFLENBQUMsQ0FRMUY7SUFFRDs7Ozs7Ozs7T0FRRztJQUNHLCtCQUErQixDQUNuQyxlQUFlLEVBQUUsWUFBWSxFQUM3QixJQUFJLEVBQUUsR0FBRyxFQUFFLEVBQ1gsSUFBSSxHQUFFLE1BQVUsR0FDZixPQUFPLENBQUMsYUFBYSxFQUFFLEVBQUUsQ0FBQyxDQWE1QjtJQUVEOzs7O09BSUc7SUFDSCxhQUFhLENBQUMsTUFBTSxFQUFFLFNBQVMsR0FBRyxPQUFPLENBQUMscUJBQXFCLENBQUMsQ0FRL0Q7SUErRkQ7Ozs7T0FJRztJQUNILG9CQUFvQixDQUFDLE1BQU0sRUFBRSxTQUFTLEdBQUcsT0FBTyxDQUFDLDRCQUE0QixDQUFDLENBUTdFO0NBc0pGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nX3N0b3JlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc3RvcmUvbG9nX3N0b3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUk5RCxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBaUIsTUFBTSxpQkFBaUIsQ0FBQztBQUN4RSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNoRSxPQUFPLEVBQWEsT0FBTyxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFFekQsT0FBTyxLQUFLLEVBQUUsNEJBQTRCLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUMzRyxPQUFPLEVBSUwsS0FBSyxTQUFTLEVBR2QsS0FBSyxTQUFTLEVBQ2QsR0FBRyxFQUNILGFBQWEsRUFDZCxNQUFNLG9CQUFvQixDQUFDO0FBSTVCLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRW5EOztHQUVHO0FBQ0gscUJBQWEsUUFBUTs7SUFhakIsT0FBTyxDQUFDLEVBQUU7SUFDVixPQUFPLENBQUMsVUFBVTtJQUZwQixZQUNVLEVBQUUsRUFBRSxpQkFBaUIsRUFDckIsVUFBVSxFQUFFLFVBQVUsRUFDOUIsZUFBZSxHQUFFLE1BQWEsRUFVL0I7SUFvT0Q7Ozs7T0FJRztJQUNILE9BQU8sQ0FBQyxNQUFNLEVBQUUsT0FBTyxFQUFFLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQVMzQztJQWNELFVBQVUsQ0FBQyxNQUFNLEVBQUUsT0FBTyxFQUFFLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQTBEOUM7SUFFRDs7Ozs7Ozs7T0FRRztJQUNHLG9CQUFvQixDQUN4QixJQUFJLEVBQUUsU0FBUyxFQUFFLEVBQ2pCLElBQUksR0FBRSxNQUFVLEVBQ2hCLGVBQWUsQ0FBQyxFQUFFLFdBQVcsR0FDNUIsT0FBTyxDQUFDLGFBQWEsRUFBRSxFQUFFLENBQUMsQ0FnQjVCO0lBRUQ7Ozs7Ozs7OztPQVNHO0lBQ0csK0JBQStCLENBQ25DLGVBQWUsRUFBRSxZQUFZLEVBQzdCLElBQUksRUFBRSxHQUFHLEVBQUUsRUFDWCxJQUFJLEdBQUUsTUFBVSxFQUNoQixlQUFlLENBQUMsRUFBRSxXQUFXLEdBQzVCLE9BQU8sQ0FBQyxhQUFhLEVBQUUsRUFBRSxDQUFDLENBb0I1QjtJQUVEOzs7O09BSUc7SUFDSCxhQUFhLENBQUMsTUFBTSxFQUFFLFNBQVMsR0FBRyxPQUFPLENBQUMscUJBQXFCLENBQUMsQ0FRL0Q7SUErRkQ7Ozs7T0FJRztJQUNILG9CQUFvQixDQUFDLE1BQU0sRUFBRSxTQUFTLEdBQUcsT0FBTyxDQUFDLDRCQUE0QixDQUFDLENBUTdFO0NBNktGIn0=

package/dest/store/log_store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"log_store.d.ts","sourceRoot":"","sources":["../../src/store/log_store.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AACxE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAa,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAEzD,OAAO,KAAK,EAAE,4BAA4B,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAC3G,OAAO,EAIL,KAAK,SAAS,EAGd,KAAK,SAAS,EACd,GAAG,EACH,aAAa,EACd,MAAM,oBAAoB,CAAC;AAG5B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnD;;GAEG;AACH,qBAAa,QAAQ;;IAajB,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,UAAU;IAFpB,YACU,EAAE,EAAE,iBAAiB,EACrB,UAAU,EAAE,UAAU,EAC9B,eAAe,GAAE,MAAa,EAU/B;IA8MD;;;;OAIG;IACH,OAAO,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAS3C;IAgBD,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CA2B9C;IAED;;;;;;;OAOG;IACG,oBAAoB,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,IAAI,GAAE,MAAU,GAAG,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAQ1F;IAED;;;;;;;;OAQG;IACG,+BAA+B,CACnC,eAAe,EAAE,YAAY,EAC7B,IAAI,EAAE,GAAG,EAAE,EACX,IAAI,GAAE,MAAU,GACf,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAa5B;IAED;;;;OAIG;IACH,aAAa,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAQ/D;IA+FD;;;;OAIG;IACH,oBAAoB,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAQ7E;CAsJF"}
+{"version":3,"file":"log_store.d.ts","sourceRoot":"","sources":["../../src/store/log_store.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAI9D,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AACxE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAa,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAEzD,OAAO,KAAK,EAAE,4BAA4B,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAC3G,OAAO,EAIL,KAAK,SAAS,EAGd,KAAK,SAAS,EACd,GAAG,EACH,aAAa,EACd,MAAM,oBAAoB,CAAC;AAI5B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnD;;GAEG;AACH,qBAAa,QAAQ;;IAajB,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,UAAU;IAFpB,YACU,EAAE,EAAE,iBAAiB,EACrB,UAAU,EAAE,UAAU,EAC9B,eAAe,GAAE,MAAa,EAU/B;IAoOD;;;;OAIG;IACH,OAAO,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAS3C;IAcD,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CA0D9C;IAED;;;;;;;;OAQG;IACG,oBAAoB,CACxB,IAAI,EAAE,SAAS,EAAE,EACjB,IAAI,GAAE,MAAU,EAChB,eAAe,CAAC,EAAE,WAAW,GAC5B,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAgB5B;IAED;;;;;;;;;OASG;IACG,+BAA+B,CACnC,eAAe,EAAE,YAAY,EAC7B,IAAI,EAAE,GAAG,EAAE,EACX,IAAI,GAAE,MAAU,EAChB,eAAe,CAAC,EAAE,WAAW,GAC5B,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAoB5B;IAED;;;;OAIG;IACH,aAAa,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAQ/D;IA+FD;;;;OAIG;IACH,oBAAoB,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAQ7E;CA6KF"}

package/dest/store/log_store.js

@@ -1,13 +1,13 @@
 import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
 import { BlockNumber } from '@aztec/foundation/branded-types';
-import { filterAsync } from '@aztec/foundation/collection';
-import { Fr } from '@aztec/foundation/curves/bn254';
+import { compactArray, filterAsync } from '@aztec/foundation/collection';
 import { createLogger } from '@aztec/foundation/log';
 import { BufferReader, numToUInt32BE } from '@aztec/foundation/serialize';
 import { BlockHash } from '@aztec/stdlib/block';
 import { MAX_LOGS_PER_TAG } from '@aztec/stdlib/interfaces/api-limit';
 import { ContractClassLog, ExtendedContractClassLog, ExtendedPublicLog, LogId, PublicLog, TxScopedL2Log } from '@aztec/stdlib/logs';
 import { TxHash } from '@aztec/stdlib/tx';
+import { OutOfOrderLogInsertionError } from '../errors.js';
 /**
  * A store for logs
  */ export class LogStore {
@@ -108,7 +108,16 @@ import { TxHash } from '@aztec/stdlib/tx';
             })));
         for (const taggedLogBuffer of currentPrivateTaggedLogs){
             if (taggedLogBuffer.logBuffers && taggedLogBuffer.logBuffers.length > 0) {
-                privateTaggedLogs.set(taggedLogBuffer.tag, taggedLogBuffer.logBuffers.concat(privateTaggedLogs.get(taggedLogBuffer.tag)));
+                const newLogs = privateTaggedLogs.get(taggedLogBuffer.tag);
+                if (newLogs.length === 0) {
+                    continue;
+                }
+                const lastExisting = TxScopedL2Log.fromBuffer(taggedLogBuffer.logBuffers.at(-1));
+                const firstNew = TxScopedL2Log.fromBuffer(newLogs[0]);
+                if (lastExisting.blockNumber > firstNew.blockNumber) {
+                    throw new OutOfOrderLogInsertionError('private', taggedLogBuffer.tag, lastExisting.blockNumber, firstNew.blockNumber);
+                }
+                privateTaggedLogs.set(taggedLogBuffer.tag, taggedLogBuffer.logBuffers.concat(newLogs));
             }
         }
         for (const block of newBlocks){
@@ -130,7 +139,16 @@ import { TxHash } from '@aztec/stdlib/tx';
             })));
         for (const taggedLogBuffer of currentPublicTaggedLogs){
             if (taggedLogBuffer.logBuffers && taggedLogBuffer.logBuffers.length > 0) {
-                publicTaggedLogs.set(taggedLogBuffer.tag, taggedLogBuffer.logBuffers.concat(publicTaggedLogs.get(taggedLogBuffer.tag)));
+                const newLogs = publicTaggedLogs.get(taggedLogBuffer.tag);
+                if (newLogs.length === 0) {
+                    continue;
+                }
+                const lastExisting = TxScopedL2Log.fromBuffer(taggedLogBuffer.logBuffers.at(-1));
+                const firstNew = TxScopedL2Log.fromBuffer(newLogs[0]);
+                if (lastExisting.blockNumber > firstNew.blockNumber) {
+                    throw new OutOfOrderLogInsertionError('public', taggedLogBuffer.tag, lastExisting.blockNumber, firstNew.blockNumber);
+                }
+                publicTaggedLogs.set(taggedLogBuffer.tag, taggedLogBuffer.logBuffers.concat(newLogs));
             }
         }
         for (const block of newBlocks){
@@ -184,22 +202,41 @@ import { TxHash } from '@aztec/stdlib/tx';
         ]);
     }
     #unpackBlockHash(reader) {
-        const blockHash = reader.remainingBytes() > 0 ? reader.readObject(Fr) : undefined;
-        if (!blockHash) {
+        if (reader.remainingBytes() === 0) {
             throw new Error('Failed to read block hash from log entry buffer');
         }
-        return new BlockHash(blockHash);
+        return BlockHash.fromBuffer(reader);
     }
     deleteLogs(blocks) {
         return this.db.transactionAsync(async ()=>{
-            await Promise.all(blocks.map(async (block)=>{
-                // Delete private logs
-                const privateKeys = await this.#privateLogKeysByBlock.getAsync(block.number) ?? [];
-                await Promise.all(privateKeys.map((tag)=>this.#privateLogsByTag.delete(tag)));
-                // Delete public logs
-                const publicKeys = await this.#publicLogKeysByBlock.getAsync(block.number) ?? [];
-                await Promise.all(publicKeys.map((key)=>this.#publicLogsByContractAndTag.delete(key)));
-            }));
+            const blockNumbers = new Set(blocks.map((block)=>block.number));
+            const firstBlockToDelete = Math.min(...blockNumbers);
+            // Collect all unique private tags across all blocks being deleted
+            const allPrivateTags = new Set(compactArray(await Promise.all(blocks.map((block)=>this.#privateLogKeysByBlock.getAsync(block.number)))).flat());
+            // Trim private logs: for each tag, delete all instances including and after the first block being deleted.
+            // This hinges on the invariant that logs for a given tag are always inserted in order of block number, which is enforced in #addPrivateLogs.
+            for (const tag of allPrivateTags){
+                const existing = await this.#privateLogsByTag.getAsync(tag);
+                if (existing === undefined || existing.length === 0) {
+                    continue;
+                }
+                const lastIndexToKeep = existing.findLastIndex((buf)=>TxScopedL2Log.getBlockNumberFromBuffer(buf) < firstBlockToDelete);
+                const remaining = existing.slice(0, lastIndexToKeep + 1);
+                await (remaining.length > 0 ? this.#privateLogsByTag.set(tag, remaining) : this.#privateLogsByTag.delete(tag));
+            }
+            // Collect all unique public keys across all blocks being deleted
+            const allPublicKeys = new Set(compactArray(await Promise.all(blocks.map((block)=>this.#publicLogKeysByBlock.getAsync(block.number)))).flat());
+            // And do the same as we did with private logs
+            for (const key of allPublicKeys){
+                const existing = await this.#publicLogsByContractAndTag.getAsync(key);
+                if (existing === undefined || existing.length === 0) {
+                    continue;
+                }
+                const lastIndexToKeep = existing.findLastIndex((buf)=>TxScopedL2Log.getBlockNumberFromBuffer(buf) < firstBlockToDelete);
+                const remaining = existing.slice(0, lastIndexToKeep + 1);
+                await (remaining.length > 0 ? this.#publicLogsByContractAndTag.set(key, remaining) : this.#publicLogsByContractAndTag.delete(key));
+            }
+            // After trimming the tagged logs, we can delete the block-level keys that track which tags are in which blocks.
             await Promise.all(blocks.map((block)=>Promise.all([
                     this.#publicLogsByBlock.delete(block.number),
                     this.#privateLogKeysByBlock.delete(block.number),
@@ -214,13 +251,23 @@ import { TxHash } from '@aztec/stdlib/tx';
    * array implies no logs match that tag.
    * @param tags - The tags to search for.
    * @param page - The page number (0-indexed) for pagination.
+   * @param upToBlockNumber - If set, only return logs from blocks up to and including this block number.
    * @returns An array of log arrays, one per tag. Returns at most MAX_LOGS_PER_TAG logs per tag per page. If
    * MAX_LOGS_PER_TAG logs are returned for a tag, the caller should fetch the next page to check for more logs.
-   */ async getPrivateLogsByTags(tags, page = 0) {
+   */ async getPrivateLogsByTags(tags, page = 0, upToBlockNumber) {
         const logs = await Promise.all(tags.map((tag)=>this.#privateLogsByTag.getAsync(tag.toString())));
         const start = page * MAX_LOGS_PER_TAG;
         const end = start + MAX_LOGS_PER_TAG;
-        return logs.map((logBuffers)=>logBuffers?.slice(start, end).map((logBuffer)=>TxScopedL2Log.fromBuffer(logBuffer)) ?? []);
+        return logs.map((logBuffers)=>{
+            const deserialized = logBuffers?.slice(start, end).map((buf)=>TxScopedL2Log.fromBuffer(buf)) ?? [];
+            if (upToBlockNumber !== undefined) {
+                const cutoff = deserialized.findIndex((log)=>log.blockNumber > upToBlockNumber);
+                if (cutoff !== -1) {
+                    return deserialized.slice(0, cutoff);
+                }
+            }
+            return deserialized;
+        });
     }
     /**
    * Gets public logs that match any of the `tags` from the specified contract. For each tag, an array of matching
@@ -228,16 +275,26 @@ import { TxHash } from '@aztec/stdlib/tx';
    * @param contractAddress - The contract address to search logs for.
    * @param tags - The tags to search for.
    * @param page - The page number (0-indexed) for pagination.
+   * @param upToBlockNumber - If set, only return logs from blocks up to and including this block number.
    * @returns An array of log arrays, one per tag. Returns at most MAX_LOGS_PER_TAG logs per tag per page. If
    * MAX_LOGS_PER_TAG logs are returned for a tag, the caller should fetch the next page to check for more logs.
-   */ async getPublicLogsByTagsFromContract(contractAddress, tags, page = 0) {
+   */ async getPublicLogsByTagsFromContract(contractAddress, tags, page = 0, upToBlockNumber) {
         const logs = await Promise.all(tags.map((tag)=>{
             const key = `${contractAddress.toString()}_${tag.value.toString()}`;
             return this.#publicLogsByContractAndTag.getAsync(key);
         }));
         const start = page * MAX_LOGS_PER_TAG;
         const end = start + MAX_LOGS_PER_TAG;
-        return logs.map((logBuffers)=>logBuffers?.slice(start, end).map((logBuffer)=>TxScopedL2Log.fromBuffer(logBuffer)) ?? []);
+        return logs.map((logBuffers)=>{
+            const deserialized = logBuffers?.slice(start, end).map((buf)=>TxScopedL2Log.fromBuffer(buf)) ?? [];
+            if (upToBlockNumber !== undefined) {
+                const cutoff = deserialized.findIndex((log)=>log.blockNumber > upToBlockNumber);
+                if (cutoff !== -1) {
+                    return deserialized.slice(0, cutoff);
+                }
+            }
+            return deserialized;
+        });
     }
     /**
    * Gets public logs based on the provided filter.
@@ -424,11 +481,20 @@ import { TxHash } from '@aztec/stdlib/tx';
         };
     }
     #accumulatePublicLogs(results, blockNumber, blockHash, txIndex, txHash, txLogs, filter = {}) {
+        if (filter.fromBlock && blockNumber < filter.fromBlock) {
+            return false;
+        }
+        if (filter.toBlock && blockNumber >= filter.toBlock) {
+            return false;
+        }
+        if (filter.txHash && !txHash.equals(filter.txHash)) {
+            return false;
+        }
         let maxLogsHit = false;
         let logIndex = typeof filter.afterLog?.logIndex === 'number' ? filter.afterLog.logIndex + 1 : 0;
         for(; logIndex < txLogs.length; logIndex++){
             const log = txLogs[logIndex];
-            if (!filter.contractAddress || log.contractAddress.equals(filter.contractAddress)) {
+            if ((!filter.contractAddress || log.contractAddress.equals(filter.contractAddress)) && (!filter.tag || log.fields[0]?.equals(filter.tag))) {
                 results.push(new ExtendedPublicLog(new LogId(BlockNumber(blockNumber), blockHash, txHash, txIndex, logIndex), log));
                 if (results.length >= this.#logsMaxPageSize) {
                     maxLogsHit = true;
@@ -439,6 +505,15 @@ import { TxHash } from '@aztec/stdlib/tx';
         return maxLogsHit;
     }
     #accumulateContractClassLogs(results, blockNumber, blockHash, txIndex, txHash, txLogs, filter = {}) {
+        if (filter.fromBlock && blockNumber < filter.fromBlock) {
+            return false;
+        }
+        if (filter.toBlock && blockNumber >= filter.toBlock) {
+            return false;
+        }
+        if (filter.txHash && !txHash.equals(filter.txHash)) {
+            return false;
+        }
         let maxLogsHit = false;
         let logIndex = typeof filter.afterLog?.logIndex === 'number' ? filter.afterLog.logIndex + 1 : 0;
         for(; logIndex < txLogs.length; logIndex++){

package/dest/store/message_store.d.ts

@@ -29,6 +29,10 @@ export declare class MessageStore {
      */
     getL1ToL2MessageIndex(l1ToL2Message: Fr): Promise<bigint | undefined>;
     getLastMessage(): Promise<InboxMessage | undefined>;
+    /** Returns the inbox tree-in-progress checkpoint number from L1, or undefined if not yet set. */
+    getInboxTreeInProgress(): Promise<bigint | undefined>;
+    /** Atomically updates the message sync state: the L1 sync point and the inbox tree-in-progress marker. */
+    setMessageSyncState(l1Block: L1BlockId, treeInProgress: bigint | undefined): Promise<void>;
     getL1ToL2Messages(checkpointNumber: CheckpointNumber): Promise<Fr[]>;
     iterateL1ToL2Messages(range?: CustomRange<bigint>): AsyncIterableIterator<InboxMessage>;
     removeL1ToL2Messages(startIndex: bigint): Promise<void>;
@@ -37,4 +41,4 @@ export declare class MessageStore {
     private leafToIndexKey;
     private increaseTotalMessageCount;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVzc2FnZV9zdG9yZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3N0b3JlL21lc3NhZ2Vfc3RvcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDMUQsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFbkUsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBSXBELE9BQU8sRUFDTCxLQUFLLGlCQUFpQixFQUd0QixLQUFLLFdBQVcsRUFFakIsTUFBTSxpQkFBaUIsQ0FBQztBQUd6QixPQUFPLEVBQ0wsS0FBSyxZQUFZLEVBSWxCLE1BQU0sNkJBQTZCLENBQUM7QUFFckMscUJBQWEsaUJBQWtCLFNBQVEsS0FBSzthQUd4QixZQUFZLEVBQUUsWUFBWTtJQUY1QyxZQUNFLE9BQU8sRUFBRSxNQUFNLEVBQ0MsWUFBWSxFQUFFLFlBQVksRUFJM0M7Q0FDRjtBQUVELHFCQUFhLFlBQVk7O0lBWVgsT0FBTyxDQUFDLEVBQUU7SUFBdEIsWUFBb0IsRUFBRSxFQUFFLGlCQUFpQixFQUt4QztJQUVZLDBCQUEwQixJQUFJLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FFekQ7SUFFRCxxQ0FBcUM7SUFDeEIsaUJBQWlCLElBQUksT0FBTyxDQUFDLFNBQVMsR0FBRyxTQUFTLENBQUMsQ0FRL0Q7SUFFRCxvQ0FBb0M7SUFDdkIsaUJBQWlCLENBQUMsT0FBTyxFQUFFLFNBQVMsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBR2hFO0lBRUQ7Ozs7T0FJRztJQUNJLGlCQUFpQixDQUFDLFFBQVEsRUFBRSxZQUFZLEVBQUUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBNkZoRTtJQUVEOzs7O09BSUc7SUFDSSxxQkFBcUIsQ0FBQyxhQUFhLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxNQUFNLEdBQUcsU0FBUyxDQUFDLENBRTNFO0lBRVksY0FBYyxJQUFJLE9BQU8sQ0FBQyxZQUFZLEdBQUcsU0FBUyxDQUFDLENBRy9EO0lBRVksaUJBQWlCLENBQUMsZ0JBQWdCLEVBQUUsZ0JBQWdCLEdBQUcsT0FBTyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBdUJoRjtJQUVhLHFCQUFxQixDQUFDLEtBQUssR0FBRSxXQUFXLENBQUMsTUFBTSxDQUFNLEdBQUcscUJBQXFCLENBQUMsWUFBWSxDQUFDLENBS3hHO0lBRU0sb0JBQW9CLENBQUMsVUFBVSxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBZ0I3RDtJQUVNLGtDQUFrQyxDQUFDLHNCQUFzQixFQUFFLGdCQUFnQixHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FJakc7SUFFRCxPQUFPLENBQUMsVUFBVTtJQUlsQixPQUFPLENBQUMsY0FBYztZQUlSLHlCQUF5QjtDQVN4QyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVzc2FnZV9zdG9yZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3N0b3JlL21lc3NhZ2Vfc3RvcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDMUQsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFbkUsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBSXBELE9BQU8sRUFDTCxLQUFLLGlCQUFpQixFQUd0QixLQUFLLFdBQVcsRUFFakIsTUFBTSxpQkFBaUIsQ0FBQztBQUl6QixPQUFPLEVBQ0wsS0FBSyxZQUFZLEVBSWxCLE1BQU0sNkJBQTZCLENBQUM7QUFFckMscUJBQWEsaUJBQWtCLFNBQVEsS0FBSzthQUd4QixZQUFZLEVBQUUsWUFBWTtJQUY1QyxZQUNFLE9BQU8sRUFBRSxNQUFNLEVBQ0MsWUFBWSxFQUFFLFlBQVksRUFJM0M7Q0FDRjtBQUVELHFCQUFhLFlBQVk7O0lBY1gsT0FBTyxDQUFDLEVBQUU7SUFBdEIsWUFBb0IsRUFBRSxFQUFFLGlCQUFpQixFQU14QztJQUVZLDBCQUEwQixJQUFJLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FFekQ7SUFFRCxxQ0FBcUM7SUFDeEIsaUJBQWlCLElBQUksT0FBTyxDQUFDLFNBQVMsR0FBRyxTQUFTLENBQUMsQ0FRL0Q7SUFFRCxvQ0FBb0M7SUFDdkIsaUJBQWlCLENBQUMsT0FBTyxFQUFFLFNBQVMsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBR2hFO0lBRUQ7Ozs7T0FJRztJQUNJLGlCQUFpQixDQUFDLFFBQVEsRUFBRSxZQUFZLEVBQUUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBb0ZoRTtJQUVEOzs7O09BSUc7SUFDSSxxQkFBcUIsQ0FBQyxhQUFhLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxNQUFNLEdBQUcsU0FBUyxDQUFDLENBRTNFO0lBRVksY0FBYyxJQUFJLE9BQU8sQ0FBQyxZQUFZLEdBQUcsU0FBUyxDQUFDLENBRy9EO0lBRUQsaUdBQWlHO0lBQzFGLHNCQUFzQixJQUFJLE9BQU8sQ0FBQyxNQUFNLEdBQUcsU0FBUyxDQUFDLENBRTNEO0lBRUQsMEdBQTBHO0lBQ25HLG1CQUFtQixDQUFDLE9BQU8sRUFBRSxTQUFTLEVBQUUsY0FBYyxFQUFFLE1BQU0sR0FBRyxTQUFTLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQVNoRztJQUVZLGlCQUFpQixDQUFDLGdCQUFnQixFQUFFLGdCQUFnQixHQUFHLE9BQU8sQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQTRCaEY7SUFFYSxxQkFBcUIsQ0FBQyxLQUFLLEdBQUUsV0FBVyxDQUFDLE1BQU0sQ0FBTSxHQUFHLHFCQUFxQixDQUFDLFlBQVksQ0FBQyxDQUt4RztJQUVNLG9CQUFvQixDQUFDLFVBQVUsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQWdCN0Q7SUFFTSxrQ0FBa0MsQ0FBQyxzQkFBc0IsRUFBRSxnQkFBZ0IsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBSWpHO0lBRUQsT0FBTyxDQUFDLFVBQVU7SUFJbEIsT0FBTyxDQUFDLGNBQWM7WUFJUix5QkFBeUI7Q0FTeEMifQ==

package/dest/store/message_store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"message_store.d.ts","sourceRoot":"","sources":["../../src/store/message_store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAEnE,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAIpD,OAAO,EACL,KAAK,iBAAiB,EAGtB,KAAK,WAAW,EAEjB,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EACL,KAAK,YAAY,EAIlB,MAAM,6BAA6B,CAAC;AAErC,qBAAa,iBAAkB,SAAQ,KAAK;aAGxB,YAAY,EAAE,YAAY;IAF5C,YACE,OAAO,EAAE,MAAM,EACC,YAAY,EAAE,YAAY,EAI3C;CACF;AAED,qBAAa,YAAY;;IAYX,OAAO,CAAC,EAAE;IAAtB,YAAoB,EAAE,EAAE,iBAAiB,EAKxC;IAEY,0BAA0B,IAAI,OAAO,CAAC,MAAM,CAAC,CAEzD;IAED,qCAAqC;IACxB,iBAAiB,IAAI,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAQ/D;IAED,oCAAoC;IACvB,iBAAiB,CAAC,OAAO,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAGhE;IAED;;;;OAIG;IACI,iBAAiB,CAAC,QAAQ,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CA6FhE;IAED;;;;OAIG;IACI,qBAAqB,CAAC,aAAa,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAE3E;IAEY,cAAc,IAAI,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC,CAG/D;IAEY,iBAAiB,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC,CAuBhF;IAEa,qBAAqB,CAAC,KAAK,GAAE,WAAW,CAAC,MAAM,CAAM,GAAG,qBAAqB,CAAC,YAAY,CAAC,CAKxG;IAEM,oBAAoB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAgB7D;IAEM,kCAAkC,CAAC,sBAAsB,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAIjG;IAED,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,cAAc;YAIR,yBAAyB;CASxC"}
+{"version":3,"file":"message_store.d.ts","sourceRoot":"","sources":["../../src/store/message_store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAEnE,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAIpD,OAAO,EACL,KAAK,iBAAiB,EAGtB,KAAK,WAAW,EAEjB,MAAM,iBAAiB,CAAC;AAIzB,OAAO,EACL,KAAK,YAAY,EAIlB,MAAM,6BAA6B,CAAC;AAErC,qBAAa,iBAAkB,SAAQ,KAAK;aAGxB,YAAY,EAAE,YAAY;IAF5C,YACE,OAAO,EAAE,MAAM,EACC,YAAY,EAAE,YAAY,EAI3C;CACF;AAED,qBAAa,YAAY;;IAcX,OAAO,CAAC,EAAE;IAAtB,YAAoB,EAAE,EAAE,iBAAiB,EAMxC;IAEY,0BAA0B,IAAI,OAAO,CAAC,MAAM,CAAC,CAEzD;IAED,qCAAqC;IACxB,iBAAiB,IAAI,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAQ/D;IAED,oCAAoC;IACvB,iBAAiB,CAAC,OAAO,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAGhE;IAED;;;;OAIG;IACI,iBAAiB,CAAC,QAAQ,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAoFhE;IAED;;;;OAIG;IACI,qBAAqB,CAAC,aAAa,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAE3E;IAEY,cAAc,IAAI,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC,CAG/D;IAED,iGAAiG;IAC1F,sBAAsB,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAE3D;IAED,0GAA0G;IACnG,mBAAmB,CAAC,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAShG;IAEY,iBAAiB,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC,CA4BhF;IAEa,qBAAqB,CAAC,KAAK,GAAE,WAAW,CAAC,MAAM,CAAM,GAAG,qBAAqB,CAAC,YAAY,CAAC,CAKxG;IAEM,oBAAoB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAgB7D;IAEM,kCAAkC,CAAC,sBAAsB,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAIjG;IAED,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,cAAc;YAIR,yBAAyB;CASxC"}