@aztec/simulator 0.0.0-test.1 → 0.0.1-commit.5daedc8

package/dest/private/circuit_recording/file_circuit_recorder.d.ts

@@ -0,0 +1,31 @@
+import type { ACVMWitness } from '../acvm/acvm_types.js';
+import { CircuitRecorder, type CircuitRecording } from './circuit_recorder.js';
+export declare class FileCircuitRecorder extends CircuitRecorder {
+    #private;
+    private readonly recordDir;
+    recording?: CircuitRecording & {
+        filePath: string;
+        isFirstCall: boolean;
+    };
+    constructor(recordDir: string);
+    start(input: ACVMWitness, circuitBytecode: Buffer, circuitName: string, functionName?: string): Promise<void>;
+    /**
+     * Records a single oracle/foreign call with its inputs and outputs.
+     * @param name - Name of the call
+     * @param inputs - Input arguments
+     * @param outputs - Output results
+     */
+    recordCall(name: string, inputs: unknown[], outputs: unknown, time: number, stackDepth: number): Promise<import("./circuit_recorder.js").OracleCall>;
+    /**
+     * Finalizes the recording file by adding closing brackets. Without calling this method, the recording file is
+     * incomplete and it fails to parse.
+     */
+    finish(): Promise<CircuitRecording>;
+    /**
+     * Finalizes the recording file by adding the error and closing brackets. Without calling this method or `finish`,
+     * the recording file is incomplete and it fails to parse.
+     * @param error - The error that occurred during circuit execution
+     */
+    finishWithError(error: unknown): Promise<CircuitRecording>;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmlsZV9jaXJjdWl0X3JlY29yZGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcHJpdmF0ZS9jaXJjdWl0X3JlY29yZGluZy9maWxlX2NpcmN1aXRfcmVjb3JkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBR0EsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDekQsT0FBTyxFQUFFLGVBQWUsRUFBRSxLQUFLLGdCQUFnQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFL0UscUJBQWEsbUJBQW9CLFNBQVEsZUFBZTs7SUFHMUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxTQUFTO0lBRjlCLFNBQVMsQ0FBQyxFQUFFLGdCQUFnQixHQUFHO1FBQUUsUUFBUSxFQUFFLE1BQU0sQ0FBQztRQUFDLFdBQVcsRUFBRSxPQUFPLENBQUE7S0FBRSxDQUFDO0lBRWxGLFlBQTZCLFNBQVMsRUFBRSxNQUFNLEVBRTdDO0lBRWMsS0FBSyxDQUNsQixLQUFLLEVBQUUsV0FBVyxFQUNsQixlQUFlLEVBQUUsTUFBTSxFQUN2QixXQUFXLEVBQUUsTUFBTSxFQUNuQixZQUFZLEdBQUUsTUFBZSxpQkFnQzlCO0lBcUNEOzs7OztPQUtHO0lBQ1ksVUFBVSxDQUFDLElBQUksRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLE9BQU8sRUFBRSxFQUFFLE9BQU8sRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxVQUFVLEVBQUUsTUFBTSx1REFVNUc7SUFFRDs7O09BR0c7SUFDWSxNQUFNLElBQUksT0FBTyxDQUFDLGdCQUFnQixDQUFDLENBV2pEO0lBRUQ7Ozs7T0FJRztJQUNZLGVBQWUsQ0FBQyxLQUFLLEVBQUUsT0FBTyxHQUFHLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxDQWF4RTtDQUNGIn0=

package/dest/private/circuit_recording/file_circuit_recorder.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"file_circuit_recorder.d.ts","sourceRoot":"","sources":["../../../src/private/circuit_recording/file_circuit_recorder.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,KAAK,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAE/E,qBAAa,mBAAoB,SAAQ,eAAe;;IAG1C,OAAO,CAAC,QAAQ,CAAC,SAAS;IAF9B,SAAS,CAAC,EAAE,gBAAgB,GAAG;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,OAAO,CAAA;KAAE,CAAC;IAElF,YAA6B,SAAS,EAAE,MAAM,EAE7C;IAEc,KAAK,CAClB,KAAK,EAAE,WAAW,EAClB,eAAe,EAAE,MAAM,EACvB,WAAW,EAAE,MAAM,EACnB,YAAY,GAAE,MAAe,iBAgC9B;IAqCD;;;;;OAKG;IACY,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,uDAU5G;IAED;;;OAGG;IACY,MAAM,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAWjD;IAED;;;;OAIG;IACY,eAAe,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAaxE;CACF"}

package/dest/private/circuit_recording/file_circuit_recorder.js

@@ -0,0 +1,135 @@
+import fs from 'fs/promises';
+import path from 'path';
+import { CircuitRecorder } from './circuit_recorder.js';
+export class FileCircuitRecorder extends CircuitRecorder {
+    recordDir;
+    constructor(recordDir){
+        super(), this.recordDir = recordDir;
+    }
+    async start(input, circuitBytecode, circuitName, functionName = 'main') {
+        await super.start(input, circuitBytecode, circuitName, functionName);
+        const recordingStringWithoutClosingBracket = JSON.stringify({
+            ...this.recording,
+            isFirstCall: undefined,
+            parent: undefined,
+            oracleCalls: undefined,
+            filePath: undefined
+        }, null, 2).slice(0, -2);
+        try {
+            // Check if the recording directory exists and is a directory
+            const stats = await fs.stat(this.recordDir);
+            if (!stats.isDirectory()) {
+                throw new Error(`Recording path ${this.recordDir} exists but is not a directory`);
+            }
+        } catch (err) {
+            if (err.code === 'ENOENT') {
+                // The directory does not exist so we create it
+                await fs.mkdir(this.recordDir, {
+                    recursive: true
+                });
+            } else {
+                throw err;
+            }
+        }
+        this.recording.isFirstCall = true;
+        this.recording.filePath = await FileCircuitRecorder.#computeFilePathAndStoreInitialRecording(this.recordDir, this.recording.circuitName, this.recording.functionName, recordingStringWithoutClosingBracket);
+    }
+    /**
+   * Computes a unique file path for the recording by trying different counter values.
+   * This is needed because multiple recordings of the same circuit could be happening simultaneously or an older
+   * recording might be present.
+   * @param recordDir - Directory to store the recording
+   * @param circuitName - Name of the circuit
+   * @param functionName - Name of the circuit function
+   * @param recordingContent - Initial recording content
+   * @returns A unique file path for the recording
+   */ static async #computeFilePathAndStoreInitialRecording(recordDir, circuitName, functionName, recordingContent) {
+        let counter = 0;
+        while(true){
+            try {
+                const filePath = getFilePath(recordDir, circuitName, functionName, counter);
+                // Write the initial recording content to the file
+                await fs.writeFile(filePath, recordingContent + ',\n  "oracleCalls": [\n', {
+                    flag: 'wx'
+                });
+                return filePath;
+            } catch (err) {
+                if (err.code === 'EEXIST') {
+                    counter++;
+                    continue;
+                }
+                throw err;
+            }
+        }
+    }
+    /**
+   * Records a single oracle/foreign call with its inputs and outputs.
+   * @param name - Name of the call
+   * @param inputs - Input arguments
+   * @param outputs - Output results
+   */ async recordCall(name, inputs, outputs, time, stackDepth) {
+        const entry = await super.recordCall(name, inputs, outputs, time, stackDepth);
+        try {
+            const prefix = this.recording.isFirstCall ? '    ' : '    ,';
+            this.recording.isFirstCall = false;
+            await fs.appendFile(this.recording.filePath, prefix + JSON.stringify(entry) + '\n');
+        } catch (err) {
+            this.logger.error('Failed to log circuit call', {
+                error: err
+            });
+        }
+        return entry;
+    }
+    /**
+   * Finalizes the recording file by adding closing brackets. Without calling this method, the recording file is
+   * incomplete and it fails to parse.
+   */ async finish() {
+        // Finish sets the recording to undefined if we are at the topmost circuit,
+        // so we save the current file path before that
+        const filePath = this.recording.filePath;
+        const result = await super.finish();
+        try {
+            await fs.appendFile(filePath, '  ]\n}\n');
+        } catch (err) {
+            this.logger.error('Failed to finalize recording file', {
+                error: err
+            });
+        }
+        return result;
+    }
+    /**
+   * Finalizes the recording file by adding the error and closing brackets. Without calling this method or `finish`,
+   * the recording file is incomplete and it fails to parse.
+   * @param error - The error that occurred during circuit execution
+   */ async finishWithError(error) {
+        // Finish sets the recording to undefined if we are at the topmost circuit,
+        // so we save the current file path before that
+        const filePath = this.recording.filePath;
+        const result = await super.finishWithError(error);
+        try {
+            await fs.appendFile(filePath, '  ],\n');
+            await fs.appendFile(filePath, `  "error": ${JSON.stringify(error)}\n`);
+            await fs.appendFile(filePath, '}\n');
+        } catch (err) {
+            this.logger.error('Failed to finalize recording file with error', {
+                error: err
+            });
+        }
+        return result;
+    }
+}
+/**
+ * Generates a file path for storing circuit recordings. The format of the filename is:
+ * `circuit_name_circuit_function_name_YYYY-MM-DD_N.json` where N is a counter to ensure unique filenames.
+ * @param recordDir - Base directory for recordings
+ * @param circuitName - Name of the circuit
+ * @param functionName - Name of the circuit function
+ * @param counter - Counter to ensure unique filenames. This is expected to be incremented in a loop until there is no
+ * existing file with the same name.
+ * @returns A file path for the recording.
+ */ function getFilePath(recordDir, circuitName, functionName, counter) {
+    const date = new Date();
+    const formattedDate = date.toISOString().split('T')[0];
+    const filename = `${circuitName}_${functionName}_${formattedDate}_${counter}.json`;
+    return path.join(recordDir, filename);
+}

