@aztec/archiver 0.17.0 → 0.19.0

package/dest/archiver/lmdb_archiver_store.d.ts

@@ -1,8 +1,8 @@
+import { ContractData, ExtendedContractData, GetUnencryptedLogsResponse, L1ToL2Message, L2Block, L2BlockL2Logs, L2Tx, LogFilter, LogType, TxHash } from '@aztec/circuit-types';
 import { Fr } from '@aztec/circuits.js';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
-import { CancelledL1ToL2Message, ContractData, ExtendedContractData, GetUnencryptedLogsResponse, L1ToL2Message, L2Block, L2BlockL2Logs, L2Tx, LogFilter, LogType, PendingL1ToL2Message, TxHash } from '@aztec/types';
 import { RootDatabase } from 'lmdb';
-import { ArchiverDataStore } from './archiver_store.js';
+import { ArchiverDataStore, ArchiverL1SynchPoint } from './archiver_store.js';
 /**
  * LMDB implementation of the ArchiverDataStore interface.
  */
@@ -40,15 +40,17 @@ export declare class LMDBArchiverStore implements ArchiverDataStore {
     /**
      * Append new pending L1 to L2 messages to the store.
      * @param messages - The L1 to L2 messages to be added to the store.
+     * @param l1BlockNumber - The L1 block number for which to add the messages.
      * @returns True if the operation is successful.
      */
-    addPendingL1ToL2Messages(messages: PendingL1ToL2Message[]): Promise<boolean>;
+    addPendingL1ToL2Messages(messages: L1ToL2Message[], l1BlockNumber: bigint): Promise<boolean>;
     /**
      * Remove pending L1 to L2 messages from the store (if they were cancelled).
-     * @param messages - The message keys to be removed from the store.
+     * @param cancelledMessages - The message keys to be removed from the store.
+     * @param l1BlockNumber - The L1 block number for which to remove the messages.
      * @returns True if the operation is successful.
      */
-    cancelPendingL1ToL2Messages(messages: CancelledL1ToL2Message[]): Promise<boolean>;
+    cancelPendingL1ToL2Messages(cancelledMessages: Fr[], l1BlockNumber: bigint): Promise<boolean>;
     /**
      * Messages that have been published in an L2 block are confirmed.
      * Add them to the confirmed store, also remove them from the pending store.
@@ -120,6 +122,9 @@ export declare class LMDBArchiverStore implements ArchiverDataStore {
      * @returns The number of the latest L2 block processed.
      */
     getBlockNumber(): Promise<number>;
-    getL1BlockNumber(): Promise<bigint>;
+    /**
+     * Gets the last L1 block number processed by the archiver
+     */
+    getL1BlockNumber(): Promise<ArchiverL1SynchPoint>;
 }
 //# sourceMappingURL=lmdb_archiver_store.d.ts.map

