@aztec/simulator 0.61.0 → 0.63.0

package/dest/public/public_tx_context.js

@@ -0,0 +1,293 @@
+import { TxExecutionPhase, TxHash, } from '@aztec/circuit-types';
+import { Fr, Gas, RevertCode, countAccumulatedItems, } from '@aztec/circuits.js';
+import { createDebugLogger } from '@aztec/foundation/log';
+import { strict as assert } from 'assert';
+import { inspect } from 'util';
+import { AvmPersistableStateManager } from '../avm/index.js';
+import { DualSideEffectTrace } from './dual_side_effect_trace.js';
+import { PublicEnqueuedCallSideEffectTrace, SideEffectArrayLengths } from './enqueued_call_side_effect_trace.js';
+import { PublicSideEffectTrace } from './side_effect_trace.js';
+import { generateAvmCircuitPublicInputs, generateAvmProvingRequest } from './transitional_adapters.js';
+import { getCallRequestsByPhase, getExecutionRequestsByPhase } from './utils.js';
+/**
+ * The transaction-level context for public execution.
+ */
+export class PublicTxContext {
+    constructor(state, globalVariables, historicalHeader, // FIXME(dbanks12): remove
+    startStateReference, startGasUsed, gasSettings, setupCallRequests, appLogicCallRequests, teardownCallRequests, setupExecutionRequests, appLogicExecutionRequests, teardownExecutionRequests, nonRevertibleAccumulatedDataFromPrivate, revertibleAccumulatedDataFromPrivate, trace) {
+        this.state = state;
+        this.globalVariables = globalVariables;
+        this.historicalHeader = historicalHeader;
+        this.startStateReference = startStateReference;
+        this.startGasUsed = startGasUsed;
+        this.gasSettings = gasSettings;
+        this.setupCallRequests = setupCallRequests;
+        this.appLogicCallRequests = appLogicCallRequests;
+        this.teardownCallRequests = teardownCallRequests;
+        this.setupExecutionRequests = setupExecutionRequests;
+        this.appLogicExecutionRequests = appLogicExecutionRequests;
+        this.teardownExecutionRequests = teardownExecutionRequests;
+        this.nonRevertibleAccumulatedDataFromPrivate = nonRevertibleAccumulatedDataFromPrivate;
+        this.revertibleAccumulatedDataFromPrivate = revertibleAccumulatedDataFromPrivate;
+        this.trace = trace;
+        /* Gas actually used during teardown (different from limit) */
+        this.teardownGasUsed = Gas.empty();
+        /* Entire transaction execution is done. */
+        this.halted = false;
+        /* Where did reverts happen (if at all)? */
+        this.revertCode = RevertCode.OK;
+        this.log = createDebugLogger(`aztec:public_tx_context`);
+        this.gasUsed = startGasUsed;
+    }
+    static async create(db, worldStateDB, tx, globalVariables) {
+        const nonRevertibleAccumulatedDataFromPrivate = tx.data.forPublic.nonRevertibleAccumulatedData;
+        const revertibleAccumulatedDataFromPrivate = tx.data.forPublic.revertibleAccumulatedData;
+        const nonRevertibleNullifiersFromPrivate = nonRevertibleAccumulatedDataFromPrivate.nullifiers.filter(n => !n.isEmpty());
+        const _revertibleNullifiersFromPrivate = revertibleAccumulatedDataFromPrivate.nullifiers.filter(n => !n.isEmpty());
+        const innerCallTrace = new PublicSideEffectTrace();
+        const previousAccumulatedDataArrayLengths = new SideEffectArrayLengths(
+        /*publicDataReads*/ 0, 
+        /*publicDataWrites*/ 0, 
+        /*noteHashReadRequests*/ 0, countAccumulatedItems(nonRevertibleAccumulatedDataFromPrivate.noteHashes), 
+        /*nullifierReadRequests*/ 0, 
+        /*nullifierNonExistentReadRequests*/ 0, countAccumulatedItems(nonRevertibleAccumulatedDataFromPrivate.nullifiers), 
+        /*l1ToL2MsgReadRequests*/ 0, countAccumulatedItems(nonRevertibleAccumulatedDataFromPrivate.l2ToL1Msgs), 
+        /*unencryptedLogsHashes*/ 0);
+        const enqueuedCallTrace = new PublicEnqueuedCallSideEffectTrace(
+        /*startSideEffectCounter=*/ 0, previousAccumulatedDataArrayLengths);
+        const trace = new DualSideEffectTrace(innerCallTrace, enqueuedCallTrace);
+        // Transaction level state manager that will be forked for revertible phases.
+        const txStateManager = AvmPersistableStateManager.newWithPendingSiloedNullifiers(worldStateDB, trace, nonRevertibleNullifiersFromPrivate);
+        return new PublicTxContext(new PhaseStateManager(txStateManager), globalVariables, tx.data.constants.historicalHeader, await db.getStateReference(), tx.data.gasUsed, tx.data.constants.txContext.gasSettings, getCallRequestsByPhase(tx, TxExecutionPhase.SETUP), getCallRequestsByPhase(tx, TxExecutionPhase.APP_LOGIC), getCallRequestsByPhase(tx, TxExecutionPhase.TEARDOWN), getExecutionRequestsByPhase(tx, TxExecutionPhase.SETUP), getExecutionRequestsByPhase(tx, TxExecutionPhase.APP_LOGIC), getExecutionRequestsByPhase(tx, TxExecutionPhase.TEARDOWN), tx.data.forPublic.nonRevertibleAccumulatedData, tx.data.forPublic.revertibleAccumulatedData, enqueuedCallTrace);
+    }
+    /**
+     * Signal that the entire transaction execution is done.
+     * All phases have been processed.
+     * Actual transaction fee and actual total consumed gas can now be queried.
+     */
+    halt() {
+        this.halted = true;
+    }
+    /**
+     * Revert execution a phase. Populate revertReason & revertCode.
+     * If in setup, throw an error (transaction will be thrown out).
+     * NOTE: this does not "halt" the entire transaction execution.
+     */
+    revert(phase, revertReason = undefined, culprit = '') {
+        this.log.debug(`${TxExecutionPhase[phase]} phase reverted! ${culprit} failed with reason: ${revertReason}`);
+        if (revertReason && !this.revertReason) {
+            // don't override revertReason
+            // (if app logic and teardown both revert, we want app logic's reason)
+            this.revertReason = revertReason;
+        }
+        if (phase === TxExecutionPhase.SETUP) {
+            this.log.debug(`Setup phase reverted! The transaction will be thrown out.`);
+            if (revertReason) {
+                throw revertReason;
+            }
+            else {
+                throw new Error(`Setup phase reverted! The transaction will be thrown out. ${culprit} failed`);
+            }
+        }
+        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;
+            }
+        }
+    }
+    /**
+     * Get the revert code.
+     * @returns The revert code.
+     */
+    getFinalRevertCode() {
+        assert(this.halted, 'Cannot know the final revert code until tx execution ends');
+        return this.revertCode;
+    }
+    /**
+     * Construct & return transaction hash.
+     * @returns The transaction's hash.
+     */
+    getTxHash() {
+        // Private kernel functions are executed client side and for this reason tx hash is already set as first nullifier
+        const firstNullifier = this.nonRevertibleAccumulatedDataFromPrivate.nullifiers[0];
+        if (!firstNullifier || firstNullifier.isZero()) {
+            throw new Error(`Cannot get tx hash since first nullifier is missing`);
+        }
+        return new TxHash(firstNullifier.toBuffer());
+    }
+    /**
+     * Are there any call requests for the speciiied phase?
+     */
+    hasPhase(phase) {
+        if (phase === TxExecutionPhase.SETUP) {
+            return this.setupCallRequests.length > 0;
+        }
+        else if (phase === TxExecutionPhase.APP_LOGIC) {
+            return this.appLogicCallRequests.length > 0;
+        }
+        else {
+            // phase === TxExecutionPhase.TEARDOWN
+            return this.teardownCallRequests.length > 0;
+        }
+    }
+    /**
+     * Get the call requests for the specified phase (including args hashes).
+     */
+    getCallRequestsForPhase(phase) {
+        switch (phase) {
+            case TxExecutionPhase.SETUP:
+                return this.setupCallRequests;
+            case TxExecutionPhase.APP_LOGIC:
+                return this.appLogicCallRequests;
+            case TxExecutionPhase.TEARDOWN:
+                return this.teardownCallRequests;
+        }
+    }
+    /**
+     * Get the call requests for the specified phase (including actual args).
+     */
+    getExecutionRequestsForPhase(phase) {
+        switch (phase) {
+            case TxExecutionPhase.SETUP:
+                return this.setupExecutionRequests;
+            case TxExecutionPhase.APP_LOGIC:
+                return this.appLogicExecutionRequests;
+            case TxExecutionPhase.TEARDOWN:
+                return this.teardownExecutionRequests;
+        }
+    }
+    /**
+     * How much gas is left for the specified phase?
+     */
+    getGasLeftForPhase(phase) {
+        if (phase === TxExecutionPhase.TEARDOWN) {
+            return this.gasSettings.teardownGasLimits;
+        }
+        else {
+            return this.gasSettings.gasLimits.sub(this.gasUsed);
+        }
+    }
+    /**
+     * Consume gas. Track gas for teardown phase separately.
+     */
+    consumeGas(phase, gas) {
+        if (phase === TxExecutionPhase.TEARDOWN) {
+            this.teardownGasUsed = this.teardownGasUsed.add(gas);
+        }
+        else {
+            this.gasUsed = this.gasUsed.add(gas);
+        }
+    }
+    /**
+     * Compute the gas used using the actual gas used during teardown instead
+     * of the teardown gas limit.
+     * Note that this.gasUsed is initialized from private's gasUsed which includes
+     * teardown gas limit.
+     */
+    getActualGasUsed() {
+        assert(this.halted, 'Can only compute actual gas used after tx execution ends');
+        const requireTeardown = this.teardownCallRequests.length > 0;
+        const teardownGasLimits = requireTeardown ? this.gasSettings.teardownGasLimits : Gas.empty();
+        return this.gasUsed.sub(teardownGasLimits).add(this.teardownGasUsed);
+    }
+    /**
+     * The gasUsed as if the entire teardown gas limit was consumed.
+     */
+    getGasUsedForFee() {
+        return this.gasUsed;
+    }
+    /**
+     * Get the transaction fee as is available to the specified phase.
+     * Only teardown should have access to the actual transaction fee.
+     */
+    getTransactionFee(phase) {
+        if (phase === TxExecutionPhase.TEARDOWN) {
+            return this.getTransactionFeeUnsafe();
+        }
+        else {
+            return Fr.zero();
+        }
+    }
+    /**
+     * Compute the transaction fee.
+     * Should only be called during or after teardown.
+     */
+    getTransactionFeeUnsafe() {
+        const txFee = this.gasUsed.computeFee(this.globalVariables.gasFees);
+        this.log.debug(`Computed tx fee`, {
+            txFee,
+            gasUsed: inspect(this.gasUsed),
+            gasFees: inspect(this.globalVariables.gasFees),
+        });
+        return txFee;
+    }
+    /**
+     * Generate the public inputs for the AVM circuit.
+     */
+    generateAvmCircuitPublicInputs(endStateReference) {
+        assert(this.halted, 'Can only get AvmCircuitPublicInputs after tx execution ends');
+        return generateAvmCircuitPublicInputs(this.trace, this.globalVariables, this.startStateReference, this.startGasUsed, this.gasSettings, this.setupCallRequests, this.appLogicCallRequests, this.teardownCallRequests, this.nonRevertibleAccumulatedDataFromPrivate, this.revertibleAccumulatedDataFromPrivate, endStateReference, 
+        /*endGasUsed=*/ this.gasUsed, this.getTransactionFeeUnsafe(), this.revertCode);
+    }
+    /**
+     * Generate the proving request for the AVM circuit.
+     */
+    generateProvingRequest(endStateReference) {
+        // TODO(dbanks12): Once we actually have tx-level proving, this will generate the entire
+        // proving request for the first time
+        this.avmProvingRequest.inputs.output = this.generateAvmCircuitPublicInputs(endStateReference);
+        return this.avmProvingRequest;
+    }
+    // TODO(dbanks12): remove once AVM proves entire public tx
+    async updateProvingRequest(real, phase, worldStateDB, stateManager, executionRequest, result, allocatedGas) {
+        if (this.avmProvingRequest === undefined) {
+            // Propagate the very first avmProvingRequest of the tx for now.
+            // Eventually this will be the proof for the entire public portion of the transaction.
+            this.avmProvingRequest = await generateAvmProvingRequest(real, worldStateDB, stateManager, this.historicalHeader, this.globalVariables, executionRequest, result, allocatedGas, this.getTransactionFee(phase));
+        }
+    }
+}
+/**
+ * Thin wrapper around the state manager to handle forking and merging for phases.
+ *
+ * This lets us keep track of whether the state has already been forked
+ * so that we can conditionally fork at the start of a phase.
+ *
+ * There is a state manager that lives at the level of the entire transaction,
+ * but for setup and teardown the active state manager will be a fork of the
+ * transaction level one.
+ */
+class PhaseStateManager {
+    constructor(txStateManager) {
+        this.txStateManager = txStateManager;
+    }
+    fork() {
+        assert(!this.currentlyActiveStateManager, 'Cannot fork when already forked');
+        this.currentlyActiveStateManager = this.txStateManager.fork();
+    }
+    getActiveStateManager() {
+        return this.currentlyActiveStateManager || this.txStateManager;
+    }
+    isForked() {
+        return !!this.currentlyActiveStateManager;
+    }
+    mergeForkedState() {
+        assert(this.currentlyActiveStateManager, 'No forked state to merge');
+        this.txStateManager.merge(this.currentlyActiveStateManager);
+        // Drop the forked state manager now that it is merged
+        this.currentlyActiveStateManager = undefined;
+    }
+    discardForkedState() {
+        assert(this.currentlyActiveStateManager, 'No forked state to discard');
+        this.txStateManager.reject(this.currentlyActiveStateManager);
+        // Drop the forked state manager. We don't want it!
+        this.currentlyActiveStateManager = undefined;
+    }
+}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"public_tx_context.js","sourceRoot":"","sources":["../../src/public/public_tx_context.ts"],"names":[],"mappings":"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"}

