@aztec/archiver 0.0.0-test.1 → 0.0.1-commit.5476d83

package/dest/archiver/kv_archiver_store/kv_archiver_store.js

@@ -1,20 +1,23 @@
 import { toArray } from '@aztec/foundation/iterable';
 import { createLogger } from '@aztec/foundation/log';
 import { FunctionSelector } from '@aztec/stdlib/abi';
+import { L2BlockHash } from '@aztec/stdlib/block';
+import { join } from 'path';
 import { BlockStore } from './block_store.js';
 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';
-import { NullifierStore } from './nullifier_store.js';
+export const ARCHIVER_DB_VERSION = 3;
+export const MAX_FUNCTION_SIGNATURES = 1000;
+export const MAX_FUNCTION_NAME_LEN = 256;
 /**
  * LMDB implementation of the ArchiverDataStore interface.
  */ export class KVArchiverDataStore {
     db;
-    static SCHEMA_VERSION = 1;
+    static SCHEMA_VERSION = ARCHIVER_DB_VERSION;
     #blockStore;
     #logStore;
-    #nullifierStore;
     #messageStore;
     #contractClassStore;
     #contractInstanceStore;
@@ -29,19 +32,36 @@ import { NullifierStore } from './nullifier_store.js';
         this.#messageStore = new MessageStore(db);
         this.#contractClassStore = new ContractClassStore(db);
         this.#contractInstanceStore = new ContractInstanceStore(db);
-        this.#nullifierStore = new NullifierStore(db);
     }
