@aztec/archiver 0.16.0 → 0.16.2

package/dest/archiver/archiver.d.ts

@@ -29,10 +29,6 @@ export declare class Archiver implements L2BlockSource, L2LogsSource, ContractDa
      * Next L1 block number to fetch `L2BlockProcessed` logs from (i.e. `fromBlock` in eth_getLogs).
      */
     private nextL2BlockFromL1Block;
-    /**
-     * Last Processed Block Number
-     */
-    private lastProcessedL1BlockNumber;
     /**
      * Use this to track logged block in order to avoid repeating the same message.
      */
@@ -49,14 +45,15 @@ export declare class Archiver implements L2BlockSource, L2LogsSource, ContractDa
      * @param store - An archiver data store for storage & retrieval of blocks, encrypted logs & contract data.
      * @param log - A logger.
      */
-    constructor(publicClient: PublicClient<HttpTransport, Chain>, rollupAddress: EthAddress, inboxAddress: EthAddress, registryAddress: EthAddress, contractDeploymentEmitterAddress: EthAddress, searchStartBlock: number, store: ArchiverDataStore, pollingIntervalMs?: number, log?: DebugLogger);
+    constructor(publicClient: PublicClient<HttpTransport, Chain>, rollupAddress: EthAddress, inboxAddress: EthAddress, registryAddress: EthAddress, contractDeploymentEmitterAddress: EthAddress, store: ArchiverDataStore, pollingIntervalMs?: number, log?: DebugLogger);
     /**
      * Creates a new instance of the Archiver and blocks until it syncs from chain.
      * @param config - The archiver's desired configuration.
+     * @param archiverStore - The backing store for the archiver.
      * @param blockUntilSynced - If true, blocks until the archiver has fully synced.
      * @returns - An instance of the archiver.
      */
-    static createAndSync(config: ArchiverConfig, blockUntilSynced?: boolean): Promise<Archiver>;
+    static createAndSync(config: ArchiverConfig, archiverStore: ArchiverDataStore, blockUntilSynced?: boolean): Promise<Archiver>;
     /**
      * Starts sync process.
      * @param blockUntilSynced - If true, blocks until the archiver has fully synced.

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

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

package/dest/archiver/archiver.js

@@ -4,11 +4,9 @@ import { padArrayEnd } from '@aztec/foundation/collection';
 import { Fr } from '@aztec/foundation/fields';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
-import { RegistryAbi } from '@aztec/l1-artifacts';
-import { L2Block, LogType, } from '@aztec/types';
+import { L2Block, } from '@aztec/types';
 import omit from 'lodash.omit';
-import { createPublicClient, getContract, http } from 'viem';
-import { MemoryArchiverStore } from './archiver_store.js';
+import { createPublicClient, http } from 'viem';
 import { retrieveBlocks, retrieveNewCancelledL1ToL2Messages, retrieveNewContractData, retrieveNewPendingL1ToL2Messages, } from './data_retrieval.js';
 /**
  * Pulls L2 blocks in a non-blocking manner and provides interface for their retrieval.
@@ -28,7 +26,7 @@ export class Archiver {
      * @param store - An archiver data store for storage & retrieval of blocks, encrypted logs & contract data.
      * @param log - A logger.
      */
