@aztec/simulator 0.0.1-commit.24de95ac → 0.0.1-commit.2606882

package/dest/public/public_tx_simulator/public_tx_context.js

@@ -1,8 +1,9 @@
 import { MAX_ENQUEUED_CALLS_PER_TX, MAX_L2_TO_L1_MSGS_PER_TX, MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX } from '@aztec/constants';
 import { padArrayEnd } from '@aztec/foundation/collection';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { createLogger } from '@aztec/foundation/log';
 import { AvmAccumulatedData, AvmAccumulatedDataArrayLengths, AvmCircuitPublicInputs, PublicDataWrite, RevertCode } from '@aztec/stdlib/avm';
+import { AllContractDeploymentData } from '@aztec/stdlib/contract';
 import { computeEffectiveGasFees, computeTransactionFee } from '@aztec/stdlib/fees';
 import { Gas } from '@aztec/stdlib/gas';
 import { PrivateToAvmAccumulatedData, PrivateToAvmAccumulatedDataArrayLengths, PublicCallRequest, PublicCallRequestArrayLengths, countAccumulatedItems } from '@aztec/stdlib/kernel';
@@ -31,6 +32,8 @@ import { getCallRequestsWithCalldataByPhase } from '../utils.js';
     setupCallRequests;
     appLogicCallRequests;
     teardownCallRequests;
+    nonRevertibleContractDeploymentData;
+    revertibleContractDeploymentData;
     nonRevertibleAccumulatedDataFromPrivate;
     revertibleAccumulatedDataFromPrivate;
     feePayer;
@@ -41,7 +44,7 @@ import { getCallRequestsWithCalldataByPhase } from '../utils.js';
     /* Entire transaction execution is done. */ halted;
     /* Where did reverts happen (if at all)? */ revertCode;
     /* What caused a revert (if one occurred)? */ revertReason;
