@aztec/simulator 0.0.1-commit.2f68f620 → 0.0.1-commit.321f6a9

package/dest/public/public_tx_simulator/public_tx_simulator.js

@@ -1,107 +1,108 @@
 import { createLogger } from '@aztec/foundation/log';
 import { sleep } from '@aztec/foundation/sleep';
-import { avmSimulate, cancelSimulation, createCancellationToken } from '@aztec/native';
-import { ProtocolContractsList } from '@aztec/protocol-contracts';
 import { AvmFastSimulationInputs, AvmTxHint, PublicTxResult, deserializeFromMessagePack } from '@aztec/stdlib/avm';
 import { SimulationError } from '@aztec/stdlib/errors';
+import { WorldStateRevision } from '@aztec/stdlib/world-state';
 import { getTelemetryClient } from '@aztec/telemetry-client';
 import { ExecutorMetrics } from '../executor_metrics.js';
-import { ContractProviderForCpp } from './contract_provider_for_cpp.js';
 import { PublicTxSimulatorBase } from './public_tx_simulator_base.js';
 /**
- * Simulates a transaction's public portion using the C++ AVM simulator.
- * The C++ simulator accesses the world state directly/natively within C++.
- * For contract DB accesses, it makes callbacks through NAPI back to the TS PublicContractsDB cache.
+ * Simulates a transaction's public portion by running its public calls through an {@link AvmSimulator}.
+ * `forkId` selects the fork whose contract data the simulation reads.
  */ export class PublicTxSimulator extends PublicTxSimulatorBase {
     log;
-    /** Current cancellation token for in-flight simulation. */ cancellationToken;
+    /** Aborts the in-flight simulation. */ abortController;
     /** Current simulation promise, used to wait for completion after cancellation. */ simulationPromise;
-    constructor(merkleTree, contractsDB, globalVariables, config, bindings){
-        super(merkleTree, contractsDB, globalVariables, config, undefined, bindings);
+    constructor(avmSimulator, globalVariables, contractsDB, forkId, config, bindings){
+        super(avmSimulator, globalVariables, contractsDB, forkId, config, undefined, bindings);
         this.log = createLogger(`simulator:public_tx_simulator`, bindings);
     }
     /**
-   * Simulate a transaction's public portion using the C++ avvm simulator.
+   * Simulate a transaction's public portion.
    *
    * @param tx - The transaction to simulate.
    * @returns The result of the transaction's public execution.
    */ async simulate(tx) {
+        this.abortController = new AbortController();
+        this.simulationPromise = this.doSimulate(tx, this.abortController.signal);
+        try {
+            return await this.simulationPromise;
+        } finally{
+            this.abortController = undefined;
+            this.simulationPromise = undefined;
+        }
+    }
+    async doSimulate(tx, signal) {
         const txHash = this.computeTxHash(tx);
-        this.log.debug(`C++ simulation of ${tx.publicFunctionCalldata.length} public calls for tx ${txHash}`, {
+        this.log.debug(`Simulating ${tx.publicFunctionCalldata.length} public calls for tx ${txHash}, forkId=${this.forkId}`, {
             txHash
         });
-        const wsRevision = this.merkleTree.getRevision();
-        const wsdbIpcPath = this.merkleTree.getIpcPath();
-        this.log.trace(`Running C++ simulation with world state revision ${JSON.stringify(wsRevision)}`);
-        // Create the fast simulation inputs
+        // Create the fast simulation inputs.
         const txHint = AvmTxHint.fromTx(tx, this.globalVariables.gasFees);
-        const protocolContracts = ProtocolContractsList;
-        const fastSimInputs = new AvmFastSimulationInputs(wsRevision, this.config, txHint, this.globalVariables, protocolContracts);
-        // Create contract provider for callbacks to TypeScript PublicContractsDB from C++
-        const contractProvider = new ContractProviderForCpp(this.contractsDB, this.globalVariables, this.bindings);
-        // Serialize to msgpack and call the C++ simulator
+        const fastSimInputs = new AvmFastSimulationInputs(// blockNumber: WorldStateRevision.LATEST sentinel so the WSDB walks the fork's current
+        // uncommitted state. Using 0 here makes WSDB treat this as a historical query against
+        // the empty genesis tree and miss any in-fork uncommitted leaves (deployed contracts,
+        // etc.) from earlier txs in the same block.
+        {
+            forkId: this.forkId,
+            blockNumber: WorldStateRevision.LATEST,
+            includeUncommitted: true
+        }, this.config, txHint, this.globalVariables, this.protocolContracts);
         this.log.trace(`Serializing fast simulation inputs to msgpack...`);
         const inputBuffer = fastSimInputs.serializeWithMessagePack();
-        // Create cancellation token for this simulation
-        this.cancellationToken = createCancellationToken();
-        // Store the promise so cancel() can wait for it
-        this.log.debug(`Calling C++ simulator for tx ${txHash}`);
-        this.simulationPromise = avmSimulate(inputBuffer, contractProvider, wsdbIpcPath, this.log.level, undefined, this.cancellationToken);
+        this.log.debug(`Running AVM simulation for tx ${txHash}`);
+        const context = {
+            contractsDB: this.contractsDB,
+            forkId: this.forkId,
+            timestamp: this.globalVariables.timestamp
+        };
         let resultBuffer;
         try {
-            resultBuffer = await this.simulationPromise;
+            resultBuffer = await this.avmSimulator.simulate(inputBuffer, context, signal);
         } catch (error) {
-            // Check if this was a cancellation
-            if (error.message?.includes('Simulation cancelled')) {
-                throw new SimulationError(`C++ simulation cancelled`, []);
+            if (error.message?.includes('cancelled')) {
+                throw new SimulationError(`AVM simulation cancelled`, []);
             }
-            throw new SimulationError(`C++ simulation failed: ${error.message}`, []);
-        } finally{
-            this.cancellationToken = undefined;
-            this.simulationPromise = undefined;
+            throw new SimulationError(`AVM simulation failed: ${error.message}`, []);
         }
-        // If we've reached this point, C++ succeeded during simulation,
-        // Deserialize the msgpack result
-        this.log.trace(`Deserializing C++ from buffer (size: ${resultBuffer.length})...`);
-        const cppResultJSON = deserializeFromMessagePack(resultBuffer);
-        this.log.trace(`Deserializing C++ result to PublicTxResult...`);
-        const cppResult = PublicTxResult.fromPlainObject(cppResultJSON);
-        this.log.trace(`C++ simulation completed for tx ${txHash}`, {
+        this.log.trace(`Deserializing simulation result from buffer (size: ${resultBuffer.length})...`);
+        const resultJSON = deserializeFromMessagePack(Buffer.from(resultBuffer));
+        const result = PublicTxResult.fromPlainObject(resultJSON);
+        this.log.trace(`AVM simulation completed for tx ${txHash}`, {
             txHash,
-            reverted: !cppResult.revertCode.isOK(),
-            cppGasUsed: cppResult.gasUsed.totalGas.l2Gas
+            reverted: !result.revertCode.isOK(),
+            l2GasUsed: result.gasUsed.totalGas.l2Gas
         });
-        return cppResult;
+        return result;
     }
     /**
    * Cancel the current simulation if one is in progress.
-   * This signals the C++ simulator to stop at the next opcode or before the next WorldState write.
-   * Safe to call even if no simulation is in progress.
+   * This signals the underlying simulator to stop at the next safe point (between opcodes, before a
+   * world-state write). Safe to call even if no simulation is in progress.
    *
    * @param waitTimeoutMs - If provided, wait up to this many ms for the simulation to actually stop.
-   *                        This is important because C++ might be in the middle of a slow operation
-   *                        (e.g., pad_trees) and won't check the cancellation flag until it completes.
+   *                        Cancellation is cooperative: the simulator may be mid slow-operation and
+   *                        won't observe the cancellation until it completes.
    *                        Default timeout of 100ms after cancellation.
    */ async cancel(waitTimeoutMs = 100) {
-        if (this.cancellationToken) {
-            this.log.debug('Cancelling C++ simulation');
-            cancelSimulation(this.cancellationToken);
+        if (this.abortController) {
+            this.log.debug('Cancelling AVM simulation');
+            this.abortController.abort();
         }
-        // Wait for the simulation to actually complete if not already done
         if (this.simulationPromise) {
-            this.log.debug(`Waiting up to ${waitTimeoutMs}ms for C++ simulation to stop`);
+            this.log.debug(`Waiting up to ${waitTimeoutMs}ms for AVM simulation to stop`);
             await Promise.race([
                 this.simulationPromise.catch(()=>{}),
                 sleep(waitTimeoutMs)
             ]);
-            this.log.debug('C++ simulation stopped or wait timed out');
+            this.log.debug('AVM simulation stopped or wait timed out');
         }
     }
 }
 export class MeasuredPublicTxSimulator extends PublicTxSimulator {
     metrics;
-    constructor(merkleTree, contractsDB, globalVariables, metrics, config, bindings){
-        super(merkleTree, contractsDB, globalVariables, config, bindings), this.metrics = metrics;
+    constructor(avmSimulator, globalVariables, contractsDB, forkId, metrics, config, bindings){
+        super(avmSimulator, globalVariables, contractsDB, forkId, config, bindings), this.metrics = metrics;
     }
     async simulate(tx, txLabel = 'unlabeledTx') {
         this.metrics.startRecordingTxSimulation(txLabel);
@@ -115,12 +116,12 @@ export class MeasuredPublicTxSimulator extends PublicTxSimulator {
     }
 }
 /**
- * A C++ public tx simulator that tracks runtime/production metrics with telemetry.
+ * A public tx simulator that tracks runtime/production metrics with telemetry.
  */ export class TelemetryPublicTxSimulator extends MeasuredPublicTxSimulator {
     /* tracer needed by trackSpans */ tracer;
-    constructor(merkleTree, contractsDB, globalVariables, telemetryClient = getTelemetryClient(), config, bindings){
+    constructor(avmSimulator, globalVariables, contractsDB, forkId, telemetryClient = getTelemetryClient(), config, bindings){
         const metrics = new ExecutorMetrics(telemetryClient, 'PublicTxSimulator');
-        super(merkleTree, contractsDB, globalVariables, metrics, config, bindings);
+        super(avmSimulator, globalVariables, contractsDB, forkId, metrics, config, bindings);
         this.tracer = metrics.tracer;
     }
 }

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

@@ -1,22 +1,24 @@
 import { type Logger, type LoggerBindings } from '@aztec/foundation/log';
 import { PublicSimulatorConfig } from '@aztec/stdlib/avm';
-import type { MerkleTreeWriteOperations } from '@aztec/stdlib/trees';
 import type { GlobalVariables, ProtocolContracts, Tx } from '@aztec/stdlib/tx';
+import type { AvmSimulator } from '../avm_simulator.js';
 import type { PublicContractsDB } from '../public_db_sources.js';
 /**
- * Shared base for public tx simulators. Holds the common configuration, world-state and contract DB
- * handles, logger, and the tx-hash helper. Concrete simulators (e.g. the C++ simulator) extend this
- * and implement `simulate`.
+ * Shared base for public tx simulators: holds the common configuration, the {@link AvmSimulator} used
+ * to run the transaction's public calls, the contracts DB and fork id that scope the simulation's
+ * contract-data lookups, the logger, and the tx-hash helper. Concrete simulators extend this and
+ * implement `simulate`.
  */
 export declare abstract class PublicTxSimulatorBase {
-    protected merkleTree: MerkleTreeWriteOperations;
-    protected contractsDB: PublicContractsDB;
+    protected avmSimulator: AvmSimulator;
     protected globalVariables: GlobalVariables;
+    protected contractsDB: PublicContractsDB;
+    protected forkId: number;
     protected protocolContracts: ProtocolContracts;
     protected log: Logger;
     protected readonly config: PublicSimulatorConfig;
     protected readonly bindings?: LoggerBindings;
-    constructor(merkleTree: MerkleTreeWriteOperations, contractsDB: PublicContractsDB, globalVariables: GlobalVariables, config?: Partial<PublicSimulatorConfig>, protocolContracts?: ProtocolContracts, bindings?: LoggerBindings);
+    constructor(avmSimulator: AvmSimulator, globalVariables: GlobalVariables, contractsDB: PublicContractsDB, forkId: number, config?: Partial<PublicSimulatorConfig>, protocolContracts?: ProtocolContracts, bindings?: LoggerBindings);
     protected computeTxHash(tx: Tx): import("@aztec/stdlib/tx").TxHash;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHVibGljX3R4X3NpbXVsYXRvcl9iYXNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcHVibGljL3B1YmxpY190eF9zaW11bGF0b3IvcHVibGljX3R4X3NpbXVsYXRvcl9iYXNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBRSxLQUFLLGNBQWMsRUFBZ0IsTUFBTSx1QkFBdUIsQ0FBQztBQUV2RixPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUMxRCxPQUFPLEtBQUssRUFBRSx5QkFBeUIsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ3JFLE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxpQkFBaUIsRUFBRSxFQUFFLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUUvRSxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRWpFOzs7O0dBSUc7QUFDSCw4QkFBc0IscUJBQXFCO0lBTXZDLFNBQVMsQ0FBQyxVQUFVLEVBQUUseUJBQXlCO0lBQy9DLFNBQVMsQ0FBQyxXQUFXLEVBQUUsaUJBQWlCO0lBQ3hDLFNBQVMsQ0FBQyxlQUFlLEVBQUUsZUFBZTtJQUUxQyxTQUFTLENBQUMsaUJBQWlCLEVBQUUsaUJBQWlCO0lBVGhELFNBQVMsQ0FBQyxHQUFHLEVBQUUsTUFBTSxDQUFDO0lBQ3RCLFNBQVMsQ0FBQyxRQUFRLENBQUMsTUFBTSxFQUFFLHFCQUFxQixDQUFDO0lBQ2pELFNBQVMsQ0FBQyxRQUFRLENBQUMsUUFBUSxDQUFDLEVBQUUsY0FBYyxDQUFDO0lBRTdDLFlBQ1ksVUFBVSxFQUFFLHlCQUF5QixFQUNyQyxXQUFXLEVBQUUsaUJBQWlCLEVBQzlCLGVBQWUsRUFBRSxlQUFlLEVBQzFDLE1BQU0sQ0FBQyxFQUFFLE9BQU8sQ0FBQyxxQkFBcUIsQ0FBQyxFQUM3QixpQkFBaUIsR0FBRSxpQkFBeUMsRUFDdEUsUUFBUSxDQUFDLEVBQUUsY0FBYyxFQUsxQjtJQUVELFNBQVMsQ0FBQyxhQUFhLENBQUMsRUFBRSxFQUFFLEVBQUUscUNBRTdCO0NBQ0YifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHVibGljX3R4X3NpbXVsYXRvcl9iYXNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcHVibGljL3B1YmxpY190eF9zaW11bGF0b3IvcHVibGljX3R4X3NpbXVsYXRvcl9iYXNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBRSxLQUFLLGNBQWMsRUFBZ0IsTUFBTSx1QkFBdUIsQ0FBQztBQUV2RixPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUMxRCxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsaUJBQWlCLEVBQUUsRUFBRSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFL0UsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDeEQsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUVqRTs7Ozs7R0FLRztBQUNILDhCQUFzQixxQkFBcUI7SUFNdkMsU0FBUyxDQUFDLFlBQVksRUFBRSxZQUFZO0lBQ3BDLFNBQVMsQ0FBQyxlQUFlLEVBQUUsZUFBZTtJQUMxQyxTQUFTLENBQUMsV0FBVyxFQUFFLGlCQUFpQjtJQUN4QyxTQUFTLENBQUMsTUFBTSxFQUFFLE1BQU07SUFFeEIsU0FBUyxDQUFDLGlCQUFpQixFQUFFLGlCQUFpQjtJQVZoRCxTQUFTLENBQUMsR0FBRyxFQUFFLE1BQU0sQ0FBQztJQUN0QixTQUFTLENBQUMsUUFBUSxDQUFDLE1BQU0sRUFBRSxxQkFBcUIsQ0FBQztJQUNqRCxTQUFTLENBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBQyxFQUFFLGNBQWMsQ0FBQztJQUU3QyxZQUNZLFlBQVksRUFBRSxZQUFZLEVBQzFCLGVBQWUsRUFBRSxlQUFlLEVBQ2hDLFdBQVcsRUFBRSxpQkFBaUIsRUFDOUIsTUFBTSxFQUFFLE1BQU0sRUFDeEIsTUFBTSxDQUFDLEVBQUUsT0FBTyxDQUFDLHFCQUFxQixDQUFDLEVBQzdCLGlCQUFpQixHQUFFLGlCQUF5QyxFQUN0RSxRQUFRLENBQUMsRUFBRSxjQUFjLEVBSzFCO0lBRUQsU0FBUyxDQUFDLGFBQWEsQ0FBQyxFQUFFLEVBQUUsRUFBRSxxQ0FFN0I7Q0FDRiJ9

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

@@ -1 +1 @@
-{"version":3,"file":"public_tx_simulator_base.d.ts","sourceRoot":"","sources":["../../../src/public/public_tx_simulator/public_tx_simulator_base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,cAAc,EAAgB,MAAM,uBAAuB,CAAC;AAEvF,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AACrE,OAAO,KAAK,EAAE,eAAe,EAAE,iBAAiB,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAE/E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAEjE;;;;GAIG;AACH,8BAAsB,qBAAqB;IAMvC,SAAS,CAAC,UAAU,EAAE,yBAAyB;IAC/C,SAAS,CAAC,WAAW,EAAE,iBAAiB;IACxC,SAAS,CAAC,eAAe,EAAE,eAAe;IAE1C,SAAS,CAAC,iBAAiB,EAAE,iBAAiB;IAThD,SAAS,CAAC,GAAG,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,qBAAqB,CAAC;IACjD,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,cAAc,CAAC;IAE7C,YACY,UAAU,EAAE,yBAAyB,EACrC,WAAW,EAAE,iBAAiB,EAC9B,eAAe,EAAE,eAAe,EAC1C,MAAM,CAAC,EAAE,OAAO,CAAC,qBAAqB,CAAC,EAC7B,iBAAiB,GAAE,iBAAyC,EACtE,QAAQ,CAAC,EAAE,cAAc,EAK1B;IAED,SAAS,CAAC,aAAa,CAAC,EAAE,EAAE,EAAE,qCAE7B;CACF"}
+{"version":3,"file":"public_tx_simulator_base.d.ts","sourceRoot":"","sources":["../../../src/public/public_tx_simulator/public_tx_simulator_base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,cAAc,EAAgB,MAAM,uBAAuB,CAAC;AAEvF,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,KAAK,EAAE,eAAe,EAAE,iBAAiB,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAE/E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAEjE;;;;;GAKG;AACH,8BAAsB,qBAAqB;IAMvC,SAAS,CAAC,YAAY,EAAE,YAAY;IACpC,SAAS,CAAC,eAAe,EAAE,eAAe;IAC1C,SAAS,CAAC,WAAW,EAAE,iBAAiB;IACxC,SAAS,CAAC,MAAM,EAAE,MAAM;IAExB,SAAS,CAAC,iBAAiB,EAAE,iBAAiB;IAVhD,SAAS,CAAC,GAAG,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,qBAAqB,CAAC;IACjD,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,cAAc,CAAC;IAE7C,YACY,YAAY,EAAE,YAAY,EAC1B,eAAe,EAAE,eAAe,EAChC,WAAW,EAAE,iBAAiB,EAC9B,MAAM,EAAE,MAAM,EACxB,MAAM,CAAC,EAAE,OAAO,CAAC,qBAAqB,CAAC,EAC7B,iBAAiB,GAAE,iBAAyC,EACtE,QAAQ,CAAC,EAAE,cAAc,EAK1B;IAED,SAAS,CAAC,aAAa,CAAC,EAAE,EAAE,EAAE,qCAE7B;CACF"}

package/dest/public/public_tx_simulator/public_tx_simulator_base.js

@@ -2,21 +2,24 @@ import { createLogger } from '@aztec/foundation/log';
 import { ProtocolContractsList } from '@aztec/protocol-contracts';
 import { PublicSimulatorConfig } from '@aztec/stdlib/avm';
 /**
- * Shared base for public tx simulators. Holds the common configuration, world-state and contract DB
- * handles, logger, and the tx-hash helper. Concrete simulators (e.g. the C++ simulator) extend this
- * and implement `simulate`.
+ * Shared base for public tx simulators: holds the common configuration, the {@link AvmSimulator} used
+ * to run the transaction's public calls, the contracts DB and fork id that scope the simulation's
+ * contract-data lookups, the logger, and the tx-hash helper. Concrete simulators extend this and
+ * implement `simulate`.
  */ export class PublicTxSimulatorBase {
-    merkleTree;
-    contractsDB;
+    avmSimulator;
     globalVariables;
+    contractsDB;
+    forkId;
     protocolContracts;
     log;
     config;
     bindings;
-    constructor(merkleTree, contractsDB, globalVariables, config, protocolContracts = ProtocolContractsList, bindings){
-        this.merkleTree = merkleTree;
-        this.contractsDB = contractsDB;
+    constructor(avmSimulator, globalVariables, contractsDB, forkId, config, protocolContracts = ProtocolContractsList, bindings){
+        this.avmSimulator = avmSimulator;
         this.globalVariables = globalVariables;
+        this.contractsDB = contractsDB;
+        this.forkId = forkId;
         this.protocolContracts = protocolContracts;
         this.config = PublicSimulatorConfig.from(config ?? {});
         this.bindings = bindings;

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

@@ -4,14 +4,14 @@ export interface PublicTxSimulatorInterface {
     simulate(tx: Tx): Promise<PublicTxResult>;
     /**
      * Cancel the current simulation if one is in progress.
-     * This signals the underlying simulator (e.g., C++) to stop at the next safe point.
+     * This signals the underlying simulator to stop at the next safe point.
      * Safe to call even if no simulation is in progress.
      * Optional - not all implementations support cancellation.
      *
      * @param waitTimeoutMs - If provided, wait up to this many ms for the simulation to actually stop.
-     *                        This is important because signaling cancellation doesn't immediately stop C++ -
-     *                        it only sets a flag that C++ checks at certain points. If C++ is in the middle
-     *                        of a slow operation (e.g., pad_trees), it won't stop until that completes.
+     *                        Cancellation is cooperative: signaling it only sets a flag the simulator
+     *                        checks at certain points, so if it's mid slow-operation it won't stop until
+     *                        that completes.
      * @returns Promise that resolves when cancellation is signaled (and optionally when simulation stops)
      */
     cancel?(waitTimeoutMs?: number): Promise<void>;
@@ -20,7 +20,7 @@ export interface MeasuredPublicTxSimulatorInterface {
     simulate(tx: Tx, txLabel: string): Promise<PublicTxResult>;
     /**
      * Cancel the current simulation if one is in progress.
-     * This signals the underlying simulator (e.g., C++) to stop at the next safe point.
+     * This signals the underlying simulator to stop at the next safe point.
      * Safe to call even if no simulation is in progress.
      * Optional - not all implementations support cancellation.
      *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/simulator",
-  "version": "0.0.1-commit.2f68f620",
+  "version": "0.0.1-commit.321f6a9",
   "type": "module",
   "exports": {
     "./server": "./dest/server.js",
@@ -19,8 +19,9 @@
     "build": "yarn clean && ../scripts/tsc.sh",
     "build:dev": "../scripts/tsc.sh --watch",
     "clean": "rm -rf ./dest .tsbuildinfo",
+    "generate": "node --experimental-strip-types --experimental-transform-types --no-warnings ../../ipc-codegen/src/generate.ts --schema ../../barretenberg/cpp/src/barretenberg/cdb/cdb_schema.json --lang ts --server --out src/public/cdb/generated",
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}",
-    "build:fuzzer": "yarn clean && ../scripts/tsc.sh"
+    "build:fuzzer": "yarn clean && yarn generate && ../scripts/tsc.sh"
   },
   "inherits": [
     "../package.common.json"
@@ -63,26 +64,29 @@
     ]
   },
   "dependencies": {
-    "@aztec/constants": "0.0.1-commit.2f68f620",
-    "@aztec/foundation": "0.0.1-commit.2f68f620",
-    "@aztec/native": "0.0.1-commit.2f68f620",
-    "@aztec/noir-acvm_js": "0.0.1-commit.2f68f620",
-    "@aztec/noir-noirc_abi": "0.0.1-commit.2f68f620",
-    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.2f68f620",
-    "@aztec/noir-types": "0.0.1-commit.2f68f620",
-    "@aztec/protocol-contracts": "0.0.1-commit.2f68f620",
-    "@aztec/standard-contracts": "0.0.1-commit.2f68f620",
-    "@aztec/stdlib": "0.0.1-commit.2f68f620",
-    "@aztec/telemetry-client": "0.0.1-commit.2f68f620",
-    "@aztec/world-state": "0.0.1-commit.2f68f620",
+    "@aztec/bb-avm-sim": "0.0.1-commit.321f6a9",
+    "@aztec/constants": "0.0.1-commit.321f6a9",
+    "@aztec/foundation": "0.0.1-commit.321f6a9",
+    "@aztec/ipc-runtime": "0.0.1-commit.321f6a9",
+    "@aztec/native": "0.0.1-commit.321f6a9",
+    "@aztec/noir-acvm_js": "0.0.1-commit.321f6a9",
+    "@aztec/noir-noirc_abi": "0.0.1-commit.321f6a9",
+    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.321f6a9",
+    "@aztec/noir-types": "0.0.1-commit.321f6a9",
+    "@aztec/protocol-contracts": "0.0.1-commit.321f6a9",
+    "@aztec/standard-contracts": "0.0.1-commit.321f6a9",
+    "@aztec/stdlib": "0.0.1-commit.321f6a9",
+    "@aztec/telemetry-client": "0.0.1-commit.321f6a9",
+    "@aztec/world-state": "0.0.1-commit.321f6a9",
     "lodash.clonedeep": "^4.5.0",
     "lodash.merge": "^4.6.2",
+    "msgpackr": "^1.11.2",
     "tslib": "^2.4.0"
   },
   "devDependencies": {
-    "@aztec/kv-store": "0.0.1-commit.2f68f620",
-    "@aztec/noir-contracts.js": "0.0.1-commit.2f68f620",
-    "@aztec/noir-test-contracts.js": "0.0.1-commit.2f68f620",
+    "@aztec/kv-store": "0.0.1-commit.321f6a9",
+    "@aztec/noir-contracts.js": "0.0.1-commit.321f6a9",
+    "@aztec/noir-test-contracts.js": "0.0.1-commit.321f6a9",
     "@jest/globals": "^30.0.0",
     "@types/jest": "^30.0.0",
     "@types/lodash.clonedeep": "^4.5.7",

package/src/client.ts

@@ -1,6 +1,4 @@
 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';

package/src/private/circuit_recording/circuit_recorder.ts

@@ -3,6 +3,8 @@ import { type Logger, type LoggerBindings, resolveLogger } from '@aztec/foundati
 import { Timer } from '@aztec/foundation/timer';
 import type { ForeignCallHandler, ForeignCallInput, ForeignCallOutput } from '@aztec/noir-acvm_js';
 
+import { AsyncLocalStorage } from 'node:async_hooks';
+
 import type { ACIRCallback } from '../acvm/acvm.js';
 import type { ACVMWitness } from '../acvm/acvm_types.js';
 
@@ -43,10 +45,23 @@ export class CircuitRecording {
   }
 }
 
+/** Inputs needed to open a recording for a single circuit execution. */
+export type RecordingMetadata = {
+  input: ACVMWitness;
+  bytecode: Buffer;
+  circuitName: string;
+  functionName: string;
+};
+
 /**
  * Class responsible for recording circuit inputs necessary to replay the circuit. These inputs are the initial witness
  * map and the oracle calls made during the circuit execution/witness generation.
  *
+ * The active recording for an execution lives in `AsyncLocalStorage`, so each (possibly nested) circuit execution owns
+ * its own recording and concurrent or re-entrant executions cannot corrupt one another's state. Nested executions
+ * (`aztec_prv_callPrivateFunction`, utility calls) re-enter {@link record}, which links the child to the recording
+ * active in the enclosing async context and lets ALS restore the parent automatically when the child completes.
+ *
  * Example recording object:
  * ```json
  * {
@@ -91,37 +106,44 @@ export class CircuitRecording {
 export class CircuitRecorder {
   protected readonly logger: Logger;
 
-  protected recording?: CircuitRecording;
-
-  private stackDepth: number = 0;
-  private newCircuit: boolean = true;
+  readonly #recordings = new AsyncLocalStorage<CircuitRecording>();
 
   protected constructor(loggerOrBindings?: Logger | LoggerBindings) {
     this.logger = resolveLogger('simulator:acvm:recording', loggerOrBindings);
   }
 
   /**
-   * Initializes a new circuit recording session.
-   * @param recordDir - Directory to store the recording
-   * @param input - Circuit input witness
-   * @param circuitBytecode - Compiled circuit bytecode
-   * @param circuitName - Name of the circuit
-   * @param functionName - Name of the circuit function (defaults to 'main'). This is meaningful only for
-   * contracts as protocol circuits artifacts always contain a single entrypoint function called 'main'.
+   * Records a single circuit execution. Opens a recording for the circuit (linked as a child of the recording active
+   * in the current async context, if any), runs `fn` within that recording's context, and finalizes it. The recording
+   * is returned alongside the result so callers can derive per-circuit stats (e.g. oracle timings).
+   *
+   * Recorder bookkeeping never alters execution: if `fn` throws, the error is attached to the recording and re-thrown
+   * unchanged.
+   * @param metadata - Identifies the circuit and its initial witness.
+   * @param fn - Runs the circuit execution; its oracle calls are recorded into this recording.
    */
-  start(input: ACVMWitness, circuitBytecode: Buffer, circuitName: string, functionName: string): Promise<void> {
-    if (this.newCircuit) {
-      const parentRef = this.recording;
-      this.recording = new CircuitRecording(
-        circuitName,
-        functionName,
-        sha512(circuitBytecode).toString('hex'),
-        Object.fromEntries(input),
-      );
-      this.recording.setParent(parentRef);
-    }
+  record<T>(metadata: RecordingMetadata, fn: () => Promise<T>): Promise<{ result: T; recording: CircuitRecording }> {
+    const parent = this.#recordings.getStore();
+    const recording = new CircuitRecording(
+      metadata.circuitName,
+      metadata.functionName,
+      sha512(metadata.bytecode).toString('hex'),
+      Object.fromEntries(metadata.input),
+    );
+    recording.setParent(parent);
 
-    return Promise.resolve();
+    return this.#recordings.run(recording, async () => {
+      await this.onStart(recording);
+      try {
+        const result = await fn();
+        await this.onFinish(recording);
+        return { result, recording };
+      } catch (error) {
+        recording.error = JSON.stringify(error);
+        await this.onError(recording, error);
+        throw error;
+      }
+    });
   }
 
   /**
@@ -147,7 +169,9 @@ export class CircuitRecorder {
   }
 
   /**
-   * Wraps a user circuit callback to record all oracle calls.
+   * Wraps a user circuit callback to record all oracle calls. A nested circuit entered via an oracle (e.g.
+   * `aztec_prv_callPrivateFunction`) re-enters {@link record}, so its own oracle calls land on the child recording and
+   * this circuit's calls (including the entering oracle call itself) land on this recording once the child completes.
    * @param callback - The original circuit callback.
    * @returns A wrapped callback that records all oracle interactions which is to be provided to the ACVM.
    */
@@ -161,38 +185,16 @@ export class CircuitRecorder {
         throw new Error(`Oracle method ${name} not found when setting up recording callback`);
       }
 
-      const isExternalCall = (name as keyof ACIRCallback) === 'aztec_prv_callPrivateFunction';
-
       recordingCallback[name as keyof ACIRCallback] = (...args: ForeignCallInput[]): ReturnType<typeof fn> => {
         const timer = new Timer();
-        // If we're entering another circuit via `aztec_prv_callPrivateFunction`, we increase the stack depth and set the
-        // newCircuit variable to ensure we are creating a new recording object.
-        if (isExternalCall) {
-          this.stackDepth++;
-          this.newCircuit = true;
-        }
         const result = fn.call(callback, ...args);
         if (result instanceof Promise) {
           return result.then(async r => {
-            // Once we leave the nested circuit, we decrease the stack depth and set newCircuit to false
-            // so that the parent circuit continues with its existing recording
-            // Note: recording restoration is handled by finish()
-            if (isExternalCall) {
-              this.stackDepth--;
-              this.newCircuit = false;
-            }
-            await this.recordCall(name, args, r, timer.ms(), this.stackDepth);
+            await this.recordCall(name, args, r, timer.ms());
             return r;
           }) as ReturnType<typeof fn>;
         }
-        // Once we leave the nested circuit, we decrease the stack depth and set newCircuit to false
-        // so that the parent circuit continues with its existing recording
-        // Note: recording restoration is handled by finish()
-        if (isExternalCall) {
-          this.stackDepth--;
-          this.newCircuit = false;
-        }
-        void this.recordCall(name, args, result, timer.ms(), this.stackDepth);
+        void this.recordCall(name, args, result, timer.ms());
         return result;
       };
     }
@@ -209,55 +211,59 @@ export class CircuitRecorder {
     return async (name: string, inputs: ForeignCallInput[]): Promise<ForeignCallOutput[]> => {
       const timer = new Timer();
       const result = await callback(name, inputs);
-      await this.recordCall(name, inputs, result, timer.ms(), 0);
+      await this.recordCall(name, inputs, result, timer.ms());
       return result;
     };
   }
 
   /**
-   * Records a single oracle/foreign call with its inputs and outputs.
+   * Records a single oracle/foreign call with its inputs and outputs against the recording active in the current
+   * async context.
    * @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<OracleCall> {
+  recordCall(name: string, inputs: unknown[], outputs: unknown, time: number): Promise<OracleCall> {
+    const recording = this.#recordings.getStore();
     const entry = {
       name,
       inputs,
       outputs,
       time,
-      stackDepth,
+      stackDepth: depthOf(recording),
     };
-    this.recording!.oracleCalls.push(entry);
+    // Outside any active recording context (e.g. a stray call after the scope closed, or a direct unit-test call)
+    // there is nowhere to record; return the entry without throwing into the execution path.
+    recording?.oracleCalls.push(entry);
     return Promise.resolve(entry);
   }
 
-  /**
-   * Finalizes the recording by resetting the state and returning the recording object.
-   */
-  finish(): Promise<CircuitRecording> {
-    const result = this.recording;
-    // If this is the top-level circuit recording, we reset the state for the next simulator call
-    if (!result!.parent) {
-      this.newCircuit = true;
-      this.recording = undefined;
-    } else {
-      // For nested circuits (utility calls, nested contract calls), restore to parent recording
-      // Note: we don't set newCircuit=false here because:
-      // - For privateCallPrivateFunction, the callback wrapper will set it to false
-      // - For utility calls, we want newCircuit to remain true so the next circuit creates its own recording
-      this.recording = result!.parent;
-    }
-    return Promise.resolve(result!);
+  /** The recording active in the current async context, if any. */
+  protected currentRecording(): CircuitRecording | undefined {
+    return this.#recordings.getStore();
   }
 
-  /**
-   * Finalizes the recording by resetting the state and returning the recording object with an attached error.
-   * @param error - The error that occurred during circuit execution
-   */
-  async finishWithError(error: unknown): Promise<CircuitRecording> {
-    const result = await this.finish();
-    result.error = JSON.stringify(error);
-    return result;
+  /** Hook invoked when a recording opens, within the recording's context. Overridden to persist recordings. */
+  protected onStart(_recording: CircuitRecording): Promise<void> {
+    return Promise.resolve();
+  }
+
+  /** Hook invoked when a recording completes successfully, within the recording's context. */
+  protected onFinish(_recording: CircuitRecording): Promise<void> {
+    return Promise.resolve();
+  }
+
+  /** Hook invoked when a recording's execution throws, within the recording's context. */
+  protected onError(_recording: CircuitRecording, _error: unknown): Promise<void> {
+    return Promise.resolve();
+  }
+}
+
+/** Depth of a recording in the call tree: 0 for a top-level circuit, incremented per nested circuit. */
+function depthOf(recording: CircuitRecording | undefined): number {
+  let depth = 0;
+  for (let ancestor = recording?.parent; ancestor; ancestor = ancestor.parent) {
+    depth++;
   }
+  return depth;
 }