@aztec/simulator 0.0.1-commit.fce3e4f → 0.0.1-commit.ff7989d6c

package/dest/public/public_tx_simulator/cpp_public_tx_simulator.js

@@ -1,25 +1,26 @@
-import { createLogger } from '@aztec/foundation/log';
-import { writeTestData } from '@aztec/foundation/testing/files';
-import { avmSimulate, avmSimulateWithHintedDbs } from '@aztec/native';
+import { createLogger, logLevel } from '@aztec/foundation/log';
+import { sleep } from '@aztec/foundation/sleep';
+import { avmSimulate, cancelSimulation, createCancellationToken } from '@aztec/native';
 import { ProtocolContractsList } from '@aztec/protocol-contracts';
-import { AvmCircuitInputs, AvmFastSimulationInputs, AvmTxHint, PublicTxResult, deserializeFromMessagePack } from '@aztec/stdlib/avm';
+import { AvmFastSimulationInputs, AvmTxHint, PublicTxResult, deserializeFromMessagePack } from '@aztec/stdlib/avm';
 import { SimulationError } from '@aztec/stdlib/errors';
 import { WorldStateRevisionWithHandle } from '@aztec/stdlib/world-state';
+import { getTelemetryClient } from '@aztec/telemetry-client';
 import { strict as assert } from 'assert';
