@aztec/prover-client 0.76.4 → 0.77.0-testnet-ignition.21

package/dest/mocks/test_context.js

@@ -1,67 +1,87 @@
-import { makeBloatedProcessedTx } from '@aztec/circuit-types/test';
-import { TreeSnapshots, } from '@aztec/circuits.js';
 import { times, timesParallel } from '@aztec/foundation/collection';
 import { Fr } from '@aztec/foundation/fields';
 import { TestDateProvider } from '@aztec/foundation/timer';
-import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vks';
+import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
 import { protocolContractTreeRoot } from '@aztec/protocol-contracts';
-import { PublicProcessor, PublicTxSimulator, WASMSimulatorWithBlobs, } from '@aztec/simulator/server';
+import { computeFeePayerBalanceLeafSlot } from '@aztec/protocol-contracts/fee-juice';
+import { PublicProcessor, PublicTxSimulationTester, PublicTxSimulator, SimpleContractDataSource, WorldStateDB } from '@aztec/simulator/server';
+import { PublicDataWrite } from '@aztec/stdlib/avm';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { makeBloatedProcessedTx } from '@aztec/stdlib/testing';
+import { PublicDataTreeLeaf } from '@aztec/stdlib/trees';
+import { TreeSnapshots } from '@aztec/stdlib/tx';
 import { NativeWorldStateService } from '@aztec/world-state/native';
-import { jest } from '@jest/globals';
 import { promises as fs } from 'fs';
-import { mock } from 'jest-mock-extended';
 import { TestCircuitProver } from '../../../bb-prover/src/test/test_circuit_prover.js';