package/dest/archiver/lmdb_archiver_store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lmdb_archiver_store.d.ts","sourceRoot":"","sources":["../../src/archiver/lmdb_archiver_store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAG/D,OAAO,EACL,sBAAsB,EACtB,YAAY,EACZ,oBAAoB,EAEpB,0BAA0B,EAE1B,aAAa,EACb,OAAO,EACP,aAAa,EACb,IAAI,EACJ,SAAS,EAET,OAAO,EACP,oBAAoB,EACpB,MAAM,EAEP,MAAM,cAAc,CAAC;AAEtB,OAAO,EAA0B,YAAY,EAAE,MAAM,MAAM,CAAC;AAE5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AA8BxD;;GAEG;AACH,qBAAa,iBAAkB,YAAW,iBAAiB;;gBAoB7C,EAAE,EAAE,YAAY,EAAE,eAAe,GAAE,MAAa;IAgC/C,KAAK;IAIlB;;;;OAIG;IACH,SAAS,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAkC9C;;;;;OAKG;IACH,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAyB3D;;;;OAIG;IACH,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;IAUlD;;;;;;OAMG;IACH,OAAO,CACL,aAAa,EAAE,aAAa,GAAG,SAAS,EACxC,eAAe,EAAE,aAAa,GAAG,SAAS,EAC1C,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,OAAO,CAAC;IAiBnB;;;;OAIG;IACH,wBAAwB,CAAC,QAAQ,EAAE,oBAAoB,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAyC5E;;;;OAIG;IACH,2BAA2B,CAAC,QAAQ,EAAE,sBAAsB,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IA0BjF;;;;;OAKG;IACH,qBAAqB,CAAC,SAAS,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAWxD;;;;OAIG;IACH,2BAA2B,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC;IA2CzD;;;;OAIG;IACH,yBAAyB,CAAC,UAAU,EAAE,EAAE,GAAG,OAAO,CAAC,aAAa,CAAC;IAajE;;;;;;OAMG;IACH,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAejF;;;;OAIG;IACH,kBAAkB,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,0BAA0B,CAAC;IAqG1E;;;;;OAKG;IACH,uBAAuB,CAAC,IAAI,EAAE,oBAAoB,EAAE,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAczF;;;;OAIG;IACH,uBAAuB,CAAC,eAAe,EAAE,YAAY,GAAG,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC;IAsBjG;;;;OAIG;IACH,8BAA8B,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,EAAE,CAAC;IASjF;;;;;OAKG;IACH,eAAe,CAAC,eAAe,EAAE,YAAY,GAAG,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;IAUjF;;;;;OAKG;IACH,sBAAsB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,EAAE,GAAG,SAAS,CAAC;IAKhF;;;OAGG;IACH,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC;IAMjC,gBAAgB,IAAI,OAAO,CAAC,MAAM,CAAC;CA0GpC"}
+{"version":3,"file":"lmdb_archiver_store.d.ts","sourceRoot":"","sources":["../../src/archiver/lmdb_archiver_store.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,oBAAoB,EAEpB,0BAA0B,EAE1B,aAAa,EACb,OAAO,EACP,aAAa,EACb,IAAI,EACJ,SAAS,EAET,OAAO,EACP,MAAM,EAEP,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAG/D,OAAO,EAA0B,YAAY,EAAE,MAAM,MAAM,CAAC;AAE5D,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAwB9E;;GAEG;AACH,qBAAa,iBAAkB,YAAW,iBAAiB;;gBAoB7C,EAAE,EAAE,YAAY,EAAE,eAAe,GAAE,MAAa;IAgC/C,KAAK;IAIlB;;;;OAIG;IACH,SAAS,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAmC9C;;;;;OAKG;IACH,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAoB3D;;;;OAIG;IACH,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;IAUlD;;;;;;OAMG;IACH,OAAO,CACL,aAAa,EAAE,aAAa,GAAG,SAAS,EACxC,eAAe,EAAE,aAAa,GAAG,SAAS,EAC1C,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,OAAO,CAAC;IAiBnB;;;;;OAKG;IACH,wBAAwB,CAAC,QAAQ,EAAE,aAAa,EAAE,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IA+B5F;;;;;OAKG;IACH,2BAA2B,CAAC,iBAAiB,EAAE,EAAE,EAAE,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAmB7F;;;;;OAKG;IACH,qBAAqB,CAAC,SAAS,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAWxD;;;;OAIG;IACH,2BAA2B,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC;IA2CzD;;;;OAIG;IACH,yBAAyB,CAAC,UAAU,EAAE,EAAE,GAAG,OAAO,CAAC,aAAa,CAAC;IAajE;;;;;;OAMG;IACH,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAejF;;;;OAIG;IACH,kBAAkB,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,0BAA0B,CAAC;IA6F1E;;;;;OAKG;IACH,uBAAuB,CAAC,IAAI,EAAE,oBAAoB,EAAE,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAczF;;;;OAIG;IACH,uBAAuB,CAAC,eAAe,EAAE,YAAY,GAAG,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC;IAsBjG;;;;OAIG;IACH,8BAA8B,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,EAAE,CAAC;IASjF;;;;;OAKG;IACH,eAAe,CAAC,eAAe,EAAE,YAAY,GAAG,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;IAUjF;;;;;OAKG;IACH,sBAAsB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,EAAE,GAAG,SAAS,CAAC;IAKhF;;;OAGG;IACH,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC;IAMjC;;OAEG;IACH,gBAAgB,IAAI,OAAO,CAAC,oBAAoB,CAAC;CAuHlD"}

package/dest/archiver/lmdb_archiver_store.js

@@ -1,12 +1,10 @@
-var _LMDBArchiverStore_instances, _LMDBArchiverStore_tables, _LMDBArchiverStore_logsMaxPageSize, _LMDBArchiverStore_log, _LMDBArchiverStore_filterLogsOfTx, _LMDBArchiverStore_filterLogsBetweenBlocks, _LMDBArchiverStore_accumulateLogs, _LMDBArchiverStore_getBlock, _LMDBArchiverStore_computeBlockRange, _LMDBArchiverStore_getL1ToL2Message, _LMDBArchiverStore_updateMessageCountInTx;
+var _LMDBArchiverStore_instances, _LMDBArchiverStore_tables, _LMDBArchiverStore_logsMaxPageSize, _LMDBArchiverStore_log, _LMDBArchiverStore_filterUnencryptedLogsOfTx, _LMDBArchiverStore_filterUnencryptedLogsBetweenBlocks, _LMDBArchiverStore_accumulateLogs, _LMDBArchiverStore_getBlock, _LMDBArchiverStore_getBlockLogs, _LMDBArchiverStore_computeBlockRange, _LMDBArchiverStore_getL1ToL2Message, _LMDBArchiverStore_updateMessageCountInTx;
 import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
+import { ExtendedContractData, ExtendedUnencryptedL2Log, INITIAL_L2_BLOCK_NUM, L1ToL2Message, L2Block, L2BlockL2Logs, LogId, LogType, UnencryptedL2Log, } from '@aztec/circuit-types';
 import { Fr } from '@aztec/circuits.js';
-import { toBigIntBE, toBufferBE } from '@aztec/foundation/bigint-buffer';
 import { createDebugLogger } from '@aztec/foundation/log';
-import { ExtendedContractData, ExtendedUnencryptedL2Log, INITIAL_L2_BLOCK_NUM, L1ToL2Message, L2Block, L2BlockL2Logs, LogId, LogType, UnencryptedL2Log, } from '@aztec/types';
-function l1ToL2MessageBlockKey(l1BlockNumber, key, indexInBlock) {
-    return `${toBufferBE(l1BlockNumber, 32).toString('hex')}:${key}:${indexInBlock}`;
-}
+const L1_BLOCK_ADDED_PENDING_MESSAGE = 'l1BlockAddedPendingMessage';
+const L1_BLOCK_CANCELLED_MESSAGE = 'l1BlockCancelledMessage';
 /* eslint-enable */
 /**
  * LMDB implementation of the ArchiverDataStore interface.
@@ -36,7 +34,7 @@ export class LMDBArchiverStore {
             }),
             l1ToL2MessagesByBlock: db.openDB('l1_to_l2_message_nonces', {
                 keyEncoding: 'ordered-binary',
-                encoding: 'binary',
+                encoding: 'msgpack',
             }),
             pendingMessagesByFee: db.openDB('pending_messages_by_fee', {
                 keyEncoding: 'ordered-binary',
@@ -61,7 +59,8 @@ export class LMDBArchiverStore {
             for (const block of blocks) {
                 const blockCtx = __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").blocks.get(block.number) ?? {};
                 blockCtx.block = block.toBuffer();
-                blockCtx.l1BlockNumber = toBufferBE(block.getL1BlockNumber(), 32);
+                blockCtx.l1BlockNumber = block.getL1BlockNumber();
+                blockCtx.blockHash = block.getBlockHash();
                 // no need to await, all writes are enqueued in the transaction
                 // awaiting would interrupt the execution flow of this callback and "leak" the transaction to some other part
                 // of the system and any writes would then be part of our transaction here
@@ -94,13 +93,7 @@ export class LMDBArchiverStore {
                 .getRange(__classPrivateFieldGet(this, _LMDBArchiverStore_instances, "m", _LMDBArchiverStore_computeBlockRange).call(this, start, limit))
                 .filter(({ value }) => value.block)
                 .map(({ value }) => {
-                const block = L2Block.fromBuffer(asBuffer(value.block));
-                if (value.encryptedLogs) {
-                    block.attachLogs(L2BlockL2Logs.fromBuffer(asBuffer(value.encryptedLogs)), LogType.ENCRYPTED);
-                }
-                if (value.unencryptedLogs) {
-                    block.attachLogs(L2BlockL2Logs.fromBuffer(asBuffer(value.unencryptedLogs)), LogType.UNENCRYPTED);
-                }
+                const block = L2Block.fromBuffer(asBuffer(value.block), value.blockHash ? asBuffer(value.blockHash) : undefined);
                 return block;
             }).asArray;
             return Promise.resolve(blocks);
@@ -120,7 +113,7 @@ export class LMDBArchiverStore {
         if (typeof blockNumber !== 'number' || typeof txIndex !== 'number') {
             return Promise.resolve(undefined);
         }
-        const block = __classPrivateFieldGet(this, _LMDBArchiverStore_instances, "m", _LMDBArchiverStore_getBlock).call(this, blockNumber, true);
+        const block = __classPrivateFieldGet(this, _LMDBArchiverStore_instances, "m", _LMDBArchiverStore_getBlock).call(this, blockNumber);
         return Promise.resolve(block?.getTx(txIndex));
     }
     /**
@@ -146,34 +139,29 @@ export class LMDBArchiverStore {
     /**
      * Append new pending L1 to L2 messages to the store.
      * @param messages - The L1 to L2 messages to be added to the store.
+     * @param l1BlockNumber - The L1 block number for which to add the messages.
      * @returns True if the operation is successful.
      */
-    addPendingL1ToL2Messages(messages) {
+    addPendingL1ToL2Messages(messages, l1BlockNumber) {
         return __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").l1ToL2Messages.transaction(() => {
-            for (const { message, blockNumber, indexInBlock } of messages) {
+            if ((__classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").l1ToL2MessagesByBlock.get(L1_BLOCK_ADDED_PENDING_MESSAGE) ?? 0n) >= l1BlockNumber) {
+                return false;
+            }
+            // ensure we don't add the same messages twice
+            void __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").l1ToL2MessagesByBlock.put(L1_BLOCK_ADDED_PENDING_MESSAGE, l1BlockNumber);
+            for (const message of messages) {
                 const messageKey = message.entryKey?.toBuffer();
                 if (!messageKey) {
                     throw new Error('Message does not have an entry key');
                 }
-                const dupeKey = l1ToL2MessageBlockKey(blockNumber, 'newMessage', indexInBlock);
-                const messageInBlock = __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").l1ToL2MessagesByBlock.get(dupeKey);
-                if (messageInBlock?.equals(messageKey)) {
-                    continue;
-                }
-                else {
-                    if (messageInBlock) {
-                        __classPrivateFieldGet(this, _LMDBArchiverStore_log, "f").call(this, `Previously add pending message ${messageInBlock.toString('hex')} at ${dupeKey.toString()}, now got ${messageKey.toString('hex')}`);
-                    }
-                    void __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").l1ToL2MessagesByBlock.put(dupeKey, messageKey);
-                }
-                let messageWithCount = __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").l1ToL2Messages.get(messageKey);
-                if (!messageWithCount) {
-                    messageWithCount = {
+                let messageCtx = __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").l1ToL2Messages.get(messageKey);
+                if (!messageCtx) {
+                    messageCtx = {
                         message: message.toBuffer(),
                         pendingCount: 0,
                         confirmedCount: 0,
                     };
-                    void __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").l1ToL2Messages.put(messageKey, messageWithCount);
+                    void __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").l1ToL2Messages.put(messageKey, messageCtx);
                 }
                 __classPrivateFieldGet(this, _LMDBArchiverStore_instances, "m", _LMDBArchiverStore_updateMessageCountInTx).call(this, messageKey, message, 1, 0);
             }
@@ -182,26 +170,22 @@ export class LMDBArchiverStore {
     }
     /**
      * Remove pending L1 to L2 messages from the store (if they were cancelled).
-     * @param messages - The message keys to be removed from the store.
+     * @param cancelledMessages - The message keys to be removed from the store.
+     * @param l1BlockNumber - The L1 block number for which to remove the messages.
      * @returns True if the operation is successful.
      */
-    cancelPendingL1ToL2Messages(messages) {
+    cancelPendingL1ToL2Messages(cancelledMessages, l1BlockNumber) {
         return __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").l1ToL2Messages.transaction(() => {
-            for (const { blockNumber, indexInBlock, entryKey } of messages) {
-                const messageKey = entryKey.toBuffer();
-                const dupeKey = l1ToL2MessageBlockKey(blockNumber, 'cancelledMessage', indexInBlock);
-                const messageInBlock = __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").l1ToL2MessagesByBlock.get(dupeKey);
-                if (messageInBlock?.equals(messageKey)) {
+            if ((__classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").l1ToL2MessagesByBlock.get(L1_BLOCK_CANCELLED_MESSAGE) ?? 0n) >= l1BlockNumber) {
+                return false;
+            }
+            void __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").l1ToL2MessagesByBlock.put(L1_BLOCK_CANCELLED_MESSAGE, l1BlockNumber);
+            for (const messageKey of cancelledMessages) {
+                const message = __classPrivateFieldGet(this, _LMDBArchiverStore_instances, "m", _LMDBArchiverStore_getL1ToL2Message).call(this, messageKey.toBuffer());
+                if (!message) {
                     continue;
                 }
-                else {
-                    if (messageInBlock) {
-                        __classPrivateFieldGet(this, _LMDBArchiverStore_log, "f").call(this, `Previously add pending message ${messageInBlock.toString('hex')} at ${dupeKey.toString()}, now got ${messageKey.toString('hex')}`);
-                    }
-                    void __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").l1ToL2MessagesByBlock.put(dupeKey, messageKey);
-                }
-                const message = __classPrivateFieldGet(this, _LMDBArchiverStore_instances, "m", _LMDBArchiverStore_getL1ToL2Message).call(this, messageKey);
-                __classPrivateFieldGet(this, _LMDBArchiverStore_instances, "m", _LMDBArchiverStore_updateMessageCountInTx).call(this, messageKey, message, -1, 0);
+                __classPrivateFieldGet(this, _LMDBArchiverStore_instances, "m", _LMDBArchiverStore_updateMessageCountInTx).call(this, messageKey.toBuffer(), message, -1, 0);
             }
             return true;
         });
@@ -304,13 +288,13 @@ export class LMDBArchiverStore {
     getUnencryptedLogs(filter) {
         try {
             if (filter.afterLog) {
-                return Promise.resolve(__classPrivateFieldGet(this, _LMDBArchiverStore_instances, "m", _LMDBArchiverStore_filterLogsBetweenBlocks).call(this, filter));
+                return Promise.resolve(__classPrivateFieldGet(this, _LMDBArchiverStore_instances, "m", _LMDBArchiverStore_filterUnencryptedLogsBetweenBlocks).call(this, filter));
             }
             else if (filter.txHash) {
-                return Promise.resolve(__classPrivateFieldGet(this, _LMDBArchiverStore_instances, "m", _LMDBArchiverStore_filterLogsOfTx).call(this, filter));
+                return Promise.resolve(__classPrivateFieldGet(this, _LMDBArchiverStore_instances, "m", _LMDBArchiverStore_filterUnencryptedLogsOfTx).call(this, filter));
             }
             else {
-                return Promise.resolve(__classPrivateFieldGet(this, _LMDBArchiverStore_instances, "m", _LMDBArchiverStore_filterLogsBetweenBlocks).call(this, filter));
+                return Promise.resolve(__classPrivateFieldGet(this, _LMDBArchiverStore_instances, "m", _LMDBArchiverStore_filterUnencryptedLogsBetweenBlocks).call(this, filter));
             }
         }
         catch (err) {
@@ -402,24 +386,23 @@ export class LMDBArchiverStore {
         const [lastBlockNumber] = __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").blocks.getKeys({ reverse: true, limit: 1 }).asArray;
         return Promise.resolve(typeof lastBlockNumber === 'number' ? lastBlockNumber : INITIAL_L2_BLOCK_NUM - 1);
     }
+    /**
+     * Gets the last L1 block number processed by the archiver
+     */
     getL1BlockNumber() {
         // inverse range with no start/end will return the last value
-        const [lastBlock] = __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").blocks.getRange({ reverse: true, limit: 1 }).asArray;
-        if (!lastBlock) {
-            return Promise.resolve(0n);
-        }
-        else {
-            const blockCtx = lastBlock.value;
-            if (!blockCtx.l1BlockNumber) {
-                return Promise.reject(new Error('L1 block number not found'));
-            }
-            else {
-                return Promise.resolve(toBigIntBE(asBuffer(blockCtx.l1BlockNumber)));
-            }
-        }
+        const [lastL2Block] = __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").blocks.getRange({ reverse: true, limit: 1 }).asArray;
+        const addedBlock = lastL2Block?.value?.l1BlockNumber ?? 0n;
+        const addedMessages = __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").l1ToL2MessagesByBlock.get(L1_BLOCK_ADDED_PENDING_MESSAGE) ?? 0n;
+        const cancelledMessages = __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").l1ToL2MessagesByBlock.get(L1_BLOCK_CANCELLED_MESSAGE) ?? 0n;
+        return Promise.resolve({
+            addedBlock,
+            addedMessages,
+            cancelledMessages,
+        });
     }
 }
-_LMDBArchiverStore_tables = new WeakMap(), _LMDBArchiverStore_logsMaxPageSize = new WeakMap(), _LMDBArchiverStore_log = new WeakMap(), _LMDBArchiverStore_instances = new WeakSet(), _LMDBArchiverStore_filterLogsOfTx = function _LMDBArchiverStore_filterLogsOfTx(filter) {
+_LMDBArchiverStore_tables = new WeakMap(), _LMDBArchiverStore_logsMaxPageSize = new WeakMap(), _LMDBArchiverStore_log = new WeakMap(), _LMDBArchiverStore_instances = new WeakSet(), _LMDBArchiverStore_filterUnencryptedLogsOfTx = function _LMDBArchiverStore_filterUnencryptedLogsOfTx(filter) {
     if (!filter.txHash) {
         throw new Error('Missing txHash');
     }
@@ -427,15 +410,12 @@ _LMDBArchiverStore_tables = new WeakMap(), _LMDBArchiverStore_logsMaxPageSize =
     if (typeof blockNumber !== 'number' || typeof txIndex !== 'number') {
         return { logs: [], maxLogsHit: false };
     }
-    const block = __classPrivateFieldGet(this, _LMDBArchiverStore_instances, "m", _LMDBArchiverStore_getBlock).call(this, blockNumber, true);
-    if (!block || !block.newUnencryptedLogs) {
-        return { logs: [], maxLogsHit: false };
-    }
-    const txLogs = block.newUnencryptedLogs.txLogs[txIndex].unrollLogs().map(log => UnencryptedL2Log.fromBuffer(log));
+    const unencryptedLogsInBlock = __classPrivateFieldGet(this, _LMDBArchiverStore_instances, "m", _LMDBArchiverStore_getBlockLogs).call(this, blockNumber, LogType.UNENCRYPTED);
+    const txLogs = unencryptedLogsInBlock.txLogs[txIndex].unrollLogs().map(log => UnencryptedL2Log.fromBuffer(log));
     const logs = [];
     const maxLogsHit = __classPrivateFieldGet(this, _LMDBArchiverStore_instances, "m", _LMDBArchiverStore_accumulateLogs).call(this, logs, blockNumber, txIndex, txLogs, filter);
     return { logs, maxLogsHit };
-}, _LMDBArchiverStore_filterLogsBetweenBlocks = function _LMDBArchiverStore_filterLogsBetweenBlocks(filter) {
+}, _LMDBArchiverStore_filterUnencryptedLogsBetweenBlocks = function _LMDBArchiverStore_filterUnencryptedLogsBetweenBlocks(filter) {
     const start = filter.afterLog?.blockNumber ?? Math.max(filter.fromBlock ?? INITIAL_L2_BLOCK_NUM, INITIAL_L2_BLOCK_NUM);
     const end = filter.toBlock;
     if (typeof end === 'number' && end < start) {
@@ -448,11 +428,7 @@ _LMDBArchiverStore_tables = new WeakMap(), _LMDBArchiverStore_logsMaxPageSize =
     const blockNumbers = __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").blocks.getKeys({ start, end, snapshot: false });
     let maxLogsHit = false;
     loopOverBlocks: for (const blockNumber of blockNumbers) {
-        const block = __classPrivateFieldGet(this, _LMDBArchiverStore_instances, "m", _LMDBArchiverStore_getBlock).call(this, blockNumber, true);
-        if (!block || !block.newUnencryptedLogs) {
-            continue;
-        }
-        const unencryptedLogsInBlock = block.newUnencryptedLogs;
+        const unencryptedLogsInBlock = __classPrivateFieldGet(this, _LMDBArchiverStore_instances, "m", _LMDBArchiverStore_getBlockLogs).call(this, blockNumber, LogType.UNENCRYPTED);
         for (let txIndex = filter.afterLog?.txIndex ?? 0; txIndex < unencryptedLogsInBlock.txLogs.length; txIndex++) {
             const txLogs = unencryptedLogsInBlock.txLogs[txIndex].unrollLogs().map(log => UnencryptedL2Log.fromBuffer(log));
             maxLogsHit = __classPrivateFieldGet(this, _LMDBArchiverStore_instances, "m", _LMDBArchiverStore_accumulateLogs).call(this, logs, blockNumber, txIndex, txLogs, filter);
@@ -485,7 +461,7 @@ _LMDBArchiverStore_tables = new WeakMap(), _LMDBArchiverStore_logsMaxPageSize =
     if (!blockCtx || !blockCtx.block) {
         return undefined;
     }
-    const block = L2Block.fromBuffer(asBuffer(blockCtx.block));
+    const block = L2Block.fromBuffer(asBuffer(blockCtx.block), blockCtx.blockHash ? asBuffer(blockCtx.blockHash) : undefined);
     if (withLogs) {
         if (blockCtx.encryptedLogs) {
             block.attachLogs(L2BlockL2Logs.fromBuffer(asBuffer(blockCtx.encryptedLogs)), LogType.ENCRYPTED);
@@ -495,6 +471,13 @@ _LMDBArchiverStore_tables = new WeakMap(), _LMDBArchiverStore_logsMaxPageSize =
         }
     }
     return block;
+}, _LMDBArchiverStore_getBlockLogs = function _LMDBArchiverStore_getBlockLogs(blockNumber, logType) {
+    const blockCtx = __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").blocks.get(blockNumber);
+    const logs = blockCtx?.[logType === LogType.ENCRYPTED ? 'encryptedLogs' : 'unencryptedLogs'];
+    if (!logs) {
+        return new L2BlockL2Logs([]);
+    }
+    return L2BlockL2Logs.fromBuffer(asBuffer(logs));
 }, _LMDBArchiverStore_computeBlockRange = function _LMDBArchiverStore_computeBlockRange(start, limit) {
     if (limit < 1) {
         throw new Error(`Invalid limit: ${limit}`);
@@ -542,4 +525,4 @@ _LMDBArchiverStore_tables = new WeakMap(), _LMDBArchiverStore_logsMaxPageSize =
 function asBuffer(arr) {
     return Buffer.isBuffer(arr) ? arr : Buffer.from(arr.buffer, arr.byteOffset, arr.length / arr.BYTES_PER_ELEMENT);
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"lmdb_archiver_store.js","sourceRoot":"","sources":["../../src/archiver/lmdb_archiver_store.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"lmdb_archiver_store.js","sourceRoot":"","sources":["../../src/archiver/lmdb_archiver_store.ts"],"names":[],"mappings":"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"}

package/dest/archiver/memory_archiver_store/l1_to_l2_message_store.d.ts

@@ -1,5 +1,5 @@
+import { L1ToL2Message } from '@aztec/circuit-types';
 import { Fr } from '@aztec/foundation/fields';
-import { L1ToL2Message } from '@aztec/types';
 /**
  * A simple in-memory implementation of an L1 to L2 message store
  * that handles message duplication.
@@ -10,10 +10,8 @@ export declare class L1ToL2MessageStore {
      * messages (and the number of times the message has been seen).
      */
     protected store: Map<bigint, L1ToL2MessageAndCount>;
-    private messagesByBlock;
     constructor();
-    addMessage(messageKey: Fr, message: L1ToL2Message, l1BlocKNumber: bigint, messageIndex: number): void;
-    addMessageUnsafe(messageKey: Fr, message: L1ToL2Message): void;
+    addMessage(messageKey: Fr, message: L1ToL2Message): void;
     getMessage(messageKey: Fr): L1ToL2Message | undefined;
     getMessageAndCount(messageKey: Fr): L1ToL2MessageAndCount | undefined;
 }
@@ -22,10 +20,8 @@ export declare class L1ToL2MessageStore {
  * for removing messages or fetching multiple messages.
  */
 export declare class PendingL1ToL2MessageStore extends L1ToL2MessageStore {
-    private cancelledMessagesByBlock;
     getMessageKeys(limit: number): Fr[];
-    removeMessage(messageKey: Fr, l1BlockNumber: bigint, messageIndex: number): void;
-    removeMessageUnsafe(messageKey: Fr): void;
+    removeMessage(messageKey: Fr): void;
 }
 /**
  * Useful to keep track of the number of times a message has been seen.

package/dest/archiver/memory_archiver_store/l1_to_l2_message_store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"l1_to_l2_message_store.d.ts","sourceRoot":"","sources":["../../../src/archiver/memory_archiver_store/l1_to_l2_message_store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C;;;GAGG;AACH,qBAAa,kBAAkB;IAC7B;;;OAGG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAa;IAChE,OAAO,CAAC,eAAe,CAAqB;;IAI5C,UAAU,CAAC,UAAU,EAAE,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM;IAS9F,gBAAgB,CAAC,UAAU,EAAE,EAAE,EAAE,OAAO,EAAE,aAAa;IAUvD,UAAU,CAAC,UAAU,EAAE,EAAE,GAAG,aAAa,GAAG,SAAS;IAIrD,kBAAkB,CAAC,UAAU,EAAE,EAAE,GAAG,qBAAqB,GAAG,SAAS;CAGtE;AAED;;;GAGG;AACH,qBAAa,yBAA0B,SAAQ,kBAAkB;IAC/D,OAAO,CAAC,wBAAwB,CAAqB;IACrD,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,EAAE,EAAE;IAmBnC,aAAa,CAAC,UAAU,EAAE,EAAE,EAAE,aAAa,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM;IAazE,mBAAmB,CAAC,UAAU,EAAE,EAAE;CAYnC;AAED;;GAEG;AACH,KAAK,qBAAqB,GAAG;IAC3B;;OAEG;IACH,OAAO,EAAE,aAAa,CAAC;IACvB;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;CACf,CAAC"}
+{"version":3,"file":"l1_to_l2_message_store.d.ts","sourceRoot":"","sources":["../../../src/archiver/memory_archiver_store/l1_to_l2_message_store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C;;;GAGG;AACH,qBAAa,kBAAkB;IAC7B;;;OAGG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAa;;IAIhE,UAAU,CAAC,UAAU,EAAE,EAAE,EAAE,OAAO,EAAE,aAAa;IAUjD,UAAU,CAAC,UAAU,EAAE,EAAE,GAAG,aAAa,GAAG,SAAS;IAIrD,kBAAkB,CAAC,UAAU,EAAE,EAAE,GAAG,qBAAqB,GAAG,SAAS;CAGtE;AAED;;;GAGG;AACH,qBAAa,yBAA0B,SAAQ,kBAAkB;IAC/D,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,EAAE,EAAE;IAmBnC,aAAa,CAAC,UAAU,EAAE,EAAE;CAiB7B;AAED;;GAEG;AACH,KAAK,qBAAqB,GAAG;IAC3B;;OAEG;IACH,OAAO,EAAE,aAAa,CAAC;IACvB;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;CACf,CAAC"}

package/dest/archiver/memory_archiver_store/l1_to_l2_message_store.js

@@ -10,17 +10,9 @@ export class L1ToL2MessageStore {
          * messages (and the number of times the message has been seen).
          */
         this.store = new Map();
-        this.messagesByBlock = new Set();
     }
-    addMessage(messageKey, message, l1BlocKNumber, messageIndex) {
-        if (this.messagesByBlock.has(`${l1BlocKNumber}-${messageIndex}`)) {
-            return;
-        }
-        this.messagesByBlock.add(`${l1BlocKNumber}-${messageIndex}`);
-        this.addMessageUnsafe(messageKey, message);
-    }
-    addMessageUnsafe(messageKey, message) {
-        const messageKeyBigInt = messageKey.value;
+    addMessage(messageKey, message) {
+        const messageKeyBigInt = messageKey.toBigInt();
         const msgAndCount = this.store.get(messageKeyBigInt);
         if (msgAndCount) {
             msgAndCount.count++;
@@ -41,10 +33,6 @@ export class L1ToL2MessageStore {
  * for removing messages or fetching multiple messages.
  */
 export class PendingL1ToL2MessageStore extends L1ToL2MessageStore {
-    constructor() {
-        super(...arguments);
-        this.cancelledMessagesByBlock = new Set();
-    }
     getMessageKeys(limit) {
         if (limit < 1) {
             return [];
@@ -63,18 +51,11 @@ export class PendingL1ToL2MessageStore extends L1ToL2MessageStore {
         }
         return messages;
     }
-    removeMessage(messageKey, l1BlockNumber, messageIndex) {
+    removeMessage(messageKey) {
         // ignore 0 - messageKey is a hash, so a 0 can probabilistically never occur. It is best to skip it.
         if (messageKey.equals(Fr.ZERO)) {
             return;
         }
-        if (this.cancelledMessagesByBlock.has(`${l1BlockNumber}-${messageIndex}`)) {
-            return;
-        }
-        this.cancelledMessagesByBlock.add(`${l1BlockNumber}-${messageIndex}`);
-        this.removeMessageUnsafe(messageKey);
-    }
-    removeMessageUnsafe(messageKey) {
         const messageKeyBigInt = messageKey.value;
         const msgAndCount = this.store.get(messageKeyBigInt);
         if (!msgAndCount) {
@@ -88,4 +69,4 @@ export class PendingL1ToL2MessageStore extends L1ToL2MessageStore {
         }
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfdG9fbDJfbWVzc2FnZV9zdG9yZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9hcmNoaXZlci9tZW1vcnlfYXJjaGl2ZXJfc3RvcmUvbDFfdG9fbDJfbWVzc2FnZV9zdG9yZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFHOUM7OztHQUdHO0FBQ0gsTUFBTSxPQUFPLGtCQUFrQjtJQVE3QjtRQVBBOzs7V0FHRztRQUNPLFVBQUssR0FBdUMsSUFBSSxHQUFHLEVBQUUsQ0FBQztRQUN4RCxvQkFBZSxHQUFHLElBQUksR0FBRyxFQUFVLENBQUM7SUFFN0IsQ0FBQztJQUVoQixVQUFVLENBQUMsVUFBYyxFQUFFLE9BQXNCLEVBQUUsYUFBcUIsRUFBRSxZQUFvQjtRQUM1RixJQUFJLElBQUksQ0FBQyxlQUFlLENBQUMsR0FBRyxDQUFDLEdBQUcsYUFBYSxJQUFJLFlBQVksRUFBRSxDQUFDLEVBQUU7WUFDaEUsT0FBTztTQUNSO1FBQ0QsSUFBSSxDQUFDLGVBQWUsQ0FBQyxHQUFHLENBQUMsR0FBRyxhQUFhLElBQUksWUFBWSxFQUFFLENBQUMsQ0FBQztRQUU3RCxJQUFJLENBQUMsZ0JBQWdCLENBQUMsVUFBVSxFQUFFLE9BQU8sQ0FBQyxDQUFDO0lBQzdDLENBQUM7SUFFRCxnQkFBZ0IsQ0FBQyxVQUFjLEVBQUUsT0FBc0I7UUFDckQsTUFBTSxnQkFBZ0IsR0FBRyxVQUFVLENBQUMsS0FBSyxDQUFDO1FBQzFDLE1BQU0sV0FBVyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLGdCQUFnQixDQUFDLENBQUM7UUFDckQsSUFBSSxXQUFXLEVBQUU7WUFDZixXQUFXLENBQUMsS0FBSyxFQUFFLENBQUM7U0FDckI7YUFBTTtZQUNMLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLGdCQUFnQixFQUFFLEVBQUUsT0FBTyxFQUFFLEtB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfdG9fbDJfbWVzc2FnZV9zdG9yZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9hcmNoaXZlci9tZW1vcnlfYXJjaGl2ZXJfc3RvcmUvbDFfdG9fbDJfbWVzc2FnZV9zdG9yZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFOUM7OztHQUdHO0FBQ0gsTUFBTSxPQUFPLGtCQUFrQjtJQU83QjtRQU5BOzs7V0FHRztRQUNPLFVBQUssR0FBdUMsSUFBSSxHQUFHLEVBQUUsQ0FBQztJQUVqRCxDQUFDO0lBRWhCLFVBQVUsQ0FBQyxVQUFjLEVBQUUsT0FBc0I7UUFDL0MsTUFBTSxnQkFBZ0IsR0FBRyxVQUFVLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDL0MsTUFBTSxXQUFXLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsZ0JBQWdCLENBQUMsQ0FBQztRQUNyRCxJQUFJLFdBQVcsRUFBRTtZQUNmLFdBQVcsQ0FBQyxLQUFLLEVBQUUsQ0FBQztTQUNyQjthQUFNO1lBQ0wsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsZ0JBQWdCLEVBQUUsRUFBRSxPQUFPLEVBQUUsS0FBSyxFQUFFLENBQUMsRUFBRSxDQUFDLENBQUM7U0FDekQ7SUFDSCxDQUFDO0lBRUQsVUFBVSxDQUFDLFVBQWM7UUFDdkIsT0FBTyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUMsS0FBSyxDQUFDLEVBQUUsT0FBTyxDQUFDO0lBQ25ELENBQUM7SUFFRCxrQkFBa0IsQ0FBQyxVQUFjO1FBQy9CLE9BQU8sSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQzFDLENBQUM7Q0FDRjtBQUVEOzs7R0FHRztBQUNILE1BQU0sT0FBTyx5QkFBMEIsU0FBUSxrQkFBa0I7SUFDL0QsY0FBYyxDQUFDLEtBQWE7UUFDMUIsSUFBSSxLQUFLLEdBQUcsQ0FBQyxFQUFFO1lBQ2IsT0FBTyxFQUFFLENBQUM7U0FDWDtRQUNELHdFQUF3RTtRQUN4RSxvSEFBb0g7UUFDcEgsTUFBTSxRQUFRLEdBQVMsRUFBRSxDQUFDO1FBQzFCLE1BQU0sY0FBYyxHQUFHLEtBQUssQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsR0FBRyxHQUFHLENBQUMsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDckcsS0FBSyxNQUFNLGVBQWUsSUFBSSxjQUFjLEVBQUU7WUFDNUMsS0FBSyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxHQUFHLGVBQWUsQ0FBQyxLQUFLLEVBQUUsQ0FBQyxFQUFFLEVBQUU7Z0JBQzlDLFFBQVEsQ0FBQyxJQUFJLENBQUMsZUFBZSxDQUFDLE9BQU8sQ0FBQyxRQUFTLENBQUMsQ0FBQztnQkFDakQsSUFBSSxRQUFRLENBQUMsTUFBTSxLQUFLLEtBQUssRUFBRTtvQkFDN0IsT0FBTyxRQUFRLENBQUM7aUJBQ2pCO2FBQ0Y7U0FDRjtRQUNELE9BQU8sUUFBUSxDQUFDO0lBQ2xCLENBQUM7SUFFRCxhQUFhLENBQUMsVUFBYztRQUMxQixvR0FBb0c7UUFDcEcsSUFBSSxVQUFVLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsRUFBRTtZQUM5QixPQUFPO1NBQ1I7UUFFRCxNQUFNLGdCQUFnQixHQUFHLFVBQVUsQ0FBQyxLQUFLLENBQUM7UUFDMUMsTUFBTSxXQUFXLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsZ0JBQWdCLENBQUMsQ0FBQztRQUNyRCxJQUFJLENBQUMsV0FBVyxFQUFFO1lBQ2hCLE1BQU0sSUFBSSxLQUFLLENBQUMsdURBQXVELGdCQUFnQixxQkFBcUIsQ0FBQyxDQUFDO1NBQy9HO1FBQ0QsSUFBSSxXQUFXLENBQUMsS0FBSyxHQUFHLENBQUMsRUFBRTtZQUN6QixXQUFXLENBQUMsS0FBSyxFQUFFLENBQUM7U0FDckI7YUFBTTtZQUNMLElBQUksQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLGdCQUFnQixDQUFDLENBQUM7U0FDckM7SUFDSCxDQUFDO0NBQ0YifQ==

package/dest/archiver/memory_archiver_store/memory_archiver_store.d.ts

@@ -1,6 +1,6 @@
+import { ContractData, ExtendedContractData, GetUnencryptedLogsResponse, L1ToL2Message, L2Block, L2BlockL2Logs, L2Tx, LogFilter, LogType, TxHash } from '@aztec/circuit-types';
 import { Fr } from '@aztec/circuits.js';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
-import { CancelledL1ToL2Message, ContractData, ExtendedContractData, GetUnencryptedLogsResponse, L1ToL2Message, L2Block, L2BlockL2Logs, L2Tx, LogFilter, LogType, PendingL1ToL2Message, TxHash } from '@aztec/types';
 import { ArchiverDataStore } from '../archiver_store.js';
 /**
  * Simple, in-memory implementation of an archiver data store.
@@ -43,6 +43,8 @@ export declare class MemoryArchiverStore implements ArchiverDataStore {
      * Contains all the pending L1 to L2 messages (accounts for duplication of messages)
      */
     private pendingL1ToL2Messages;
+    private lastL1BlockAddedMessages;
+    private lastL1BlockCancelledMessages;
     constructor(
     /** The max number of logs that can be obtained in 1 "getUnencryptedLogs" call. */
     maxLogs: number);
@@ -63,15 +65,17 @@ export declare class MemoryArchiverStore implements ArchiverDataStore {
     /**
      * Append new pending L1 to L2 messages to the store.
      * @param messages - The L1 to L2 messages to be added to the store.
+     * @param l1BlockNumber - The L1 block number for which to add the messages.
      * @returns True if the operation is successful (always in this implementation).
      */
-    addPendingL1ToL2Messages(messages: PendingL1ToL2Message[]): Promise<boolean>;
+    addPendingL1ToL2Messages(messages: L1ToL2Message[], l1BlockNumber: bigint): Promise<boolean>;
     /**
      * Remove pending L1 to L2 messages from the store (if they were cancelled).
      * @param messages - The message keys to be removed from the store.
+     * @param l1BlockNumber - The L1 block number for which to remove the messages.
      * @returns True if the operation is successful (always in this implementation).
      */
-    cancelPendingL1ToL2Messages(messages: CancelledL1ToL2Message[]): Promise<boolean>;
+    cancelPendingL1ToL2Messages(messages: Fr[], l1BlockNumber: bigint): Promise<boolean>;
     /**
      * Messages that have been published in an L2 block are confirmed.
      * Add them to the confirmed store, also remove them from the pending store.
@@ -158,6 +162,10 @@ export declare class MemoryArchiverStore implements ArchiverDataStore {
      * @returns The number of the latest L2 block processed.
      */
     getBlockNumber(): Promise<number>;
-    getL1BlockNumber(): Promise<bigint>;
+    getL1BlockNumber(): Promise<{
+        addedBlock: bigint;
+        addedMessages: bigint;
+        cancelledMessages: bigint;
+    }>;
 }
 //# sourceMappingURL=memory_archiver_store.d.ts.map

package/dest/archiver/memory_archiver_store/memory_archiver_store.d.ts.map

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