+import { ExecutorMetrics } from '../executor_metrics.js';
 import { ContractProviderForCpp } from './contract_provider_for_cpp.js';
 import { PublicTxSimulator } from './public_tx_simulator.js';
 /**
  * C++ implementation of PublicTxSimulator using the C++ 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.
- *
- * TODO(dbanks12): for now this still simulates first in TS to generate hints and public inputs,
- * since the C++ simulator doesn't have hinting & PI generation logic yet.
  */ export class CppPublicTxSimulator extends PublicTxSimulator {
     log;
-    constructor(merkleTree, contractsDB, globalVariables, config){
-        super(merkleTree, contractsDB, globalVariables, config);
-        this.log = createLogger(`simulator:cpp_public_tx_simulator`);
+    /** Current cancellation token for in-flight simulation. */ cancellationToken;
+    /** Current simulation promise, used to wait for completion after cancellation. */ simulationPromise;
+    constructor(merkleTree, contractsDB, globalVariables, config, bindings){
+        super(merkleTree, contractsDB, globalVariables, config, undefined, bindings);
+        this.log = createLogger(`simulator:cpp_public_tx_simulator`, bindings);
     }
     /**
    * Simulate a transaction's public portion using the C++ avvm simulator.
@@ -31,171 +32,82 @@ import { PublicTxSimulator } from './public_tx_simulator.js';
         this.log.debug(`C++ simulation of ${tx.publicFunctionCalldata.length} public calls for tx ${txHash}`, {
             txHash
         });
-        // TODO(dbanks12): remove the first run with TS that hints!
-        // Run TS simulation to generate hints and public inputs
-        this.log.debug(`Running TS simulation for tx ${txHash}`);
-        // create checkpoint for ws
-        let tsResult;
-        let tsStateRef;
-        await this.merkleTree.createCheckpoint();
-        this.contractsDB.createCheckpoint();
-        try {
-            // Run the full TypeScript simulation using the parent class
-            // This will modify the merkle tree with the transaction's state changes
-            tsResult = await super.simulate(tx);
-            this.log.debug(`TS simulation completed for tx ${txHash}`);
-            tsStateRef = await this.merkleTree.getStateReference(); // capture tree roots for later comparsion
-        } catch (error) {
-            this.log.warn(`TS simulation failed, but still continuing with C++ simulation: ${error.message} ${error.stack}`);
-        } finally{
-            // revert checkpoint for ws and clear contract db changes
-            // (cpp should reapply exactly the same changes if there are no bugs)
-            await this.merkleTree.revertCheckpoint();
-            this.contractsDB.revertCheckpoint();
-        }
-        this.log.debug(`Running C++ simulation for tx ${txHash}`);
         // Using the "as WorldStateRevisionWithHandle" is a bit of a "trust me bro", hence the assert.
         let wsRevision = this.merkleTree.getRevision();
         assert(wsRevision instanceof WorldStateRevisionWithHandle, 'CppPublicTxSimulator a real NativeWorldStateInstance with a handle to the C++ WorldState object');
         const wsCppHandle = wsRevision.handle;
         wsRevision = wsRevision.toWorldStateRevision(); // for msgpack serialization, we don't include the handle in the type
-        this.log.debug(`Running C++ simulation with world state revision ${JSON.stringify(wsRevision)}`);
+        this.log.trace(`Running C++ simulation with world state revision ${JSON.stringify(wsRevision)}`);
         // 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);
+        const contractProvider = new ContractProviderForCpp(this.contractsDB, this.globalVariables, this.bindings);
         // Serialize to msgpack and call the C++ simulator
-        this.log.verbose(`Serializing fast simulation inputs to msgpack...`);
+        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, wsCppHandle, logLevel, // TODO: re-enable logging
+        undefined, this.cancellationToken);
         let resultBuffer;
         try {
-            this.log.verbose(`Calling C++ simulator for tx ${txHash}`);
-            resultBuffer = await avmSimulate(inputBuffer, contractProvider, wsCppHandle);
+            resultBuffer = await this.simulationPromise;
         } catch (error) {
+            // Check if this was a cancellation
+            if (error.message?.includes('Simulation cancelled')) {
+                throw new SimulationError(`C++ simulation cancelled`, []);
+            }
             throw new SimulationError(`C++ simulation failed: ${error.message}`, []);
+        } finally{
+            this.cancellationToken = undefined;
+            this.simulationPromise = undefined;
         }
         // If we've reached this point, C++ succeeded during simulation,
-        // so we assert that TS also succeeded.
-        assert(tsResult !== undefined, 'TS simulation should have succeeded if C++ succeeded');
-        assert(tsStateRef !== undefined, 'TS state reference should have been captured if C++ succeeded');
         // Deserialize the msgpack result
-        this.log.verbose(`Deserializing C++ from buffer (size: ${resultBuffer.length})...`);
+        this.log.trace(`Deserializing C++ from buffer (size: ${resultBuffer.length})...`);
         const cppResultJSON = deserializeFromMessagePack(resultBuffer);
-        // Write testdata if AZTEC_WRITE_TESTDATA=1.
-        writeTestData(`barretenberg/cpp/src/barretenberg/vm2/testing/tx_result_${txHash}.testdata.bin`, resultBuffer, /*raw=*/ true);
-        this.log.verbose(`Deserializing C++ result to PublicTxResult...`);
+        this.log.trace(`Deserializing C++ result to PublicTxResult...`);
         const cppResult = PublicTxResult.fromPlainObject(cppResultJSON);
-        this.log.verbose(`Done.`);
-        // TODO(fcarreiro): complete this.
-        assert(cppResult.revertCode.equals(tsResult.revertCode));
-        assert(cppResult.gasUsed.totalGas.equals(tsResult.gasUsed.totalGas));
-        assert(cppResult.gasUsed.publicGas.equals(tsResult.gasUsed.publicGas));
-        assert(cppResult.gasUsed.teardownGas.equals(tsResult.gasUsed.teardownGas));
-        assert(cppResult.gasUsed.billedGas.equals(tsResult.gasUsed.billedGas));
-        assert(cppResult.publicInputs.toBuffer().equals(tsResult.publicInputs.toBuffer()));
-        if (this.config?.collectCallMetadata) {
-            assert(cppResult.appLogicReturnValues.length == tsResult.appLogicReturnValues.length);
-            assert(cppResult.appLogicReturnValues.every((v, i)=>v.equals(tsResult.appLogicReturnValues[i])));
-        }
-        // Confirm that tree roots match
-        const cppStateRef = await this.merkleTree.getStateReference();
-        assert(cppStateRef.equals(tsStateRef), `Tree roots mismatch between TS and C++ public simulations for tx ${txHash}`);
-        this.log.debug(`C++ simulation completed for tx ${txHash}`, {
+        this.log.trace(`C++ simulation completed for tx ${txHash}`, {
             txHash,
-            reverted: !tsResult.revertCode.isOK(),
-            tsGasUsed: tsResult.gasUsed.totalGas.l2Gas,
-            cppGasUsed: tsResult.gasUsed.totalGas.l2Gas
+            reverted: !cppResult.revertCode.isOK(),
+            cppGasUsed: cppResult.gasUsed.totalGas.l2Gas
         });
-        // TODO(dbanks12): C++ should return PublicTxResult (or something similar)
-        return tsResult;
-    }
-}
-export class MeasuredCppPublicTxSimulator extends CppPublicTxSimulator {
-    metrics;
-    constructor(merkleTree, contractsDB, globalVariables, metrics, config){
-        super(merkleTree, contractsDB, globalVariables, config), this.metrics = metrics;
-    }
-    async simulate(tx, txLabel = 'unlabeledTx') {
-        this.metrics.startRecordingTxSimulation(txLabel);
-        let result;
-        try {
-            result = await super.simulate(tx);
-        } finally{
-            this.metrics.stopRecordingTxSimulation(txLabel, result?.gasUsed, result?.revertCode);
-        }
-        return result;
-    }
-}
-/**
- * C++ implementation of PublicTxSimulator using pre-collected hints.
- * This implementation runs TS simulation first to collect all hints,
- * then passes the complete AvmCircuitInputs (hints + public inputs)
- * to C++ to run hinted simulation.
- */ export class CppPublicTxSimulatorHintedDbs extends PublicTxSimulator {
-    log;
-    constructor(merkleTree, contractsDB, globalVariables, config){
-        super(merkleTree, contractsDB, globalVariables, config);
-        this.log = createLogger(`simulator:cpp_public_tx_simulator_hinted_dbs`);
+        return cppResult;
     }
     /**
-   * Simulate a transaction's public portion using the C++ vm2 simulator with hinted DBs.
-   *
-   * This implementation:
-   * 1. Runs the full TypeScript simulation to generate AvmCircuitInputs (hints + public inputs)
-   * 2. Passes the complete AvmCircuitInputs to C++ to run hinted simulation
+   * 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.
    *
-   * @param tx - The transaction to simulate.
-   * @returns The result of the transaction's public execution.
-   */ async simulate(tx) {
-        const txHash = this.computeTxHash(tx);
-        this.log.debug(`C++ hinted DB simulation of ${tx.publicFunctionCalldata.length} public calls for tx ${txHash}`, {
-            txHash
-        });
-        // First, run TS simulation to generate hints and public inputs
-        this.log.debug(`Running TS simulation for tx ${txHash}`);
-        // Run the full TypeScript simulation using the parent class
-        // This will modify the merkle tree with the transaction's state changes
-        const tsResult = await super.simulate(tx);
-        this.log.debug(`TS simulation succeeded for tx ${txHash}`);
-        // Extract the full AvmCircuitInputs from the TS result
-        const avmCircuitInputs = new AvmCircuitInputs(tsResult.hints, tsResult.publicInputs);
-        // Second, run C++ simulation with hinted DBs
-        this.log.debug(`Running C++ simulation with hinted DBs for tx ${txHash}`);
-        // Serialize to msgpack and call the C++ simulator
-        const inputBuffer = avmCircuitInputs.serializeWithMessagePack();
-        let resultBuffer;
-        try {
-            resultBuffer = await avmSimulateWithHintedDbs(inputBuffer);
-        } catch (error) {
-            throw new SimulationError(`C++ hinted simulation failed: ${error.message}`, []);
+   * @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.
+   *                        Default timeout of 100ms after cancellation.
+   */ async cancel(waitTimeoutMs = 100) {
+        if (this.cancellationToken) {
+            this.log.debug('Cancelling C++ simulation');
+            cancelSimulation(this.cancellationToken);
+        }
+        // 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`);
+            await Promise.race([
+                this.simulationPromise.catch(()=>{}),
+                sleep(waitTimeoutMs)
+            ]);
+            this.log.debug('C++ simulation stopped or wait timed out');
         }
-        // Deserialize the msgpack result
-        const cppResultJSON = deserializeFromMessagePack(resultBuffer);
-        const cppResult = PublicTxResult.fromPlainObject(cppResultJSON);
-        assert(cppResult.revertCode.equals(tsResult.revertCode));
-        assert(cppResult.gasUsed.totalGas.equals(tsResult.gasUsed.totalGas));
-        this.log.debug(`C++ hinted simulation completed for tx ${txHash}`, {
-            txHash,
-            reverted: !tsResult.revertCode.isOK(),
-            tsGasUsed: tsResult.gasUsed.totalGas.l2Gas,
-            cppGasUsed: tsResult.gasUsed.totalGas.l2Gas
-        });
-        // TODO(fcarreiro): complete this.
-        return tsResult;
     }
 }
-/**
- * Class to record metrics for simulation.
- *
- * Note(dbanks12): We might not be able to collect all the same metrics in C++ as we do in TS!
- * Unless we move some of the metrics collection to C++, we don't have inner functions exposed
- * to TS for tracking.
- */ export class MeasuredCppPublicTxSimulatorHintedDbs extends CppPublicTxSimulatorHintedDbs {
+export class MeasuredCppPublicTxSimulator extends CppPublicTxSimulator {
     metrics;
-    constructor(merkleTree, contractsDB, globalVariables, metrics, config){
-        super(merkleTree, contractsDB, globalVariables, config), this.metrics = metrics;
+    constructor(merkleTree, contractsDB, globalVariables, metrics, config, bindings){
+        super(merkleTree, contractsDB, globalVariables, config, bindings), this.metrics = metrics;
     }
     async simulate(tx, txLabel = 'unlabeledTx') {
         this.metrics.startRecordingTxSimulation(txLabel);
@@ -208,3 +120,13 @@ export class MeasuredCppPublicTxSimulator extends CppPublicTxSimulator {
         return result;
     }
 }
+/**
+ * A C++ public tx simulator that tracks runtime/production metrics with telemetry.
+ */ export class TelemetryCppPublicTxSimulator extends MeasuredCppPublicTxSimulator {
+    /* tracer needed by trackSpans */ tracer;
+    constructor(merkleTree, contractsDB, globalVariables, telemetryClient = getTelemetryClient(), config, bindings){
+        const metrics = new ExecutorMetrics(telemetryClient, 'CppPublicTxSimulator');
+        super(merkleTree, contractsDB, globalVariables, metrics, config, bindings);
+        this.tracer = metrics.tracer;
+    }
+}

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

@@ -0,0 +1,42 @@
+import { type Logger, type LoggerBindings } from '@aztec/foundation/log';
+import { type PublicSimulatorConfig, PublicTxResult } from '@aztec/stdlib/avm';
+import type { MerkleTreeWriteOperations } from '@aztec/stdlib/trees';
+import type { GlobalVariables, Tx } from '@aztec/stdlib/tx';
+import type { ExecutorMetricsInterface } from '../executor_metrics_interface.js';
+import type { PublicContractsDB } from '../public_db_sources.js';
+import { PublicTxSimulator } from './public_tx_simulator.js';
+import type { MeasuredPublicTxSimulatorInterface, PublicTxSimulatorInterface } from './public_tx_simulator_interface.js';
+/**
+ * C++ implementation of PublicTxSimulator using pre-collected hints.
+ * This implementation runs TS simulation first to collect all hints,
+ * then passes the complete AvmCircuitInputs (hints + public inputs)
+ * to C++ to run hinted simulation.
+ */
+export declare class CppPublicTxSimulatorHintedDbs extends PublicTxSimulator implements PublicTxSimulatorInterface {
+    protected log: Logger;
+    constructor(merkleTree: MerkleTreeWriteOperations, contractsDB: PublicContractsDB, globalVariables: GlobalVariables, config?: Partial<PublicSimulatorConfig>, bindings?: LoggerBindings);
+    /**
+     * Simulate a transaction's public portion using the C++ vm2 simulator with hinted DBs.
+     *
+     * This implementation:
+     * 1. Runs the full TypeScript simulation to generate AvmCircuitInputs (hints + public inputs)
+     * 2. Passes the complete AvmCircuitInputs to C++ to run hinted simulation
+     *
+     * @param tx - The transaction to simulate.
+     * @returns The result of the transaction's public execution.
+     */
+    simulate(tx: Tx): Promise<PublicTxResult>;
+}
+/**
+ * Class to record metrics for simulation.
+ *
+ * Note(dbanks12): We might not be able to collect all the same metrics in C++ as we do in TS!
+ * Unless we move some of the metrics collection to C++, we don't have inner functions exposed
+ * to TS for tracking.
+ */
+export declare class MeasuredCppPublicTxSimulatorHintedDbs extends CppPublicTxSimulatorHintedDbs implements MeasuredPublicTxSimulatorInterface {
+    protected readonly metrics: ExecutorMetricsInterface;
+    constructor(merkleTree: MerkleTreeWriteOperations, contractsDB: PublicContractsDB, globalVariables: GlobalVariables, metrics: ExecutorMetricsInterface, config?: Partial<PublicSimulatorConfig>, bindings?: LoggerBindings);
+    simulate(tx: Tx, txLabel?: string): Promise<PublicTxResult>;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3BwX3B1YmxpY190eF9zaW11bGF0b3Jfd2l0aF9oaW50ZWRfZGJzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcHVibGljL3B1YmxpY190eF9zaW11bGF0b3IvY3BwX3B1YmxpY190eF9zaW11bGF0b3Jfd2l0aF9oaW50ZWRfZGJzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBRSxLQUFLLGNBQWMsRUFBMEIsTUFBTSx1QkFBdUIsQ0FBQztBQUVqRyxPQUFPLEVBRUwsS0FBSyxxQkFBcUIsRUFDMUIsY0FBYyxFQUVmLE1BQU0sbUJBQW1CLENBQUM7QUFFM0IsT0FBTyxLQUFLLEVBQUUseUJBQXlCLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNyRSxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsRUFBRSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFJNUQsT0FBTyxLQUFLLEVBQUUsd0JBQXdCLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQztBQUNqRixPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ2pFLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQzdELE9BQU8sS0FBSyxFQUNWLGtDQUFrQyxFQUNsQywwQkFBMEIsRUFDM0IsTUFBTSxvQ0FBb0MsQ0FBQztBQUU1Qzs7Ozs7R0FLRztBQUNILHFCQUFhLDZCQUE4QixTQUFRLGlCQUFrQixZQUFXLDBCQUEwQjtJQUN4RyxVQUFtQixHQUFHLEVBQUUsTUFBTSxDQUFDO0lBRS9CLFlBQ0UsVUFBVSxFQUFFLHlCQUF5QixFQUNyQyxXQUFXLEVBQUUsaUJBQWlCLEVBQzlCLGVBQWUsRUFBRSxlQUFlLEVBQ2hDLE1BQU0sQ0FBQyxFQUFFLE9BQU8sQ0FBQyxxQkFBcUIsQ0FBQyxFQUN2QyxRQUFRLENBQUMsRUFBRSxjQUFjLEVBSTFCO0lBRUQ7Ozs7Ozs7OztPQVNHO0lBQ21CLFFBQVEsQ0FBQyxFQUFFLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxjQUFjLENBQUMsQ0E4QzlEO0NBQ0Y7QUFFRDs7Ozs7O0dBTUc7QUFDSCxxQkFBYSxxQ0FDWCxTQUFRLDZCQUNSLFlBQVcsa0NBQWtDO0lBTTNDLFNBQVMsQ0FBQyxRQUFRLENBQUMsT0FBTyxFQUFFLHdCQUF3QjtJQUp0RCxZQUNFLFVBQVUsRUFBRSx5QkFBeUIsRUFDckMsV0FBVyxFQUFFLGlCQUFpQixFQUM5QixlQUFlLEVBQUUsZUFBZSxFQUNiLE9BQU8sRUFBRSx3QkFBd0IsRUFDcEQsTUFBTSxDQUFDLEVBQUUsT0FBTyxDQUFDLHFCQUFxQixDQUFDLEVBQ3ZDLFFBQVEsQ0FBQyxFQUFFLGNBQWMsRUFHMUI7SUFFcUIsUUFBUSxDQUFDLEVBQUUsRUFBRSxFQUFFLEVBQUUsT0FBTyxHQUFFLE1BQXNCLEdBQUcsT0FBTyxDQUFDLGNBQWMsQ0FBQyxDQVMvRjtDQUNGIn0=

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

@@ -0,0 +1 @@
+{"version":3,"file":"cpp_public_tx_simulator_with_hinted_dbs.d.ts","sourceRoot":"","sources":["../../../src/public/public_tx_simulator/cpp_public_tx_simulator_with_hinted_dbs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,cAAc,EAA0B,MAAM,uBAAuB,CAAC;AAEjG,OAAO,EAEL,KAAK,qBAAqB,EAC1B,cAAc,EAEf,MAAM,mBAAmB,CAAC;AAE3B,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AACrE,OAAO,KAAK,EAAE,eAAe,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAI5D,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AACjF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,KAAK,EACV,kCAAkC,EAClC,0BAA0B,EAC3B,MAAM,oCAAoC,CAAC;AAE5C;;;;;GAKG;AACH,qBAAa,6BAA8B,SAAQ,iBAAkB,YAAW,0BAA0B;IACxG,UAAmB,GAAG,EAAE,MAAM,CAAC;IAE/B,YACE,UAAU,EAAE,yBAAyB,EACrC,WAAW,EAAE,iBAAiB,EAC9B,eAAe,EAAE,eAAe,EAChC,MAAM,CAAC,EAAE,OAAO,CAAC,qBAAqB,CAAC,EACvC,QAAQ,CAAC,EAAE,cAAc,EAI1B;IAED;;;;;;;;;OASG;IACmB,QAAQ,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC,CA8C9D;CACF;AAED;;;;;;GAMG;AACH,qBAAa,qCACX,SAAQ,6BACR,YAAW,kCAAkC;IAM3C,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,wBAAwB;IAJtD,YACE,UAAU,EAAE,yBAAyB,EACrC,WAAW,EAAE,iBAAiB,EAC9B,eAAe,EAAE,eAAe,EACb,OAAO,EAAE,wBAAwB,EACpD,MAAM,CAAC,EAAE,OAAO,CAAC,qBAAqB,CAAC,EACvC,QAAQ,CAAC,EAAE,cAAc,EAG1B;IAEqB,QAAQ,CAAC,EAAE,EAAE,EAAE,EAAE,OAAO,GAAE,MAAsB,GAAG,OAAO,CAAC,cAAc,CAAC,CAS/F;CACF"}

package/dest/public/public_tx_simulator/cpp_public_tx_simulator_with_hinted_dbs.js

@@ -0,0 +1,86 @@
+import { createLogger, logLevel } from '@aztec/foundation/log';
+import { avmSimulateWithHintedDbs } from '@aztec/native';
+import { AvmCircuitInputs, PublicTxResult, deserializeFromMessagePack } from '@aztec/stdlib/avm';
+import { SimulationError } from '@aztec/stdlib/errors';
+import { strict as assert } from 'assert';
+import { PublicTxSimulator } from './public_tx_simulator.js';
+/**
+ * C++ implementation of PublicTxSimulator using pre-collected hints.
+ * This implementation runs TS simulation first to collect all hints,
+ * then passes the complete AvmCircuitInputs (hints + public inputs)
+ * to C++ to run hinted simulation.
+ */ export class CppPublicTxSimulatorHintedDbs extends PublicTxSimulator {
+    log;
+    constructor(merkleTree, contractsDB, globalVariables, config, bindings){
+        super(merkleTree, contractsDB, globalVariables, config, undefined, bindings);
+        this.log = createLogger(`simulator:cpp_public_tx_simulator_hinted_dbs`, bindings);
+    }
+    /**
+   * Simulate a transaction's public portion using the C++ vm2 simulator with hinted DBs.
+   *
+   * This implementation:
+   * 1. Runs the full TypeScript simulation to generate AvmCircuitInputs (hints + public inputs)
+   * 2. Passes the complete AvmCircuitInputs to C++ to run hinted simulation
+   *
+   * @param tx - The transaction to simulate.
+   * @returns The result of the transaction's public execution.
+   */ async simulate(tx) {
+        const txHash = this.computeTxHash(tx);
+        this.log.debug(`C++ hinted DB simulation of ${tx.publicFunctionCalldata.length} public calls for tx ${txHash}`, {
+            txHash
+        });
+        // First, run TS simulation to generate hints and public inputs
+        this.log.debug(`Running TS simulation for tx ${txHash}`);
+        // Run the full TypeScript simulation using the parent class
+        // This will modify the merkle tree with the transaction's state changes
+        const tsResult = await super.simulate(tx);
+        this.log.debug(`TS simulation succeeded for tx ${txHash}`);
+        // Extract the full AvmCircuitInputs from the TS result
+        const avmCircuitInputs = new AvmCircuitInputs(tsResult.hints, tsResult.publicInputs);
+        // Second, run C++ simulation with hinted DBs
+        this.log.debug(`Running C++ simulation with hinted DBs for tx ${txHash}`);
+        // Serialize to msgpack and call the C++ simulator
+        const inputBuffer = avmCircuitInputs.serializeWithMessagePack();
+        let resultBuffer;
+        try {
+            resultBuffer = await avmSimulateWithHintedDbs(inputBuffer, logLevel);
+        } catch (error) {
+            throw new SimulationError(`C++ hinted simulation failed: ${error.message}`, []);
+        }
+        // Deserialize the msgpack result
+        const cppResultJSON = deserializeFromMessagePack(resultBuffer);
+        const cppResult = PublicTxResult.fromPlainObject(cppResultJSON);
+        assert(cppResult.revertCode.equals(tsResult.revertCode));
+        assert(cppResult.gasUsed.totalGas.equals(tsResult.gasUsed.totalGas));
+        this.log.debug(`C++ hinted simulation completed for tx ${txHash}`, {
+            txHash,
+            reverted: !tsResult.revertCode.isOK(),
+            tsGasUsed: tsResult.gasUsed.totalGas.l2Gas,
+            cppGasUsed: tsResult.gasUsed.totalGas.l2Gas
+        });
+        // TODO(fcarreiro): complete this.
+        return tsResult;
+    }
+}
+/**
+ * Class to record metrics for simulation.
+ *
+ * Note(dbanks12): We might not be able to collect all the same metrics in C++ as we do in TS!
+ * Unless we move some of the metrics collection to C++, we don't have inner functions exposed
+ * to TS for tracking.
+ */ export class MeasuredCppPublicTxSimulatorHintedDbs extends CppPublicTxSimulatorHintedDbs {
+    metrics;
+    constructor(merkleTree, contractsDB, globalVariables, metrics, config, bindings){
+        super(merkleTree, contractsDB, globalVariables, config, bindings), this.metrics = metrics;
+    }
+    async simulate(tx, txLabel = 'unlabeledTx') {
+        this.metrics.startRecordingTxSimulation(txLabel);
+        let result;
+        try {
+            result = await super.simulate(tx);
+        } finally{
+            this.metrics.stopRecordingTxSimulation(txLabel, result?.gasUsed, result?.revertCode);
+        }
+        return result;
+    }
+}

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

@@ -0,0 +1,30 @@
+import { type Logger, type LoggerBindings } from '@aztec/foundation/log';
+import { type PublicSimulatorConfig, PublicTxResult } from '@aztec/stdlib/avm';
+import type { MerkleTreeWriteOperations } from '@aztec/stdlib/trees';
+import type { GlobalVariables, Tx } from '@aztec/stdlib/tx';
+import type { ExecutorMetricsInterface } from '../executor_metrics_interface.js';
+import type { PublicContractsDB } from '../public_db_sources.js';
+import { PublicTxSimulator } from './public_tx_simulator.js';
+import type { MeasuredPublicTxSimulatorInterface, PublicTxSimulatorInterface } from './public_tx_simulator_interface.js';
+/**
+ * An implementation of PublicTxSimulator that first simulates in C++, then TS, an compares the results.
+ * 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.
+ */
+export declare class CppVsTsPublicTxSimulator extends PublicTxSimulator implements PublicTxSimulatorInterface {
+    protected log: Logger;
+    constructor(merkleTree: MerkleTreeWriteOperations, contractsDB: PublicContractsDB, globalVariables: GlobalVariables, config?: Partial<PublicSimulatorConfig>, bindings?: LoggerBindings);
+    /**
+     * Simulate a transaction's public portion using the C++ avvm simulator.
+     *
+     * @param tx - The transaction to simulate.
+     * @returns The result of the transaction's public execution.
+     */
+    simulate(tx: Tx): Promise<PublicTxResult>;
+}
+export declare class MeasuredCppVsTsPublicTxSimulator extends CppVsTsPublicTxSimulator implements MeasuredPublicTxSimulatorInterface {
+    protected readonly metrics: ExecutorMetricsInterface;
+    constructor(merkleTree: MerkleTreeWriteOperations, contractsDB: PublicContractsDB, globalVariables: GlobalVariables, metrics: ExecutorMetricsInterface, config?: Partial<PublicSimulatorConfig>, bindings?: LoggerBindings);
+    simulate(tx: Tx, txLabel?: string): Promise<PublicTxResult>;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3BwX3ZzX3RzX3B1YmxpY190eF9zaW11bGF0b3IuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9wdWJsaWMvcHVibGljX3R4X3NpbXVsYXRvci9jcHBfdnNfdHNfcHVibGljX3R4X3NpbXVsYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQUUsS0FBSyxjQUFjLEVBQTBCLE1BQU0sdUJBQXVCLENBQUM7QUFHakcsT0FBTyxFQUdMLEtBQUsscUJBQXFCLEVBQzFCLGNBQWMsRUFFZixNQUFNLG1CQUFtQixDQUFDO0FBRTNCLE9BQU8sS0FBSyxFQUFFLHlCQUF5QixFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDckUsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFrQixFQUFFLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUs1RSxPQUFPLEtBQUssRUFBRSx3QkFBd0IsRUFBRSxNQUFNLGtDQUFrQyxDQUFDO0FBQ2pGLE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFakUsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDN0QsT0FBTyxLQUFLLEVBQ1Ysa0NBQWtDLEVBQ2xDLDBCQUEwQixFQUMzQixNQUFNLG9DQUFvQyxDQUFDO0FBRTVDOzs7O0dBSUc7QUFDSCxxQkFBYSx3QkFBeUIsU0FBUSxpQkFBa0IsWUFBVywwQkFBMEI7SUFDbkcsVUFBbUIsR0FBRyxFQUFFLE1BQU0sQ0FBQztJQUUvQixZQUNFLFVBQVUsRUFBRSx5QkFBeUIsRUFDckMsV0FBVyxFQUFFLGlCQUFpQixFQUM5QixlQUFlLEVBQUUsZUFBZSxFQUNoQyxNQUFNLENBQUMsRUFBRSxPQUFPLENBQUMscUJBQXFCLENBQUMsRUFDdkMsUUFBUSxDQUFDLEVBQUUsY0FBYyxFQUkxQjtJQUVEOzs7OztPQUtHO0lBQ21CLFFBQVEsQ0FBQyxFQUFFLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxjQUFjLENBQUMsQ0ErSjlEO0NBQ0Y7QUFFRCxxQkFBYSxnQ0FDWCxTQUFRLHdCQUNSLFlBQVcsa0NBQWtDO0lBTTNDLFNBQVMsQ0FBQyxRQUFRLENBQUMsT0FBTyxFQUFFLHdCQUF3QjtJQUp0RCxZQUNFLFVBQVUsRUFBRSx5QkFBeUIsRUFDckMsV0FBVyxFQUFFLGlCQUFpQixFQUM5QixlQUFlLEVBQUUsZUFBZSxFQUNiLE9BQU8sRUFBRSx3QkFBd0IsRUFDcEQsTUFBTSxDQUFDLEVBQUUsT0FBTyxDQUFDLHFCQUFxQixDQUFDLEVBQ3ZDLFFBQVEsQ0FBQyxFQUFFLGNBQWMsRUFHMUI7SUFFcUIsUUFBUSxDQUFDLEVBQUUsRUFBRSxFQUFFLEVBQUUsT0FBTyxHQUFFLE1BQXNCLEdBQUcsT0FBTyxDQUFDLGNBQWMsQ0FBQyxDQVMvRjtDQUNGIn0=

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

@@ -0,0 +1 @@
+{"version":3,"file":"cpp_vs_ts_public_tx_simulator.d.ts","sourceRoot":"","sources":["../../../src/public/public_tx_simulator/cpp_vs_ts_public_tx_simulator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,cAAc,EAA0B,MAAM,uBAAuB,CAAC;AAGjG,OAAO,EAGL,KAAK,qBAAqB,EAC1B,cAAc,EAEf,MAAM,mBAAmB,CAAC;AAE3B,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AACrE,OAAO,KAAK,EAAE,eAAe,EAAkB,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAK5E,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AACjF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,KAAK,EACV,kCAAkC,EAClC,0BAA0B,EAC3B,MAAM,oCAAoC,CAAC;AAE5C;;;;GAIG;AACH,qBAAa,wBAAyB,SAAQ,iBAAkB,YAAW,0BAA0B;IACnG,UAAmB,GAAG,EAAE,MAAM,CAAC;IAE/B,YACE,UAAU,EAAE,yBAAyB,EACrC,WAAW,EAAE,iBAAiB,EAC9B,eAAe,EAAE,eAAe,EAChC,MAAM,CAAC,EAAE,OAAO,CAAC,qBAAqB,CAAC,EACvC,QAAQ,CAAC,EAAE,cAAc,EAI1B;IAED;;;;;OAKG;IACmB,QAAQ,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC,CA+J9D;CACF;AAED,qBAAa,gCACX,SAAQ,wBACR,YAAW,kCAAkC;IAM3C,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,wBAAwB;IAJtD,YACE,UAAU,EAAE,yBAAyB,EACrC,WAAW,EAAE,iBAAiB,EAC9B,eAAe,EAAE,eAAe,EACb,OAAO,EAAE,wBAAwB,EACpD,MAAM,CAAC,EAAE,OAAO,CAAC,qBAAqB,CAAC,EACvC,QAAQ,CAAC,EAAE,cAAc,EAG1B;IAEqB,QAAQ,CAAC,EAAE,EAAE,EAAE,EAAE,OAAO,GAAE,MAAsB,GAAG,OAAO,CAAC,cAAc,CAAC,CAS/F;CACF"}

package/dest/public/public_tx_simulator/cpp_vs_ts_public_tx_simulator.js

@@ -0,0 +1,171 @@
+import { createLogger, logLevel } from '@aztec/foundation/log';
+import { avmSimulate } 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 { WorldStateRevisionWithHandle } from '@aztec/stdlib/world-state';
+import { strict as assert } from 'assert';
+import { ContractProviderForCpp } from './contract_provider_for_cpp.js';
+import { PublicTxSimulator } from './public_tx_simulator.js';
+/**
+ * An implementation of PublicTxSimulator that first simulates in C++, then TS, an compares the results.
+ * 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.
+ */ export class CppVsTsPublicTxSimulator extends PublicTxSimulator {
+    log;
+    constructor(merkleTree, contractsDB, globalVariables, config, bindings){
+        super(merkleTree, contractsDB, globalVariables, config, undefined, bindings);
+        this.log = createLogger(`simulator:cpp_vs_public_tx_simulator`, bindings);
+    }
+    /**
+   * Simulate a transaction's public portion using the C++ avvm simulator.
+   *
+   * @param tx - The transaction to simulate.
+   * @returns The result of the transaction's public execution.
+   */ async simulate(tx) {
+        const txHash = this.computeTxHash(tx);
+        this.log.debug(`C++ simulation of ${tx.publicFunctionCalldata.length} public calls for tx ${txHash}`, {
+            txHash
+        });
+        // Run TS simulation to generate hints and public inputs
+        this.log.debug(`Running TS simulation for tx ${txHash}`);
+        // create checkpoint for ws
+        let tsResult;
+        let tsStateRef;
+        await this.merkleTree.createCheckpoint();
+        this.contractsDB.createCheckpoint();
+        try {
+            // Run the full TypeScript simulation using the parent class
+            // This will modify the merkle tree with the transaction's state changes
+            tsResult = await super.simulate(tx);
+            this.log.debug(`TS simulation completed for tx ${txHash}`);
+            tsStateRef = await this.merkleTree.getStateReference(); // capture tree roots for later comparsion
+        } catch (error) {
+            this.log.warn(`TS simulation failed, but still continuing with C++ simulation: ${error.message} ${error.stack}`);
+        } finally{
+            // revert checkpoint for ws and clear contract db changes
+            // (cpp should reapply exactly the same changes if there are no bugs)
+            await this.merkleTree.revertCheckpoint();
+            this.contractsDB.revertCheckpoint();
+        }
+        this.log.debug(`Running C++ simulation for tx ${txHash}`);
+        // Using the "as WorldStateRevisionWithHandle" is a bit of a "trust me bro", hence the assert.
+        let wsRevision = this.merkleTree.getRevision();
+        assert(wsRevision instanceof WorldStateRevisionWithHandle, 'CppPublicTxSimulator a real NativeWorldStateInstance with a handle to the C++ WorldState object');
+        const wsCppHandle = wsRevision.handle;
+        wsRevision = wsRevision.toWorldStateRevision(); // for msgpack serialization, we don't include the handle in the type
+        this.log.debug(`Running C++ simulation with world state revision ${JSON.stringify(wsRevision)}`);
+        // 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
+        this.log.debug(`Serializing fast simulation inputs to msgpack...`);
+        const inputBuffer = fastSimInputs.serializeWithMessagePack();
+        let resultBuffer;
+        try {
+            this.log.debug(`Calling C++ simulator for tx ${txHash}`);
+            resultBuffer = await avmSimulate(inputBuffer, contractProvider, wsCppHandle, logLevel);
+        } catch (error) {
+            throw new SimulationError(`C++ simulation failed: ${error.message}`, []);
+        }
+        // If we've reached this point, C++ succeeded during simulation,
+        // so we assert that TS also succeeded.
+        assert(tsResult !== undefined, 'TS simulation should have succeeded if C++ succeeded');
+        assert(tsStateRef !== undefined, 'TS state reference should have been captured if C++ succeeded');
+        // Deserialize the msgpack result
+        this.log.debug(`Deserializing C++ from buffer (size: ${resultBuffer.length})...`);
+        const cppResultJSON = deserializeFromMessagePack(resultBuffer);
+        this.log.debug(`Deserializing C++ result to PublicTxResult...`);
+        const cppResult = PublicTxResult.fromPlainObject(cppResultJSON);
+        this.log.debug(`Done.`);
+        assert(cppResult.revertCode.equals(tsResult.revertCode));
+        assert(cppResult.gasUsed.totalGas.equals(tsResult.gasUsed.totalGas));
+        assert(cppResult.gasUsed.publicGas.equals(tsResult.gasUsed.publicGas));
+        assert(cppResult.gasUsed.teardownGas.equals(tsResult.gasUsed.teardownGas));
+        assert(cppResult.gasUsed.billedGas.equals(tsResult.gasUsed.billedGas));
+        assert(cppResult.publicTxEffect.equals(tsResult.publicTxEffect));
+        if (cppResult.publicInputs !== undefined) {
+            assert(cppResult.publicInputs.toBuffer().equals(tsResult.publicInputs.toBuffer()));
+        }
+        // TODO(fcarreiro): complete this.
+        // Check that C++ hints are a strict subset of TS hints.
+        // Then enable for misc tests and validate hints.
+        //if (this.config?.collectHints) {
+        //}
+        if (this.config?.collectCallMetadata) {
+            assert(cppResult.getAppLogicReturnValues().length === tsResult.getAppLogicReturnValues().length);
+            for(let i = 0; i < cppResult.getAppLogicReturnValues().length; i++){
+                assert(cppResult.getAppLogicReturnValues()[i].equals(tsResult.getAppLogicReturnValues()[i]));
+            }
+        }
+        // Messages are still not ok for exceptional halts (they are not plumbed in C++).
+        const cppRevertReason = cppResult.findRevertReason() || {};
+        const tsRevertReason = tsResult.findRevertReason() || {};
+        const cppRevertReasonAsObject = JSON.parse(JSON.stringify(cppRevertReason));
+        const tsRevertReasonAsObject = JSON.parse(JSON.stringify(tsRevertReason));
+        if (JSON.stringify(cppRevertReasonAsObject) !== JSON.stringify(tsRevertReasonAsObject)) {
+            this.log.debug('cppResult.findRevertReason()', cppRevertReasonAsObject);
+            this.log.debug('tsResult.findRevertReason()', tsRevertReasonAsObject);
+        }
+        // TODO: dont compare the strings since this is not deterministic.
+        // Sometimes error messages are different between C++ and TS, so we omit in the default comparison
+        const cppRevertReasonWithoutMessage = {
+            ...cppRevertReasonAsObject,
+            originalMessage: undefined
+        };
+        const tsRevertReasonWithoutMessage = {
+            ...tsRevertReasonAsObject,
+            originalMessage: undefined
+        };
+        assert(JSON.stringify(cppRevertReasonWithoutMessage) === JSON.stringify(tsRevertReasonWithoutMessage));
+        const cppHasRevertMessage = cppRevertReasonAsObject.originalMessage && cppRevertReasonAsObject.originalMessage.length > 0;
+        const tsHasRevertMessage = tsRevertReasonAsObject.originalMessage && tsRevertReasonAsObject.originalMessage.length > 0;
+        // assert that if one of the error messages is non-empty, the other is
+        assert(cppHasRevertMessage === tsHasRevertMessage, 'One of the AVM simulators (C++ or TS) produced a revert message, but the other did not');
+        // Ideally, we'd love to be able to compare full error messages, but without a lot of work
+        // the two simulators will always be able to produce some differing errors.
+        // Commenting out the code below will enforce that the error messages are at least
+        // similar (one contains the other). Even this is not something we can guarantee.
+        //if (cppHasRevertMessage) {
+        //  const cppRevertMessageContainsTs = cppRevertReasonAsObject.originalMessage.includes(
+        //    tsRevertReasonAsObject.originalMessage,
+        //  );
+        //  const tsRevertMessageContainsCpp = tsRevertReasonAsObject.originalMessage.includes(
+        //    cppRevertReasonAsObject.originalMessage,
+        //  );
+        //  assert(
+        //    cppRevertMessageContainsTs || tsRevertMessageContainsCpp,
+        //    'The AVM simulators (C++ and TS) produced different revert messages (neither was a substring of the other)',
+        //  );
+        //}
+        // Confirm that tree roots match
+        const cppStateRef = await this.merkleTree.getStateReference();
+        assert(cppStateRef.equals(tsStateRef), `Tree roots mismatch between TS and C++ public simulations for tx ${txHash}`);
+        this.log.debug(`C++ simulation completed for tx ${txHash}`, {
+            txHash,
+            reverted: !cppResult.revertCode.isOK(),
+            cppGasUsed: cppResult.gasUsed.totalGas.l2Gas
+        });
+        // Return cpp result as it has more detailed metadata / revert reasons
+        return cppResult;
+    }
+}
+export class MeasuredCppVsTsPublicTxSimulator extends CppVsTsPublicTxSimulator {
+    metrics;
+    constructor(merkleTree, contractsDB, globalVariables, metrics, config, bindings){
+        super(merkleTree, contractsDB, globalVariables, config, bindings), this.metrics = metrics;
+    }
+    async simulate(tx, txLabel = 'unlabeledTx') {
+        this.metrics.startRecordingTxSimulation(txLabel);
+        let result;
+        try {
+            result = await super.simulate(tx);
+        } finally{
+            this.metrics.stopRecordingTxSimulation(txLabel, result?.gasUsed, result?.revertCode);
+        }
+        return result;
+    }
+}