@aztec/simulator 0.0.1-fake-ceab37513c → 0.0.6-commit.a2d1860fe9

package/src/public/public_tx_simulator/public_tx_simulator.ts

@@ -1,37 +1,76 @@
 import { AVM_MAX_PROCESSABLE_L2_GAS } from '@aztec/constants';
-import type { Fr } from '@aztec/foundation/fields';
-import { type Logger, createLogger } from '@aztec/foundation/log';
-import { ProtocolContractAddress } from '@aztec/protocol-contracts';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { type Logger, type LoggerBindings, createLogger } from '@aztec/foundation/log';
+import { ProtocolContractAddress, ProtocolContractsList } from '@aztec/protocol-contracts';
 import { computeFeePayerBalanceStorageSlot } from '@aztec/protocol-contracts/fee-juice';
-import {
-  AvmCircuitInputs,
-  AvmCircuitPublicInputs,
-  AvmExecutionHints,
-  type AvmProvingRequest,
-  AvmTxHint,
-  type RevertCode,
-} from '@aztec/stdlib/avm';
+import { AvmExecutionHints, AvmTxHint, PublicSimulatorConfig, PublicTxEffect, PublicTxResult } from '@aztec/stdlib/avm';
 import { SimulationError } from '@aztec/stdlib/errors';
-import type { Gas, GasUsed } from '@aztec/stdlib/gas';
-import { ProvingRequestType } from '@aztec/stdlib/proofs';
+import { Gas } from '@aztec/stdlib/gas';
 import type { MerkleTreeWriteOperations } from '@aztec/stdlib/trees';
 import {
   type GlobalVariables,
   NestedProcessReturnValues,
+  ProtocolContracts,
   PublicCallRequestWithCalldata,
   Tx,
   TxExecutionPhase,
 } from '@aztec/stdlib/tx';
 
+import { strict as assert } from 'assert';
+
 import type { AvmFinalizedCallResult } from '../avm/avm_contract_call_result.js';
+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 { type PublicContractsDB, PublicTreesDB } from '../public_db_sources.js';
+import {
+  L2ToL1MessageLimitReachedError,
+  NoteHashLimitReachedError,
+  NullifierCollisionError,
+  NullifierLimitReachedError,
+} from '../side_effect_errors.js';
 import type { PublicPersistableStateManager } from '../state_manager/state_manager.js';
 import { PublicTxContext } from './public_tx_context.js';
