@aztec/simulator 0.0.1-commit.5daedc8 → 0.0.1-commit.6230efd

package/dest/public/public_tx_simulator/contract_provider_for_cpp.js

@@ -1,10 +1,9 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { createLogger } from '@aztec/foundation/log';
 import { FunctionSelector } from '@aztec/stdlib/abi';
 import { deserializeFromMessagePack, serializeWithMessagePack } from '@aztec/stdlib/avm';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { ContractDeploymentData } from '@aztec/stdlib/contract';
-import { ContractClassLog, ContractClassLogFields, PrivateLog } from '@aztec/stdlib/logs';
 export class ContractProviderForCpp {
     contractsDB;
     globalVariables;
@@ -14,7 +13,7 @@ export class ContractProviderForCpp {
         this.globalVariables = globalVariables;
         this.log = createLogger('simulator:contract_provider_for_cpp');
         this.getContractInstance = async (address)=>{
-            this.log.debug(`Contract provider callback: getContractInstance(${address})`);
+            this.log.trace(`Contract provider callback: getContractInstance(${address})`);
             const aztecAddr = AztecAddress.fromString(address);
             const instance = await this.contractsDB.getContractInstance(aztecAddr, this.globalVariables.timestamp);
             if (!instance) {
@@ -24,7 +23,7 @@ export class ContractProviderForCpp {
             return serializeWithMessagePack(instance);
         };
         this.getContractClass = async (classId)=>{
-            this.log.debug(`Contract provider callback: getContractClass(${classId})`);
+            this.log.trace(`Contract provider callback: getContractClass(${classId})`);
             // Parse classId string to Fr
             const classIdFr = Fr.fromString(classId);
             // Fetch contract class from the contracts DB
@@ -36,16 +35,16 @@ export class ContractProviderForCpp {
             return serializeWithMessagePack(contractClass);
         };
         this.addContracts = async (contractDeploymentDataBuffer)=>{
-            this.log.debug(`Contract provider callback: addContracts`);
+            this.log.trace(`Contract provider callback: addContracts`);
             const rawData = deserializeFromMessagePack(contractDeploymentDataBuffer);
-            // Construct class instances using the from method
-            const contractDeploymentData = this.reconstructContractDeploymentData(rawData);
+            // Construct ContractDeploymentData from plain object.
+            const contractDeploymentData = ContractDeploymentData.fromPlainObject(rawData);
             // Add contracts to the contracts DB
-            this.log.debug(`Calling contractsDB.addContracts`);
+            this.log.trace(`Calling contractsDB.addContracts`);
             await this.contractsDB.addContracts(contractDeploymentData);
         };
         this.getBytecodeCommitment = async (classId)=>{
-            this.log.debug(`Contract provider callback: getBytecodeCommitment(${classId})`);
+            this.log.trace(`Contract provider callback: getBytecodeCommitment(${classId})`);
             // Parse classId string to Fr
             const classIdFr = Fr.fromString(classId);
             // Fetch bytecode commitment from the contracts DB
@@ -58,29 +57,33 @@ export class ContractProviderForCpp {
             return serializeWithMessagePack(commitment);
         };
         this.getDebugFunctionName = async (address, selector)=>{
-            this.log.debug(`Contract provider callback: getDebugFunctionName(${address}, ${selector})`);
+            this.log.trace(`Contract provider callback: getDebugFunctionName(${address}, ${selector})`);
             // Parse address and selector strings
             const aztecAddr = AztecAddress.fromString(address);
             const selectorFr = Fr.fromString(selector);
-            const functionSelector = FunctionSelector.fromField(selectorFr);
+            const functionSelector = FunctionSelector.fromFieldOrUndefined(selectorFr);
+            if (!functionSelector) {
+                this.log.trace(`calldata[0] is not a function selector: ${selector}`);
+                return undefined;
+            }
             // Fetch debug function name from the contracts DB
             const name = await this.contractsDB.getDebugFunctionName(aztecAddr, functionSelector);
             if (!name) {
-                this.log.debug(`Debug function name not found for ${address}:${selector}`);
+                this.log.trace(`Debug function name not found for ${address}:${selector}`);
                 return undefined;
             }
             return name;
         };
         this.createCheckpoint = ()=>{
-            this.log.debug(`Contract provider callback: createCheckpoint`);
+            this.log.trace(`Contract provider callback: createCheckpoint`);
             return Promise.resolve(this.contractsDB.createCheckpoint());
         };
         this.commitCheckpoint = ()=>{
-            this.log.debug(`Contract provider callback: commitCheckpoint`);
+            this.log.trace(`Contract provider callback: commitCheckpoint`);
             return Promise.resolve(this.contractsDB.commitCheckpoint());
         };
         this.revertCheckpoint = ()=>{
-            this.log.debug(`Contract provider callback: revertCheckpoint`);
+            this.log.trace(`Contract provider callback: revertCheckpoint`);
             return Promise.resolve(this.contractsDB.revertCheckpoint());
         };
     }
@@ -92,42 +95,4 @@ export class ContractProviderForCpp {
     createCheckpoint;
     commitCheckpoint;
     revertCheckpoint;
-    /**
-   * Reconstruct ContractDeploymentData from plain msgpack-deserialized objects.
-   *
-   * msgpackr does not automatically apply extensions to nested fields, so we need to
-   * manually reconstruct ContractClassLog and PrivateLog instances with proper types.
-   *
-   * TODO(dbanks12): we really shouldn't have to do this.... We need to for now because
-   * msgpack deserialization doesn't give us actual typed objects, but rather just JSON.
-   * It would be easier if all types matched between languages (like AztecAddress which is just
-   * FF in C++).
-   */ reconstructContractDeploymentData(rawData) {
-        // Helper to ensure a value is an Fr instance
-        const toFr = (value)=>{
-            if (value instanceof Fr) {
-                return value;
-            }
-            if (Buffer.isBuffer(value)) {
-                return Fr.fromBuffer(value);
-            }
-            return new Fr(value);
-        };
-        // Reconstruct ContractClassLogs
-        const contractClassLogs = (rawData.contractClassLogs || []).map((log)=>{
-            // Convert contractAddress to TS AztecAddress
-            const addressFr = toFr(log.contractAddress);
-            const address = AztecAddress.fromField(addressFr);
-            // Ensure all fields are Fr instances
-            const fields = (log.fields.fields || []).map((field)=>toFr(field));
-            // Create proper ContractClassLog instance
-            return new ContractClassLog(address, new ContractClassLogFields(fields), log.emittedLength);
-        });
-        // Reconstruct PrivateLogs - ensure fields are Fr instances
-        const privateLogs = (rawData.privateLogs || []).map((log)=>{
-            const fields = (log.fields || []).map((field)=>toFr(field));
-            return new PrivateLog(fields, log.emittedLength);
-        });
-        return new ContractDeploymentData(contractClassLogs, privateLogs);
-    }
 }

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

@@ -2,6 +2,7 @@ import { type Logger } 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 TelemetryClient, type Tracer } from '@aztec/telemetry-client';
 import type { ExecutorMetricsInterface } from '../executor_metrics_interface.js';
 import type { PublicContractsDB } from '../public_db_sources.js';
 import { PublicTxSimulator } from './public_tx_simulator.js';
@@ -10,12 +11,13 @@ import type { MeasuredPublicTxSimulatorInterface, PublicTxSimulatorInterface } f
  * 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 declare class CppPublicTxSimulator extends PublicTxSimulator implements PublicTxSimulatorInterface {
     protected log: Logger;
+    /** Current cancellation token for in-flight simulation. */
+    private cancellationToken?;
+    /** Current simulation promise, used to wait for completion after cancellation. */
+    private simulationPromise?;
     constructor(merkleTree: MerkleTreeWriteOperations, contractsDB: PublicContractsDB, globalVariables: GlobalVariables, config?: Partial<PublicSimulatorConfig>);
     /**
      * Simulate a transaction's public portion using the C++ avvm simulator.
@@ -24,6 +26,17 @@ export declare class CppPublicTxSimulator extends PublicTxSimulator implements P
      * @returns The result of the transaction's public execution.
      */
     simulate(tx: Tx): Promise<PublicTxResult>;
+    /**
+     * 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 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.
+     */
+    cancel(waitTimeoutMs?: number): Promise<void>;
 }
 export declare class MeasuredCppPublicTxSimulator extends CppPublicTxSimulator implements MeasuredPublicTxSimulatorInterface {
     protected readonly metrics: ExecutorMetricsInterface;
@@ -31,36 +44,10 @@ export declare class MeasuredCppPublicTxSimulator extends CppPublicTxSimulator i
     simulate(tx: Tx, txLabel?: string): Promise<PublicTxResult>;
 }
 /**
- * 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>);
-    /**
-     * 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.
+ * A C++ public tx simulator that tracks runtime/production metrics with telemetry.
  */
-export declare class MeasuredCppPublicTxSimulatorHintedDbs extends CppPublicTxSimulatorHintedDbs implements MeasuredPublicTxSimulatorInterface {
-    protected readonly metrics: ExecutorMetricsInterface;
-    constructor(merkleTree: MerkleTreeWriteOperations, contractsDB: PublicContractsDB, globalVariables: GlobalVariables, metrics: ExecutorMetricsInterface, config?: Partial<PublicSimulatorConfig>);
-    simulate(tx: Tx, txLabel?: string): Promise<PublicTxResult>;
+export declare class TelemetryCppPublicTxSimulator extends MeasuredCppPublicTxSimulator {
+    readonly tracer: Tracer;
+    constructor(merkleTree: MerkleTreeWriteOperations, contractsDB: PublicContractsDB, globalVariables: GlobalVariables, telemetryClient?: TelemetryClient, config?: Partial<PublicSimulatorConfig>);
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3BwX3B1YmxpY190eF9zaW11bGF0b3IuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9wdWJsaWMvcHVibGljX3R4X3NpbXVsYXRvci9jcHBfcHVibGljX3R4X3NpbXVsYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0sdUJBQXVCLENBQUM7QUFJbEUsT0FBTyxFQUlMLEtBQUsscUJBQXFCLEVBQzFCLGNBQWMsRUFFZixNQUFNLG1CQUFtQixDQUFDO0FBRTNCLE9BQU8sS0FBSyxFQUFFLHlCQUF5QixFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDckUsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFrQixFQUFFLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUs1RSxPQUFPLEtBQUssRUFBRSx3QkFBd0IsRUFBRSxNQUFNLGtDQUFrQyxDQUFDO0FBQ2pGLE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFakUsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDN0QsT0FBTyxLQUFLLEVBQ1Ysa0NBQWtDLEVBQ2xDLDBCQUEwQixFQUMzQixNQUFNLG9DQUFvQyxDQUFDO0FBRTVDOzs7Ozs7O0dBT0c7QUFDSCxxQkFBYSxvQkFBcUIsU0FBUSxpQkFBa0IsWUFBVywwQkFBMEI7SUFDL0YsVUFBbUIsR0FBRyxFQUFFLE1BQU0sQ0FBQztJQUUvQixZQUNFLFVBQVUsRUFBRSx5QkFBeUIsRUFDckMsV0FBVyxFQUFFLGlCQUFpQixFQUM5QixlQUFlLEVBQUUsZUFBZSxFQUNoQyxNQUFNLENBQUMsRUFBRSxPQUFPLENBQUMscUJBQXFCLENBQUMsRUFJeEM7SUFFRDs7Ozs7T0FLRztJQUNtQixRQUFRLENBQUMsRUFBRSxFQUFFLEVBQUUsR0FBRyxPQUFPLENBQUMsY0FBYyxDQUFDLENBbUg5RDtDQUNGO0FBRUQscUJBQWEsNEJBQTZCLFNBQVEsb0JBQXFCLFlBQVcsa0NBQWtDO0lBS2hILFNBQVMsQ0FBQyxRQUFRLENBQUMsT0FBTyxFQUFFLHdCQUF3QjtJQUp0RCxZQUNFLFVBQVUsRUFBRSx5QkFBeUIsRUFDckMsV0FBVyxFQUFFLGlCQUFpQixFQUM5QixlQUFlLEVBQUUsZUFBZSxFQUNiLE9BQU8sRUFBRSx3QkFBd0IsRUFDcEQsTUFBTSxDQUFDLEVBQUUsT0FBTyxDQUFDLHFCQUFxQixDQUFDLEVBR3hDO0lBRXFCLFFBQVEsQ0FBQyxFQUFFLEVBQUUsRUFBRSxFQUFFLE9BQU8sR0FBRSxNQUFzQixHQUFHLE9BQU8sQ0FBQyxjQUFjLENBQUMsQ0FTL0Y7Q0FDRjtBQUVEOzs7OztHQUtHO0FBQ0gscUJBQWEsNkJBQThCLFNBQVEsaUJBQWtCLFlBQVcsMEJBQTBCO0lBQ3hHLFVBQW1CLEdBQUcsRUFBRSxNQUFNLENBQUM7SUFFL0IsWUFDRSxVQUFVLEVBQUUseUJBQXlCLEVBQ3JDLFdBQVcsRUFBRSxpQkFBaUIsRUFDOUIsZUFBZSxFQUFFLGVBQWUsRUFDaEMsTUFBTSxDQUFDLEVBQUUsT0FBTyxDQUFDLHFCQUFxQixDQUFDLEVBSXhDO0lBRUQ7Ozs7Ozs7OztPQVNHO0lBQ21CLFFBQVEsQ0FBQyxFQUFFLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxjQUFjLENBQUMsQ0E4QzlEO0NBQ0Y7QUFFRDs7Ozs7O0dBTUc7QUFDSCxxQkFBYSxxQ0FDWCxTQUFRLDZCQUNSLFlBQVcsa0NBQWtDO0lBTTNDLFNBQVMsQ0FBQyxRQUFRLENBQUMsT0FBTyxFQUFFLHdCQUF3QjtJQUp0RCxZQUNFLFVBQVUsRUFBRSx5QkFBeUIsRUFDckMsV0FBVyxFQUFFLGlCQUFpQixFQUM5QixlQUFlLEVBQUUsZUFBZSxFQUNiLE9BQU8sRUFBRSx3QkFBd0IsRUFDcEQsTUFBTSxDQUFDLEVBQUUsT0FBTyxDQUFDLHFCQUFxQixDQUFDLEVBR3hDO0lBRXFCLFFBQVEsQ0FBQyxFQUFFLEVBQUUsRUFBRSxFQUFFLE9BQU8sR0FBRSxNQUFzQixHQUFHLE9BQU8sQ0FBQyxjQUFjLENBQUMsQ0FTL0Y7Q0FDRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3BwX3B1YmxpY190eF9zaW11bGF0b3IuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9wdWJsaWMvcHVibGljX3R4X3NpbXVsYXRvci9jcHBfcHVibGljX3R4X3NpbXVsYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQTBCLE1BQU0sdUJBQXVCLENBQUM7QUFJNUUsT0FBTyxFQUdMLEtBQUsscUJBQXFCLEVBQzFCLGNBQWMsRUFFZixNQUFNLG1CQUFtQixDQUFDO0FBRTNCLE9BQU8sS0FBSyxFQUFFLHlCQUF5QixFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDckUsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLEVBQUUsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRTVELE9BQU8sRUFBRSxLQUFLLGVBQWUsRUFBRSxLQUFLLE1BQU0sRUFBc0IsTUFBTSx5QkFBeUIsQ0FBQztBQUtoRyxPQUFPLEtBQUssRUFBRSx3QkFBd0IsRUFBRSxNQUFNLGtDQUFrQyxDQUFDO0FBQ2pGLE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFakUsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDN0QsT0FBTyxLQUFLLEVBQ1Ysa0NBQWtDLEVBQ2xDLDBCQUEwQixFQUMzQixNQUFNLG9DQUFvQyxDQUFDO0FBRTVDOzs7O0dBSUc7QUFDSCxxQkFBYSxvQkFBcUIsU0FBUSxpQkFBa0IsWUFBVywwQkFBMEI7SUFDL0YsVUFBbUIsR0FBRyxFQUFFLE1BQU0sQ0FBQztJQUMvQiwyREFBMkQ7SUFDM0QsT0FBTyxDQUFDLGlCQUFpQixDQUFDLENBQW9CO0lBQzlDLGtGQUFrRjtJQUNsRixPQUFPLENBQUMsaUJBQWlCLENBQUMsQ0FBa0I7SUFFNUMsWUFDRSxVQUFVLEVBQUUseUJBQXlCLEVBQ3JDLFdBQVcsRUFBRSxpQkFBaUIsRUFDOUIsZUFBZSxFQUFFLGVBQWUsRUFDaEMsTUFBTSxDQUFDLEVBQUUsT0FBTyxDQUFDLHFCQUFxQixDQUFDLEVBSXhDO0lBRUQ7Ozs7O09BS0c7SUFDbUIsUUFBUSxDQUFDLEVBQUUsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLGNBQWMsQ0FBQyxDQXVFOUQ7SUFFRDs7Ozs7Ozs7O09BU0c7SUFDVSxNQUFNLENBQUMsYUFBYSxHQUFFLE1BQVksR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBZTlEO0NBQ0Y7QUFFRCxxQkFBYSw0QkFBNkIsU0FBUSxvQkFBcUIsWUFBVyxrQ0FBa0M7SUFLaEgsU0FBUyxDQUFDLFFBQVEsQ0FBQyxPQUFPLEVBQUUsd0JBQXdCO0lBSnRELFlBQ0UsVUFBVSxFQUFFLHlCQUF5QixFQUNyQyxXQUFXLEVBQUUsaUJBQWlCLEVBQzlCLGVBQWUsRUFBRSxlQUFlLEVBQ2IsT0FBTyxFQUFFLHdCQUF3QixFQUNwRCxNQUFNLENBQUMsRUFBRSxPQUFPLENBQUMscUJBQXFCLENBQUMsRUFHeEM7SUFFcUIsUUFBUSxDQUFDLEVBQUUsRUFBRSxFQUFFLEVBQUUsT0FBTyxHQUFFLE1BQXNCLEdBQUcsT0FBTyxDQUFDLGNBQWMsQ0FBQyxDQVMvRjtDQUNGO0FBRUQ7O0dBRUc7QUFDSCxxQkFBYSw2QkFBOEIsU0FBUSw0QkFBNEI7SUFFN0UsU0FBZ0IsTUFBTSxFQUFFLE1BQU0sQ0FBQztJQUUvQixZQUNFLFVBQVUsRUFBRSx5QkFBeUIsRUFDckMsV0FBVyxFQUFFLGlCQUFpQixFQUM5QixlQUFlLEVBQUUsZUFBZSxFQUNoQyxlQUFlLEdBQUUsZUFBc0MsRUFDdkQsTUFBTSxDQUFDLEVBQUUsT0FBTyxDQUFDLHFCQUFxQixDQUFDLEVBS3hDO0NBQ0YifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"cpp_public_tx_simulator.d.ts","sourceRoot":"","sources":["../../../src/public/public_tx_simulator/cpp_public_tx_simulator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAIlE,OAAO,EAIL,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;;;;;;;GAOG;AACH,qBAAa,oBAAqB,SAAQ,iBAAkB,YAAW,0BAA0B;IAC/F,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,EAIxC;IAED;;;;;OAKG;IACmB,QAAQ,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC,CAmH9D;CACF;AAED,qBAAa,4BAA6B,SAAQ,oBAAqB,YAAW,kCAAkC;IAKhH,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,EAGxC;IAEqB,QAAQ,CAAC,EAAE,EAAE,EAAE,EAAE,OAAO,GAAE,MAAsB,GAAG,OAAO,CAAC,cAAc,CAAC,CAS/F;CACF;AAED;;;;;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,EAIxC;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,EAGxC;IAEqB,QAAQ,CAAC,EAAE,EAAE,EAAE,EAAE,OAAO,GAAE,MAAsB,GAAG,OAAO,CAAC,cAAc,CAAC,CAS/F;CACF"}
+{"version":3,"file":"cpp_public_tx_simulator.d.ts","sourceRoot":"","sources":["../../../src/public/public_tx_simulator/cpp_public_tx_simulator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAA0B,MAAM,uBAAuB,CAAC;AAI5E,OAAO,EAGL,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;AAE5D,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,MAAM,EAAsB,MAAM,yBAAyB,CAAC;AAKhG,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,oBAAqB,SAAQ,iBAAkB,YAAW,0BAA0B;IAC/F,UAAmB,GAAG,EAAE,MAAM,CAAC;IAC/B,2DAA2D;IAC3D,OAAO,CAAC,iBAAiB,CAAC,CAAoB;IAC9C,kFAAkF;IAClF,OAAO,CAAC,iBAAiB,CAAC,CAAkB;IAE5C,YACE,UAAU,EAAE,yBAAyB,EACrC,WAAW,EAAE,iBAAiB,EAC9B,eAAe,EAAE,eAAe,EAChC,MAAM,CAAC,EAAE,OAAO,CAAC,qBAAqB,CAAC,EAIxC;IAED;;;;;OAKG;IACmB,QAAQ,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC,CAuE9D;IAED;;;;;;;;;OASG;IACU,MAAM,CAAC,aAAa,GAAE,MAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAe9D;CACF;AAED,qBAAa,4BAA6B,SAAQ,oBAAqB,YAAW,kCAAkC;IAKhH,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,EAGxC;IAEqB,QAAQ,CAAC,EAAE,EAAE,EAAE,EAAE,OAAO,GAAE,MAAsB,GAAG,OAAO,CAAC,cAAc,CAAC,CAS/F;CACF;AAED;;GAEG;AACH,qBAAa,6BAA8B,SAAQ,4BAA4B;IAE7E,SAAgB,MAAM,EAAE,MAAM,CAAC;IAE/B,YACE,UAAU,EAAE,yBAAyB,EACrC,WAAW,EAAE,iBAAiB,EAC9B,eAAe,EAAE,eAAe,EAChC,eAAe,GAAE,eAAsC,EACvD,MAAM,CAAC,EAAE,OAAO,CAAC,qBAAqB,CAAC,EAKxC;CACF"}

package/dest/public/public_tx_simulator/cpp_public_tx_simulator.js

@@ -1,22 +1,23 @@
-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;
+    /** Current cancellation token for in-flight simulation. */ cancellationToken;
+    /** Current simulation promise, used to wait for completion after cancellation. */ simulationPromise;
     constructor(merkleTree, contractsDB, globalVariables, config){
         super(merkleTree, contractsDB, globalVariables, config);
         this.log = createLogger(`simulator:cpp_public_tx_simulator`);
@@ -31,35 +32,12 @@ 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;
@@ -67,132 +45,65 @@ import { PublicTxSimulator } from './public_tx_simulator.js';
         // Create contract provider for callbacks to TypeScript PublicContractsDB from C++
         const contractProvider = new ContractProviderForCpp(this.contractsDB, this.globalVariables);
         // 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, 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;
@@ -208,3 +119,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){
+        const metrics = new ExecutorMetrics(telemetryClient, 'CppPublicTxSimulator');
+        super(merkleTree, contractsDB, globalVariables, metrics, config);
+        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 } 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>);
+    /**
+     * 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>);
+    simulate(tx: Tx, txLabel?: string): Promise<PublicTxResult>;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3BwX3B1YmxpY190eF9zaW11bGF0b3Jfd2l0aF9oaW50ZWRfZGJzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcHVibGljL3B1YmxpY190eF9zaW11bGF0b3IvY3BwX3B1YmxpY190eF9zaW11bGF0b3Jfd2l0aF9oaW50ZWRfZGJzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBMEIsTUFBTSx1QkFBdUIsQ0FBQztBQUU1RSxPQUFPLEVBRUwsS0FBSyxxQkFBcUIsRUFDMUIsY0FBYyxFQUVmLE1BQU0sbUJBQW1CLENBQUM7QUFFM0IsT0FBTyxLQUFLLEVBQUUseUJBQXlCLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNyRSxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsRUFBRSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFJNUQsT0FBTyxLQUFLLEVBQUUsd0JBQXdCLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQztBQUNqRixPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ2pFLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQzdELE9BQU8sS0FBSyxFQUNWLGtDQUFrQyxFQUNsQywwQkFBMEIsRUFDM0IsTUFBTSxvQ0FBb0MsQ0FBQztBQUU1Qzs7Ozs7R0FLRztBQUNILHFCQUFhLDZCQUE4QixTQUFRLGlCQUFrQixZQUFXLDBCQUEwQjtJQUN4RyxVQUFtQixHQUFHLEVBQUUsTUFBTSxDQUFDO0lBRS9CLFlBQ0UsVUFBVSxFQUFFLHlCQUF5QixFQUNyQyxXQUFXLEVBQUUsaUJBQWlCLEVBQzlCLGVBQWUsRUFBRSxlQUFlLEVBQ2hDLE1BQU0sQ0FBQyxFQUFFLE9BQU8sQ0FBQyxxQkFBcUIsQ0FBQyxFQUl4QztJQUVEOzs7Ozs7Ozs7T0FTRztJQUNtQixRQUFRLENBQUMsRUFBRSxFQUFFLEVBQUUsR0FBRyxPQUFPLENBQUMsY0FBYyxDQUFDLENBOEM5RDtDQUNGO0FBRUQ7Ozs7OztHQU1HO0FBQ0gscUJBQWEscUNBQ1gsU0FBUSw2QkFDUixZQUFXLGtDQUFrQztJQU0zQyxTQUFTLENBQUMsUUFBUSxDQUFDLE9BQU8sRUFBRSx3QkFBd0I7SUFKdEQsWUFDRSxVQUFVLEVBQUUseUJBQXlCLEVBQ3JDLFdBQVcsRUFBRSxpQkFBaUIsRUFDOUIsZUFBZSxFQUFFLGVBQWUsRUFDYixPQUFPLEVBQUUsd0JBQXdCLEVBQ3BELE1BQU0sQ0FBQyxFQUFFLE9BQU8sQ0FBQyxxQkFBcUIsQ0FBQyxFQUd4QztJQUVxQixRQUFRLENBQUMsRUFBRSxFQUFFLEVBQUUsRUFBRSxPQUFPLEdBQUUsTUFBc0IsR0FBRyxPQUFPLENBQUMsY0FBYyxDQUFDLENBUy9GO0NBQ0YifQ==

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,EAA0B,MAAM,uBAAuB,CAAC;AAE5E,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,EAIxC;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,EAGxC;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){
+        super(merkleTree, contractsDB, globalVariables, config);
+        this.log = createLogger(`simulator:cpp_public_tx_simulator_hinted_dbs`);
+    }
+    /**
+   * 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){
+        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;
+    }
+}