package/dest/private/circuit_recording/memory_circuit_recorder.d.ts

@@ -0,0 +1,5 @@
+import { CircuitRecorder } from './circuit_recorder.js';
+export declare class MemoryCircuitRecorder extends CircuitRecorder {
+    constructor();
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVtb3J5X2NpcmN1aXRfcmVjb3JkZXIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9wcml2YXRlL2NpcmN1aXRfcmVjb3JkaW5nL21lbW9yeV9jaXJjdWl0X3JlY29yZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQU14RCxxQkFBYSxxQkFBc0IsU0FBUSxlQUFlO0lBQ3hELGNBRUM7Q0FDRiJ9

package/dest/private/circuit_recording/memory_circuit_recorder.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"memory_circuit_recorder.d.ts","sourceRoot":"","sources":["../../../src/private/circuit_recording/memory_circuit_recorder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAMxD,qBAAa,qBAAsB,SAAQ,eAAe;IACxD,cAEC;CACF"}

package/dest/private/circuit_recording/memory_circuit_recorder.js

@@ -0,0 +1,9 @@
+import { CircuitRecorder } from './circuit_recorder.js';
+/*
+ * In memory circuit recorder uses the default implementation. This is kept
+ * while we decide the fate of the FileCircuitRecorder
+ */ export class MemoryCircuitRecorder extends CircuitRecorder {
+    constructor(){
+        super();
+    }
+}

package/dest/private/circuit_recording/simulator_recorder_wrapper.d.ts

@@ -0,0 +1,21 @@
+import type { ForeignCallHandler } from '@aztec/noir-acvm_js';
+import type { FunctionArtifactWithContractName } from '@aztec/stdlib/abi';
+import type { NoirCompiledCircuitWithName } from '@aztec/stdlib/noir';
+import type { ACIRCallback, ACIRExecutionResult } from '../acvm/acvm.js';
+import type { ACVMWitness } from '../acvm/acvm_types.js';
+import type { ACVMSuccess } from '../acvm_native.js';
+import type { CircuitSimulator } from '../circuit_simulator.js';
+import type { CircuitRecorder } from './circuit_recorder.js';
+/**
+ * Takes a circuit simulator and wraps it in a circuit recorder. See CircuitRecorder for more details on how circuit
+ * recording works.
+ */
+export declare class SimulatorRecorderWrapper implements CircuitSimulator {
+    #private;
+    private simulator;
+    private recorder;
+    constructor(simulator: CircuitSimulator, recorder: CircuitRecorder);
+    executeProtocolCircuit(input: ACVMWitness, artifact: NoirCompiledCircuitWithName, callback: ForeignCallHandler | undefined): Promise<ACVMSuccess>;
+    executeUserCircuit(input: ACVMWitness, artifact: FunctionArtifactWithContractName, callback: ACIRCallback): Promise<ACIRExecutionResult>;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2ltdWxhdG9yX3JlY29yZGVyX3dyYXBwZXIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9wcml2YXRlL2NpcmN1aXRfcmVjb3JkaW5nL3NpbXVsYXRvcl9yZWNvcmRlcl93cmFwcGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLGtCQUFrQixFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDOUQsT0FBTyxLQUFLLEVBQUUsZ0NBQWdDLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUMxRSxPQUFPLEtBQUssRUFBRSwyQkFBMkIsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRXRFLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBcUIsbUJBQW1CLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUM1RixPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUN6RCxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUNyRCxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRTdEOzs7R0FHRztBQUNILHFCQUFhLHdCQUF5QixZQUFXLGdCQUFnQjs7SUFFN0QsT0FBTyxDQUFDLFNBQVM7SUFDakIsT0FBTyxDQUFDLFFBQVE7SUFGbEIsWUFDVSxTQUFTLEVBQUUsZ0JBQWdCLEVBQzNCLFFBQVEsRUFBRSxlQUFlLEVBQy9CO0lBRUosc0JBQXNCLENBQ3BCLEtBQUssRUFBRSxXQUFXLEVBQ2xCLFFBQVEsRUFBRSwyQkFBMkIsRUFDckMsUUFBUSxFQUFFLGtCQUFrQixHQUFHLFNBQVMsR0FDdkMsT0FBTyxDQUFDLFdBQVcsQ0FBQyxDQVd0QjtJQUVELGtCQUFrQixDQUNoQixLQUFLLEVBQUUsV0FBVyxFQUNsQixRQUFRLEVBQUUsZ0NBQWdDLEVBQzFDLFFBQVEsRUFBRSxZQUFZLEdBQ3JCLE9BQU8sQ0FBQyxtQkFBbUIsQ0FBQyxDQVM5QjtDQXdDRiJ9

package/dest/private/circuit_recording/simulator_recorder_wrapper.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"simulator_recorder_wrapper.d.ts","sourceRoot":"","sources":["../../../src/private/circuit_recording/simulator_recorder_wrapper.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,mBAAmB,CAAC;AAC1E,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,oBAAoB,CAAC;AAEtE,OAAO,KAAK,EAAE,YAAY,EAAqB,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAC5F,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE7D;;;GAGG;AACH,qBAAa,wBAAyB,YAAW,gBAAgB;;IAE7D,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,QAAQ;IAFlB,YACU,SAAS,EAAE,gBAAgB,EAC3B,QAAQ,EAAE,eAAe,EAC/B;IAEJ,sBAAsB,CACpB,KAAK,EAAE,WAAW,EAClB,QAAQ,EAAE,2BAA2B,EACrC,QAAQ,EAAE,kBAAkB,GAAG,SAAS,GACvC,OAAO,CAAC,WAAW,CAAC,CAWtB;IAED,kBAAkB,CAChB,KAAK,EAAE,WAAW,EAClB,QAAQ,EAAE,gCAAgC,EAC1C,QAAQ,EAAE,YAAY,GACrB,OAAO,CAAC,mBAAmB,CAAC,CAS9B;CAwCF"}

package/dest/private/circuit_recording/simulator_recorder_wrapper.js

@@ -0,0 +1,44 @@
+/**
+ * Takes a circuit simulator and wraps it in a circuit recorder. See CircuitRecorder for more details on how circuit
+ * recording works.
+ */ export class SimulatorRecorderWrapper {
+    simulator;
+    recorder;
+    constructor(simulator, recorder){
+        this.simulator = simulator;
+        this.recorder = recorder;
+    }
+    executeProtocolCircuit(input, artifact, callback) {
+        const bytecode = Buffer.from(artifact.bytecode, 'base64');
+        return this.#simulate((wrappedCallback)=>this.simulator.executeProtocolCircuit(input, artifact, wrappedCallback), input, bytecode, artifact.name, 'main', callback);
+    }
+    executeUserCircuit(input, artifact, callback) {
+        return this.#simulate((wrappedCallback)=>this.simulator.executeUserCircuit(input, artifact, wrappedCallback), input, artifact.bytecode, artifact.contractName, artifact.name, callback);
+    }
+    async #simulate(simulateFn, input, bytecode, contractName, functionName, callback) {
+        // Start recording circuit execution
+        await this.recorder.start(input, bytecode, contractName, functionName);
+        // If callback was provided, we wrap it in a circuit recorder callback wrapper
+        const wrappedCallback = this.recorder.wrapCallback(callback);
+        let result;
+        try {
+            result = await simulateFn(wrappedCallback);
+        } catch (error) {
+            // If an error occurs, we finalize the recording file with the error
+            await this.recorder.finishWithError(error);
+            throw error;
+        }
+        // Witness generation is complete so we finish the circuit recorder
+        const recording = await this.recorder.finish();
+        result.oracles = recording.oracleCalls?.reduce((acc, { time, name })=>{
+            if (!acc[name]) {
+                acc[name] = {
+                    times: []
+                };
+            }
+            acc[name].times.push(time);
+            return acc;
+        }, {});
+        return result;
+    }
+}

package/dest/private/circuit_simulator.d.ts

@@ -0,0 +1,35 @@
+import type { ExecutionError, ForeignCallHandler } from '@aztec/noir-acvm_js';
+import type { FunctionArtifactWithContractName } from '@aztec/stdlib/abi';
+import type { NoirCompiledCircuit, NoirCompiledCircuitWithName } from '@aztec/stdlib/noir';
+import { type ACIRCallback, type ACIRExecutionResult } from './acvm/acvm.js';
+import type { ACVMWitness } from './acvm/acvm_types.js';
+import type { ACVMSuccess } from './acvm_native.js';
+/**
+ * Low level simulation interface
+ */
+export interface CircuitSimulator {
+    /**
+     * Execute a protocol circuit/generate a witness
+     * @param input - The initial witness map defining all of the inputs to `circuit`.
+     * @param artifact - ACIR circuit bytecode and its metadata.
+     * @param callback - A callback to process any foreign calls from the circuit. Can be undefined as for native
+     * ACVM simulator we don't process foreign calls.
+     * @returns The solved witness calculated by executing the circuit on the provided inputs.
+     */
+    executeProtocolCircuit(input: ACVMWitness, artifact: NoirCompiledCircuitWithName, callback: ForeignCallHandler | undefined): Promise<ACVMSuccess>;
+    /**
+     * Execute a user circuit (smart contract function)/generate a witness
+     * @param input - The initial witness map defining all of the inputs to `circuit`.
+     * @param artifact - Contract function ACIR circuit bytecode and its metadata.
+     * @param callback - A callback to process any foreign calls from the circuit.
+     * @returns The solved witness calculated by executing the circuit on the provided inputs, as well as the return
+     * witness indices as specified by the circuit.
+     */
+    executeUserCircuit(input: ACVMWitness, artifact: FunctionArtifactWithContractName, callback: ACIRCallback): Promise<ACIRExecutionResult>;
+}
+export type DecodedError = ExecutionError & {
+    decodedAssertionPayload?: any;
+    noirCallStack?: string[];
+};
+export declare function enrichNoirError(artifact: NoirCompiledCircuit, originalError: ExecutionError): DecodedError;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2lyY3VpdF9zaW11bGF0b3IuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wcml2YXRlL2NpcmN1aXRfc2ltdWxhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLGNBQWMsRUFBRSxrQkFBa0IsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBRzlFLE9BQU8sS0FBSyxFQUFFLGdDQUFnQyxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDMUUsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUUzRixPQUFPLEVBQUUsS0FBSyxZQUFZLEVBQUUsS0FBSyxtQkFBbUIsRUFBb0IsTUFBTSxnQkFBZ0IsQ0FBQztBQUMvRixPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN4RCxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUVwRDs7R0FFRztBQUNILE1BQU0sV0FBVyxnQkFBZ0I7SUFDL0I7Ozs7Ozs7T0FPRztJQUNILHNCQUFzQixDQUNwQixLQUFLLEVBQUUsV0FBVyxFQUNsQixRQUFRLEVBQUUsMkJBQTJCLEVBQ3JDLFFBQVEsRUFBRSxrQkFBa0IsR0FBRyxTQUFTLEdBQ3ZDLE9BQU8sQ0FBQyxXQUFXLENBQUMsQ0FBQztJQUV4Qjs7Ozs7OztPQU9HO0lBQ0gsa0JBQWtCLENBQ2hCLEtBQUssRUFBRSxXQUFXLEVBQ2xCLFFBQVEsRUFBRSxnQ0FBZ0MsRUFDMUMsUUFBUSxFQUFFLFlBQVksR0FDckIsT0FBTyxDQUFDLG1CQUFtQixDQUFDLENBQUM7Q0FDakM7QUFFRCxNQUFNLE1BQU0sWUFBWSxHQUFHLGNBQWMsR0FBRztJQUFFLHVCQUF1QixDQUFDLEVBQUUsR0FBRyxDQUFDO0lBQUMsYUFBYSxDQUFDLEVBQUUsTUFBTSxFQUFFLENBQUE7Q0FBRSxDQUFDO0FBSXhHLHdCQUFnQixlQUFlLENBQUMsUUFBUSxFQUFFLG1CQUFtQixFQUFFLGFBQWEsRUFBRSxjQUFjLEdBQUcsWUFBWSxDQTBDMUcifQ==

package/dest/private/circuit_simulator.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"circuit_simulator.d.ts","sourceRoot":"","sources":["../../src/private/circuit_simulator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAG9E,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,mBAAmB,CAAC;AAC1E,OAAO,KAAK,EAAE,mBAAmB,EAAE,2BAA2B,EAAE,MAAM,oBAAoB,CAAC;AAE3F,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,mBAAmB,EAAoB,MAAM,gBAAgB,CAAC;AAC/F,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEpD;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;;;;;;OAOG;IACH,sBAAsB,CACpB,KAAK,EAAE,WAAW,EAClB,QAAQ,EAAE,2BAA2B,EACrC,QAAQ,EAAE,kBAAkB,GAAG,SAAS,GACvC,OAAO,CAAC,WAAW,CAAC,CAAC;IAExB;;;;;;;OAOG;IACH,kBAAkB,CAChB,KAAK,EAAE,WAAW,EAClB,QAAQ,EAAE,gCAAgC,EAC1C,QAAQ,EAAE,YAAY,GACrB,OAAO,CAAC,mBAAmB,CAAC,CAAC;CACjC;AAED,MAAM,MAAM,YAAY,GAAG,cAAc,GAAG;IAAE,uBAAuB,CAAC,EAAE,GAAG,CAAC;IAAC,aAAa,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAIxG,wBAAgB,eAAe,CAAC,QAAQ,EAAE,mBAAmB,EAAE,aAAa,EAAE,cAAc,GAAG,YAAY,CA0C1G"}

package/dest/private/circuit_simulator.js

@@ -0,0 +1,43 @@
+import { abiDecodeError } from '@aztec/noir-noirc_abi';
+import { parseDebugSymbols } from '@aztec/stdlib/abi';
+import { extractCallStack } from './acvm/acvm.js';
+// Payload parsing taken from noir/noir-repo/tooling/noir_js/src/witness_generation.ts.
+// TODO: import this in isolation without having to import noir_js in its entirety.
+export function enrichNoirError(artifact, originalError) {
+    const enrichedError = originalError;
+    if (originalError.rawAssertionPayload) {
+        try {
+            // Decode the payload
+            const decodedPayload = abiDecodeError(artifact.abi, originalError.rawAssertionPayload);
+            if (typeof decodedPayload === 'string') {
+                // If it's a string, just add it to the error message
+                enrichedError.message = `Circuit execution failed: ${decodedPayload}`;
+            } else {
+                // If not, attach the payload to the original error
+                enrichedError.decodedAssertionPayload = decodedPayload;
+            }
+        } catch  {
+        // Ignore errors decoding the payload
+        }
+    }
+    try {
+        // Decode the callstack
+        const callStack = extractCallStack(originalError, {
+            // TODO(https://github.com/AztecProtocol/aztec-packages/issues/5813)
+            // We only support handling debug info for the circuit entry point.
+            // So for now we simply index into the first debug info.
+            debugSymbols: parseDebugSymbols(artifact.debug_symbols)[0],
+            files: artifact.file_map
+        });
+        enrichedError.noirCallStack = callStack?.map((errorLocation)=>{
+            if (typeof errorLocation === 'string') {
+                return `at opcode ${errorLocation}`;
+            } else {
+                return `at ${errorLocation.locationText} (${errorLocation.filePath}:${errorLocation.line}:${errorLocation.column})`;
+            }
+        });
+    } catch  {
+    // Ignore errors resolving the callstack
+    }
+    return enrichedError;
+}

package/dest/private/factory.d.ts

@@ -0,0 +1,12 @@
+import { type Logger } from '@aztec/foundation/log';
+import type { CircuitSimulator } from './circuit_simulator.js';
+export type SimulatorConfig = {
+    acvmBinaryPath?: string;
+    acvmWorkingDirectory?: string;
+};
+export declare function getSimulatorConfigFromEnv(): {
+    acvmWorkingDirectory: string | undefined;
+    acvmBinaryPath: string | undefined;
+};
+export declare function createSimulator(config: SimulatorConfig, logger?: Logger): Promise<CircuitSimulator>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3ByaXZhdGUvZmFjdG9yeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0sdUJBQXVCLENBQUM7QUFNbEUsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUUvRCxNQUFNLE1BQU0sZUFBZSxHQUFHO0lBQzVCLGNBQWMsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUN4QixvQkFBb0IsQ0FBQyxFQUFFLE1BQU0sQ0FBQztDQUMvQixDQUFDO0FBRUYsd0JBQWdCLHlCQUF5Qjs7O0VBTXhDO0FBRUQsd0JBQXNCLGVBQWUsQ0FDbkMsTUFBTSxFQUFFLGVBQWUsRUFDdkIsTUFBTSxHQUFFLE1BQWtDLEdBQ3pDLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxDQWEzQiJ9

package/dest/private/factory.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../src/private/factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAMlE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE/D,MAAM,MAAM,eAAe,GAAG;IAC5B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC/B,CAAC;AAEF,wBAAgB,yBAAyB;;;EAMxC;AAED,wBAAsB,eAAe,CACnC,MAAM,EAAE,eAAe,EACvB,MAAM,GAAE,MAAkC,GACzC,OAAO,CAAC,gBAAgB,CAAC,CAa3B"}

package/dest/private/{providers/factory.js → factory.js}

@@ -2,14 +2,14 @@ import { createLogger } from '@aztec/foundation/log';
 import { promises as fs } from 'fs';
 import { NativeACVMSimulator } from './acvm_native.js';
 import { WASMSimulator } from './acvm_wasm.js';
-export function getSimulationProviderConfigFromEnv() {
+export function getSimulatorConfigFromEnv() {
     const { ACVM_BINARY_PATH, ACVM_WORKING_DIRECTORY } = process.env;
     return {
         acvmWorkingDirectory: ACVM_WORKING_DIRECTORY ? ACVM_WORKING_DIRECTORY : undefined,
         acvmBinaryPath: ACVM_BINARY_PATH ? ACVM_BINARY_PATH : undefined
     };
 }
-export async function createSimulationProvider(config, logger = createLogger('simulator')) {
+export async function createSimulator(config, logger = createLogger('simulator')) {
     if (config.acvmBinaryPath && config.acvmWorkingDirectory) {
         try {
             await fs.access(config.acvmBinaryPath, fs.constants.R_OK);

package/dest/public/avm/avm_context.d.ts

@@ -1,16 +1,16 @@
 import type { Fr } from '@aztec/foundation/fields';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { PublicPersistableStateManager } from '../state_manager/state_manager.js';
 import type { AvmExecutionEnvironment } from './avm_execution_environment.js';
 import { type Gas } from './avm_gas.js';
 import { AvmMachineState } from './avm_machine_state.js';
-import type { AvmSimulator } from './avm_simulator.js';
-import type { AvmPersistableStateManager } from './journal/journal.js';
+import type { AvmSimulatorInterface } from './avm_simulator_interface.js';
 /**
  * An execution context includes the information necessary to initiate AVM
  * execution along with all state maintained by the AVM throughout execution.
  */
 export declare class AvmContext {
-    persistableState: AvmPersistableStateManager;
+    persistableState: PublicPersistableStateManager;
     environment: AvmExecutionEnvironment;
     machineState: AvmMachineState;
     /**
@@ -20,8 +20,8 @@ export declare class AvmContext {
      * @param machineState - VM state that is modified on an instruction-by-instruction basis
      * @returns new AvmContext instance
      */
-    constructor(persistableState: AvmPersistableStateManager, environment: AvmExecutionEnvironment, machineState: AvmMachineState);
-    provideSimulator?: (ctx: this) => Promise<AvmSimulator>;
+    constructor(persistableState: PublicPersistableStateManager, environment: AvmExecutionEnvironment, machineState: AvmMachineState);
+    provideSimulator?: (context: AvmContext) => Promise<AvmSimulatorInterface>;
     /**
      * Prepare a new AVM context that will be ready for an external/nested call
      * - Fork the world state journal
@@ -38,4 +38,4 @@ export declare class AvmContext {
      */
     createNestedContractCallContext(address: AztecAddress, calldata: Fr[], allocatedGas: Gas, callType: 'CALL' | 'STATICCALL'): Promise<AvmContext>;
 }
-//# sourceMappingURL=avm_context.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXZtX2NvbnRleHQuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9wdWJsaWMvYXZtL2F2bV9jb250ZXh0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQ25ELE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBRWhFLE9BQU8sS0FBSyxFQUFFLDZCQUE2QixFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFDdkYsT0FBTyxLQUFLLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUM5RSxPQUFPLEVBQUUsS0FBSyxHQUFHLEVBQWdCLE1BQU0sY0FBYyxDQUFDO0FBQ3RELE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUN6RCxPQUFPLEtBQUssRUFBRSxxQkFBcUIsRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBRTFFOzs7R0FHRztBQUNILHFCQUFhLFVBQVU7SUFTWixnQkFBZ0IsRUFBRSw2QkFBNkI7SUFDL0MsV0FBVyxFQUFFLHVCQUF1QjtJQUNwQyxZQUFZLEVBQUUsZUFBZTtJQVZ0Qzs7Ozs7O09BTUc7SUFDSCxZQUNTLGdCQUFnQixFQUFFLDZCQUE2QixFQUMvQyxXQUFXLEVBQUUsdUJBQXVCLEVBQ3BDLFlBQVksRUFBRSxlQUFlLEVBQ2xDO0lBSUcsZ0JBQWdCLENBQUMsRUFBRSxDQUFDLE9BQU8sRUFBRSxVQUFVLEtBQUssT0FBTyxDQUFDLHFCQUFxQixDQUFDLENBQUM7SUFFbEY7Ozs7Ozs7Ozs7Ozs7T0FhRztJQUNVLCtCQUErQixDQUMxQyxPQUFPLEVBQUUsWUFBWSxFQUNyQixRQUFRLEVBQUUsRUFBRSxFQUFFLEVBQ2QsWUFBWSxFQUFFLEdBQUcsRUFDakIsUUFBUSxFQUFFLE1BQU0sR0FBRyxZQUFZLEdBQzlCLE9BQU8sQ0FBQyxVQUFVLENBQUMsQ0FTckI7Q0FDRiJ9

package/dest/public/avm/avm_context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"avm_context.d.ts","sourceRoot":"","sources":["../../../src/public/avm/avm_context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAC9E,OAAO,EAAE,KAAK,GAAG,EAAgB,MAAM,cAAc,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,sBAAsB,CAAC;AAEvE;;;GAGG;AACH,qBAAa,UAAU;IASZ,gBAAgB,EAAE,0BAA0B;IAC5C,WAAW,EAAE,uBAAuB;IACpC,YAAY,EAAE,eAAe;IAVtC;;;;;;OAMG;gBAEM,gBAAgB,EAAE,0BAA0B,EAC5C,WAAW,EAAE,uBAAuB,EACpC,YAAY,EAAE,eAAe;IAK/B,gBAAgB,CAAC,EAAE,CAAC,GAAG,EAAE,IAAI,KAAK,OAAO,CAAC,YAAY,CAAC,CAAC;IAE/D;;;;;;;;;;;;;OAaG;IACU,+BAA+B,CAC1C,OAAO,EAAE,YAAY,EACrB,QAAQ,EAAE,EAAE,EAAE,EACd,YAAY,EAAE,GAAG,EACjB,QAAQ,EAAE,MAAM,GAAG,YAAY,GAC9B,OAAO,CAAC,UAAU,CAAC;CAUvB"}
+{"version":3,"file":"avm_context.d.ts","sourceRoot":"","sources":["../../../src/public/avm/avm_context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,mCAAmC,CAAC;AACvF,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAC9E,OAAO,EAAE,KAAK,GAAG,EAAgB,MAAM,cAAc,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAE1E;;;GAGG;AACH,qBAAa,UAAU;IASZ,gBAAgB,EAAE,6BAA6B;IAC/C,WAAW,EAAE,uBAAuB;IACpC,YAAY,EAAE,eAAe;IAVtC;;;;;;OAMG;IACH,YACS,gBAAgB,EAAE,6BAA6B,EAC/C,WAAW,EAAE,uBAAuB,EACpC,YAAY,EAAE,eAAe,EAClC;IAIG,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE,UAAU,KAAK,OAAO,CAAC,qBAAqB,CAAC,CAAC;IAElF;;;;;;;;;;;;;OAaG;IACU,+BAA+B,CAC1C,OAAO,EAAE,YAAY,EACrB,QAAQ,EAAE,EAAE,EAAE,EACd,YAAY,EAAE,GAAG,EACjB,QAAQ,EAAE,MAAM,GAAG,YAAY,GAC9B,OAAO,CAAC,UAAU,CAAC,CASrB;CACF"}

package/dest/public/avm/avm_contract_call_result.d.ts

@@ -11,7 +11,8 @@ export declare class AvmContractCallResult {
     output: Fr[];
     gasLeft: AvmGas;
     revertReason?: AvmRevertReason | undefined;
-    constructor(reverted: boolean, output: Fr[], gasLeft: AvmGas, revertReason?: AvmRevertReason | undefined);
+    totalInstructions: number;
+    constructor(reverted: boolean, output: Fr[], gasLeft: AvmGas, revertReason?: AvmRevertReason | undefined, totalInstructions?: number);
     toString(): string;
     finalize(): AvmFinalizedCallResult;
 }
@@ -24,7 +25,8 @@ export declare class AvmFinalizedCallResult {
     output: Fr[];
     gasLeft: Gas;
     revertReason?: SimulationError | undefined;
-    constructor(reverted: boolean, output: Fr[], gasLeft: Gas, revertReason?: SimulationError | undefined);
+    totalInstructions: number;
+    constructor(reverted: boolean, output: Fr[], gasLeft: Gas, revertReason?: SimulationError | undefined, totalInstructions?: number);
     toString(): string;
 }
-//# sourceMappingURL=avm_contract_call_result.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXZtX2NvbnRyYWN0X2NhbGxfcmVzdWx0LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcHVibGljL2F2bS9hdm1fY29udHJhY3RfY2FsbF9yZXN1bHQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsRUFBRSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDbkQsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDNUQsT0FBTyxFQUFFLEdBQUcsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBS3hDLE9BQU8sS0FBSyxFQUFFLEdBQUcsSUFBSSxNQUFNLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFDbEQsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBRW5EOztHQUVHO0FBQ0gscUJBQWEscUJBQXFCO0lBRXZCLFFBQVEsRUFBRSxPQUFPO0lBQ2pCLE1BQU0sRUFBRSxFQUFFLEVBQUU7SUFDWixPQUFPLEVBQUUsTUFBTTtJQUNmLFlBQVksQ0FBQztJQUNiLGlCQUFpQixFQUFFLE1BQU07SUFMbEMsWUFDUyxRQUFRLEVBQUUsT0FBTyxFQUNqQixNQUFNLEVBQUUsRUFBRSxFQUFFLEVBQ1osT0FBTyxFQUFFLE1BQU0sRUFDZixZQUFZLENBQUMsNkJBQWlCLEVBQzlCLGlCQUFpQixHQUFFLE1BQVUsRUFDbEM7SUFFSixRQUFRLElBQUksTUFBTSxDQVFqQjtJQUVELFFBQVEsSUFBSSxzQkFBc0IsQ0FTakM7Q0FDRjtBQUVEOzs7R0FHRztBQUNILHFCQUFhLHNCQUFzQjtJQUV4QixRQUFRLEVBQUUsT0FBTztJQUNqQixNQUFNLEVBQUUsRUFBRSxFQUFFO0lBQ1osT0FBTyxFQUFFLEdBQUc7SUFDWixZQUFZLENBQUM7SUFDYixpQkFBaUIsRUFBRSxNQUFNO0lBTGxDLFlBQ1MsUUFBUSxFQUFFLE9BQU8sRUFDakIsTUFBTSxFQUFFLEVBQUUsRUFBRSxFQUNaLE9BQU8sRUFBRSxHQUFHLEVBQ1osWUFBWSxDQUFDLDZCQUFpQixFQUM5QixpQkFBaUIsR0FBRSxNQUFVLEVBQ2xDO0lBRUosUUFBUSxJQUFJLE1BQU0sQ0FRakI7Q0FDRiJ9

package/dest/public/avm/avm_contract_call_result.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"avm_contract_call_result.d.ts","sourceRoot":"","sources":["../../../src/public/avm/avm_contract_call_result.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAKxC,OAAO,KAAK,EAAE,GAAG,IAAI,MAAM,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD;;GAEG;AACH,qBAAa,qBAAqB;IAEvB,QAAQ,EAAE,OAAO;IACjB,MAAM,EAAE,EAAE,EAAE;IACZ,OAAO,EAAE,MAAM;IACf,YAAY,CAAC;gBAHb,QAAQ,EAAE,OAAO,EACjB,MAAM,EAAE,EAAE,EAAE,EACZ,OAAO,EAAE,MAAM,EACf,YAAY,CAAC,6BAAiB;IAGvC,QAAQ,IAAI,MAAM;IAQlB,QAAQ,IAAI,sBAAsB;CAInC;AAED;;;GAGG;AACH,qBAAa,sBAAsB;IAExB,QAAQ,EAAE,OAAO;IACjB,MAAM,EAAE,EAAE,EAAE;IACZ,OAAO,EAAE,GAAG;IACZ,YAAY,CAAC;gBAHb,QAAQ,EAAE,OAAO,EACjB,MAAM,EAAE,EAAE,EAAE,EACZ,OAAO,EAAE,GAAG,EACZ,YAAY,CAAC,6BAAiB;IAGvC,QAAQ,IAAI,MAAM;CAOnB"}
+{"version":3,"file":"avm_contract_call_result.d.ts","sourceRoot":"","sources":["../../../src/public/avm/avm_contract_call_result.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAKxC,OAAO,KAAK,EAAE,GAAG,IAAI,MAAM,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD;;GAEG;AACH,qBAAa,qBAAqB;IAEvB,QAAQ,EAAE,OAAO;IACjB,MAAM,EAAE,EAAE,EAAE;IACZ,OAAO,EAAE,MAAM;IACf,YAAY,CAAC;IACb,iBAAiB,EAAE,MAAM;IALlC,YACS,QAAQ,EAAE,OAAO,EACjB,MAAM,EAAE,EAAE,EAAE,EACZ,OAAO,EAAE,MAAM,EACf,YAAY,CAAC,6BAAiB,EAC9B,iBAAiB,GAAE,MAAU,EAClC;IAEJ,QAAQ,IAAI,MAAM,CAQjB;IAED,QAAQ,IAAI,sBAAsB,CASjC;CACF;AAED;;;GAGG;AACH,qBAAa,sBAAsB;IAExB,QAAQ,EAAE,OAAO;IACjB,MAAM,EAAE,EAAE,EAAE;IACZ,OAAO,EAAE,GAAG;IACZ,YAAY,CAAC;IACb,iBAAiB,EAAE,MAAM;IALlC,YACS,QAAQ,EAAE,OAAO,EACjB,MAAM,EAAE,EAAE,EAAE,EACZ,OAAO,EAAE,GAAG,EACZ,YAAY,CAAC,6BAAiB,EAC9B,iBAAiB,GAAE,MAAU,EAClC;IAEJ,QAAQ,IAAI,MAAM,CAQjB;CACF"}

package/dest/public/avm/avm_contract_call_result.js

@@ -8,22 +8,24 @@ import { createSimulationError } from '../../common/errors.js';
     output;
     gasLeft;
     revertReason;
-    constructor(reverted, output, gasLeft, revertReason){
+    totalInstructions;
+    constructor(reverted, output, gasLeft, revertReason, totalInstructions = 0){
         this.reverted = reverted;
         this.output = output;
         this.gasLeft = gasLeft;
         this.revertReason = revertReason;
+        this.totalInstructions = totalInstructions;
     }
     toString() {
-        let resultsStr = `reverted: ${this.reverted}, output: ${this.output}, gasLeft: ${inspect(this.gasLeft)}`;
+        let resultsStr = `reverted: ${this.reverted}, output: ${this.output}, gasLeft: ${inspect(this.gasLeft)}, totalInstructions: ${this.totalInstructions}`;
         if (this.revertReason) {
-            resultsStr += `, revertReason: ${this.revertReason}`;
+            resultsStr += `, revertReason: ${this.revertReason.message}`;
         }
         return resultsStr;
     }
     finalize() {
         const revertReason = this.revertReason ? createSimulationError(this.revertReason, this.output) : undefined;
-        return new AvmFinalizedCallResult(this.reverted, this.output, Gas.from(this.gasLeft), revertReason);
+        return new AvmFinalizedCallResult(this.reverted, this.output, Gas.from(this.gasLeft), revertReason, this.totalInstructions);
     }
 }
 /**
@@ -34,16 +36,18 @@ import { createSimulationError } from '../../common/errors.js';
     output;
     gasLeft;
     revertReason;
-    constructor(reverted, output, gasLeft, revertReason){
+    totalInstructions;
+    constructor(reverted, output, gasLeft, revertReason, totalInstructions = 0){
         this.reverted = reverted;
         this.output = output;
         this.gasLeft = gasLeft;
         this.revertReason = revertReason;
+        this.totalInstructions = totalInstructions;
     }
     toString() {
-        let resultsStr = `reverted: ${this.reverted}, output: ${this.output}, gasLeft: ${inspect(this.gasLeft)}`;
+        let resultsStr = `reverted: ${this.reverted}, output: ${this.output}, gasLeft: ${inspect(this.gasLeft)}, totalInstructions: ${this.totalInstructions}`;
         if (this.revertReason) {
-            resultsStr += `, revertReason: ${this.revertReason}`;
+            resultsStr += `, revertReason: ${this.revertReason.message}`;
         }
         return resultsStr;
     }

package/dest/public/avm/avm_execution_environment.d.ts

@@ -1,4 +1,5 @@
 import { Fr } from '@aztec/foundation/fields';
+import type { PublicSimulatorConfig } from '@aztec/stdlib/avm';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { GlobalVariables } from '@aztec/stdlib/tx';
 /**
@@ -13,9 +14,10 @@ export declare class AvmExecutionEnvironment {
     readonly globals: GlobalVariables;
     readonly isStaticCall: boolean;
     readonly calldata: Fr[];
-    constructor(address: AztecAddress, sender: AztecAddress, contractCallDepth: Fr, transactionFee: Fr, globals: GlobalVariables, isStaticCall: boolean, calldata: Fr[]);
+    readonly config: PublicSimulatorConfig;
+    constructor(address: AztecAddress, sender: AztecAddress, contractCallDepth: Fr, transactionFee: Fr, globals: GlobalVariables, isStaticCall: boolean, calldata: Fr[], config: PublicSimulatorConfig);
     private deriveEnvironmentForNestedCallInternal;
     deriveEnvironmentForNestedCall(targetAddress: AztecAddress, calldata: Fr[]): AvmExecutionEnvironment;
     deriveEnvironmentForNestedStaticCall(targetAddress: AztecAddress, calldata: Fr[]): AvmExecutionEnvironment;
 }
-//# sourceMappingURL=avm_execution_environment.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXZtX2V4ZWN1dGlvbl9lbnZpcm9ubWVudC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3B1YmxpYy9hdm0vYXZtX2V4ZWN1dGlvbl9lbnZpcm9ubWVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDOUMsT0FBTyxLQUFLLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUMvRCxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUV4RDs7O0dBR0c7QUFDSCxxQkFBYSx1QkFBdUI7YUFFaEIsT0FBTyxFQUFFLFlBQVk7YUFDckIsTUFBTSxFQUFFLFlBQVk7YUFDcEIsaUJBQWlCLEVBQUUsRUFBRTthQUNyQixjQUFjLEVBQUUsRUFBRTthQUNsQixPQUFPLEVBQUUsZUFBZTthQUN4QixZQUFZLEVBQUUsT0FBTzthQUNyQixRQUFRLEVBQUUsRUFBRSxFQUFFO2FBQ2QsTUFBTSxFQUFFLHFCQUFxQjtJQVIvQyxZQUNrQixPQUFPLEVBQUUsWUFBWSxFQUNyQixNQUFNLEVBQUUsWUFBWSxFQUNwQixpQkFBaUIsRUFBRSxFQUFFLEVBQ3JCLGNBQWMsRUFBRSxFQUFFLEVBQ2xCLE9BQU8sRUFBRSxlQUFlLEVBQ3hCLFlBQVksRUFBRSxPQUFPLEVBQ3JCLFFBQVEsRUFBRSxFQUFFLEVBQUUsRUFDZCxNQUFNLEVBQUUscUJBQXFCLEVBQzNDO0lBRUosT0FBTyxDQUFDLHNDQUFzQztJQWlCdkMsOEJBQThCLENBQUMsYUFBYSxFQUFFLFlBQVksRUFBRSxRQUFRLEVBQUUsRUFBRSxFQUFFLEdBQUcsdUJBQXVCLENBRTFHO0lBRU0sb0NBQW9DLENBQUMsYUFBYSxFQUFFLFlBQVksRUFBRSxRQUFRLEVBQUUsRUFBRSxFQUFFLEdBQUcsdUJBQXVCLENBRWhIO0NBQ0YifQ==

package/dest/public/avm/avm_execution_environment.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"avm_execution_environment.d.ts","sourceRoot":"","sources":["../../../src/public/avm/avm_execution_environment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAExD;;;GAGG;AACH,qBAAa,uBAAuB;aAEhB,OAAO,EAAE,YAAY;aACrB,MAAM,EAAE,YAAY;aACpB,iBAAiB,EAAE,EAAE;aACrB,cAAc,EAAE,EAAE;aAClB,OAAO,EAAE,eAAe;aACxB,YAAY,EAAE,OAAO;aACrB,QAAQ,EAAE,EAAE,EAAE;gBANd,OAAO,EAAE,YAAY,EACrB,MAAM,EAAE,YAAY,EACpB,iBAAiB,EAAE,EAAE,EACrB,cAAc,EAAE,EAAE,EAClB,OAAO,EAAE,eAAe,EACxB,YAAY,EAAE,OAAO,EACrB,QAAQ,EAAE,EAAE,EAAE;IAGhC,OAAO,CAAC,sCAAsC;IAYvC,8BAA8B,CAAC,aAAa,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE,EAAE,GAAG,uBAAuB;IAIpG,oCAAoC,CAAC,aAAa,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE,EAAE,GAAG,uBAAuB;CAGlH"}
+{"version":3,"file":"avm_execution_environment.d.ts","sourceRoot":"","sources":["../../../src/public/avm/avm_execution_environment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC/D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAExD;;;GAGG;AACH,qBAAa,uBAAuB;aAEhB,OAAO,EAAE,YAAY;aACrB,MAAM,EAAE,YAAY;aACpB,iBAAiB,EAAE,EAAE;aACrB,cAAc,EAAE,EAAE;aAClB,OAAO,EAAE,eAAe;aACxB,YAAY,EAAE,OAAO;aACrB,QAAQ,EAAE,EAAE,EAAE;aACd,MAAM,EAAE,qBAAqB;IAR/C,YACkB,OAAO,EAAE,YAAY,EACrB,MAAM,EAAE,YAAY,EACpB,iBAAiB,EAAE,EAAE,EACrB,cAAc,EAAE,EAAE,EAClB,OAAO,EAAE,eAAe,EACxB,YAAY,EAAE,OAAO,EACrB,QAAQ,EAAE,EAAE,EAAE,EACd,MAAM,EAAE,qBAAqB,EAC3C;IAEJ,OAAO,CAAC,sCAAsC;IAiBvC,8BAA8B,CAAC,aAAa,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE,EAAE,GAAG,uBAAuB,CAE1G;IAEM,oCAAoC,CAAC,aAAa,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE,EAAE,GAAG,uBAAuB,CAEhH;CACF"}

package/dest/public/avm/avm_execution_environment.js

@@ -10,7 +10,8 @@ import { Fr } from '@aztec/foundation/fields';
     globals;
     isStaticCall;
     calldata;
-    constructor(address, sender, contractCallDepth, transactionFee, globals, isStaticCall, calldata){
+    config;
+    constructor(address, sender, contractCallDepth, transactionFee, globals, isStaticCall, calldata, config){
         this.address = address;
         this.sender = sender;
         this.contractCallDepth = contractCallDepth;
@@ -18,9 +19,10 @@ import { Fr } from '@aztec/foundation/fields';
         this.globals = globals;
         this.isStaticCall = isStaticCall;
         this.calldata = calldata;
+        this.config = config;
     }
     deriveEnvironmentForNestedCallInternal(targetAddress, calldata, isStaticCall) {
-        return new AvmExecutionEnvironment(/*address=*/ targetAddress, /*sender=*/ this.address, this.contractCallDepth.add(Fr.ONE), this.transactionFee, this.globals, isStaticCall, calldata);
+        return new AvmExecutionEnvironment(/*address=*/ targetAddress, /*sender=*/ this.address, this.contractCallDepth.add(Fr.ONE), this.transactionFee, this.globals, isStaticCall, calldata, this.config);
     }
     deriveEnvironmentForNestedCall(targetAddress, calldata) {
         return this.deriveEnvironmentForNestedCallInternal(targetAddress, calldata, /*isStaticCall=*/ false);

package/dest/public/avm/avm_gas.d.ts

@@ -36,25 +36,9 @@ export declare const EmptyGas: Gas;
 export declare const GAS_DIMENSIONS: readonly ["l2Gas", "daGas"];
 /** Returns the fixed base gas cost for a given opcode. */
 export declare function getBaseGasCost(opcode: Opcode): Gas;
+export declare function computeAddressingCost(indirectOperandsCount: number, relativeOperandsCount: number): Gas;
 export declare function getDynamicGasCost(opcode: Opcode): Gas;
-/** Returns the gas cost associated with the memory operations performed. */
-export declare function getMemoryGasCost(args: {
-    reads?: number;
-    writes?: number;
-    indirect?: number;
-}): {
-    l2Gas: number;
-    daGas: number;
-};
-/** Constants used in base cost calculations. */
-export declare const GAS_COST_CONSTANTS: {
-    MEMORY_READ: number;
-    MEMORY_INDIRECT_READ_PENALTY: number;
-    MEMORY_WRITE: number;
-};
-/** Returns gas cost for an operation on a given type tag based on the base cost per byte. */
-export declare function getGasCostForTypeTag(tag: TypeTag, baseCost: Gas): {
-    l2Gas: number;
-    daGas: number;
-};
-//# sourceMappingURL=avm_gas.d.ts.map
+/** Returns a multiplier based on the byte size of the type represented by the integer tag.
+ * Used to account for necessary rows in the bitwise trace. Throws on invalid. */
+export declare function getBitwiseDynamicGasMultiplier(tag: TypeTag): 0 | 1 | 2 | 4 | 8 | 16;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXZtX2dhcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3B1YmxpYy9hdm0vYXZtX2dhcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFaEQsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLDhDQUE4QyxDQUFDO0FBRXRFLHNDQUFzQztBQUN0QyxNQUFNLE1BQU0sR0FBRyxHQUFHO0lBQ2hCLEtBQUssRUFBRSxNQUFNLENBQUM7SUFDZCxLQUFLLEVBQUUsTUFBTSxDQUFDO0NBQ2YsQ0FBQztBQUVGLCtDQUErQztBQUMvQyx3QkFBZ0IsWUFBWSxDQUFDLEdBQUcsRUFBRSxHQUFHOzs7RUFFcEM7QUFFRCwrQ0FBK0M7QUFDL0Msd0JBQWdCLFlBQVksQ0FBQyxPQUFPLEVBQUU7SUFBRSxTQUFTLEVBQUUsTUFBTSxDQUFDO0lBQUMsU0FBUyxFQUFFLE1BQU0sQ0FBQTtDQUFFOzs7RUFFN0U7QUFFRCw4RUFBOEU7QUFDOUUsd0JBQWdCLE9BQU8sQ0FBQyxPQUFPLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQzs7O0VBRTVDO0FBRUQsK0NBQStDO0FBQy9DLHdCQUFnQixNQUFNLENBQUMsR0FBRyxLQUFLLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxFQUFFLE9BUTlDO0FBRUQsNkNBQTZDO0FBQzdDLHdCQUFnQixNQUFNLENBQUMsR0FBRyxFQUFFLE9BQU8sQ0FBQyxHQUFHLENBQUMsRUFBRSxNQUFNLEVBQUUsTUFBTTs7O0VBRXZEO0FBRUQsMENBQTBDO0FBQzFDLGVBQU8sTUFBTSxRQUFRLEVBQUUsR0FHdEIsQ0FBQztBQU1GLCtDQUErQztBQUMvQyxlQUFPLE1BQU0sY0FBYyw2QkFBOEIsQ0FBQztBQXlGMUQsMERBQTBEO0FBQzFELHdCQUFnQixjQUFjLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxHQUFHLENBRWxEO0FBRUQsd0JBQWdCLHFCQUFxQixDQUFDLHFCQUFxQixFQUFFLE1BQU0sRUFBRSxxQkFBcUIsRUFBRSxNQUFNLEdBQUcsR0FBRyxDQU92RztBQUVELHdCQUFnQixpQkFBaUIsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLEdBQUcsQ0FFckQ7QUFFRDtpRkFDaUY7QUFDakYsd0JBQWdCLDhCQUE4QixDQUFDLEdBQUcsRUFBRSxPQUFPLDBCQW1CMUQifQ==

package/dest/public/avm/avm_gas.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"avm_gas.d.ts","sourceRoot":"","sources":["../../../src/public/avm/avm_gas.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAGhD,OAAO,EAAE,MAAM,EAAE,MAAM,8CAA8C,CAAC;AAEtE,sCAAsC;AACtC,MAAM,MAAM,GAAG,GAAG;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,+CAA+C;AAC/C,wBAAgB,YAAY,CAAC,GAAG,EAAE,GAAG;;;EAEpC;AAED,+CAA+C;AAC/C,wBAAgB,YAAY,CAAC,OAAO,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE;;;EAE7E;AAED,8EAA8E;AAC9E,wBAAgB,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC;;;EAE5C;AAED,+CAA+C;AAC/C,wBAAgB,MAAM,CAAC,GAAG,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,EAAE,OAQ9C;AAED,6CAA6C;AAC7C,wBAAgB,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,MAAM;;;EAEvD;AAED,0CAA0C;AAC1C,eAAO,MAAM,QAAQ,EAAE,GAGtB,CAAC;AAMF,+CAA+C;AAC/C,eAAO,MAAM,cAAc,6BAA8B,CAAC;AAuF1D,0DAA0D;AAC1D,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,CAElD;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,CAErD;AAED,4EAA4E;AAC5E,wBAAgB,gBAAgB,CAAC,IAAI,EAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE;;;EAQ5F;AAED,gDAAgD;AAChD,eAAO,MAAM,kBAAkB;;;;CAI9B,CAAC;AAEF,6FAA6F;AAC7F,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG;;;EAE/D"}
+{"version":3,"file":"avm_gas.d.ts","sourceRoot":"","sources":["../../../src/public/avm/avm_gas.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAEhD,OAAO,EAAE,MAAM,EAAE,MAAM,8CAA8C,CAAC;AAEtE,sCAAsC;AACtC,MAAM,MAAM,GAAG,GAAG;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,+CAA+C;AAC/C,wBAAgB,YAAY,CAAC,GAAG,EAAE,GAAG;;;EAEpC;AAED,+CAA+C;AAC/C,wBAAgB,YAAY,CAAC,OAAO,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE;;;EAE7E;AAED,8EAA8E;AAC9E,wBAAgB,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC;;;EAE5C;AAED,+CAA+C;AAC/C,wBAAgB,MAAM,CAAC,GAAG,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,EAAE,OAQ9C;AAED,6CAA6C;AAC7C,wBAAgB,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,MAAM;;;EAEvD;AAED,0CAA0C;AAC1C,eAAO,MAAM,QAAQ,EAAE,GAGtB,CAAC;AAMF,+CAA+C;AAC/C,eAAO,MAAM,cAAc,6BAA8B,CAAC;AAyF1D,0DAA0D;AAC1D,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,CAElD;AAED,wBAAgB,qBAAqB,CAAC,qBAAqB,EAAE,MAAM,EAAE,qBAAqB,EAAE,MAAM,GAAG,GAAG,CAOvG;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,CAErD;AAED;iFACiF;AACjF,wBAAgB,8BAA8B,CAAC,GAAG,EAAE,OAAO,0BAmB1D"}