+import type { PublicTxSimulatorInterface } from './public_tx_simulator_interface.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.
+
+/**
+ * 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 type ProcessedPhase = {
+/** Only used internally. */
+type ProcessedPhase = {
   phase: TxExecutionPhase;
   durationMs?: number;
   returnValues: NestedProcessReturnValues[];
@@ -39,28 +78,22 @@ export type ProcessedPhase = {
   revertReason?: SimulationError;
 };
 
-export type PublicTxResult = {
-  avmProvingRequest: AvmProvingRequest;
-  /** Gas used during the execution of this tx */
-  gasUsed: GasUsed;
-  revertCode: RevertCode;
-  /** Revert reason, if any */
-  revertReason?: SimulationError;
-  processedPhases: ProcessedPhase[];
-};
-
-export class PublicTxSimulator {
+export class PublicTxSimulator implements PublicTxSimulatorInterface {
   protected log: Logger;
+  protected readonly config: PublicSimulatorConfig;
+  protected readonly bindings?: LoggerBindings;
 
   constructor(
-    private merkleTree: MerkleTreeWriteOperations,
-    private contractsDB: PublicContractsDB,
-    private globalVariables: GlobalVariables,
-    private doMerkleOperations: boolean = false,
-    private skipFeeEnforcement: boolean = false,
-    private clientInitiatedSimulation: boolean = false,
+    protected merkleTree: MerkleTreeWriteOperations,
+    protected contractsDB: PublicContractsDB,
+    protected globalVariables: GlobalVariables,
+    config?: Partial<PublicSimulatorConfig>,
+    protected protocolContracts: ProtocolContracts = ProtocolContractsList,
+    bindings?: LoggerBindings,
   ) {
-    this.log = createLogger(`simulator:public_tx_simulator`);
+    this.config = PublicSimulatorConfig.from(config ?? {});
+    this.bindings = bindings;
+    this.log = createLogger(`simulator:public_tx_simulator`, bindings);
   }
 
   /**
@@ -69,121 +102,144 @@ export class PublicTxSimulator {
    * @returns The result of the transaction's public execution.
    */
   public async simulate(tx: Tx): Promise<PublicTxResult> {
-    try {
-      const txHash = this.computeTxHash(tx);
-      this.log.debug(`Simulating ${tx.publicFunctionCalldata.length} public calls for tx ${txHash}`, { txHash });
-
-      // Create hinting DBs.
-      const hints = new AvmExecutionHints(this.globalVariables, AvmTxHint.fromTx(tx, this.globalVariables.gasFees));
-      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.doMerkleOperations,
-      );
+    const txHash = this.computeTxHash(tx);
+    this.log.debug(`Simulating ${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.
+    // This will throw if there is a nullifier collision.
+    // In that case the transaction will be thrown out.
+    await this.insertNonRevertiblesFromPrivate(context);
+
+    const processedPhases: ProcessedPhase[] = [];
+    if (context.hasPhase(TxExecutionPhase.SETUP)) {
+      // This will throw if the setup phase reverts.
       // In that case the transaction will be thrown out.
-      await this.insertNonRevertiblesFromPrivate(context, tx);
-
-      const processedPhases: ProcessedPhase[] = [];
-      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 phase reverted! The transaction will be thrown out. ${setupResult.revertReason?.message}`,
-          );
-        }
-        processedPhases.push(setupResult);
+      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();
-
-      try {
-        // This will throw if there is a nullifier collision.
-        await this.insertRevertiblesFromPrivate(context, tx);
-        // 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 Error(`App logic phase reverted! ${appLogicResult.revertReason?.message}`);
-          }
+    // 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) {
-        this.log.debug(String(e));
+      }
+    } catch (e: any) {
+      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;
       }
+    }
 
