@aztec/archiver 0.73.0 → 0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2

package/dest/archiver/kv_archiver_store/kv_archiver_store.js

@@ -1,5 +1,3 @@
-var _KVArchiverDataStore_blockStore, _KVArchiverDataStore_logStore, _KVArchiverDataStore_nullifierStore, _KVArchiverDataStore_messageStore, _KVArchiverDataStore_contractClassStore, _KVArchiverDataStore_contractInstanceStore, _KVArchiverDataStore_log;
-import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
 import { FunctionSelector } from '@aztec/foundation/abi';
 import { toArray } from '@aztec/foundation/iterable';
 import { createLogger } from '@aztec/foundation/log';
@@ -11,24 +9,26 @@ import { MessageStore } from './message_store.js';
 import { NullifierStore } from './nullifier_store.js';
 /**
  * LMDB implementation of the ArchiverDataStore interface.
- */
-export class KVArchiverDataStore {
-    constructor(db, logsMaxPageSize = 1000) {
+ */ export class KVArchiverDataStore {
+    db;
+    #blockStore;
+    #logStore;
+    #nullifierStore;
+    #messageStore;
+    #contractClassStore;
+    #contractInstanceStore;
+    functionNames;
+    #log;
+    constructor(db, logsMaxPageSize = 1000){
         this.db = db;
-        _KVArchiverDataStore_blockStore.set(this, void 0);
-        _KVArchiverDataStore_logStore.set(this, void 0);
-        _KVArchiverDataStore_nullifierStore.set(this, void 0);
-        _KVArchiverDataStore_messageStore.set(this, void 0);
-        _KVArchiverDataStore_contractClassStore.set(this, void 0);
-        _KVArchiverDataStore_contractInstanceStore.set(this, void 0);
         this.functionNames = new Map();
-        _KVArchiverDataStore_log.set(this, createLogger('archiver:data-store'));
-        __classPrivateFieldSet(this, _KVArchiverDataStore_blockStore, new BlockStore(db), "f");
-        __classPrivateFieldSet(this, _KVArchiverDataStore_logStore, new LogStore(db, __classPrivateFieldGet(this, _KVArchiverDataStore_blockStore, "f"), logsMaxPageSize), "f");
-        __classPrivateFieldSet(this, _KVArchiverDataStore_messageStore, new MessageStore(db), "f");
-        __classPrivateFieldSet(this, _KVArchiverDataStore_contractClassStore, new ContractClassStore(db), "f");
-        __classPrivateFieldSet(this, _KVArchiverDataStore_contractInstanceStore, new ContractInstanceStore(db), "f");
-        __classPrivateFieldSet(this, _KVArchiverDataStore_nullifierStore, new NullifierStore(db), "f");
+        this.#log = createLogger('archiver:data-store');
+        this.#blockStore = new BlockStore(db);
+        this.#logStore = new LogStore(db, this.#blockStore, logsMaxPageSize);
+        this.#messageStore = new MessageStore(db);
+        this.#contractClassStore = new ContractClassStore(db);
+        this.#contractInstanceStore = new ContractInstanceStore(db);
+        this.#nullifierStore = new NullifierStore(db);
     }
     // TODO:  These function names are in memory only as they are for development/debugging. They require the full contract
     //        artifact supplied to the node out of band. This should be reviewed and potentially removed as part of
@@ -37,240 +37,217 @@ export class KVArchiverDataStore {
         return Promise.resolve(this.functionNames.get(selector.toString()));
     }
     async registerContractFunctionSignatures(_address, signatures) {
-        for (const sig of signatures) {
+        for (const sig of signatures){
             try {
                 const selector = await FunctionSelector.fromSignature(sig);
                 this.functionNames.set(selector.toString(), sig.slice(0, sig.indexOf('(')));
-            }
-            catch {
-                __classPrivateFieldGet(this, _KVArchiverDataStore_log, "f").warn(`Failed to parse signature: ${sig}. Ignoring`);
+            } catch  {
+                this.#log.warn(`Failed to parse signature: ${sig}. Ignoring`);
             }
         }
     }
     getContractClass(id) {
-        return __classPrivateFieldGet(this, _KVArchiverDataStore_contractClassStore, "f").getContractClass(id);
+        return this.#contractClassStore.getContractClass(id);
     }
     getContractClassIds() {
-        return __classPrivateFieldGet(this, _KVArchiverDataStore_contractClassStore, "f").getContractClassIds();
+        return this.#contractClassStore.getContractClassIds();
     }
     getContractInstance(address) {
-        const contract = __classPrivateFieldGet(this, _KVArchiverDataStore_contractInstanceStore, "f").getContractInstance(address);
+        const contract = this.#contractInstanceStore.getContractInstance(address);
         return contract;
     }
     async addContractClasses(data, bytecodeCommitments, blockNumber) {
-        return (await Promise.all(data.map((c, i) => __classPrivateFieldGet(this, _KVArchiverDataStore_contractClassStore, "f").addContractClass(c, bytecodeCommitments[i], blockNumber)))).every(Boolean);
+        return (await Promise.all(data.map((c, i)=>this.#contractClassStore.addContractClass(c, bytecodeCommitments[i], blockNumber)))).every(Boolean);
     }
     async deleteContractClasses(data, blockNumber) {
-        return (await Promise.all(data.map(c => __classPrivateFieldGet(this, _KVArchiverDataStore_contractClassStore, "f").deleteContractClasses(c, blockNumber)))).every(Boolean);
+        return (await Promise.all(data.map((c)=>this.#contractClassStore.deleteContractClasses(c, blockNumber)))).every(Boolean);
     }
     getBytecodeCommitment(contractClassId) {
-        return __classPrivateFieldGet(this, _KVArchiverDataStore_contractClassStore, "f").getBytecodeCommitment(contractClassId);
+        return this.#contractClassStore.getBytecodeCommitment(contractClassId);
     }
     addFunctions(contractClassId, privateFunctions, unconstrainedFunctions) {
-        return __classPrivateFieldGet(this, _KVArchiverDataStore_contractClassStore, "f").addFunctions(contractClassId, privateFunctions, unconstrainedFunctions);
+        return this.#contractClassStore.addFunctions(contractClassId, privateFunctions, unconstrainedFunctions);
     }
     async addContractInstances(data, _blockNumber) {
-        return (await Promise.all(data.map(c => __classPrivateFieldGet(this, _KVArchiverDataStore_contractInstanceStore, "f").addContractInstance(c)))).every(Boolean);
+        return (await Promise.all(data.map((c)=>this.#contractInstanceStore.addContractInstance(c)))).every(Boolean);
     }
     async deleteContractInstances(data, _blockNumber) {
-        return (await Promise.all(data.map(c => __classPrivateFieldGet(this, _KVArchiverDataStore_contractInstanceStore, "f").deleteContractInstance(c)))).every(Boolean);
+        return (await Promise.all(data.map((c)=>this.#contractInstanceStore.deleteContractInstance(c)))).every(Boolean);
     }
     /**
-     * Append new blocks to the store's list.
-     * @param blocks - The L2 blocks to be added to the store and the last processed L1 block.
-     * @returns True if the operation is successful.
-     */
-    addBlocks(blocks) {
-        return __classPrivateFieldGet(this, _KVArchiverDataStore_blockStore, "f").addBlocks(blocks);
+   * Append new blocks to the store's list.
+   * @param blocks - The L2 blocks to be added to the store and the last processed L1 block.
+   * @returns True if the operation is successful.
+   */ addBlocks(blocks) {
+        return this.#blockStore.addBlocks(blocks);
     }
     /**
-     * Unwinds blocks from the database
-     * @param from -  The tip of the chain, passed for verification purposes,
-     *                ensuring that we don't end up deleting something we did not intend
-     * @param blocksToUnwind - The number of blocks we are to unwind
-     * @returns True if the operation is successful
-     */
-    unwindBlocks(from, blocksToUnwind) {
-        return __classPrivateFieldGet(this, _KVArchiverDataStore_blockStore, "f").unwindBlocks(from, blocksToUnwind);
+   * Unwinds blocks from the database
+   * @param from -  The tip of the chain, passed for verification purposes,
+   *                ensuring that we don't end up deleting something we did not intend
+   * @param blocksToUnwind - The number of blocks we are to unwind
+   * @returns True if the operation is successful
+   */ unwindBlocks(from, blocksToUnwind) {
+        return this.#blockStore.unwindBlocks(from, blocksToUnwind);
     }
     /**
-     * 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) {
-        return toArray(__classPrivateFieldGet(this, _KVArchiverDataStore_blockStore, "f").getBlocks(start, limit));
+   * 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) {
+        return toArray(this.#blockStore.getBlocks(start, limit));
     }
     /**
-     * Gets up to `limit` amount of L2 blocks headers 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
-     */
-    getBlockHeaders(start, limit) {
-        return toArray(__classPrivateFieldGet(this, _KVArchiverDataStore_blockStore, "f").getBlockHeaders(start, limit));
+   * Gets up to `limit` amount of L2 blocks headers 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
+   */ getBlockHeaders(start, limit) {
+        return toArray(this.#blockStore.getBlockHeaders(start, limit));
     }
     /**
-     * Gets a tx effect.
-     * @param txHash - The txHash of the tx corresponding to the tx effect.
-     * @returns The requested tx effect (or undefined if not found).
-     */
-    getTxEffect(txHash) {
-        return __classPrivateFieldGet(this, _KVArchiverDataStore_blockStore, "f").getTxEffect(txHash);
+   * Gets a tx effect.
+   * @param txHash - The txHash of the tx corresponding to the tx effect.
+   * @returns The requested tx effect (or undefined if not found).
+   */ getTxEffect(txHash) {
+        return this.#blockStore.getTxEffect(txHash);
     }
     /**
-     * Gets a receipt of a settled tx.
-     * @param txHash - The hash of a tx we try to get the receipt for.
-     * @returns The requested tx receipt (or undefined if not found).
-     */
-    getSettledTxReceipt(txHash) {
-        return __classPrivateFieldGet(this, _KVArchiverDataStore_blockStore, "f").getSettledTxReceipt(txHash);
+   * Gets a receipt of a settled tx.
+   * @param txHash - The hash of a tx we try to get the receipt for.
+   * @returns The requested tx receipt (or undefined if not found).
+   */ getSettledTxReceipt(txHash) {
+        return this.#blockStore.getSettledTxReceipt(txHash);
     }
     /**
-     * Append new logs to the store's list.
-     * @param blocks - The blocks for which to add the logs.
-     * @returns True if the operation is successful.
-     */
-    addLogs(blocks) {
-        return __classPrivateFieldGet(this, _KVArchiverDataStore_logStore, "f").addLogs(blocks);
+   * Append new logs to the store's list.
+   * @param blocks - The blocks for which to add the logs.
+   * @returns True if the operation is successful.
+   */ addLogs(blocks) {
+        return this.#logStore.addLogs(blocks);
     }
     deleteLogs(blocks) {
-        return __classPrivateFieldGet(this, _KVArchiverDataStore_logStore, "f").deleteLogs(blocks);
+        return this.#logStore.deleteLogs(blocks);
     }
     /**
-     * Append new nullifiers to the store's list.
-     * @param blocks - The blocks for which to add the nullifiers.
-     * @returns True if the operation is successful.
-     */
-    addNullifiers(blocks) {
-        return __classPrivateFieldGet(this, _KVArchiverDataStore_nullifierStore, "f").addNullifiers(blocks);
+   * Append new nullifiers to the store's list.
+   * @param blocks - The blocks for which to add the nullifiers.
+   * @returns True if the operation is successful.
+   */ addNullifiers(blocks) {
+        return this.#nullifierStore.addNullifiers(blocks);
     }
     deleteNullifiers(blocks) {
-        return __classPrivateFieldGet(this, _KVArchiverDataStore_nullifierStore, "f").deleteNullifiers(blocks);
+        return this.#nullifierStore.deleteNullifiers(blocks);
     }
     findNullifiersIndexesWithBlock(blockNumber, nullifiers) {
-        return __classPrivateFieldGet(this, _KVArchiverDataStore_nullifierStore, "f").findNullifiersIndexesWithBlock(blockNumber, nullifiers);
+        return this.#nullifierStore.findNullifiersIndexesWithBlock(blockNumber, nullifiers);
     }
     getTotalL1ToL2MessageCount() {
-        return __classPrivateFieldGet(this, _KVArchiverDataStore_messageStore, "f").getTotalL1ToL2MessageCount();
+        return this.#messageStore.getTotalL1ToL2MessageCount();
     }
     /**
-     * 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.
-     */
-    addL1ToL2Messages(messages) {
-        return __classPrivateFieldGet(this, _KVArchiverDataStore_messageStore, "f").addL1ToL2Messages(messages);
+   * 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.
+   */ addL1ToL2Messages(messages) {
+        return this.#messageStore.addL1ToL2Messages(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).
-     */
-    getL1ToL2MessageIndex(l1ToL2Message) {
-        return __classPrivateFieldGet(this, _KVArchiverDataStore_messageStore, "f").getL1ToL2MessageIndex(l1ToL2Message);
+   * Gets the L1 to L2 message index in the L1 to L2 message tree.
+   * @param l1ToL2Message - The L1 to L2 message.
+   * @returns The index of the L1 to L2 message in the L1 to L2 message tree (undefined if not found).
+   */ getL1ToL2MessageIndex(l1ToL2Message) {
+        return this.#messageStore.getL1ToL2MessageIndex(l1ToL2Message);
     }
     /**
-     * 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).
-     */
-    getL1ToL2Messages(blockNumber) {
-        return __classPrivateFieldGet(this, _KVArchiverDataStore_messageStore, "f").getL1ToL2Messages(blockNumber);
+   * 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).
+   */ getL1ToL2Messages(blockNumber) {
+        return this.#messageStore.getL1ToL2Messages(blockNumber);
     }
     /**
-     * Retrieves all private logs from up to `limit` blocks, starting from the block number `from`.
-     * @param from - The block number from which to begin retrieving logs.
-     * @param limit - The maximum number of blocks to retrieve logs from.
-     * @returns An array of private logs from the specified range of blocks.
-     */
-    getPrivateLogs(from, limit) {
-        return __classPrivateFieldGet(this, _KVArchiverDataStore_logStore, "f").getPrivateLogs(from, limit);
+   * Retrieves all private logs from up to `limit` blocks, starting from the block number `from`.
+   * @param from - The block number from which to begin retrieving logs.
+   * @param limit - The maximum number of blocks to retrieve logs from.
+   * @returns An array of private logs from the specified range of blocks.
+   */ getPrivateLogs(from, limit) {
+        return this.#logStore.getPrivateLogs(from, limit);
     }
     /**
-     * Gets all logs that match any of the received tags (i.e. logs with their first field equal to a tag).
-     * @param tags - The tags to filter the logs by.
-     * @returns For each received tag, an array of matching logs is returned. An empty array implies no logs match
-     * that tag.
-     */
-    getLogsByTags(tags) {
+   * Gets all logs that match any of the received tags (i.e. logs with their first field equal to a tag).
+   * @param tags - The tags to filter the logs by.
+   * @returns For each received tag, an array of matching logs is returned. An empty array implies no logs match
+   * that tag.
+   */ getLogsByTags(tags) {
         try {
-            return __classPrivateFieldGet(this, _KVArchiverDataStore_logStore, "f").getLogsByTags(tags);
-        }
-        catch (err) {
+            return this.#logStore.getLogsByTags(tags);
+        } catch (err) {
             return Promise.reject(err);
         }
     }
     /**
-     * Gets public logs based on the provided filter.
-     * @param filter - The filter to apply to the logs.
-     * @returns The requested logs.
-     */
-    getPublicLogs(filter) {
+   * Gets public logs based on the provided filter.
+   * @param filter - The filter to apply to the logs.
+   * @returns The requested logs.
+   */ getPublicLogs(filter) {
         try {
-            return __classPrivateFieldGet(this, _KVArchiverDataStore_logStore, "f").getPublicLogs(filter);
-        }
-        catch (err) {
+            return this.#logStore.getPublicLogs(filter);
+        } catch (err) {
             return Promise.reject(err);
         }
     }
     /**
-     * Gets contract class logs based on the provided filter.
-     * @param filter - The filter to apply to the logs.
-     * @returns The requested logs.
-     */
-    getContractClassLogs(filter) {
+   * Gets contract class logs based on the provided filter.
+   * @param filter - The filter to apply to the logs.
+   * @returns The requested logs.
+   */ getContractClassLogs(filter) {
         try {
-            return __classPrivateFieldGet(this, _KVArchiverDataStore_logStore, "f").getContractClassLogs(filter);
-        }
-        catch (err) {
+            return this.#logStore.getContractClassLogs(filter);
+        } catch (err) {
             return Promise.reject(err);
         }
     }
     /**
-     * Gets the number of the latest L2 block processed.
-     * @returns The number of the latest L2 block processed.
-     */
-    getSynchedL2BlockNumber() {
-        return __classPrivateFieldGet(this, _KVArchiverDataStore_blockStore, "f").getSynchedL2BlockNumber();
+   * Gets the number of the latest L2 block processed.
+   * @returns The number of the latest L2 block processed.
+   */ getSynchedL2BlockNumber() {
+        return this.#blockStore.getSynchedL2BlockNumber();
     }
     getProvenL2BlockNumber() {
-        return __classPrivateFieldGet(this, _KVArchiverDataStore_blockStore, "f").getProvenL2BlockNumber();
+        return this.#blockStore.getProvenL2BlockNumber();
     }
     getProvenL2EpochNumber() {
-        return __classPrivateFieldGet(this, _KVArchiverDataStore_blockStore, "f").getProvenL2EpochNumber();
+        return this.#blockStore.getProvenL2EpochNumber();
     }
     async setProvenL2BlockNumber(blockNumber) {
-        await __classPrivateFieldGet(this, _KVArchiverDataStore_blockStore, "f").setProvenL2BlockNumber(blockNumber);
+        await this.#blockStore.setProvenL2BlockNumber(blockNumber);
     }
     async setProvenL2EpochNumber(epochNumber) {
-        await __classPrivateFieldGet(this, _KVArchiverDataStore_blockStore, "f").setProvenL2EpochNumber(epochNumber);
+        await this.#blockStore.setProvenL2EpochNumber(epochNumber);
     }
     async setBlockSynchedL1BlockNumber(l1BlockNumber) {
-        await __classPrivateFieldGet(this, _KVArchiverDataStore_blockStore, "f").setSynchedL1BlockNumber(l1BlockNumber);
+        await this.#blockStore.setSynchedL1BlockNumber(l1BlockNumber);
     }
     async setMessageSynchedL1BlockNumber(l1BlockNumber) {
-        await __classPrivateFieldGet(this, _KVArchiverDataStore_messageStore, "f").setSynchedL1BlockNumber(l1BlockNumber);
+        await this.#messageStore.setSynchedL1BlockNumber(l1BlockNumber);
     }
     /**
-     * Gets the last L1 block number processed by the archiver
-     */
-    async getSynchPoint() {
+   * Gets the last L1 block number processed by the archiver
+   */ async getSynchPoint() {
         const [blocksSynchedTo, messagesSynchedTo] = await Promise.all([
-            __classPrivateFieldGet(this, _KVArchiverDataStore_blockStore, "f").getSynchedL1BlockNumber(),
-            __classPrivateFieldGet(this, _KVArchiverDataStore_messageStore, "f").getSynchedL1BlockNumber(),
+            this.#blockStore.getSynchedL1BlockNumber(),
+            this.#messageStore.getSynchedL1BlockNumber()
         ]);
         return {
             blocksSynchedTo,
-            messagesSynchedTo,
+            messagesSynchedTo
         };
     }
     estimateSize() {
         return this.db.estimateSize();
     }
 }
-_KVArchiverDataStore_blockStore = new WeakMap(), _KVArchiverDataStore_logStore = new WeakMap(), _KVArchiverDataStore_nullifierStore = new WeakMap(), _KVArchiverDataStore_messageStore = new WeakMap(), _KVArchiverDataStore_contractClassStore = new WeakMap(), _KVArchiverDataStore_contractInstanceStore = new WeakMap(), _KVArchiverDataStore_log = new WeakMap();
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"kv_archiver_store.js","sourceRoot":"","sources":["../../../src/archiver/kv_archiver_store/kv_archiver_store.ts"],"names":[],"mappings":";;AAoBA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAMrD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD;;GAEG;AACH,MAAM,OAAO,mBAAmB;IAW9B,YAAoB,EAAqB,EAAE,kBAA0B,IAAI;QAArD,OAAE,GAAF,EAAE,CAAmB;QAVzC,kDAAwB;QACxB,gDAAoB;QACpB,sDAAgC;QAChC,oDAA4B;QAC5B,0DAAwC;QACxC,6DAA8C;QACtC,kBAAa,GAAG,IAAI,GAAG,EAAkB,CAAC;QAElD,mCAAO,YAAY,CAAC,qBAAqB,CAAC,EAAC;QAGzC,uBAAA,IAAI,mCAAe,IAAI,UAAU,CAAC,EAAE,CAAC,MAAA,CAAC;QACtC,uBAAA,IAAI,iCAAa,IAAI,QAAQ,CAAC,EAAE,EAAE,uBAAA,IAAI,uCAAY,EAAE,eAAe,CAAC,MAAA,CAAC;QACrE,uBAAA,IAAI,qCAAiB,IAAI,YAAY,CAAC,EAAE,CAAC,MAAA,CAAC;QAC1C,uBAAA,IAAI,2CAAuB,IAAI,kBAAkB,CAAC,EAAE,CAAC,MAAA,CAAC;QACtD,uBAAA,IAAI,8CAA0B,IAAI,qBAAqB,CAAC,EAAE,CAAC,MAAA,CAAC;QAC5D,uBAAA,IAAI,uCAAmB,IAAI,cAAc,CAAC,EAAE,CAAC,MAAA,CAAC;IAChD,CAAC;IAED,uHAAuH;IACvH,+GAA+G;IAC/G,uCAAuC;IACvC,uBAAuB,CAAC,QAAsB,EAAE,QAA0B;QACxE,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;IACtE,CAAC;IAED,KAAK,CAAC,kCAAkC,CAAC,QAAsB,EAAE,UAAoB;QACnF,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;YAC7B,IAAI,CAAC;gBACH,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;gBAC3D,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,EAAE,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YAC9E,CAAC;YAAC,MAAM,CAAC;gBACP,uBAAA,IAAI,gCAAK,CAAC,IAAI,CAAC,8BAA8B,GAAG,YAAY,CAAC,CAAC;YAChE,CAAC;QACH,CAAC;IACH,CAAC;IAED,gBAAgB,CAAC,EAAM;QACrB,OAAO,uBAAA,IAAI,+CAAoB,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC;IACvD,CAAC;IAED,mBAAmB;QACjB,OAAO,uBAAA,IAAI,+CAAoB,CAAC,mBAAmB,EAAE,CAAC;IACxD,CAAC;IAED,mBAAmB,CAAC,OAAqB;QACvC,MAAM,QAAQ,GAAG,uBAAA,IAAI,kDAAuB,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;QAC1E,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,kBAAkB,CACtB,IAA2B,EAC3B,mBAAyB,EACzB,WAAmB;QAEnB,OAAO,CACL,MAAM,OAAO,CAAC,GAAG,CACf,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,uBAAA,IAAI,+CAAoB,CAAC,gBAAgB,CAAC,CAAC,EAAE,mBAAmB,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CACtG,CACF,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAC,IAA2B,EAAE,WAAmB;QAC1E,OAAO,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,uBAAA,IAAI,+CAAoB,CAAC,qBAAqB,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAC7G,OAAO,CACR,CAAC;IACJ,CAAC;IAED,qBAAqB,CAAC,eAAmB;QACvC,OAAO,uBAAA,IAAI,+CAAoB,CAAC,qBAAqB,CAAC,eAAe,CAAC,CAAC;IACzE,CAAC;IAED,YAAY,CACV,eAAmB,EACnB,gBAAgE,EAChE,sBAAkE;QAElE,OAAO,uBAAA,IAAI,+CAAoB,CAAC,YAAY,CAAC,eAAe,EAAE,gBAAgB,EAAE,sBAAsB,CAAC,CAAC;IAC1G,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,IAAmC,EAAE,YAAoB;QAClF,OAAO,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,uBAAA,IAAI,kDAAuB,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAC/G,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,IAAmC,EAAE,YAAoB;QACrF,OAAO,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,uBAAA,IAAI,kDAAuB,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAClH,CAAC;IAED;;;;OAIG;IACH,SAAS,CAAC,MAA8B;QACtC,OAAO,uBAAA,IAAI,uCAAY,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAC5C,CAAC;IAED;;;;;;OAMG;IACH,YAAY,CAAC,IAAY,EAAE,cAAsB;QAC/C,OAAO,uBAAA,IAAI,uCAAY,CAAC,YAAY,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAC7D,CAAC;IAED;;;;;;OAMG;IACH,SAAS,CAAC,KAAa,EAAE,KAAa;QACpC,OAAO,OAAO,CAAC,uBAAA,IAAI,uCAAY,CAAC,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;IAC3D,CAAC;IAED;;;;;;OAMG;IACH,eAAe,CAAC,KAAa,EAAE,KAAa;QAC1C,OAAO,OAAO,CAAC,uBAAA,IAAI,uCAAY,CAAC,eAAe,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;IACjE,CAAC;IAED;;;;OAIG;IACH,WAAW,CAAC,MAAc;QACxB,OAAO,uBAAA,IAAI,uCAAY,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAC9C,CAAC;IAED;;;;OAIG;IACH,mBAAmB,CAAC,MAAc;QAChC,OAAO,uBAAA,IAAI,uCAAY,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;IACtD,CAAC;IAED;;;;OAIG;IACH,OAAO,CAAC,MAAiB;QACvB,OAAO,uBAAA,IAAI,qCAAU,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACxC,CAAC;IAED,UAAU,CAAC,MAAiB;QAC1B,OAAO,uBAAA,IAAI,qCAAU,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IAC3C,CAAC;IAED;;;;OAIG;IACH,aAAa,CAAC,MAAiB;QAC7B,OAAO,uBAAA,IAAI,2CAAgB,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IACpD,CAAC;IAED,gBAAgB,CAAC,MAAiB;QAChC,OAAO,uBAAA,IAAI,2CAAgB,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;IACvD,CAAC;IAED,8BAA8B,CAAC,WAAmB,EAAE,UAAgB;QAClE,OAAO,uBAAA,IAAI,2CAAgB,CAAC,8BAA8B,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;IACtF,CAAC;IAED,0BAA0B;QACxB,OAAO,uBAAA,IAAI,yCAAc,CAAC,0BAA0B,EAAE,CAAC;IACzD,CAAC;IAED;;;;OAIG;IACH,iBAAiB,CAAC,QAAkC;QAClD,OAAO,uBAAA,IAAI,yCAAc,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IACxD,CAAC;IAED;;;;OAIG;IACH,qBAAqB,CAAC,aAAiB;QACrC,OAAO,uBAAA,IAAI,yCAAc,CAAC,qBAAqB,CAAC,aAAa,CAAC,CAAC;IACjE,CAAC;IAED;;;;OAIG;IACH,iBAAiB,CAAC,WAAmB;QACnC,OAAO,uBAAA,IAAI,yCAAc,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;IAC3D,CAAC;IAED;;;;;OAKG;IACH,cAAc,CAAC,IAAY,EAAE,KAAa;QACxC,OAAO,uBAAA,IAAI,qCAAU,CAAC,cAAc,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACpD,CAAC;IAED;;;;;OAKG;IACH,aAAa,CAAC,IAAU;QACtB,IAAI,CAAC;YACH,OAAO,uBAAA,IAAI,qCAAU,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAC5C,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC7B,CAAC;IACH,CAAC;IAED;;;;OAIG;IACH,aAAa,CAAC,MAAiB;QAC7B,IAAI,CAAC;YACH,OAAO,uBAAA,IAAI,qCAAU,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QAC9C,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC7B,CAAC;IACH,CAAC;IAED;;;;OAIG;IACH,oBAAoB,CAAC,MAAiB;QACpC,IAAI,CAAC;YACH,OAAO,uBAAA,IAAI,qCAAU,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC;QACrD,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC7B,CAAC;IACH,CAAC;IAED;;;OAGG;IACH,uBAAuB;QACrB,OAAO,uBAAA,IAAI,uCAAY,CAAC,uBAAuB,EAAE,CAAC;IACpD,CAAC;IAED,sBAAsB;QACpB,OAAO,uBAAA,IAAI,uCAAY,CAAC,sBAAsB,EAAE,CAAC;IACnD,CAAC;IAED,sBAAsB;QACpB,OAAO,uBAAA,IAAI,uCAAY,CAAC,sBAAsB,EAAE,CAAC;IACnD,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,WAAmB;QAC9C,MAAM,uBAAA,IAAI,uCAAY,CAAC,sBAAsB,CAAC,WAAW,CAAC,CAAC;IAC7D,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,WAAmB;QAC9C,MAAM,uBAAA,IAAI,uCAAY,CAAC,sBAAsB,CAAC,WAAW,CAAC,CAAC;IAC7D,CAAC;IAED,KAAK,CAAC,4BAA4B,CAAC,aAAqB;QACtD,MAAM,uBAAA,IAAI,uCAAY,CAAC,uBAAuB,CAAC,aAAa,CAAC,CAAC;IAChE,CAAC;IAED,KAAK,CAAC,8BAA8B,CAAC,aAAqB;QACxD,MAAM,uBAAA,IAAI,yCAAc,CAAC,uBAAuB,CAAC,aAAa,CAAC,CAAC;IAClE,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,aAAa;QACjB,MAAM,CAAC,eAAe,EAAE,iBAAiB,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAC7D,uBAAA,IAAI,uCAAY,CAAC,uBAAuB,EAAE;YAC1C,uBAAA,IAAI,yCAAc,CAAC,uBAAuB,EAAE;SAC7C,CAAC,CAAC;QACH,OAAO;YACL,eAAe;YACf,iBAAiB;SAClB,CAAC;IACJ,CAAC;IAEM,YAAY;QACjB,OAAO,IAAI,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC;IAChC,CAAC;CACF"}