@aztec/simulator 0.76.4 → 0.77.0-testnet-ignition.17

package/dest/public/public_tx_context.js

@@ -1,18 +1,48 @@
-import { MerkleTreeId, ProvingRequestType, TxExecutionPhase, } from '@aztec/circuit-types';
-import { AvmCircuitInputs, Fr, Gas, MAX_L2_GAS_PER_TX_PUBLIC_PORTION, MAX_L2_TO_L1_MSGS_PER_TX, MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, PrivateToAvmAccumulatedData, PrivateToAvmAccumulatedDataArrayLengths, PublicCallRequest, PublicDataWrite, RevertCode, TreeSnapshots, computeTransactionFee, countAccumulatedItems, mergeAccumulatedData, } from '@aztec/circuits.js';
+import { MAX_L2_GAS_PER_TX_PUBLIC_PORTION, MAX_L2_TO_L1_MSGS_PER_TX, MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, NULLIFIER_SUBTREE_HEIGHT } from '@aztec/constants';
 import { padArrayEnd } from '@aztec/foundation/collection';
+import { Fr } from '@aztec/foundation/fields';
 import { createLogger } from '@aztec/foundation/log';
 import { assertLength } from '@aztec/foundation/serialize';
+import { AvmCircuitInputs, PublicDataWrite, RevertCode } from '@aztec/stdlib/avm';
+import { computeTransactionFee } from '@aztec/stdlib/fees';
+import { Gas } from '@aztec/stdlib/gas';
+import { PrivateToAvmAccumulatedData, PrivateToAvmAccumulatedDataArrayLengths, PublicCallRequest, countAccumulatedItems, mergeAccumulatedData } from '@aztec/stdlib/kernel';
+import { ProvingRequestType } from '@aztec/stdlib/proofs';
+import { MerkleTreeId } from '@aztec/stdlib/trees';
+import { TreeSnapshots, TxExecutionPhase } from '@aztec/stdlib/tx';
 import { strict as assert } from 'assert';
 import { inspect } from 'util';
