@aztec/archiver 0.86.0 → 0.87.0

package/dest/archiver/kv_archiver_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 = 1;
+export const ARCHIVER_DB_VERSION = 2;
 /**
  * LMDB implementation of the ArchiverDataStore interface.
  */ export class KVArchiverDataStore {
@@ -30,6 +30,15 @@ export const ARCHIVER_DB_VERSION = 1;
         this.#contractClassStore = new ContractClassStore(db);
         this.#contractInstanceStore = new ContractInstanceStore(db);
     }
+    transactionAsync(callback) {
+        return this.db.transactionAsync(callback);
+    }
+    getBlockNumber() {
+        return this.getSynchedL2BlockNumber();
+    }
+    async getContract(address, blockNumber) {
+        return this.getContractInstance(address, blockNumber ?? await this.getBlockNumber());
+    }
     async backupTo(path, compress = true) {
         await this.db.backupTo(path, compress);
         return join(path, 'data.mdb');
@@ -62,6 +71,9 @@ export const ARCHIVER_DB_VERSION = 1;
     getContractInstance(address, blockNumber) {
         return this.#contractInstanceStore.getContractInstance(address, blockNumber);
     }
+    getContractInstanceDeploymentBlockNumber(address) {
+        return this.#contractInstanceStore.getContractInstanceDeploymentBlockNumber(address);
+    }
     async addContractClasses(data, bytecodeCommitments, blockNumber) {
         return (await Promise.all(data.map((c, i)=>this.#contractClassStore.addContractClass(c, bytecodeCommitments[i], blockNumber)))).every(Boolean);
     }
@@ -74,8 +86,8 @@ export const ARCHIVER_DB_VERSION = 1;
     addFunctions(contractClassId, privateFunctions, utilityFunctions) {
         return this.#contractClassStore.addFunctions(contractClassId, privateFunctions, utilityFunctions);
     }
-    async addContractInstances(data, _blockNumber) {
-        return (await Promise.all(data.map((c)=>this.#contractInstanceStore.addContractInstance(c)))).every(Boolean);
+    async addContractInstances(data, blockNumber) {
+        return (await Promise.all(data.map((c)=>this.#contractInstanceStore.addContractInstance(c, blockNumber)))).every(Boolean);
     }
     async deleteContractInstances(data, _blockNumber) {
         return (await Promise.all(data.map((c)=>this.#contractInstanceStore.deleteContractInstance(c)))).every(Boolean);
@@ -90,8 +102,8 @@ export const ARCHIVER_DB_VERSION = 1;
    * Append new blocks to the store's list.
    * @param blocks - The L2 blocks to be added to the store and the last processed L1 block.
    * @returns True if the operation is successful.
-   */ addBlocks(blocks) {
-        return this.#blockStore.addBlocks(blocks);
+   */ addBlocks(blocks, opts = {}) {
+        return this.#blockStore.addBlocks(blocks, opts);
     }
     /**
    * Unwinds blocks from the database
@@ -102,13 +114,16 @@ export const ARCHIVER_DB_VERSION = 1;
    */ unwindBlocks(from, blocksToUnwind) {
         return this.#blockStore.unwindBlocks(from, blocksToUnwind);
     }
+    getPublishedBlock(number) {
+        return this.#blockStore.getBlock(number);
+    }
     /**
    * Gets up to `limit` amount of L2 blocks starting from `from`.
    *
    * @param start - Number of the first block to return (inclusive).
    * @param limit - The number of blocks to return.
    * @returns The requested L2 blocks
-   */ getBlocks(start, limit) {
+   */ getPublishedBlocks(start, limit) {
         return toArray(this.#blockStore.getBlocks(start, limit));
     }
     /**
@@ -147,10 +162,12 @@ export const ARCHIVER_DB_VERSION = 1;
     getTotalL1ToL2MessageCount() {
         return this.#messageStore.getTotalL1ToL2MessageCount();
     }
+    getLastL1ToL2Message() {
+        return this.#messageStore.getLastMessage();
+    }
     /**
    * Append L1 to L2 messages to the store.
-   * @param messages - The L1 to L2 messages to be added to the store and the last processed L1 block.
-   * @returns True if the operation is successful.
+   * @param messages - The L1 to L2 messages to be added to the store.
    */ addL1ToL2Messages(messages) {
         return this.#messageStore.addL1ToL2Messages(messages);
     }
@@ -225,15 +242,15 @@ export const ARCHIVER_DB_VERSION = 1;
     async setBlockSynchedL1BlockNumber(l1BlockNumber) {
         await this.#blockStore.setSynchedL1BlockNumber(l1BlockNumber);
     }
-    async setMessageSynchedL1BlockNumber(l1BlockNumber) {
-        await this.#messageStore.setSynchedL1BlockNumber(l1BlockNumber);
+    async setMessageSynchedL1Block(l1Block) {
+        await this.#messageStore.setSynchedL1Block(l1Block);
     }
     /**
    * Gets the last L1 block number processed by the archiver
    */ async getSynchPoint() {
         const [blocksSynchedTo, messagesSynchedTo] = await Promise.all([
             this.#blockStore.getSynchedL1BlockNumber(),
-            this.#messageStore.getSynchedL1BlockNumber()
+            this.#messageStore.getSynchedL1Block()
         ]);
         return {
             blocksSynchedTo,
@@ -243,4 +260,13 @@ export const ARCHIVER_DB_VERSION = 1;
     estimateSize() {
         return this.db.estimateSize();
     }
+    rollbackL1ToL2MessagesToL2Block(targetBlockNumber) {
+        return this.#messageStore.rollbackL1ToL2MessagesToL2Block(BigInt(targetBlockNumber));
+    }
+    iterateL1ToL2Messages(range = {}) {
+        return this.#messageStore.iterateL1ToL2Messages(range);
+    }
+    removeL1ToL2Messages(startIndex) {
+        return this.#messageStore.removeL1ToL2Messages(startIndex);
+    }
 }

package/dest/archiver/kv_archiver_store/log_store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"log_store.d.ts","sourceRoot":"","sources":["../../../src/archiver/kv_archiver_store/log_store.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAGnD,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AACxE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EAAE,4BAA4B,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAC3G,OAAO,EAIL,KAAK,SAAS,EAEd,UAAU,EAEV,aAAa,EACd,MAAM,oBAAoB,CAAC;AAE5B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnD;;GAEG;AACH,qBAAa,QAAQ;;IASP,OAAO,CAAC,EAAE;IAAqB,OAAO,CAAC,UAAU;gBAAzC,EAAE,EAAE,iBAAiB,EAAU,UAAU,EAAE,UAAU,EAAE,eAAe,GAAE,MAAa;IAwCzG;;;;OAIG;IACH,OAAO,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAkE5C,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IA2B/C;;;;;OAKG;IACG,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IAWzE;;;;;OAKG;IACG,aAAa,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC;IAK3D;;;;OAIG;IACH,aAAa,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,qBAAqB,CAAC;IA+EhE;;;;OAIG;IACH,oBAAoB,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,4BAA4B,CAAC;CA6G/E"}
+{"version":3,"file":"log_store.d.ts","sourceRoot":"","sources":["../../../src/archiver/kv_archiver_store/log_store.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAGnD,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AACxE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EAAE,4BAA4B,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAC3G,OAAO,EAIL,KAAK,SAAS,EAEd,UAAU,EAEV,aAAa,EACd,MAAM,oBAAoB,CAAC;AAE5B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnD;;GAEG;AACH,qBAAa,QAAQ;;IAUjB,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,UAAU;gBADV,EAAE,EAAE,iBAAiB,EACrB,UAAU,EAAE,UAAU,EAC9B,eAAe,GAAE,MAAa;IAyChC;;;;OAIG;IACH,OAAO,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAkE5C,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IA2B/C;;;;;OAKG;IACG,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IAWzE;;;;;OAKG;IACG,aAAa,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC;IAK3D;;;;OAIG;IACH,aAAa,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,qBAAqB,CAAC;IA+EhE;;;;OAIG;IACH,oBAAoB,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,4BAA4B,CAAC;CA6G/E"}

package/dest/archiver/kv_archiver_store/log_store.js

@@ -39,7 +39,7 @@ import { ContractClassLog, ExtendedContractClassLog, ExtendedPublicLog, LogId, P
                 taggedLogs.set(tag.toString(), currentLogs);
             });
             txEffect.publicLogs.forEach((log, logIndex)=>{
-                const tag = log.log[0];
+                const tag = log.fields[0];
                 this.#log.debug(`Found public log with tag ${tag.toString()} in block ${block.number}`);
                 const currentLogs = taggedLogs.get(tag.toString()) ?? [];
                 currentLogs.push(new TxScopedL2Log(txHash, dataStartIndexForTx, logIndex, block.number, log).toBuffer());

package/dest/archiver/kv_archiver_store/message_store.d.ts

@@ -1,33 +1,39 @@
+import type { L1BlockId } from '@aztec/ethereum';
 import { Fr } from '@aztec/foundation/fields';
-import type { AztecAsyncKVStore } from '@aztec/kv-store';
-import { InboxLeaf } from '@aztec/stdlib/messaging';
-import type { DataRetrieval } from '../structs/data_retrieval.js';
-/**
- * LMDB implementation of the ArchiverDataStore interface.
- */
+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 number that emitted new messages.
-     * @returns The last L1 block number processed
-     */
-    getSynchedL1BlockNumber(): Promise<bigint | undefined>;
-    setSynchedL1BlockNumber(l1BlockNumber: bigint): Promise<void>;
+    /** 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.
-     * @param messages - The L1 to L2 messages to be added to the store and the last processed L1 block.
-     * @returns True if the operation is successful.
+     * 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: DataRetrieval<InboxLeaf>): Promise<boolean>;
+    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>;
     getL1ToL2Messages(blockNumber: bigint): Promise<Fr[]>;
+    iterateL1ToL2Messages(range?: CustomRange<bigint>): AsyncIterableIterator<InboxMessage>;
+    removeL1ToL2Messages(startIndex: bigint): Promise<void>;
+    rollbackL1ToL2MessagesToL2Block(targetBlockNumber: bigint): Promise<void>;
+    private indexToKey;
+    private leafToIndexKey;
+    private increaseTotalMessageCount;
 }
 //# sourceMappingURL=message_store.d.ts.map

package/dest/archiver/kv_archiver_store/message_store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"message_store.d.ts","sourceRoot":"","sources":["../../../src/archiver/kv_archiver_store/message_store.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,KAAK,EAAE,iBAAiB,EAAsC,MAAM,iBAAiB,CAAC;AAC7F,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAElE;;GAEG;AACH,qBAAa,YAAY;;IAUX,OAAO,CAAC,EAAE;gBAAF,EAAE,EAAE,iBAAiB;IAOnC,0BAA0B,IAAI,OAAO,CAAC,MAAM,CAAC;IAInD;;;OAGG;IACH,uBAAuB,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAIhD,uBAAuB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAInE;;;;OAIG;IACH,iBAAiB,CAAC,QAAQ,EAAE,aAAa,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC;IAsBvE;;;;OAIG;IACH,qBAAqB,CAAC,aAAa,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAI/D,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC;CAqB5D"}
+{"version":3,"file":"message_store.d.ts","sourceRoot":"","sources":["../../../src/archiver/kv_archiver_store/message_store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAI9C,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;gBAD1C,OAAO,EAAE,MAAM,EACC,YAAY,EAAE,YAAY;CAK7C;AAED,qBAAa,YAAY;;IAYX,OAAO,CAAC,EAAE;gBAAF,EAAE,EAAE,iBAAiB;IAO5B,0BAA0B,IAAI,OAAO,CAAC,MAAM,CAAC;IAI1D,qCAAqC;IACxB,iBAAiB,IAAI,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;IAUhE,oCAAoC;IACvB,iBAAiB,CAAC,OAAO,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAKjE;;;;OAIG;IACI,iBAAiB,CAAC,QAAQ,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IA+FjE;;;;OAIG;IACI,qBAAqB,CAAC,aAAa,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAI/D,cAAc,IAAI,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;IAKnD,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC;IAuBpD,qBAAqB,CAAC,KAAK,GAAE,WAAW,CAAC,MAAM,CAAM,GAAG,qBAAqB,CAAC,YAAY,CAAC;IAOlG,oBAAoB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBvD,+BAA+B,CAAC,iBAAiB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAMhF,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,cAAc;YAIR,yBAAyB;CASxC"}

package/dest/archiver/kv_archiver_store/message_store.js

@@ -1,57 +1,112 @@
-import { L1_TO_L2_MSG_SUBTREE_HEIGHT } from '@aztec/constants';
-import { Fr } from '@aztec/foundation/fields';
+import { Buffer16, Buffer32 } from '@aztec/foundation/buffer';
+import { toArray } from '@aztec/foundation/iterable';
 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';
-/**
- * LMDB implementation of the ArchiverDataStore interface.
- */ export class MessageStore {
+import { deserializeInboxMessage, serializeInboxMessage, updateRollingHash } from '../structs/inbox_message.js';
+export class MessageStoreError extends Error {
+    inboxMessage;
+    constructor(message, inboxMessage){
+        super(message), this.inboxMessage = inboxMessage;
+        this.name = 'MessageStoreError';
+    }
+}
+export class MessageStore {
     db;
-    #l1ToL2Messages;
-    #l1ToL2MessageIndices;
-    #lastSynchedL1Block;
-    #totalMessageCount;
+    /** Maps from message index to serialized InboxMessage */ #l1ToL2Messages;
+    /** 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;
     #log;
-    #l1ToL2MessagesSubtreeSize;
     constructor(db){
         this.db = db;
         this.#log = createLogger('archiver:message_store');
-        this.#l1ToL2MessagesSubtreeSize = 2 ** L1_TO_L2_MSG_SUBTREE_HEIGHT;
         this.#l1ToL2Messages = db.openMap('archiver_l1_to_l2_messages');
         this.#l1ToL2MessageIndices = db.openMap('archiver_l1_to_l2_message_indices');
-        this.#lastSynchedL1Block = db.openSingleton('archiver_last_l1_block_new_messages');
+        this.#lastSynchedL1Block = db.openSingleton('archiver_last_l1_block_id');
         this.#totalMessageCount = db.openSingleton('archiver_l1_to_l2_message_count');
     }
     async getTotalL1ToL2MessageCount() {
         return await this.#totalMessageCount.getAsync() ?? 0n;
     }
-    /**
-   * Gets the last L1 block number that emitted new messages.
-   * @returns The last L1 block number processed
-   */ getSynchedL1BlockNumber() {
-        return this.#lastSynchedL1Block.getAsync();
+    /** Gets the last L1 block synced. */ async getSynchedL1Block() {
+        const buffer = await this.#lastSynchedL1Block.getAsync();
+        if (!buffer) {
+            return undefined;
+        }
+        const reader = BufferReader.asReader(buffer);
+        return {
+            l1BlockNumber: reader.readUInt256(),
+            l1BlockHash: Buffer32.fromBuffer(reader.readBytes(Buffer32.SIZE))
+        };
     }
-    async setSynchedL1BlockNumber(l1BlockNumber) {
-        await this.#lastSynchedL1Block.set(l1BlockNumber);
+    /** Sets the last L1 block synced */ async setSynchedL1Block(l1Block) {
+        const buffer = serializeToBuffer([
+            l1Block.l1BlockNumber,
+            l1Block.l1BlockHash
+        ]);
+        await this.#lastSynchedL1Block.set(buffer);
     }
     /**
    * Append L1 to L2 messages to the store.
-   * @param messages - The L1 to L2 messages to be added to the store and the last processed L1 block.
-   * @returns True if the operation is successful.
+   * 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) {
+        if (messages.length === 0) {
+            return Promise.resolve();
+        }
         return this.db.transactionAsync(async ()=>{
-            const lastL1BlockNumber = await this.#lastSynchedL1Block.getAsync() ?? 0n;
-            if (lastL1BlockNumber >= messages.lastProcessedL1BlockNumber) {
-                return false;
+            let lastMessage = await this.getLastMessage();
+            let messageCount = 0;
+            for (const message of messages){
+                // Check messages are inserted in increasing order, but allow reinserting messages.
+                if (lastMessage && message.index <= lastMessage.index) {
+                    const existing = await this.#l1ToL2Messages.getAsync(this.indexToKey(message.index));
+                    if (existing && deserializeInboxMessage(existing).rollingHash.equals(message.rollingHash)) {
+                        // We reinsert instead of skipping in case the message was re-orged and got added in a different L1 block.
+                        this.#log.trace(`Reinserting message with index ${message.index} in the store`);
+                        await this.#l1ToL2Messages.set(this.indexToKey(message.index), serializeInboxMessage(message));
+                        continue;
+                    }
+                    throw new MessageStoreError(`Cannot insert L1 to L2 message with index ${message.index} before last message with index ${lastMessage.index}`, message);
+                }
+                // Check rolling hash is valid.
+                const previousRollingHash = lastMessage?.rollingHash ?? Buffer16.ZERO;
+                const expectedRollingHash = updateRollingHash(previousRollingHash, message.leaf);
+                if (!expectedRollingHash.equals(message.rollingHash)) {
+                    throw new MessageStoreError(`Invalid rolling hash for incoming L1 to L2 message ${message.leaf.toString()} ` + `with index ${message.index} ` + `(expected ${expectedRollingHash.toString()} from previous hash ${previousRollingHash} but got ${message.rollingHash.toString()})`, message);
+                }
+                // Check index corresponds to the L2 block number.
+                const [expectedStart, expectedEnd] = InboxLeaf.indexRangeFromL2Block(message.l2BlockNumber);
+                if (message.index < expectedStart || message.index >= expectedEnd) {
+                    throw new MessageStoreError(`Invalid index ${message.index} for incoming L1 to L2 message ${message.leaf.toString()} ` + `at block ${message.l2BlockNumber} (expected value in range [${expectedStart}, ${expectedEnd}))`, message);
+                }
+                // Check there are no gaps in the indices within the same block.
+                if (lastMessage && message.l2BlockNumber === lastMessage.l2BlockNumber && 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.
+                if ((!lastMessage || message.l2BlockNumber > lastMessage.l2BlockNumber) && message.index !== InboxLeaf.smallestIndexFromL2Block(message.l2BlockNumber)) {
+                    throw new MessageStoreError(`Message ${message.leaf.toString()} for L2 block ${message.l2BlockNumber} has wrong index ` + `${message.index} (expected ${InboxLeaf.smallestIndexFromL2Block(message.l2BlockNumber)})`, message);
+                }
+                // Perform the insertions.
+                await this.#l1ToL2Messages.set(this.indexToKey(message.index), serializeInboxMessage(message));
+                await this.#l1ToL2MessageIndices.set(this.leafToIndexKey(message.leaf), message.index);
+                messageCount++;
+                this.#log.trace(`Inserted L1 to L2 message ${message.leaf} with index ${message.index} into the store`);
+                lastMessage = message;
             }
-            await this.#lastSynchedL1Block.set(messages.lastProcessedL1BlockNumber);
-            for (const message of messages.retrievedData){
-                const key = `${message.index}`;
-                await this.#l1ToL2Messages.set(key, message.leaf.toBuffer());
-                await this.#l1ToL2MessageIndices.set(message.leaf.toString(), message.index);
+            // Update the L1 sync point to that of the last message added.
+            const currentSyncPoint = await this.getSynchedL1Block();
+            if (!currentSyncPoint || currentSyncPoint.l1BlockNumber < lastMessage.l1BlockNumber) {
+                await this.setSynchedL1Block({
+                    l1BlockNumber: lastMessage.l1BlockNumber,
+                    l1BlockHash: lastMessage.l1BlockHash
+                });
             }
-            const lastTotalMessageCount = await this.getTotalL1ToL2MessageCount();
-            await this.#totalMessageCount.set(lastTotalMessageCount + BigInt(messages.retrievedData.length));
-            return true;
+            // Update total message count with the number of inserted messages.
+            await this.increaseTotalMessageCount(messageCount);
         });
     }
     /**
@@ -59,27 +114,74 @@ import { InboxLeaf } from '@aztec/stdlib/messaging';
    * @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) {
-        return this.#l1ToL2MessageIndices.getAsync(l1ToL2Message.toString());
+        return this.#l1ToL2MessageIndices.getAsync(this.leafToIndexKey(l1ToL2Message));
+    }
+    async getLastMessage() {
+        const [msg] = await toArray(this.#l1ToL2Messages.valuesAsync({
+            reverse: true,
+            limit: 1
+        }));
+        return msg ? deserializeInboxMessage(msg) : undefined;
     }
     async getL1ToL2Messages(blockNumber) {
         const messages = [];
-        let undefinedMessageFound = false;
-        const startIndex = Number(InboxLeaf.smallestIndexFromL2Block(blockNumber));
-        for(let i = startIndex; i < startIndex + this.#l1ToL2MessagesSubtreeSize; i++){
-            // This is inefficient but probably fine for now.
-            const key = `${i}`;
-            const message = await this.#l1ToL2Messages.getAsync(key);
-            if (message) {
-                if (undefinedMessageFound) {
-                    throw new Error(`L1 to L2 message gap found in block ${blockNumber}`);
-                }
-                messages.push(Fr.fromBuffer(message));
-            } else {
-                undefinedMessageFound = true;
-            // We continue iterating over messages here to verify that there are no more messages after the undefined one.
-            // --> If this was the case this would imply there is some issue with log fetching.
+        const [startIndex, endIndex] = InboxLeaf.indexRangeFromL2Block(blockNumber);
+        let lastIndex = startIndex - 1n;
+        for await (const msgBuffer of this.#l1ToL2Messages.valuesAsync({
+            start: this.indexToKey(startIndex),
+            end: this.indexToKey(endIndex)
+        })){
+            const msg = deserializeInboxMessage(msgBuffer);
+            if (msg.l2BlockNumber !== blockNumber) {
+                throw new Error(`L1 to L2 message with index ${msg.index} has invalid block number ${msg.l2BlockNumber}`);
+            } else if (msg.index !== lastIndex + 1n) {
+                throw new Error(`Expected L1 to L2 message with index ${lastIndex + 1n} but got ${msg.index}`);
             }
+            lastIndex = msg.index;
+            messages.push(msg.leaf);
         }
         return messages;
     }
+    async *iterateL1ToL2Messages(range = {}) {
+        const entriesRange = mapRange(range, this.indexToKey);
+        for await (const msgBuffer of this.#l1ToL2Messages.valuesAsync(entriesRange)){
+            yield deserializeInboxMessage(msgBuffer);
+        }
+    }
+    removeL1ToL2Messages(startIndex) {
+        this.#log.debug(`Deleting L1 to L2 messages from index ${startIndex}`);
+        let deleteCount = 0;
+        return this.db.transactionAsync(async ()=>{
+            for await (const [key, msgBuffer] of this.#l1ToL2Messages.entriesAsync({
+                start: this.indexToKey(startIndex)
+            })){
+                this.#log.trace(`Deleting L1 to L2 message with index ${key - 1} from the store`);
+                await this.#l1ToL2Messages.delete(key);
+                await this.#l1ToL2MessageIndices.delete(this.leafToIndexKey(deserializeInboxMessage(msgBuffer).leaf));
+                deleteCount++;
+            }
+            await this.increaseTotalMessageCount(-deleteCount);
+            this.#log.warn(`Deleted ${deleteCount} L1 to L2 messages from index ${startIndex} from the store`);
+        });
+    }
+    rollbackL1ToL2MessagesToL2Block(targetBlockNumber) {
+        this.#log.debug(`Deleting L1 to L2 messages up to target L2 block ${targetBlockNumber}`);
+        const startIndex = InboxLeaf.smallestIndexFromL2Block(targetBlockNumber + 1n);
+        return this.removeL1ToL2Messages(startIndex);
+    }
+    indexToKey(index) {
+        return Number(index);
+    }
+    leafToIndexKey(leaf) {
+        return leaf.toString();
+    }
+    async increaseTotalMessageCount(count) {
+        if (count === 0) {
+            return;
+        }
+        return await this.db.transactionAsync(async ()=>{
+            const lastTotalMessageCount = await this.getTotalL1ToL2MessageCount();
+            await this.#totalMessageCount.set(lastTotalMessageCount + BigInt(count));
+        });
+    }
 }

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

@@ -0,0 +1,14 @@
+import { Buffer16, Buffer32 } from '@aztec/foundation/buffer';
+import { Fr } from '@aztec/foundation/fields';
+export type InboxMessage = {
+    index: bigint;
+    leaf: Fr;
+    l2BlockNumber: bigint;
+    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=inbox_message.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"inbox_message.d.ts","sourceRoot":"","sources":["../../../src/archiver/structs/inbox_message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAE9D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAG9C,MAAM,MAAM,YAAY,GAAG;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,EAAE,CAAC;IACT,aAAa,EAAE,MAAM,CAAC;IACtB,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/inbox_message.js

@@ -0,0 +1,38 @@
+import { Buffer16, Buffer32 } from '@aztec/foundation/buffer';
+import { keccak256 } from '@aztec/foundation/crypto';
+import { Fr } from '@aztec/foundation/fields';
+import { BufferReader, bigintToUInt64BE, numToUInt32BE, serializeToBuffer } from '@aztec/foundation/serialize';
+export function updateRollingHash(currentRollingHash, leaf) {
+    const input = Buffer.concat([
+        currentRollingHash.toBuffer(),
+        leaf.toBuffer()
+    ]);
+    return Buffer16.fromBuffer(keccak256(input));
+}
+export function serializeInboxMessage(message) {
+    return serializeToBuffer([
+        bigintToUInt64BE(message.index),
+        message.leaf,
+        message.l1BlockHash,
+        numToUInt32BE(Number(message.l1BlockNumber)),
+        numToUInt32BE(Number(message.l2BlockNumber)),
+        message.rollingHash
+    ]);
+}
+export function deserializeInboxMessage(buffer) {
+    const reader = BufferReader.asReader(buffer);
+    const index = reader.readUInt64();
+    const leaf = reader.readObject(Fr);
+    const l1BlockHash = reader.readObject(Buffer32);
+    const l1BlockNumber = BigInt(reader.readNumber());
+    const l2BlockNumber = BigInt(reader.readNumber());
+    const rollingHash = reader.readObject(Buffer16);
+    return {
+        index,
+        leaf,
+        l1BlockHash,
+        l1BlockNumber,
+        l2BlockNumber,
+        rollingHash
+    };
+}

package/dest/rpc/index.d.ts

@@ -1,6 +1,6 @@
 import { type ArchiverApi } from '@aztec/stdlib/interfaces/server';
 import { type ComponentsVersions } from '@aztec/stdlib/versioning';
-export declare function createArchiverClient(url: string, versions: Partial<ComponentsVersions>, fetch?: (host: string, rpcMethod: string, body: any, useApiEndpoints: boolean, extraHeaders?: Record<string, string> | undefined, noRetry?: boolean | undefined) => Promise<{
+export declare function createArchiverClient(url: string, versions: Partial<ComponentsVersions>, fetch?: (host: string, body: unknown, extraHeaders?: Record<string, string>, noRetry?: boolean) => Promise<{
     response: any;
     headers: {
         get: (header: string) => string | null | undefined;

package/dest/test/mock_l2_block_source.d.ts

@@ -12,11 +12,13 @@ import { type BlockHeader, TxHash, TxReceipt } from '@aztec/stdlib/tx';
 export declare class MockL2BlockSource implements L2BlockSource, ContractDataSource {
     protected l2Blocks: L2Block[];
     private provenBlockNumber;
+    private finalizedBlockNumber;
     private log;
     createBlocks(numBlocks: number): Promise<void>;
     addBlocks(blocks: L2Block[]): void;
     removeBlocks(numBlocks: number): void;
     setProvenBlockNumber(provenBlockNumber: number): void;
+    setFinalizedBlockNumber(finalizedBlockNumber: number): void;
     /**
      * Method to fetch the rollup contract address at the base-layer.
      * @returns The rollup address.

package/dest/test/mock_l2_block_source.d.ts.map

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

package/dest/test/mock_l2_block_source.js

@@ -10,6 +10,7 @@ import { TxReceipt, TxStatus } from '@aztec/stdlib/tx';
  */ export class MockL2BlockSource {
     l2Blocks = [];
     provenBlockNumber = 0;
+    finalizedBlockNumber = 0;
     log = createLogger('archiver:mock_l2_block_source');
     async createBlocks(numBlocks) {
         for(let i = 0; i < numBlocks; i++){
@@ -30,6 +31,12 @@ import { TxReceipt, TxStatus } from '@aztec/stdlib/tx';
     setProvenBlockNumber(provenBlockNumber) {
         this.provenBlockNumber = provenBlockNumber;
     }
+    setFinalizedBlockNumber(finalizedBlockNumber) {
+        if (finalizedBlockNumber > this.provenBlockNumber) {
+            this.provenBlockNumber = finalizedBlockNumber;
+        }
+        this.finalizedBlockNumber = finalizedBlockNumber;
+    }
     /**
    * Method to fetch the rollup contract address at the base-layer.
    * @returns The rollup address.
@@ -133,7 +140,7 @@ import { TxReceipt, TxStatus } from '@aztec/stdlib/tx';
         const [latest, proven, finalized] = [
             await this.getBlockNumber(),
             await this.getProvenBlockNumber(),
-            await this.getProvenBlockNumber()
+            this.finalizedBlockNumber
         ];
         const latestBlock = this.l2Blocks[latest - 1];
         const provenBlock = this.l2Blocks[proven - 1];

package/dest/test/mock_structs.d.ts

@@ -0,0 +1,9 @@
+import { Buffer16 } from '@aztec/foundation/buffer';
+import { type InboxMessage } from '../archiver/structs/inbox_message.js';
+export declare function makeInboxMessage(previousRollingHash?: Buffer16, overrides?: Partial<InboxMessage>): InboxMessage;
+export declare function makeInboxMessages(count: number, opts?: {
+    initialHash?: Buffer16;
+    initialL2BlockNumber?: bigint;
+    overrideFn?: (msg: InboxMessage, index: number) => InboxMessage;
+}): InboxMessage[];
+//# sourceMappingURL=mock_structs.d.ts.map

package/dest/test/mock_structs.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mock_structs.d.ts","sourceRoot":"","sources":["../../src/test/mock_structs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAY,MAAM,0BAA0B,CAAC;AAK9D,OAAO,EAAE,KAAK,YAAY,EAAqB,MAAM,sCAAsC,CAAC;AAE5F,wBAAgB,gBAAgB,CAC9B,mBAAmB,WAAgB,EACnC,SAAS,GAAE,OAAO,CAAC,YAAY,CAAM,GACpC,YAAY,CAgBd;AAED,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,MAAM,EACb,IAAI,GAAE;IACJ,WAAW,CAAC,EAAE,QAAQ,CAAC;IACvB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,UAAU,CAAC,EAAE,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,KAAK,YAAY,CAAC;CAC5D,GACL,YAAY,EAAE,CAahB"}

package/dest/test/mock_structs.js

@@ -0,0 +1,37 @@
+import { Buffer16, Buffer32 } from '@aztec/foundation/buffer';
+import { randomBigInt } from '@aztec/foundation/crypto';
+import { Fr } from '@aztec/foundation/fields';
+import { InboxLeaf } from '@aztec/stdlib/messaging';
+import { updateRollingHash } from '../archiver/structs/inbox_message.js';
+export function makeInboxMessage(previousRollingHash = Buffer16.ZERO, overrides = {}) {
+    const { l2BlockNumber = randomBigInt(100n) + 1n } = overrides;
+    const { l1BlockNumber = l2BlockNumber } = overrides;
+    const { l1BlockHash = Buffer32.random() } = overrides;
+    const { leaf = Fr.random() } = overrides;
+    const { rollingHash = updateRollingHash(previousRollingHash, leaf) } = overrides;
+    const { index = InboxLeaf.smallestIndexFromL2Block(l2BlockNumber) } = overrides;
+    return {
+        index,
+        leaf,
+        l2BlockNumber,
+        l1BlockNumber,
+        l1BlockHash,
+        rollingHash
+    };
+}
+export function makeInboxMessages(count, opts = {}) {
+    const { initialHash = Buffer16.ZERO, overrideFn = (msg)=>msg, initialL2BlockNumber = 1n } = opts;
+    const messages = [];
+    let rollingHash = initialHash;
+    for(let i = 0; i < count; i++){
+        const leaf = Fr.random();
+        const l2BlockNumber = BigInt(i) + initialL2BlockNumber;
+        const message = overrideFn(makeInboxMessage(rollingHash, {
+            leaf,
+            l2BlockNumber
+        }), i);
+        rollingHash = message.rollingHash;
+        messages.push(message);
+    }
+    return messages;
+}