@aztec/simulator 0.0.1-commit.2eb6648a → 0.0.1-commit.2f68f620

package/dest/public/public_tx_simulator/public_tx_simulator.js

@@ -1,347 +1,126 @@
-import { AVM_MAX_PROCESSABLE_L2_GAS } from '@aztec/constants';
 import { createLogger } from '@aztec/foundation/log';
-import { ProtocolContractAddress, ProtocolContractsList } from '@aztec/protocol-contracts';
-import { computeFeePayerBalanceStorageSlot } from '@aztec/protocol-contracts/fee-juice';
-import { AvmExecutionHints, AvmTxHint, PublicSimulatorConfig, PublicTxEffect, PublicTxResult } from '@aztec/stdlib/avm';
+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 { NestedProcessReturnValues, TxExecutionPhase } from '@aztec/stdlib/tx';
-import { strict as assert } from 'assert';
-import { CallDataArray } from '../avm/calldata.js';
-import { AvmSimulator } from '../avm/index.js';
-import { getPublicFunctionDebugName } from '../debug_fn_name.js';
-import { HintingMerkleWriteOperations, HintingPublicContractsDB } from '../hinting_db_sources.js';
-import { PublicTreesDB } from '../public_db_sources.js';
-import { L2ToL1MessageLimitReachedError, NoteHashLimitReachedError, NullifierCollisionError, NullifierLimitReachedError } from '../side_effect_errors.js';
-import { PublicTxContext } from './public_tx_context.js';
-// The errors below are only thrown here in the public tx simulator,
-// and only during revertible phases (revertible insertions, app logic and teardown).
-// These are strictly "checked" errors (not exported and never propagated).
-// They are used internally for control flow to trigger rollbacks to the post-setup 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';
 /**
- * Error thrown when public tx simulation reverts in a known/checked way during revertible insertions.
- */ class TxSimRevertibleInsertionsRevert extends Error {
-    constructor(){
-        super('Public Tx Simulation reverted during Revertible Insertions');
-        this.name = 'TxSimRevertibleInsertionsRevert';
-    }
-}
-/**
- * Error thrown when public tx simulation reverts during app logic.
- */ class TxSimAppLogicRevert extends Error {
-    constructor(){
-        super('Public Tx Simulation reverted during App Logic');
-        this.name = 'TxSimAppLogicRevert';
-    }
-}
-/**
- * Error thrown when public tx simulation reverts during teardown.
- */ class TxSimTeardownRevert extends Error {
-    constructor(){
-        super('Public Tx Simulation reverted during Teardown');
-        this.name = 'TxSimTeardownRevert';
-    }
-}
-export class PublicTxSimulator {
-    merkleTree;
-    contractsDB;
-    globalVariables;
-    protocolContracts;
+ * 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.
+ */ export class PublicTxSimulator extends PublicTxSimulatorBase {
     log;
-    config;
-    bindings;
-    constructor(merkleTree, contractsDB, globalVariables, config, protocolContracts = ProtocolContractsList, bindings){
-        this.merkleTree = merkleTree;
-        this.contractsDB = contractsDB;
-        this.globalVariables = globalVariables;
-        this.protocolContracts = protocolContracts;
-        this.config = PublicSimulatorConfig.from(config ?? {});
-        this.bindings = bindings;
+    /** 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:public_tx_simulator`, bindings);
     }
     /**
-   * Simulate a transaction's public portion including all of its phases.
+   * 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(`Simulating ${tx.publicFunctionCalldata.length} public calls for tx ${txHash}`, {
+        this.log.debug(`C++ simulation of ${tx.publicFunctionCalldata.length} public calls for tx ${txHash}`, {
             txHash
         });
-        // Create hinting DBs.
-        const hints = new AvmExecutionHints(this.globalVariables, AvmTxHint.fromTx(tx, this.globalVariables.gasFees), this.protocolContracts);
-        const hintingMerkleTree = await HintingMerkleWriteOperations.create(this.merkleTree, hints);
-        const hintingTreesDB = new PublicTreesDB(hintingMerkleTree);
-        const hintingContractsDB = new HintingPublicContractsDB(this.contractsDB, hints);
-        const context = await PublicTxContext.create(hintingTreesDB, hintingContractsDB, tx, this.globalVariables, this.protocolContracts, this.config.proverId, this.bindings);
-        // This will throw if there is a nullifier collision.
-        // In that case the transaction will be thrown out.
-        await this.insertNonRevertiblesFromPrivate(context);
-        const processedPhases = [];
-        if (context.hasPhase(TxExecutionPhase.SETUP)) {
-            // This will throw if the setup phase reverts.
-            // In that case the transaction will be thrown out.
-            const setupResult = await this.simulatePhase(TxExecutionPhase.SETUP, context);
-            if (setupResult.reverted) {
-                throw new Error(`[SETUP] UNRECOVERABLE ERROR! The transaction will be thrown out. ${setupResult.revertReason?.message}`);
-            }
-            processedPhases.push(setupResult);
-        }
-        // The checkpoint we should go back to if anything from now on reverts.
-        await context.state.fork();
-        hintingContractsDB.createCheckpoint();
-        try {
-            // This will throw if there is a nullifier collision or other insertion error (limit reached).
-            await this.insertRevertiblesFromPrivate(context);
-            // Only proceed with app logic if there was no revert during revertible insertion.
-            if (context.hasPhase(TxExecutionPhase.APP_LOGIC)) {
-                const appLogicResult = await this.simulatePhase(TxExecutionPhase.APP_LOGIC, context);
-                processedPhases.push(appLogicResult);
-                if (appLogicResult.reverted) {
-                    throw new TxSimAppLogicRevert();
-                }
-            }
-        } catch (e) {
-            if (e instanceof TxSimRevertibleInsertionsRevert || e instanceof TxSimAppLogicRevert) {
-                // We revert to the post-setup state.
-                await context.state.discardForkedState();
-                hintingContractsDB.revertCheckpoint();
-                // But we also create a new fork so that the teardown phase can transparently
-                // commit or rollback at the end of teardown.
-                await context.state.fork();
-                hintingContractsDB.createCheckpoint();
-            } else {
-                // Unchecked/unknown error - re-throw as-is
-                throw e;
-            }
-        }
+        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
+        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.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);
+        let resultBuffer;
         try {
-            if (context.hasPhase(TxExecutionPhase.TEARDOWN)) {
-                const teardownResult = await this.simulatePhase(TxExecutionPhase.TEARDOWN, context);
-                processedPhases.push(teardownResult);
-                if (teardownResult.reverted) {
-                    throw new TxSimTeardownRevert();
-                }
+            resultBuffer = await this.simulationPromise;
+        } catch (error) {
+            // Check if this was a cancellation
+            if (error.message?.includes('Simulation cancelled')) {
+                throw new SimulationError(`C++ simulation cancelled`, []);
             }
-            // We commit the forked state and we are done.
-            await context.state.mergeForkedState();
-            hintingContractsDB.commitCheckpoint();
-        } catch (e) {
-            if (e instanceof TxSimTeardownRevert) {
-                // We revert to the post-setup state and we are done.
-                await context.state.discardForkedState();
-                hintingContractsDB.revertCheckpoint();
-            } else {
-                // Unchecked/unknown error - re-throw as-is
-                throw e;
-            }
-        }
-        context.halt();
-        // Such transactions should be filtered by GasTxValidator.
-        assert(context.getActualGasUsed().l2Gas <= AVM_MAX_PROCESSABLE_L2_GAS, `Transaction consumes ${context.getActualGasUsed().l2Gas} L2 gas, which exceeds the AVM maximum processable gas of ${AVM_MAX_PROCESSABLE_L2_GAS}`);
-        await this.payFee(context);
-        const publicInputs = await context.generateAvmCircuitPublicInputs();
-        const revertCode = context.getFinalRevertCode();
-        // We only return the app logic phase information, and only 1 per phase.
-        const appLogicReturnValues = processedPhases.find(({ phase })=>phase === TxExecutionPhase.APP_LOGIC)?.returnValues ?? [];
-        // TODO(fcarreiro): This is a temporary backwards compatibility layer until we migrate to the C++ simulator.
-        if (context.revertReason !== undefined) {
-            appLogicReturnValues.revertReason = context.revertReason;
+            throw new SimulationError(`C++ simulation failed: ${error.message}`, []);
+        } finally{
+            this.cancellationToken = undefined;
+            this.simulationPromise = undefined;
         }
-        // Create PublicTxEffect from PublicInputs.
-        const publicTxEffect = new PublicTxEffect(publicInputs.transactionFee, publicInputs.accumulatedData.noteHashes.filter((h)=>!h.isEmpty()), publicInputs.accumulatedData.nullifiers.filter((n)=>!n.isEmpty()), publicInputs.accumulatedData.l2ToL1Msgs.filter((m)=>!m.isEmpty()), publicInputs.accumulatedData.publicLogs.toLogs(), publicInputs.accumulatedData.publicDataWrites.filter((w)=>!w.isEmpty()));
-        return new PublicTxResult(/*gasUsed=*/ {
-            totalGas: context.getActualGasUsed(),
-            teardownGas: context.teardownGasUsed,
-            publicGas: context.getActualPublicGasUsed(),
-            billedGas: context.getTotalGasUsed()
-        }, /*revertCode=*/ revertCode, /*publicTxEffect=*/ publicTxEffect, /*callStackMetadata=*/ appLogicReturnValues, /*logs=*/ context.state.getActiveStateManager().getLogs(), /*hints=*/ hints, /*publicInputs=*/ publicInputs);
-    }
-    computeTxHash(tx) {
-        return tx.getTxHash();
-    }
-    /**
-   * Simulate the setup phase of a transaction's public execution.
-   * @param context - WILL BE MUTATED. The context of the currently executing public transaction portion
-   * @returns The phase result.
-   */ async simulatePhase(phase, context) {
-        const callRequests = context.getCallRequestsForPhase(phase);
-        this.log.debug(`Processing phase ${TxExecutionPhase[phase]} for tx ${context.txHash}`, {
-            txHash: context.txHash.toString(),
-            phase: TxExecutionPhase[phase],
-            callRequests: callRequests.length
+        // 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}`, {
+            txHash,
+            reverted: !cppResult.revertCode.isOK(),
+            cppGasUsed: cppResult.gasUsed.totalGas.l2Gas
         });
-        const returnValues = [];
-        let reverted = false;
-        let revertReason;
-        for(let i = 0; i < callRequests.length; i++){
-            if (reverted) {
-                break;
-            }
-            const callRequest = callRequests[i];
-            const enqueuedCallResult = await this.simulateEnqueuedCall(phase, context, callRequest);
-            returnValues.push(new NestedProcessReturnValues(enqueuedCallResult.output.bestEffortReadAll()));
-            if (enqueuedCallResult.reverted) {
-                reverted = true;
-                revertReason = enqueuedCallResult.revertReason;
-            }
-        }
-        return {
-            phase,
-            returnValues,
-            reverted,
-            revertReason
-        };
+        return cppResult;
     }
     /**
-   * Simulate an enqueued public call.
-   * @param phase - The current phase of public execution
-   * @param context - WILL BE MUTATED. The context of the currently executing public transaction portion
-   * @param callRequest - The public function call request, including the calldata.
-   * @returns The result of execution.
-   */ async simulateEnqueuedCall(phase, context, callRequest) {
-        const stateManager = context.state.getActiveStateManager();
-        const contractAddress = callRequest.request.contractAddress;
-        const fnName = await getPublicFunctionDebugName(this.contractsDB, contractAddress, new CallDataArray(callRequest.calldata));
-        const allocatedGas = context.getGasLeftAtPhase(phase);
-        const result = await this.simulateEnqueuedCallInternal(stateManager, callRequest, allocatedGas, /*transactionFee=*/ context.getTransactionFee(phase), fnName);
-        const gasUsed = allocatedGas.sub(result.gasLeft); // by enqueued call
-        context.consumeGas(phase, gasUsed);
-        this.log.debug(`Simulated enqueued public call (${fnName}) consumed ${gasUsed.l2Gas} L2 gas ending with ${result.gasLeft.l2Gas} L2 gas left.`);
-        if (result.reverted) {
-            const culprit = `${contractAddress}:${fnName}`;
-            context.revert(phase, result.revertReason, culprit);
-        }
-        return result;
-    }
-    /**
-   * Simulate an enqueued public call, without modifying the context (PublicTxContext).
-   * Resulting modifications to the context can be applied by the caller.
-   *
-   * This function can be mocked for testing to skip actual AVM simulation
-   * while still simulating phases and generating a proving request.
+   * 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 stateManager - The state manager for AvmSimulation
-   * @param callRequest - The public function call request, including the calldata.
-   * @param allocatedGas - The gas allocated to the enqueued call
-   * @param fnName - The name of the function
-   * @returns The result of execution.
-   */ async simulateEnqueuedCallInternal(stateManager, { request, calldata }, allocatedGas, transactionFee, fnName) {
-        const address = request.contractAddress;
-        const sender = request.msgSender;
-        this.log.debug(`Executing enqueued public call to external function ${fnName}@${address} with ${allocatedGas.l2Gas} allocated L2 gas.`);
-        const simulator = await AvmSimulator.create(stateManager, address, sender, transactionFee, this.globalVariables, request.isStaticCall, new CallDataArray(calldata), allocatedGas, this.config);
-        const avmCallResult = await simulator.execute();
-        return avmCallResult.finalize();
-    }
-    /**
-   * Insert the non-revertible accumulated data from private into the public state.
-   */ async insertNonRevertiblesFromPrivate(context) {
-        const stateManager = context.state.getActiveStateManager();
-        for (const siloedNullifier of context.nonRevertibleAccumulatedDataFromPrivate.nullifiers.filter((n)=>!n.isEmpty())){
-            await stateManager.writeSiloedNullifier(siloedNullifier);
+   * @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);
         }
-        for (const noteHash of context.nonRevertibleAccumulatedDataFromPrivate.noteHashes){
-            if (!noteHash.isEmpty()) {
-                await stateManager.writeUniqueNoteHash(noteHash);
-            }
-        }
-        for (const l2ToL1Message of context.nonRevertibleAccumulatedDataFromPrivate.l2ToL1Msgs){
-            if (!l2ToL1Message.isEmpty()) {
-                stateManager.writeScopedL2ToL1Message(l2ToL1Message);
-            }
+        // 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');
         }
-        // add new contracts to the contracts db so that their code may be found and called
-        // FIXME(fcarreiro): this should conceptually use the hinting contracts db.
-        // However, things work as expected because later calls to getters on the hintingContractsDB
-        // will pick up the new contracts and will generate the necessary hints.
-        // So, a consumer of the hints will always see the new contracts.
-        await this.contractsDB.addContracts(context.nonRevertibleContractDeploymentData);
     }