-    constructor(publicClient, rollupAddress, inboxAddress, registryAddress, contractDeploymentEmitterAddress, searchStartBlock, store, pollingIntervalMs = 10000, log = createDebugLogger('aztec:archiver')) {
+    constructor(publicClient, rollupAddress, inboxAddress, registryAddress, contractDeploymentEmitterAddress, store, pollingIntervalMs = 10000, log = createDebugLogger('aztec:archiver')) {
         this.publicClient = publicClient;
         this.rollupAddress = rollupAddress;
         this.inboxAddress = inboxAddress;
@@ -41,40 +39,26 @@ export class Archiver {
          * Next L1 block number to fetch `L2BlockProcessed` logs from (i.e. `fromBlock` in eth_getLogs).
          */
         this.nextL2BlockFromL1Block = 0n;
-        /**
-         * Last Processed Block Number
-         */
-        this.lastProcessedL1BlockNumber = 0n;
         /**
          * Use this to track logged block in order to avoid repeating the same message.
          */
         this.lastLoggedL1BlockNumber = 0n;
-        this.nextL2BlockFromL1Block = BigInt(searchStartBlock);
-        this.lastProcessedL1BlockNumber = BigInt(searchStartBlock);
     }
     /**
      * Creates a new instance of the Archiver and blocks until it syncs from chain.
      * @param config - The archiver's desired configuration.
+     * @param archiverStore - The backing store for the archiver.
      * @param blockUntilSynced - If true, blocks until the archiver has fully synced.
      * @returns - An instance of the archiver.
      */
-    static async createAndSync(config, blockUntilSynced = true) {
+    static async createAndSync(config, archiverStore, blockUntilSynced = true) {
         const chain = createEthereumChain(config.rpcUrl, config.apiKey);
         const publicClient = createPublicClient({
             chain: chain.chainInfo,
             transport: http(chain.rpcUrl),
             pollingInterval: config.viemPollingIntervalMS,
         });
-        // ask the registry for the block number when the rollup was deployed
-        // this is the block from which archiver has to search from
-        const registryContract = getContract({
-            address: config.l1Contracts.registryAddress.toString(),
-            abi: RegistryAbi,
-            publicClient,
-        });
-        const searchStartBlock = Number((await registryContract.read.getCurrentSnapshot()).blockNumber);
-        const archiverStore = new MemoryArchiverStore(config.maxLogs ?? 1000);
-        const archiver = new Archiver(publicClient, config.l1Contracts.rollupAddress, config.l1Contracts.inboxAddress, config.l1Contracts.registryAddress, config.l1Contracts.contractDeploymentEmitterAddress, searchStartBlock, archiverStore, config.archiverPollingIntervalMS);
+        const archiver = new Archiver(publicClient, config.l1Contracts.rollupAddress, config.l1Contracts.inboxAddress, config.l1Contracts.registryAddress, config.l1Contracts.contractDeploymentEmitterAddress, archiverStore, config.archiverPollingIntervalMS);
         await archiver.start(blockUntilSynced);
         return archiver;
     }
@@ -99,7 +83,12 @@ export class Archiver {
      */
     async sync(blockUntilSynced) {
         const currentL1BlockNumber = await this.publicClient.getBlockNumber();
-        if (currentL1BlockNumber <= this.lastProcessedL1BlockNumber) {
+        // this makes the archiver more resilient to eventually-consistent eth providers like Infura
+        // it _will_ process the same L1 blocks over and over again until the L2 chain advances
+        // one thing to handle now is that we will process the same L1 to L2 messages over and over again
+        // so the store needs to account for that.
+        const lastProcessedL1BlockNumber = await this.store.getL1BlockNumber();
+        if (currentL1BlockNumber <= lastProcessedL1BlockNumber) {
             // reducing logs, otherwise this gets triggered on every loop (1s)
             if (currentL1BlockNumber !== this.lastLoggedL1BlockNumber) {
                 this.log(`No new blocks to process, current block number: ${currentL1BlockNumber}`);
@@ -114,14 +103,14 @@ export class Archiver {
          * to ensure that data is read exactly once.
          *
          * The first is the problem of eventually consistent ETH service providers like Infura.
-         * We are not currently handling this correctly in the case of L1 to L2 messages and we will
-         * want to re-visit L2 Block and contract data retrieval at a later stage. This is not
-         * currently a problem but will need to be addressed before a mainnet release.
+         * We currently read from the last L1 block that we saw emit an L2 block. This could mean
+         * that the archiver ends up looking at the same L1 block multiple times (e.g. if we last saw
+         * an L2 block emitted at L1 block 10, we'd constantly ask for L1 blocks from 11 onwards until
+         * we see another L2 block). For this to work message and block processing need to be idempotent.
+         * We should re-visit this before mainnet launch.
          *
          * The second is that in between the various calls to L1, the block number can move meaning some
          * of the following calls will return data for blocks that were not present during earlier calls.
-         * This is a problem for example when setting the last block number marker for L1 to L2 messages -
-         * this.lastProcessedBlockNumber = currentBlockNumber;
          * It's possible that we actually received messages in block currentBlockNumber + 1 meaning the next time
          * we do this sync we get the same message again. Additionally, the call to get cancelled L1 to L2 messages
          * could read from a block not present when retrieving pending messages. If a message was added and cancelled
@@ -134,9 +123,9 @@ export class Archiver {
          */
         // ********** Events that are processed in between blocks **********
         // Process l1ToL2Messages, these are consumed as time passes, not each block
-        const retrievedPendingL1ToL2Messages = await retrieveNewPendingL1ToL2Messages(this.publicClient, this.inboxAddress, blockUntilSynced, this.lastProcessedL1BlockNumber + 1n, // + 1 to prevent re-including messages from the last processed block
+        const retrievedPendingL1ToL2Messages = await retrieveNewPendingL1ToL2Messages(this.publicClient, this.inboxAddress, blockUntilSynced, lastProcessedL1BlockNumber + 1n, // + 1 to prevent re-including messages from the last processed block
         currentL1BlockNumber);
-        const retrievedCancelledL1ToL2Messages = await retrieveNewCancelledL1ToL2Messages(this.publicClient, this.inboxAddress, blockUntilSynced, this.lastProcessedL1BlockNumber + 1n, currentL1BlockNumber);
+        const retrievedCancelledL1ToL2Messages = await retrieveNewCancelledL1ToL2Messages(this.publicClient, this.inboxAddress, blockUntilSynced, lastProcessedL1BlockNumber + 1n, currentL1BlockNumber);
         // TODO (#717): optimize this - there could be messages in confirmed that are also in pending.
         // Or messages in pending that are also cancelled in the same block. No need to modify storage for them.
         // Store l1 to l2 messages
@@ -145,7 +134,6 @@ export class Archiver {
         // remove cancelled messages from the pending message store:
         this.log('Removing pending l1 to l2 messages from store where messages were cancelled');
         await this.store.cancelPendingL1ToL2Messages(retrievedCancelledL1ToL2Messages.retrievedData);
-        this.lastProcessedL1BlockNumber = currentL1BlockNumber;
         // ********** Events that are processed per block **********
         // Read all data from chain and then write to our stores at the end
         const nextExpectedL2BlockNum = BigInt((await this.store.getBlockNumber()) + 1);
@@ -161,24 +149,15 @@ export class Archiver {
             return;
         }
         this.log(`Retrieved ${retrievedBlocks.retrievedData.length} block(s) from chain`);
-        // store encrypted logs from L2 Blocks that we have retrieved
-        const encryptedLogs = retrievedBlocks.retrievedData.map(block => {
-            return block.newEncryptedLogs;
-        });
-        await this.store.addLogs(encryptedLogs, LogType.ENCRYPTED);
-        // store unencrypted logs from L2 Blocks that we have retrieved
-        const unencryptedLogs = retrievedBlocks.retrievedData.map(block => {
-            return block.newUnencryptedLogs;
-        });
-        await this.store.addLogs(unencryptedLogs, LogType.UNENCRYPTED);
+        await Promise.all(retrievedBlocks.retrievedData.map(block => this.store.addLogs(block.newEncryptedLogs, block.newUnencryptedLogs, block.number)));
         // store contracts for which we have retrieved L2 blocks
         const lastKnownL2BlockNum = retrievedBlocks.retrievedData[retrievedBlocks.retrievedData.length - 1].number;
-        retrievedContracts.retrievedData.forEach(async ([contracts, l2BlockNum], index) => {
-            this.log(`Retrieved extended contract data for l2 block number: ${index}`);
+        await Promise.all(retrievedContracts.retrievedData.map(async ([contracts, l2BlockNum]) => {
+            this.log(`Retrieved extended contract data for l2 block number: ${l2BlockNum}`);
             if (l2BlockNum <= lastKnownL2BlockNum) {
                 await this.store.addExtendedContractData(contracts, l2BlockNum);
             }
-        });
+        }));
         // from retrieved L2Blocks, confirm L1 to L2 messages that have been published
         // from each l2block fetch all messageKeys in a flattened array:
         const messageKeysToRemove = retrievedBlocks.retrievedData.map(l2block => l2block.newL1ToL2Messages).flat();
@@ -189,7 +168,7 @@ export class Archiver {
         await this.store.addBlocks(retrievedBlocks.retrievedData.map(block => {
             // Ensure we pad the L1 to L2 message array to the full size before storing.
             block.newL1ToL2Messages = padArrayEnd(block.newL1ToL2Messages, Fr.ZERO, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
-            return L2Block.fromFields(omit(block, ['newEncryptedLogs', 'newUnencryptedLogs']), block.getBlockHash());
+            return L2Block.fromFields(omit(block, ['newEncryptedLogs', 'newUnencryptedLogs']), block.getBlockHash(), block.getL1BlockNumber());
         }));
         // set the L1 block for the next search
         this.nextL2BlockFromL1Block = retrievedBlocks.nextEthBlockNumber;
@@ -321,4 +300,4 @@ export class Archiver {
         return this.store.getConfirmedL1ToL2Message(messageKey);
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"archiver.js","sourceRoot":"","sources":["../../src/archiver/archiver.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"archiver.js","sourceRoot":"","sources":["../../src/archiver/archiver.ts"],"names":[],"mappings":"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"}

package/dest/archiver/archiver_store.d.ts

@@ -1,6 +1,6 @@
 import { Fr } from '@aztec/circuits.js';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
-import { ContractData, ExtendedContractData, GetUnencryptedLogsResponse, L1ToL2Message, L2Block, L2BlockL2Logs, L2Tx, LogFilter, LogType, TxHash } from '@aztec/types';
+import { CancelledL1ToL2Message, ContractData, ExtendedContractData, GetUnencryptedLogsResponse, L1ToL2Message, L2Block, L2BlockL2Logs, L2Tx, LogFilter, LogType, PendingL1ToL2Message, TxHash } from '@aztec/types';
 /**
  * Interface describing a data store to be used by the archiver to store all its relevant data
  * (blocks, encrypted logs, aztec contract data extended contract data).
@@ -27,23 +27,24 @@ export interface ArchiverDataStore {
     getL2Tx(txHash: TxHash): Promise<L2Tx | undefined>;
     /**
      * Append new logs to the store's list.
-     * @param data - The logs to be added to the store.
-     * @param logType - The type of the logs to be added to the store.
+     * @param encryptedLogs - The encrypted logs to be added to the store.
+     * @param unencryptedLogs - The unencrypted 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(data: L2BlockL2Logs[], logType: LogType): Promise<boolean>;
+    addLogs(encryptedLogs: L2BlockL2Logs | undefined, unencryptedLogs: L2BlockL2Logs | undefined, blockNumber: number): 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.
      * @returns True if the operation is successful.
      */
-    addPendingL1ToL2Messages(messages: L1ToL2Message[]): Promise<boolean>;
+    addPendingL1ToL2Messages(messages: PendingL1ToL2Message[]): Promise<boolean>;
     /**
      * Remove pending L1 to L2 messages from the store (if they were cancelled).
-     * @param messageKeys - The message keys to be removed from the store.
+     * @param message - The message keys to be removed from the store.
      * @returns True if the operation is successful.
      */
-    cancelPendingL1ToL2Messages(messageKeys: Fr[]): Promise<boolean>;
+    cancelPendingL1ToL2Messages(message: CancelledL1ToL2Message[]): 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.
@@ -115,161 +116,9 @@ export interface ArchiverDataStore {
      * @returns The number of the latest L2 block processed.
      */
     getBlockNumber(): Promise<number>;
-}
-/**
- * Simple, in-memory implementation of an archiver data store.
- */
-export declare class MemoryArchiverStore implements ArchiverDataStore {
-    /** The max number of logs that can be obtained in 1 "getUnencryptedLogs" call. */
-    readonly maxLogs: number;
-    /**
-     * An array containing all the L2 blocks that have been fetched so far.
-     */
-    private l2BlockContexts;
-    /**
-     * An array containing all the L2 Txs in the L2 blocks that have been fetched so far.
-     */
-    private l2Txs;
-    /**
-     * An array containing all the encrypted logs that have been fetched so far.
-     * Note: Index in the "outer" array equals to (corresponding L2 block's number - INITIAL_L2_BLOCK_NUM).
-     */
-    private encryptedLogsPerBlock;
-    /**
-     * An array containing all the unencrypted logs that have been fetched so far.
-     * Note: Index in the "outer" array equals to (corresponding L2 block's number - INITIAL_L2_BLOCK_NUM).
-     */
-    private unencryptedLogsPerBlock;
-    /**
-     * A sparse array containing all the extended contract data that have been fetched so far.
-     */
-    private extendedContractDataByBlock;
-    /**
-     * A mapping of contract address to extended contract data.
-     */
-    private extendedContractData;
-    /**
-     * 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;
-    constructor(
-    /** The max number of logs that can be obtained in 1 "getUnencryptedLogs" call. */
-    maxLogs: number);
-    /**
-     * 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).
-     */
-    addBlocks(blocks: L2Block[]): Promise<boolean>;
-    /**
-     * Append new logs to the store's list.
-     * @param data - The logs to be added to the store.
-     * @param logType - The type of the logs to be added to the store.
-     * @returns True if the operation is successful.
-     */
-    addLogs(data: L2BlockL2Logs[], logType: LogType): 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.
-     * @returns True if the operation is successful (always in this implementation).
-     */
-    addPendingL1ToL2Messages(messages: L1ToL2Message[]): Promise<boolean>;
-    /**
-     * Remove pending L1 to L2 messages from the store (if they were cancelled).
-     * @param messageKeys - The message keys to be removed from the store.
-     * @returns True if the operation is successful (always in this implementation).
-     */
-    cancelPendingL1ToL2Messages(messageKeys: Fr[]): 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 messageKeys - The message keys to be removed from the store.
-     * @returns True if the operation is successful (always in this implementation).
-     */
-    confirmL1ToL2Messages(messageKeys: 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>;
-    /**
-     * Gets up to `limit` amount of L2 blocks starting from `from`.
-     * @param from - Number of the first block to return (inclusive).
-     * @param limit - The number of blocks to return.
-     * @returns The requested L2 blocks.
-     * @remarks When "from" is smaller than genesis block number, blocks from the beginning are returned.
-     */
-    getBlocks(from: number, limit: number): Promise<L2Block[]>;
-    /**
-     * Gets an l2 tx.
-     * @param txHash - The txHash of the l2 tx.
-     * @returns The requested L2 tx.
-     */
-    getL2Tx(txHash: TxHash): Promise<L2Tx | 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 message keys.
+     * Gets the number of the latest L1 block processed.
      */
-    getPendingL1ToL2MessageKeys(limit?: number): Promise<Fr[]>;
-    /**
-     * 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: Fr): Promise<L1ToL2Message>;
-    /**
-     * 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.
-     * @param limit - The number of logs to return.
-     * @param logType - Specifies whether to return encrypted or unencrypted logs.
-     * @returns The requested logs.
-     */
-    getLogs(from: number, limit: number, logType: LogType): Promise<L2BlockL2Logs[]>;
-    /**
-     * Gets unencrypted logs based on the provided filter.
-     * @param filter - The filter to apply to the logs.
-     * @returns The requested logs.
-     * @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.
-     * @param contractAddress - The contract data address.
-     * @returns The extended contract data or undefined if not found.
-     */
-    getExtendedContractData(contractAddress: AztecAddress): Promise<ExtendedContractData | undefined>;
-    /**
-     * Lookup all 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: number): Promise<ExtendedContractData[]>;
-    /**
-     * 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: AztecAddress): Promise<ContractData | undefined>;
-    /**
-     * Get basic info for an all L2 contracts deployed in a block.
-     * Contains contract address & the ethereum portal address.
-     * @param l2BlockNum - Number of the L2 block where contracts were deployed.
-     * @returns ContractData with the portal address (if we didn't throw an error).
-     */
-    getContractDataInBlock(l2BlockNum: number): Promise<ContractData[] | undefined>;
-    /**
-     * Gets the number of the latest L2 block processed.
-     * @returns The number of the latest L2 block processed.
-     */
-    getBlockNumber(): Promise<number>;
+    getL1BlockNumber(): Promise<bigint>;
 }
 //# sourceMappingURL=archiver_store.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"archiver_store.d.ts","sourceRoot":"","sources":["../../src/archiver/archiver_store.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"archiver_store.d.ts","sourceRoot":"","sources":["../../src/archiver/archiver_store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EACL,sBAAsB,EACtB,YAAY,EACZ,oBAAoB,EACpB,0BAA0B,EAC1B,aAAa,EACb,OAAO,EACP,aAAa,EACb,IAAI,EACJ,SAAS,EACT,OAAO,EACP,oBAAoB,EACpB,MAAM,EACP,MAAM,cAAc,CAAC;AAEtB;;;GAGG;AACH,MAAM,WAAW,iBAAiB;IAChC;;;;OAIG;IACH,SAAS,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAE/C;;;;;OAKG;IACH,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;IAE3D;;;;OAIG;IACH,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC,CAAC;IAEnD;;;;;;OAMG;IACH,OAAO,CACL,aAAa,EAAE,aAAa,GAAG,SAAS,EACxC,eAAe,EAAE,aAAa,GAAG,SAAS,EAC1C,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,OAAO,CAAC,CAAC;IAEpB;;;;OAIG;IACH,wBAAwB,CAAC,QAAQ,EAAE,oBAAoB,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAE7E;;;;OAIG;IACH,2BAA2B,CAAC,OAAO,EAAE,sBAAsB,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAEjF;;;;;OAKG;IACH,qBAAqB,CAAC,WAAW,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAE3D;;;;OAIG;IACH,2BAA2B,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;IAE1D;;;;OAIG;IACH,yBAAyB,CAAC,UAAU,EAAE,EAAE,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IAElE;;;;;;OAMG;IACH,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC;IAEjF;;;;OAIG;IACH,kBAAkB,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAC;IAE3E;;;;;OAKG;IACH,uBAAuB,CAAC,IAAI,EAAE,oBAAoB,EAAE,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAE1F;;;;OAIG;IACH,uBAAuB,CAAC,eAAe,EAAE,YAAY,GAAG,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC,CAAC;IAElG;;;;OAIG;IACH,8BAA8B,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,EAAE,CAAC,CAAC;IAElF;;;;;OAKG;IACH,eAAe,CAAC,eAAe,EAAE,YAAY,GAAG,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC,CAAC;IAElF;;;;;OAKG;IACH,sBAAsB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,EAAE,GAAG,SAAS,CAAC,CAAC;IAEhF;;;OAGG;IACH,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAElC;;OAEG;IACH,gBAAgB,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;CACrC"}