-      try {
-        if (context.hasPhase(TxExecutionPhase.TEARDOWN)) {
-          const teardownResult = await this.simulatePhase(TxExecutionPhase.TEARDOWN, context);
-          processedPhases.push(teardownResult);
-          if (teardownResult.reverted) {
-            throw new Error(`Teardown phase reverted! ${teardownResult.revertReason?.message}`);
-          }
+    try {
+      if (context.hasPhase(TxExecutionPhase.TEARDOWN)) {
+        const teardownResult = await this.simulatePhase(TxExecutionPhase.TEARDOWN, context);
+        processedPhases.push(teardownResult);
+        if (teardownResult.reverted) {
+          throw new TxSimTeardownRevert();
         }
-
-        // We commit the forked state and we are done.
-        await context.state.mergeForkedState();
-      } catch (e) {
-        this.log.debug(String(e));
-        // We rollback to the post-setup state.
+      }
+      // We commit the forked state and we are done.
+      await context.state.mergeForkedState();
+      hintingContractsDB.commitCheckpoint();
+    } catch (e: any) {
+      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();
+    context.halt();
 
-      if (context.getActualGasUsed().l2Gas > AVM_MAX_PROCESSABLE_L2_GAS) {
-        throw new Error(
-          `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 avmProvingRequest = PublicTxSimulator.generateProvingRequest(publicInputs, hints);
-
-      const revertCode = context.getFinalRevertCode();
-
-      // Commit contracts from this TX to the block-level cache and clear tx cache
-      // If the tx reverted, only commit non-revertible contracts
-      // NOTE: You can't create contracts in public, so this is only relevant for private-created contracts
-      // FIXME(fcarreiro): this should conceptually use the hinted contracts db.
-      // However things should work as they are now because the hinted db would still pick up the new contracts.
-      this.contractsDB.commitContractsForTx(/*onlyNonRevertibles=*/ !revertCode.isOK());
-
-      return {
-        avmProvingRequest,
-        gasUsed: {
-          totalGas: context.getActualGasUsed(),
-          teardownGas: context.teardownGasUsed,
-          publicGas: context.getActualPublicGasUsed(),
-          billedGas: context.getTotalGasUsed(),
-        },
-        revertCode,
-        revertReason: context.revertReason,
-        processedPhases: processedPhases,
-      };
-    } finally {
-      // Make sure there are no new contracts in the tx-level cache.
-      // They should either be committed to block-level cache or cleared.
-      // FIXME(fcarreiro): this should conceptually use the hinted contracts db.
-      // However things should work as they are now because the hinted db would still pick up the new contracts.
-      this.contractsDB.clearContractsForTx();
+    // 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: NestedProcessReturnValues[] =
+      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 as any).revertReason = context.revertReason;
     }
+
+    // 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,
+    );
   }
 
   protected computeTxHash(tx: Tx) {
@@ -216,7 +272,7 @@ export class PublicTxSimulator {
 
       const enqueuedCallResult = await this.simulateEnqueuedCall(phase, context, callRequest);
 
-      returnValues.push(new NestedProcessReturnValues(enqueuedCallResult.output));
+      returnValues.push(new NestedProcessReturnValues(enqueuedCallResult.output.bestEffortReadAll()));
 
       if (enqueuedCallResult.reverted) {
         reverted = true;
@@ -246,7 +302,11 @@ export class PublicTxSimulator {
   ): Promise<AvmFinalizedCallResult> {
     const stateManager = context.state.getActiveStateManager();
     const contractAddress = callRequest.request.contractAddress;
-    const fnName = await getPublicFunctionDebugName(this.contractsDB, contractAddress, callRequest.calldata);
+    const fnName = await getPublicFunctionDebugName(
+      this.contractsDB,
+      contractAddress,
+      new CallDataArray(callRequest.calldata),
+    );
 
     const allocatedGas = context.getGasLeftAtPhase(phase);
 
@@ -265,7 +325,7 @@ export class PublicTxSimulator {
     );
 
     if (result.reverted) {
-      const culprit = `${contractAddress}:${callRequest.functionSelector}`;
+      const culprit = `${contractAddress}:${fnName}`;
       context.revert(phase, result.revertReason, culprit);
     }
 
@@ -306,9 +366,9 @@ export class PublicTxSimulator {
       transactionFee,
       this.globalVariables,
       request.isStaticCall,
-      calldata,
+      new CallDataArray(calldata),
       allocatedGas,
-      this.clientInitiatedSimulation,
+      this.config,
     );
     const avmCallResult = await simulator.execute();
     return avmCallResult.finalize();
@@ -317,7 +377,7 @@ export class PublicTxSimulator {
   /**
    * Insert the non-revertible accumulated data from private into the public state.
    */
-  protected async insertNonRevertiblesFromPrivate(context: PublicTxContext, tx: Tx) {
+  protected async insertNonRevertiblesFromPrivate(context: PublicTxContext) {
     const stateManager = context.state.getActiveStateManager();
 
     for (const siloedNullifier of context.nonRevertibleAccumulatedDataFromPrivate.nullifiers.filter(
@@ -336,58 +396,107 @@ export class PublicTxSimulator {
       }
     }
 
-    // add new contracts to the contracts db so that their functions may be found and called
-    // TODO(#6464): Should we allow emitting contracts in the private setup phase?
-    // FIXME(fcarreiro): this should conceptually use the hinted contracts db.
-    // However things should work as they are now because the hinted db would still pick up the new contracts.
-    await this.contractsDB.addNewNonRevertibleContracts(tx);
+    // 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.
-   * Start by forking state so we can rollback to the end of setup if app logic or teardown reverts.
+   * Throws TxSimRevertibleInsertionsRevert if there is some checked error during revertible insertions.
+   * This function checks for the following errors:
+   * - NullifierLimitReachedError
+   * - NullifierCollisionError
+   * - NoteHashLimitReachedError
+   * - L2ToL1MessageLimitReachedError
    */
-  protected async insertRevertiblesFromPrivate(context: PublicTxContext, tx: Tx): /*success=*/ Promise<boolean> {
+  protected async insertRevertiblesFromPrivate(context: PublicTxContext) {
     const stateManager = context.state.getActiveStateManager();
 
     try {
       for (const siloedNullifier of context.revertibleAccumulatedDataFromPrivate.nullifiers.filter(n => !n.isEmpty())) {
         await stateManager.writeSiloedNullifier(siloedNullifier);
       }
-    } catch (e) {
-      context.revert(
-        TxExecutionPhase.APP_LOGIC,
-        new SimulationError(
-          `Nullifier collision encountered when inserting revertible nullifiers from private.\nDetails: ${String(e)}`,
-          [],
-        ),
-      );
-      throw e;
+    } catch (e: any) {
+      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;
+      }
     }
-    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);
+
+    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: any) {
+      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;
       }
     }
-    for (const l2ToL1Message of context.revertibleAccumulatedDataFromPrivate.l2ToL1Msgs) {
-      if (!l2ToL1Message.isEmpty()) {
-        stateManager.writeScopedL2ToL1Message(l2ToL1Message);
+
+    try {
+      for (const l2ToL1Message of context.revertibleAccumulatedDataFromPrivate.l2ToL1Msgs) {
+        if (!l2ToL1Message.isEmpty()) {
+          stateManager.writeScopedL2ToL1Message(l2ToL1Message);
+        }
+      }
+    } catch (e: any) {
+      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;
       }
     }
-    // add new contracts to the contracts db so that their functions may be found and called
-    // FIXME(fcarreiro): this should conceptually use the hinted contracts db.
-    // However things should work as they are now because the hinted db would still pick up the new contracts.
-    await this.contractsDB.addNewRevertibleContracts(tx);
 
-    return /*success=*/ true;
+    // 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);
   }
 
   private async payFee(context: PublicTxContext) {
     const txFee = context.getTransactionFee(TxExecutionPhase.TEARDOWN);
 
     if (context.feePayer.isZero()) {
-      this.log.debug(`No one is paying the fee of ${txFee.toBigInt()}`);
+      // 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;
     }
 
@@ -402,29 +511,17 @@ export class PublicTxSimulator {
     // When mocking the balance of the fee payer, the circuit should not be able to prove the simulation
 
     if (currentBalance.lt(txFee)) {
-      if (!this.skipFeeEnforcement) {
-        throw new Error(
-          `Not enough balance for fee payer to pay for transaction (got ${currentBalance.toBigInt()} needs ${txFee.toBigInt()})`,
-        );
-      } else {
-        currentBalance = 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);
   }
-
-  /**
-   * Generate the proving request for the AVM circuit.
-   */
-  private static generateProvingRequest(
-    publicInputs: AvmCircuitPublicInputs,
-    hints: AvmExecutionHints,
-  ): AvmProvingRequest {
-    return {
-      type: ProvingRequestType.PUBLIC_VM,
-      inputs: new AvmCircuitInputs(hints, publicInputs),
-    };
-  }
 }

package/src/public/public_tx_simulator/public_tx_simulator_interface.ts

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

package/src/public/public_tx_simulator/telemetry_public_tx_simulator.ts

@@ -1,4 +1,5 @@
-import type { Fr } from '@aztec/foundation/fields';
+import type { Fr } from '@aztec/foundation/curves/bn254';
+import type { PublicSimulatorConfig } from '@aztec/stdlib/avm';
 import type { Gas } from '@aztec/stdlib/gas';
 import type { MerkleTreeWriteOperations } from '@aztec/stdlib/trees';
 import { type GlobalVariables, PublicCallRequestWithCalldata, TxExecutionPhase } from '@aztec/stdlib/tx';
@@ -22,21 +23,11 @@ export class TelemetryPublicTxSimulator extends MeasuredPublicTxSimulator {
     merkleTree: MerkleTreeWriteOperations,
     contractsDB: PublicContractsDB,
     globalVariables: GlobalVariables,
-    doMerkleOperations: boolean = false,
-    skipFeeEnforcement: boolean = false,
-    clientInitiatedSimulation: boolean = false,
     telemetryClient: TelemetryClient = getTelemetryClient(),
+    config?: Partial<PublicSimulatorConfig>,
   ) {
     const metrics = new ExecutorMetrics(telemetryClient, 'PublicTxSimulator');
-    super(
-      merkleTree,
-      contractsDB,
-      globalVariables,
-      doMerkleOperations,
-      skipFeeEnforcement,
-      clientInitiatedSimulation,
-      metrics,
-    );
+    super(merkleTree, contractsDB, globalVariables, metrics, config);
     this.tracer = metrics.tracer;
   }