-    /**
-   * Insert the revertible accumulated data from private into the public state.
-   * Throws TxSimRevertibleInsertionsRevert if there is some checked error during revertible insertions.
-   * This function checks for the following errors:
-   * - NullifierLimitReachedError
-   * - NullifierCollisionError
-   * - NoteHashLimitReachedError
-   * - L2ToL1MessageLimitReachedError
-   */ async insertRevertiblesFromPrivate(context) {
-        const stateManager = context.state.getActiveStateManager();
-        try {
-            for (const siloedNullifier of context.revertibleAccumulatedDataFromPrivate.nullifiers.filter((n)=>!n.isEmpty())){
-                await stateManager.writeSiloedNullifier(siloedNullifier);
-            }
-        } catch (e) {
-            if (e instanceof NullifierLimitReachedError || e instanceof NullifierCollisionError) {
-                context.revert(TxExecutionPhase.APP_LOGIC, new SimulationError(`Error encountered when inserting revertible nullifiers from private.\nDetails: ${e.message}`, []));
-                throw new TxSimRevertibleInsertionsRevert();
-            } else {
-                // Unchecked/unknown error - re-throw as-is
-                throw e;
-            }
-        }
-        try {
-            for (const noteHash of context.revertibleAccumulatedDataFromPrivate.noteHashes){
-                if (!noteHash.isEmpty()) {
-                    // Revertible note hashes from private are not hashed with nonce, since private can't know their final position, only we can.
-                    await stateManager.writeSiloedNoteHash(noteHash);
-                }
-            }
-        } catch (e) {
-            if (e instanceof NoteHashLimitReachedError) {
-                context.revert(TxExecutionPhase.APP_LOGIC, new SimulationError(`Error encountered when inserting revertible note hashes from private.\nDetails: ${e.message}`, []));
-                throw new TxSimRevertibleInsertionsRevert();
-            } else {
-                // Unchecked/unknown error - re-throw as-is
-                throw e;
-            }
-        }
+}
+export class MeasuredPublicTxSimulator extends PublicTxSimulator {
+    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 {
-            for (const l2ToL1Message of context.revertibleAccumulatedDataFromPrivate.l2ToL1Msgs){
-                if (!l2ToL1Message.isEmpty()) {
-                    stateManager.writeScopedL2ToL1Message(l2ToL1Message);
-                }
-            }
-        } catch (e) {
-            if (e instanceof L2ToL1MessageLimitReachedError) {
-                context.revert(TxExecutionPhase.APP_LOGIC, new SimulationError(`Error encountered when inserting revertible L2-to-L1 messages from private.\nDetails: ${e.message}`, []));
-                throw new TxSimRevertibleInsertionsRevert();
-            } else {
-                // Unchecked/unknown error - re-throw as-is
-                throw e;
-            }
+            result = await super.simulate(tx);
+        } finally{
+            this.metrics.stopRecordingTxSimulation(txLabel, result?.gasUsed, result?.revertCode);
         }
-        // add new contracts to the contracts db so that their functions may be found and called
-        // FIXME(fcarreiro): this should conceptually use the hinting contracts db.
-        // However, things work as expected because later calls to getters on the hintingContractsDB
-        // will pick up the new contracts and will generate the necessary hints.
-        // So, a consumer of the hints will always see the new contracts.
-        await this.contractsDB.addContracts(context.revertibleContractDeploymentData);
+        return result;
     }