package/dest/public/public_tx_simulator.d.ts

@@ -0,0 +1,36 @@
+import { type AvmProvingRequest, type GasUsed, type MerkleTreeReadOperations, NestedProcessReturnValues, type SimulationError, type Tx, TxExecutionPhase } from '@aztec/circuit-types';
+import { type GlobalVariables, type RevertCode } from '@aztec/circuits.js';
+import { type PublicExecutor } from './executor.js';
+import { type WorldStateDB } from './public_db_sources.js';
+export 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[];
+};
+export declare class PublicTxSimulator {
+    private db;
+    private globalVariables;
+    private worldStateDB;
+    private publicExecutor;
+    private realAvmProvingRequests;
+    private log;
+    constructor(db: MerkleTreeReadOperations, globalVariables: GlobalVariables, worldStateDB: WorldStateDB, publicExecutor: PublicExecutor, realAvmProvingRequests?: boolean);
+    static create(db: MerkleTreeReadOperations, publicExecutor: PublicExecutor, globalVariables: GlobalVariables, worldStateDB: WorldStateDB, realAvmProvingRequests?: boolean): PublicTxSimulator;
+    simulate(tx: Tx): Promise<PublicTxResult>;
+    private simulateSetupPhase;
+    private simulateAppLogicPhase;
+    private simulateTeardownPhase;
+    private simulatePhase;
+}
+//# sourceMappingURL=public_tx_simulator.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"public_tx_simulator.d.ts","sourceRoot":"","sources":["../../src/public/public_tx_simulator.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,OAAO,EACZ,KAAK,wBAAwB,EAC7B,yBAAyB,EACzB,KAAK,eAAe,EACpB,KAAK,EAAE,EACP,gBAAgB,EAEjB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAO,KAAK,eAAe,EAAgC,KAAK,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAK9G,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAG3D,MAAM,MAAM,cAAc,GAAG;IAC3B,KAAK,EAAE,gBAAgB,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,yBAAyB,EAAE,CAAC;IAC1C,QAAQ,EAAE,OAAO,CAAC;IAClB,YAAY,CAAC,EAAE,eAAe,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,+CAA+C;IAC/C,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,UAAU,CAAC;IACvB,4BAA4B;IAC5B,YAAY,CAAC,EAAE,eAAe,CAAC;IAC/B,eAAe,EAAE,cAAc,EAAE,CAAC;CACnC,CAAC;AAEF,qBAAa,iBAAiB;IAI1B,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,sBAAsB;IAPhC,OAAO,CAAC,GAAG,CAAc;gBAGf,EAAE,EAAE,wBAAwB,EAC5B,eAAe,EAAE,eAAe,EAChC,YAAY,EAAE,YAAY,EAC1B,cAAc,EAAE,cAAc,EAC9B,sBAAsB,GAAE,OAAc;IAKhD,MAAM,CAAC,MAAM,CACX,EAAE,EAAE,wBAAwB,EAC5B,cAAc,EAAE,cAAc,EAC9B,eAAe,EAAE,eAAe,EAChC,YAAY,EAAE,YAAY,EAC1B,sBAAsB,GAAE,OAAc;IAKlC,QAAQ,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC;YA2DjC,kBAAkB;YAIlB,qBAAqB;YAoBrB,qBAAqB;YAoBrB,aAAa;CAoE5B"}

