@aztec/simulator 0.82.2 → 0.82.3-nightly.20250330

package/dest/public/public_tx_simulator/apps_tests/token_test.js

@@ -0,0 +1,109 @@
+import { Fr } from '@aztec/foundation/fields';
+import { TokenContractArtifact } from '@aztec/noir-contracts.js/Token';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
+export async function tokenTest(tester, logger) {
+    const startTime = performance.now();
+    const admin = AztecAddress.fromNumber(42);
+    const sender = AztecAddress.fromNumber(111);
+    const receiver = AztecAddress.fromNumber(222);
+    const token = await deployToken(tester, admin);
+    const mintAmount = 100n;
+    const mintResult = await tester.simulateTxWithLabel(/*txLabel=*/ 'mint_to_public', /*sender=*/ admin, /*setupCalls=*/ [], /*appCalls=*/ [
+        {
+            address: token.address,
+            fnName: 'mint_to_public',
+            args: [
+                /*to=*/ sender,
+                mintAmount
+            ]
+        }
+    ]);
+    expect(mintResult.revertCode.isOK()).toBe(true);
+    await checkBalance(tester, token, sender, sender, mintAmount);
+    const nonce = new Fr(0);
+    const transferAmount = 50n;
+    const transferResult = await tester.simulateTxWithLabel(/*txLabel=*/ 'transfer_in_public', /*sender=*/ sender, /*setupCalls=*/ [], /*appCalls=*/ [
+        {
+            address: token.address,
+            fnName: 'transfer_in_public',
+            args: [
+                /*from=*/ sender,
+                /*to=*/ receiver,
+                transferAmount,
+                nonce
+            ]
+        }
+    ]);
+    expect(transferResult.revertCode.isOK()).toBe(true);
+    await checkBalance(tester, token, sender, receiver, mintAmount - transferAmount);
+    await checkBalance(tester, token, sender, receiver, transferAmount);
+    const balResult = await tester.simulateTxWithLabel(/*txLabel=*/ 'balance_of_public', sender, /*setupCalls=*/ [], /*appCalls=*/ [
+        {
+            address: token.address,
+            fnName: 'balance_of_public',
+            args: [
+                /*owner=*/ receiver
+            ],
+            isStaticCall: true
+        }
+    ]);
+    expect(balResult.revertCode.isOK()).toBe(true);
+    const burnResult = await tester.simulateTxWithLabel(/*txLabel=*/ 'burn_public', /*sender=*/ receiver, /*setupCalls=*/ [], /*appCalls=*/ [
+        {
+            address: token.address,
+            fnName: 'burn_public',
+            args: [
+                /*from=*/ receiver,
+                transferAmount,
+                nonce
+            ]
+        }
+    ]);
+    expect(burnResult.revertCode.isOK()).toBe(true);
+    await checkBalance(tester, token, sender, receiver, 0n);
+    const endTime = performance.now();
+    logger.info(`TokenContract public tx simulator test took ${endTime - startTime}ms\n`);
+}
+export async function deployToken(tester, admin, seed = 0) {
+    const constructorArgs = [
+        admin,
+        /*name=*/ 'Token',
+        /*symbol=*/ 'TOK',
+        /*decimals=*/ new Fr(18)
+    ];
+    const token = await tester.registerAndDeployContract(constructorArgs, /*deployer=*/ admin, TokenContractArtifact, /*skipNullifierInsertion=*/ false, seed);
+    const result = await tester.simulateTxWithLabel(/*txLabel=*/ 'Token.constructor', /*sender=*/ admin, /*setupCalls=*/ [], /*appCalls=*/ [
+        {
+            fnName: 'constructor',
+            args: constructorArgs,
+            address: token.address
+        }
+    ]);
+    expect(result.revertCode.isOK()).toBe(true);
+    return token;
+}
+async function checkBalance(tester, token, sender, account, expectedBalance) {
+    const balResult = await tester.simulateTxWithLabel(/*txLabel=*/ 'balance_of_public', sender, /*setupCalls=*/ [], /*appCalls=*/ [
+        {
+            address: token.address,
+            fnName: 'balance_of_public',
+            args: [
+                /*owner=*/ account
+            ],
+            isStaticCall: true
+        }
+    ]);
+    expect(balResult.revertCode.isOK()).toBe(true);
+    // should be 1 call with 1 return value that is expectedBalance
+    expect(balResult.processedPhases).toEqual([
+        expect.objectContaining({
+            returnValues: [
+                expect.objectContaining({
+                    values: [
+                        new Fr(expectedBalance)
+                    ]
+                })
+            ]
+        })
+    ]);
+}

package/dest/public/public_tx_simulator/index.d.ts

@@ -0,0 +1,3 @@
+export * from './public_tx_simulator.js';
+export { TelemetryPublicTxSimulator } from './telemetry_public_tx_simulator.js';
+//# sourceMappingURL=index.d.ts.map

package/dest/public/public_tx_simulator/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/public/public_tx_simulator/index.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAC;AACzC,OAAO,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAC"}

package/dest/public/public_tx_simulator/index.js

@@ -0,0 +1,2 @@
+export * from './public_tx_simulator.js';
+export { TelemetryPublicTxSimulator } from './telemetry_public_tx_simulator.js';

package/dest/public/public_tx_simulator/measured_public_tx_simulator.d.ts

