@aztec/archiver 0.0.1-commit.1142ef1 → 0.0.1-commit.125b3452

package/dest/{archiver/kv_archiver_store → store}/log_store.js

@@ -1,10 +1,14 @@
 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 { createLogger } from '@aztec/foundation/log';
 import { BufferReader, numToUInt32BE } from '@aztec/foundation/serialize';
-import { L2BlockHash } from '@aztec/stdlib/block';
+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 {
@@ -95,60 +99,100 @@ import { ContractClassLog, ExtendedContractClassLog, ExtendedPublicLog, LogId, P
             publicTaggedLogs
         };
     }
-    /**
-   * Append new logs to the store's list.
-   * @param blocks - The blocks for which to add the logs.
-   * @returns True if the operation is successful.
-   */ addLogs(blocks) {
-        const { privateTaggedLogs, publicTaggedLogs } = this.#extractTaggedLogs(blocks);
+    async #addPrivateLogs(blocks) {
+        const newBlocks = await filterAsync(blocks, async (block)=>!await this.#privateLogKeysByBlock.hasAsync(block.number));
+        const { privateTaggedLogs } = this.#extractTaggedLogs(newBlocks);
         const keysOfPrivateLogsToUpdate = Array.from(privateTaggedLogs.keys());
-        const keysOfPublicLogsToUpdate = Array.from(publicTaggedLogs.keys());
-        return this.db.transactionAsync(async ()=>{
-            const currentPrivateTaggedLogs = await Promise.all(keysOfPrivateLogsToUpdate.map(async (key)=>({
-                    tag: key,
-                    logBuffers: await this.#privateLogsByTag.getAsync(key)
-                })));
-            currentPrivateTaggedLogs.forEach((taggedLogBuffer)=>{
-                if (taggedLogBuffer.logBuffers && taggedLogBuffer.logBuffers.length > 0) {
-                    privateTaggedLogs.set(taggedLogBuffer.tag, taggedLogBuffer.logBuffers.concat(privateTaggedLogs.get(taggedLogBuffer.tag)));
+        const currentPrivateTaggedLogs = await Promise.all(keysOfPrivateLogsToUpdate.map(async (key)=>({
+                tag: key,
+                logBuffers: await this.#privateLogsByTag.getAsync(key)
+            })));
+        for (const taggedLogBuffer of currentPrivateTaggedLogs){
+            if (taggedLogBuffer.logBuffers && taggedLogBuffer.logBuffers.length > 0) {
+                const newLogs = privateTaggedLogs.get(taggedLogBuffer.tag);
+                if (newLogs.length === 0) {
+                    continue;
                 }
-            });
-            const currentPublicTaggedLogs = await Promise.all(keysOfPublicLogsToUpdate.map(async (key)=>({
-                    key,
-                    logBuffers: await this.#publicLogsByContractAndTag.getAsync(key)
-                })));
-            currentPublicTaggedLogs.forEach((taggedLogBuffer)=>{
-                if (taggedLogBuffer.logBuffers && taggedLogBuffer.logBuffers.length > 0) {
-                    publicTaggedLogs.set(taggedLogBuffer.key, taggedLogBuffer.logBuffers.concat(publicTaggedLogs.get(taggedLogBuffer.key)));
+                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);
                 }
-            });
-            for (const block of blocks){
-                const blockHash = await block.hash();
-                const privateTagsInBlock = [];
-                for (const [tag, logs] of privateTaggedLogs.entries()){
-                    await this.#privateLogsByTag.set(tag, logs);
-                    privateTagsInBlock.push(tag);
+                privateTaggedLogs.set(taggedLogBuffer.tag, taggedLogBuffer.logBuffers.concat(newLogs));
+            }
+        }
+        for (const block of newBlocks){
+            const privateTagsInBlock = [];
+            for (const [tag, logs] of privateTaggedLogs.entries()){
+                await this.#privateLogsByTag.set(tag, logs);
+                privateTagsInBlock.push(tag);
+            }
+            await this.#privateLogKeysByBlock.set(block.number, privateTagsInBlock);
+        }
+    }
+    async #addPublicLogs(blocks) {
+        const newBlocks = await filterAsync(blocks, async (block)=>!await this.#publicLogKeysByBlock.hasAsync(block.number));
+        const { publicTaggedLogs } = this.#extractTaggedLogs(newBlocks);
+        const keysOfPublicLogsToUpdate = Array.from(publicTaggedLogs.keys());
+        const currentPublicTaggedLogs = await Promise.all(keysOfPublicLogsToUpdate.map(async (key)=>({
+                tag: key,
+                logBuffers: await this.#publicLogsByContractAndTag.getAsync(key)
+            })));
+        for (const taggedLogBuffer of currentPublicTaggedLogs){
+            if (taggedLogBuffer.logBuffers && taggedLogBuffer.logBuffers.length > 0) {
+                const newLogs = publicTaggedLogs.get(taggedLogBuffer.tag);
+                if (newLogs.length === 0) {
+                    continue;
                 }
-                await this.#privateLogKeysByBlock.set(block.number, privateTagsInBlock);
-                const publicKeysInBlock = [];
-                for (const [key, logs] of publicTaggedLogs.entries()){
-                    await this.#publicLogsByContractAndTag.set(key, logs);
-                    publicKeysInBlock.push(key);
+                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);
                 }
-                await this.#publicLogKeysByBlock.set(block.number, publicKeysInBlock);
-                const publicLogsInBlock = block.body.txEffects.map((txEffect, txIndex)=>[
-                        numToUInt32BE(txIndex),
-                        numToUInt32BE(txEffect.publicLogs.length),
-                        txEffect.publicLogs.map((log)=>log.toBuffer())
-                    ].flat()).flat();
-                const contractClassLogsInBlock = block.body.txEffects.map((txEffect, txIndex)=>[
-                        numToUInt32BE(txIndex),
-                        numToUInt32BE(txEffect.contractClassLogs.length),
-                        txEffect.contractClassLogs.map((log)=>log.toBuffer())
-                    ].flat()).flat();
-                await this.#publicLogsByBlock.set(block.number, this.#packWithBlockHash(blockHash, publicLogsInBlock));
-                await this.#contractClassLogsByBlock.set(block.number, this.#packWithBlockHash(blockHash, contractClassLogsInBlock));
+                publicTaggedLogs.set(taggedLogBuffer.tag, taggedLogBuffer.logBuffers.concat(newLogs));
+            }
+        }
+        for (const block of newBlocks){
+            const blockHash = await block.hash();
+            const publicTagsInBlock = [];
+            for (const [tag, logs] of publicTaggedLogs.entries()){
+                await this.#publicLogsByContractAndTag.set(tag, logs);
+                publicTagsInBlock.push(tag);
             }
+            await this.#publicLogKeysByBlock.set(block.number, publicTagsInBlock);
+            const publicLogsInBlock = block.body.txEffects.map((txEffect, txIndex)=>[
+                    numToUInt32BE(txIndex),
+                    txEffect.txHash.toBuffer(),
+                    numToUInt32BE(txEffect.publicLogs.length),
+                    txEffect.publicLogs.map((log)=>log.toBuffer())
+                ].flat()).flat();
+            await this.#publicLogsByBlock.set(block.number, this.#packWithBlockHash(blockHash, publicLogsInBlock));
+        }
+    }
+    async #addContractClassLogs(blocks) {
+        const newBlocks = await filterAsync(blocks, async (block)=>!await this.#contractClassLogsByBlock.hasAsync(block.number));
+        for (const block of newBlocks){
+            const blockHash = await block.hash();
+            const contractClassLogsInBlock = block.body.txEffects.map((txEffect, txIndex)=>[
+                    numToUInt32BE(txIndex),
+                    txEffect.txHash.toBuffer(),
+                    numToUInt32BE(txEffect.contractClassLogs.length),
+                    txEffect.contractClassLogs.map((log)=>log.toBuffer())
+                ].flat()).flat();
+            await this.#contractClassLogsByBlock.set(block.number, this.#packWithBlockHash(blockHash, contractClassLogsInBlock));
+        }
+    }
+    /**
+   * Append new logs to the store's list.
+   * @param blocks - The blocks for which to add the logs.
+   * @returns True if the operation is successful.
+   */ addLogs(blocks) {
+        return this.db.transactionAsync(async ()=>{
+            await Promise.all([
+                this.#addPrivateLogs(blocks),
+                this.#addPublicLogs(blocks),
+                this.#addContractClassLogs(blocks)
+            ]);
             return true;
         });
     }
@@ -163,7 +207,7 @@ import { ContractClassLog, ExtendedContractClassLog, ExtendedPublicLog, LogId, P
         if (!blockHash) {
             throw new Error('Failed to read block hash from log entry buffer');
         }
-        return L2BlockHash.fromField(blockHash);
+        return new BlockHash(blockHash);
     }
     deleteLogs(blocks) {
         return this.db.transactionAsync(async ()=>{
@@ -185,21 +229,54 @@ import { ContractClassLog, ExtendedContractClassLog, ExtendedPublicLog, LogId, P
         });
     }
     /**
-   * Gets all private logs that match any of the `tags`. For each tag, an array of matching logs is returned. An empty
+   * Gets private logs that match any of the `tags`. For each tag, an array of matching logs is returned. An empty
    * array implies no logs match that tag.
-   */ async getPrivateLogsByTags(tags) {
+   * @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, upToBlockNumber) {
         const logs = await Promise.all(tags.map((tag)=>this.#privateLogsByTag.getAsync(tag.toString())));
-        return logs.map((logBuffers)=>logBuffers?.map((logBuffer)=>TxScopedL2Log.fromBuffer(logBuffer)) ?? []);
+        const start = page * MAX_LOGS_PER_TAG;
+        const end = start + MAX_LOGS_PER_TAG;
+        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 all public logs that match any of the `tags` from the specified contract. For each tag, an array of matching
+   * 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.
-   */ async getPublicLogsByTagsFromContract(contractAddress, tags) {
+   * @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, upToBlockNumber) {
         const logs = await Promise.all(tags.map((tag)=>{
             const key = `${contractAddress.toString()}_${tag.value.toString()}`;
             return this.#publicLogsByContractAndTag.getAsync(key);
         }));
-        return logs.map((logBuffers)=>logBuffers?.map((logBuffer)=>TxScopedL2Log.fromBuffer(logBuffer)) ?? []);
+        const start = page * MAX_LOGS_PER_TAG;
+        const end = start + MAX_LOGS_PER_TAG;
+        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.
@@ -226,22 +303,24 @@ import { ContractClassLog, ExtendedContractClassLog, ExtendedPublicLog, LogId, P
             };
         }
         const buffer = await this.#publicLogsByBlock.getAsync(blockNumber) ?? Buffer.alloc(0);
-        const publicLogsInBlock = [
-            []
-        ];
+        const publicLogsInBlock = [];
         const reader = new BufferReader(buffer);
         const blockHash = this.#unpackBlockHash(reader);
         while(reader.remainingBytes() > 0){
             const indexOfTx = reader.readNumber();
+            const txHash = reader.readObject(TxHash);
             const numLogsInTx = reader.readNumber();
-            publicLogsInBlock[indexOfTx] = [];
+            publicLogsInBlock[indexOfTx] = {
+                txHash,
+                logs: []
+            };
             for(let i = 0; i < numLogsInTx; i++){
-                publicLogsInBlock[indexOfTx].push(reader.readObject(PublicLog));
+                publicLogsInBlock[indexOfTx].logs.push(reader.readObject(PublicLog));
             }
         }
-        const txLogs = publicLogsInBlock[txIndex];
+        const txData = publicLogsInBlock[txIndex];
         const logs = [];
-        const maxLogsHit = this.#accumulateLogs(logs, blockNumber, blockHash, txIndex, txLogs, filter);
+        const maxLogsHit = this.#accumulatePublicLogs(logs, blockNumber, blockHash, txIndex, txData.txHash, txData.logs, filter);
         return {
             logs,
             maxLogsHit
@@ -262,22 +341,24 @@ import { ContractClassLog, ExtendedContractClassLog, ExtendedPublicLog, LogId, P
             start,
             end
         })){
-            const publicLogsInBlock = [
-                []
-            ];
+            const publicLogsInBlock = [];
             const reader = new BufferReader(logBuffer);
             const blockHash = this.#unpackBlockHash(reader);
             while(reader.remainingBytes() > 0){
                 const indexOfTx = reader.readNumber();
+                const txHash = reader.readObject(TxHash);
                 const numLogsInTx = reader.readNumber();
-                publicLogsInBlock[indexOfTx] = [];
+                publicLogsInBlock[indexOfTx] = {
+                    txHash,
+                    logs: []
+                };
                 for(let i = 0; i < numLogsInTx; i++){
-                    publicLogsInBlock[indexOfTx].push(reader.readObject(PublicLog));
+                    publicLogsInBlock[indexOfTx].logs.push(reader.readObject(PublicLog));
                 }
             }
             for(let txIndex = filter.afterLog?.txIndex ?? 0; txIndex < publicLogsInBlock.length; txIndex++){
-                const txLogs = publicLogsInBlock[txIndex];
-                maxLogsHit = this.#accumulateLogs(logs, blockNumber, blockHash, txIndex, txLogs, filter);
+                const txData = publicLogsInBlock[txIndex];
+                maxLogsHit = this.#accumulatePublicLogs(logs, blockNumber, blockHash, txIndex, txData.txHash, txData.logs, filter);
                 if (maxLogsHit) {
                     this.#log.debug(`Max logs hit at block ${blockNumber}`);
                     break loopOverBlocks;
@@ -314,22 +395,24 @@ import { ContractClassLog, ExtendedContractClassLog, ExtendedPublicLog, LogId, P
             };
         }
         const contractClassLogsBuffer = await this.#contractClassLogsByBlock.getAsync(blockNumber) ?? Buffer.alloc(0);
-        const contractClassLogsInBlock = [
-            []
-        ];
+        const contractClassLogsInBlock = [];
         const reader = new BufferReader(contractClassLogsBuffer);
         const blockHash = this.#unpackBlockHash(reader);
         while(reader.remainingBytes() > 0){
             const indexOfTx = reader.readNumber();
+            const txHash = reader.readObject(TxHash);
             const numLogsInTx = reader.readNumber();
-            contractClassLogsInBlock[indexOfTx] = [];
+            contractClassLogsInBlock[indexOfTx] = {
+                txHash,
+                logs: []
+            };
             for(let i = 0; i < numLogsInTx; i++){
-                contractClassLogsInBlock[indexOfTx].push(reader.readObject(ContractClassLog));
+                contractClassLogsInBlock[indexOfTx].logs.push(reader.readObject(ContractClassLog));
             }
         }
-        const txLogs = contractClassLogsInBlock[txIndex];
+        const txData = contractClassLogsInBlock[txIndex];
         const logs = [];
-        const maxLogsHit = this.#accumulateLogs(logs, blockNumber, blockHash, txIndex, txLogs, filter);
+        const maxLogsHit = this.#accumulateContractClassLogs(logs, blockNumber, blockHash, txIndex, txData.txHash, txData.logs, filter);
         return {
             logs,
             maxLogsHit
@@ -350,22 +433,24 @@ import { ContractClassLog, ExtendedContractClassLog, ExtendedPublicLog, LogId, P
             start,
             end
         })){
-            const contractClassLogsInBlock = [
-                []
-            ];
+            const contractClassLogsInBlock = [];
             const reader = new BufferReader(logBuffer);
             const blockHash = this.#unpackBlockHash(reader);
             while(reader.remainingBytes() > 0){
                 const indexOfTx = reader.readNumber();
+                const txHash = reader.readObject(TxHash);
                 const numLogsInTx = reader.readNumber();
-                contractClassLogsInBlock[indexOfTx] = [];
+                contractClassLogsInBlock[indexOfTx] = {
+                    txHash,
+                    logs: []
+                };
                 for(let i = 0; i < numLogsInTx; i++){
-                    contractClassLogsInBlock[indexOfTx].push(reader.readObject(ContractClassLog));
+                    contractClassLogsInBlock[indexOfTx].logs.push(reader.readObject(ContractClassLog));
                 }
             }
             for(let txIndex = filter.afterLog?.txIndex ?? 0; txIndex < contractClassLogsInBlock.length; txIndex++){
-                const txLogs = contractClassLogsInBlock[txIndex];
-                maxLogsHit = this.#accumulateLogs(logs, blockNumber, blockHash, txIndex, txLogs, filter);
+                const txData = contractClassLogsInBlock[txIndex];
+                maxLogsHit = this.#accumulateContractClassLogs(logs, blockNumber, blockHash, txIndex, txData.txHash, txData.logs, filter);
                 if (maxLogsHit) {
                     this.#log.debug(`Max logs hit at block ${blockNumber}`);
                     break loopOverBlocks;
@@ -377,19 +462,46 @@ import { ContractClassLog, ExtendedContractClassLog, ExtendedPublicLog, LogId, P
             maxLogsHit
         };
     }
-    #accumulateLogs(results, blockNumber, blockHash, txIndex, txLogs, filter = {}) {
+    #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 (log instanceof ContractClassLog) {
-                    results.push(new ExtendedContractClassLog(new LogId(BlockNumber(blockNumber), blockHash, txIndex, logIndex), log));
-                } else if (log instanceof PublicLog) {
-                    results.push(new ExtendedPublicLog(new LogId(BlockNumber(blockNumber), blockHash, txIndex, logIndex), log));
-                } else {
-                    throw new Error('Unknown log type');
+            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;
+                    break;
                 }
+            }
+        }
+        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++){
+            const log = txLogs[logIndex];
+            if (!filter.contractAddress || log.contractAddress.equals(filter.contractAddress)) {
+                results.push(new ExtendedContractClassLog(new LogId(BlockNumber(blockNumber), blockHash, txHash, txIndex, logIndex), log));
                 if (results.length >= this.#logsMaxPageSize) {
                     maxLogsHit = true;
                     break;

package/dest/store/message_store.d.ts

@@ -0,0 +1,44 @@
+import type { L1BlockId } from '@aztec/ethereum/l1-types';
+import { CheckpointNumber } from '@aztec/foundation/branded-types';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { type AztecAsyncKVStore, type CustomRange } from '@aztec/kv-store';
+import { type InboxMessage } from '../structs/inbox_message.js';
+export declare class MessageStoreError extends Error {
+    readonly inboxMessage: InboxMessage;
+    constructor(message: string, inboxMessage: InboxMessage);
+}
+export declare class MessageStore {
+    #private;
+    private db;
+    constructor(db: AztecAsyncKVStore);
+    getTotalL1ToL2MessageCount(): Promise<bigint>;
+    /** Gets the last L1 block synced. */
+    getSynchedL1Block(): Promise<L1BlockId | undefined>;
+    /** Sets the last L1 block synced */
+    setSynchedL1Block(l1Block: L1BlockId): Promise<void>;
+    /**
+     * Append L1 to L2 messages to the store.
+     * Requires new messages to be in order and strictly after the last message added.
+     * Throws if out of order messages are added or if the rolling hash is invalid.
+     */
+    addL1ToL2Messages(messages: InboxMessage[]): Promise<void>;
+    /**
+     * Gets the L1 to L2 message index in the L1 to L2 message tree.
+     * @param l1ToL2Message - The L1 to L2 message.
+     * @returns The index of the L1 to L2 message in the L1 to L2 message tree (undefined if not found).
+     */
+    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>;
+    /** Persists the inbox tree-in-progress checkpoint number from L1 state. */
+    setInboxTreeInProgress(value: bigint): Promise<void>;
+    getL1ToL2Messages(checkpointNumber: CheckpointNumber): Promise<Fr[]>;
+    iterateL1ToL2Messages(range?: CustomRange<bigint>): AsyncIterableIterator<InboxMessage>;
+    removeL1ToL2Messages(startIndex: bigint): Promise<void>;
+    rollbackL1ToL2MessagesToCheckpoint(targetCheckpointNumber: CheckpointNumber): Promise<void>;
+    private indexToKey;
+    private leafToIndexKey;
+    private increaseTotalMessageCount;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVzc2FnZV9zdG9yZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3N0b3JlL21lc3NhZ2Vfc3RvcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDMUQsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFbkUsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBSXBELE9BQU8sRUFDTCxLQUFLLGlCQUFpQixFQUd0QixLQUFLLFdBQVcsRUFFakIsTUFBTSxpQkFBaUIsQ0FBQztBQUl6QixPQUFPLEVBQ0wsS0FBSyxZQUFZLEVBSWxCLE1BQU0sNkJBQTZCLENBQUM7QUFFckMscUJBQWEsaUJBQWtCLFNBQVEsS0FBSzthQUd4QixZQUFZLEVBQUUsWUFBWTtJQUY1QyxZQUNFLE9BQU8sRUFBRSxNQUFNLEVBQ0MsWUFBWSxFQUFFLFlBQVksRUFJM0M7Q0FDRjtBQUVELHFCQUFhLFlBQVk7O0lBY1gsT0FBTyxDQUFDLEVBQUU7SUFBdEIsWUFBb0IsRUFBRSxFQUFFLGlCQUFpQixFQU14QztJQUVZLDBCQUEwQixJQUFJLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FFekQ7SUFFRCxxQ0FBcUM7SUFDeEIsaUJBQWlCLElBQUksT0FBTyxDQUFDLFNBQVMsR0FBRyxTQUFTLENBQUMsQ0FRL0Q7SUFFRCxvQ0FBb0M7SUFDdkIsaUJBQWlCLENBQUMsT0FBTyxFQUFFLFNBQVMsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBR2hFO0lBRUQ7Ozs7T0FJRztJQUNJLGlCQUFpQixDQUFDLFFBQVEsRUFBRSxZQUFZLEVBQUUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBNkZoRTtJQUVEOzs7O09BSUc7SUFDSSxxQkFBcUIsQ0FBQyxhQUFhLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxNQUFNLEdBQUcsU0FBUyxDQUFDLENBRTNFO0lBRVksY0FBYyxJQUFJLE9BQU8sQ0FBQyxZQUFZLEdBQUcsU0FBUyxDQUFDLENBRy9EO0lBRUQsaUdBQWlHO0lBQzFGLHNCQUFzQixJQUFJLE9BQU8sQ0FBQyxNQUFNLEdBQUcsU0FBUyxDQUFDLENBRTNEO0lBRUQsMkVBQTJFO0lBQzlELHNCQUFzQixDQUFDLEtBQUssRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUVoRTtJQUVZLGlCQUFpQixDQUFDLGdCQUFnQixFQUFFLGdCQUFnQixHQUFHLE9BQU8sQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQTRCaEY7SUFFYSxxQkFBcUIsQ0FBQyxLQUFLLEdBQUUsV0FBVyxDQUFDLE1BQU0sQ0FBTSxHQUFHLHFCQUFxQixDQUFDLFlBQVksQ0FBQyxDQUt4RztJQUVNLG9CQUFvQixDQUFDLFVBQVUsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQWdCN0Q7SUFFTSxrQ0FBa0MsQ0FBQyxzQkFBc0IsRUFBRSxnQkFBZ0IsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBSWpHO0lBRUQsT0FBTyxDQUFDLFVBQVU7SUFJbEIsT0FBTyxDQUFDLGNBQWM7WUFJUix5QkFBeUI7Q0FTeEMifQ==

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

@@ -0,0 +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;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,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;IAED,iGAAiG;IAC1F,sBAAsB,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAE3D;IAED,2EAA2E;IAC9D,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAEhE;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"}

package/dest/{archiver/kv_archiver_store → store}/message_store.js

@@ -5,6 +5,7 @@ import { createLogger } from '@aztec/foundation/log';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { mapRange } from '@aztec/kv-store';
 import { InboxLeaf } from '@aztec/stdlib/messaging';
+import { L1ToL2MessagesNotReadyError } from '../errors.js';
 import { deserializeInboxMessage, serializeInboxMessage, updateRollingHash } from '../structs/inbox_message.js';
 export class MessageStoreError extends Error {
     inboxMessage;
@@ -19,6 +20,7 @@ export class MessageStore {
     /** Maps from hex-stringified message leaf to its index */ #l1ToL2MessageIndices;
     /** Stores L1 block number and hash of the L1 synchpoint */ #lastSynchedL1Block;
     /** Stores total messages stored */ #totalMessageCount;
+    /** Stores the checkpoint number whose message tree is currently being filled on L1. */ #inboxTreeInProgress;
     #log;
     constructor(db){
         this.db = db;
@@ -27,6 +29,7 @@ export class MessageStore {
         this.#l1ToL2MessageIndices = db.openMap('archiver_l1_to_l2_message_indices');
         this.#lastSynchedL1Block = db.openSingleton('archiver_last_l1_block_id');
         this.#totalMessageCount = db.openSingleton('archiver_l1_to_l2_message_count');
+        this.#inboxTreeInProgress = db.openSingleton('archiver_inbox_tree_in_progress');
     }
     async getTotalL1ToL2MessageCount() {
         return await this.#totalMessageCount.getAsync() ?? 0n;
@@ -87,7 +90,7 @@ export class MessageStore {
                 if (lastMessage && message.checkpointNumber === lastMessage.checkpointNumber && message.index !== lastMessage.index + 1n) {
                     throw new MessageStoreError(`Missing prior message for incoming L1 to L2 message ${message.leaf.toString()} ` + `with index ${message.index}`, message);
                 }
-                // Check the first message in a block has the correct index.
+                // Check the first message in a checkpoint has the correct index.
                 if ((!lastMessage || message.checkpointNumber > lastMessage.checkpointNumber) && message.index !== expectedStart) {
                     throw new MessageStoreError(`Message ${message.leaf.toString()} for checkpoint ${message.checkpointNumber} has wrong index ` + `${message.index} (expected ${expectedStart})`, message);
                 }
@@ -124,7 +127,17 @@ export class MessageStore {
         }));
         return msg ? deserializeInboxMessage(msg) : undefined;
     }
+    /** Returns the inbox tree-in-progress checkpoint number from L1, or undefined if not yet set. */ getInboxTreeInProgress() {
+        return this.#inboxTreeInProgress.getAsync();
+    }
+    /** Persists the inbox tree-in-progress checkpoint number from L1 state. */ async setInboxTreeInProgress(value) {
+        await this.#inboxTreeInProgress.set(value);
+    }
     async getL1ToL2Messages(checkpointNumber) {
+        const treeInProgress = await this.#inboxTreeInProgress.getAsync();
+        if (treeInProgress !== undefined && BigInt(checkpointNumber) >= treeInProgress) {
+            throw new L1ToL2MessagesNotReadyError(checkpointNumber, treeInProgress);
+        }
         const messages = [];
         const [startIndex, endIndex] = InboxLeaf.indexRangeForCheckpoint(checkpointNumber);
         let lastIndex = startIndex - 1n;

package/dest/{archiver/structs → structs}/data_retrieval.d.ts

@@ -24,4 +24,4 @@ export type SingletonDataRetrieval<T> = {
      */
     retrievedData: T;
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGF0YV9yZXRyaWV2YWwuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9hcmNoaXZlci9zdHJ1Y3RzL2RhdGFfcmV0cmlldmFsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxNQUFNLGFBQWEsQ0FBQyxDQUFDLElBQUk7SUFDN0I7O09BRUc7SUFDSCwwQkFBMEIsRUFBRSxNQUFNLENBQUM7SUFDbkM7O09BRUc7SUFDSCxhQUFhLEVBQUUsQ0FBQyxFQUFFLENBQUM7Q0FDcEIsQ0FBQztBQUVGOztHQUVHO0FBQ0gsTUFBTSxNQUFNLHNCQUFzQixDQUFDLENBQUMsSUFBSTtJQUN0Qzs7T0FFRztJQUNILDBCQUEwQixFQUFFLE1BQU0sQ0FBQztJQUNuQzs7T0FFRztJQUNILGFBQWEsRUFBRSxDQUFDLENBQUM7Q0FDbEIsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGF0YV9yZXRyaWV2YWwuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zdHJ1Y3RzL2RhdGFfcmV0cmlldmFsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxNQUFNLGFBQWEsQ0FBQyxDQUFDLElBQUk7SUFDN0I7O09BRUc7SUFDSCwwQkFBMEIsRUFBRSxNQUFNLENBQUM7SUFDbkM7O09BRUc7SUFDSCxhQUFhLEVBQUUsQ0FBQyxFQUFFLENBQUM7Q0FDcEIsQ0FBQztBQUVGOztHQUVHO0FBQ0gsTUFBTSxNQUFNLHNCQUFzQixDQUFDLENBQUMsSUFBSTtJQUN0Qzs7T0FFRztJQUNILDBCQUEwQixFQUFFLE1BQU0sQ0FBQztJQUNuQzs7T0FFRztJQUNILGFBQWEsRUFBRSxDQUFDLENBQUM7Q0FDbEIsQ0FBQyJ9

package/dest/structs/data_retrieval.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"data_retrieval.d.ts","sourceRoot":"","sources":["../../src/structs/data_retrieval.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,MAAM,aAAa,CAAC,CAAC,IAAI;IAC7B;;OAEG;IACH,0BAA0B,EAAE,MAAM,CAAC;IACnC;;OAEG;IACH,aAAa,EAAE,CAAC,EAAE,CAAC;CACpB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,sBAAsB,CAAC,CAAC,IAAI;IACtC;;OAEG;IACH,0BAA0B,EAAE,MAAM,CAAC;IACnC;;OAEG;IACH,aAAa,EAAE,CAAC,CAAC;CAClB,CAAC"}

package/dest/structs/inbox_message.d.ts

@@ -0,0 +1,15 @@
+import { CheckpointNumber } from '@aztec/foundation/branded-types';
+import { Buffer16, Buffer32 } from '@aztec/foundation/buffer';
+import { Fr } from '@aztec/foundation/curves/bn254';
+export type InboxMessage = {
+    index: bigint;
+    leaf: Fr;
+    checkpointNumber: CheckpointNumber;
+    l1BlockNumber: bigint;
+    l1BlockHash: Buffer32;
+    rollingHash: Buffer16;
+};
+export declare function updateRollingHash(currentRollingHash: Buffer16, leaf: Fr): Buffer16;
+export declare function serializeInboxMessage(message: InboxMessage): Buffer;
+export declare function deserializeInboxMessage(buffer: Buffer): InboxMessage;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5ib3hfbWVzc2FnZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3N0cnVjdHMvaW5ib3hfbWVzc2FnZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNuRSxPQUFPLEVBQUUsUUFBUSxFQUFFLFFBQVEsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBRTlELE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUdwRCxNQUFNLE1BQU0sWUFBWSxHQUFHO0lBQ3pCLEtBQUssRUFBRSxNQUFNLENBQUM7SUFDZCxJQUFJLEVBQUUsRUFBRSxDQUFDO0lBQ1QsZ0JBQWdCLEVBQUUsZ0JBQWdCLENBQUM7SUFDbkMsYUFBYSxFQUFFLE1BQU0sQ0FBQztJQUN0QixXQUFXLEVBQUUsUUFBUSxDQUFDO0lBQ3RCLFdBQVcsRUFBRSxRQUFRLENBQUM7Q0FDdkIsQ0FBQztBQUVGLHdCQUFnQixpQkFBaUIsQ0FBQyxrQkFBa0IsRUFBRSxRQUFRLEVBQUUsSUFBSSxFQUFFLEVBQUUsR0FBRyxRQUFRLENBR2xGO0FBRUQsd0JBQWdCLHFCQUFxQixDQUFDLE9BQU8sRUFBRSxZQUFZLEdBQUcsTUFBTSxDQVNuRTtBQUVELHdCQUFnQix1QkFBdUIsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVksQ0FTcEUifQ==

package/dest/structs/inbox_message.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"inbox_message.d.ts","sourceRoot":"","sources":["../../src/structs/inbox_message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAE9D,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAGpD,MAAM,MAAM,YAAY,GAAG;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,EAAE,CAAC;IACT,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,QAAQ,CAAC;IACtB,WAAW,EAAE,QAAQ,CAAC;CACvB,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,kBAAkB,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,GAAG,QAAQ,CAGlF;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,YAAY,GAAG,MAAM,CASnE;AAED,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,CASpE"}

package/dest/{archiver/structs → structs}/published.d.ts

@@ -1,2 +1,2 @@
 export type { L1PublishedData, PublishedCheckpoint } from '@aztec/stdlib/checkpoint';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHVibGlzaGVkLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvYXJjaGl2ZXIvc3RydWN0cy9wdWJsaXNoZWQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsWUFBWSxFQUFFLGVBQWUsRUFBRSxtQkFBbUIsRUFBRSxNQUFNLDBCQUEwQixDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHVibGlzaGVkLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc3RydWN0cy9wdWJsaXNoZWQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsWUFBWSxFQUFFLGVBQWUsRUFBRSxtQkFBbUIsRUFBRSxNQUFNLDBCQUEwQixDQUFDIn0=

package/dest/structs/published.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"published.d.ts","sourceRoot":"","sources":["../../src/structs/published.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC"}