@aztec/simulator 0.0.1-commit.b9865e97 → 0.0.1-commit.be03c316

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/dest/public/test_executor_metrics.d.ts

@@ -13,10 +13,6 @@ export interface PublicTxMetrics {
     totalDurationMs: number;
     manaUsed: number | undefined;
     totalInstructionsExecuted: number;
-    bytecodeSizes: {
-        contractName: string;
-        sizeBytes: number;
-    }[];
     nonRevertiblePrivateInsertionsUs: number | undefined;
     revertiblePrivateInsertionsUs: number | undefined;
     enqueuedCalls: PublicEnqueuedCallMetrics[];
@@ -51,11 +47,10 @@ export declare class TestExecutorMetrics implements ExecutorMetricsInterface {
     recordEnqueuedCallSimulation(fnName: string, durationMs: number, manaUsed: number, totalInstructionsExecuted: number): void;
     recordEnqueuedCallSimulationFailure(fnName: string, durationMs: number, manaUsed: number, totalInstructionsExecuted: number): void;
     recordPrivateEffectsInsertion(durationUs: number, type: 'revertible' | 'non-revertible'): void;
-    recordBytecodeSize(txLabel: string, contractName: string, sizeBytes: number): void;
     recordProverMetrics(txLabel: string, metrics: Partial<PublicTxMetrics>): void;
     prettyPrint(filter?: PublicTxMetricsFilter): void;
     toPrettyString(filter?: PublicTxMetricsFilter): string;
     toJSON(indent?: number): string;
     toGithubActionBenchmarkJSON(indent?: number): string;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdF9leGVjdXRvcl9tZXRyaWNzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHVibGljL3Rlc3RfZXhlY3V0b3JfbWV0cmljcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQWUsS0FBSyxjQUFjLEVBQWdCLE1BQU0sdUJBQXVCLENBQUM7QUFFdkYsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDcEQsT0FBTyxLQUFLLEVBQUUsT0FBTyxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFJakQsT0FBTyxLQUFLLEVBQUUsd0JBQXdCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUVoRixNQUFNLFdBQVcseUJBQXlCO0lBQ3hDLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFDZixVQUFVLEVBQUUsTUFBTSxDQUFDO0lBQ25CLFFBQVEsRUFBRSxNQUFNLENBQUM7SUFDakIseUJBQXlCLEVBQUUsTUFBTSxDQUFDO0lBQ2xDLFFBQVEsRUFBRSxPQUFPLENBQUM7Q0FDbkI7QUFFRCxNQUFNLFdBQVcsZUFBZTtJQUU5QixlQUFlLEVBQUUsTUFBTSxDQUFDO0lBQ3hCLFFBQVEsRUFBRSxNQUFNLEdBQUcsU0FBUyxDQUFDO0lBQzdCLHlCQUF5QixFQUFFLE1BQU0sQ0FBQztJQUNsQyxhQUFhLEVBQUU7UUFBRSxZQUFZLEVBQUUsTUFBTSxDQUFDO1FBQUMsU0FBUyxFQUFFLE1BQU0sQ0FBQTtLQUFFLEVBQUUsQ0FBQztJQUM3RCxnQ0FBZ0MsRUFBRSxNQUFNLEdBQUcsU0FBUyxDQUFDO0lBQ3JELDZCQUE2QixFQUFFLE1BQU0sR0FBRyxTQUFTLENBQUM7SUFDbEQsYUFBYSxFQUFFLHlCQUF5QixFQUFFLENBQUM7SUFDM0MsWUFBWSxFQUFFLFVBQVUsR0FBRyxTQUFTLENBQUM7SUFFckMsc0JBQXNCLEVBQUUsTUFBTSxHQUFHLFNBQVMsQ0FBQztJQUMzQyxtQkFBbUIsRUFBRSxNQUFNLEdBQUcsU0FBUyxDQUFDO0lBQ3hDLDJCQUEyQixFQUFFLE1BQU0sR0FBRyxTQUFTLENBQUM7SUFFaEQsNkJBQTZCLEVBQUUsTUFBTSxHQUFHLFNBQVMsQ0FBQztJQUNsRCx1QkFBdUIsRUFBRSxNQUFNLEdBQUcsU0FBUyxDQUFDO0lBQzVDLGlCQUFpQixFQUFFLE1BQU0sR0FBRyxTQUFTLENBQUM7SUFDdEMsWUFBWSxFQUFFLE1BQU0sR0FBRyxTQUFTLENBQUM7SUFDakMsNkJBQTZCLEVBQUUsTUFBTSxHQUFHLFNBQVMsQ0FBQztJQUNsRCx3Q0FBd0MsRUFBRSxNQUFNLEdBQUcsU0FBUyxDQUFDO0lBQzdELHdCQUF3QixFQUFFLE1BQU0sR0FBRyxTQUFTLENBQUM7Q0FDOUM7QUFXRCxvQkFBWSxxQkFBcUI7SUFDL0IsR0FBRyxJQUFBO0lBQ0gsTUFBTSxJQUFBO0lBQ04sU0FBUyxJQUFBO0lBQ1QsWUFBWSxJQUFBO0lBQ1osT0FBTyxJQUFBO0NBQ1I7QUE0QkQscUJBQWEsbUJBQW9CLFlBQVcsd0JBQXdCOztJQUNsRSxPQUFPLENBQUMsTUFBTSxDQUFTO0lBRXZCLE9BQU8sQ0FBQyxTQUFTLENBQTJDO0lBQzVELE9BQU8sQ0FBQyxjQUFjLENBQXFCO0lBQzNDLE9BQU8sQ0FBQyxPQUFPLENBQW9CO0lBRW5DLFlBQVksUUFBUSxDQUFDLEVBQUUsY0FBYyxFQUVwQztJQUVELDBCQUEwQixDQUFDLE9BQU8sRUFBRSxNQUFNLFFBTXpDO0lBRUQseUJBQXlCLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxPQUFPLENBQUMsRUFBRSxPQUFPLEVBQUUsWUFBWSxDQUFDLEVBQUUsVUFBVSxRQWdCdEY7SUFFRCw0QkFBNEIsQ0FDMUIsTUFBTSxFQUFFLE1BQU0sRUFDZCxVQUFVLEVBQUUsTUFBTSxFQUNsQixRQUFRLEVBQUUsTUFBTSxFQUNoQix5QkFBeUIsRUFBRSxNQUFNLFFBR2xDO0lBRUQsbUNBQW1DLENBQ2pDLE1BQU0sRUFBRSxNQUFNLEVBQ2QsVUFBVSxFQUFFLE1BQU0sRUFDbEIsUUFBUSxFQUFFLE1BQU0sRUFDaEIseUJBQXlCLEVBQUUsTUFBTSxRQUdsQztJQW9CRCw2QkFBNkIsQ0FBQyxVQUFVLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxZQUFZLEdBQUcsZ0JBQWdCLFFBZ0J0RjtJQUVELGtCQUFrQixDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsWUFBWSxFQUFFLE1BQU0sRUFBRSxTQUFTLEVBQUUsTUFBTSxRQUkxRTtJQUVELG1CQUFtQixDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsT0FBTyxFQUFFLE9BQU8sQ0FBQyxlQUFlLENBQUMsUUFVckU7SUFFRCxXQUFXLENBQUMsTUFBTSxHQUFFLHFCQUFpRCxRQUVwRTtJQUVELGNBQWMsQ0FBQyxNQUFNLEdBQUUscUJBQWlELFVBd0Z2RTtJQTBCRCxNQUFNLENBQUMsTUFBTSxTQUFJLFVBRWhCO0lBRUQsMkJBQTJCLENBQUMsTUFBTSxTQUFJLFVBbUdyQztDQUNGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdF9leGVjdXRvcl9tZXRyaWNzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHVibGljL3Rlc3RfZXhlY3V0b3JfbWV0cmljcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQWUsS0FBSyxjQUFjLEVBQWdCLE1BQU0sdUJBQXVCLENBQUM7QUFFdkYsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDcEQsT0FBTyxLQUFLLEVBQUUsT0FBTyxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFJakQsT0FBTyxLQUFLLEVBQUUsd0JBQXdCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUVoRixNQUFNLFdBQVcseUJBQXlCO0lBQ3hDLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFDZixVQUFVLEVBQUUsTUFBTSxDQUFDO0lBQ25CLFFBQVEsRUFBRSxNQUFNLENBQUM7SUFDakIseUJBQXlCLEVBQUUsTUFBTSxDQUFDO0lBQ2xDLFFBQVEsRUFBRSxPQUFPLENBQUM7Q0FDbkI7QUFFRCxNQUFNLFdBQVcsZUFBZTtJQUU5QixlQUFlLEVBQUUsTUFBTSxDQUFDO0lBQ3hCLFFBQVEsRUFBRSxNQUFNLEdBQUcsU0FBUyxDQUFDO0lBQzdCLHlCQUF5QixFQUFFLE1BQU0sQ0FBQztJQUNsQyxnQ0FBZ0MsRUFBRSxNQUFNLEdBQUcsU0FBUyxDQUFDO0lBQ3JELDZCQUE2QixFQUFFLE1BQU0sR0FBRyxTQUFTLENBQUM7SUFDbEQsYUFBYSxFQUFFLHlCQUF5QixFQUFFLENBQUM7SUFDM0MsWUFBWSxFQUFFLFVBQVUsR0FBRyxTQUFTLENBQUM7SUFFckMsc0JBQXNCLEVBQUUsTUFBTSxHQUFHLFNBQVMsQ0FBQztJQUMzQyxtQkFBbUIsRUFBRSxNQUFNLEdBQUcsU0FBUyxDQUFDO0lBQ3hDLDJCQUEyQixFQUFFLE1BQU0sR0FBRyxTQUFTLENBQUM7SUFFaEQsNkJBQTZCLEVBQUUsTUFBTSxHQUFHLFNBQVMsQ0FBQztJQUNsRCx1QkFBdUIsRUFBRSxNQUFNLEdBQUcsU0FBUyxDQUFDO0lBQzVDLGlCQUFpQixFQUFFLE1BQU0sR0FBRyxTQUFTLENBQUM7SUFDdEMsWUFBWSxFQUFFLE1BQU0sR0FBRyxTQUFTLENBQUM7SUFDakMsNkJBQTZCLEVBQUUsTUFBTSxHQUFHLFNBQVMsQ0FBQztJQUNsRCx3Q0FBd0MsRUFBRSxNQUFNLEdBQUcsU0FBUyxDQUFDO0lBQzdELHdCQUF3QixFQUFFLE1BQU0sR0FBRyxTQUFTLENBQUM7Q0FDOUM7QUFXRCxvQkFBWSxxQkFBcUI7SUFDL0IsR0FBRyxJQUFBO0lBQ0gsTUFBTSxJQUFBO0lBQ04sU0FBUyxJQUFBO0lBQ1QsWUFBWSxJQUFBO0lBQ1osT0FBTyxJQUFBO0NBQ1I7QUEyQkQscUJBQWEsbUJBQW9CLFlBQVcsd0JBQXdCOztJQUNsRSxPQUFPLENBQUMsTUFBTSxDQUFTO0lBRXZCLE9BQU8sQ0FBQyxTQUFTLENBQTJDO0lBQzVELE9BQU8sQ0FBQyxjQUFjLENBQXFCO0lBQzNDLE9BQU8sQ0FBQyxPQUFPLENBQW9CO0lBRW5DLFlBQVksUUFBUSxDQUFDLEVBQUUsY0FBYyxFQUVwQztJQUVELDBCQUEwQixDQUFDLE9BQU8sRUFBRSxNQUFNLFFBTXpDO0lBRUQseUJBQXlCLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxPQUFPLENBQUMsRUFBRSxPQUFPLEVBQUUsWUFBWSxDQUFDLEVBQUUsVUFBVSxRQWdCdEY7SUFFRCw0QkFBNEIsQ0FDMUIsTUFBTSxFQUFFLE1BQU0sRUFDZCxVQUFVLEVBQUUsTUFBTSxFQUNsQixRQUFRLEVBQUUsTUFBTSxFQUNoQix5QkFBeUIsRUFBRSxNQUFNLFFBR2xDO0lBRUQsbUNBQW1DLENBQ2pDLE1BQU0sRUFBRSxNQUFNLEVBQ2QsVUFBVSxFQUFFLE1BQU0sRUFDbEIsUUFBUSxFQUFFLE1BQU0sRUFDaEIseUJBQXlCLEVBQUUsTUFBTSxRQUdsQztJQW9CRCw2QkFBNkIsQ0FBQyxVQUFVLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxZQUFZLEdBQUcsZ0JBQWdCLFFBZ0J0RjtJQUVELG1CQUFtQixDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsT0FBTyxFQUFFLE9BQU8sQ0FBQyxlQUFlLENBQUMsUUFVckU7SUFFRCxXQUFXLENBQUMsTUFBTSxHQUFFLHFCQUFpRCxRQUVwRTtJQUVELGNBQWMsQ0FBQyxNQUFNLEdBQUUscUJBQWlELFVBK0V2RTtJQTBCRCxNQUFNLENBQUMsTUFBTSxTQUFJLFVBRWhCO0lBRUQsMkJBQTJCLENBQUMsTUFBTSxTQUFJLFVBNEZyQztDQUNGIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"test_executor_metrics.d.ts","sourceRoot":"","sources":["../../src/public/test_executor_metrics.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"test_executor_metrics.d.ts","sourceRoot":"","sources":["../../src/public/test_executor_metrics.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,KAAK,cAAc,EAAgB,MAAM,uBAAuB,CAAC;AAEvF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAIjD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAEhF,MAAM,WAAW,yBAAyB;IACxC,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,yBAAyB,EAAE,MAAM,CAAC;IAClC,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,eAAe;IAE9B,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,yBAAyB,EAAE,MAAM,CAAC;IAClC,gCAAgC,EAAE,MAAM,GAAG,SAAS,CAAC;IACrD,6BAA6B,EAAE,MAAM,GAAG,SAAS,CAAC;IAClD,aAAa,EAAE,yBAAyB,EAAE,CAAC;IAC3C,YAAY,EAAE,UAAU,GAAG,SAAS,CAAC;IAErC,sBAAsB,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3C,mBAAmB,EAAE,MAAM,GAAG,SAAS,CAAC;IACxC,2BAA2B,EAAE,MAAM,GAAG,SAAS,CAAC;IAEhD,6BAA6B,EAAE,MAAM,GAAG,SAAS,CAAC;IAClD,uBAAuB,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5C,iBAAiB,EAAE,MAAM,GAAG,SAAS,CAAC;IACtC,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,6BAA6B,EAAE,MAAM,GAAG,SAAS,CAAC;IAClD,wCAAwC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7D,wBAAwB,EAAE,MAAM,GAAG,SAAS,CAAC;CAC9C;AAWD,oBAAY,qBAAqB;IAC/B,GAAG,IAAA;IACH,MAAM,IAAA;IACN,SAAS,IAAA;IACT,YAAY,IAAA;IACZ,OAAO,IAAA;CACR;AA2BD,qBAAa,mBAAoB,YAAW,wBAAwB;;IAClE,OAAO,CAAC,MAAM,CAAS;IAEvB,OAAO,CAAC,SAAS,CAA2C;IAC5D,OAAO,CAAC,cAAc,CAAqB;IAC3C,OAAO,CAAC,OAAO,CAAoB;IAEnC,YAAY,QAAQ,CAAC,EAAE,cAAc,EAEpC;IAED,0BAA0B,CAAC,OAAO,EAAE,MAAM,QAMzC;IAED,yBAAyB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,EAAE,YAAY,CAAC,EAAE,UAAU,QAgBtF;IAED,4BAA4B,CAC1B,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,yBAAyB,EAAE,MAAM,QAGlC;IAED,mCAAmC,CACjC,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,yBAAyB,EAAE,MAAM,QAGlC;IAoBD,6BAA6B,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,GAAG,gBAAgB,QAgBtF;IAED,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,eAAe,CAAC,QAUrE;IAED,WAAW,CAAC,MAAM,GAAE,qBAAiD,QAEpE;IAED,cAAc,CAAC,MAAM,GAAE,qBAAiD,UA+EvE;IA0BD,MAAM,CAAC,MAAM,SAAI,UAEhB;IAED,2BAA2B,CAAC,MAAM,SAAI,UA4FrC;CACF"}

package/dest/public/test_executor_metrics.js

@@ -24,7 +24,6 @@ function createEmptyTxMetrics() {
         totalDurationMs: 0,
         manaUsed: 0,
         totalInstructionsExecuted: 0,
-        bytecodeSizes: [],
         nonRevertiblePrivateInsertionsUs: undefined,
         revertiblePrivateInsertionsUs: undefined,
         enqueuedCalls: [],
@@ -100,14 +99,6 @@ export class TestExecutorMetrics {
             txMetrics.nonRevertiblePrivateInsertionsUs = durationUs;
         }
     }
-    recordBytecodeSize(txLabel, contractName, sizeBytes) {
-        const txMetrics = this.txMetrics.get(txLabel);
-        assert(txMetrics, `Cannot record bytecode size for unknown tx label: ${txLabel}`);
-        txMetrics.bytecodeSizes.push({
-            contractName,
-            sizeBytes
-        });
-    }
     recordProverMetrics(txLabel, metrics) {
         if (!this.txMetrics.has(txLabel)) {
             this.txMetrics.set(txLabel, createEmptyTxMetrics());
@@ -141,12 +132,6 @@ export class TestExecutorMetrics {
             if (filter === 3 || filter === 1 || filter === 0) {
                 pretty += `${INDENT0}Total instructions executed: ${fmtNum(txMetrics.totalInstructionsExecuted)}\n`;
             }
-            if ((filter === 1 || filter === 0) && txMetrics.bytecodeSizes.length > 0) {
-                pretty += `${INDENT0}Bytecode sizes:\n`;
-                for (const { contractName, sizeBytes } of txMetrics.bytecodeSizes){
-                    pretty += `${INDENT1}${contractName}: ${fmtNum(sizeBytes, 'bytes')}\n`;
-                }
-            }
             if (filter === 2 || filter === 0) {
                 pretty += `${INDENT0}Private insertions:\n`;
                 pretty += `${INDENT1}Non-revertible: ${fmtNum(txMetrics.nonRevertiblePrivateInsertionsUs / 1_000, 'ms')}\n`;
@@ -313,13 +298,6 @@ export class TestExecutorMetrics {
                     });
                 }
             }
-            for (const { contractName, sizeBytes } of txMetrics.bytecodeSizes){
-                data.push({
-                    name: `${txLabel}/bytecodeSizeBytes/${contractName}`,
-                    value: sizeBytes,
-                    unit: 'bytes'
-                });
-            }
         }
         return JSON.stringify(data, null, indent);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/simulator",
-  "version": "0.0.1-commit.b9865e97",
+  "version": "0.0.1-commit.be03c316",
   "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.b9865e97",
-    "@aztec/foundation": "0.0.1-commit.b9865e97",
-    "@aztec/native": "0.0.1-commit.b9865e97",
-    "@aztec/noir-acvm_js": "0.0.1-commit.b9865e97",
-    "@aztec/noir-noirc_abi": "0.0.1-commit.b9865e97",
-    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.b9865e97",
-    "@aztec/noir-types": "0.0.1-commit.b9865e97",
-    "@aztec/protocol-contracts": "0.0.1-commit.b9865e97",
-    "@aztec/standard-contracts": "0.0.1-commit.b9865e97",
-    "@aztec/stdlib": "0.0.1-commit.b9865e97",
-    "@aztec/telemetry-client": "0.0.1-commit.b9865e97",
-    "@aztec/world-state": "0.0.1-commit.b9865e97",
+    "@aztec/bb-avm-sim": "0.0.1-commit.be03c316",
+    "@aztec/constants": "0.0.1-commit.be03c316",
+    "@aztec/foundation": "0.0.1-commit.be03c316",
+    "@aztec/ipc-runtime": "0.0.1-commit.be03c316",
+    "@aztec/native": "0.0.1-commit.be03c316",
+    "@aztec/noir-acvm_js": "0.0.1-commit.be03c316",
+    "@aztec/noir-noirc_abi": "0.0.1-commit.be03c316",
+    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.be03c316",
+    "@aztec/noir-types": "0.0.1-commit.be03c316",
+    "@aztec/protocol-contracts": "0.0.1-commit.be03c316",
+    "@aztec/standard-contracts": "0.0.1-commit.be03c316",
+    "@aztec/stdlib": "0.0.1-commit.be03c316",
+    "@aztec/telemetry-client": "0.0.1-commit.be03c316",
+    "@aztec/world-state": "0.0.1-commit.be03c316",
     "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.b9865e97",
-    "@aztec/noir-contracts.js": "0.0.1-commit.b9865e97",
-    "@aztec/noir-test-contracts.js": "0.0.1-commit.b9865e97",
+    "@aztec/kv-store": "0.0.1-commit.be03c316",
+    "@aztec/noir-contracts.js": "0.0.1-commit.be03c316",
+    "@aztec/noir-test-contracts.js": "0.0.1-commit.be03c316",
     "@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';