@@ -0,0 +1,23 @@
+import type { Fr } from '@aztec/foundation/fields';
+import type { Gas } from '@aztec/stdlib/gas';
+import { type GlobalVariables, PublicCallRequestWithCalldata, Tx, TxExecutionPhase } from '@aztec/stdlib/tx';
+import type { AvmFinalizedCallResult } from '../avm/avm_contract_call_result.js';
+import type { AvmPersistableStateManager } from '../avm/index.js';
+import type { ExecutorMetricsInterface } from '../executor_metrics_interface.js';
+import type { PublicContractsDB, PublicTreesDB } from '../public_db_sources.js';
+import { PublicTxContext } from './public_tx_context.js';
+import { type ProcessedPhase, type PublicTxResult, PublicTxSimulator } from './public_tx_simulator.js';
+/**
+ * A public tx simulator that tracks miscellaneous simulation metrics without telemetry.
+ */
+export declare class MeasuredPublicTxSimulator extends PublicTxSimulator {
+    protected readonly metrics: ExecutorMetricsInterface;
+    constructor(treesDB: PublicTreesDB, contractsDB: PublicContractsDB, globalVariables: GlobalVariables, doMerkleOperations: boolean | undefined, skipFeeEnforcement: boolean | undefined, metrics: ExecutorMetricsInterface);
+    simulate(tx: Tx, txLabel?: string): Promise<PublicTxResult>;
+    protected computeTxHash(tx: Tx): Promise<import("@aztec/stdlib/tx").TxHash>;
+    protected insertNonRevertiblesFromPrivate(context: PublicTxContext, tx: Tx): Promise<void>;
+    protected insertRevertiblesFromPrivate(context: PublicTxContext, tx: Tx): Promise<boolean>;
+    protected simulatePhase(phase: TxExecutionPhase, context: PublicTxContext): Promise<ProcessedPhase>;
+    protected simulateEnqueuedCallInternal(stateManager: AvmPersistableStateManager, callRequest: PublicCallRequestWithCalldata, allocatedGas: Gas, transactionFee: Fr, fnName: string): Promise<AvmFinalizedCallResult>;
+}
+//# sourceMappingURL=measured_public_tx_simulator.d.ts.map

package/dest/public/public_tx_simulator/measured_public_tx_simulator.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"measured_public_tx_simulator.d.ts","sourceRoot":"","sources":["../../../src/public/public_tx_simulator/measured_public_tx_simulator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAEnD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAE7C,OAAO,EAAE,KAAK,eAAe,EAAE,6BAA6B,EAAE,EAAE,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAE7G,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AACjF,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,iBAAiB,CAAC;AAClE,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AACjF,OAAO,KAAK,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAChF,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,KAAK,cAAc,EAAE,KAAK,cAAc,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAEvG;;GAEG;AACH,qBAAa,yBAA0B,SAAQ,iBAAiB;IAO5D,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,wBAAwB;gBALpD,OAAO,EAAE,aAAa,EACtB,WAAW,EAAE,iBAAiB,EAC9B,eAAe,EAAE,eAAe,EAChC,kBAAkB,qBAAiB,EACnC,kBAAkB,qBAAiB,EAChB,OAAO,EAAE,wBAAwB;IAKhC,QAAQ,CAAC,EAAE,EAAE,EAAE,EAAE,OAAO,GAAE,MAAsB,GAAG,OAAO,CAAC,cAAc,CAAC;cAWvE,aAAa,CAAC,EAAE,EAAE,EAAE;cAOpB,+BAA+B,CAAC,OAAO,EAAE,eAAe,EAAE,EAAE,EAAE,EAAE;cAMhE,4BAA4B,CAAC,OAAO,EAAE,eAAe,EAAE,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;cAOhF,aAAa,CAAC,KAAK,EAAE,gBAAgB,EAAE,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC;cAOzF,4BAA4B,CACnD,YAAY,EAAE,0BAA0B,EACxC,WAAW,EAAE,6BAA6B,EAC1C,YAAY,EAAE,GAAG,EACjB,cAAc,EAAE,EAAE,EAClB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,sBAAsB,CAAC;CAsCnC"}

package/dest/public/public_tx_simulator/measured_public_tx_simulator.js

@@ -0,0 +1,58 @@
+import { Timer } from '@aztec/foundation/timer';
+import { PublicTxSimulator } from './public_tx_simulator.js';
+/**
+ * A public tx simulator that tracks miscellaneous simulation metrics without telemetry.
+ */ export class MeasuredPublicTxSimulator extends PublicTxSimulator {
+    metrics;
+    constructor(treesDB, contractsDB, globalVariables, doMerkleOperations = false, skipFeeEnforcement = false, metrics){
+        super(treesDB, contractsDB, globalVariables, doMerkleOperations, skipFeeEnforcement), this.metrics = metrics;
+    }
+    async simulate(tx, txLabel = 'unlabeledTx') {
+        this.metrics.startRecordingTxSimulation(txLabel);
+        let avmResult;
+        try {
+            avmResult = await super.simulate(tx);
+        } finally{
+            this.metrics.stopRecordingTxSimulation(txLabel, avmResult?.revertCode);
+        }
+        return avmResult;
+    }
+    async computeTxHash(tx) {
+        const timer = new Timer();
+        const txHash = await super.computeTxHash(tx);
+        this.metrics.recordTxHashComputation(timer.ms());
+        return txHash;
+    }
+    async insertNonRevertiblesFromPrivate(context, tx) {
+        const timer = new Timer();
+        await super.insertNonRevertiblesFromPrivate(context, tx);
+        this.metrics.recordPrivateEffectsInsertion(timer.us(), 'non-revertible');
+    }
+    async insertRevertiblesFromPrivate(context, tx) {
+        const timer = new Timer();
+        const result = await super.insertRevertiblesFromPrivate(context, tx);
+        this.metrics.recordPrivateEffectsInsertion(timer.us(), 'revertible');
+        return result;
+    }
+    async simulatePhase(phase, context) {
+        const timer = new Timer();
+        const result = await super.simulatePhase(phase, context);
+        result.durationMs = timer.ms();
+        return result;
+    }
+    async simulateEnqueuedCallInternal(stateManager, callRequest, allocatedGas, transactionFee, fnName) {
+        const timer = new Timer();
+        const result = await super.simulateEnqueuedCallInternal(stateManager, callRequest, allocatedGas, transactionFee, fnName);
+        this.log.verbose(result.reverted ? `Simulation of enqueued public call ${fnName} reverted with reason ${result.revertReason}.` : `Simulation of enqueued public call ${fnName} completed successfully.`, {
+            eventName: 'avm-simulation',
+            appCircuitName: fnName,
+            duration: timer.ms()
+        });
+        if (result.reverted) {
+            this.metrics.recordEnqueuedCallSimulationFailure(fnName, timer.ms(), allocatedGas.sub(result.gasLeft).l2Gas, result.totalInstructions);
+        } else {
+            this.metrics.recordEnqueuedCallSimulation(fnName, timer.ms(), allocatedGas.sub(result.gasLeft).l2Gas, result.totalInstructions);
+        }
+        return result;
+    }
+}