package/dest/public/public_tx_simulator.js

@@ -0,0 +1,148 @@
+import { NestedProcessReturnValues, TxExecutionPhase, UnencryptedFunctionL2Logs, } from '@aztec/circuit-types';
+import { Gas, MAX_L2_GAS_PER_ENQUEUED_CALL } from '@aztec/circuits.js';
+import { createDebugLogger } from '@aztec/foundation/log';
+import { Timer } from '@aztec/foundation/timer';
+import { PublicTxContext } from './public_tx_context.js';
+export class PublicTxSimulator {
+    constructor(db, globalVariables, worldStateDB, publicExecutor, realAvmProvingRequests = true) {
+        this.db = db;
+        this.globalVariables = globalVariables;
+        this.worldStateDB = worldStateDB;
+        this.publicExecutor = publicExecutor;
+        this.realAvmProvingRequests = realAvmProvingRequests;
+        this.log = createDebugLogger(`aztec:public_tx_simulator`);
+    }
+    static create(db, publicExecutor, globalVariables, worldStateDB, realAvmProvingRequests = true) {
+        return new PublicTxSimulator(db, globalVariables, worldStateDB, publicExecutor, realAvmProvingRequests);
+    }
+    async simulate(tx) {
+        this.log.verbose(`Processing tx ${tx.getTxHash()}`);
+        const context = await PublicTxContext.create(this.db, this.worldStateDB, tx, this.globalVariables);
+        // add new contracts to the contracts db so that their functions may be found and called
+        // TODO(#4073): This is catching only private deployments, when we add public ones, we'll
+        // have to capture contracts emitted in that phase as well.
+        // TODO(@spalladino): Should we allow emitting contracts in the fee preparation phase?
+        // TODO(#6464): Should we allow emitting contracts in the private setup phase?
+        // if so, this should only add contracts that were deployed during private app logic.
+        // FIXME: we shouldn't need to directly modify worldStateDb here!
+        await this.worldStateDB.addNewContracts(tx);
+        const processedPhases = [];
+        if (context.hasPhase(TxExecutionPhase.SETUP)) {
+            const setupResult = await this.simulateSetupPhase(context);
+            processedPhases.push(setupResult);
+        }
+        if (context.hasPhase(TxExecutionPhase.APP_LOGIC)) {
+            const appLogicResult = await this.simulateAppLogicPhase(context);
+            processedPhases.push(appLogicResult);
+        }
+        if (context.hasPhase(TxExecutionPhase.TEARDOWN)) {
+            const teardownResult = await this.simulateTeardownPhase(context);
+            processedPhases.push(teardownResult);
+        }
+        context.halt();
+        const endStateReference = await this.db.getStateReference();
+        const avmProvingRequest = context.generateProvingRequest(endStateReference);
+        const avmCircuitPublicInputs = avmProvingRequest.inputs.output;
+        const revertCode = context.getFinalRevertCode();
+        if (!revertCode.isOK()) {
+            // TODO(#6464): Should we allow emitting contracts in the private setup phase?
+            // if so, this is removing contracts deployed in private setup
+            // You can't submit contracts in public, so this is only relevant for private-created side effects
+            // FIXME: we shouldn't need to directly modify worldStateDb here!
+            await this.worldStateDB.removeNewContracts(tx);
+            // FIXME(dbanks12): should not be changing immutable tx
+            tx.filterRevertedLogs(tx.data.forPublic.nonRevertibleAccumulatedData, avmCircuitPublicInputs.accumulatedData.unencryptedLogsHashes);
+        }
+        // FIXME(dbanks12): should not be changing immutable tx
+        tx.unencryptedLogs.addFunctionLogs([new UnencryptedFunctionL2Logs(context.trace.getUnencryptedLogs())]);
+        return {
+            avmProvingRequest,
+            gasUsed: { totalGas: context.getActualGasUsed(), teardownGas: context.teardownGasUsed },
+            revertCode,
+            revertReason: context.revertReason,
+            processedPhases: processedPhases,
+        };
+    }
+    async simulateSetupPhase(context) {
+        return await this.simulatePhase(TxExecutionPhase.SETUP, context);
+    }
+    async simulateAppLogicPhase(context) {
+        // Fork the state manager so that we can rollback state if app logic or teardown reverts.
+        // Don't need to fork for setup since it's non-revertible (if setup fails, transaction is thrown out).
+        context.state.fork();
+        const result = await this.simulatePhase(TxExecutionPhase.APP_LOGIC, context);
+        if (result.reverted) {
+            // Drop the currently active forked state manager and rollback to end of setup.
+            context.state.discardForkedState();
+        }
+        else {
+            if (!context.hasPhase(TxExecutionPhase.TEARDOWN)) {
+                // Nothing to do after this (no teardown), so merge state updates now instead of letting teardown handle it.
+                context.state.mergeForkedState();
+            }
+        }
+        return result;
+    }
+    async simulateTeardownPhase(context) {
+        if (!context.state.isForked()) {
+            // If state isn't forked (app logic was empty or reverted), fork now
+            // so we can rollback to the end of setup if teardown reverts.
+            context.state.fork();
+        }
+        const result = await this.simulatePhase(TxExecutionPhase.TEARDOWN, context);
+        if (result.reverted) {
+            // Drop the currently active forked state manager and rollback to end of setup.
+            context.state.discardForkedState();
+        }
+        else {
+            // Merge state updates from teardown,
+            context.state.mergeForkedState();
+        }
+        return result;
+    }
+    async simulatePhase(phase, context) {
+        const callRequests = context.getCallRequestsForPhase(phase);
+        const executionRequests = context.getExecutionRequestsForPhase(phase);
+        const txStateManager = context.state.getActiveStateManager();
+        this.log.debug(`Beginning processing in phase ${TxExecutionPhase[phase]} for tx ${context.getTxHash()}`);
+        const returnValues = [];
+        let reverted = false;
+        let revertReason;
+        const phaseTimer = new Timer();
+        for (let i = callRequests.length - 1; i >= 0; i--) {
+            if (reverted) {
+                break;
+            }
+            const callRequest = callRequests[i];
+            const executionRequest = executionRequests[i];
+            const availableGas = context.getGasLeftForPhase(phase);
+            // Gas allocated to an enqueued call can be different from the available gas
+            // if there is more gas available than the max allocation per enqueued call.
+            const allocatedGas = new Gas(
+            /*daGas=*/ availableGas.daGas, 
+            /*l2Gas=*/ Math.min(availableGas.l2Gas, MAX_L2_GAS_PER_ENQUEUED_CALL));
+            const enqueuedCallResult = (await this.publicExecutor.simulate(txStateManager, executionRequest, this.globalVariables, // todo get from context
+            allocatedGas, context.getTransactionFee(phase)));
+            // TODO(dbanks12): remove once AVM proves entire public tx
+            await context.updateProvingRequest(this.realAvmProvingRequests, phase, this.worldStateDB, txStateManager, executionRequest, enqueuedCallResult, allocatedGas);
+            txStateManager.traceEnqueuedCall(callRequest, executionRequest.args, enqueuedCallResult.reverted);
+            const gasUsed = allocatedGas.sub(Gas.from(enqueuedCallResult.endGasLeft));
+            context.consumeGas(phase, gasUsed);
+            returnValues.push(new NestedProcessReturnValues(enqueuedCallResult.returnValues));
+            if (enqueuedCallResult.reverted) {
+                reverted = true;
+                const culprit = `${executionRequest.callContext.contractAddress}:${executionRequest.callContext.functionSelector}`;
+                revertReason = enqueuedCallResult.revertReason;
+                context.revert(phase, enqueuedCallResult.revertReason, culprit); // throws if in setup (non-revertible) phase
+            }
+        }
+        return {
+            phase,
+            durationMs: phaseTimer.ms(),
+            returnValues,
+            reverted,
+            revertReason,
+        };
+    }
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHVibGljX3R4X3NpbXVsYXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wdWJsaWMvcHVibGljX3R4X3NpbXVsYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBSUwseUJBQXlCLEVBR3pCLGdCQUFnQixFQUNoQix5QkFBeUIsR0FDMUIsTUFBTSxzQkFBc0IsQ0FBQztBQUM5QixPQUFPLEVBQUUsR0FBRyxFQUF3Qiw0QkFBNEIsRUFBbUIsTUFBTSxvQkFBb0IsQ0FBQztBQUM5RyxPQUFPLEVBQW9CLGlCQUFpQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDNUUsT0FBTyxFQUFFLEtBQUssRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBS2hELE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQW9CekQsTUFBTSxPQUFPLGlCQUFpQjtJQUc1QixZQUNVLEVBQTRCLEVBQzVCLGVBQWdDLEVBQ2hDLFlBQTBCLEVBQzFCLGNBQThCLEVBQzlCLHlCQUFrQyxJQUFJO1FBSnRDLE9BQUUsR0FBRixFQUFFLENBQTBCO1FBQzVCLG9CQUFlLEdBQWYsZUFBZSxDQUFpQjtRQUNoQyxpQkFBWSxHQUFaLFlBQVksQ0FBYztRQUMxQixtQkFBYyxHQUFkLGNBQWMsQ0FBZ0I7UUFDOUIsMkJBQXNCLEdBQXRCLHNCQUFzQixDQUFnQjtRQUU5QyxJQUFJLENBQUMsR0FBRyxHQUFHLGlCQUFpQixDQUFDLDJCQUEyQixDQUFDLENBQUM7SUFDNUQsQ0FBQztJQUVELE1BQU0sQ0FBQyxNQUFNLENBQ1gsRUFBNEIsRUFDNUIsY0FBOEIsRUFDOUIsZUFBZ0MsRUFDaEMsWUFBMEIsRUFDMUIseUJBQWtDLElBQUk7UUFFdEMsT0FBTyxJQUFJLGlCQUFpQixDQUFDLEVBQUUsRUFBRSxlQUFlLEVBQUUsWUFBWSxFQUFFLGNBQWMsRUFBRSxzQkFBc0IsQ0FBQyxDQUFDO0lBQzFHLENBQUM7SUFFRCxLQUFLLENBQUMsUUFB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

package/dest/public/side_effect_trace.d.ts

@@ -1,10 +1,11 @@
 /// <reference types="node" resolution-mode="require"/>
 /// <reference types="node" resolution-mode="require"/>
-import { type ContractClassIdPreimage, type ContractInstanceWithAddress, Gas, SerializableContractInstance } from '@aztec/circuits.js';
+import { UnencryptedL2Log } from '@aztec/circuit-types';
+import { type AztecAddress, type ContractClassIdPreimage, type ContractInstanceWithAddress, Gas, NullifierLeafPreimage, type PublicCallRequest, PublicDataTreeLeafPreimage, SerializableContractInstance } from '@aztec/circuits.js';
 import { Fr } from '@aztec/foundation/fields';
 import { type AvmContractCallResult } from '../avm/avm_contract_call_result.js';
 import { type AvmExecutionEnvironment } from '../avm/avm_execution_environment.js';
-import { type PublicExecutionResult } from './execution.js';
+import { type EnqueuedPublicCallExecutionResultWithSideEffects, type PublicFunctionCallResult } from './execution.js';
 import { type PublicSideEffectTraceInterface } from './side_effect_trace_interface.js';
 export type TracedContractInstance = {
     exists: boolean;
@@ -36,17 +37,17 @@ export declare class PublicSideEffectTrace implements PublicSideEffectTraceInter
     fork(): PublicSideEffectTrace;
     getCounter(): number;
     private incrementSideEffectCounter;
-    tracePublicStorageRead(contractAddress: Fr, slot: Fr, value: Fr, _exists: boolean, _cached: boolean): void;
-    tracePublicStorageWrite(contractAddress: Fr, slot: Fr, value: Fr): void;
-    traceNoteHashCheck(_contractAddress: Fr, noteHash: Fr, leafIndex: Fr, exists: boolean): void;
-    traceNewNoteHash(_contractAddress: Fr, noteHash: Fr): void;
-    traceNullifierCheck(_contractAddress: Fr, nullifier: Fr, _leafIndex: Fr, exists: boolean, _isPending: boolean): void;
-    traceNewNullifier(_contractAddress: Fr, nullifier: Fr): void;
-    traceL1ToL2MessageCheck(_contractAddress: Fr, msgHash: Fr, msgLeafIndex: Fr, exists: boolean): void;
-    traceNewL2ToL1Message(_contractAddress: Fr, recipient: Fr, content: Fr): void;
-    traceUnencryptedLog(contractAddress: Fr, log: Fr[]): void;
-    traceGetContractInstance(contractAddress: Fr, exists: boolean, instance?: SerializableContractInstance): void;
-    traceGetBytecode(contractAddress: Fr, exists: boolean, bytecode?: Buffer, contractInstance?: SerializableContractInstance, contractClass?: ContractClassIdPreimage): void;
+    tracePublicStorageRead(contractAddress: AztecAddress, slot: Fr, value: Fr, leafPreimage?: PublicDataTreeLeafPreimage, leafIndex?: Fr, path?: Fr[]): void;
+    tracePublicStorageWrite(contractAddress: AztecAddress, slot: Fr, value: Fr, lowLeafPreimage?: PublicDataTreeLeafPreimage, lowLeafIndex?: Fr, lowLeafPath?: Fr[], newLeafPreimage?: PublicDataTreeLeafPreimage, insertionPath?: Fr[]): void;
+    traceNoteHashCheck(_contractAddress: AztecAddress, noteHash: Fr, leafIndex: Fr, exists: boolean, path?: Fr[]): void;
+    traceNewNoteHash(_contractAddress: AztecAddress, noteHash: Fr, leafIndex: Fr, path?: Fr[]): void;
+    traceNullifierCheck(_contractAddress: AztecAddress, nullifier: Fr, exists: boolean, lowLeafPreimage?: NullifierLeafPreimage, lowLeafIndex?: Fr, lowLeafPath?: Fr[]): void;
+    traceNewNullifier(_contractAddress: AztecAddress, nullifier: Fr, lowLeafPreimage?: NullifierLeafPreimage, lowLeafIndex?: Fr, lowLeafPath?: Fr[], insertionPath?: Fr[]): void;
+    traceL1ToL2MessageCheck(_contractAddress: AztecAddress, msgHash: Fr, msgLeafIndex: Fr, exists: boolean, path?: Fr[]): void;
+    traceNewL2ToL1Message(_contractAddress: AztecAddress, recipient: Fr, content: Fr): void;
+    traceUnencryptedLog(contractAddress: AztecAddress, log: Fr[]): void;
+    traceGetContractInstance(contractAddress: AztecAddress, exists: boolean, instance?: SerializableContractInstance): void;
+    traceGetBytecode(contractAddress: AztecAddress, exists: boolean, bytecode?: Buffer, contractInstance?: SerializableContractInstance, contractClass?: ContractClassIdPreimage): void;
     /**
      * Trace a nested call.
      * Accept some results from a finished nested call's trace into this one.
@@ -66,10 +67,18 @@ export declare class PublicSideEffectTrace implements PublicSideEffectTraceInter
     avmCallResults: AvmContractCallResult, 
     /** Function name for logging */
     functionName?: string): void;
+    traceEnqueuedCall(
+    /** The call request from private that enqueued this call. */
+    _publicCallRequest: PublicCallRequest, 
+    /** The call's calldata */
+    _calldata: Fr[], 
+    /** Did the call revert? */
+    _reverted: boolean): void;
+    merge(_nestedTrace: this, _reverted?: boolean): void;
     /**
      * Convert this trace to a PublicExecutionResult for use externally to the simulator.
      */
-    toPublicExecutionResult(
+    toPublicFunctionCallResult(
     /** The execution environment of the nested call. */
     avmEnvironment: AvmExecutionEnvironment, 
     /** How much gas was available for this public execution. */
@@ -81,7 +90,13 @@ export declare class PublicSideEffectTrace implements PublicSideEffectTraceInter
     /** The call's results */
     avmCallResults: AvmContractCallResult, 
     /** Function name for logging */
-    functionName?: string): PublicExecutionResult;
+    functionName?: string): PublicFunctionCallResult;
+    toPublicEnqueuedCallExecutionResult(
+    /** How much gas was left after this public execution. */
+    _endGasLeft: Gas, 
+    /** The call's results */
+    _avmCallResults: AvmContractCallResult): EnqueuedPublicCallExecutionResultWithSideEffects;
     private enforceLimitOnNullifierChecks;
+    getUnencryptedLogs(): UnencryptedL2Log[];
 }
 //# sourceMappingURL=side_effect_trace.d.ts.map

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

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