-import { AvmFinalizedCallResult } from '../../../simulator/src/avm/avm_contract_call_result.js';
 import { buildBlock } from '../block_builder/light.js';
 import { ProvingOrchestrator } from '../orchestrator/index.js';
 import { BrokerCircuitProverFacade } from '../proving_broker/broker_prover_facade.js';
 import { TestBroker } from '../test/mock_prover.js';
 import { getEnvironmentConfig, getSimulationProvider, makeGlobals, updateExpectedTreesFromTxs } from './fixtures.js';
 export class TestContext {
-    constructor(publicTxSimulator, worldState, publicProcessor, simulationProvider, globalVariables, prover, broker, brokerProverFacade, orchestrator, blockNumber, directoriesToCleanup, logger) {
+    publicTxSimulator;
+    worldState;
+    publicProcessor;
+    globalVariables;
+    prover;
+    broker;
+    brokerProverFacade;
+    orchestrator;
+    blockNumber;
+    feePayer;
+    directoriesToCleanup;
+    tester;
+    logger;
+    headers;
+    feePayerBalance;
+    constructor(publicTxSimulator, worldState, publicProcessor, globalVariables, prover, broker, brokerProverFacade, orchestrator, blockNumber, feePayer, initialFeePayerBalance, directoriesToCleanup, tester, logger){
         this.publicTxSimulator = publicTxSimulator;
         this.worldState = worldState;
         this.publicProcessor = publicProcessor;
-        this.simulationProvider = simulationProvider;
         this.globalVariables = globalVariables;
         this.prover = prover;
         this.broker = broker;
         this.brokerProverFacade = brokerProverFacade;
         this.orchestrator = orchestrator;
         this.blockNumber = blockNumber;
+        this.feePayer = feePayer;
         this.directoriesToCleanup = directoriesToCleanup;
+        this.tester = tester;
         this.logger = logger;
         this.headers = new Map();
+        this.feePayerBalance = initialFeePayerBalance;
     }
     get epochProver() {
         return this.orchestrator;
     }
-    static async new(logger, proverCount = 4, createProver = _ => Promise.resolve(new TestCircuitProver(new WASMSimulatorWithBlobs())), blockNumber = 1) {
+    static async new(logger, proverCount = 4, createProver = async (bbConfig)=>new TestCircuitProver(await getSimulationProvider(bbConfig, logger)), blockNumber = 1) {
         const directoriesToCleanup = [];
         const globalVariables = makeGlobals(blockNumber);
-        const worldStateDB = mock();
+        const feePayer = AztecAddress.fromNumber(42222);
+        const initialFeePayerBalance = new Fr(10n ** 20n);
+        const feePayerSlot = await computeFeePayerBalanceLeafSlot(feePayer);
+        const prefilledPublicData = [
+            new PublicDataTreeLeaf(feePayerSlot, initialFeePayerBalance)
+        ];
         // Separated dbs for public processor and prover - see public_processor for context
-        const ws = await NativeWorldStateService.tmp();
+        const ws = await NativeWorldStateService.tmp(undefined /* rollupAddress */ , true, prefilledPublicData);
         const publicDb = await ws.fork();
-        worldStateDB.getMerkleInterface.mockReturnValue(publicDb);
+        const contractDataSource = new SimpleContractDataSource();
+        const worldStateDB = new WorldStateDB(publicDb, contractDataSource);
+        const tester = new PublicTxSimulationTester(worldStateDB, contractDataSource, publicDb);
         const publicTxSimulator = new PublicTxSimulator(publicDb, worldStateDB, globalVariables, true);
         const processor = new PublicProcessor(publicDb, globalVariables, worldStateDB, publicTxSimulator, new TestDateProvider());
         let localProver;
         const config = await getEnvironmentConfig(logger);
-        const simulationProvider = await getSimulationProvider({
-            acvmWorkingDirectory: config?.acvmWorkingDirectory,
-            acvmBinaryPath: config?.expectedAcvmPath,
-        });
         if (!config) {
-            localProver = new TestCircuitProver(simulationProvider);
-        }
-        else {
+            localProver = new TestCircuitProver();
+        } else {
             const bbConfig = {
                 acvmBinaryPath: config.expectedAcvmPath,
                 acvmWorkingDirectory: config.acvmWorkingDirectory,
                 bbBinaryPath: config.expectedBBPath,
                 bbWorkingDirectory: config.bbWorkingDirectory,
-                bbSkipCleanup: config.bbSkipCleanup,
+                bbSkipCleanup: config.bbSkipCleanup
             };
             localProver = await createProver(bbConfig);
         }
@@ -73,7 +93,7 @@ export class TestContext {
         const orchestrator = new TestProvingOrchestrator(ws, facade, Fr.ZERO);
         await broker.start();
         facade.start();
-        return new this(publicTxSimulator, ws, processor, simulationProvider, globalVariables, localProver, broker, facade, orchestrator, blockNumber, directoriesToCleanup, logger);
+        return new this(publicTxSimulator, ws, processor, globalVariables, localProver, broker, facade, orchestrator, blockNumber, feePayer, initialFeePayerBalance, directoriesToCleanup, tester, logger);
     }
     getFork() {
         return this.worldState.fork();
@@ -87,56 +107,71 @@ export class TestContext {
     async cleanup() {
         await this.brokerProverFacade.stop();
         await this.broker.stop();
-        for (const dir of this.directoriesToCleanup.filter(x => x !== '')) {
-            await fs.rm(dir, { recursive: true, force: true });
+        for (const dir of this.directoriesToCleanup.filter((x)=>x !== '')){
+            try {
+                await fs.rm(dir, {
+                    recursive: true,
+                    force: true,
+                    maxRetries: 3
+                });
+            } catch (err) {
+                this.logger.warn(`Failed to delete tmp directory $dir}: ${err}`);
+            }
         }
     }
-    makeProcessedTx(seedOrOpts) {
-        const opts = typeof seedOrOpts === 'number' ? { seed: seedOrOpts } : seedOrOpts;
+    async makeProcessedTx(seedOrOpts) {
+        const opts = typeof seedOrOpts === 'number' ? {
+            seed: seedOrOpts
+        } : seedOrOpts;
         const blockNum = (opts?.globalVariables ?? this.globalVariables).blockNumber.toNumber();
         const header = this.getBlockHeader(blockNum - 1);
-        return makeBloatedProcessedTx({
+        const tx = await makeBloatedProcessedTx({
             header,
             vkTreeRoot: getVKTreeRoot(),
             protocolContractTreeRoot,
             globalVariables: this.globalVariables,
-            ...opts,
+            feePayer: this.feePayer,
+            ...opts
         });
+        this.feePayerBalance = new Fr(this.feePayerBalance.toBigInt() - tx.txEffect.transactionFee.toBigInt());
+        if (opts?.privateOnly) {
+            const feePayerSlot = await computeFeePayerBalanceLeafSlot(this.feePayer);
+            tx.txEffect.publicDataWrites[0] = new PublicDataWrite(feePayerSlot, this.feePayerBalance);
+        }
+        return tx;
     }
-    /** Creates a block with the given number of txs and adds it to world-state */
-    async makePendingBlock(numTxs, numMsgs = 0, blockNumOrGlobals = this.globalVariables, makeProcessedTxOpts = () => ({})) {
+    /** Creates a block with the given number of txs and adds it to world-state */ async makePendingBlock(numTxs, numMsgs = 0, blockNumOrGlobals = this.globalVariables, makeProcessedTxOpts = ()=>({})) {
         const globalVariables = typeof blockNumOrGlobals === 'number' ? makeGlobals(blockNumOrGlobals) : blockNumOrGlobals;
         const blockNum = globalVariables.blockNumber.toNumber();
         const db = await this.worldState.fork();
-        const msgs = times(numMsgs, i => new Fr(blockNum * 100 + i));
-        const txs = await timesParallel(numTxs, i => this.makeProcessedTx({ seed: i + blockNum * 1000, globalVariables, ...makeProcessedTxOpts(i) }));
+        const msgs = times(numMsgs, (i)=>new Fr(blockNum * 100 + i));
+        const txs = await timesParallel(numTxs, (i)=>this.makeProcessedTx({
+                seed: i + blockNum * 1000,
+                globalVariables,
+                ...makeProcessedTxOpts(i)
+            }));
         await this.setTreeRoots(txs);
         const block = await buildBlock(txs, globalVariables, msgs, db);
         this.headers.set(blockNum, block.header);
         await this.worldState.handleL2BlockAndMessages(block, msgs);
-        return { block, txs, msgs };
+        return {
+            block,
+            txs,
+            msgs
+        };
     }
     async processPublicFunctions(txs, maxTransactions) {
-        const defaultExecutorImplementation = (_stateManager, executionRequest, allocatedGas, _transactionFee, _fnName) => {
-            for (const tx of txs) {
-                const allCalls = tx.publicTeardownFunctionCall.isEmpty()
-                    ? tx.enqueuedPublicFunctionCalls
-                    : [...tx.enqueuedPublicFunctionCalls, tx.publicTeardownFunctionCall];
-                for (const request of allCalls) {
-                    if (executionRequest.callContext.equals(request.callContext)) {
-                        return Promise.resolve(new AvmFinalizedCallResult(/*reverted=*/ false, /*output=*/ [], /*gasLeft=*/ allocatedGas));
-                    }
-                }
-            }
-            throw new Error(`Unexpected execution request: ${executionRequest}`);
-        };
-        return await this.processPublicFunctionsWithMockExecutorImplementation(txs, maxTransactions, defaultExecutorImplementation);
+        return await this.publicProcessor.process(txs, {
+            maxTransactions
+        });
     }
     async setTreeRoots(txs) {
         const db = await this.worldState.fork();
-        for (const tx of txs) {
+        for (const tx of txs){
             const startStateReference = await db.getStateReference();
-            await updateExpectedTreesFromTxs(db, [tx]);
+            await updateExpectedTreesFromTxs(db, [
+                tx
+            ]);
             const endStateReference = await db.getStateReference();
             if (tx.avmProvingRequest) {
                 tx.avmProvingRequest.inputs.publicInputs.startTreeSnapshots = new TreeSnapshots(startStateReference.l1ToL2MessageTree, startStateReference.partial.noteHashTree, startStateReference.partial.nullifierTree, startStateReference.partial.publicDataTree);
@@ -144,20 +179,9 @@ export class TestContext {
             }
         }
     }
-    async processPublicFunctionsWithMockExecutorImplementation(txs, maxTransactions, executorMock) {
-        // Mock the internal private function. Borrowed from https://stackoverflow.com/a/71033167
-        const simulateInternal = jest.spyOn(this.publicTxSimulator, 'simulateEnqueuedCallInternal');
-        if (executorMock) {
-            simulateInternal.mockImplementation(executorMock);
-        }
-        return await this.publicProcessor.process(txs, { maxTransactions });
-    }
 }
 class TestProvingOrchestrator extends ProvingOrchestrator {
-    constructor() {
-        super(...arguments);
-        this.isVerifyBuiltBlockAgainstSyncedStateEnabled = false;
-    }
+    isVerifyBuiltBlockAgainstSyncedStateEnabled = false;
     // Disable this check by default, since it requires seeding world state with the block being built
     // This is only enabled in some tests with multiple blocks that populate the pending chain via makePendingBlock
     verifyBuiltBlockAgainstSyncedState(l2Block, newArchive) {
@@ -167,4 +191,3 @@ class TestProvingOrchestrator extends ProvingOrchestrator {
         return Promise.resolve();
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"test_context.js","sourceRoot":"","sources":["../../src/mocks/test_context.ts"],"names":[],"mappings":"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"}

package/dest/orchestrator/block-building-helpers.d.ts

@@ -1,13 +1,18 @@
 /// <reference types="node" resolution-mode="require"/>
 /// <reference types="node" resolution-mode="require"/>
-import { Blob } from '@aztec/blob-lib';
-import { Body, MerkleTreeId, type MerkleTreeWriteOperations, type ProcessedTx, TxEffect } from '@aztec/circuit-types';
-import { AppendOnlyTreeSnapshot, BlockHeader, Fr, type GlobalVariables, MembershipWitness, type ParityPublicInputs, PartialStateReference, PublicDataHint, StateReference } from '@aztec/circuits.js';
-import { type SpongeBlob } from '@aztec/circuits.js/blobs';
-import { type BaseOrMergeRollupPublicInputs, type BlockRootOrBlockMergePublicInputs, ConstantRollupData, PrivateBaseRollupHints, PublicBaseRollupHints } from '@aztec/circuits.js/rollup';
-import { type Logger } from '@aztec/foundation/log';
+import { Blob, type SpongeBlob } from '@aztec/blob-lib';
+import { Fr } from '@aztec/foundation/fields';
+import type { Logger } from '@aztec/foundation/log';
 import { type Tuple } from '@aztec/foundation/serialize';
-import { type MerkleTreeReadOperations } from '@aztec/world-state';
+import { MembershipWitness } from '@aztec/foundation/trees';
+import { PublicDataHint } from '@aztec/stdlib/avm';
+import { Body } from '@aztec/stdlib/block';
+import type { MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server';
+import type { ParityPublicInputs } from '@aztec/stdlib/parity';
+import { type BaseOrMergeRollupPublicInputs, type BlockRootOrBlockMergePublicInputs, ConstantRollupData, PrivateBaseRollupHints, PublicBaseRollupHints } from '@aztec/stdlib/rollup';
+import { AppendOnlyTreeSnapshot, MerkleTreeId } from '@aztec/stdlib/trees';
+import { BlockHeader, type GlobalVariables, PartialStateReference, type ProcessedTx, StateReference, TxEffect } from '@aztec/stdlib/tx';
+import type { MerkleTreeReadOperations } from '@aztec/world-state';
 /**
  * Type representing the names of the trees for the base rollup.
  */

package/dest/orchestrator/block-building-helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"block-building-helpers.d.ts","sourceRoot":"","sources":["../../src/orchestrator/block-building-helpers.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AACvC,OAAO,EACL,IAAI,EACJ,YAAY,EACZ,KAAK,yBAAyB,EAC9B,KAAK,WAAW,EAChB,QAAQ,EAET,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAEL,sBAAsB,EACtB,WAAW,EAEX,EAAE,EACF,KAAK,eAAe,EAGpB,iBAAiB,EAUjB,KAAK,kBAAkB,EACvB,qBAAqB,EACrB,cAAc,EAGd,cAAc,EACf,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EACL,KAAK,6BAA6B,EAClC,KAAK,iCAAiC,EACtC,kBAAkB,EAClB,sBAAsB,EAEtB,qBAAqB,EACtB,MAAM,2BAA2B,CAAC;AAInC,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,KAAK,KAAK,EAAmD,MAAM,6BAA6B,CAAC;AAM1G,OAAO,EAAE,KAAK,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;AAInE;;GAEG;AACH,KAAK,aAAa,GAAG,cAAc,GAAG,cAAc,GAAG,eAAe,GAAG,gBAAgB,CAAC;AAC1F;;GAEG;AACH,MAAM,MAAM,SAAS,GAAG,aAAa,GAAG,mBAAmB,GAAG,SAAS,CAAC;AAGxE,eAAO,MAAM,oBAAoB,4KAmJhC,CAAC;AAEF,wBAAsB,iBAAiB,CAAC,EAAE,EAAE,yBAAyB,EAAE,QAAQ,EAAE,MAAM,2BAkBtF;AAED,eAAO,MAAM,cAAc;;;;;EAU1B,CAAC;AAEF,eAAO,MAAM,6BAA6B,oOAoDzC,CAAC;AAEF,eAAO,MAAM,yBAAyB;;;EAoDrC,CAAC;AAEF,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,CAG5D;AAGD,wBAAsB,uBAAuB,CAC3C,eAAe,EAAE,iCAAiC,EAClD,WAAW,EAAE,WAAW,EACxB,EAAE,EAAE,wBAAwB,iBAM7B;AAED,eAAO,MAAM,aAAa,wEAmBzB,CAAC;AAEF,wBAAsB,sBAAsB,CAAC,GAAG,SAAS,YAAY,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE,EAAE,wBAAwB;;;;;;SAI/G;AAED,eAAO,MAAM,qBAAqB,iGAWjC,CAAC;AAEF,wBAAsB,eAAe,CAAC,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,wBAAwB,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAGrH;AAED,wBAAgB,0BAA0B,CAAC,CAAC,SAAS,MAAM,EAAE,MAAM,EAAE,CAAC,wBAMrE;AA4CD,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,YAAY,EACpB,aAAa,EAAE,MAAM,EACrB,EAAE,EAAE,wBAAwB,GAC3B,OAAO,CAAC,EAAE,EAAE,CAAC,CAMf;AAGD,wBAAsB,uBAAuB,CAAC,CAAC,SAAS,MAAM,EAC5D,KAAK,EAAE,EAAE,EACT,MAAM,EAAE,YAAY,EACpB,MAAM,EAAE,CAAC,EACT,EAAE,EAAE,wBAAwB,GAC3B,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAY/B;AAED,wBAAgB,oBAAoB,CAClC,YAAY,EAAE,qBAAqB,EACnC,aAAa,EAAE,GAAG,CAAC,YAAY,EAAE,sBAAsB,CAAC,QASzD;AAqBD,wBAAgB,UAAU,CAAC,EAAE,EAAE,WAAW,QAczC"}
+{"version":3,"file":"block-building-helpers.d.ts","sourceRoot":"","sources":["../../src/orchestrator/block-building-helpers.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,IAAI,EAAE,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAiBxD,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,KAAK,KAAK,EAAmD,MAAM,6BAA6B,CAAC;AAC1G,OAAO,EAAE,iBAAiB,EAAqD,MAAM,yBAAyB,CAAC;AAI/G,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAC3C,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,iCAAiC,CAAC;AAEjF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,EACL,KAAK,6BAA6B,EAClC,KAAK,iCAAiC,EACtC,kBAAkB,EAClB,sBAAsB,EAEtB,qBAAqB,EACtB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,sBAAsB,EACtB,YAAY,EAKb,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,WAAW,EAEX,KAAK,eAAe,EACpB,qBAAqB,EACrB,KAAK,WAAW,EAChB,cAAc,EACd,QAAQ,EACT,MAAM,kBAAkB,CAAC;AAE1B,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;AAInE;;GAEG;AACH,KAAK,aAAa,GAAG,cAAc,GAAG,cAAc,GAAG,eAAe,GAAG,gBAAgB,CAAC;AAC1F;;GAEG;AACH,MAAM,MAAM,SAAS,GAAG,aAAa,GAAG,mBAAmB,GAAG,SAAS,CAAC;AAGxE,eAAO,MAAM,oBAAoB,4KAuJhC,CAAC;AAEF,wBAAsB,iBAAiB,CAAC,EAAE,EAAE,yBAAyB,EAAE,QAAQ,EAAE,MAAM,2BAkBtF;AAED,eAAO,MAAM,cAAc;;;;;EAU1B,CAAC;AAEF,eAAO,MAAM,6BAA6B,oOAoDzC,CAAC;AAEF,eAAO,MAAM,yBAAyB;;;EAoDrC,CAAC;AAEF,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,CAG5D;AAGD,wBAAsB,uBAAuB,CAC3C,eAAe,EAAE,iCAAiC,EAClD,WAAW,EAAE,WAAW,EACxB,EAAE,EAAE,wBAAwB,iBAM7B;AAED,eAAO,MAAM,aAAa,wEAmBzB,CAAC;AAEF,wBAAsB,sBAAsB,CAAC,GAAG,SAAS,YAAY,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE,EAAE,wBAAwB;;;;;;SAI/G;AAED,eAAO,MAAM,qBAAqB,iGAWjC,CAAC;AAEF,wBAAsB,eAAe,CAAC,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,wBAAwB,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAGrH;AAED,wBAAgB,0BAA0B,CAAC,CAAC,SAAS,MAAM,EAAE,MAAM,EAAE,CAAC,wBAMrE;AA4CD,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,YAAY,EACpB,aAAa,EAAE,MAAM,EACrB,EAAE,EAAE,wBAAwB,GAC3B,OAAO,CAAC,EAAE,EAAE,CAAC,CAMf;AAGD,wBAAsB,uBAAuB,CAAC,CAAC,SAAS,MAAM,EAC5D,KAAK,EAAE,EAAE,EACT,MAAM,EAAE,YAAY,EACpB,MAAM,EAAE,CAAC,EACT,EAAE,EAAE,wBAAwB,GAC3B,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAY/B;AAED,wBAAgB,oBAAoB,CAClC,YAAY,EAAE,qBAAqB,EACnC,aAAa,EAAE,GAAG,CAAC,YAAY,EAAE,sBAAsB,CAAC,QASzD;AAqBD,wBAAgB,UAAU,CAAC,EAAE,EAAE,WAAW,QAczC"}