@aztec/simulator 0.0.0-test.1 → 0.0.1-commit.24de95ac

package/README.md

@@ -47,3 +47,9 @@ Same steps as any other library. They are detailed [here](../README.md#developme
 ### Testing
 
 Same steps as any other library. They are detailed [here](../README.md#tests)
+
+### Benchmarking
+
+```
+LOG_LEVEL=info yarn test src/public/public_tx_simulator/apps_tests/bench.test.ts
+```

package/dest/client.d.ts

@@ -1,5 +1,7 @@
-export * from './private/index.js';
-export { WASMSimulator } from './private/providers/acvm_wasm.js';
-export { type SimulationProvider } from './private/providers/simulation_provider.js';
+export * from './private/acvm/index.js';
+export { WASMSimulator } from './private/acvm_wasm.js';
+export { SimulatorRecorderWrapper } from './private/circuit_recording/simulator_recorder_wrapper.js';
+export { MemoryCircuitRecorder } from './private/circuit_recording/memory_circuit_recorder.js';
+export { type CircuitSimulator, type DecodedError } from './private/circuit_simulator.js';
 export * from './common/index.js';
 //# sourceMappingURL=client.d.ts.map

package/dest/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,4CAA4C,CAAC;AACrF,cAAc,mBAAmB,CAAC"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,wBAAwB,EAAE,MAAM,2DAA2D,CAAC;AACrG,OAAO,EAAE,qBAAqB,EAAE,MAAM,wDAAwD,CAAC;AAC/F,OAAO,EAAE,KAAK,gBAAgB,EAAE,KAAK,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC1F,cAAc,mBAAmB,CAAC"}

package/dest/client.js

@@ -1,3 +1,5 @@
-export * from './private/index.js';
-export { WASMSimulator } from './private/providers/acvm_wasm.js';
+export * from './private/acvm/index.js';
+export { WASMSimulator } from './private/acvm_wasm.js';
+export { SimulatorRecorderWrapper } from './private/circuit_recording/simulator_recorder_wrapper.js';
+export { MemoryCircuitRecorder } from './private/circuit_recording/memory_circuit_recorder.js';
 export * from './common/index.js';

package/dest/common/errors.d.ts

@@ -1,7 +1,7 @@
 import type { Fr } from '@aztec/foundation/fields';
-import type { BrilligFunctionId, FunctionAbi, FunctionDebugMetadata, OpcodeLocation } from '@aztec/stdlib/abi';
+import type { RawAssertionPayload } from '@aztec/noir-acvm_js';
+import type { BrilligFunctionId, DebugFileMap, DebugInfo, FunctionAbi, OpcodeLocation } from '@aztec/stdlib/abi';
 import { type FailingFunction, type NoirCallStack, SimulationError, type SourceCodeLocation } from '@aztec/stdlib/errors';
-import type { RawAssertionPayload } from '@noir-lang/acvm_js';
 /**
  * An error that occurred during the execution of a function.
  * @param message - the error message
@@ -42,12 +42,9 @@ export declare function traverseCauseChain(error: Error, callback: (error: Error
  */
 export declare function createSimulationError(error: Error, revertData?: Fr[]): SimulationError;
 /**
- * Extracts the source code locations for an array of opcode locations
- * @param opcodeLocations - The opcode locations that caused the error.
- * @param debug - The debug metadata of the function.
- * @returns The source code locations.
+ * Resolves the source code locations from an array of opcode locations
  */
-export declare function resolveOpcodeLocations(opcodeLocations: OpcodeLocation[], debug: FunctionDebugMetadata, brilligFunctionId?: BrilligFunctionId): SourceCodeLocation[];
+export declare function resolveOpcodeLocations(opcodeLocations: OpcodeLocation[], debug: DebugInfo, files: DebugFileMap, brilligFunctionId?: BrilligFunctionId): SourceCodeLocation[];
 export declare function resolveAssertionMessage(errorPayload: RawAssertionPayload, abi: FunctionAbi): string | undefined;
 export declare function resolveAssertionMessageFromRevertData(revertData: Fr[], abi: FunctionAbi): string | undefined;
 export declare function resolveAssertionMessageFromError(err: Error, abi: FunctionAbi): string;

package/dest/common/errors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../src/common/errors.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAEnD,OAAO,KAAK,EAAE,iBAAiB,EAAE,WAAW,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC/G,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,aAAa,EAClB,eAAe,EACf,KAAK,kBAAkB,EACxB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAG9D;;;;;;;GAOG;AACH,qBAAa,cAAe,SAAQ,KAAK;IAGrC;;OAEG;IACI,eAAe,EAAE,eAAe;IACvC;;OAEG;IACI,aAAa,CAAC;gBARrB,OAAO,EAAE,MAAM;IACf;;OAEG;IACI,eAAe,EAAE,eAAe;IACvC;;OAEG;IACI,aAAa,CAAC,2BAAe,EACpC,OAAO,CAAC,EAAE,YAAY;CAIzB;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,QAUhF;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,KAAK,EAAE,UAAU,CAAC,EAAE,EAAE,EAAE,GAAG,eAAe,CAgBtF;AAuDD;;;;;GAKG;AACH,wBAAgB,sBAAsB,CACpC,eAAe,EAAE,cAAc,EAAE,EACjC,KAAK,EAAE,qBAAqB,EAC5B,iBAAiB,CAAC,EAAE,iBAAiB,GACpC,kBAAkB,EAAE,CAItB;AAED,wBAAgB,uBAAuB,CAAC,YAAY,EAAE,mBAAmB,EAAE,GAAG,EAAE,WAAW,GAAG,MAAM,GAAG,SAAS,CAW/G;AAED,wBAAgB,qCAAqC,CAAC,UAAU,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,WAAW,GAAG,MAAM,GAAG,SAAS,CAc5G;AAED,wBAAgB,gCAAgC,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,WAAW,GAAG,MAAM,CAMrF"}
+{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../src/common/errors.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAEnD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAE/D,OAAO,KAAK,EACV,iBAAiB,EACjB,YAAY,EACZ,SAAS,EACT,WAAW,EAEX,cAAc,EACf,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,aAAa,EAClB,eAAe,EACf,KAAK,kBAAkB,EACxB,MAAM,sBAAsB,CAAC;AAE9B;;;;;;;GAOG;AACH,qBAAa,cAAe,SAAQ,KAAK;IAGrC;;OAEG;IACI,eAAe,EAAE,eAAe;IACvC;;OAEG;IACI,aAAa,CAAC,EAAE,aAAa;gBARpC,OAAO,EAAE,MAAM;IACf;;OAEG;IACI,eAAe,EAAE,eAAe;IACvC;;OAEG;IACI,aAAa,CAAC,EAAE,aAAa,YAAA,EACpC,OAAO,CAAC,EAAE,YAAY;CAIzB;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,QAUhF;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,KAAK,EAAE,UAAU,CAAC,EAAE,EAAE,EAAE,GAAG,eAAe,CAgBtF;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,eAAe,EAAE,cAAc,EAAE,EACjC,KAAK,EAAE,SAAS,EAChB,KAAK,EAAE,YAAY,EACnB,iBAAiB,CAAC,EAAE,iBAAiB,GACpC,kBAAkB,EAAE,CAkBtB;AAwED,wBAAgB,uBAAuB,CAAC,YAAY,EAAE,mBAAmB,EAAE,GAAG,EAAE,WAAW,GAAG,MAAM,GAAG,SAAS,CAW/G;AAED,wBAAgB,qCAAqC,CAAC,UAAU,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,WAAW,GAAG,MAAM,GAAG,SAAS,CAc5G;AAED,wBAAgB,gCAAgC,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,WAAW,GAAG,MAAM,CAMrF"}

package/dest/common/errors.js

@@ -1,6 +1,6 @@
 import { jsonStringify } from '@aztec/foundation/json-rpc';
+import { abiDecodeError } from '@aztec/noir-noirc_abi';
 import { SimulationError } from '@aztec/stdlib/errors';
-import { abiDecodeError } from '@noir-lang/noirc_abi';
 /**
  * An error that occurred during the execution of a function.
  * @param message - the error message
@@ -56,30 +56,27 @@ import { abiDecodeError } from '@noir-lang/noirc_abi';
     });
 }
 /**
- * Extracts a brillig location from an opcode location.
- * @param opcodeLocation - The opcode location to extract from. It should be in the format `acirLocation.brilligLocation` or `acirLocation`.
- * @returns The brillig location if the opcode location contains one.
- */ function extractBrilligLocation(opcodeLocation) {
-    const splitted = opcodeLocation.split('.');
-    if (splitted.length === 2) {
-        return splitted[1];
-    }
-    return undefined;
-}
-/**
- * Extracts the call stack from the location of a failing opcode and the debug metadata.
- * One opcode can point to multiple calls due to inlining.
- */ function getSourceCodeLocationsFromOpcodeLocation(opcodeLocation, debug, brilligFunctionId) {
-    const { debugSymbols, files } = debug;
-    let callStack = debugSymbols.locations[opcodeLocation] || [];
-    if (callStack.length === 0) {
-        const brilligLocation = extractBrilligLocation(opcodeLocation);
-        if (brilligFunctionId !== undefined && brilligLocation !== undefined) {
-            callStack = debugSymbols.brillig_locations[brilligFunctionId][brilligLocation] || [];
+ * Resolves the source code locations from an array of opcode locations
+ */ export function resolveOpcodeLocations(opcodeLocations, debug, files, brilligFunctionId) {
+    let locations = opcodeLocations.flatMap((opcodeLocation)=>getSourceCodeLocationsFromOpcodeLocation(opcodeLocation, debug, files, brilligFunctionId));
+    // Adds the acir call stack if the last location is a brillig opcode
+    if (locations.length > 0) {
+        const decomposedOpcodeLocation = opcodeLocations[opcodeLocations.length - 1].split('.');
+        if (decomposedOpcodeLocation.length === 2) {
+            const acirCallstackId = debug.acir_locations[decomposedOpcodeLocation[0]];
+            if (acirCallstackId !== undefined) {
+                const callStack = debug.location_tree.locations[acirCallstackId];
+                const acirCallstack = getCallStackFromLocationNode(callStack, debug.location_tree.locations, files);
+                locations = acirCallstack.concat(locations);
+            }
         }
     }
-    return callStack.map((call)=>{
-        const { file: fileId, span } = call;
+    return locations;
+}
+function getCallStackFromLocationNode(callStack, locationTree, files) {
+    const result = [];
+    while(callStack.parent !== null){
+        const { file: fileId, span } = callStack.value;
         const { path, source } = files[fileId];
         const locationText = source.substring(span.start, span.end);
         const precedingText = source.substring(0, span.start);
@@ -87,22 +84,44 @@ import { abiDecodeError } from '@noir-lang/noirc_abi';
         // Lines and columns in stacks are one indexed.
         const line = previousLines.length;
         const column = previousLines[previousLines.length - 1].length + 1;
-        return {
+        // Unshift since we are exploring child nodes first
+        result.unshift({
             filePath: path,
             line,
             column,
             fileSource: source,
             locationText
-        };
-    });
+        });
+        callStack = locationTree[callStack.parent];
+    }
+    return result;
 }
 /**
- * Extracts the source code locations for an array of opcode locations
- * @param opcodeLocations - The opcode locations that caused the error.
- * @param debug - The debug metadata of the function.
- * @returns The source code locations.
- */ export function resolveOpcodeLocations(opcodeLocations, debug, brilligFunctionId) {
-    return opcodeLocations.flatMap((opcodeLocation)=>getSourceCodeLocationsFromOpcodeLocation(opcodeLocation, debug, brilligFunctionId));
+ * Extracts the call stack from the location of a failing opcode and the debug metadata.
+ * One opcode can point to multiple calls due to inlining.
+ */ function getSourceCodeLocationsFromOpcodeLocation(opcodeLocation, debug, files, brilligFunctionId) {
+    let callStackID = debug.acir_locations[opcodeLocation];
+    const brilligLocation = extractBrilligLocation(opcodeLocation);
+    if (brilligFunctionId !== undefined && brilligLocation !== undefined) {
+        callStackID = debug.brillig_locations[brilligFunctionId][brilligLocation];
+        if (callStackID === undefined) {
+            return [];
+        }
+    }
+    if (callStackID === undefined) {
+        return [];
+    }
+    const callStack = debug.location_tree.locations[callStackID];
+    return getCallStackFromLocationNode(callStack, debug.location_tree.locations, files);
+}
+/**
+ * Extracts a brillig location from an opcode location.
+ */ function extractBrilligLocation(opcodeLocation) {
+    const splitted = opcodeLocation.split('.');
+    if (splitted.length === 2) {
+        return splitted[1];
+    }
+    return undefined;
 }
 export function resolveAssertionMessage(errorPayload, abi) {
     const decoded = abiDecodeError({

package/dest/common/index.d.ts

@@ -1,4 +1,3 @@
 export * from './errors.js';
 export * from './stats/index.js';
-export * from './message_load_oracle_inputs.js';
 //# sourceMappingURL=index.d.ts.map

package/dest/common/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/common/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,kBAAkB,CAAC;AACjC,cAAc,iCAAiC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/common/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,kBAAkB,CAAC"}

package/dest/common/index.js

@@ -1,3 +1,2 @@
 export * from './errors.js';
 export * from './stats/index.js';
-export * from './message_load_oracle_inputs.js';

package/dest/private/acvm/acvm.d.ts

@@ -1,14 +1,14 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
+import { type ExecutionError, type ForeignCallInput, type ForeignCallOutput } from '@aztec/noir-acvm_js';
 import type { FunctionDebugMetadata } from '@aztec/stdlib/abi';
 import type { NoirCallStack } from '@aztec/stdlib/errors';
-import { type ExecutionError, type ForeignCallInput, type ForeignCallOutput } from '@noir-lang/acvm_js';
 import type { ACVMWitness } from './acvm_types.js';
-import type { ORACLE_NAMES } from './oracle/index.js';
 /**
  * The callback interface for the ACIR.
  */
-export type ACIRCallback = Record<ORACLE_NAMES, (...args: ForeignCallInput[]) => void | Promise<void> | ForeignCallOutput | ForeignCallOutput[] | Promise<ForeignCallOutput> | Promise<ForeignCallOutput[]>>;
+export type ACIRCallback = Record<string, (...args: ForeignCallInput[]) => Promise<ForeignCallOutput[]>>;
+export type ACIRCallbackStats = {
+    times: number[];
+};
 /**
  * The result of executing an ACIR.
  */
@@ -20,9 +20,15 @@ export interface ACIRExecutionResult {
      */
     partialWitness: ACVMWitness;
     returnWitness: ACVMWitness;
+    oracles?: Record<string, ACIRCallbackStats>;
 }
 /**
  * The function call that executes an ACIR.
+ * @param acir - The ACIR circuit bytecode to execute.
+ * @param initialWitness - The initial witness map defining all of the inputs to `circuit`.
+ * @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.
  */
 export declare function acvm(acir: Buffer, initialWitness: ACVMWitness, callback: ACIRCallback): Promise<ACIRExecutionResult>;
 /**

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

@@ -1 +1 @@
-{"version":3,"file":"acvm.d.ts","sourceRoot":"","sources":["../../../src/private/acvm/acvm.ts"],"names":[],"mappings":";;AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,gBAAgB,EACrB,KAAK,iBAAiB,EAEvB,MAAM,oBAAoB,CAAC;AAG5B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEtD;;GAEG;AACH,MAAM,MAAM,YAAY,GAAG,MAAM,CAC/B,YAAY,EACZ,CACE,GAAG,IAAI,EAAE,gBAAgB,EAAE,KAEzB,IAAI,GACJ,OAAO,CAAC,IAAI,CAAC,GACb,iBAAiB,GACjB,iBAAiB,EAAE,GACnB,OAAO,CAAC,iBAAiB,CAAC,GAC1B,OAAO,CAAC,iBAAiB,EAAE,CAAC,CACjC,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC;;;;OAIG;IACH,cAAc,EAAE,WAAW,CAAC;IAC5B,aAAa,EAAE,WAAW,CAAC;CAC5B;AAED;;GAEG;AACH,wBAAsB,IAAI,CACxB,IAAI,EAAE,MAAM,EACZ,cAAc,EAAE,WAAW,EAC3B,QAAQ,EAAE,YAAY,GACrB,OAAO,CAAC,mBAAmB,CAAC,CAkD9B;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,KAAK,GAAG,cAAc,EAC7B,KAAK,CAAC,EAAE,qBAAqB,GAC5B,aAAa,GAAG,SAAS,CAc3B"}
+{"version":3,"file":"acvm.d.ts","sourceRoot":"","sources":["../../../src/private/acvm/acvm.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,gBAAgB,EACrB,KAAK,iBAAiB,EAEvB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAG1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAEnD;;GAEG;AACH,MAAM,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,gBAAgB,EAAE,KAAK,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC;AAEzG,MAAM,MAAM,iBAAiB,GAAG;IAAE,KAAK,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAEpD;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC;;;;OAIG;IACH,cAAc,EAAE,WAAW,CAAC;IAC5B,aAAa,EAAE,WAAW,CAAC;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;CAC7C;AAED;;;;;;;GAOG;AACH,wBAAsB,IAAI,CACxB,IAAI,EAAE,MAAM,EACZ,cAAc,EAAE,WAAW,EAC3B,QAAQ,EAAE,YAAY,GACrB,OAAO,CAAC,mBAAmB,CAAC,CAwC9B;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,KAAK,GAAG,cAAc,EAC7B,KAAK,CAAC,EAAE,qBAAqB,GAC5B,aAAa,GAAG,SAAS,CAc3B"}

package/dest/private/acvm/acvm.js

@@ -1,29 +1,23 @@
 import { createLogger } from '@aztec/foundation/log';
-import { executeCircuitWithReturnWitness } from '@noir-lang/acvm_js';
+import { executeCircuitWithReturnWitness } from '@aztec/noir-acvm_js';
 import { resolveOpcodeLocations, traverseCauseChain } from '../../common/errors.js';
 /**
  * The function call that executes an ACIR.
+ * @param acir - The ACIR circuit bytecode to execute.
+ * @param initialWitness - The initial witness map defining all of the inputs to `circuit`.
+ * @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.
  */ export async function acvm(acir, initialWitness, callback) {
     const logger = createLogger('simulator:acvm');
-    const solvedAndReturnWitness = await executeCircuitWithReturnWitness(acir, initialWitness, async (name, args)=>{
+    const solvedAndReturnWitness = await executeCircuitWithReturnWitness(acir, initialWitness, (name, args)=>{
         try {
             logger.debug(`Oracle callback ${name}`);
             const oracleFunction = callback[name];
             if (!oracleFunction) {
                 throw new Error(`Oracle callback ${name} not found`);
             }
-            const result = await oracleFunction.call(callback, ...args);
-            if (typeof result === 'undefined') {
-                return [];
-            } else if (result instanceof Array && !result.every((item)=>typeof item === 'string')) {
-                // We are dealing with a nested array which means that we do not need it wrap it in another array as to have
-                // the nested array structure it is already "wrapped".
-                return result;
-            } else {
-                return [
-                    result
-                ];
-            }
+            return oracleFunction.call(callback, ...args);
         } catch (err) {
             let typedError;
             if (err instanceof Error) {
@@ -63,8 +57,8 @@ import { resolveOpcodeLocations, traverseCauseChain } from '../../common/errors.
         return callStack;
     }
     try {
-        return resolveOpcodeLocations(callStack, debug, brilligFunctionId);
-    } catch (err) {
+        return resolveOpcodeLocations(callStack, debug.debugSymbols, debug.files, brilligFunctionId);
+    } catch  {
         return callStack;
     }
 }

package/dest/private/acvm/acvm_types.d.ts

@@ -1,4 +1,4 @@
-import type { WitnessMap } from '@noir-lang/acvm_js';
+import type { WitnessMap } from '@aztec/noir-acvm_js';
 /**
  * ACVMField
  */

package/dest/private/acvm/acvm_types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"acvm_types.d.ts","sourceRoot":"","sources":["../../../src/private/acvm/acvm_types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD;;GAEG;AACH,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC;AAE/B;;GAEG;AACH,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC"}
+{"version":3,"file":"acvm_types.d.ts","sourceRoot":"","sources":["../../../src/private/acvm/acvm_types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEtD;;GAEG;AACH,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC;AAE/B;;GAEG;AACH,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC"}

package/dest/private/acvm/deserialize.d.ts

@@ -1,23 +1,5 @@
 import { Fr } from '@aztec/foundation/fields';
 import type { ACVMField, ACVMWitness } from './acvm_types.js';
-/**
- * Converts an ACVM field to a Fr.
- * @param field - The ACVM field to convert.
- * @returns The Fr.
- */
-export declare function fromACVMField(field: ACVMField): Fr;
-/**
- * Converts a field to a number.
- * @param fr - The field to convert.
- * @returns The number.
- * TODO(#4102): Nuke this once block number is big int.
- */
-export declare function frToNumber(fr: Fr): number;
-/**
- * Converts a field to a boolean.
- * @param fr - The field to convert.
- */
-export declare function frToBoolean(fr: Fr): boolean;
 /**
  * Converts a Noir BoundedVec of Fields into an Fr array. Note that BoundedVecs are structs, and therefore translated as
  * two separate ACVMField values (an array and a single field).
@@ -27,10 +9,27 @@ export declare function frToBoolean(fr: Fr): boolean;
  * @returns An array with the same content as the Noir version. Elements past the length are discarded.
  */
 export declare function fromBoundedVec(storage: ACVMField[], length: ACVMField): Fr[];
+/**
+ * Converts a Noir BoundedVec of unsigned integers into a Buffer. Note that BoundedVecs are structs, and therefore
+ * translated as two separate ACVMField values (an array and a single field).
+ *
+ * @param storage The array with the BoundedVec's storage (i.e. BoundedVec::storage())
+ * @param length The length of the BoundedVec (i.e. BoundedVec::len())
+ * @param uintBitSize If it's an array of Noir u8's, put `8`, etc.
+ * @returns A buffer containing the unsigned integers tightly packed
+ */
+export declare function fromUintBoundedVec(storage: ACVMField[], length: ACVMField, uintBitSize: number): Buffer;
 /**
  * Transforms a witness map to its field elements.
  * @param witness - The witness to extract from.
  * @returns The return values.
  */
 export declare function witnessMapToFields(witness: ACVMWitness): Fr[];
+/**
+ * Converts an array of Noir unsigned integers to a single tightly-packed buffer.
+ * @param uintBitSize If it's an array of Noir u8's, put `8`, etc.
+ * @returns A buffer where each byte is correctly represented as a single byte in the buffer.
+ * Copy of the function in txe/src/util/encoding.ts.
+ */
+export declare function fromUintArray(obj: ACVMField[], uintBitSize: number): Buffer;
 //# sourceMappingURL=deserialize.d.ts.map

package/dest/private/acvm/deserialize.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deserialize.d.ts","sourceRoot":"","sources":["../../../src/private/acvm/deserialize.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9D;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,SAAS,GAAG,EAAE,CAElD;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,EAAE,EAAE,EAAE,GAAG,MAAM,CAEzC;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAE3C;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,SAAS,EAAE,EAAE,MAAM,EAAE,SAAS,GAAG,EAAE,EAAE,CAE5E;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,WAAW,GAAG,EAAE,EAAE,CAG7D"}
+{"version":3,"file":"deserialize.d.ts","sourceRoot":"","sources":["../../../src/private/acvm/deserialize.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAG9C,OAAO,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9D;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,SAAS,EAAE,EAAE,MAAM,EAAE,SAAS,GAAG,EAAE,EAAE,CAE5E;AAED;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,SAAS,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,CAOvG;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,WAAW,GAAG,EAAE,EAAE,CAG7D;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,SAAS,EAAE,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,CAM3E"}

package/dest/private/acvm/deserialize.js

@@ -1,25 +1,5 @@
 import { Fr } from '@aztec/foundation/fields';
-/**
- * Converts an ACVM field to a Fr.
- * @param field - The ACVM field to convert.
- * @returns The Fr.
- */ export function fromACVMField(field) {
-    return Fr.fromBuffer(Buffer.from(field.slice(2), 'hex'));
-}
-/**
- * Converts a field to a number.
- * @param fr - The field to convert.
- * @returns The number.
- * TODO(#4102): Nuke this once block number is big int.
- */ export function frToNumber(fr) {
-    return Number(fr.value);
-}
-/**
- * Converts a field to a boolean.
- * @param fr - The field to convert.
- */ export function frToBoolean(fr) {
-    return fr.toBigInt() === BigInt(1);
-}
+import { hexToBuffer } from '@aztec/foundation/string';
 /**
  * Converts a Noir BoundedVec of Fields into an Fr array. Note that BoundedVecs are structs, and therefore translated as
  * two separate ACVMField values (an array and a single field).
@@ -28,7 +8,23 @@ import { Fr } from '@aztec/foundation/fields';
  * @param length The length of the BoundedVec (i.e. BoundedVec::len())
  * @returns An array with the same content as the Noir version. Elements past the length are discarded.
  */ export function fromBoundedVec(storage, length) {
-    return storage.slice(0, frToNumber(fromACVMField(length))).map(fromACVMField);
+    return storage.slice(0, Fr.fromString(length).toNumber()).map(Fr.fromString);
+}
+/**
+ * Converts a Noir BoundedVec of unsigned integers into a Buffer. Note that BoundedVecs are structs, and therefore
+ * translated as two separate ACVMField values (an array and a single field).
+ *
+ * @param storage The array with the BoundedVec's storage (i.e. BoundedVec::storage())
+ * @param length The length of the BoundedVec (i.e. BoundedVec::len())
+ * @param uintBitSize If it's an array of Noir u8's, put `8`, etc.
+ * @returns A buffer containing the unsigned integers tightly packed
+ */ export function fromUintBoundedVec(storage, length, uintBitSize) {
+    if (uintBitSize % 8 !== 0) {
+        throw new Error(`u${uintBitSize} is not a supported type in Noir`);
+    }
+    const uintByteSize = uintBitSize / 8;
+    const boundedStorage = storage.slice(0, Fr.fromString(length).toNumber());
+    return Buffer.concat(boundedStorage.map((str)=>hexToBuffer(str).subarray(-uintByteSize)));
 }
 /**
  * Transforms a witness map to its field elements.
@@ -38,5 +34,17 @@ import { Fr } from '@aztec/foundation/fields';
     const sortedKeys = [
         ...witness.keys()
     ].sort((a, b)=>a - b);
-    return sortedKeys.map((key)=>witness.get(key)).map(fromACVMField);
+    return sortedKeys.map((key)=>witness.get(key)).map(Fr.fromString);
+}
+/**
+ * Converts an array of Noir unsigned integers to a single tightly-packed buffer.
+ * @param uintBitSize If it's an array of Noir u8's, put `8`, etc.
+ * @returns A buffer where each byte is correctly represented as a single byte in the buffer.
+ * Copy of the function in txe/src/util/encoding.ts.
+ */ export function fromUintArray(obj, uintBitSize) {
+    if (uintBitSize % 8 !== 0) {
+        throw new Error(`u${uintBitSize} is not a supported type in Noir`);
+    }
+    const uintByteSize = uintBitSize / 8;
+    return Buffer.concat(obj.map((str)=>hexToBuffer(str).slice(-uintByteSize)));
 }

package/dest/private/acvm/index.d.ts

@@ -1,6 +1,5 @@
 export { extractCallStack, type ACIRCallback, type ACIRExecutionResult } from './acvm.js';
 export * from './acvm_types.js';
 export * from './deserialize.js';
-export * from './oracle/index.js';
 export * from './serialize.js';
 //# sourceMappingURL=index.d.ts.map

package/dest/private/acvm/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/private/acvm/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,KAAK,YAAY,EAAE,KAAK,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAC1F,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/private/acvm/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,KAAK,YAAY,EAAE,KAAK,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAC1F,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC"}

package/dest/private/acvm/index.js

@@ -1,5 +1,4 @@
 export { extractCallStack } from './acvm.js';
 export * from './acvm_types.js';
 export * from './deserialize.js';
-export * from './oracle/index.js';
 export * from './serialize.js';

package/dest/private/acvm/serialize.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
@@ -21,4 +19,23 @@ export declare function toACVMFieldSingleOrArray(value: Fr | Fr[]): string | str
  * @returns The witness.
  */
 export declare function toACVMWitness(witnessStartIndex: number, fields: Parameters<typeof toACVMField>[0][]): Map<number, string>;
+export declare function bufferToU8Array(buffer: Buffer): ACVMField[];
+export declare function bufferToBoundedVec(buffer: Buffer, maxLen: number): [ACVMField[], ACVMField];
+/**
+ * Converts a ForeignCallArray into a tuple which represents a nr BoundedVec.
+ * If the input array is shorter than the maxLen, it pads the result with zeros,
+ * so that nr can correctly coerce this result into a BoundedVec.
+ * @param bVecStorage - The array underlying the BoundedVec.
+ * @param maxLen - the max length of the BoundedVec.
+ * @returns a tuple representing a BoundedVec.
+ */
+export declare function arrayToBoundedVec(bVecStorage: ACVMField[], maxLen: number): [ACVMField[], ACVMField];
+/**
+ * Converts an array of arrays representing Noir BoundedVec of nested arrays into its Noir serialized form.
+ * @param bVecStorage - The array underlying the BoundedVec.
+ * @param maxLen - The max length of the BoundedVec (max num of the nested arrays in the BoundedVec).
+ * @param nestedArrayLength - The length of the nested arrays (each nested array has to have the same length).
+ * @returns Serialized BoundedVec following Noir intrinsic serialization.
+ */
+export declare function arrayOfArraysToBoundedVecOfArrays(bVecStorage: ACVMField[][], maxLen: number, nestedArrayLength: number): [ACVMField[], ACVMField];
 //# sourceMappingURL=serialize.d.ts.map

package/dest/private/acvm/serialize.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"serialize.d.ts","sourceRoot":"","sources":["../../../src/private/acvm/serialize.ts"],"names":[],"mappings":";;AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAgBjD;;;;GAIG;AACH,wBAAgB,WAAW,CACzB,KAAK,EAAE,YAAY,GAAG,UAAU,GAAG,EAAE,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,SAAS,GACrF,SAAS,CAYX;AAED;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,EAAE,qBAExD;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,iBAAiB,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,uBAKnG"}
+{"version":3,"file":"serialize.d.ts","sourceRoot":"","sources":["../../../src/private/acvm/serialize.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAgBjD;;;;GAIG;AACH,wBAAgB,WAAW,CACzB,KAAK,EAAE,YAAY,GAAG,UAAU,GAAG,EAAE,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,SAAS,GACrF,SAAS,CAYX;AAED;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,EAAE,qBAExD;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,iBAAiB,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,uBAKnG;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,EAAE,CAE3D;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,CAAC,SAAS,EAAE,EAAE,SAAS,CAAC,CAG3F;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,SAAS,EAAE,EAAE,MAAM,EAAE,MAAM,GAAG,CAAC,SAAS,EAAE,EAAE,SAAS,CAAC,CASpG;AAED;;;;;;GAMG;AACH,wBAAgB,iCAAiC,CAC/C,WAAW,EAAE,SAAS,EAAE,EAAE,EAC1B,MAAM,EAAE,MAAM,EACd,iBAAiB,EAAE,MAAM,GACxB,CAAC,SAAS,EAAE,EAAE,SAAS,CAAC,CAsB1B"}

package/dest/private/acvm/serialize.js

@@ -44,3 +44,56 @@ import { Fr } from '@aztec/foundation/fields';
         return witness;
     }, new Map());
 }
+export function bufferToU8Array(buffer) {
+    return Array.from(buffer).map((byte)=>toACVMField(BigInt(byte)));
+}
+export function bufferToBoundedVec(buffer, maxLen) {
+    const u8Array = bufferToU8Array(buffer);
+    return arrayToBoundedVec(u8Array, maxLen);
+}
+/**
+ * Converts a ForeignCallArray into a tuple which represents a nr BoundedVec.
+ * If the input array is shorter than the maxLen, it pads the result with zeros,
+ * so that nr can correctly coerce this result into a BoundedVec.
+ * @param bVecStorage - The array underlying the BoundedVec.
+ * @param maxLen - the max length of the BoundedVec.
+ * @returns a tuple representing a BoundedVec.
+ */ export function arrayToBoundedVec(bVecStorage, maxLen) {
+    if (bVecStorage.length > maxLen) {
+        throw new Error(`Array of length ${bVecStorage.length} larger than maxLen ${maxLen}`);
+    }
+    const lengthDiff = maxLen - bVecStorage.length;
+    const zeroPaddingArray = Array(lengthDiff).fill(toACVMField(BigInt(0)));
+    const storage = bVecStorage.concat(zeroPaddingArray);
+    const len = toACVMField(BigInt(bVecStorage.length));
+    return [
+        storage,
+        len
+    ];
+}
+/**
+ * Converts an array of arrays representing Noir BoundedVec of nested arrays into its Noir serialized form.
+ * @param bVecStorage - The array underlying the BoundedVec.
+ * @param maxLen - The max length of the BoundedVec (max num of the nested arrays in the BoundedVec).
+ * @param nestedArrayLength - The length of the nested arrays (each nested array has to have the same length).
+ * @returns Serialized BoundedVec following Noir intrinsic serialization.
+ */ export function arrayOfArraysToBoundedVecOfArrays(bVecStorage, maxLen, nestedArrayLength) {
+    if (bVecStorage.length > maxLen) {
+        throw new Error(`Array of length ${bVecStorage.length} larger than maxLen ${maxLen}`);
+    }
+    // Check that all nested arrays have length nestedArrayLength
+    if (!bVecStorage.every((nestedArray)=>nestedArray.length === nestedArrayLength)) {
+        throw new Error(`Nested array length passed in from Noir does not correspond to the length obtained in TS: ${nestedArrayLength} !== ${bVecStorage[0].length}`);
+    }
+    // Flatten the array of arrays
+    const flattenedStorage = bVecStorage.flat();
+    // Calculate and add padding
+    const numFieldsToPad = maxLen * nestedArrayLength - flattenedStorage.length;
+    const flattenedStorageWithPadding = flattenedStorage.concat(Array(numFieldsToPad).fill(toACVMField(BigInt(0))));
+    // Return flattened array with padding and length
+    const len = toACVMField(BigInt(bVecStorage.length));
+    return [
+        flattenedStorageWithPadding,
+        len
+    ];
+}

package/dest/private/{providers/acvm_native.d.ts → acvm_native.d.ts}

@@ -1,10 +1,9 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-import type { NoirCompiledCircuit } from '@aztec/stdlib/noir';
-import type { WitnessMap } from '@noir-lang/types';
-import type { ACIRCallback, ACIRExecutionResult } from '../acvm/acvm.js';
-import type { ACVMWitness } from '../acvm/acvm_types.js';
-import type { SimulationProvider } from './simulation_provider.js';
+import type { ForeignCallHandler, WitnessMap } 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 { CircuitSimulator } from './circuit_simulator.js';
 export declare enum ACVM_RESULT {
     SUCCESS = 0,
     FAILURE = 1
@@ -29,12 +28,12 @@ export type ACVMResult = ACVMSuccess | ACVMFailure;
  * @returns The completed partial witness outputted from the circuit
  */
 export declare function executeNativeCircuit(inputWitness: WitnessMap, bytecode: Buffer, workingDirectory: string, pathToAcvm: string, outputFilename?: string): Promise<ACVMResult>;
-export declare class NativeACVMSimulator implements SimulationProvider {
+export declare class NativeACVMSimulator implements CircuitSimulator {
     private workingDirectory;
     private pathToAcvm;
     private witnessFilename?;
     constructor(workingDirectory: string, pathToAcvm: string, witnessFilename?: string | undefined);
-    executeProtocolCircuit(input: WitnessMap, compiledCircuit: NoirCompiledCircuit): Promise<WitnessMap>;
-    executeUserCircuit(_acir: Buffer, _initialWitness: ACVMWitness, _callback: ACIRCallback): Promise<ACIRExecutionResult>;
+    executeProtocolCircuit(input: ACVMWitness, artifact: NoirCompiledCircuitWithName, callback: ForeignCallHandler | undefined): Promise<ACVMSuccess>;
+    executeUserCircuit(_input: ACVMWitness, _artifact: FunctionArtifactWithContractName, _callback: ACIRCallback): Promise<ACIRExecutionResult>;
 }
 //# sourceMappingURL=acvm_native.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"acvm_native.d.ts","sourceRoot":"","sources":["../../src/private/acvm_native.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,kBAAkB,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAC1E,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,mBAAmB,CAAC;AAC1E,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,oBAAoB,CAAC;AAKtE,OAAO,KAAK,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACxE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAI/D,oBAAY,WAAW;IACrB,OAAO,IAAA;IACP,OAAO,IAAA;CACR;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC;IAC5B,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,WAAW,GAAG,WAAW,CAAC;AAmBnD;;;;;;;;GAQG;AACH,wBAAsB,oBAAoB,CACxC,YAAY,EAAE,UAAU,EACxB,QAAQ,EAAE,MAAM,EAChB,gBAAgB,EAAE,MAAM,EACxB,UAAU,EAAE,MAAM,EAClB,cAAc,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,UAAU,CAAC,CA8ErB;AAED,qBAAa,mBAAoB,YAAW,gBAAgB;IAExD,OAAO,CAAC,gBAAgB;IACxB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,eAAe,CAAC;gBAFhB,gBAAgB,EAAE,MAAM,EACxB,UAAU,EAAE,MAAM,EAClB,eAAe,CAAC,EAAE,MAAM,YAAA;IAG5B,sBAAsB,CAC1B,KAAK,EAAE,WAAW,EAClB,QAAQ,EAAE,2BAA2B,EACrC,QAAQ,EAAE,kBAAkB,GAAG,SAAS,GACvC,OAAO,CAAC,WAAW,CAAC;IA6BvB,kBAAkB,CAChB,MAAM,EAAE,WAAW,EACnB,SAAS,EAAE,gCAAgC,EAC3C,SAAS,EAAE,YAAY,GACtB,OAAO,CAAC,mBAAmB,CAAC;CAGhC"}