-    async payFee(context) {
-        const txFee = context.getTransactionFee(TxExecutionPhase.TEARDOWN);
-        if (context.feePayer.isZero()) {
-            // Real transactions are enforced by private kernel to have nonzero fee payer.
-            // Real transactions cannot skip fee enforcement (skipping fee enforcement makes them unprovable).
-            assert(this.config.skipFeeEnforcement, 'Fee payer cannot be 0 unless skipping fee enforcement for simulation');
-            this.log.debug(`Fee payer is 0. Skipping fee enforcement. No one is paying the fee of ${txFee.toBigInt()}`);
-            return;
-        }
-        const feeJuiceAddress = ProtocolContractAddress.FeeJuice;
-        const balanceSlot = await computeFeePayerBalanceStorageSlot(context.feePayer);
-        this.log.debug(`Deducting ${txFee.toBigInt()} balance in Fee Juice for ${context.feePayer}`);
-        const stateManager = context.state.getActiveStateManager();
-        let currentBalance = await stateManager.readStorage(feeJuiceAddress, balanceSlot);
-        // We allow to fake the balance of the fee payer to allow fee estimation
-        // When mocking the balance of the fee payer, the circuit should not be able to prove the simulation
-        if (currentBalance.lt(txFee)) {
-            // Without "skipFeeEnforcement", such transactions should be filtered by GasTxValidator.
-            assert(this.config.skipFeeEnforcement, `Not enough balance for fee payer to pay for transaction (got ${currentBalance.toBigInt()} needs ${txFee.toBigInt()})`);
-            this.log.debug(`Fee payer balance insufficient, but we're skipping fee enforcement`);
-            // We still proceed and perform the storage write to minimize deviation from normal execution.
-            currentBalance = txFee;
-        }
-        const updatedBalance = currentBalance.sub(txFee);
-        await stateManager.writeStorage(feeJuiceAddress, balanceSlot, updatedBalance, true);
+}
+/**
+ * A C++ 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){
+        const metrics = new ExecutorMetrics(telemetryClient, 'PublicTxSimulator');
+        super(merkleTree, contractsDB, globalVariables, metrics, config, bindings);
+        this.tracer = metrics.tracer;
     }
 }

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

@@ -0,0 +1,22 @@
+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 { 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`.
+ */
+export declare abstract class PublicTxSimulatorBase {
+    protected merkleTree: MerkleTreeWriteOperations;
+    protected contractsDB: PublicContractsDB;
+    protected globalVariables: GlobalVariables;
+    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);
+    protected computeTxHash(tx: Tx): import("@aztec/stdlib/tx").TxHash;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHVibGljX3R4X3NpbXVsYXRvcl9iYXNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcHVibGljL3B1YmxpY190eF9zaW11bGF0b3IvcHVibGljX3R4X3NpbXVsYXRvcl9iYXNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBRSxLQUFLLGNBQWMsRUFBZ0IsTUFBTSx1QkFBdUIsQ0FBQztBQUV2RixPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUMxRCxPQUFPLEtBQUssRUFBRSx5QkFBeUIsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ3JFLE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxpQkFBaUIsRUFBRSxFQUFFLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUUvRSxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRWpFOzs7O0dBSUc7QUFDSCw4QkFBc0IscUJBQXFCO0lBTXZDLFNBQVMsQ0FBQyxVQUFVLEVBQUUseUJBQXlCO0lBQy9DLFNBQVMsQ0FBQyxXQUFXLEVBQUUsaUJBQWlCO0lBQ3hDLFNBQVMsQ0FBQyxlQUFlLEVBQUUsZUFBZTtJQUUxQyxTQUFTLENBQUMsaUJBQWlCLEVBQUUsaUJBQWlCO0lBVGhELFNBQVMsQ0FBQyxHQUFHLEVBQUUsTUFBTSxDQUFDO0lBQ3RCLFNBQVMsQ0FBQyxRQUFRLENBQUMsTUFBTSxFQUFFLHFCQUFxQixDQUFDO0lBQ2pELFNBQVMsQ0FBQyxRQUFRLENBQUMsUUFBUSxDQUFDLEVBQUUsY0FBYyxDQUFDO0lBRTdDLFlBQ1ksVUFBVSxFQUFFLHlCQUF5QixFQUNyQyxXQUFXLEVBQUUsaUJBQWlCLEVBQzlCLGVBQWUsRUFBRSxlQUFlLEVBQzFDLE1BQU0sQ0FBQyxFQUFFLE9BQU8sQ0FBQyxxQkFBcUIsQ0FBQyxFQUM3QixpQkFBaUIsR0FBRSxpQkFBeUMsRUFDdEUsUUFBUSxDQUFDLEVBQUUsY0FBYyxFQUsxQjtJQUVELFNBQVMsQ0FBQyxhQUFhLENBQUMsRUFBRSxFQUFFLEVBQUUscUNBRTdCO0NBQ0YifQ==

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