-import { AvmPersistableStateManager } from '../avm/index.js';
+import { AvmPersistableStateManager } from './avm/index.js';
 import { SideEffectArrayLengths, SideEffectTrace } from './side_effect_trace.js';
 import { getCallRequestsByPhase, getExecutionRequestsByPhase } from './utils.js';
 /**
  * The transaction-level context for public execution.
- */
-export class PublicTxContext {
-    constructor(txHash, state, globalVariables, startStateReference, gasSettings, gasUsedByPrivate, gasAllocatedToPublic, setupCallRequests, appLogicCallRequests, teardownCallRequests, setupExecutionRequests, appLogicExecutionRequests, teardownExecutionRequests, nonRevertibleAccumulatedDataFromPrivate, revertibleAccumulatedDataFromPrivate, feePayer, trace) {
+ */ export class PublicTxContext {
+    txHash;
+    state;
+    globalVariables;
+    startStateReference;
+    gasSettings;
+    gasUsedByPrivate;
+    gasAllocatedToPublic;
+    setupCallRequests;
+    appLogicCallRequests;
+    teardownCallRequests;
+    setupExecutionRequests;
+    appLogicExecutionRequests;
+    teardownExecutionRequests;
+    nonRevertibleAccumulatedDataFromPrivate;
+    revertibleAccumulatedDataFromPrivate;
+    feePayer;
+    trace;
+    log;
+    /* Gas used including private, teardown gas _limit_, setup and app logic */ gasUsedByPublic;
+    /* Gas actually used during teardown (different from limit) */ teardownGasUsed;
+    /* Entire transaction execution is done. */ halted;
+    /* Where did reverts happen (if at all)? */ revertCode;
+    /* What caused a revert (if one occurred)? */ revertReason;
+    avmProvingRequest;
+    constructor(txHash, state, globalVariables, startStateReference, gasSettings, gasUsedByPrivate, gasAllocatedToPublic, setupCallRequests, appLogicCallRequests, teardownCallRequests, setupExecutionRequests, appLogicExecutionRequests, teardownExecutionRequests, nonRevertibleAccumulatedDataFromPrivate, revertibleAccumulatedDataFromPrivate, feePayer, trace){
         this.txHash = txHash;
         this.state = state;
         this.globalVariables = globalVariables;
@@ -30,28 +60,19 @@ export class PublicTxContext {
         this.revertibleAccumulatedDataFromPrivate = revertibleAccumulatedDataFromPrivate;
         this.feePayer = feePayer;
         this.trace = trace;
-        /* Gas used including private, teardown gas _limit_, setup and app logic */
         this.gasUsedByPublic = Gas.empty();
-        /* 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 = createLogger(`simulator:public_tx_context`);
     }
     static async create(db, worldStateDB, tx, globalVariables, doMerkleOperations) {
         const nonRevertibleAccumulatedDataFromPrivate = tx.data.forPublic.nonRevertibleAccumulatedData;
-        const previousAccumulatedDataArrayLengths = new SideEffectArrayLengths(
-        /*publicDataWrites*/ 0, 
-        /*protocolPublicDataWrites*/ 0, 
-        /*noteHashes*/ 0, 
-        /*nullifiers=*/ 0, countAccumulatedItems(nonRevertibleAccumulatedDataFromPrivate.l2ToL1Msgs), 
-        /*publicLogs*/ 0);
+        const previousAccumulatedDataArrayLengths = new SideEffectArrayLengths(/*publicDataWrites*/ 0, /*protocolPublicDataWrites*/ 0, /*noteHashes*/ 0, /*nullifiers=*/ 0, countAccumulatedItems(nonRevertibleAccumulatedDataFromPrivate.l2ToL1Msgs), /*publicLogs*/ 0);
         const trace = new SideEffectTrace(/*startSideEffectCounter=*/ 0, previousAccumulatedDataArrayLengths);
         const firstNullifier = nonRevertibleAccumulatedDataFromPrivate.nullifiers[0];
         // Transaction level state manager that will be forked for revertible phases.
-        const txStateManager = await AvmPersistableStateManager.create(worldStateDB, trace, doMerkleOperations, firstNullifier);
+        const txStateManager = AvmPersistableStateManager.create(worldStateDB, trace, doMerkleOperations, firstNullifier);
         const gasSettings = tx.data.constants.txContext.gasSettings;
         const gasUsedByPrivate = tx.data.gasUsed;
         // Gas allocated to public is "whatever's left" after private, but with some max applied.
@@ -59,22 +80,20 @@ export class PublicTxContext {
         return new PublicTxContext(await tx.getTxHash(), new PhaseStateManager(txStateManager), globalVariables, await db.getStateReference(), gasSettings, gasUsedByPrivate, gasAllocatedToPublic, 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, tx.data.feePayer, trace);
     }
     /**
-     * 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() {
+   * 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.
+   */ async halt() {
         if (this.state.isForked()) {
-            this.state.mergeForkedState();
+            await this.state.mergeForkedState();
         }
         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 = '') {
+   * 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.warn(`${TxExecutionPhase[phase]} phase reverted! ${culprit} failed with reason: ${revertReason}`);
         if (revertReason && !this.revertReason) {
             // don't override revertReason
@@ -85,51 +104,42 @@ export class PublicTxContext {
             this.log.warn(`Setup phase reverted! The transaction will be thrown out.`);
             if (revertReason) {
                 throw revertReason;
-            }
-            else {
+            } else {
                 throw new Error(`Setup phase reverted! The transaction will be thrown out. ${culprit} failed`);
             }
-        }
-        else if (phase === TxExecutionPhase.APP_LOGIC) {
+        } else if (phase === TxExecutionPhase.APP_LOGIC) {
             this.revertCode = RevertCode.APP_LOGIC_REVERTED;
-        }
-        else if (phase === TxExecutionPhase.TEARDOWN) {
+        } else if (phase === TxExecutionPhase.TEARDOWN) {
             if (this.revertCode.equals(RevertCode.APP_LOGIC_REVERTED)) {
                 this.revertCode = RevertCode.BOTH_REVERTED;
-            }
-            else {
+            } else {
                 this.revertCode = RevertCode.TEARDOWN_REVERTED;
             }
         }
     }
     /**
-     * Get the revert code.
-     * @returns The revert code.
-     */
-    getFinalRevertCode() {
+   * 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;
     }
     /**
-     * Are there any call requests for the speciiied phase?
-     */
-    hasPhase(phase) {
+   * 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) {
+        } else if (phase === TxExecutionPhase.APP_LOGIC) {
             return this.appLogicCallRequests.length > 0;
-        }
-        else {
+        } else {
             // phase === TxExecutionPhase.TEARDOWN
             return this.teardownCallRequests.length > 0;
         }
     }
     /**
-     * Get the call requests for the specified phase (including args hashes).
-     */
-    getCallRequestsForPhase(phase) {
-        switch (phase) {
+   * 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:
@@ -139,10 +149,9 @@ export class PublicTxContext {
         }
     }
     /**
-     * Get the call requests for the specified phase (including actual args).
-     */
-    getExecutionRequestsForPhase(phase) {
-        switch (phase) {
+   * 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:
@@ -152,140 +161,112 @@ export class PublicTxContext {
         }
     }
     /**
-     * How much gas is left as of the specified phase?
-     */
-    getGasLeftAtPhase(phase) {
+   * How much gas is left as of the specified phase?
+   */ getGasLeftAtPhase(phase) {
         if (phase === TxExecutionPhase.TEARDOWN) {
             return applyMaxToAvailableGas(this.gasSettings.teardownGasLimits);
-        }
-        else {
+        } else {
             const gasLeftForPublic = this.gasAllocatedToPublic.sub(this.gasUsedByPublic);
             return gasLeftForPublic;
         }
     }
     /**
-     * Consume gas. Track gas for teardown phase separately.
-     */
-    consumeGas(phase, gas) {
+   * Consume gas. Track gas for teardown phase separately.
+   */ consumeGas(phase, gas) {
         if (phase === TxExecutionPhase.TEARDOWN) {
             this.teardownGasUsed = this.teardownGasUsed.add(gas);
-        }
-        else {
+        } else {
             this.gasUsedByPublic = this.gasUsedByPublic.add(gas);
         }
     }
     /**
-     * The gasUsed by public and private,
-     * as if the entire teardown gas limit was consumed.
-     */
-    getTotalGasUsed() {
+   * The gasUsed by public and private,
+   * as if the entire teardown gas limit was consumed.
+   */ getTotalGasUsed() {
         return this.gasUsedByPrivate.add(this.gasUsedByPublic);
     }
     /**
-     * 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() {
+   * 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.getTotalGasUsed().sub(teardownGasLimits).add(this.teardownGasUsed);
     }
     /**
-     * Compute the public gas used using the actual gas used during teardown instead
-     * of the teardown gas limit.
-     */
-    getActualPublicGasUsed() {
+   * Compute the public gas used using the actual gas used during teardown instead
+   * of the teardown gas limit.
+   */ getActualPublicGasUsed() {
         assert(this.halted, 'Can only compute actual gas used after tx execution ends');
         return this.gasUsedByPublic.add(this.teardownGasUsed);
     }
     /**
-     * Get the transaction fee as is available to the specified phase.
-     * Only teardown should have access to the actual transaction fee.
-     */
-    getTransactionFee(phase) {
+   * 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 {
+        } else {
             return Fr.zero();
         }
     }
     /**
-     * Compute the transaction fee.
-     * Should only be called during or after teardown.
-     */
-    getTransactionFeeUnsafe() {
+   * Compute the transaction fee.
+   * Should only be called during or after teardown.
+   */ getTransactionFeeUnsafe() {
         const gasUsed = this.getTotalGasUsed();
         const txFee = computeTransactionFee(this.globalVariables.gasFees, this.gasSettings, gasUsed);
         this.log.debug(`Computed tx fee`, {
             txFee,
             gasUsed: inspect(gasUsed),
-            gasFees: inspect(this.globalVariables.gasFees),
+            gasFees: inspect(this.globalVariables.gasFees)
         });
         return txFee;
     }
     /**
-     * Generate the public inputs for the AVM circuit.
-     */
-    async generateAvmCircuitPublicInputs(endStateReference) {
+   * Generate the public inputs for the AVM circuit.
+   */ async generateAvmCircuitPublicInputs(endStateReference) {
         assert(this.halted, 'Can only get AvmCircuitPublicInputs after tx execution ends');
-        const ephemeralTrees = this.state.getActiveStateManager().merkleTrees;
-        const noteHashTree = await ephemeralTrees.getTreeSnapshot(MerkleTreeId.NOTE_HASH_TREE);
-        const nullifierTree = await ephemeralTrees.getTreeSnapshot(MerkleTreeId.NULLIFIER_TREE);
-        const publicDataTree = await ephemeralTrees.getTreeSnapshot(MerkleTreeId.PUBLIC_DATA_TREE);
-        // Pad the note hash and nullifier trees
-        const paddedNoteHashTreeSize = this.startStateReference.partial.noteHashTree.nextAvailableLeafIndex + MAX_NOTE_HASHES_PER_TX;
-        if (noteHashTree.nextAvailableLeafIndex > paddedNoteHashTreeSize) {
-            throw new Error(`Inserted too many leaves in note hash tree: ${noteHashTree.nextAvailableLeafIndex} > ${paddedNoteHashTreeSize}`);
-        }
-        noteHashTree.nextAvailableLeafIndex = paddedNoteHashTreeSize;
-        const paddedNullifierTreeSize = this.startStateReference.partial.nullifierTree.nextAvailableLeafIndex + MAX_NULLIFIERS_PER_TX;
-        if (nullifierTree.nextAvailableLeafIndex > paddedNullifierTreeSize) {
-            throw new Error(`Inserted too many leaves in nullifier tree: ${nullifierTree.nextAvailableLeafIndex} > ${paddedNullifierTreeSize}`);
-        }
-        nullifierTree.nextAvailableLeafIndex = paddedNullifierTreeSize;
-        const endTreeSnapshots = new TreeSnapshots(endStateReference.l1ToL2MessageTree, noteHashTree, nullifierTree, publicDataTree);
+        const stateManager = this.state.getActiveStateManager();
         const startTreeSnapshots = new TreeSnapshots(this.startStateReference.l1ToL2MessageTree, this.startStateReference.partial.noteHashTree, this.startStateReference.partial.nullifierTree, this.startStateReference.partial.publicDataTree);
-        const avmCircuitPublicInputs = this.trace.toAvmCircuitPublicInputs(this.globalVariables, startTreeSnapshots, 
-        /*startGasUsed=*/ this.gasUsedByPrivate, this.gasSettings, this.feePayer, this.setupCallRequests, this.appLogicCallRequests, 
-        /*teardownCallRequest=*/ this.teardownCallRequests.length
-            ? this.teardownCallRequests[0]
-            : PublicCallRequest.empty(), endTreeSnapshots, 
-        /*endGasUsed=*/ this.getTotalGasUsed(), 
-        /*transactionFee=*/ this.getTransactionFeeUnsafe(), 
-        /*reverted=*/ !this.revertCode.isOK());
-        const getArrayLengths = (from) => new PrivateToAvmAccumulatedDataArrayLengths(countAccumulatedItems(from.noteHashes), countAccumulatedItems(from.nullifiers), countAccumulatedItems(from.l2ToL1Msgs));
-        const convertAccumulatedData = (from) => new PrivateToAvmAccumulatedData(from.noteHashes, from.nullifiers, from.l2ToL1Msgs);
+        // Will be patched/padded at the end of this fn
+        const endTreeSnapshots = new TreeSnapshots(endStateReference.l1ToL2MessageTree, endStateReference.partial.noteHashTree, endStateReference.partial.nullifierTree, endStateReference.partial.publicDataTree);
+        const avmCircuitPublicInputs = this.trace.toAvmCircuitPublicInputs(this.globalVariables, startTreeSnapshots, /*startGasUsed=*/ this.gasUsedByPrivate, this.gasSettings, this.feePayer, this.setupCallRequests, this.appLogicCallRequests, /*teardownCallRequest=*/ this.teardownCallRequests.length ? this.teardownCallRequests[0] : PublicCallRequest.empty(), endTreeSnapshots, /*endGasUsed=*/ this.getTotalGasUsed(), /*transactionFee=*/ this.getTransactionFeeUnsafe(), /*reverted=*/ !this.revertCode.isOK());
+        const getArrayLengths = (from)=>new PrivateToAvmAccumulatedDataArrayLengths(countAccumulatedItems(from.noteHashes), countAccumulatedItems(from.nullifiers), countAccumulatedItems(from.l2ToL1Msgs));
+        const convertAccumulatedData = (from)=>new PrivateToAvmAccumulatedData(from.noteHashes, from.nullifiers, from.l2ToL1Msgs);
         // Temporary overrides as these entries aren't yet populated in trace
         avmCircuitPublicInputs.previousNonRevertibleAccumulatedDataArrayLengths = getArrayLengths(this.nonRevertibleAccumulatedDataFromPrivate);
         avmCircuitPublicInputs.previousRevertibleAccumulatedDataArrayLengths = getArrayLengths(this.revertibleAccumulatedDataFromPrivate);
         avmCircuitPublicInputs.previousNonRevertibleAccumulatedData = convertAccumulatedData(this.nonRevertibleAccumulatedDataFromPrivate);
         avmCircuitPublicInputs.previousRevertibleAccumulatedData = convertAccumulatedData(this.revertibleAccumulatedDataFromPrivate);
-        const msgsFromPrivate = this.revertCode.isOK()
-            ? mergeAccumulatedData(avmCircuitPublicInputs.previousNonRevertibleAccumulatedData.l2ToL1Msgs, avmCircuitPublicInputs.previousRevertibleAccumulatedData.l2ToL1Msgs)
-            : avmCircuitPublicInputs.previousNonRevertibleAccumulatedData.l2ToL1Msgs;
+        const msgsFromPrivate = this.revertCode.isOK() ? mergeAccumulatedData(avmCircuitPublicInputs.previousNonRevertibleAccumulatedData.l2ToL1Msgs, avmCircuitPublicInputs.previousRevertibleAccumulatedData.l2ToL1Msgs) : avmCircuitPublicInputs.previousNonRevertibleAccumulatedData.l2ToL1Msgs;
         avmCircuitPublicInputs.accumulatedData.l2ToL1Msgs = assertLength(mergeAccumulatedData(msgsFromPrivate, avmCircuitPublicInputs.accumulatedData.l2ToL1Msgs), MAX_L2_TO_L1_MSGS_PER_TX);
         // Maps slot to value. Maps in TS are iterable in insertion order, which is exactly what we want for
         // squashing "to the left", where the first occurrence of a slot uses the value of the last write to it,
         // and the rest occurrences are omitted
         const squashedPublicDataWrites = new Map();
-        for (const publicDataWrite of avmCircuitPublicInputs.accumulatedData.publicDataWrites) {
+        for (const publicDataWrite of avmCircuitPublicInputs.accumulatedData.publicDataWrites){
             squashedPublicDataWrites.set(publicDataWrite.leafSlot.toBigInt(), publicDataWrite.value);
         }
-        avmCircuitPublicInputs.accumulatedData.publicDataWrites = padArrayEnd(Array.from(squashedPublicDataWrites.entries()).map(([slot, value]) => new PublicDataWrite(new Fr(slot), value)), PublicDataWrite.empty(), MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX);
+        avmCircuitPublicInputs.accumulatedData.publicDataWrites = padArrayEnd(Array.from(squashedPublicDataWrites.entries()).map(([slot, value])=>new PublicDataWrite(new Fr(slot), value)), PublicDataWrite.empty(), MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX);
+        const numNoteHashesToPad = MAX_NOTE_HASHES_PER_TX - countAccumulatedItems(avmCircuitPublicInputs.accumulatedData.noteHashes);
+        await stateManager.db.appendLeaves(MerkleTreeId.NOTE_HASH_TREE, padArrayEnd([], Fr.ZERO, numNoteHashesToPad));
+        const numNullifiersToPad = MAX_NULLIFIERS_PER_TX - countAccumulatedItems(avmCircuitPublicInputs.accumulatedData.nullifiers);
+        await stateManager.db.batchInsert(MerkleTreeId.NULLIFIER_TREE, padArrayEnd([], Fr.ZERO, numNullifiersToPad).map((nullifier)=>nullifier.toBuffer()), NULLIFIER_SUBTREE_HEIGHT);
+        const paddedState = await stateManager.db.getStateReference();
+        avmCircuitPublicInputs.endTreeSnapshots = new TreeSnapshots(paddedState.l1ToL2MessageTree, paddedState.partial.noteHashTree, paddedState.partial.nullifierTree, paddedState.partial.publicDataTree);
         return avmCircuitPublicInputs;
     }
     /**
-     * Generate the proving request for the AVM circuit.
-     */
-    async generateProvingRequest(endStateReference) {
+   * Generate the proving request for the AVM circuit.
+   */ async generateProvingRequest(endStateReference) {
         const hints = this.trace.getAvmCircuitHints();
         return {
             type: ProvingRequestType.PUBLIC_VM,
-            inputs: new AvmCircuitInputs('public_dispatch', [], hints, await this.generateAvmCircuitPublicInputs(endStateReference)),
+            inputs: new AvmCircuitInputs('public_dispatch', [], hints, await this.generateAvmCircuitPublicInputs(endStateReference))
         };
     }
 }
@@ -298,16 +279,18 @@ export class PublicTxContext {
  * There is a state manager that lives at the level of the entire transaction,
  * but for app logic and teardown the active state manager will be a fork of the
  * transaction level one.
- */
-class PhaseStateManager {
-    constructor(txStateManager) {
+ */ class PhaseStateManager {
+    txStateManager;
+    log;
+    currentlyActiveStateManager;
+    constructor(txStateManager){
         this.txStateManager = txStateManager;
         this.log = createLogger(`simulator:public_phase_state_manager`);
     }
-    fork() {
+    async fork() {
         assert(!this.currentlyActiveStateManager, 'Cannot fork when already forked');
         this.log.debug(`Forking phase state manager`);
-        this.currentlyActiveStateManager = this.txStateManager.fork();
+        this.currentlyActiveStateManager = await this.txStateManager.fork();
     }
     getActiveStateManager() {
         return this.currentlyActiveStateManager || this.txStateManager;
@@ -315,27 +298,23 @@ class PhaseStateManager {
     isForked() {
         return !!this.currentlyActiveStateManager;
     }
-    mergeForkedState() {
+    async mergeForkedState() {
         assert(this.currentlyActiveStateManager, 'No forked state to merge');
         this.log.debug(`Merging in forked state`);
-        this.txStateManager.merge(this.currentlyActiveStateManager);
+        await this.txStateManager.merge(this.currentlyActiveStateManager);
         // Drop the forked state manager now that it is merged
         this.currentlyActiveStateManager = undefined;
     }
-    discardForkedState() {
+    async discardForkedState() {
         this.log.debug(`Discarding forked state`);
         assert(this.currentlyActiveStateManager, 'No forked state to discard');
-        this.txStateManager.reject(this.currentlyActiveStateManager);
+        await this.txStateManager.reject(this.currentlyActiveStateManager);
         // Drop the forked state manager. We don't want it!
         this.currentlyActiveStateManager = undefined;
     }
 }
 /**
  * Apply L2 gas maximum.
- */
-function applyMaxToAvailableGas(availableGas) {
-    return new Gas(
-    /*daGas=*/ availableGas.daGas, 
-    /*l2Gas=*/ Math.min(availableGas.l2Gas, MAX_L2_GAS_PER_TX_PUBLIC_PORTION));
+ */ function applyMaxToAvailableGas(availableGas) {
+    return new Gas(/*daGas=*/ availableGas.daGas, /*l2Gas=*/ Math.min(availableGas.l2Gas, MAX_L2_GAS_PER_TX_PUBLIC_PORTION));
 }
-//# 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

@@ -1,8 +1,11 @@
-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 { AvmProvingRequest, RevertCode } from '@aztec/stdlib/avm';
+import type { SimulationError } from '@aztec/stdlib/errors';
+import type { GasUsed } from '@aztec/stdlib/gas';
+import type { MerkleTreeReadOperations } from '@aztec/stdlib/interfaces/server';
+import { type GlobalVariables, NestedProcessReturnValues, Tx, TxExecutionPhase } from '@aztec/stdlib/tx';
 import { type TelemetryClient, type Tracer } from '@aztec/telemetry-client';
 import { ExecutorMetrics } from './executor_metrics.js';
-import { type WorldStateDB } from './public_db_sources.js';
+import type { WorldStateDB } from './public_db_sources.js';
 import { PublicTxContext } from './public_tx_context.js';
 export type ProcessedPhase = {
     phase: TxExecutionPhase;
@@ -25,10 +28,10 @@ export declare class PublicTxSimulator {
     private worldStateDB;
     private globalVariables;
     private doMerkleOperations;
-    private enforceFeePayment;
+    private skipFeeEnforcement;
     metrics: ExecutorMetrics;
     private log;
-    constructor(db: MerkleTreeReadOperations, worldStateDB: WorldStateDB, globalVariables: GlobalVariables, doMerkleOperations?: boolean, enforceFeePayment?: boolean, telemetryClient?: TelemetryClient);
+    constructor(db: MerkleTreeReadOperations, worldStateDB: WorldStateDB, globalVariables: GlobalVariables, doMerkleOperations?: boolean, skipFeeEnforcement?: boolean, telemetryClient?: TelemetryClient);
     get tracer(): Tracer;
     /**
      * Simulate a transaction's public portion including all of its phases.

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

@@ -1 +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,EAEzB,KAAK,eAAe,EACpB,KAAK,EAAE,EACP,gBAAgB,EACjB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAqB,KAAK,eAAe,EAA0B,KAAK,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAItH,OAAO,EAAc,KAAK,eAAe,EAAE,KAAK,MAAM,EAAiC,MAAM,yBAAyB,CAAC;AAQvH,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,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;IAM1B,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,iBAAiB;IAT3B,OAAO,EAAE,eAAe,CAAC;IAEzB,OAAO,CAAC,GAAG,CAAS;gBAGV,EAAE,EAAE,wBAAwB,EAC5B,YAAY,EAAE,YAAY,EAC1B,eAAe,EAAE,eAAe,EAChC,kBAAkB,GAAE,OAAe,EACnC,iBAAiB,GAAE,OAAc,EACzC,eAAe,GAAE,eAAsC;IAMzD,IAAI,MAAM,IAAI,MAAM,CAEnB;IACD;;;;OAIG;IACU,QAAQ,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC;IA4EtD;;;;OAIG;YACW,kBAAkB;IAIhC;;;;OAIG;YACW,qBAAqB;IAkBnC;;;;OAIG;YACW,qBAAqB;IAoBnC;;;;;OAKG;YACW,aAAa;IA0C3B;;;;;;;OAOG;YAOW,oBAAoB;IAoClC;;;;;;;;;;;;;OAaG;YAOW,4BAA4B;IAgD1C;;OAEG;IACU,+BAA+B,CAAC,OAAO,EAAE,eAAe;IAkBrE;;;OAGG;IACU,4BAA4B,CAAC,OAAO,EAAE,eAAe;YAqBpD,MAAM;CA+BrB"}
+{"version":3,"file":"public_tx_simulator.d.ts","sourceRoot":"","sources":["../../src/public/public_tx_simulator.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAO,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAGhF,OAAO,EACL,KAAK,eAAe,EACpB,yBAAyB,EAEzB,EAAE,EACF,gBAAgB,EACjB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAc,KAAK,eAAe,EAAE,KAAK,MAAM,EAAiC,MAAM,yBAAyB,CAAC;AAQvH,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,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;IAM1B,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,kBAAkB;IAT5B,OAAO,EAAE,eAAe,CAAC;IAEzB,OAAO,CAAC,GAAG,CAAS;gBAGV,EAAE,EAAE,wBAAwB,EAC5B,YAAY,EAAE,YAAY,EAC1B,eAAe,EAAE,eAAe,EAChC,kBAAkB,GAAE,OAAe,EACnC,kBAAkB,GAAE,OAAe,EAC3C,eAAe,GAAE,eAAsC;IAMzD,IAAI,MAAM,IAAI,MAAM,CAEnB;IACD;;;;OAIG;IACU,QAAQ,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC;IAkFtD;;;;OAIG;YACW,kBAAkB;IAIhC;;;;OAIG;YACW,qBAAqB;IAkBnC;;;;OAIG;YACW,qBAAqB;IAoBnC;;;;;OAKG;YACW,aAAa;IA0C3B;;;;;;;OAOG;YAOW,oBAAoB;IAoClC;;;;;;;;;;;;;OAaG;YAOW,4BAA4B;IAgD1C;;OAEG;IACU,+BAA+B,CAAC,OAAO,EAAE,eAAe;IAkBrE;;;OAGG;IACU,4BAA4B,CAAC,OAAO,EAAE,eAAe;YAqBpD,MAAM;CA+BrB"}