package/dest/public/public_tx_simulator/public_tx_context.d.ts

@@ -4,7 +4,7 @@ import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { SimulationError } from '@aztec/stdlib/errors';
 import { Gas } from '@aztec/stdlib/gas';
 import { type PrivateToPublicAccumulatedData } from '@aztec/stdlib/kernel';
-import { type GlobalVariables, PublicCallRequestWithCalldata, type StateReference, type Tx, TxExecutionPhase, type TxHash } from '@aztec/stdlib/tx';
+import { type GlobalVariables, PublicCallRequestWithCalldata, type Tx, TxExecutionPhase, type TxHash } from '@aztec/stdlib/tx';
 import type { PublicContractsDBInterface } from '../../server.js';
 import { AvmPersistableStateManager } from '../avm/index.js';
 import type { PublicTreesDB } from '../public_db_sources.js';
@@ -98,7 +98,7 @@ export declare class PublicTxContext {
     /**
      * Generate the public inputs for the AVM circuit.
      */
-    generateAvmCircuitPublicInputs(endStateReference: StateReference): Promise<AvmCircuitPublicInputs>;
+    generateAvmCircuitPublicInputs(): Promise<AvmCircuitPublicInputs>;
 }
 /**
  * Thin wrapper around the state manager to handle forking and merging for phases.

package/dest/public/public_tx_simulator/public_tx_context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"public_tx_context.d.ts","sourceRoot":"","sources":["../../../src/public/public_tx_simulator/public_tx_context.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"public_tx_context.d.ts","sourceRoot":"","sources":["../../../src/public/public_tx_simulator/public_tx_context.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAG9C,OAAO,EAAE,KAAK,sBAAsB,EAAE,iBAAiB,EAAmB,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAChH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE5D,OAAO,EAAE,GAAG,EAAe,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAGL,KAAK,8BAA8B,EAIpC,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EACL,KAAK,eAAe,EACpB,6BAA6B,EAG7B,KAAK,EAAE,EACP,gBAAgB,EAChB,KAAK,MAAM,EACZ,MAAM,kBAAkB,CAAC;AAK1B,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,iBAAiB,CAAC;AAClE,OAAO,EAAE,0BAA0B,EAAE,MAAM,iBAAiB,CAAC;AAE7D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAI7D;;GAEG;AACH,qBAAa,eAAe;aAgBR,MAAM,EAAE,MAAM;aACd,KAAK,EAAE,iBAAiB;IACxC,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,OAAO,CAAC,QAAQ,CAAC,oBAAoB;aACrB,uCAAuC,EAAE,8BAA8B;aACvE,oCAAoC,EAAE,8BAA8B;aACpE,QAAQ,EAAE,YAAY;IACtC,OAAO,CAAC,QAAQ,CAAC,KAAK;aACN,KAAK,EAAE,iBAAiB;IA7B1C,OAAO,CAAC,GAAG,CAAS;IAGpB,OAAO,CAAC,eAAe,CAAoB;IAEpC,eAAe,EAAE,GAAG,CAAe;IAG1C,OAAO,CAAC,MAAM,CAAS;IAEvB,OAAO,CAAC,UAAU,CAA6B;IAExC,YAAY,EAAE,eAAe,GAAG,SAAS,CAAC;IAEjD,OAAO;WAoBa,MAAM,CACxB,OAAO,EAAE,aAAa,EACtB,WAAW,EAAE,0BAA0B,EACvC,EAAE,EAAE,EAAE,EACN,eAAe,EAAE,eAAe,EAChC,kBAAkB,EAAE,OAAO;IAwD7B;;;;OAIG;IACG,IAAI;IAOV;;;;OAIG;IACH,MAAM,CAAC,KAAK,EAAE,gBAAgB,EAAE,YAAY,GAAE,eAAe,GAAG,SAAqB,EAAE,OAAO,SAAK;IA0BnG;;;OAGG;IACH,kBAAkB,IAAI,UAAU;IAKhC;;OAEG;IACH,QAAQ,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO;IAW1C;;OAEG;IACH,uBAAuB,CAAC,KAAK,EAAE,gBAAgB,GAAG,6BAA6B,EAAE;IAWjF;;OAEG;IACH,iBAAiB,CAAC,KAAK,EAAE,gBAAgB,GAAG,GAAG;IAS/C;;OAEG;IACH,UAAU,CAAC,KAAK,EAAE,gBAAgB,EAAE,GAAG,EAAE,GAAG;IAQ5C;;;OAGG;IACH,eAAe,IAAI,GAAG;IAItB;;;;;OAKG;IACH,gBAAgB,IAAI,GAAG;IAOvB;;;OAGG;IACH,sBAAsB,IAAI,GAAG;IAK7B;;;OAGG;IACH,iBAAiB,CAAC,KAAK,EAAE,gBAAgB,GAAG,EAAE;IAQ9C;;;OAGG;IACH,OAAO,CAAC,uBAAuB;IAa/B;;OAEG;IACU,8BAA8B,IAAI,OAAO,CAAC,sBAAsB,CAAC;CAqG/E;AAED;;;;;;;;;GASG;AACH,cAAM,iBAAiB;IAKT,OAAO,CAAC,QAAQ,CAAC,cAAc;IAJ3C,OAAO,CAAC,GAAG,CAAS;IAEpB,OAAO,CAAC,2BAA2B,CAAyC;gBAE/C,cAAc,EAAE,0BAA0B;IAIjE,IAAI;IAMV,qBAAqB;IAIrB,QAAQ;IAIF,gBAAgB;IAQhB,kBAAkB;CAOzB"}

package/dest/public/public_tx_simulator/public_tx_context.js

@@ -12,7 +12,7 @@ import { TreeSnapshots, TxExecutionPhase } from '@aztec/stdlib/tx';
 import { strict as assert } from 'assert';
 import { inspect } from 'util';
 import { AvmPersistableStateManager } from '../avm/index.js';
-import { HintingPublicContractsDB } from '../hinting_db_sources.js';
+import { HintingPublicContractsDB, HintingPublicTreesDB } from '../hinting_db_sources.js';
 import { SideEffectArrayLengths, SideEffectTrace } from '../side_effect_trace.js';
 import { getCallRequestsWithCalldataByPhase } from '../utils.js';
 /**
@@ -69,9 +69,9 @@ import { getCallRequestsWithCalldataByPhase } from '../utils.js';
         // We wrap the DB to collect AVM hints.
         const hints = new AvmExecutionHints();
         const hintingContractsDB = new HintingPublicContractsDB(contractsDB, hints);
-        // TODO: Wrap merkle db.
+        const hintingTreesDB = new HintingPublicTreesDB(treesDB, hints);
         // Transaction level state manager that will be forked for revertible phases.
-        const txStateManager = AvmPersistableStateManager.create(treesDB, hintingContractsDB, trace, doMerkleOperations, firstNullifier, globalVariables.blockNumber.toNumber());
+        const txStateManager = AvmPersistableStateManager.create(hintingTreesDB, hintingContractsDB, trace, doMerkleOperations, firstNullifier, globalVariables.blockNumber.toNumber());
         const gasSettings = tx.data.constants.txContext.gasSettings;
         const gasUsedByPrivate = tx.data.gasUsed;
         // Gas allocated to public is "whatever's left" after private, but with some max applied.
@@ -215,13 +215,15 @@ import { getCallRequestsWithCalldataByPhase } from '../utils.js';
     }
     /**
    * Generate the public inputs for the AVM circuit.
-   */ async generateAvmCircuitPublicInputs(endStateReference) {
+   */ async generateAvmCircuitPublicInputs() {
         assert(this.halted, 'Can only get AvmCircuitPublicInputs after tx execution ends');
         const stateManager = this.state.getActiveStateManager();
         const startTreeSnapshots = new TreeSnapshots(this.startStateReference.l1ToL2MessageTree, this.startStateReference.partial.noteHashTree, this.startStateReference.partial.nullifierTree, this.startStateReference.partial.publicDataTree);
-        // Will be patched/padded at the end of this fn
-        const endTreeSnapshots = new TreeSnapshots(endStateReference.l1ToL2MessageTree, endStateReference.partial.noteHashTree, endStateReference.partial.nullifierTree, endStateReference.partial.publicDataTree);
-        const avmCircuitPublicInputs = this.trace.toAvmCircuitPublicInputs(this.globalVariables, startTreeSnapshots, /*startGasUsed=*/ this.gasUsedByPrivate, this.gasSettings, this.feePayer, this.setupCallRequests.map((r)=>r.request), this.appLogicCallRequests.map((r)=>r.request), /*teardownCallRequest=*/ this.teardownCallRequests.length ? this.teardownCallRequests[0].request : PublicCallRequest.empty(), endTreeSnapshots, /*endGasUsed=*/ this.getTotalGasUsed(), /*transactionFee=*/ this.getTransactionFeeUnsafe(), /*reverted=*/ !this.revertCode.isOK());
+        // FIXME: We are first creating the PIs with the wrong endTreeSnapshots, then patching them.
+        // This is because we need to know the lengths of the accumulated data arrays to pad them.
+        // We should refactor this to avoid this hack.
+        // We should just get the info we need from the trace, and create the rest of the PIs here.
+        const avmCircuitPublicInputs = this.trace.toAvmCircuitPublicInputs(this.globalVariables, startTreeSnapshots, /*startGasUsed=*/ this.gasUsedByPrivate, this.gasSettings, this.feePayer, this.setupCallRequests.map((r)=>r.request), this.appLogicCallRequests.map((r)=>r.request), /*teardownCallRequest=*/ this.teardownCallRequests.length ? this.teardownCallRequests[0].request : PublicCallRequest.empty(), /*endTreeSnapshots=*/ TreeSnapshots.empty(), /*endGasUsed=*/ this.getTotalGasUsed(), /*transactionFee=*/ this.getTransactionFeeUnsafe(), /*reverted=*/ !this.revertCode.isOK());
         const getArrayLengths = (from)=>new PrivateToAvmAccumulatedDataArrayLengths(countAccumulatedItems(from.noteHashes), countAccumulatedItems(from.nullifiers), countAccumulatedItems(from.l2ToL1Msgs));
         const convertAccumulatedData = (from)=>new PrivateToAvmAccumulatedData(from.noteHashes, from.nullifiers, from.l2ToL1Msgs);
         // Temporary overrides as these entries aren't yet populated in trace

package/dest/public/public_tx_simulator/public_tx_simulator.d.ts

@@ -1,14 +1,16 @@
+import type { Fr } from '@aztec/foundation/fields';
+import { type Logger } from '@aztec/foundation/log';
 import { type AvmProvingRequest, type RevertCode } from '@aztec/stdlib/avm';
 import { SimulationError } from '@aztec/stdlib/errors';
-import type { GasUsed } from '@aztec/stdlib/gas';
-import { type GlobalVariables, NestedProcessReturnValues, Tx, TxExecutionPhase } from '@aztec/stdlib/tx';
-import { type TelemetryClient, type Tracer } from '@aztec/telemetry-client';
-import { ExecutorMetrics } from '../executor_metrics.js';
+import type { Gas, GasUsed } from '@aztec/stdlib/gas';
+import { type GlobalVariables, NestedProcessReturnValues, PublicCallRequestWithCalldata, Tx, TxExecutionPhase } from '@aztec/stdlib/tx';
+import type { AvmFinalizedCallResult } from '../avm/avm_contract_call_result.js';
+import { type AvmPersistableStateManager } from '../avm/index.js';
 import type { PublicContractsDB, PublicTreesDB } from '../public_db_sources.js';
 import { PublicTxContext } from './public_tx_context.js';
 export type ProcessedPhase = {
     phase: TxExecutionPhase;
-    durationMs: number;
+    durationMs?: number;
     returnValues: NestedProcessReturnValues[];
     reverted: boolean;
     revertReason?: SimulationError;
@@ -24,20 +26,19 @@ export type PublicTxResult = {
 };
 export declare class PublicTxSimulator {
     private treesDB;
-    private contractsDB;
+    protected contractsDB: PublicContractsDB;
     private globalVariables;
     private doMerkleOperations;
     private skipFeeEnforcement;
-    metrics: ExecutorMetrics;
-    private log;
-    constructor(treesDB: PublicTreesDB, contractsDB: PublicContractsDB, globalVariables: GlobalVariables, doMerkleOperations?: boolean, skipFeeEnforcement?: boolean, telemetryClient?: TelemetryClient);
-    get tracer(): Tracer;
+    protected log: Logger;
+    constructor(treesDB: PublicTreesDB, contractsDB: PublicContractsDB, globalVariables: GlobalVariables, doMerkleOperations?: boolean, skipFeeEnforcement?: boolean);
     /**
      * Simulate a transaction's public portion including all of its phases.
      * @param tx - The transaction to simulate.
      * @returns The result of the transaction's public execution.
      */
     simulate(tx: Tx): Promise<PublicTxResult>;
+    protected computeTxHash(tx: Tx): Promise<import("@aztec/stdlib/tx").TxHash>;
     /**
      * Simulate the setup phase of a transaction's public execution.
      * @param context - WILL BE MUTATED. The context of the currently executing public transaction portion
@@ -62,7 +63,7 @@ export declare class PublicTxSimulator {
      * @param context - WILL BE MUTATED. The context of the currently executing public transaction portion
      * @returns The phase result.
      */
-    private simulatePhase;
+    protected simulatePhase(phase: TxExecutionPhase, context: PublicTxContext): Promise<ProcessedPhase>;
     /**
      * Simulate an enqueued public call.
      * @param phase - The current phase of public execution
@@ -70,7 +71,7 @@ export declare class PublicTxSimulator {
      * @param callRequest - The public function call request, including the calldata.
      * @returns The result of execution.
      */
-    private simulateEnqueuedCall;
+    protected simulateEnqueuedCall(phase: TxExecutionPhase, context: PublicTxContext, callRequest: PublicCallRequestWithCalldata): Promise<AvmFinalizedCallResult>;
     /**
      * Simulate an enqueued public call, without modifying the context (PublicTxContext).
      * Resulting modifications to the context can be applied by the caller.
@@ -79,22 +80,21 @@ export declare class PublicTxSimulator {
      * while still simulating phases and generating a proving request.
      *
      * @param stateManager - The state manager for AvmSimulation
-     * @param context - The context of the currently executing public transaction portion
      * @param callRequest - The public function call request, including the calldata.
      * @param allocatedGas - The gas allocated to the enqueued call
      * @param fnName - The name of the function
      * @returns The result of execution.
      */
-    private simulateEnqueuedCallInternal;
+    protected simulateEnqueuedCallInternal(stateManager: AvmPersistableStateManager, { request, calldata }: PublicCallRequestWithCalldata, allocatedGas: Gas, transactionFee: Fr, fnName: string): Promise<AvmFinalizedCallResult>;
     /**
      * Insert the non-revertible accumulated data from private into the public state.
      */
-    insertNonRevertiblesFromPrivate(context: PublicTxContext): Promise<void>;
+    protected insertNonRevertiblesFromPrivate(context: PublicTxContext, tx: Tx): Promise<void>;
     /**
      * Insert the revertible accumulated data from private into the public state.
      * Start by forking state so we can rollback to the end of setup if app logic or teardown reverts.
      */
-    insertRevertiblesFromPrivate(context: PublicTxContext): Promise<boolean>;
+    protected insertRevertiblesFromPrivate(context: PublicTxContext, tx: Tx): Promise<boolean>;
     private payFee;
     /**
      * Generate the proving request for the AVM circuit.

package/dest/public/public_tx_simulator/public_tx_simulator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"public_tx_simulator.d.ts","sourceRoot":"","sources":["../../../src/public/public_tx_simulator/public_tx_simulator.ts"],"names":[],"mappings":"AAKA,OAAO,EAKL,KAAK,iBAAiB,EACtB,KAAK,UAAU,EAChB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,KAAK,EAAO,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAGtD,OAAO,EACL,KAAK,eAAe,EACpB,yBAAyB,EAEzB,EAAE,EACF,gBAAgB,EACjB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAc,KAAK,eAAe,EAAE,KAAK,MAAM,EAAiC,MAAM,yBAAyB,CAAC;AAQvH,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,KAAK,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAChF,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,MAAM,MAAM,cAAc,GAAG;IAC3B,KAAK,EAAE,gBAAgB,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,yBAAyB,EAAE,CAAC;IAC1C,QAAQ,EAAE,OAAO,CAAC;IAClB,YAAY,CAAC,EAAE,eAAe,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,+CAA+C;IAC/C,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,UAAU,CAAC;IACvB,4BAA4B;IAC5B,YAAY,CAAC,EAAE,eAAe,CAAC;IAC/B,eAAe,EAAE,cAAc,EAAE,CAAC;CACnC,CAAC;AAEF,qBAAa,iBAAiB;IAM1B,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,kBAAkB;IAT5B,OAAO,EAAE,eAAe,CAAC;IAEzB,OAAO,CAAC,GAAG,CAAS;gBAGV,OAAO,EAAE,aAAa,EACtB,WAAW,EAAE,iBAAiB,EAC9B,eAAe,EAAE,eAAe,EAChC,kBAAkB,GAAE,OAAe,EACnC,kBAAkB,GAAE,OAAe,EAC3C,eAAe,GAAE,eAAsC;IAMzD,IAAI,MAAM,IAAI,MAAM,CAEnB;IACD;;;;OAIG;IACU,QAAQ,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC;IAyFtD;;;;OAIG;YACW,kBAAkB;IAIhC;;;;OAIG;YACW,qBAAqB;IAkBnC;;;;OAIG;YACW,qBAAqB;IAoBnC;;;;;OAKG;YACW,aAAa;IAuC3B;;;;;;OAMG;YAOW,oBAAoB;IA8ClC;;;;;;;;;;;;;OAaG;YAOW,4BAA4B;IAgD1C;;OAEG;IACU,+BAA+B,CAAC,OAAO,EAAE,eAAe;IAkBrE;;;OAGG;IACU,4BAA4B,CAAC,OAAO,EAAE,eAAe,GAAgB,OAAO,CAAC,OAAO,CAAC;YA+BpF,MAAM;IAgCpB;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,sBAAsB;CAStC"}
+{"version":3,"file":"public_tx_simulator.d.ts","sourceRoot":"","sources":["../../../src/public/public_tx_simulator/public_tx_simulator.ts"],"names":[],"mappings":"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"}

package/dest/public/public_tx_simulator/public_tx_simulator.js

@@ -1,23 +1,14 @@
-function _ts_decorate(decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-}
 import { createLogger } from '@aztec/foundation/log';
-import { Timer } from '@aztec/foundation/timer';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 import { computeFeePayerBalanceStorageSlot } from '@aztec/protocol-contracts/fee-juice';
 import { AvmCircuitInputs, AvmEnqueuedCallHint } from '@aztec/stdlib/avm';
 import { SimulationError } from '@aztec/stdlib/errors';
 import { ProvingRequestType } from '@aztec/stdlib/proofs';
 import { NestedProcessReturnValues, TxExecutionPhase } from '@aztec/stdlib/tx';
-import { Attributes, getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
 import { strict as assert } from 'assert';
 import { getPublicFunctionDebugName } from '../../common/debug_fn_name.js';
 import { AvmSimulator } from '../avm/index.js';
 import { NullifierCollisionError } from '../avm/journal/nullifiers.js';
-import { ExecutorMetrics } from '../executor_metrics.js';
 import { PublicTxContext } from './public_tx_context.js';
 export class PublicTxSimulator {
     treesDB;
@@ -25,19 +16,14 @@ export class PublicTxSimulator {
     globalVariables;
     doMerkleOperations;
     skipFeeEnforcement;
-    metrics;
     log;
-    constructor(treesDB, contractsDB, globalVariables, doMerkleOperations = false, skipFeeEnforcement = false, telemetryClient = getTelemetryClient()){
+    constructor(treesDB, contractsDB, globalVariables, doMerkleOperations = false, skipFeeEnforcement = false){
         this.treesDB = treesDB;
         this.contractsDB = contractsDB;
         this.globalVariables = globalVariables;
         this.doMerkleOperations = doMerkleOperations;
         this.skipFeeEnforcement = skipFeeEnforcement;
         this.log = createLogger(`simulator:public_tx_simulator`);
-        this.metrics = new ExecutorMetrics(telemetryClient, 'PublicTxSimulator');
-    }
-    get tracer() {
-        return this.metrics.tracer;
     }
     /**
    * Simulate a transaction's public portion including all of its phases.
@@ -45,31 +31,19 @@ export class PublicTxSimulator {
    * @returns The result of the transaction's public execution.
    */ async simulate(tx) {
         try {
-            const startTime = process.hrtime.bigint();
-            const txHash = await tx.getTxHash();
+            const txHash = await this.computeTxHash(tx);
             this.log.debug(`Simulating ${tx.publicFunctionCalldata.length} public calls for tx ${txHash}`, {
                 txHash
             });
             const context = await PublicTxContext.create(this.treesDB, this.contractsDB, tx, this.globalVariables, this.doMerkleOperations);
-            const nonRevertStart = process.hrtime.bigint();
-            await this.insertNonRevertiblesFromPrivate(context);
-            // add new contracts to the contracts db so that their functions may be found and called
-            // TODO(#6464): Should we allow emitting contracts in the private setup phase?
-            await this.contractsDB.addNewNonRevertibleContracts(tx);
-            const nonRevertEnd = process.hrtime.bigint();
-            this.metrics.recordPrivateEffectsInsertion(Number(nonRevertEnd - nonRevertStart) / 1_000, 'non-revertible');
+            await this.insertNonRevertiblesFromPrivate(context, tx);
             const processedPhases = [];
             if (context.hasPhase(TxExecutionPhase.SETUP)) {
                 const setupResult = await this.simulateSetupPhase(context);
                 processedPhases.push(setupResult);
             }
-            const revertStart = process.hrtime.bigint();
-            const success = await this.insertRevertiblesFromPrivate(context);
+            const success = await this.insertRevertiblesFromPrivate(context, tx);
             if (success) {
-                // add new contracts to the contracts db so that their functions may be found and called
-                await this.contractsDB.addNewRevertibleContracts(tx);
-                const revertEnd = process.hrtime.bigint();
-                this.metrics.recordPrivateEffectsInsertion(Number(revertEnd - revertStart) / 1_000, 'revertible');
                 // Only proceed with app logic if there was no revert during revertible insertion
                 if (context.hasPhase(TxExecutionPhase.APP_LOGIC)) {
                     const appLogicResult = await this.simulateAppLogicPhase(context);
@@ -84,7 +58,7 @@ export class PublicTxSimulator {
             }
             await context.halt();
             await this.payFee(context);
-            const publicInputs = await context.generateAvmCircuitPublicInputs(await this.treesDB.getStateReference());
+            const publicInputs = await context.generateAvmCircuitPublicInputs();
             const avmProvingRequest = PublicTxSimulator.generateProvingRequest(publicInputs, context.hints);
             const revertCode = context.getFinalRevertCode();
             if (!revertCode.isOK()) {
@@ -93,9 +67,9 @@ export class PublicTxSimulator {
             // Commit contracts from this TX to the block-level cache and clear tx cache
             // If the tx reverted, only commit non-revertible contracts
             // NOTE: You can't create contracts in public, so this is only relevant for private-created contracts
+            // FIXME(fcarreiro): this should conceptually use the hinted contracts db.
+            // However things should work as they are now because the hinted db would still pick up the new contracts.
             this.contractsDB.commitContractsForTx(/*onlyNonRevertibles=*/ !revertCode.isOK());
-            const endTime = process.hrtime.bigint();
-            this.log.debug(`Public TX simulator took ${Number(endTime - startTime) / 1_000_000} ms\n`);
             return {
                 avmProvingRequest,
                 gasUsed: {
@@ -111,9 +85,14 @@ export class PublicTxSimulator {
         } finally{
             // Make sure there are no new contracts in the tx-level cache.
             // They should either be committed to block-level cache or cleared.
+            // FIXME(fcarreiro): this should conceptually use the hinted contracts db.
+            // However things should work as they are now because the hinted db would still pick up the new contracts.
             this.contractsDB.clearContractsForTx();
         }
     }
+    async computeTxHash(tx) {
+        return await tx.getTxHash();
+    }
     /**
    * Simulate the setup phase of a transaction's public execution.
    * @param context - WILL BE MUTATED. The context of the currently executing public transaction portion
@@ -174,7 +153,6 @@ export class PublicTxSimulator {
         const returnValues = [];
         let reverted = false;
         let revertReason;
-        const phaseTimer = new Timer();
         for(let i = callRequests.length - 1; i >= 0; i--){
             if (reverted) {
                 break;
@@ -189,7 +167,6 @@ export class PublicTxSimulator {
         }
         return {
             phase,
-            durationMs: phaseTimer.ms(),
             returnValues,
             reverted,
             revertReason
@@ -229,7 +206,6 @@ export class PublicTxSimulator {
    * while still simulating phases and generating a proving request.
    *
    * @param stateManager - The state manager for AvmSimulation
-   * @param context - The context of the currently executing public transaction portion
    * @param callRequest - The public function call request, including the calldata.
    * @param allocatedGas - The gas allocated to the enqueued call
    * @param fnName - The name of the function
@@ -238,25 +214,13 @@ export class PublicTxSimulator {
         const address = request.contractAddress;
         const sender = request.msgSender;
         this.log.debug(`Executing enqueued public call to external function ${fnName}@${address} with ${allocatedGas.l2Gas} allocated L2 gas.`);
-        const timer = new Timer();
         const simulator = await AvmSimulator.create(stateManager, address, sender, transactionFee, this.globalVariables, request.isStaticCall, calldata, allocatedGas);
         const avmCallResult = await simulator.execute();
-        const result = avmCallResult.finalize();
-        this.log.verbose(result.reverted ? `Simulation of enqueued public call ${fnName} reverted with reason ${result.revertReason}.` : `Simulation of enqueued public call ${fnName} completed successfully.`, {
-            eventName: 'avm-simulation',
-            appCircuitName: fnName,
-            duration: timer.ms()
-        });
-        if (result.reverted) {
-            this.metrics.recordFunctionSimulationFailure();
-        } else {
-            this.metrics.recordFunctionSimulation(timer.ms(), allocatedGas.sub(result.gasLeft).l2Gas, fnName);
-        }
-        return result;
+        return avmCallResult.finalize();
     }
     /**
    * Insert the non-revertible accumulated data from private into the public state.
-   */ async insertNonRevertiblesFromPrivate(context) {
+   */ async insertNonRevertiblesFromPrivate(context, tx) {
         const stateManager = context.state.getActiveStateManager();
         try {
             await stateManager.writeSiloedNullifiersFromPrivate(context.nonRevertibleAccumulatedDataFromPrivate.nullifiers);
@@ -270,11 +234,16 @@ export class PublicTxSimulator {
                 await stateManager.writeUniqueNoteHash(noteHash);
             }
         }
+        // add new contracts to the contracts db so that their functions may be found and called
+        // TODO(#6464): Should we allow emitting contracts in the private setup phase?
+        // FIXME(fcarreiro): this should conceptually use the hinted contracts db.
+        // However things should work as they are now because the hinted db would still pick up the new contracts.
+        await this.contractsDB.addNewNonRevertibleContracts(tx);
     }
     /**
    * Insert the revertible accumulated data from private into the public state.
    * Start by forking state so we can rollback to the end of setup if app logic or teardown reverts.
-   */ async insertRevertiblesFromPrivate(context) {
+   */ async insertRevertiblesFromPrivate(context, tx) {
         // Fork the state manager so we can rollback to end of setup if app logic reverts.
         await context.state.fork();
         const stateManager = context.state.getActiveStateManager();
@@ -295,6 +264,10 @@ export class PublicTxSimulator {
                 await stateManager.writeSiloedNoteHash(noteHash);
             }
         }
+        // add new contracts to the contracts db so that their functions may be found and called
+        // FIXME(fcarreiro): this should conceptually use the hinted contracts db.
+        // However things should work as they are now because the hinted db would still pick up the new contracts.
+        await this.contractsDB.addNewRevertibleContracts(tx);
         return /*success=*/ true;
     }
     async payFee(context) {
@@ -329,16 +302,3 @@ export class PublicTxSimulator {
         };
     }
 }
-_ts_decorate([
-    trackSpan('PublicTxSimulator.simulateEnqueuedCall', (phase, context, callRequest)=>({
-            [Attributes.TX_HASH]: context.txHash.toString(),
-            [Attributes.TARGET_ADDRESS]: callRequest.request.contractAddress.toString(),
-            [Attributes.SENDER_ADDRESS]: callRequest.request.msgSender.toString(),
-            [Attributes.SIMULATOR_PHASE]: TxExecutionPhase[phase].toString()
-        }))
-], PublicTxSimulator.prototype, "simulateEnqueuedCall", null);
-_ts_decorate([
-    trackSpan('PublicTxSimulator.simulateEnqueuedCallInternal', (_stateManager, _callRequest, _allocatedGas, _transactionFee, fnName)=>({
-            [Attributes.APP_CIRCUIT_NAME]: fnName
-        }))
-], PublicTxSimulator.prototype, "simulateEnqueuedCallInternal", null);

package/dest/public/public_tx_simulator/telemetry_public_tx_simulator.d.ts

@@ -0,0 +1,19 @@
+import type { Fr } from '@aztec/foundation/fields';
+import type { Gas } from '@aztec/stdlib/gas';
+import { type GlobalVariables, PublicCallRequestWithCalldata, TxExecutionPhase } from '@aztec/stdlib/tx';
+import { type TelemetryClient, type Tracer } from '@aztec/telemetry-client';
+import type { AvmFinalizedCallResult } from '../avm/avm_contract_call_result.js';
+import type { AvmPersistableStateManager } from '../avm/index.js';
+import type { PublicContractsDB, PublicTreesDB } from '../public_db_sources.js';
+import { MeasuredPublicTxSimulator } from './measured_public_tx_simulator.js';
+import { PublicTxContext } from './public_tx_context.js';
+/**
+ * A public tx simulator that tracks runtime/production metrics with telemetry.
+ */
+export declare class TelemetryPublicTxSimulator extends MeasuredPublicTxSimulator {
+    readonly tracer: Tracer;
+    constructor(treesDB: PublicTreesDB, contractsDB: PublicContractsDB, globalVariables: GlobalVariables, doMerkleOperations?: boolean, skipFeeEnforcement?: boolean, telemetryClient?: TelemetryClient);
+    protected simulateEnqueuedCall(phase: TxExecutionPhase, context: PublicTxContext, callRequest: PublicCallRequestWithCalldata): Promise<AvmFinalizedCallResult>;
+    protected simulateEnqueuedCallInternal(stateManager: AvmPersistableStateManager, callRequest: PublicCallRequestWithCalldata, allocatedGas: Gas, transactionFee: Fr, fnName: string): Promise<AvmFinalizedCallResult>;
+}
+//# sourceMappingURL=telemetry_public_tx_simulator.d.ts.map

package/dest/public/public_tx_simulator/telemetry_public_tx_simulator.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"telemetry_public_tx_simulator.d.ts","sourceRoot":"","sources":["../../../src/public/public_tx_simulator/telemetry_public_tx_simulator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,KAAK,eAAe,EAAE,6BAA6B,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACzG,OAAO,EAAc,KAAK,eAAe,EAAE,KAAK,MAAM,EAAiC,MAAM,yBAAyB,CAAC;AAEvH,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AACjF,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,iBAAiB,CAAC;AAElE,OAAO,KAAK,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAChF,OAAO,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AAC9E,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD;;GAEG;AACH,qBAAa,0BAA2B,SAAQ,yBAAyB;IAEvE,SAAgB,MAAM,EAAE,MAAM,CAAC;gBAG7B,OAAO,EAAE,aAAa,EACtB,WAAW,EAAE,iBAAiB,EAC9B,eAAe,EAAE,eAAe,EAChC,kBAAkB,GAAE,OAAe,EACnC,kBAAkB,GAAE,OAAe,EACnC,eAAe,GAAE,eAAsC;cAahC,oBAAoB,CAC3C,KAAK,EAAE,gBAAgB,EACvB,OAAO,EAAE,eAAe,EACxB,WAAW,EAAE,6BAA6B,GACzC,OAAO,CAAC,sBAAsB,CAAC;cAUT,4BAA4B,CACnD,YAAY,EAAE,0BAA0B,EACxC,WAAW,EAAE,6BAA6B,EAC1C,YAAY,EAAE,GAAG,EACjB,cAAc,EAAE,EAAE,EAClB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,sBAAsB,CAAC;CAGnC"}