@aztec/archiver 0.28.1 → 0.30.0

package/dest/archiver/kv_archiver_store/message_store.js

@@ -1,7 +1,6 @@
-var _MessageStore_newMessages, _MessageStore_lastL1BlockNewMessages, _MessageStore_pendingMessagesByFee, _MessageStore_messages, _MessageStore_lastL1BlockAddingMessages, _MessageStore_lastL1BlockCancellingMessages, _MessageStore_log, _MessageStore_l1ToL2MessagesSubtreeSize;
+var _MessageStore_l1ToL2Messages, _MessageStore_l1ToL2MessageIndices, _MessageStore_lastL1BlockMessages, _MessageStore_log, _MessageStore_l1ToL2MessagesSubtreeSize;
 import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
-import { L1ToL2Message } from '@aztec/circuit-types';
-import { Fr, L1_TO_L2_MSG_SUBTREE_HEIGHT } from '@aztec/circuits.js';
+import { Fr, INITIAL_L2_BLOCK_NUM, L1_TO_L2_MSG_SUBTREE_HEIGHT, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, } from '@aztec/circuits.js';
 import { createDebugLogger } from '@aztec/foundation/log';
 /**
  * LMDB implementation of the ArchiverDataStore interface.
@@ -9,171 +8,63 @@ import { createDebugLogger } from '@aztec/foundation/log';
 export class MessageStore {
     constructor(db) {
         this.db = db;
-        _MessageStore_newMessages.set(this, void 0);
-        _MessageStore_lastL1BlockNewMessages.set(this, void 0);
-        // TODO(#4492): Nuke the following when purging the old inbox
-        _MessageStore_pendingMessagesByFee.set(this, void 0);
-        _MessageStore_messages.set(this, void 0);
-        _MessageStore_lastL1BlockAddingMessages.set(this, void 0);
-        _MessageStore_lastL1BlockCancellingMessages.set(this, void 0);
+        _MessageStore_l1ToL2Messages.set(this, void 0);
+        _MessageStore_l1ToL2MessageIndices.set(this, void 0);
+        _MessageStore_lastL1BlockMessages.set(this, void 0);
         _MessageStore_log.set(this, createDebugLogger('aztec:archiver:message_store'));
         _MessageStore_l1ToL2MessagesSubtreeSize.set(this, 2 ** L1_TO_L2_MSG_SUBTREE_HEIGHT);
-        __classPrivateFieldSet(this, _MessageStore_newMessages, db.openMap('archiver_l1_to_l2_new_messages'), "f");
-        __classPrivateFieldSet(this, _MessageStore_messages, db.openMap('archiver_l1_to_l2_messages'), "f");
-        __classPrivateFieldSet(this, _MessageStore_pendingMessagesByFee, db.openCounter('archiver_messages_by_fee'), "f");
-        __classPrivateFieldSet(this, _MessageStore_lastL1BlockNewMessages, db.openSingleton('archiver_last_l1_block_new_messages'), "f");
-        __classPrivateFieldSet(this, _MessageStore_lastL1BlockAddingMessages, db.openSingleton('archiver_last_l1_block_adding_messages'), "f");
-        __classPrivateFieldSet(this, _MessageStore_lastL1BlockCancellingMessages, db.openSingleton('archiver_last_l1_block_cancelling_messages'), "f");
+        __classPrivateFieldSet(this, _MessageStore_l1ToL2Messages, db.openMap('archiver_l1_to_l2_messages'), "f");
+        __classPrivateFieldSet(this, _MessageStore_l1ToL2MessageIndices, db.openMap('archiver_l1_to_l2_message_indices'), "f");
+        __classPrivateFieldSet(this, _MessageStore_lastL1BlockMessages, db.openSingleton('archiver_last_l1_block_new_messages'), "f");
     }
     /**
-     * Gets the last L1 block number that emitted new messages and the block that cancelled messages.
+     * Gets the last L1 block number that emitted new messages.
      * @returns The last L1 block number processed
      */