-    // TODO:  These function names are in memory only as they are for development/debugging. They require the full contract
-    //        artifact supplied to the node out of band. This should be reviewed and potentially removed as part of
-    //        the node api cleanup process.
-    getContractFunctionName(_address, selector) {
+    transactionAsync(callback) {
+        return this.db.transactionAsync(callback);
+    }
+    getBlockNumber() {
+        return this.getSynchedL2BlockNumber();
+    }
+    async getContract(address, maybeTimestamp) {
+        const [header] = await this.getBlockHeaders(await this.getBlockNumber(), 1);
+        const timestamp = maybeTimestamp ?? header.globalVariables.timestamp;
+        return this.getContractInstance(address, timestamp);
+    }
+    async backupTo(path, compress = true) {
+        await this.db.backupTo(path, compress);
+        return join(path, 'data.mdb');
+    }
+    close() {
+        return this.db.close();
+    }
+    getDebugFunctionName(_address, selector) {
         return Promise.resolve(this.functionNames.get(selector.toString()));
     }
-    async registerContractFunctionSignatures(_address, signatures) {
+    async registerContractFunctionSignatures(signatures) {
         for (const sig of signatures){
+            if (this.functionNames.size > MAX_FUNCTION_SIGNATURES) {
+                return;
+            }
             try {
                 const selector = await FunctionSelector.fromSignature(sig);
-                this.functionNames.set(selector.toString(), sig.slice(0, sig.indexOf('(')));
+                this.functionNames.set(selector.toString(), sig.slice(0, sig.indexOf('(')).slice(0, MAX_FUNCTION_NAME_LEN));
             } catch  {
                 this.#log.warn(`Failed to parse signature: ${sig}. Ignoring`);
             }
@@ -53,9 +73,11 @@ import { NullifierStore } from './nullifier_store.js';
     getContractClassIds() {
         return this.#contractClassStore.getContractClassIds();
     }
-    async getContractInstance(address) {
-        const contract = this.#contractInstanceStore.getContractInstance(address, await this.getSynchedL2BlockNumber());
-        return contract;
+    getContractInstance(address, timestamp) {
+        return this.#contractInstanceStore.getContractInstance(address, timestamp);
+    }
+    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);
@@ -66,27 +88,27 @@ import { NullifierStore } from './nullifier_store.js';
     getBytecodeCommitment(contractClassId) {
         return this.#contractClassStore.getBytecodeCommitment(contractClassId);
     }
-    addFunctions(contractClassId, privateFunctions, unconstrainedFunctions) {
-        return this.#contractClassStore.addFunctions(contractClassId, privateFunctions, unconstrainedFunctions);
+    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);
     }
-    async addContractInstanceUpdates(data, blockNumber) {
-        return (await Promise.all(data.map((update, logIndex)=>this.#contractInstanceStore.addContractInstanceUpdate(update, blockNumber, logIndex)))).every(Boolean);
+    async addContractInstanceUpdates(data, timestamp) {
+        return (await Promise.all(data.map((update, logIndex)=>this.#contractInstanceStore.addContractInstanceUpdate(update, timestamp, logIndex)))).every(Boolean);
     }
-    async deleteContractInstanceUpdates(data, blockNumber) {
-        return (await Promise.all(data.map((update, logIndex)=>this.#contractInstanceStore.deleteContractInstanceUpdate(update, blockNumber, logIndex)))).every(Boolean);
+    async deleteContractInstanceUpdates(data, timestamp) {
+        return (await Promise.all(data.map((update, logIndex)=>this.#contractInstanceStore.deleteContractInstanceUpdate(update, timestamp, logIndex)))).every(Boolean);
     }
     /**
    * 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
@@ -97,13 +119,22 @@ import { NullifierStore } from './nullifier_store.js';
    */ unwindBlocks(from, blocksToUnwind) {
         return this.#blockStore.unwindBlocks(from, blocksToUnwind);
     }
+    getPublishedBlock(number) {
+        return this.#blockStore.getBlock(number);
+    }
+    getPublishedBlockByHash(blockHash) {
+        return this.#blockStore.getBlockByHash(L2BlockHash.fromField(blockHash));
+    }
+    getPublishedBlockByArchive(archive) {
+        return this.#blockStore.getBlockByArchive(archive);
+    }
     /**
    * 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));
     }
     /**
@@ -115,10 +146,16 @@ import { NullifierStore } from './nullifier_store.js';
    */ getBlockHeaders(start, limit) {
         return toArray(this.#blockStore.getBlockHeaders(start, limit));
     }
+    getBlockHeaderByHash(blockHash) {
+        return this.#blockStore.getBlockHeaderByHash(L2BlockHash.fromField(blockHash));
+    }
+    getBlockHeaderByArchive(archive) {
+        return this.#blockStore.getBlockHeaderByArchive(archive);
+    }
     /**
    * Gets a tx effect.
-   * @param txHash - The txHash of the tx corresponding to the tx effect.
-   * @returns The requested tx effect (or undefined if not found).
+   * @param txHash - The hash of the tx corresponding to the tx effect.
+   * @returns The requested tx effect with block info (or undefined if not found).
    */ getTxEffect(txHash) {
         return this.#blockStore.getTxEffect(txHash);
     }
@@ -139,26 +176,15 @@ import { NullifierStore } from './nullifier_store.js';
     deleteLogs(blocks) {
         return this.#logStore.deleteLogs(blocks);
     }
-    /**
-   * Append new nullifiers to the store's list.
-   * @param blocks - The blocks for which to add the nullifiers.
-   * @returns True if the operation is successful.
-   */ addNullifiers(blocks) {
-        return this.#nullifierStore.addNullifiers(blocks);
-    }
-    deleteNullifiers(blocks) {
-        return this.#nullifierStore.deleteNullifiers(blocks);
-    }
-    findNullifiersIndexesWithBlock(blockNumber, nullifiers) {
-        return this.#nullifierStore.findNullifiersIndexesWithBlock(blockNumber, nullifiers);
-    }
     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);
     }
@@ -187,11 +213,12 @@ import { NullifierStore } from './nullifier_store.js';
     /**
    * Gets all logs that match any of the received tags (i.e. logs with their first field equal to a tag).
    * @param tags - The tags to filter the logs by.
+   * @param logsPerTag - How many logs to return per tag. Default returns everything
    * @returns For each received tag, an array of matching logs is returned. An empty array implies no logs match
    * that tag.
-   */ getLogsByTags(tags) {
+   */ getLogsByTags(tags, logsPerTag) {
         try {
-            return this.#logStore.getLogsByTags(tags);
+            return this.#logStore.getLogsByTags(tags, logsPerTag);
         } catch (err) {
             return Promise.reject(err);
         }
@@ -233,15 +260,15 @@ import { NullifierStore } from './nullifier_store.js';
     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,
@@ -251,4 +278,19 @@ import { NullifierStore } from './nullifier_store.js';
     estimateSize() {
         return this.db.estimateSize();
     }
+    rollbackL1ToL2MessagesToL2Block(targetBlockNumber) {
+        return this.#messageStore.rollbackL1ToL2MessagesToL2Block(targetBlockNumber);
+    }
+    iterateL1ToL2Messages(range = {}) {
+        return this.#messageStore.iterateL1ToL2Messages(range);
+    }
+    removeL1ToL2Messages(startIndex) {
+        return this.#messageStore.removeL1ToL2Messages(startIndex);
+    }
+    getPendingChainValidationStatus() {
+        return this.#blockStore.getPendingChainValidationStatus();
+    }
+    setPendingChainValidationStatus(status) {
+        return this.#blockStore.setPendingChainValidationStatus(status);
+    }
 }

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

@@ -32,7 +32,7 @@ export declare class LogStore {
      * @returns For each received tag, an array of matching logs is returned. An empty array implies no logs match
      * that tag.
      */
-    getLogsByTags(tags: Fr[]): Promise<TxScopedL2Log[][]>;
+    getLogsByTags(tags: Fr[], limitPerTag?: number): Promise<TxScopedL2Log[][]>;
     /**
      * Gets public logs based on the provided filter.
      * @param filter - The filter to apply to the logs.
@@ -46,4 +46,4 @@ export declare class LogStore {
      */
     getContractClassLogs(filter: LogFilter): Promise<GetContractClassLogsResponse>;
 }
-//# sourceMappingURL=log_store.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nX3N0b3JlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvYXJjaGl2ZXIva3ZfYXJjaGl2ZXJfc3RvcmUvbG9nX3N0b3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBR25ELE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFpQixNQUFNLGlCQUFpQixDQUFDO0FBQ3hFLE9BQU8sS0FBSyxFQUFFLE9BQU8sRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ25ELE9BQU8sS0FBSyxFQUFFLDRCQUE0QixFQUFFLHFCQUFxQixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDM0csT0FBTyxFQUlMLEtBQUssU0FBUyxFQUVkLFVBQVUsRUFFVixhQUFhLEVBQ2QsTUFBTSxvQkFBb0IsQ0FBQztBQUU1QixPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUVuRDs7R0FFRztBQUNILHFCQUFhLFFBQVE7O0lBVWpCLE9BQU8sQ0FBQyxFQUFFO0lBQ1YsT0FBTyxDQUFDLFVBQVU7SUFGcEIsWUFDVSxFQUFFLEVBQUUsaUJBQWlCLEVBQ3JCLFVBQVUsRUFBRSxVQUFVLEVBQzlCLGVBQWUsR0FBRSxNQUFhLEVBUy9CO0lBZ0NEOzs7O09BSUc7SUFDSCxPQUFPLENBQUMsTUFBTSxFQUFFLE9BQU8sRUFBRSxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FnRTNDO0lBRUQsVUFBVSxDQUFDLE1BQU0sRUFBRSxPQUFPLEVBQUUsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBeUI5QztJQUVEOzs7OztPQUtHO0lBQ0csY0FBYyxDQUFDLEtBQUssRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsVUFBVSxFQUFFLENBQUMsQ0FTeEU7SUFFRDs7Ozs7T0FLRztJQUNHLGFBQWEsQ0FBQyxJQUFJLEVBQUUsRUFBRSxFQUFFLEVBQUUsV0FBVyxDQUFDLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxhQUFhLEVBQUUsRUFBRSxDQUFDLENBUWhGO0lBRUQ7Ozs7T0FJRztJQUNILGFBQWEsQ0FBQyxNQUFNLEVBQUUsU0FBUyxHQUFHLE9BQU8sQ0FBQyxxQkFBcUIsQ0FBQyxDQVEvRDtJQXVFRDs7OztPQUlHO0lBQ0gsb0JBQW9CLENBQUMsTUFBTSxFQUFFLFNBQVMsR0FBRyxPQUFPLENBQUMsNEJBQTRCLENBQUMsQ0FRN0U7Q0FxR0YifQ==

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;IAsFzG;;;;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;IA0B/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;IAO3D;;;;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;IAFpB,YACU,EAAE,EAAE,iBAAiB,EACrB,UAAU,EAAE,UAAU,EAC9B,eAAe,GAAE,MAAa,EAS/B;IAgCD;;;;OAIG;IACH,OAAO,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAgE3C;IAED,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAyB9C;IAED;;;;;OAKG;IACG,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC,CASxE;IAED;;;;;OAKG;IACG,aAAa,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAQhF;IAED;;;;OAIG;IACH,aAAa,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAQ/D;IAuED;;;;OAIG;IACH,oBAAoB,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAQ7E;CAqGF"}

package/dest/archiver/kv_archiver_store/log_store.js

@@ -1,4 +1,4 @@
-import { INITIAL_L2_BLOCK_NUM, MAX_NOTE_HASHES_PER_TX, PUBLIC_LOG_DATA_SIZE_IN_FIELDS } from '@aztec/constants';
+import { INITIAL_L2_BLOCK_NUM, MAX_NOTE_HASHES_PER_TX } from '@aztec/constants';
 import { createLogger } from '@aztec/foundation/log';
 import { BufferReader, numToUInt32BE } from '@aztec/foundation/serialize';
 import { ContractClassLog, ExtendedContractClassLog, ExtendedPublicLog, LogId, PrivateLog, PublicLog, TxScopedL2Log } from '@aztec/stdlib/logs';
@@ -25,53 +25,24 @@ import { ContractClassLog, ExtendedContractClassLog, ExtendedPublicLog, LogId, P
         this.#contractClassLogsByBlock = db.openMap('archiver_contract_class_logs_by_block');
         this.#logsMaxPageSize = logsMaxPageSize;
     }
-    #extractTaggedLogsFromPrivate(block) {
+    #extractTaggedLogs(block) {
         const taggedLogs = new Map();
         const dataStartIndexForBlock = block.header.state.partial.noteHashTree.nextAvailableLeafIndex - block.body.txEffects.length * MAX_NOTE_HASHES_PER_TX;
         block.body.txEffects.forEach((txEffect, txIndex)=>{
             const txHash = txEffect.txHash;
             const dataStartIndexForTx = dataStartIndexForBlock + txIndex * MAX_NOTE_HASHES_PER_TX;
-            txEffect.privateLogs.forEach((log)=>{
+            txEffect.privateLogs.forEach((log, logIndex)=>{
                 const tag = log.fields[0];
+                this.#log.debug(`Found private log with tag ${tag.toString()} in block ${block.number}`);
                 const currentLogs = taggedLogs.get(tag.toString()) ?? [];
-                currentLogs.push(new TxScopedL2Log(txHash, dataStartIndexForTx, block.number, /* isFromPublic */ false, log.toBuffer()).toBuffer());
+                currentLogs.push(new TxScopedL2Log(txHash, dataStartIndexForTx, logIndex, block.number, log).toBuffer());
                 taggedLogs.set(tag.toString(), currentLogs);
             });
-        });
-        return taggedLogs;
-    }
-    #extractTaggedLogsFromPublic(block) {
-        const taggedLogs = new Map();
-        const dataStartIndexForBlock = block.header.state.partial.noteHashTree.nextAvailableLeafIndex - block.body.txEffects.length * MAX_NOTE_HASHES_PER_TX;
-        block.body.txEffects.forEach((txEffect, txIndex)=>{
-            const txHash = txEffect.txHash;
-            const dataStartIndexForTx = dataStartIndexForBlock + txIndex * MAX_NOTE_HASHES_PER_TX;
-            txEffect.publicLogs.forEach((log)=>{
-                // Check that each log stores 2 lengths in its first field. If not, it's not a tagged log:
-                const firstFieldBuf = log.log[0].toBuffer();
-                // See macros/note/mod/ and see how finalization_log[0] is constructed, to understand this monstrosity. (It wasn't me).
-                // Search the codebase for "disgusting encoding" to see other hardcoded instances of this encoding, that you might need to change if you ever find yourself here.
-                if (!firstFieldBuf.subarray(0, 27).equals(Buffer.alloc(27)) || firstFieldBuf[29] !== 0) {
-                    // See parseLogFromPublic - the first field of a tagged log is 5 bytes structured:
-                    // [ publicLen[0], publicLen[1], 0, privateLen[0], privateLen[1]]
-                    this.#log.warn(`Skipping public log with invalid first field: ${log.log[0]}`);
-                    return;
-                }
-                // Check that the length values line up with the log contents
-                const publicValuesLength = firstFieldBuf.subarray(-5).readUint16BE();
-                const privateValuesLength = firstFieldBuf.subarray(-5).readUint16BE(3);
-                // Add 1 for the first field holding lengths
-                const totalLogLength = 1 + publicValuesLength + privateValuesLength;
-                // Note that zeroes can be valid log values, so we can only assert that we do not go over the given length
-                if (totalLogLength > PUBLIC_LOG_DATA_SIZE_IN_FIELDS || log.log.slice(totalLogLength).find((f)=>!f.isZero())) {
-                    this.#log.warn(`Skipping invalid tagged public log with first field: ${log.log[0]}`);
-                    return;
-                }
-                // The first elt stores lengths as above => tag is in fields[1]
-                const tag = log.log[1];
-                this.#log.debug(`Found tagged public log with tag ${tag.toString()} in block ${block.number}`);
+            txEffect.publicLogs.forEach((log, logIndex)=>{
+                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, block.number, /* isFromPublic */ true, log.toBuffer()).toBuffer());
+                currentLogs.push(new TxScopedL2Log(txHash, dataStartIndexForTx, logIndex, block.number, log).toBuffer());
                 taggedLogs.set(tag.toString(), currentLogs);
             });
         });
@@ -82,16 +53,13 @@ import { ContractClassLog, ExtendedContractClassLog, ExtendedPublicLog, LogId, P
    * @param blocks - The blocks for which to add the logs.
    * @returns True if the operation is successful.
    */ addLogs(blocks) {
-        const taggedLogsToAdd = blocks.flatMap((block)=>[
-                this.#extractTaggedLogsFromPrivate(block),
-                this.#extractTaggedLogsFromPublic(block)
-            ]).reduce((acc, val)=>{
+        const taggedLogsToAdd = blocks.map((block)=>this.#extractTaggedLogs(block)).reduce((acc, val)=>{
             for (const [tag, logs] of val.entries()){
                 const currentLogs = acc.get(tag) ?? [];
                 acc.set(tag, currentLogs.concat(logs));
             }
             return acc;
-        });
+        }, new Map());
         const tagsToUpdate = Array.from(taggedLogsToAdd.keys());
         return this.db.transactionAsync(async ()=>{
             const currentTaggedLogs = await Promise.all(tagsToUpdate.map(async (tag)=>({
@@ -137,7 +105,8 @@ import { ContractClassLog, ExtendedContractClassLog, ExtendedPublicLog, LogId, P
             await Promise.all(blocks.map((block)=>Promise.all([
                     this.#privateLogsByBlock.delete(block.number),
                     this.#publicLogsByBlock.delete(block.number),
-                    this.#logTagsByBlock.delete(block.number)
+                    this.#logTagsByBlock.delete(block.number),
+                    this.#contractClassLogsByBlock.delete(block.number)
                 ])));
             await Promise.all(tagsToDelete.map((tag)=>this.#logsByTag.delete(tag.toString())));
             return true;
@@ -166,9 +135,12 @@ import { ContractClassLog, ExtendedContractClassLog, ExtendedPublicLog, LogId, P
    * @param tags - The tags to filter the logs by.
    * @returns For each received tag, an array of matching logs is returned. An empty array implies no logs match
    * that tag.
-   */ async getLogsByTags(tags) {
+   */ async getLogsByTags(tags, limitPerTag) {
+        if (limitPerTag !== undefined && limitPerTag <= 0) {
+            throw new TypeError('limitPerTag needs to be greater than 0');
+        }
         const logs = await Promise.all(tags.map((tag)=>this.#logsByTag.getAsync(tag.toString())));
-        return logs.map((noteLogBuffers)=>noteLogBuffers?.map((noteLogBuffer)=>TxScopedL2Log.fromBuffer(noteLogBuffer)) ?? []);
+        return logs.map((logBuffers)=>logBuffers?.slice(0, limitPerTag).map((logBuffer)=>TxScopedL2Log.fromBuffer(logBuffer)) ?? []);
     }
     /**
    * Gets public logs based on the provided filter.

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>;
-    getL1ToL2Messages(blockNumber: bigint): Promise<Fr[]>;
+    getLastMessage(): Promise<InboxMessage | undefined>;
+    getL1ToL2Messages(blockNumber: number): Promise<Fr[]>;
+    iterateL1ToL2Messages(range?: CustomRange<bigint>): AsyncIterableIterator<InboxMessage>;
+    removeL1ToL2Messages(startIndex: bigint): Promise<void>;
+    rollbackL1ToL2MessagesToL2Block(targetBlockNumber: number): Promise<void>;
+    private indexToKey;
+    private leafToIndexKey;
+    private increaseTotalMessageCount;
 }
-//# sourceMappingURL=message_store.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVzc2FnZV9zdG9yZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2FyY2hpdmVyL2t2X2FyY2hpdmVyX3N0b3JlL21lc3NhZ2Vfc3RvcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFFakQsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBSTlDLE9BQU8sRUFDTCxLQUFLLGlCQUFpQixFQUd0QixLQUFLLFdBQVcsRUFFakIsTUFBTSxpQkFBaUIsQ0FBQztBQUd6QixPQUFPLEVBQ0wsS0FBSyxZQUFZLEVBSWxCLE1BQU0sNkJBQTZCLENBQUM7QUFFckMscUJBQWEsaUJBQWtCLFNBQVEsS0FBSzthQUd4QixZQUFZLEVBQUUsWUFBWTtJQUY1QyxZQUNFLE9BQU8sRUFBRSxNQUFNLEVBQ0MsWUFBWSxFQUFFLFlBQVksRUFJM0M7Q0FDRjtBQUVELHFCQUFhLFlBQVk7O0lBWVgsT0FBTyxDQUFDLEVBQUU7SUFBdEIsWUFBb0IsRUFBRSxFQUFFLGlCQUFpQixFQUt4QztJQUVZLDBCQUEwQixJQUFJLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FFekQ7SUFFRCxxQ0FBcUM7SUFDeEIsaUJBQWlCLElBQUksT0FBTyxDQUFDLFNBQVMsR0FBRyxTQUFTLENBQUMsQ0FRL0Q7SUFFRCxvQ0FBb0M7SUFDdkIsaUJBQWlCLENBQUMsT0FBTyxFQUFFLFNBQVMsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBR2hFO0lBRUQ7Ozs7T0FJRztJQUNJLGlCQUFpQixDQUFDLFFBQVEsRUFBRSxZQUFZLEVBQUUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBNkZoRTtJQUVEOzs7O09BSUc7SUFDSSxxQkFBcUIsQ0FBQyxhQUFhLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxNQUFNLEdBQUcsU0FBUyxDQUFDLENBRTNFO0lBRVksY0FBYyxJQUFJLE9BQU8sQ0FBQyxZQUFZLEdBQUcsU0FBUyxDQUFDLENBRy9EO0lBRVksaUJBQWlCLENBQUMsV0FBVyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FxQmpFO0lBRWEscUJBQXFCLENBQUMsS0FBSyxHQUFFLFdBQVcsQ0FBQyxNQUFNLENBQU0sR0FBRyxxQkFBcUIsQ0FBQyxZQUFZLENBQUMsQ0FLeEc7SUFFTSxvQkFBb0IsQ0FBQyxVQUFVLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FnQjdEO0lBRU0sK0JBQStCLENBQUMsaUJBQWlCLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FJL0U7SUFFRCxPQUFPLENBQUMsVUFBVTtJQUlsQixPQUFPLENBQUMsY0FBYztZQUlSLHlCQUF5QjtDQVN4QyJ9

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;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,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC,CAqBjE;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,+BAA+B,CAAC,iBAAiB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAI/E;IAED,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,cAAc;YAIR,yBAAyB;CASxC"}