@@ -0,0 +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"}

package/dest/public/public_tx_simulator/public_tx_simulator_base.js

@@ -0,0 +1,28 @@
+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`.
+ */ export class PublicTxSimulatorBase {
+    merkleTree;
+    contractsDB;
+    globalVariables;
+    protocolContracts;
+    log;
+    config;
+    bindings;
+    constructor(merkleTree, contractsDB, globalVariables, config, protocolContracts = ProtocolContractsList, bindings){
+        this.merkleTree = merkleTree;
+        this.contractsDB = contractsDB;
+        this.globalVariables = globalVariables;
+        this.protocolContracts = protocolContracts;
+        this.config = PublicSimulatorConfig.from(config ?? {});
+        this.bindings = bindings;
+        this.log = createLogger(`simulator:public_tx_simulator`, bindings);
+    }
+    computeTxHash(tx) {
+        return tx.getTxHash();
+    }
+}

package/package.json

@@ -1,13 +1,12 @@
 {
   "name": "@aztec/simulator",
-  "version": "0.0.1-commit.2eb6648a",
+  "version": "0.0.1-commit.2f68f620",
   "type": "module",
   "exports": {
     "./server": "./dest/server.js",
     "./client": "./dest/client.js",
     "./testing": "./dest/testing.js",
-    "./public/fixtures": "./dest/public/fixtures/index.js",
-    "./public/avm/opcodes": "./dest/public/avm/opcodes/index.js"
+    "./public/fixtures": "./dest/public/fixtures/index.js"
   },
   "typedocOptions": {
     "entryPoints": [
@@ -64,26 +63,26 @@
     ]
   },
   "dependencies": {
-    "@aztec/constants": "0.0.1-commit.2eb6648a",
-    "@aztec/foundation": "0.0.1-commit.2eb6648a",
-    "@aztec/native": "0.0.1-commit.2eb6648a",
-    "@aztec/noir-acvm_js": "0.0.1-commit.2eb6648a",
-    "@aztec/noir-noirc_abi": "0.0.1-commit.2eb6648a",
-    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.2eb6648a",
-    "@aztec/noir-types": "0.0.1-commit.2eb6648a",
-    "@aztec/protocol-contracts": "0.0.1-commit.2eb6648a",
-    "@aztec/stdlib": "0.0.1-commit.2eb6648a",
-    "@aztec/telemetry-client": "0.0.1-commit.2eb6648a",
-    "@aztec/world-state": "0.0.1-commit.2eb6648a",
+    "@aztec/constants": "0.0.1-commit.2f68f620",
+    "@aztec/foundation": "0.0.1-commit.2f68f620",
+    "@aztec/native": "0.0.1-commit.2f68f620",
+    "@aztec/noir-acvm_js": "0.0.1-commit.2f68f620",
+    "@aztec/noir-noirc_abi": "0.0.1-commit.2f68f620",
+    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.2f68f620",
+    "@aztec/noir-types": "0.0.1-commit.2f68f620",
+    "@aztec/protocol-contracts": "0.0.1-commit.2f68f620",
+    "@aztec/standard-contracts": "0.0.1-commit.2f68f620",
+    "@aztec/stdlib": "0.0.1-commit.2f68f620",
+    "@aztec/telemetry-client": "0.0.1-commit.2f68f620",
+    "@aztec/world-state": "0.0.1-commit.2f68f620",
     "lodash.clonedeep": "^4.5.0",
     "lodash.merge": "^4.6.2",
     "tslib": "^2.4.0"
   },
   "devDependencies": {
-    "@aztec/kv-store": "0.0.1-commit.2eb6648a",
-    "@aztec/merkle-tree": "0.0.1-commit.2eb6648a",
-    "@aztec/noir-contracts.js": "0.0.1-commit.2eb6648a",
-    "@aztec/noir-test-contracts.js": "0.0.1-commit.2eb6648a",
+    "@aztec/kv-store": "0.0.1-commit.2f68f620",
+    "@aztec/noir-contracts.js": "0.0.1-commit.2f68f620",
+    "@aztec/noir-test-contracts.js": "0.0.1-commit.2f68f620",
     "@jest/globals": "^30.0.0",
     "@types/jest": "^30.0.0",
     "@types/lodash.clonedeep": "^4.5.7",

package/src/private/acvm_wasm.ts

@@ -10,6 +10,8 @@ import type { ACVMWitness } from './acvm/acvm_types.js';
 import type { ACVMSuccess } from './acvm_native.js';
 import { type CircuitSimulator, enrichNoirError } from './circuit_simulator.js';
 
+let wasmInitPromise: Promise<unknown> | undefined;
+
 export class WASMSimulator implements CircuitSimulator {
   protected log: Logger;
 
@@ -23,7 +25,8 @@ export class WASMSimulator implements CircuitSimulator {
     // is a no-op.
     if (typeof initAbi === 'function') {
       /** @ts-expect-error The node bundle doesn't include these default imports, so TS complains */
-      await Promise.all([initAbi(), initACVM()]);
+      wasmInitPromise ??= Promise.all([initAbi(), initACVM()]);
+      await wasmInitPromise;
     }
   }
 

package/src/private/circuit_recording/circuit_recorder.ts

@@ -161,11 +161,11 @@ export class CircuitRecorder {
         throw new Error(`Oracle method ${name} not found when setting up recording callback`);
       }
 
-      const isExternalCall = (name as keyof ACIRCallback) === 'privateCallPrivateFunction';
+      const isExternalCall = (name as keyof ACIRCallback) === 'aztec_prv_callPrivateFunction';
 
       recordingCallback[name as keyof ACIRCallback] = (...args: ForeignCallInput[]): ReturnType<typeof fn> => {
         const timer = new Timer();
-        // If we're entering another circuit via `privateCallPrivateFunction`, we increase the stack depth and set the
+        // If we're entering another circuit via `aztec_prv_callPrivateFunction`, we increase the stack depth and set the
         // newCircuit variable to ensure we are creating a new recording object.
         if (isExternalCall) {
           this.stackDepth++;