@aztec/archiver 0.16.0 → 0.16.2

package/dest/archiver/lmdb_archiver_store.js

@@ -0,0 +1,545 @@
+var _LMDBArchiverStore_instances, _LMDBArchiverStore_tables, _LMDBArchiverStore_logsMaxPageSize, _LMDBArchiverStore_log, _LMDBArchiverStore_filterLogsOfTx, _LMDBArchiverStore_filterLogsBetweenBlocks, _LMDBArchiverStore_accumulateLogs, _LMDBArchiverStore_getBlock, _LMDBArchiverStore_computeBlockRange, _LMDBArchiverStore_getL1ToL2Message, _LMDBArchiverStore_updateMessageCountInTx;
+import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
+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}`;
+}
+/* eslint-enable */
+/**
+ * LMDB implementation of the ArchiverDataStore interface.
+ */
+export class LMDBArchiverStore {
+    constructor(db, logsMaxPageSize = 1000) {
+        _LMDBArchiverStore_instances.add(this);
+        _LMDBArchiverStore_tables.set(this, void 0);
+        _LMDBArchiverStore_logsMaxPageSize.set(this, void 0);
+        _LMDBArchiverStore_log.set(this, createDebugLogger('aztec:archiver:lmdb'));
+        __classPrivateFieldSet(this, _LMDBArchiverStore_tables, {
+            blocks: db.openDB('blocks', {
+                keyEncoding: 'uint32',
+                encoding: 'msgpack',
+            }),
+            txIndex: db.openDB('tx_index', {
+                keyEncoding: 'binary',
+                encoding: 'msgpack',
+            }),
+            contractIndex: db.openDB('contract_index', {
+                keyEncoding: 'binary',
+                encoding: 'msgpack',
+            }),
+            l1ToL2Messages: db.openDB('l1_to_l2_messages', {
+                keyEncoding: 'binary',
+                encoding: 'msgpack',
+            }),
+            l1ToL2MessagesByBlock: db.openDB('l1_to_l2_message_nonces', {
+                keyEncoding: 'ordered-binary',
+                encoding: 'binary',
+            }),
+            pendingMessagesByFee: db.openDB('pending_messages_by_fee', {
+                keyEncoding: 'ordered-binary',
+                encoding: 'binary',
+                dupSort: true,
+            }),
+        }, "f");
+        __classPrivateFieldSet(this, _LMDBArchiverStore_logsMaxPageSize, logsMaxPageSize, "f");
+    }
+    async close() {
+        await Promise.all(Object.values(__classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f")).map(table => table.close()));
+    }
+    /**
+     * 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.
+     */
+    addBlocks(blocks) {
+        // LMDB transactions are shared across databases, so we can use a single transaction for all the writes
+        // https://github.com/kriszyp/lmdb-js/blob/67505a979ab63187953355a88747a7ad703d50b6/README.md#dbopendbdatabase-stringnamestring
+        return __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").blocks.transaction(() => {
+            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);
+                // 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
+                void __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").blocks.put(block.number, blockCtx);
+                for (const [i, tx] of block.getTxs().entries()) {
+                    if (tx.txHash.isZero()) {
+                        continue;
+                    }
+                    void __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").txIndex.put(tx.txHash.buffer, [block.number, i]);
+                }
+                for (const [i, contractData] of block.newContractData.entries()) {
+                    if (contractData.contractAddress.isZero()) {
+                        continue;
+                    }
+                    void __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").contractIndex.put(contractData.contractAddress.toBuffer(), [block.number, i]);
+                }
+            }
+            return true;
+        });
+    }
+    /**
+     * 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) {
+        try {
+            const blocks = __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").blocks
+                .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);
+                }
+                return block;
+            }).asArray;
+            return Promise.resolve(blocks);
+        }
+        catch (err) {
+            // this function is sync so if any errors are thrown we need to make sure they're passed on as rejected Promises
+            return Promise.reject(err);
+        }
+    }
+    /**
+     * Gets an l2 tx.
+     * @param txHash - The txHash of the l2 tx.
+     * @returns The requested L2 tx.
+     */
+    getL2Tx(txHash) {
+        const [blockNumber, txIndex] = __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").txIndex.get(txHash.buffer) ?? [];
+        if (typeof blockNumber !== 'number' || typeof txIndex !== 'number') {
+            return Promise.resolve(undefined);
+        }
+        const block = __classPrivateFieldGet(this, _LMDBArchiverStore_instances, "m", _LMDBArchiverStore_getBlock).call(this, blockNumber, true);
+        return Promise.resolve(block?.getTx(txIndex));
+    }
+    /**
+     * Append new logs to the store's list.
+     * @param encryptedLogs - The logs to be added to the store.
+     * @param unencryptedLogs - The type of the logs to be added to the store.
+     * @param blockNumber - The block for which to add the logs.
+     * @returns True if the operation is successful.
+     */
+    addLogs(encryptedLogs, unencryptedLogs, blockNumber) {
+        return __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").blocks.transaction(() => {
+            const blockCtx = __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").blocks.get(blockNumber) ?? {};
+            if (encryptedLogs) {
+                blockCtx.encryptedLogs = encryptedLogs.toBuffer();
+            }
+            if (unencryptedLogs) {
+                blockCtx.unencryptedLogs = unencryptedLogs.toBuffer();
+            }
+            void __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").blocks.put(blockNumber, blockCtx);
+            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.
+     * @returns True if the operation is successful.
+     */
+    addPendingL1ToL2Messages(messages) {
+        return __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").l1ToL2Messages.transaction(() => {
+            for (const { message, blockNumber, indexInBlock } 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 = {
+                        message: message.toBuffer(),
+                        pendingCount: 0,
+                        confirmedCount: 0,
+                    };
+                    void __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").l1ToL2Messages.put(messageKey, messageWithCount);
+                }
+                __classPrivateFieldGet(this, _LMDBArchiverStore_instances, "m", _LMDBArchiverStore_updateMessageCountInTx).call(this, messageKey, message, 1, 0);
+            }
+            return true;
+        });
+    }
+    /**
+     * Remove pending L1 to L2 messages from the store (if they were cancelled).
+     * @param messages - The message keys to be removed from the store.
+     * @returns True if the operation is successful.
+     */
+    cancelPendingL1ToL2Messages(messages) {
+        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)) {
+                    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);
+            }
+            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 message keys to be removed from the store.
+     * @returns True if the operation is successful.
+     */
+    confirmL1ToL2Messages(entryKeys) {
+        return __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").l1ToL2Messages.transaction(() => {
+            for (const entryKey of entryKeys) {
+                const messageKey = entryKey.toBuffer();
+                const message = __classPrivateFieldGet(this, _LMDBArchiverStore_instances, "m", _LMDBArchiverStore_getL1ToL2Message).call(this, messageKey);
+                __classPrivateFieldGet(this, _LMDBArchiverStore_instances, "m", _LMDBArchiverStore_updateMessageCountInTx).call(this, messageKey, message, -1, 1);
+            }
+            return true;
+        });
+    }
+    /**
+     * 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 message keys.
+     */
+    getPendingL1ToL2MessageKeys(limit) {
+        // start a read transaction in order to have a consistent view of the data
+        // this is all sync code, but better to be safe in case it changes in the future
+        // or we end up having multiple processes touching the same db
+        const transaction = __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").pendingMessagesByFee.useReadTransaction();
+        try {
+            // get all the keys, in reverse order
+            const fees = __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").pendingMessagesByFee.getKeys({ reverse: true, transaction });
+            const messages = [];
+            loopOverFees: for (const fee of fees) {
+                const pendingMessages = __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").pendingMessagesByFee.getValues(fee, { transaction });
+                __classPrivateFieldGet(this, _LMDBArchiverStore_log, "f").call(this, `Found pending messages for ${fee}`);
+                for (const messageKey of pendingMessages) {
+                    const messageWithCount = __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").l1ToL2Messages.get(messageKey, { transaction });
+                    if (!messageWithCount || messageWithCount.pendingCount === 0) {
+                        __classPrivateFieldGet(this, _LMDBArchiverStore_log, "f").call(this, `Message ${messageKey.toString('hex')} has no pending count but it got picked up by getPEndingL1ToL2MessageKeys`);
+                        continue;
+                    }
+                    const toAdd = Array(messageWithCount.pendingCount).fill(Fr.fromBuffer(messageKey));
+                    __classPrivateFieldGet(this, _LMDBArchiverStore_log, "f").call(this, `Adding ${toAdd.length} copies of ${messageKey.toString('hex')} for ${fee}`);
+                    messages.push(...toAdd);
+                    if (messages.length >= limit) {
+                        break loopOverFees;
+                    }
+                }
+            }
+            return Promise.resolve(messages);
+        }
+        catch (err) {
+            return Promise.reject(err);
+        }
+        finally {
+            transaction.done();
+        }
+    }
+    /**
+     * Gets the confirmed L1 to L2 message corresponding to the given message key.
+     * @param messageKey - The message key to look up.
+     * @returns The requested L1 to L2 message or throws if not found.
+     */
+    getConfirmedL1ToL2Message(messageKey) {
+        const value = __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").l1ToL2Messages.get(messageKey.toBuffer());
+        if (!value) {
+            return Promise.reject(new Error(`Message with key ${messageKey} not found`));
+        }
+        if (value.confirmedCount === 0) {
+            return Promise.reject(new Error(`Message with key ${messageKey} not confirmed`));
+        }
+        return Promise.resolve(L1ToL2Message.fromBuffer(value.message));
+    }
+    /**
+     * Gets up to `limit` amount of logs starting from `from`.
+     * @param start - Number of the L2 block to which corresponds the first logs to be returned.
+     * @param limit - The number of logs to return.
+     * @param logType - Specifies whether to return encrypted or unencrypted logs.
+     * @returns The requested logs.
+     */
+    getLogs(start, limit, logType) {
+        try {
+            const blockCtxKey = logType === LogType.ENCRYPTED ? 'encryptedLogs' : 'unencryptedLogs';
+            const logs = __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").blocks
+                .getRange(__classPrivateFieldGet(this, _LMDBArchiverStore_instances, "m", _LMDBArchiverStore_computeBlockRange).call(this, start, limit))
+                .map(({ value: { [blockCtxKey]: logs } }) => logs ? L2BlockL2Logs.fromBuffer(asBuffer(logs)) : new L2BlockL2Logs([])).asArray;
+            return Promise.resolve(logs);
+        }
+        catch (err) {
+            return Promise.reject(err);
+        }
+    }
+    /**
+     * Gets unencrypted logs based on the provided filter.
+     * @param filter - The filter to apply to the logs.
+     * @returns The requested logs.
+     */
+    getUnencryptedLogs(filter) {
+        try {
+            if (filter.afterLog) {
+                return Promise.resolve(__classPrivateFieldGet(this, _LMDBArchiverStore_instances, "m", _LMDBArchiverStore_filterLogsBetweenBlocks).call(this, filter));
+            }
+            else if (filter.txHash) {
+                return Promise.resolve(__classPrivateFieldGet(this, _LMDBArchiverStore_instances, "m", _LMDBArchiverStore_filterLogsOfTx).call(this, filter));
+            }
+            else {
+                return Promise.resolve(__classPrivateFieldGet(this, _LMDBArchiverStore_instances, "m", _LMDBArchiverStore_filterLogsBetweenBlocks).call(this, filter));
+            }
+        }
+        catch (err) {
+            return Promise.reject(err);
+        }
+    }
+    /**
+     * Add 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.
+     */
+    addExtendedContractData(data, blockNum) {
+        return __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").blocks.transaction(() => {
+            const blockCtx = __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").blocks.get(blockNum) ?? {};
+            if (!blockCtx.extendedContractData) {
+                blockCtx.extendedContractData = [];
+            }
+            __classPrivateFieldGet(this, _LMDBArchiverStore_log, "f").call(this, `Adding ${data.length} extended contract data to block ${blockNum}`);
+            blockCtx.extendedContractData.push(...data.map(data => data.toBuffer()));
+            void __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").blocks.put(blockNum, blockCtx);
+            return true;
+        });
+    }
+    /**
+     * Get the extended contract data for this contract.
+     * @param contractAddress - The contract data address.
+     * @returns The extended contract data or undefined if not found.
+     */
+    getExtendedContractData(contractAddress) {
+        const [blockNumber, _] = __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").contractIndex.get(contractAddress.toBuffer()) ?? [];
+        if (typeof blockNumber !== 'number') {
+            return Promise.resolve(undefined);
+        }
+        const blockCtx = __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").blocks.get(blockNumber);
+        if (!blockCtx) {
+            return Promise.resolve(undefined);
+        }
+        for (const data of blockCtx.extendedContractData ?? []) {
+            const extendedContractData = ExtendedContractData.fromBuffer(asBuffer(data));
+            if (extendedContractData.contractData.contractAddress.equals(contractAddress)) {
+                return Promise.resolve(extendedContractData);
+            }
+        }
+        return Promise.resolve(undefined);
+    }
+    /**
+     * Lookup all extended contract data in an L2 block.
+     * @param blockNum - The block number to get all contract data from.
+     * @returns All extended contract data in the block (if found).
+     */
+    getExtendedContractDataInBlock(blockNum) {
+        const blockCtx = __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").blocks.get(blockNum);
+        if (!blockCtx || !blockCtx.extendedContractData) {
+            return Promise.resolve([]);
+        }
+        return Promise.resolve(blockCtx.extendedContractData.map(data => ExtendedContractData.fromBuffer(asBuffer(data))));
+    }
+    /**
+     * Get basic info for an L2 contract.
+     * Contains contract address & the ethereum portal address.
+     * @param contractAddress - The contract data address.
+     * @returns ContractData with the portal address (if we didn't throw an error).
+     */
+    getContractData(contractAddress) {
+        const [blockNumber, index] = __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").contractIndex.get(contractAddress.toBuffer()) ?? [];
+        if (typeof blockNumber !== 'number' || typeof index !== 'number') {
+            return Promise.resolve(undefined);
+        }
+        const block = __classPrivateFieldGet(this, _LMDBArchiverStore_instances, "m", _LMDBArchiverStore_getBlock).call(this, blockNumber);
+        return Promise.resolve(block?.newContractData[index]);
+    }
+    /**
+     * Get basic info for an all L2 contracts deployed in a block.
+     * Contains contract address & the ethereum portal address.
+     * @param blockNumber - Number of the L2 block where contracts were deployed.
+     * @returns ContractData with the portal address (if we didn't throw an error).
+     */
+    getContractDataInBlock(blockNumber) {
+        const block = __classPrivateFieldGet(this, _LMDBArchiverStore_instances, "m", _LMDBArchiverStore_getBlock).call(this, blockNumber);
+        return Promise.resolve(block?.newContractData ?? []);
+    }
+    /**
+     * Gets the number of the latest L2 block processed.
+     * @returns The number of the latest L2 block processed.
+     */
+    getBlockNumber() {
+        // inverse range with no start/end will return the last key
+        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);
+    }
+    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)));
+            }
+        }
+    }
+}
+_LMDBArchiverStore_tables = new WeakMap(), _LMDBArchiverStore_logsMaxPageSize = new WeakMap(), _LMDBArchiverStore_log = new WeakMap(), _LMDBArchiverStore_instances = new WeakSet(), _LMDBArchiverStore_filterLogsOfTx = function _LMDBArchiverStore_filterLogsOfTx(filter) {
+    if (!filter.txHash) {
+        throw new Error('Missing txHash');
+    }
+    const [blockNumber, txIndex] = __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").txIndex.get(filter.txHash.buffer) ?? [];
+    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 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) {
+    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) {
+        return {
+            logs: [],
+            maxLogsHit: true,
+        };
+    }
+    const logs = [];
+    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;
+        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);
+            if (maxLogsHit) {
+                break loopOverBlocks;
+            }
+        }
+    }
+    return { logs, maxLogsHit };
+}, _LMDBArchiverStore_accumulateLogs = function _LMDBArchiverStore_accumulateLogs(results, blockNumber, txIndex, txLogs, filter) {
+    let maxLogsHit = false;
+    let logIndex = typeof filter.afterLog?.logIndex === 'number' ? filter.afterLog.logIndex + 1 : 0;
+    for (; logIndex < txLogs.length; logIndex++) {
+        const log = txLogs[logIndex];
+        if (filter.contractAddress && !log.contractAddress.equals(filter.contractAddress)) {
+            continue;
+        }
+        if (filter.selector && !log.selector.equals(filter.selector)) {
+            continue;
+        }
+        results.push(new ExtendedUnencryptedL2Log(new LogId(blockNumber, txIndex, logIndex), log));
+        if (results.length >= __classPrivateFieldGet(this, _LMDBArchiverStore_logsMaxPageSize, "f")) {
+            maxLogsHit = true;
+            break;
+        }
+    }
+    return maxLogsHit;
+}, _LMDBArchiverStore_getBlock = function _LMDBArchiverStore_getBlock(blockNumber, withLogs = false) {
+    const blockCtx = __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").blocks.get(blockNumber);
+    if (!blockCtx || !blockCtx.block) {
+        return undefined;
+    }
+    const block = L2Block.fromBuffer(asBuffer(blockCtx.block));
+    if (withLogs) {
+        if (blockCtx.encryptedLogs) {
+            block.attachLogs(L2BlockL2Logs.fromBuffer(asBuffer(blockCtx.encryptedLogs)), LogType.ENCRYPTED);
+        }
+        if (blockCtx.unencryptedLogs) {
+            block.attachLogs(L2BlockL2Logs.fromBuffer(asBuffer(blockCtx.unencryptedLogs)), LogType.UNENCRYPTED);
+        }
+    }
+    return block;
+}, _LMDBArchiverStore_computeBlockRange = function _LMDBArchiverStore_computeBlockRange(start, limit) {
+    if (limit < 1) {
+        throw new Error(`Invalid limit: ${limit}`);
+    }
+    if (start < INITIAL_L2_BLOCK_NUM) {
+        __classPrivateFieldGet(this, _LMDBArchiverStore_log, "f").call(this, `Clamping start block ${start} to ${INITIAL_L2_BLOCK_NUM}`);
+        start = INITIAL_L2_BLOCK_NUM;
+    }
+    const end = start + limit;
+    return { start, end };
+}, _LMDBArchiverStore_getL1ToL2Message = function _LMDBArchiverStore_getL1ToL2Message(entryKey) {
+    const value = __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").l1ToL2Messages.get(entryKey);
+    if (!value) {
+        throw new Error('Unknown message: ' + entryKey.toString());
+    }
+    return L1ToL2Message.fromBuffer(value.message);
+}, _LMDBArchiverStore_updateMessageCountInTx = function _LMDBArchiverStore_updateMessageCountInTx(messageKey, message, deltaPendingCount, deltaConfirmedCount) {
+    const entry = __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").l1ToL2Messages.getEntry(messageKey);
+    if (!entry) {
+        return;
+    }
+    const { value } = entry;
+    value.pendingCount = Math.max(0, value.pendingCount + deltaPendingCount);
+    value.confirmedCount = Math.max(0, value.confirmedCount + deltaConfirmedCount);
+    __classPrivateFieldGet(this, _LMDBArchiverStore_log, "f").call(this, `Updating count of ${messageKey.toString('hex')} to ${value.pendingCount} pending and ${value.confirmedCount} confirmed}`);
+    if (value.pendingCount === 0) {
+        __classPrivateFieldGet(this, _LMDBArchiverStore_log, "f").call(this, `Removing message ${messageKey.toString('hex')} from pending messages group with fee ${message.fee}`);
+        void __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").pendingMessagesByFee.remove(message.fee, messageKey);
+    }
+    else if (value.pendingCount > 0) {
+        __classPrivateFieldGet(this, _LMDBArchiverStore_log, "f").call(this, `Adding message ${messageKey.toString('hex')} to pending message group with fee ${message.fee}`);
+        void __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").pendingMessagesByFee.put(message.fee, messageKey);
+    }
+    if (value.pendingCount === 0 && value.confirmedCount === 0) {
+        void __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").l1ToL2Messages.remove(messageKey);
+    }
+    else {
+        void __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").l1ToL2Messages.put(messageKey, value);
+    }
+};
+/**
+ * Creates a Buffer viewing the same memory location as the passed array.
+ * @param arr - A Uint8Array
+ */
+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":";;AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAC;AAExC,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAGL,oBAAoB,EACpB,wBAAwB,EAExB,oBAAoB,EACpB,aAAa,EACb,OAAO,EACP,aAAa,EAGb,KAAK,EACL,OAAO,EAGP,gBAAgB,GACjB,MAAM,cAAc,CAAC;AAetB,SAAS,qBAAqB,CAC5B,aAAqB,EACrB,GAAsC,EACtC,YAAoB;IAEpB,OAAO,GAAG,UAAU,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,GAAG,IAAI,YAAY,EAAE,CAAC;AACnF,CAAC;AAWD,mBAAmB;AAEnB;;GAEG;AACH,MAAM,OAAO,iBAAiB;IAoB5B,YAAY,EAAgB,EAAE,kBAA0B,IAAI;;QAnB5D,4CAaE;QAEF,qDAAyB;QAEzB,iCAAO,iBAAiB,CAAC,qBAAqB,CAAC,EAAC;QAG9C,uBAAA,IAAI,6BAAW;YACb,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE;gBAC1B,WAAW,EAAE,QAAQ;gBACrB,QAAQ,EAAE,SAAS;aACpB,CAAC;YACF,OAAO,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,EAAE;gBAC7B,WAAW,EAAE,QAAQ;gBACrB,QAAQ,EAAE,SAAS;aACpB,CAAC;YACF,aAAa,EAAE,EAAE,CAAC,MAAM,CAAC,gBAAgB,EAAE;gBACzC,WAAW,EAAE,QAAQ;gBACrB,QAAQ,EAAE,SAAS;aACpB,CAAC;YACF,cAAc,EAAE,EAAE,CAAC,MAAM,CAAC,mBAAmB,EAAE;gBAC7C,WAAW,EAAE,QAAQ;gBACrB,QAAQ,EAAE,SAAS;aACpB,CAAC;YACF,qBAAqB,EAAE,EAAE,CAAC,MAAM,CAAC,yBAAyB,EAAE;gBAC1D,WAAW,EAAE,gBAAgB;gBAC7B,QAAQ,EAAE,QAAQ;aACnB,CAAC;YACF,oBAAoB,EAAE,EAAE,CAAC,MAAM,CAAC,yBAAyB,EAAE;gBACzD,WAAW,EAAE,gBAAgB;gBAC7B,QAAQ,EAAE,QAAQ;gBAClB,OAAO,EAAE,IAAI;aACd,CAAC;SACH,MAAA,CAAC;QAEF,uBAAA,IAAI,sCAAoB,eAAe,MAAA,CAAC;IAC1C,CAAC;IAEM,KAAK,CAAC,KAAK;QAChB,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,uBAAA,IAAI,iCAAQ,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IAC7E,CAAC;IAED;;;;OAIG;IACH,SAAS,CAAC,MAAiB;QACzB,uGAAuG;QACvG,+HAA+H;QAC/H,OAAO,uBAAA,IAAI,iCAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,EAAE;YAC1C,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;gBAC1B,MAAM,QAAQ,GAAG,uBAAA,IAAI,iCAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;gBAC7D,QAAQ,CAAC,KAAK,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC;gBAClC,QAAQ,CAAC,aAAa,GAAG,UAAU,CAAC,KAAK,CAAC,gBAAgB,EAAE,EAAE,EAAE,CAAC,CAAC;gBAElE,+DAA+D;gBAC/D,6GAA6G;gBAC7G,0EAA0E;gBAC1E,KAAK,uBAAA,IAAI,iCAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;gBAErD,KAAK,MAAM,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,EAAE;oBAC9C,IAAI,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE;wBACtB,SAAS;qBACV;oBACD,KAAK,uBAAA,IAAI,iCAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;iBACpE;gBAED,KAAK,MAAM,CAAC,CAAC,EAAE,YAAY,CAAC,IAAI,KAAK,CAAC,eAAe,CAAC,OAAO,EAAE,EAAE;oBAC/D,IAAI,YAAY,CAAC,eAAe,CAAC,MAAM,EAAE,EAAE;wBACzC,SAAS;qBACV;oBAED,KAAK,uBAAA,IAAI,iCAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,eAAe,CAAC,QAAQ,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;iBACjG;aACF;YAED,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;;OAKG;IACH,SAAS,CAAC,KAAa,EAAE,KAAa;QACpC,IAAI;YACF,MAAM,MAAM,GAAG,uBAAA,IAAI,iCAAQ,CAAC,MAAM;iBAC/B,QAAQ,CAAC,uBAAA,IAAI,0EAAmB,MAAvB,IAAI,EAAoB,KAAK,EAAE,KAAK,CAAC,CAAC;iBAC/C,MAAM,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC;iBAClC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE;gBACjB,MAAM,KAAK,GAAG,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAM,CAAC,CAAC,CAAC;gBACzD,IAAI,KAAK,CAAC,aAAa,EAAE;oBACvB,KAAK,CAAC,UAAU,CAAC,aAAa,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;iBAC9F;gBAED,IAAI,KAAK,CAAC,eAAe,EAAE;oBACzB,KAAK,CAAC,UAAU,CAAC,aAAa,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;iBAClG;gBAED,OAAO,KAAK,CAAC;YACf,CAAC,CAAC,CAAC,OAAO,CAAC;YAEb,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;SAChC;QAAC,OAAO,GAAG,EAAE;YACZ,gHAAgH;YAChH,OAAO,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;SAC5B;IACH,CAAC;IAED;;;;OAIG;IACH,OAAO,CAAC,MAAc;QACpB,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,GAAG,uBAAA,IAAI,iCAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QAC7E,IAAI,OAAO,WAAW,KAAK,QAAQ,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;YAClE,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;SACnC;QAED,MAAM,KAAK,GAAG,uBAAA,IAAI,iEAAU,MAAd,IAAI,EAAW,WAAW,EAAE,IAAI,CAAC,CAAC;QAChD,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;IAChD,CAAC;IAED;;;;;;OAMG;IACH,OAAO,CACL,aAAwC,EACxC,eAA0C,EAC1C,WAAmB;QAEnB,OAAO,uBAAA,IAAI,iCAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,EAAE;YAC1C,MAAM,QAAQ,GAAG,uBAAA,IAAI,iCAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;YAE5D,IAAI,aAAa,EAAE;gBACjB,QAAQ,CAAC,aAAa,GAAG,aAAa,CAAC,QAAQ,EAAE,CAAC;aACnD;YAED,IAAI,eAAe,EAAE;gBACnB,QAAQ,CAAC,eAAe,GAAG,eAAe,CAAC,QAAQ,EAAE,CAAC;aACvD;YAED,KAAK,uBAAA,IAAI,iCAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;YACpD,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;OAIG;IACH,wBAAwB,CAAC,QAAgC;QACvD,OAAO,uBAAA,IAAI,iCAAQ,CAAC,cAAc,CAAC,WAAW,CAAC,GAAG,EAAE;YAClD,KAAK,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,IAAI,QAAQ,EAAE;gBAC7D,MAAM,UAAU,GAAG,OAAO,CAAC,QAAQ,EAAE,QAAQ,EAAE,CAAC;gBAChD,IAAI,CAAC,UAAU,EAAE;oBACf,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;iBACvD;gBAED,MAAM,OAAO,GAAG,qBAAqB,CAAC,WAAW,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC;gBAC/E,MAAM,cAAc,GAAG,uBAAA,IAAI,iCAAQ,CAAC,qBAAqB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBAEvE,IAAI,cAAc,EAAE,MAAM,CAAC,UAAU,CAAC,EAAE;oBACtC,SAAS;iBACV;qBAAM;oBACL,IAAI,cAAc,EAAE;wBAClB,uBAAA,IAAI,8BAAK,MAAT,IAAI,EACF,kCAAkC,cAAc,CAAC,QAAQ,CACvD,KAAK,CACN,OAAO,OAAO,CAAC,QAAQ,EAAE,aAAa,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CACpE,CAAC;qBACH;oBAED,KAAK,uBAAA,IAAI,iCAAQ,CAAC,qBAAqB,CAAC,GAAG,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;iBAClE;gBAED,IAAI,gBAAgB,GAAG,uBAAA,IAAI,iCAAQ,CAAC,cAAc,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;gBACnE,IAAI,CAAC,gBAAgB,EAAE;oBACrB,gBAAgB,GAAG;wBACjB,OAAO,EAAE,OAAO,CAAC,QAAQ,EAAE;wBAC3B,YAAY,EAAE,CAAC;wBACf,cAAc,EAAE,CAAC;qBAClB,CAAC;oBACF,KAAK,uBAAA,IAAI,iCAAQ,CAAC,cAAc,CAAC,GAAG,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;iBACpE;gBAED,uBAAA,IAAI,+EAAwB,MAA5B,IAAI,EAAyB,UAAU,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;aACzD;YACD,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;OAIG;IACH,2BAA2B,CAAC,QAAkC;QAC5D,OAAO,uBAAA,IAAI,iCAAQ,CAAC,cAAc,CAAC,WAAW,CAAC,GAAG,EAAE;YAClD,KAAK,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,QAAQ,EAAE;gBAC9D,MAAM,UAAU,GAAG,QAAQ,CAAC,QAAQ,EAAE,CAAC;gBACvC,MAAM,OAAO,GAAG,qBAAqB,CAAC,WAAW,EAAE,kBAAkB,EAAE,YAAY,CAAC,CAAC;gBACrF,MAAM,cAAc,GAAG,uBAAA,IAAI,iCAAQ,CAAC,qBAAqB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBACvE,IAAI,cAAc,EAAE,MAAM,CAAC,UAAU,CAAC,EAAE;oBACtC,SAAS;iBACV;qBAAM;oBACL,IAAI,cAAc,EAAE;wBAClB,uBAAA,IAAI,8BAAK,MAAT,IAAI,EACF,kCAAkC,cAAc,CAAC,QAAQ,CACvD,KAAK,CACN,OAAO,OAAO,CAAC,QAAQ,EAAE,aAAa,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CACpE,CAAC;qBACH;oBACD,KAAK,uBAAA,IAAI,iCAAQ,CAAC,qBAAqB,CAAC,GAAG,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;iBAClE;gBAED,MAAM,OAAO,GAAG,uBAAA,IAAI,yEAAkB,MAAtB,IAAI,EAAmB,UAAU,CAAC,CAAC;gBACnD,uBAAA,IAAI,+EAAwB,MAA5B,IAAI,EAAyB,UAAU,EAAE,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;aAC1D;YACD,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;;OAKG;IACH,qBAAqB,CAAC,SAAe;QACnC,OAAO,uBAAA,IAAI,iCAAQ,CAAC,cAAc,CAAC,WAAW,CAAC,GAAG,EAAE;YAClD,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;gBAChC,MAAM,UAAU,GAAG,QAAQ,CAAC,QAAQ,EAAE,CAAC;gBACvC,MAAM,OAAO,GAAG,uBAAA,IAAI,yEAAkB,MAAtB,IAAI,EAAmB,UAAU,CAAC,CAAC;gBACnD,uBAAA,IAAI,+EAAwB,MAA5B,IAAI,EAAyB,UAAU,EAAE,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;aAC1D;YACD,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;OAIG;IACH,2BAA2B,CAAC,KAAa;QACvC,0EAA0E;QAC1E,gFAAgF;QAChF,8DAA8D;QAC9D,MAAM,WAAW,GAAG,uBAAA,IAAI,iCAAQ,CAAC,oBAAoB,CAAC,kBAAkB,EAAE,CAAC;QAE3E,IAAI;YACF,qCAAqC;YACrC,MAAM,IAAI,GAAG,uBAAA,IAAI,iCAAQ,CAAC,oBAAoB,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;YACvF,MAAM,QAAQ,GAAS,EAAE,CAAC;YAE1B,YAAY,EAAE,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;gBACpC,MAAM,eAAe,GAAG,uBAAA,IAAI,iCAAQ,CAAC,oBAAoB,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC;gBAC1F,uBAAA,IAAI,8BAAK,MAAT,IAAI,EAAM,8BAA8B,GAAG,EAAE,CAAC,CAAC;gBAE/C,KAAK,MAAM,UAAU,IAAI,eAAe,EAAE;oBACxC,MAAM,gBAAgB,GAAG,uBAAA,IAAI,iCAAQ,CAAC,cAAc,CAAC,GAAG,CAAC,UAAU,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC;oBACtF,IAAI,CAAC,gBAAgB,IAAI,gBAAgB,CAAC,YAAY,KAAK,CAAC,EAAE;wBAC5D,uBAAA,IAAI,8BAAK,MAAT,IAAI,EACF,WAAW,UAAU,CAAC,QAAQ,CAC5B,KAAK,CACN,2EAA2E,CAC7E,CAAC;wBACF,SAAS;qBACV;oBACD,MAAM,KAAK,GAAG,KAAK,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC;oBACnF,uBAAA,IAAI,8BAAK,MAAT,IAAI,EAAM,UAAU,KAAK,CAAC,MAAM,cAAc,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,GAAG,EAAE,CAAC,CAAC;oBACvF,QAAQ,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC;oBAExB,IAAI,QAAQ,CAAC,MAAM,IAAI,KAAK,EAAE;wBAC5B,MAAM,YAAY,CAAC;qBACpB;iBACF;aACF;YAED,OAAO,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;SAClC;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;SAC5B;gBAAS;YACR,WAAW,CAAC,IAAI,EAAE,CAAC;SACpB;IACH,CAAC;IAED;;;;OAIG;IACH,yBAAyB,CAAC,UAAc;QACtC,MAAM,KAAK,GAAG,uBAAA,IAAI,iCAAQ,CAAC,cAAc,CAAC,GAAG,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;QACrE,IAAI,CAAC,KAAK,EAAE;YACV,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,oBAAoB,UAAU,YAAY,CAAC,CAAC,CAAC;SAC9E;QAED,IAAI,KAAK,CAAC,cAAc,KAAK,CAAC,EAAE;YAC9B,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,oBAAoB,UAAU,gBAAgB,CAAC,CAAC,CAAC;SAClF;QAED,OAAO,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;IAClE,CAAC;IAED;;;;;;OAMG;IACH,OAAO,CAAC,KAAa,EAAE,KAAa,EAAE,OAAgB;QACpD,IAAI;YACF,MAAM,WAAW,GAAG,OAAO,KAAK,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,iBAAiB,CAAC;YACxF,MAAM,IAAI,GAAG,uBAAA,IAAI,iCAAQ,CAAC,MAAM;iBAC7B,QAAQ,CAAC,uBAAA,IAAI,0EAAmB,MAAvB,IAAI,EAAoB,KAAK,EAAE,KAAK,CAAC,CAAC;iBAC/C,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,CAC1C,IAAI,CAAC,CAAC,CAAC,aAAa,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,aAAa,CAAC,EAAE,CAAC,CACxE,CAAC,OAAO,CAAC;YAEZ,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;SAC9B;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;SAC5B;IACH,CAAC;IAED;;;;OAIG;IACH,kBAAkB,CAAC,MAAiB;QAClC,IAAI;YACF,IAAI,MAAM,CAAC,QAAQ,EAAE;gBACnB,OAAO,OAAO,CAAC,OAAO,CAAC,uBAAA,IAAI,gFAAyB,MAA7B,IAAI,EAA0B,MAAM,CAAC,CAAC,CAAC;aAC/D;iBAAM,IAAI,MAAM,CAAC,MAAM,EAAE;gBACxB,OAAO,OAAO,CAAC,OAAO,CAAC,uBAAA,IAAI,uEAAgB,MAApB,IAAI,EAAiB,MAAM,CAAC,CAAC,CAAC;aACtD;iBAAM;gBACL,OAAO,OAAO,CAAC,OAAO,CAAC,uBAAA,IAAI,gFAAyB,MAA7B,IAAI,EAA0B,MAAM,CAAC,CAAC,CAAC;aAC/D;SACF;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;SAC5B;IACH,CAAC;IAyFD;;;;;OAKG;IACH,uBAAuB,CAAC,IAA4B,EAAE,QAAgB;QACpE,OAAO,uBAAA,IAAI,iCAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,EAAE;YAC1C,MAAM,QAAQ,GAAG,uBAAA,IAAI,iCAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;YACzD,IAAI,CAAC,QAAQ,CAAC,oBAAoB,EAAE;gBAClC,QAAQ,CAAC,oBAAoB,GAAG,EAAE,CAAC;aACpC;YACD,uBAAA,IAAI,8BAAK,MAAT,IAAI,EAAM,UAAU,IAAI,CAAC,MAAM,oCAAoC,QAAQ,EAAE,CAAC,CAAC;YAC/E,QAAQ,CAAC,oBAAoB,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;YACzE,KAAK,uBAAA,IAAI,iCAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;YAEjD,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;OAIG;IACH,uBAAuB,CAAC,eAA6B;QACnD,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC,GAAG,uBAAA,IAAI,iCAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC;QAE1F,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE;YACnC,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;SACnC;QAED,MAAM,QAAQ,GAAG,uBAAA,IAAI,iCAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QACtD,IAAI,CAAC,QAAQ,EAAE;YACb,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;SACnC;QAED,KAAK,MAAM,IAAI,IAAI,QAAQ,CAAC,oBAAoB,IAAI,EAAE,EAAE;YACtD,MAAM,oBAAoB,GAAG,oBAAoB,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;YAC7E,IAAI,oBAAoB,CAAC,YAAY,CAAC,eAAe,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;gBAC7E,OAAO,OAAO,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;aAC9C;SACF;QAED,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACpC,CAAC;IAED;;;;OAIG;IACH,8BAA8B,CAAC,QAAgB;QAC7C,MAAM,QAAQ,GAAG,uBAAA,IAAI,iCAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACnD,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,CAAC,oBAAoB,EAAE;YAC/C,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;SAC5B;QAED,OAAO,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,oBAAoB,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IACrH,CAAC;IAED;;;;;OAKG;IACH,eAAe,CAAC,eAA6B;QAC3C,MAAM,CAAC,WAAW,EAAE,KAAK,CAAC,GAAG,uBAAA,IAAI,iCAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC;QAC9F,IAAI,OAAO,WAAW,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAChE,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;SACnC;QAED,MAAM,KAAK,GAAG,uBAAA,IAAI,iEAAU,MAAd,IAAI,EAAW,WAAW,CAAC,CAAC;QAC1C,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;IACxD,CAAC;IAED;;;;;OAKG;IACH,sBAAsB,CAAC,WAAmB;QACxC,MAAM,KAAK,GAAG,uBAAA,IAAI,iEAAU,MAAd,IAAI,EAAW,WAAW,CAAC,CAAC;QAC1C,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,eAAe,IAAI,EAAE,CAAC,CAAC;IACvD,CAAC;IAED;;;OAGG;IACH,cAAc;QACZ,2DAA2D;QAC3D,MAAM,CAAC,eAAe,CAAC,GAAG,uBAAA,IAAI,iCAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC;QAC3F,OAAO,OAAO,CAAC,OAAO,CAAC,OAAO,eAAe,KAAK,QAAQ,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,oBAAoB,GAAG,CAAC,CAAC,CAAC;IAC3G,CAAC;IAED,gBAAgB;QACd,6DAA6D;QAC7D,MAAM,CAAC,SAAS,CAAC,GAAG,uBAAA,IAAI,iCAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC;QACtF,IAAI,CAAC,SAAS,EAAE;YACd,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;SAC5B;aAAM;YACL,MAAM,QAAQ,GAAG,SAAS,CAAC,KAAK,CAAC;YACjC,IAAI,CAAC,QAAQ,CAAC,aAAa,EAAE;gBAC3B,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC,CAAC;aAC/D;iBAAM;gBACL,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;aACtE;SACF;IACH,CAAC;CA6FF;oQAnSiB,MAAiB;IAC/B,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;QAClB,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC;KACnC;IAED,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,GAAG,uBAAA,IAAI,iCAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IACpF,IAAI,OAAO,WAAW,KAAK,QAAQ,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;QAClE,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;KACxC;IAED,MAAM,KAAK,GAAG,uBAAA,IAAI,iEAAU,MAAd,IAAI,EAAW,WAAW,EAAE,IAAI,CAAC,CAAC;IAChD,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,kBAAkB,EAAE;QACvC,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;KACxC;IAED,MAAM,MAAM,GAAG,KAAK,CAAC,kBAAkB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,gBAAgB,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;IAClH,MAAM,IAAI,GAA+B,EAAE,CAAC;IAC5C,MAAM,UAAU,GAAG,uBAAA,IAAI,uEAAgB,MAApB,IAAI,EAAiB,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAEpF,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;AAC9B,CAAC,mGAEwB,MAAiB;IACxC,MAAM,KAAK,GACT,MAAM,CAAC,QAAQ,EAAE,WAAW,IAAI,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,IAAI,oBAAoB,EAAE,oBAAoB,CAAC,CAAC;IAC3G,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC;IAE3B,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,GAAG,KAAK,EAAE;QAC1C,OAAO;YACL,IAAI,EAAE,EAAE;YACR,UAAU,EAAE,IAAI;SACjB,CAAC;KACH;IAED,MAAM,IAAI,GAA+B,EAAE,CAAC;IAE5C,MAAM,YAAY,GAAG,uBAAA,IAAI,iCAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;IAClF,IAAI,UAAU,GAAG,KAAK,CAAC;IAEvB,cAAc,EAAE,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE;QACtD,MAAM,KAAK,GAAG,uBAAA,IAAI,iEAAU,MAAd,IAAI,EAAW,WAAW,EAAE,IAAI,CAAC,CAAC;QAChD,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,kBAAkB,EAAE;YACvC,SAAS;SACV;QAED,MAAM,sBAAsB,GAAG,KAAK,CAAC,kBAAkB,CAAC;QACxD,KAAK,IAAI,OAAO,GAAG,MAAM,CAAC,QAAQ,EAAE,OAAO,IAAI,CAAC,EAAE,OAAO,GAAG,sBAAsB,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE;YAC3G,MAAM,MAAM,GAAG,sBAAsB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,gBAAgB,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;YAChH,UAAU,GAAG,uBAAA,IAAI,uEAAgB,MAApB,IAAI,EAAiB,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;YAC9E,IAAI,UAAU,EAAE;gBACd,MAAM,cAAc,CAAC;aACtB;SACF;KACF;IAED,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;AAC9B,CAAC,iFAGC,OAAmC,EACnC,WAAmB,EACnB,OAAe,EACf,MAA0B,EAC1B,MAAiB;IAEjB,IAAI,UAAU,GAAG,KAAK,CAAC;IACvB,IAAI,QAAQ,GAAG,OAAO,MAAM,CAAC,QAAQ,EAAE,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAChG,OAAO,QAAQ,GAAG,MAAM,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE;QAC3C,MAAM,GAAG,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC7B,IAAI,MAAM,CAAC,eAAe,IAAI,CAAC,GAAG,CAAC,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;YACjF,SAAS;SACV;QAED,IAAI,MAAM,CAAC,QAAQ,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE;YAC5D,SAAS;SACV;QAED,OAAO,CAAC,IAAI,CAAC,IAAI,wBAAwB,CAAC,IAAI,KAAK,CAAC,WAAW,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;QAC3F,IAAI,OAAO,CAAC,MAAM,IAAI,uBAAA,IAAI,0CAAiB,EAAE;YAC3C,UAAU,GAAG,IAAI,CAAC;YAClB,MAAM;SACP;KACF;IAED,OAAO,UAAU,CAAC;AACpB,CAAC,qEAmHS,WAAmB,EAAE,QAAQ,GAAG,KAAK;IAC7C,MAAM,QAAQ,GAAG,uBAAA,IAAI,iCAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IACtD,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE;QAChC,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,KAAK,GAAG,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;IAE3D,IAAI,QAAQ,EAAE;QACZ,IAAI,QAAQ,CAAC,aAAa,EAAE;YAC1B,KAAK,CAAC,UAAU,CAAC,aAAa,CAAC,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;SACjG;QAED,IAAI,QAAQ,CAAC,eAAe,EAAE;YAC5B,KAAK,CAAC,UAAU,CAAC,aAAa,CAAC,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;SACrG;KACF;IAED,OAAO,KAAK,CAAC;AACf,CAAC,uFAEkB,KAAa,EAAE,KAAa;IAC7C,IAAI,KAAK,GAAG,CAAC,EAAE;QACb,MAAM,IAAI,KAAK,CAAC,kBAAkB,KAAK,EAAE,CAAC,CAAC;KAC5C;IAED,IAAI,KAAK,GAAG,oBAAoB,EAAE;QAChC,uBAAA,IAAI,8BAAK,MAAT,IAAI,EAAM,wBAAwB,KAAK,OAAO,oBAAoB,EAAE,CAAC,CAAC;QACtE,KAAK,GAAG,oBAAoB,CAAC;KAC9B;IAED,MAAM,GAAG,GAAG,KAAK,GAAG,KAAK,CAAC;IAC1B,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;AACxB,CAAC,qFAEiB,QAAgB;IAChC,MAAM,KAAK,GAAG,uBAAA,IAAI,iCAAQ,CAAC,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACxD,IAAI,CAAC,KAAK,EAAE;QACV,MAAM,IAAI,KAAK,CAAC,mBAAmB,GAAG,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;KAC5D;IAED,OAAO,aAAa,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;AACjD,CAAC,iGAcC,UAAkB,EAClB,OAAsB,EACtB,iBAAyB,EACzB,mBAA2B;IAE3B,MAAM,KAAK,GAAG,uBAAA,IAAI,iCAAQ,CAAC,cAAc,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IAC/D,IAAI,CAAC,KAAK,EAAE;QACV,OAAO;KACR;IAED,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC;IAExB,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,YAAY,GAAG,iBAAiB,CAAC,CAAC;IACzE,KAAK,CAAC,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,cAAc,GAAG,mBAAmB,CAAC,CAAC;IAE/E,uBAAA,IAAI,8BAAK,MAAT,IAAI,EACF,qBAAqB,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,KAAK,CAAC,YAAY,gBACtE,KAAK,CAAC,cACR,aAAa,CACd,CAAC;IAEF,IAAI,KAAK,CAAC,YAAY,KAAK,CAAC,EAAE;QAC5B,uBAAA,IAAI,8BAAK,MAAT,IAAI,EAAM,oBAAoB,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,yCAAyC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;QAChH,KAAK,uBAAA,IAAI,iCAAQ,CAAC,oBAAoB,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;KACxE;SAAM,IAAI,KAAK,CAAC,YAAY,GAAG,CAAC,EAAE;QACjC,uBAAA,IAAI,8BAAK,MAAT,IAAI,EAAM,kBAAkB,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,sCAAsC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;QAC3G,KAAK,uBAAA,IAAI,iCAAQ,CAAC,oBAAoB,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;KACrE;IAED,IAAI,KAAK,CAAC,YAAY,KAAK,CAAC,IAAI,KAAK,CAAC,cAAc,KAAK,CAAC,EAAE;QAC1D,KAAK,uBAAA,IAAI,iCAAQ,CAAC,cAAc,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;KACrD;SAAM;QACL,KAAK,uBAAA,IAAI,iCAAQ,CAAC,cAAc,CAAC,GAAG,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;KACzD;AACH,CAAC;AAGH;;;GAGG;AACH,SAAS,QAAQ,CAAC,GAAwB;IACxC,OAAO,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,iBAAiB,CAAC,CAAC;AAClH,CAAC"}

package/dest/archiver/{l1_to_l2_message_store.d.ts → memory_archiver_store/l1_to_l2_message_store.d.ts}

@@ -10,8 +10,10 @@ 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, msg: L1ToL2Message): void;
+    addMessage(messageKey: Fr, message: L1ToL2Message, l1BlocKNumber: bigint, messageIndex: number): void;
+    addMessageUnsafe(messageKey: Fr, message: L1ToL2Message): void;
     getMessage(messageKey: Fr): L1ToL2Message | undefined;
     getMessageAndCount(messageKey: Fr): L1ToL2MessageAndCount | undefined;
 }
@@ -20,8 +22,10 @@ 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): void;
+    removeMessage(messageKey: Fr, l1BlockNumber: bigint, messageIndex: number): void;
+    removeMessageUnsafe(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

@@ -0,0 +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"}