-    getL1BlockNumber() {
-        return {
-            newMessages: __classPrivateFieldGet(this, _MessageStore_lastL1BlockNewMessages, "f").get() ?? 0n,
-            // TODO(#4492): Nuke the following when purging the old inbox
-            addedMessages: __classPrivateFieldGet(this, _MessageStore_lastL1BlockAddingMessages, "f").get() ?? 0n,
-            cancelledMessages: __classPrivateFieldGet(this, _MessageStore_lastL1BlockCancellingMessages, "f").get() ?? 0n,
-        };
+    getSynchedL1BlockNumber() {
+        return __classPrivateFieldGet(this, _MessageStore_lastL1BlockMessages, "f").get() ?? 0n;
     }
     /**
-     * Append new L1 to L2 messages to the store.
-     * @param messages - The L1 to L2 messages to be added to the store.
-     * @param lastMessageL1BlockNumber - The L1 block number in which the last message was emitted.
+     * 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.
      */
-    addNewL1ToL2Messages(messages, lastMessageL1BlockNumber) {
+    addL1ToL2Messages(messages) {
         return this.db.transaction(() => {
-            const lastL1BlockNumber = __classPrivateFieldGet(this, _MessageStore_lastL1BlockNewMessages, "f").get() ?? 0n;
-            if (lastL1BlockNumber >= lastMessageL1BlockNumber) {
+            const lastL1BlockNumber = __classPrivateFieldGet(this, _MessageStore_lastL1BlockMessages, "f").get() ?? 0n;
+            if (lastL1BlockNumber >= messages.lastProcessedL1BlockNumber) {
                 return false;
             }
-            void __classPrivateFieldGet(this, _MessageStore_lastL1BlockNewMessages, "f").set(lastMessageL1BlockNumber);
-            for (const message of messages) {
+            void __classPrivateFieldGet(this, _MessageStore_lastL1BlockMessages, "f").set(messages.lastProcessedL1BlockNumber);
+            for (const message of messages.retrievedData) {
                 if (message.index >= __classPrivateFieldGet(this, _MessageStore_l1ToL2MessagesSubtreeSize, "f")) {
                     throw new Error(`Message index ${message.index} out of subtree range`);
                 }
                 const key = `${message.blockNumber}-${message.index}`;
-                void __classPrivateFieldGet(this, _MessageStore_newMessages, "f").setIfNotExists(key, message.leaf.toBuffer());
+                void __classPrivateFieldGet(this, _MessageStore_l1ToL2Messages, "f").setIfNotExists(key, message.leaf.toBuffer());
+                const indexInTheWholeTree = (message.blockNumber - BigInt(INITIAL_L2_BLOCK_NUM)) * BigInt(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP) +
+                    message.index;
+                void __classPrivateFieldGet(this, _MessageStore_l1ToL2MessageIndices, "f").setIfNotExists(message.leaf.toString(), indexInTheWholeTree);
             }
             return true;
         });
     }
     /**
-     * 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.
-     */
-    addPendingMessages(messages, l1BlockNumber) {
-        return this.db.transaction(() => {
-            const lastL1BlockNumber = __classPrivateFieldGet(this, _MessageStore_lastL1BlockAddingMessages, "f").get() ?? 0n;
-            if (lastL1BlockNumber >= l1BlockNumber) {
-                return false;
-            }
-            void __classPrivateFieldGet(this, _MessageStore_lastL1BlockAddingMessages, "f").set(l1BlockNumber);
-            for (const message of messages) {
-                const entryKey = message.entryKey?.toString();
-                if (!entryKey) {
-                    throw new Error('Message does not have an entry key');
-                }
-                void __classPrivateFieldGet(this, _MessageStore_messages, "f").setIfNotExists(entryKey, {
-                    message: message.toBuffer(),
-                    fee: message.fee,
-                    confirmed: false,
-                });
-                void __classPrivateFieldGet(this, _MessageStore_pendingMessagesByFee, "f").update([message.fee, entryKey], 1);
-            }
-            return true;
-        });
-    }
-    /**
-     * Remove pending L1 to L2 messages from the store (if they were cancelled).
-     * @param entryKeys - The entry 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.
+     * 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).
      */
-    cancelPendingMessages(entryKeys, l1BlockNumber) {
-        return this.db.transaction(() => {
-            const lastL1BlockNumber = __classPrivateFieldGet(this, _MessageStore_lastL1BlockCancellingMessages, "f").get() ?? 0n;
-            if (lastL1BlockNumber >= l1BlockNumber) {
-                return false;
-            }
-            void __classPrivateFieldGet(this, _MessageStore_lastL1BlockCancellingMessages, "f").set(l1BlockNumber);
-            for (const entryKey of entryKeys) {
-                const messageCtx = __classPrivateFieldGet(this, _MessageStore_messages, "f").get(entryKey.toString());
-                if (!messageCtx) {
-                    throw new Error(`Message ${entryKey.toString()} not found`);
-                }
-                void __classPrivateFieldGet(this, _MessageStore_pendingMessagesByFee, "f").update([messageCtx.fee, entryKey.toString()], -1);
-            }
-            return true;
-        });
-    }
-    /**
-     * Messages that have been published in an L2 block are confirmed.
-     * Add them to the confirmed store, also remove them from the pending store.
-     * @param entryKeys - The entry keys to be removed from the store.
-     * @returns True if the operation is successful.
-     */
-    confirmPendingMessages(entryKeys) {
-        return this.db.transaction(() => {
-            for (const entryKey of entryKeys) {
-                if (entryKey.equals(Fr.ZERO)) {
-                    continue;
-                }
-                const messageCtx = __classPrivateFieldGet(this, _MessageStore_messages, "f").get(entryKey.toString());
-                if (!messageCtx) {
-                    throw new Error(`Message ${entryKey.toString()} not found`);
-                }
-                messageCtx.confirmed = true;
-                void __classPrivateFieldGet(this, _MessageStore_messages, "f").set(entryKey.toString(), messageCtx);
-                void __classPrivateFieldGet(this, _MessageStore_pendingMessagesByFee, "f").update([messageCtx.fee, entryKey.toString()], -1);
-            }
-            return true;
-        });
-    }
-    /**
-     * Gets the confirmed L1 to L2 message corresponding to the given entry key.
-     * @param entryKey - The entry key to look up.
-     * @returns The requested L1 to L2 message or throws if not found.
-     */
-    getConfirmedMessage(entryKey) {
-        const messageCtx = __classPrivateFieldGet(this, _MessageStore_messages, "f").get(entryKey.toString());
-        if (!messageCtx) {
-            throw new Error(`Message ${entryKey.toString()} not found`);
-        }
-        if (!messageCtx.confirmed) {
-            throw new Error(`Message ${entryKey.toString()} not confirmed`);
-        }
-        return L1ToL2Message.fromBuffer(messageCtx.message);
-    }
-    /**
-     * Gets up to `limit` amount of pending L1 to L2 messages, sorted by fee
-     * @param limit - The number of messages to return (by default NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP).
-     * @returns The requested L1 to L2 entry keys.
-     */
-    getPendingEntryKeysByFee(limit) {
-        const entryKeys = [];
-        for (const [[_, entryKey], count] of __classPrivateFieldGet(this, _MessageStore_pendingMessagesByFee, "f").entries({
-            reverse: true,
-        })) {
-            // put `count` copies of this message in the result list
-            entryKeys.push(...Array(count).fill(Fr.fromString(entryKey)));
-            if (entryKeys.length >= limit) {
-                break;
-            }
-        }
-        return entryKeys;
+    getL1ToL2MessageIndex(l1ToL2Message) {
+        const index = __classPrivateFieldGet(this, _MessageStore_l1ToL2MessageIndices, "f").get(l1ToL2Message.toString());
+        return Promise.resolve(index);
     }
-    getNewL1ToL2Messages(blockNumber) {
+    getL1ToL2Messages(blockNumber) {
         const messages = [];
         let undefinedMessageFound = false;
         for (let messageIndex = 0; messageIndex < __classPrivateFieldGet(this, _MessageStore_l1ToL2MessagesSubtreeSize, "f"); messageIndex++) {
             // This is inefficient but probably fine for now.
             const key = `${blockNumber}-${messageIndex}`;
-            const message = __classPrivateFieldGet(this, _MessageStore_newMessages, "f").get(key);
+            const message = __classPrivateFieldGet(this, _MessageStore_l1ToL2Messages, "f").get(key);
             if (message) {
                 if (undefinedMessageFound) {
                     throw new Error(`L1 to L2 message gap found in block ${blockNumber}`);
@@ -189,5 +80,5 @@ export class MessageStore {
         return messages;
     }
 }
-_MessageStore_newMessages = new WeakMap(), _MessageStore_lastL1BlockNewMessages = new WeakMap(), _MessageStore_pendingMessagesByFee = new WeakMap(), _MessageStore_messages = new WeakMap(), _MessageStore_lastL1BlockAddingMessages = new WeakMap(), _MessageStore_lastL1BlockCancellingMessages = new WeakMap(), _MessageStore_log = new WeakMap(), _MessageStore_l1ToL2MessagesSubtreeSize = new WeakMap();
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVzc2FnZV9zdG9yZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9hcmNoaXZlci9rdl9hcmNoaXZlcl9zdG9yZS9tZXNzYWdlX3N0b3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsT0FBTyxFQUFFLGFBQWEsRUFBZ0IsTUFBTSxzQkFBc0IsQ0FBQztBQUNuRSxPQUFPLEVBQUUsRUFBRSxFQUFFLDJCQUEyQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDckUsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFlMUQ7O0dBRUc7QUFDSCxNQUFNLE9BQU8sWUFBWTtJQWF2QixZQUFvQixFQUFnQjtRQUFoQixPQUFFLEdBQUYsRUFBRSxDQUFjO1FBWnBDLDRDQUF1QztRQUN2Qyx1REFBZ0Q7UUFDaEQsNkRBQTZEO1FBQzdELHFEQUFzRDtRQUN0RCx5Q0FBcUM7UUFDckMsMERBQW1EO1FBQ25ELDhEQUF1RDtRQUV2RCw0QkFBTyxpQkFBaUIsQ0FBQyw4QkFBOEIsQ0FBQyxFQUFDO1FBRXpELGtEQUE2QixDQUFDLElBQUksMkJBQTJCLEVBQUM7UUFHNUQsdUJBQUEsSUFBSSw2QkFBZ0IsRUFBRSxDQUFDLE9BQU8sQ0FBQyxnQ0FBZ0MsQ0FBQyxNQUFBLENBQUM7UUFDakUsdUJBQUEsSUFBSSwwQkFBYSxFQUFFLENBQUMsT0FBTyxDQUFDLDRCQUE0QixDQUFDLE1BQUEsQ0FBQztRQUMxRCx1QkFBQSxJQUFJLHNDQUF5QixFQUFFLENBQUMsV0FBVyxDQUFDLDBCQUEwQixDQUFDLE1BQUEsQ0FBQztRQUN4RSx1QkFBQSxJQUFJLHdDQUEyQixFQUFFLENBQUMsYUFBYSxDQUFDLHFDQUFxQyxDQUFDLE1BQUEsQ0FBQztRQUN2Rix1QkFBQSxJQUFJLDJDQUE4QixFQUFFLENBQUMsYUFBYSxDQUFDLHdDQUF3QyxDQUFDLE1BQUEsQ0FBQztRQUM3Rix1QkFBQSxJQUFJLCtDQUFrQyxFQUFFLENBQUMs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
+_MessageStore_l1ToL2Messages = new WeakMap(), _MessageStore_l1ToL2MessageIndices = new WeakMap(), _MessageStore_lastL1BlockMessages = new WeakMap(), _MessageStore_log = new WeakMap(), _MessageStore_l1ToL2MessagesSubtreeSize = new WeakMap();
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVzc2FnZV9zdG9yZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9hcmNoaXZlci9rdl9hcmNoaXZlcl9zdG9yZS9tZXNzYWdlX3N0b3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQ0EsT0FBTyxFQUNMLEVBQUUsRUFDRixvQkFBb0IsRUFDcEIsMkJBQTJCLEVBQzNCLG1DQUFtQyxHQUNwQyxNQUFNLG9CQUFvQixDQUFDO0FBQzVCLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBSzFEOztHQUVHO0FBQ0gsTUFBTSxPQUFPLFlBQVk7SUFTdkIsWUFBb0IsRUFBZ0I7UUFBaEIsT0FBRSxHQUFGLEVBQUUsQ0FBYztRQVJwQywrQ0FBMEM7UUFDMUMscURBQWdEO1FBQ2hELG9EQUE2QztRQUU3Qyw0QkFBTyxpQkFBaUIsQ0FBQyw4QkFBOEIsQ0FBQyxFQUFDO1FBRXpELGtEQUE2QixDQUFDLElBQUksMkJBQTJCLEVBQUM7UUFHNUQsdUJBQUEsSUFBSSxnQ0FBbUIsRUFBRSxDQUFDLE9BQU8sQ0FBQyw0QkFBNEIsQ0FBQyxNQUFBLENBQUM7UUFDaEUsdUJBQUEsSUFBSSxzQ0FBeUIsRUFBRSxDQUFDLE9BQU8sQ0FBQyxtQ0FBbUMsQ0FBQyxNQUFBLENBQUM7UUFDN0UsdUJBQUEsSUFBSSxxQ0FBd0IsRUFBRSxDQUFDLGFBQWEsQ0FBQyxxQ0FBcUMsQ0FBQyxNQUFBLENBQUM7SUFDdEYsQ0FBQztJQUVEOzs7T0FHRztJQUNILHVCQUF1QjtRQUNyQixPQUFPLHVCQUFBLElBQUkseUNBQXFCLENBQUMsR0FBRyxFQUFFLElBQUksRUFBRSxDQUFDO0lBQy9DLENBQUM7SUFFRDs7OztPQUlHO0lBQ0gsaUJBQWlCLENBQUMsUUFBa0M7UUFDbEQsT0FBTyxJQUFJLENBQUMsRUFBRSxDQUFDLFdBQVcsQ0FBQyxHQUFHLEVBQUU7WUFDOUIsTUFBTSxpQkFBaUIsR0FBRyx1QkFBQSxJQUFJLHlDQUFxQixD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

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

@@ -1,11 +1,9 @@
-import { L1ToL2Message, NewInboxLeaf } from '@aztec/circuit-types';
+import { InboxLeaf } from '@aztec/circuit-types';
 import { Fr } from '@aztec/foundation/fields';
 /**
- * A simple in-memory implementation of an L1 to L2 message store
- * that handles message duplication.
- * TODO(#4492): Clean this up
+ * A simple in-memory implementation of an L1 to L2 message store.
  */
-export declare class NewL1ToL2MessageStore {
+export declare class L1ToL2MessageStore {
     #private;
     /**
      * A map containing the entry key to the corresponding L1 to L2
@@ -13,44 +11,13 @@ export declare class NewL1ToL2MessageStore {
      */
     protected store: Map<string, Fr>;
     constructor();
-    addMessage(message: NewInboxLeaf): void;
+    addMessage(message: InboxLeaf): void;
     getMessages(blockNumber: bigint): Fr[];
-}
-/**
- * A simple in-memory implementation of an L1 to L2 message store
- * that handles message duplication.
- */
-export declare class L1ToL2MessageStore {
     /**
-     * A map containing the entry key to the corresponding L1 to L2
-     * messages (and the number of times the message has been seen).
+     * 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).
      */
-    protected store: Map<bigint, L1ToL2MessageAndCount>;
-    constructor();
-    addMessage(entryKey: Fr, message: L1ToL2Message): void;
-    getMessage(entryKey: Fr): L1ToL2Message | undefined;
-    getMessageAndCount(entryKey: Fr): L1ToL2MessageAndCount | undefined;
+    getMessageIndex(l1ToL2Message: Fr): bigint | undefined;
 }
-/**
- * Specifically for the store that will hold pending messages
- * for removing messages or fetching multiple messages.
- */
-export declare class PendingL1ToL2MessageStore extends L1ToL2MessageStore {
-    getEntryKeys(limit: number): Fr[];
-    removeMessage(entryKey: Fr): void;
-}
-/**
- * Useful to keep track of the number of times a message has been seen.
- */
-type L1ToL2MessageAndCount = {
-    /**
-     * The message.
-     */
-    message: L1ToL2Message;
-    /**
-     * The number of times the message has been seen.
-     */
-    count: number;
-};
-export {};
 //# sourceMappingURL=l1_to_l2_message_store.d.ts.map

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,aAAa,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEnE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C;;;;GAIG;AACH,qBAAa,qBAAqB;;IAChC;;;OAGG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC,CAAa;;IAM7C,UAAU,CAAC,OAAO,EAAE,YAAY;IAQhC,WAAW,CAAC,WAAW,EAAE,MAAM,GAAG,EAAE,EAAE;CAoBvC;AAED;;;GAGG;AACH,qBAAa,kBAAkB;IAC7B;;;OAGG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAa;;IAIhE,UAAU,CAAC,QAAQ,EAAE,EAAE,EAAE,OAAO,EAAE,aAAa;IAU/C,UAAU,CAAC,QAAQ,EAAE,EAAE,GAAG,aAAa,GAAG,SAAS;IAInD,kBAAkB,CAAC,QAAQ,EAAE,EAAE,GAAG,qBAAqB,GAAG,SAAS;CAGpE;AAED;;;GAGG;AACH,qBAAa,yBAA0B,SAAQ,kBAAkB;IAC/D,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,EAAE,EAAE;IAmBjC,aAAa,CAAC,QAAQ,EAAE,EAAE;CAiB3B;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,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAMjD,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C;;GAEG;AACH,qBAAa,kBAAkB;;IAC7B;;;OAGG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC,CAAa;;IAM7C,UAAU,CAAC,OAAO,EAAE,SAAS;IAQ7B,WAAW,CAAC,WAAW,EAAE,MAAM,GAAG,EAAE,EAAE;IAqBtC;;;;OAIG;IACH,eAAe,CAAC,aAAa,EAAE,EAAE,GAAG,MAAM,GAAG,SAAS;CAYvD"}

package/dest/archiver/memory_archiver_store/l1_to_l2_message_store.js

@@ -1,23 +1,20 @@
-var _NewL1ToL2MessageStore_l1ToL2MessagesSubtreeSize;
+var _L1ToL2MessageStore_l1ToL2MessagesSubtreeSize;
 import { __classPrivateFieldGet } from "tslib";
-import { L1_TO_L2_MSG_SUBTREE_HEIGHT } from '@aztec/circuits.js/constants';
-import { Fr } from '@aztec/foundation/fields';
+import { INITIAL_L2_BLOCK_NUM, L1_TO_L2_MSG_SUBTREE_HEIGHT, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, } from '@aztec/circuits.js/constants';
 /**
- * A simple in-memory implementation of an L1 to L2 message store
- * that handles message duplication.
- * TODO(#4492): Clean this up
+ * A simple in-memory implementation of an L1 to L2 message store.
  */
-export class NewL1ToL2MessageStore {
+export class L1ToL2MessageStore {
     constructor() {
         /**
          * A map containing the entry key to the corresponding L1 to L2
          * messages (and the number of times the message has been seen).
          */
         this.store = new Map();
-        _NewL1ToL2MessageStore_l1ToL2MessagesSubtreeSize.set(this, 2 ** L1_TO_L2_MSG_SUBTREE_HEIGHT);
+        _L1ToL2MessageStore_l1ToL2MessagesSubtreeSize.set(this, 2 ** L1_TO_L2_MSG_SUBTREE_HEIGHT);
     }
     addMessage(message) {
-        if (message.index >= __classPrivateFieldGet(this, _NewL1ToL2MessageStore_l1ToL2MessagesSubtreeSize, "f")) {
+        if (message.index >= __classPrivateFieldGet(this, _L1ToL2MessageStore_l1ToL2MessagesSubtreeSize, "f")) {
             throw new Error(`Message index ${message.index} out of subtree range`);
         }
         const key = `${message.blockNumber}-${message.index}`;
@@ -26,7 +23,7 @@ export class NewL1ToL2MessageStore {
     getMessages(blockNumber) {
         const messages = [];
         let undefinedMessageFound = false;
-        for (let messageIndex = 0; messageIndex < __classPrivateFieldGet(this, _NewL1ToL2MessageStore_l1ToL2MessagesSubtreeSize, "f"); messageIndex++) {
+        for (let messageIndex = 0; messageIndex < __classPrivateFieldGet(this, _L1ToL2MessageStore_l1ToL2MessagesSubtreeSize, "f"); messageIndex++) {
             // This is inefficient but probably fine for now.
             const key = `${blockNumber}-${messageIndex}`;
             const message = this.store.get(key);
@@ -44,76 +41,22 @@ export class NewL1ToL2MessageStore {
         }
         return messages;
     }
-}
-_NewL1ToL2MessageStore_l1ToL2MessagesSubtreeSize = new WeakMap();
-/**
- * A simple in-memory implementation of an L1 to L2 message store
- * that handles message duplication.
- */
-export class L1ToL2MessageStore {
-    constructor() {
-        /**
-         * A map containing the entry key to the corresponding L1 to L2
-         * messages (and the number of times the message has been seen).
-         */
-        this.store = new Map();
-    }
-    addMessage(entryKey, message) {
-        const entryKeyBigInt = entryKey.toBigInt();
-        const msgAndCount = this.store.get(entryKeyBigInt);
-        if (msgAndCount) {
-            msgAndCount.count++;
-        }
-        else {
-            this.store.set(entryKeyBigInt, { message, count: 1 });
-        }
-    }
-    getMessage(entryKey) {
-        return this.store.get(entryKey.value)?.message;
-    }
-    getMessageAndCount(entryKey) {
-        return this.store.get(entryKey.value);
-    }
-}
-/**
- * Specifically for the store that will hold pending messages
- * for removing messages or fetching multiple messages.
- */
-export class PendingL1ToL2MessageStore extends L1ToL2MessageStore {
-    getEntryKeys(limit) {
-        if (limit < 1) {
-            return [];
-        }
-        // fetch `limit` number of messages from the store with the highest fee.
-        // Note the store has multiple of the same message. So if a message has count 2, include both of them in the result:
-        const messages = [];
-        const sortedMessages = Array.from(this.store.values()).sort((a, b) => b.message.fee - a.message.fee);
-        for (const messageAndCount of sortedMessages) {
-            for (let i = 0; i < messageAndCount.count; i++) {
-                messages.push(messageAndCount.message.entryKey);
-                if (messages.length === limit) {
-                    return messages;
-                }
+    /**
+     * 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).
+     */
+    getMessageIndex(l1ToL2Message) {
+        for (const [key, message] of this.store.entries()) {
+            if (message.equals(l1ToL2Message)) {
+                const [blockNumber, messageIndex] = key.split('-');
+                const indexInTheWholeTree = (BigInt(blockNumber) - BigInt(INITIAL_L2_BLOCK_NUM)) * BigInt(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP) +
+                    BigInt(messageIndex);
+                return indexInTheWholeTree;
             }
         }
-        return messages;
-    }
-    removeMessage(entryKey) {
-        // ignore 0 - entryKey is a hash, so a 0 can probabilistically never occur. It is best to skip it.
-        if (entryKey.equals(Fr.ZERO)) {
-            return;
-        }
-        const entryKeyBigInt = entryKey.value;
-        const msgAndCount = this.store.get(entryKeyBigInt);
-        if (!msgAndCount) {
-            throw new Error(`Unable to remove message: L1 to L2 Message with key ${entryKeyBigInt} not found in store`);
-        }
-        if (msgAndCount.count > 1) {
-            msgAndCount.count--;
-        }
-        else {
-            this.store.delete(entryKeyBigInt);
-        }
+        return undefined;
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfdG9fbDJfbWVzc2FnZV9zdG9yZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9hcmNoaXZlci9tZW1vcnlfYXJjaGl2ZXJfc3RvcmUvbDFfdG9fbDJfbWVzc2FnZV9zdG9yZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUNBLE9BQU8sRUFBRSwyQkFBMkIsRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBQzNFLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUU5Qzs7OztHQUlHO0FBQ0gsTUFBTSxPQUFPLHFCQUFxQjtJQVNoQztRQVJBOzs7V0FHRztRQUNPLFVBQUssR0FBb0IsSUFBSSxHQUFHLEVBQUUsQ0FBQztRQUU3QywyREFBNkIsQ0FBQyxJQUFJLDJCQUEyQixFQUFDO0lBRS9DLENBQUM7SUFFaEIsVUFBVSxDQUFDLE9BQXFCO1FBQzlCLElBQUksT0FBTyxDQUFDLEtBQUssSUFBSSx1QkFBQSxJQUFJLHdEQUEyQixFQUFFLENBQUM7WUFDckQsTUFBTSxJQUFJLEtBQUssQ0FBQyxpQkFBaUIsT0FBTyxDQUFDLEtBQUssdUJBQXVCLENBQUMsQ0FBQztRQUN6RSxDQUFDO1FBQ0QsTUFBTSxHQUFHLEdBQUcsR0FBRyxPQUFPLENBQUMsV0FBVyxJQUFJLE9BQU8sQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUN0RCxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxHQUFHLEVBQUUsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3BDLENBQUM7SUFFRCxXQUFXLENBQUMsV0FBbUI7UUFDN0IsTUFBTSxRQUFRLEdBQVMsRUFBRSxDQUFDO1FBQzFCLElBQUkscUJBQXFCLEdBQUcsS0FBSyxDQUFDO1FBQ2xDLEtBQUssSUFBSSxZQUFZLEdBQUcsQ0FBQyxFQUFFLFlBQVksR0FBRyx1QkFBQSxJQUFJLHdEQUEyQixFQUFFLFlBQVksRUFBRSxFQUFFLENBQUM7WUFDMUYsaURBQWlEO1lBQ2pELE1B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
+_L1ToL2MessageStore_l1ToL2MessagesSubtreeSize = new WeakMap();
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfdG9fbDJfbWVzc2FnZV9zdG9yZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9hcmNoaXZlci9tZW1vcnlfYXJjaGl2ZXJfc3RvcmUvbDFfdG9fbDJfbWVzc2FnZV9zdG9yZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUNBLE9BQU8sRUFDTCxvQkFBb0IsRUFDcEIsMkJBQTJCLEVBQzNCLG1DQUFtQyxHQUNwQyxNQUFNLDhCQUE4QixDQUFDO0FBR3RDOztHQUVHO0FBQ0gsTUFBTSxPQUFPLGtCQUFrQjtJQVM3QjtRQVJBOzs7V0FHRztRQUNPLFVBQUssR0FBb0IsSUFBSSxHQUFHLEVBQUUsQ0FBQztRQUU3Qyx3REFBNkIsQ0FBQyxJQUFJLDJCQUEyQixFQUFDO0lBRS9DLENBQUM7SUFFaEIsVUFBVSxDQUFDLE9BQWtCO1FBQzNCLElBQUksT0FBTyxDQUFDLEtBQUssSUFBSSx1QkFBQSxJQUFJLHFEQUEyQixFQUFFLENBQUM7WUFDckQsTUFBTSxJQUFJLEtBQUssQ0FBQyxpQkFBaUIsT0FBTyxDQUFDLEtBQUssdUJBQXVCLENBQUMsQ0FBQztRQUN6RSxDQUFDO1FBQ0QsTUFBTSxHQUFHLEdBQUcsR0FBRyxPQUFPLENBQUMsV0FBVyxJQUFJLE9BQU8sQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUN0RCxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxHQUFHLEVBQUUsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3BDLENBQUM7SUFFRCxXQUFXLENBQUMsV0FBbUI7UUFDN0IsTUFBTSxRQUFRLEdBQVMsRUFBRSxDQUFDO1FBQzFCLElBQUkscUJBQXFCLEdBQUcsS0FBSyxDQUFDO1FBQ2xDLEtBQUssSUFBSSxZQUFZLEdBQUcsQ0FBQyxFQUFFLFlBQVksR0FBRyx1QkFBQSxJQUFJLHFEQUEyQixFQUFFLFlBQVksRUFBRSxFQUFFLENBQUM7WUFDMUYsaURBQWlEO1lBQ2pELE1BQU0sR0FBRyxHQUFHLEdBQUcsV0FBVyxJQUFJLFlBQVksRUFBRSxDQUFDO1lBQzdDLE1BQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1lBQ3BDLElBQUksT0FBTyxFQUFFLENBQUM7Z0JBQ1osSUFBSSxxQkFBcUIsRUFBRSxDQUFDO29CQUMxQixNQUFNLElBQUksS0FBSyxDQUFDLHVDQUF1QyxXQUFXLEVBQUUsQ0FBQyxDQUFDO2dCQUN4RSxDQUFDO2dCQUNELFFBQVEsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUM7WUFDekIsQ0FBQztpQkFBTSxDQUFDO2dCQUNOLHFCQUFxQixHQUFHLElBQUksQ0FBQztnQkFDN0IsOEdBQThHO2dCQUM5RyxtRkFBbUY7WUFDckYsQ0FBQztRQUNILENBQUM7UUFDRCxPQUFPLFFBQVEsQ0FBQztJQUNsQixDQUFDO0lBRUQ7Ozs7T0FJRztJQUNILGVBQWUsQ0FBQyxhQUFpQjtRQUMvQixLQUFLLE1BQU0sQ0FBQyxHQUFHLEVBQUUsT0FBTyxDQUFDLElBQUksSUFBSSxDQUFDLEtBQUssQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUFDO1lBQ2xELElBQUksT0FBTyxDQUFDLE1BQU0sQ0FBQyxhQUFhLENBQUMsRUFBRSxDQUFDO2dCQUNsQyxNQUFNLENBQUMsV0FBVyxFQUFFLFlBQVksQ0FBQyxHQUFHLEdBQUcsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7Z0JBQ25ELE1BQU0sbUJBQW1CLEdBQ3ZCLENBQUMsTUFBTSxDQUFDLFdBQVcsQ0FBQyxHQUFHLE1BQU0sQ0FBQyxvQkFBb0IsQ0FBQyxDQUFDLEdBQUcsTUFBTSxDQUFDLG1DQUFtQyxDQUFDO29CQUNsRyxNQUFNLENBQUMsWUFBWSxDQUFDLENBQUM7Z0JBQ3ZCLE9BQU8sbUJBQW1CLENBQUM7WUFDN0IsQ0FBQztRQUNILENBQUM7UUFDRCxPQUFPLFNBQVMsQ0FBQztJQUNuQixDQUFDO0NBQ0YifQ==

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

@@ -1,9 +1,10 @@
 /// <reference types="node" resolution-mode="require"/>
-import { Body, ExtendedContractData, GetUnencryptedLogsResponse, L1ToL2Message, L2Block, L2BlockL2Logs, LogFilter, LogType, NewInboxLeaf, TxEffect, TxHash, TxReceipt } from '@aztec/circuit-types';
+import { Body, GetUnencryptedLogsResponse, InboxLeaf, L2Block, L2BlockL2Logs, LogFilter, LogType, TxEffect, TxHash, TxReceipt } from '@aztec/circuit-types';
 import { Fr } from '@aztec/circuits.js';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { ContractClassPublic, ContractInstanceWithAddress } from '@aztec/types/contracts';
-import { ArchiverDataStore } from '../archiver_store.js';
+import { ArchiverDataStore, ArchiverL1SynchPoint } from '../archiver_store.js';
+import { DataRetrieval } from '../data_retrieval.js';
 /**
  * Simple, in-memory implementation of an archiver data store.
  */
@@ -33,28 +34,13 @@ export declare class MemoryArchiverStore implements ArchiverDataStore {
      */
     private unencryptedLogsPerBlock;
     /**
-     * A sparse array containing all the extended contract data that have been fetched so far.
+     * Contains all L1 to L2 messages.
      */
-    private extendedContractDataByBlock;
-    /**
-     * A mapping of contract address to extended contract data.
-     */
-    private extendedContractData;
-    private newL1ToL2Messages;
-    /**
-     * Contains all the confirmed L1 to L2 messages (i.e. messages that were consumed in an L2 block)
-     * It is a map of entryKey to the corresponding L1 to L2 message and the number of times it has appeared
-     */
-    private confirmedL1ToL2Messages;
-    /**
-     * Contains all the pending L1 to L2 messages (accounts for duplication of messages)
-     */
-    private pendingL1ToL2Messages;
+    private l1ToL2Messages;
     private contractClasses;
     private contractInstances;
+    private lastL1BlockNewBlocks;
     private lastL1BlockNewMessages;
-    private lastL1BlockAddedMessages;
-    private lastL1BlockCancelledMessages;
     constructor(
     /** The max number of logs that can be obtained in 1 "getUnencryptedLogs" call. */
     maxLogs: number);
@@ -65,10 +51,10 @@ export declare class MemoryArchiverStore implements ArchiverDataStore {
     addContractInstances(data: ContractInstanceWithAddress[], _blockNumber: number): Promise<boolean>;
     /**
      * Append new blocks to the store's list.
-     * @param blocks - The L2 blocks to be added to the store.
-     * @returns True if the operation is successful (always in this implementation).
+     * @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: L2Block[]): Promise<boolean>;
+    addBlocks(blocks: DataRetrieval<L2Block>): Promise<boolean>;
     /**
      * Append new block bodies to the store's list.
      * @param blockBodies - The L2 block bodies to be added to the store.
@@ -91,40 +77,17 @@ export declare class MemoryArchiverStore implements ArchiverDataStore {
      */
     addLogs(encryptedLogs: L2BlockL2Logs, unencryptedLogs: L2BlockL2Logs, blockNumber: number): Promise<boolean>;
     /**
-     * Append new L1 to L2 messages to the store.
-     * @param messages - The L1 to L2 messages to be added to the store.
-     * @param lastMessageL1BlockNumber - The L1 block number in which the last message was emitted.
+     * 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.
      */
-    addNewL1ToL2Messages(messages: NewInboxLeaf[], lastMessageL1BlockNumber: bigint): Promise<boolean>;
+    addL1ToL2Messages(messages: DataRetrieval<InboxLeaf>): Promise<boolean>;
     /**
-     * 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).
+     * 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).
      */
-    addPendingL1ToL2Messages(messages: L1ToL2Message[], l1BlockNumber: bigint): Promise<boolean>;
-    /**
-     * Remove pending L1 to L2 messages from the store (if they were cancelled).
-     * @param messages - The entry 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).
-     */
-    cancelPendingL1ToL2EntryKeys(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.
-     * @param entryKeys - The entry keys to be removed from the store.
-     * @returns True if the operation is successful (always in this implementation).
-     */
-    confirmL1ToL2EntryKeys(entryKeys: Fr[]): Promise<boolean>;
-    /**
-     * Store new extended contract data from an L2 block to the store's list.
-     * @param data - List of contracts' data to be added.
-     * @param blockNum - Number of the L2 block the contract data was deployed in.
-     * @returns True if the operation is successful (always in this implementation).
-     */
-    addExtendedContractData(data: ExtendedContractData[], blockNum: number): Promise<boolean>;
+    getL1ToL2MessageIndex(l1ToL2Message: Fr): Promise<bigint | undefined>;
     /**
      * Gets up to `limit` amount of L2 blocks starting from `from`.
      * @param from - Number of the first block to return (inclusive).
@@ -146,23 +109,11 @@ export declare class MemoryArchiverStore implements ArchiverDataStore {
      */
     getSettledTxReceipt(txHash: TxHash): Promise<TxReceipt | undefined>;
     /**
-     * Gets up to `limit` amount of pending L1 to L2 messages, sorted by fee
-     * @param limit - The number of messages to return (by default NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP).
-     * @returns The requested L1 to L2 entry keys.
-     */
-    getPendingL1ToL2EntryKeys(limit?: number): Promise<Fr[]>;
-    /**
-     * Gets the confirmed L1 to L2 message corresponding to the given entry key.
-     * @param entryKey - The entry key to look up.
-     * @returns The requested L1 to L2 message or throws if not found.
-     */
-    getConfirmedL1ToL2Message(entryKey: Fr): Promise<L1ToL2Message>;
-    /**
-     * Gets new L1 to L2 message (to be) included in a given block.
+     * Gets L1 to L2 message (to be) included in a given block.
      * @param blockNumber - L2 block number to get messages for.
      * @returns The L1 to L2 messages/leaves of the messages subtree (throws if not found).
      */
-    getNewL1ToL2Messages(blockNumber: bigint): Promise<Fr[]>;
+    getL1ToL2Messages(blockNumber: bigint): Promise<Fr[]>;
     /**
      * Gets up to `limit` amount of logs starting from `from`.
      * @param from - Number of the L2 block to which corresponds the first logs to be returned.
@@ -178,23 +129,11 @@ export declare class MemoryArchiverStore implements ArchiverDataStore {
      * @remarks Works by doing an intersection of all params in the filter.
      */
     getUnencryptedLogs(filter: LogFilter): Promise<GetUnencryptedLogsResponse>;
-    /**
-     * Get the extended contract data for this contract.
-     * TODO(palla/purge-old-contract-deploy): Delete me?
-     * @param contractAddress - The contract data address.
-     * @returns The extended contract data or undefined if not found.
-     */
-    getExtendedContractData(contractAddress: AztecAddress): Promise<ExtendedContractData | undefined>;
     /**
      * Gets the number of the latest L2 block processed.
      * @returns The number of the latest L2 block processed.
      */
-    getBlockNumber(): Promise<number>;
-    getL1BlockNumber(): Promise<{
-        addedBlock: bigint;
-        newMessages: bigint;
-        addedMessages: bigint;
-        cancelledMessages: bigint;
-    }>;
+    getSynchedL2BlockNumber(): Promise<number>;
+    getSynchedL1BlockNumbers(): Promise<ArchiverL1SynchPoint>;
 }
 //# 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":";AAAA,OAAO,EACL,IAAI,EACJ,oBAAoB,EAEpB,0BAA0B,EAC1B,aAAa,EACb,OAAO,EAEP,aAAa,EACb,SAAS,EAET,OAAO,EACP,YAAY,EACZ,QAAQ,EACR,MAAM,EACN,SAAS,EAGV,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,EAAE,EAA6D,MAAM,oBAAoB,CAAC;AACnG,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,mBAAmB,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAE1F,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAGzD;;GAEG;AACH,qBAAa,mBAAoB,YAAW,iBAAiB;IA6DzD,kFAAkF;aAClE,OAAO,EAAE,MAAM;IA7DjC;;OAEG;IACH,OAAO,CAAC,eAAe,CAAwB;IAE/C;;OAEG;IACH,OAAO,CAAC,aAAa,CAAgC;IAErD;;OAEG;IACH,OAAO,CAAC,SAAS,CAAkB;IAEnC;;;OAGG;IACH,OAAO,CAAC,qBAAqB,CAAuB;IAEpD;;;OAGG;IACH,OAAO,CAAC,uBAAuB,CAAuB;IAEtD;;OAEG;IACH,OAAO,CAAC,2BAA2B,CAA8C;IAEjF;;OAEG;IACH,OAAO,CAAC,oBAAoB,CAAgD;IAG5E,OAAO,CAAC,iBAAiB,CAA+B;IAExD;;;OAGG;IACH,OAAO,CAAC,uBAAuB,CAAgD;IAE/E;;OAEG;IACH,OAAO,CAAC,qBAAqB,CAA8D;IAE3F,OAAO,CAAC,eAAe,CAA+C;IAEtE,OAAO,CAAC,iBAAiB,CAAuD;IAEhF,OAAO,CAAC,sBAAsB,CAAc;IAC5C,OAAO,CAAC,wBAAwB,CAAc;IAC9C,OAAO,CAAC,4BAA4B,CAAc;;IAGhD,kFAAkF;IAClE,OAAO,EAAE,MAAM;IAG1B,gBAAgB,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC;IAIlE,mBAAmB,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC;IAIpC,mBAAmB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,2BAA2B,GAAG,SAAS,CAAC;IAI5F,kBAAkB,CAAC,IAAI,EAAE,mBAAmB,EAAE,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAOvF,oBAAoB,CAAC,IAAI,EAAE,2BAA2B,EAAE,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAOxG;;;;OAIG;IACI,SAAS,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAMrD;;;;OAIG;IACH,cAAc,CAAC,WAAW,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAQrD;;;;;OAKG;IACH,cAAc,CAAC,gBAAgB,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAU3D;;;;;;OAMG;IACH,OAAO,CAAC,aAAa,EAAE,aAAa,EAAE,eAAe,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAY5G;;;;;OAKG;IACI,oBAAoB,CAAC,QAAQ,EAAE,YAAY,EAAE,EAAE,wBAAwB,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAYzG;;;;;OAKG;IACI,wBAAwB,CAAC,QAAQ,EAAE,aAAa,EAAE,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAYnG;;;;;OAKG;IACI,4BAA4B,CAAC,QAAQ,EAAE,EAAE,EAAE,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAY5F;;;;;OAKG;IACI,sBAAsB,CAAC,SAAS,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAYhE;;;;;OAKG;IACI,uBAAuB,CAAC,IAAI,EAAE,oBAAoB,EAAE,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAgBhG;;;;;;OAMG;IACI,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAejE;;;;OAIG;IACI,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC;IAKjE;;;;OAIG;IACI,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;IAa1E;;;;OAIG;IACI,yBAAyB,CAAC,KAAK,GAAE,MAA4C,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC;IAIpG;;;;OAIG;IACI,yBAAyB,CAAC,QAAQ,EAAE,EAAE,GAAG,OAAO,CAAC,aAAa,CAAC;IAQtE;;;;OAIG;IACH,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC;IAIxD;;;;;;OAMG;IACH,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAahF;;;;;OAKG;IACH,kBAAkB,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,0BAA0B,CAAC;IA8E1E;;;;;OAKG;IACH,uBAAuB,CAAC,eAAe,EAAE,YAAY,GAAG,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC;IAKjG;;;OAGG;IACI,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC;IAOjC,gBAAgB;;;;;;CAaxB"}
+{"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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"}