-    constructor(txHash, state, startTreeSnapshots, globalVariables, protocolContracts, proverId, gasSettings, gasUsedByPrivate, gasAllocatedToPublic, gasAllocatedToPublicTeardown, setupCallRequests, appLogicCallRequests, teardownCallRequests, nonRevertibleAccumulatedDataFromPrivate, revertibleAccumulatedDataFromPrivate, feePayer, trace){
+    constructor(txHash, state, startTreeSnapshots, globalVariables, protocolContracts, proverId, gasSettings, gasUsedByPrivate, gasAllocatedToPublic, gasAllocatedToPublicTeardown, setupCallRequests, appLogicCallRequests, teardownCallRequests, nonRevertibleContractDeploymentData, revertibleContractDeploymentData, nonRevertibleAccumulatedDataFromPrivate, revertibleAccumulatedDataFromPrivate, feePayer, trace, bindings){
         this.txHash = txHash;
         this.state = state;
         this.startTreeSnapshots = startTreeSnapshots;
@@ -55,6 +58,8 @@ import { getCallRequestsWithCalldataByPhase } from '../utils.js';
         this.setupCallRequests = setupCallRequests;
         this.appLogicCallRequests = appLogicCallRequests;
         this.teardownCallRequests = teardownCallRequests;
+        this.nonRevertibleContractDeploymentData = nonRevertibleContractDeploymentData;
+        this.revertibleContractDeploymentData = revertibleContractDeploymentData;
         this.nonRevertibleAccumulatedDataFromPrivate = nonRevertibleAccumulatedDataFromPrivate;
         this.revertibleAccumulatedDataFromPrivate = revertibleAccumulatedDataFromPrivate;
         this.feePayer = feePayer;
@@ -63,19 +68,22 @@ import { getCallRequestsWithCalldataByPhase } from '../utils.js';
         this.teardownGasUsed = Gas.empty();
         this.halted = false;
         this.revertCode = RevertCode.OK;
-        this.log = createLogger(`simulator:public_tx_context`);
+        this.log = createLogger(`simulator:public_tx_context`, bindings);
     }
-    static async create(treesDB, contractsDB, tx, globalVariables, protocolContracts, doMerkleOperations, proverId) {
+    static async create(treesDB, contractsDB, tx, globalVariables, protocolContracts, proverId, bindings) {
+        const contractDeploymentData = AllContractDeploymentData.fromTx(tx);
+        const nonRevertibleContractDeploymentData = contractDeploymentData.getNonRevertibleContractDeploymentData();
+        const revertibleContractDeploymentData = contractDeploymentData.getRevertibleContractDeploymentData();
         const nonRevertibleAccumulatedDataFromPrivate = tx.data.forPublic.nonRevertibleAccumulatedData;
-        const trace = new SideEffectTrace();
+        const trace = new SideEffectTrace(0, bindings);
         const firstNullifier = nonRevertibleAccumulatedDataFromPrivate.nullifiers[0];
         // Transaction level state manager that will be forked for revertible phases.
-        const txStateManager = PublicPersistableStateManager.create(treesDB, contractsDB, trace, doMerkleOperations, firstNullifier, globalVariables.timestamp);
+        const txStateManager = PublicPersistableStateManager.create(treesDB, contractsDB, trace, firstNullifier, globalVariables.timestamp, bindings);
         const gasSettings = tx.data.constants.txContext.gasSettings;
         const gasUsedByPrivate = tx.data.gasUsed;
         const gasAllocatedToPublic = gasSettings.gasLimits.sub(gasUsedByPrivate);
         const gasAllocatedToPublicTeardown = gasSettings.teardownGasLimits;
-        return new PublicTxContext(tx.getTxHash(), new PhaseStateManager(txStateManager), await txStateManager.getTreeSnapshots(), globalVariables, protocolContracts, proverId, gasSettings, gasUsedByPrivate, gasAllocatedToPublic, gasAllocatedToPublicTeardown, getCallRequestsWithCalldataByPhase(tx, TxExecutionPhase.SETUP), getCallRequestsWithCalldataByPhase(tx, TxExecutionPhase.APP_LOGIC), getCallRequestsWithCalldataByPhase(tx, TxExecutionPhase.TEARDOWN), tx.data.forPublic.nonRevertibleAccumulatedData, tx.data.forPublic.revertibleAccumulatedData, tx.data.feePayer, trace);
+        return new PublicTxContext(tx.getTxHash(), new PhaseStateManager(txStateManager, bindings), await txStateManager.getTreeSnapshots(), globalVariables, protocolContracts, proverId, gasSettings, gasUsedByPrivate, gasAllocatedToPublic, gasAllocatedToPublicTeardown, getCallRequestsWithCalldataByPhase(tx, TxExecutionPhase.SETUP), getCallRequestsWithCalldataByPhase(tx, TxExecutionPhase.APP_LOGIC), getCallRequestsWithCalldataByPhase(tx, TxExecutionPhase.TEARDOWN), nonRevertibleContractDeploymentData, revertibleContractDeploymentData, tx.data.forPublic.nonRevertibleAccumulatedData, tx.data.forPublic.revertibleAccumulatedData, tx.data.feePayer, trace, bindings);
     }
     /**
    * Signal that the entire transaction execution is done.
@@ -98,14 +106,8 @@ import { getCallRequestsWithCalldataByPhase } from '../utils.js';
         }
         if (phase === TxExecutionPhase.SETUP) {
             this.log.warn(`Setup phase reverted! The transaction will be thrown out.`);
-        } else if (phase === TxExecutionPhase.APP_LOGIC) {
-            this.revertCode = RevertCode.APP_LOGIC_REVERTED;
-        } else if (phase === TxExecutionPhase.TEARDOWN) {
-            if (this.revertCode.equals(RevertCode.APP_LOGIC_REVERTED)) {
-                this.revertCode = RevertCode.BOTH_REVERTED;
-            } else {
-                this.revertCode = RevertCode.TEARDOWN_REVERTED;
-            }
+        } else if (phase === TxExecutionPhase.APP_LOGIC || phase === TxExecutionPhase.TEARDOWN) {
+            this.revertCode = RevertCode.REVERTED;
         }
     }
     /**
@@ -160,8 +162,12 @@ import { getCallRequestsWithCalldataByPhase } from '../utils.js';
         }
     }
     /**
-   * The gasUsed by public and private,
-   * as if the entire teardown gas limit was consumed.
+   * The gasUsed by public and private, as if the entire teardown gas limit was consumed.
+   *
+   * This is intentional: teardown is used for gas accounting and refunds, so the transaction
+   * fee must be deterministic _before_ teardown executes. If fees depended on teardown's actual
+   * consumption there would be a circular dependency. Billing the full teardown gas limit
+   * (set by the user) makes the fee known in advance and available to the teardown function.
    */ getTotalGasUsed() {
         return this.gasUsedByPrivate.add(this.gasUsedByPublic);
     }
@@ -260,9 +266,9 @@ import { getCallRequestsWithCalldataByPhase } from '../utils.js';
     txStateManager;
     log;
     currentlyActiveStateManager;
-    constructor(txStateManager){
+    constructor(txStateManager, bindings){
         this.txStateManager = txStateManager;
-        this.log = createLogger(`simulator:public_phase_state_manager`);
+        this.log = createLogger(`simulator:public_phase_state_manager`, bindings);
     }
     async fork() {
         assert(!this.currentlyActiveStateManager, 'Cannot fork when already forked');

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

@@ -1,47 +1,32 @@
-import { Fr } from '@aztec/foundation/fields';
-import { type Logger } from '@aztec/foundation/log';
-import { type AvmProvingRequest, type RevertCode } from '@aztec/stdlib/avm';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { type Logger, type LoggerBindings } from '@aztec/foundation/log';
+import { PublicSimulatorConfig, PublicTxResult } from '@aztec/stdlib/avm';
 import { SimulationError } from '@aztec/stdlib/errors';
-import type { Gas, GasUsed } from '@aztec/stdlib/gas';
-import type { DebugLog } from '@aztec/stdlib/logs';
+import { Gas } from '@aztec/stdlib/gas';
 import type { MerkleTreeWriteOperations } from '@aztec/stdlib/trees';
-import { type GlobalVariables, NestedProcessReturnValues, PublicCallRequestWithCalldata, Tx, TxExecutionPhase } from '@aztec/stdlib/tx';
+import { type GlobalVariables, NestedProcessReturnValues, ProtocolContracts, PublicCallRequestWithCalldata, Tx, TxExecutionPhase } from '@aztec/stdlib/tx';
 import type { AvmFinalizedCallResult } from '../avm/avm_contract_call_result.js';
 import { type PublicContractsDB } from '../public_db_sources.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';
-export type ProcessedPhase = {
+/** Only used internally. */
+type ProcessedPhase = {
     phase: TxExecutionPhase;
     durationMs?: number;
     returnValues: NestedProcessReturnValues[];
     reverted: boolean;
     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[];
-    logs: DebugLog[];
-};
-export type PublicTxSimulatorConfig = {
-    proverId: Fr;
-    doMerkleOperations: boolean;
-    skipFeeEnforcement: boolean;
-    clientInitiatedSimulation: boolean;
-    maxDebugLogMemoryReads: number;
-};
 export declare class PublicTxSimulator implements PublicTxSimulatorInterface {
     protected merkleTree: MerkleTreeWriteOperations;
     protected contractsDB: PublicContractsDB;
     protected globalVariables: GlobalVariables;
+    protected protocolContracts: ProtocolContracts;
     protected log: Logger;
-    private config;
-    constructor(merkleTree: MerkleTreeWriteOperations, contractsDB: PublicContractsDB, globalVariables: GlobalVariables, config?: Partial<PublicTxSimulatorConfig>);
+    protected readonly config: PublicSimulatorConfig;
+    protected readonly bindings?: LoggerBindings;
+    constructor(merkleTree: MerkleTreeWriteOperations, contractsDB: PublicContractsDB, globalVariables: GlobalVariables, config?: Partial<PublicSimulatorConfig>, protocolContracts?: ProtocolContracts, bindings?: LoggerBindings);
     /**
      * Simulate a transaction's public portion including all of its phases.
      * @param tx - The transaction to simulate.
@@ -80,21 +65,22 @@ export declare class PublicTxSimulator implements PublicTxSimulatorInterface {
     /**
      * Insert the non-revertible accumulated data from private into the public state.
      */
-    protected insertNonRevertiblesFromPrivate(context: PublicTxContext, tx: Tx): Promise<void>;
+    protected insertNonRevertiblesFromPrivate(context: PublicTxContext): Promise<void>;
     /**
      * 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
+     *
+     * Note: NullifierCollisionError is intentionally NOT caught here. A nullifier collision
+     * during revertible insertions is unprovable (the nullifier originated from private, so
+     * a collision indicates the tx should never have been proposed). It propagates as-is to
+     * make the transaction unrecoverable, matching the AVM circuit behavior.
      */
-    protected insertRevertiblesFromPrivate(context: PublicTxContext, tx: Tx): Promise<void>;
+    protected insertRevertiblesFromPrivate(context: PublicTxContext): Promise<void>;
     private payFee;
-    /**
-     * Generate the proving request for the AVM circuit.
-     */
-    private static generateProvingRequest;
 }
-//# sourceMappingURL=public_tx_simulator.d.ts.map
+export {};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHVibGljX3R4X3NpbXVsYXRvci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3B1YmxpYy9wdWJsaWNfdHhfc2ltdWxhdG9yL3B1YmxpY190eF9zaW11bGF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3BELE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBRSxLQUFLLGNBQWMsRUFBZ0IsTUFBTSx1QkFBdUIsQ0FBQztBQUd2RixPQUFPLEVBQWdDLHFCQUFxQixFQUFrQixjQUFjLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUN4SCxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDdkQsT0FBTyxFQUFFLEdBQUcsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ3hDLE9BQU8sS0FBSyxFQUFFLHlCQUF5QixFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDckUsT0FBTyxFQUNMLEtBQUssZUFBZSxFQUNwQix5QkFBeUIsRUFDekIsaUJBQWlCLEVBQ2pCLDZCQUE2QixFQUM3QixFQUFFLEVBQ0YsZ0JBQWdCLEVBQ2pCLE1BQU0sa0JBQWtCLENBQUM7QUFJMUIsT0FBTyxLQUFLLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSxvQ0FBb0MsQ0FBQztBQUtqRixPQUFPLEVBQUUsS0FBSyxpQkFBaUIsRUFBaUIsTUFBTSx5QkFBeUIsQ0FBQztBQU1oRixPQUFPLEtBQUssRUFBRSw2QkFBNkIsRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBQ3ZGLE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUN6RCxPQUFPLEtBQUssRUFBRSwwQkFBMEIsRUFBRSxNQUFNLG9DQUFvQyxDQUFDO0FBcUNyRiw0QkFBNEI7QUFDNUIsS0FBSyxjQUFjLEdBQUc7SUFDcEIsS0FBSyxFQUFFLGdCQUFnQixDQUFDO0lBQ3hCLFVBQVUsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUNwQixZQUFZLEVBQUUseUJBQXlCLEVBQUUsQ0FBQztJQUMxQyxRQUFRLEVBQUUsT0FBTyxDQUFDO0lBQ2xCLFlBQVksQ0FBQyxFQUFFLGVBQWUsQ0FBQztDQUNoQyxDQUFDO0FBRUYscUJBQWEsaUJBQWtCLFlBQVcsMEJBQTBCO0lBTWhFLFNBQVMsQ0FBQyxVQUFVLEVBQUUseUJBQXlCO0lBQy9DLFNBQVMsQ0FBQyxXQUFXLEVBQUUsaUJBQWlCO0lBQ3hDLFNBQVMsQ0FBQyxlQUFlLEVBQUUsZUFBZTtJQUUxQyxTQUFTLENBQUMsaUJBQWlCLEVBQUUsaUJBQWlCO0lBVGhELFNBQVMsQ0FBQyxHQUFHLEVBQUUsTUFBTSxDQUFDO0lBQ3RCLFNBQVMsQ0FBQyxRQUFRLENBQUMsTUFBTSxFQUFFLHFCQUFxQixDQUFDO0lBQ2pELFNBQVMsQ0FBQyxRQUFRLENBQUMsUUFBUSxDQUFDLEVBQUUsY0FBYyxDQUFDO0lBRTdDLFlBQ1ksVUFBVSxFQUFFLHlCQUF5QixFQUNyQyxXQUFXLEVBQUUsaUJBQWlCLEVBQzlCLGVBQWUsRUFBRSxlQUFlLEVBQzFDLE1BQU0sQ0FBQyxFQUFFLE9BQU8sQ0FBQyxxQkFBcUIsQ0FBQyxFQUM3QixpQkFBaUIsR0FBRSxpQkFBeUMsRUFDdEUsUUFBUSxDQUFDLEVBQUUsY0FBYyxFQUsxQjtJQUVEOzs7O09BSUc7SUFDVSxRQUFRLENBQUMsRUFBRSxFQUFFLEVBQUUsR0FBRyxPQUFPLENBQUMsY0FBYyxDQUFDLENBNElyRDtJQUVELFNBQVMsQ0FBQyxhQUFhLENBQUMsRUFBRSxFQUFFLEVBQUUscUNBRTdCO0lBRUQ7Ozs7T0FJRztJQUNILFVBQWdCLGFBQWEsQ0FBQyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsT0FBTyxFQUFFLGVBQWUsR0FBRyxPQUFPLENBQUMsY0FBYyxDQUFDLENBbUN4RztJQUVEOzs7Ozs7T0FNRztJQUNILFVBQWdCLG9CQUFvQixDQUNsQyxLQUFLLEVBQUUsZ0JBQWdCLEVBQ3ZCLE9BQU8sRUFBRSxlQUFlLEVBQ3hCLFdBQVcsRUFBRSw2QkFBNkIsR0FDekMsT0FBTyxDQUFDLHNCQUFzQixDQUFDLENBK0JqQztJQUVEOzs7Ozs7Ozs7Ozs7T0FZRztJQUNILFVBQWdCLDRCQUE0QixDQUMxQyxZQUFZLEVBQUUsNkJBQTZCLEVBQzNDLEVBQUUsT0FBTyxFQUFFLFFBQVEsRUFBRSxFQUFFLDZCQUE2QixFQUNwRCxZQUFZLEVBQUUsR0FBRyxFQUNqQixjQUFjLEVBQUUsRUFBRSxFQUNsQixNQUFNLEVBQUUsTUFBTSxHQUNiLE9BQU8sQ0FBQyxzQkFBc0IsQ0FBQyxDQXFCakM7SUFFRDs7T0FFRztJQUNILFVBQWdCLCtCQUErQixDQUFDLE9BQU8sRUFBRSxlQUFlLGlCQXlCdkU7SUFFRDs7Ozs7Ozs7Ozs7O09BWUc7SUFDSCxVQUFnQiw0QkFBNEIsQ0FBQyxPQUFPLEVBQUUsZUFBZSxpQkEwRXBFO1lBRWEsTUFBTTtDQW1DckIifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"public_tx_simulator.d.ts","sourceRoot":"","sources":["../../../src/public/public_tx_simulator/public_tx_simulator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"public_tx_simulator.d.ts","sourceRoot":"","sources":["../../../src/public/public_tx_simulator/public_tx_simulator.ts"],"names":[],"mappings":"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"}

package/dest/public/public_tx_simulator/public_tx_simulator.js

@@ -1,18 +1,17 @@
-import { AVM_MAX_PROCESSABLE_L2_GAS, DEFAULT_MAX_DEBUG_LOG_MEMORY_READS } from '@aztec/constants';
-import { Fr } from '@aztec/foundation/fields';
+import { 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 { AvmCircuitInputs, AvmExecutionHints, AvmTxHint } from '@aztec/stdlib/avm';
+import { AvmExecutionHints, AvmTxHint, PublicSimulatorConfig, PublicTxEffect, PublicTxResult } from '@aztec/stdlib/avm';
 import { SimulationError } from '@aztec/stdlib/errors';
-import { ProvingRequestType } from '@aztec/stdlib/proofs';
 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 { L2ToL1MessageLimitReachedError, NoteHashLimitReachedError, 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).
@@ -46,127 +45,117 @@ export class PublicTxSimulator {
     merkleTree;
     contractsDB;
     globalVariables;
+    protocolContracts;
     log;
     config;
-    constructor(merkleTree, contractsDB, globalVariables, config){
+    bindings;
+    constructor(merkleTree, contractsDB, globalVariables, config, protocolContracts = ProtocolContractsList, bindings){
         this.merkleTree = merkleTree;
         this.contractsDB = contractsDB;
         this.globalVariables = globalVariables;
-        this.config = {
-            proverId: config?.proverId ?? Fr.ZERO,
-            doMerkleOperations: config?.doMerkleOperations ?? false,
-            skipFeeEnforcement: config?.skipFeeEnforcement ?? false,
-            clientInitiatedSimulation: config?.clientInitiatedSimulation ?? false,
-            maxDebugLogMemoryReads: config?.maxDebugLogMemoryReads ?? DEFAULT_MAX_DEBUG_LOG_MEMORY_READS
-        };
-        this.log = createLogger(`simulator:public_tx_simulator`);
+        this.protocolContracts = protocolContracts;
+        this.config = PublicSimulatorConfig.from(config ?? {});
+        this.bindings = bindings;
+        this.log = createLogger(`simulator:public_tx_simulator`, bindings);
     }
     /**
    * Simulate a transaction's public portion including all of its phases.
    * @param tx - The transaction to simulate.
    * @returns The result of the transaction's public execution.
    */ async simulate(tx) {
-        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), ProtocolContractsList);
-            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, ProtocolContractsList, this.config.doMerkleOperations, this.config.proverId);
-            // This will throw if there is a nullifier collision.
+        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.
+        // 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.
-            await this.insertNonRevertiblesFromPrivate(context, tx);
-            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 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}`);
             }
-            // 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 or other insertion error (limit reached).
-                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 TxSimAppLogicRevert();
-                    }
-                }
-            } catch (e) {
-                if (e instanceof TxSimRevertibleInsertionsRevert || e instanceof TxSimAppLogicRevert) {
-                    // We revert to the post-setup state.
-                    await context.state.discardForkedState();
-                    // 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();
-                } else {
-                    // Unchecked/unknown error - re-throw as-is
-                    throw e;
+            processedPhases.push(setupResult);
+        }
+        // The checkpoint we should go back to if anything from now on reverts.
+        await context.state.fork();
+        hintingContractsDB.createCheckpoint();
+        try {
+            // This may throw: a side-effect limit error triggers a soft revert (caught below), while a
+            // nullifier collision is unrecoverable and propagates out of simulate() to throw out the tx.
+            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();
                 }
             }
-            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) {
-                if (e instanceof TxSimTeardownRevert) {
-                    // We revert to the post-setup state and we are done.
-                    await context.state.discardForkedState();
-                } else {
-                    // Unchecked/unknown error - re-throw as-is
-                    throw e;
+        } 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;
+            }
+        }
+        try {
+            if (context.hasPhase(TxExecutionPhase.TEARDOWN)) {
+                const teardownResult = await this.simulatePhase(TxExecutionPhase.TEARDOWN, context);
+                processedPhases.push(teardownResult);
+                if (teardownResult.reverted) {
+                    throw new TxSimTeardownRevert();
                 }
             }
-            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 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,
-                logs: context.state.getActiveStateManager().getLogs()
-            };
-        } 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();
+            // 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 <= MAX_PROCESSABLE_L2_GAS, `Transaction consumes ${context.getActualGasUsed().l2Gas} L2 gas, which exceeds the maximum processable gas of ${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;
         }
+        // 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();
@@ -191,7 +180,7 @@ export class PublicTxSimulator {
             }
             const callRequest = callRequests[i];
             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;
                 revertReason = enqueuedCallResult.revertReason;
@@ -213,14 +202,14 @@ export class PublicTxSimulator {
    */ async simulateEnqueuedCall(phase, context, callRequest) {
         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);
         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}:${callRequest.functionSelector}`;
+            const culprit = `${contractAddress}:${fnName}`;
             context.revert(phase, result.revertReason, culprit);
         }
         return result;
@@ -241,13 +230,13 @@ export class PublicTxSimulator {
         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, calldata, allocatedGas, this.config.clientInitiatedSimulation, this.config.maxDebugLogMemoryReads);
+        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, tx) {
+   */ async insertNonRevertiblesFromPrivate(context) {
         const stateManager = context.state.getActiveStateManager();
         for (const siloedNullifier of context.nonRevertibleAccumulatedDataFromPrivate.nullifiers.filter((n)=>!n.isEmpty())){
             await stateManager.writeSiloedNullifier(siloedNullifier);
@@ -262,32 +251,37 @@ export class PublicTxSimulator {
                 stateManager.writeScopedL2ToL1Message(l2ToL1Message);
             }
         }
-        // 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.
+        this.contractsDB.addContractsFromLogs(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, tx) {
+   *
+   * Note: NullifierCollisionError is intentionally NOT caught here. A nullifier collision
+   * during revertible insertions is unprovable (the nullifier originated from private, so
+   * a collision indicates the tx should never have been proposed). It propagates as-is to
+   * make the transaction unrecoverable, matching the AVM circuit behavior.
+   */ 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) {
+            if (e instanceof NullifierLimitReachedError) {
                 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
+                // Unchecked/unknown error or NullifierCollisionError (unrecoverable) - re-throw as-is
                 throw e;
             }
         }
@@ -323,14 +317,19 @@ export class PublicTxSimulator {
             }
         }
         // 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);
+        // 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.
+        this.contractsDB.addContractsFromLogs(context.revertibleContractDeploymentData);
     }
     async payFee(context) {
         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;
         }
         const feeJuiceAddress = ProtocolContractAddress.FeeJuice;
@@ -343,17 +342,11 @@ export class PublicTxSimulator {
         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);
     }
-    /**
-   * Generate the proving request for the AVM circuit.
-   */ static generateProvingRequest(publicInputs, hints) {
-        return {
-            type: ProvingRequestType.PUBLIC_VM,
-            inputs: new AvmCircuitInputs(hints, publicInputs)
-        };
-    }
 }