@aztec/simulator 0.64.0 → 0.65.1

package/dest/public/public_tx_simulator.js

@@ -1,228 +1,274 @@
+import { __esDecorate, __runInitializers } from "tslib";
 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 { Attributes, trackSpan } from '@aztec/telemetry-client';
+import { strict as assert } from 'assert';
 import { AvmSimulator } from '../avm/index.js';
 import { getPublicFunctionDebugName } from '../common/debug_fn_name.js';
 import { ExecutorMetrics } from './executor_metrics.js';
 import { PublicTxContext } from './public_tx_context.js';
-export class PublicTxSimulator {
-    constructor(db, worldStateDB, client, globalVariables, realAvmProvingRequests = true, doMerkleOperations = false) {
-        this.db = db;
-        this.worldStateDB = worldStateDB;
-        this.globalVariables = globalVariables;
-        this.realAvmProvingRequests = realAvmProvingRequests;
-        this.doMerkleOperations = doMerkleOperations;
-        this.log = createDebugLogger(`aztec:public_tx_simulator`);
-        this.metrics = new ExecutorMetrics(client, 'PublicTxSimulator');
-    }
-    /**
-     * 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) {
-        this.log.verbose(`Processing tx ${tx.getTxHash()}`);
-        const context = await PublicTxContext.create(this.db, this.worldStateDB, tx, this.globalVariables, this.doMerkleOperations);
-        // 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,
-        };
-    }
-    /**
-     * Simulate the setup phase of a transaction's public execution.
-     * @param context - WILL BE MUTATED. The context of the currently executing public transaction portion
-     * @returns The phase result.
-     */
-    async simulateSetupPhase(context) {
-        return await this.simulatePhase(TxExecutionPhase.SETUP, context);
-    }
-    /**
-     * Simulate the app logic phase of a transaction's public execution.
-     * @param context - WILL BE MUTATED. The context of the currently executing public transaction portion
-     * @returns The phase result.
-     */
-    async 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();
+let PublicTxSimulator = (() => {
+    var _a;
+    let _instanceExtraInitializers = [];
+    let _simulateEnqueuedCall_decorators;
+    let _simulateEnqueuedCallInternal_decorators;
+    return _a = class PublicTxSimulator {
+            constructor(db, worldStateDB, telemetryClient, globalVariables, realAvmProvingRequests = true, doMerkleOperations = false) {
+                this.db = (__runInitializers(this, _instanceExtraInitializers), db);
+                this.worldStateDB = worldStateDB;
+                this.globalVariables = globalVariables;
+                this.realAvmProvingRequests = realAvmProvingRequests;
+                this.doMerkleOperations = doMerkleOperations;
+                this.log = createDebugLogger(`aztec:public_tx_simulator`);
+                this.metrics = new ExecutorMetrics(telemetryClient, 'PublicTxSimulator');
             }
-        }
-        return result;
-    }
-    /**
-     * Simulate the teardown phase of a transaction's public execution.
-     * @param context - WILL BE MUTATED. The context of the currently executing public transaction portion
-     * @returns The phase result.
-     */
-    async 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;
-    }
-    /**
-     * Simulate a phase of a transaction's public execution.
-     * @param phase - The current phase
-     * @param context - WILL BE MUTATED. The context of the currently executing public transaction portion
-     * @returns The phase result.
-     */
-    async simulatePhase(phase, context) {
-        const callRequests = context.getCallRequestsForPhase(phase);
-        const executionRequests = context.getExecutionRequestsForPhase(phase);
-        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;
+            get tracer() {
+                return this.metrics.tracer;
             }
-            const callRequest = callRequests[i];
-            const executionRequest = executionRequests[i];
-            const enqueuedCallResult = await this.simulateEnqueuedCall(phase, context, callRequest, executionRequest);
-            returnValues.push(new NestedProcessReturnValues(enqueuedCallResult.output));
-            if (enqueuedCallResult.reverted) {
-                reverted = true;
-                revertReason = enqueuedCallResult.revertReason;
+            /**
+             * 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) {
+                this.log.verbose(`Processing tx ${tx.getTxHash()}`);
+                const context = await PublicTxContext.create(this.db, this.worldStateDB, tx, this.globalVariables, this.doMerkleOperations);
+                // 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);
+                await this.insertNonRevertiblesFromPrivate(context);
+                const processedPhases = [];
+                if (context.hasPhase(TxExecutionPhase.SETUP)) {
+                    const setupResult = await this.simulateSetupPhase(context);
+                    processedPhases.push(setupResult);
+                }
+                await this.insertRevertiblesFromPrivate(context);
+                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,
+                };
             }
-        }
-        return {
-            phase,
-            durationMs: phaseTimer.ms(),
-            returnValues,
-            reverted,
-            revertReason,
-        };
-    }
-    /**
-     * Simulate an enqueued public call.
-     * @param phase - The current phase of public execution
-     * @param context - WILL BE MUTATED. The context of the currently executing public transaction portion
-     * @param callRequest - The enqueued call to execute
-     * @param executionRequest - The execution request (includes args)
-     * @returns The result of execution.
-     */
-    async simulateEnqueuedCall(phase, context, callRequest, executionRequest) {
-        const stateManager = context.state.getActiveStateManager();
-        const address = executionRequest.callContext.contractAddress;
-        const selector = executionRequest.callContext.functionSelector;
-        const fnName = await getPublicFunctionDebugName(this.worldStateDB, address, selector, executionRequest.args);
-        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 result = await this.simulateEnqueuedCallInternal(context.state.getActiveStateManager(), executionRequest, allocatedGas, context.getTransactionFee(phase), fnName);
-        const gasUsed = allocatedGas.sub(result.gasLeft);
-        context.consumeGas(phase, gasUsed);
-        this.log.verbose(`[AVM] Enqueued public call consumed ${gasUsed.l2Gas} L2 gas ending with ${result.gasLeft.l2Gas} L2 gas left.`);
-        // TODO(dbanks12): remove once AVM proves entire public tx
-        context.updateProvingRequest(this.realAvmProvingRequests, phase, fnName, stateManager, executionRequest, result, allocatedGas);
-        stateManager.traceEnqueuedCall(callRequest, executionRequest.args, result.reverted);
-        if (result.reverted) {
-            const culprit = `${executionRequest.callContext.contractAddress}:${executionRequest.callContext.functionSelector}`;
-            context.revert(phase, result.revertReason, culprit); // throws if in setup (non-revertible) phase
-        }
-        return result;
-    }
-    /**
-     * Simulate an enqueued public call, without modifying the context (PublicTxContext).
-     * Resulting modifcations to the context can be applied by the caller.
-     *
-     * This function can be mocked for testing to skip actual AVM simulation
-     * while still simulating phases and generating a proving request.
-     *
-     * @param stateManager - The state manager for AvmSimulation
-     * @param context - The context of the currently executing public transaction portion
-     * @param executionRequest - The execution request (includes args)
-     * @param allocatedGas - The gas allocated to the enqueued call
-     * @param fnName - The name of the function
-     * @returns The result of execution.
-     */
-    async simulateEnqueuedCallInternal(stateManager, executionRequest, allocatedGas, transactionFee, fnName) {
-        const address = executionRequest.callContext.contractAddress;
-        const sender = executionRequest.callContext.msgSender;
-        const selector = executionRequest.callContext.functionSelector;
-        this.log.verbose(`[AVM] Executing enqueued public call to external function ${fnName}@${address} with ${allocatedGas.l2Gas} allocated L2 gas.`);
-        const timer = new Timer();
-        const simulator = AvmSimulator.create(stateManager, address, sender, selector, transactionFee, this.globalVariables, executionRequest.callContext.isStaticCall, executionRequest.args, allocatedGas);
-        const avmCallResult = await simulator.execute();
-        const result = avmCallResult.finalize();
-        this.log.verbose(`[AVM] Simulation of enqueued public call ${fnName} completed. reverted: ${result.reverted}${result.reverted ? ', reason: ' + result.revertReason : ''}.`, {
-            eventName: 'avm-simulation',
-            appCircuitName: fnName,
-            duration: timer.ms(),
-        });
-        if (result.reverted) {
-            this.metrics.recordFunctionSimulationFailure();
-        }
-        else {
-            this.metrics.recordFunctionSimulation(timer.ms());
-        }
-        return result;
-    }
-}
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"public_tx_simulator.js","sourceRoot":"","sources":["../../src/public/public_tx_simulator.ts"],"names":[],"mappings":"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"}
+            /**
+             * Simulate the setup phase of a transaction's public execution.
+             * @param context - WILL BE MUTATED. The context of the currently executing public transaction portion
+             * @returns The phase result.
+             */
+            async simulateSetupPhase(context) {
+                return await this.simulatePhase(TxExecutionPhase.SETUP, context);
+            }
+            /**
+             * Simulate the app logic phase of a transaction's public execution.
+             * @param context - WILL BE MUTATED. The context of the currently executing public transaction portion
+             * @returns The phase result.
+             */
+            async simulateAppLogicPhase(context) {
+                assert(context.state.isForked(), 'App logic phase should operate with forked state.');
+                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;
+            }
+            /**
+             * Simulate the teardown phase of a transaction's public execution.
+             * @param context - WILL BE MUTATED. The context of the currently executing public transaction portion
+             * @returns The phase result.
+             */
+            async simulateTeardownPhase(context) {
+                if (!context.state.isForked()) {
+                    // If state isn't forked (app logic 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;
+            }
+            /**
+             * Simulate a phase of a transaction's public execution.
+             * @param phase - The current phase
+             * @param context - WILL BE MUTATED. The context of the currently executing public transaction portion
+             * @returns The phase result.
+             */
+            async simulatePhase(phase, context) {
+                const callRequests = context.getCallRequestsForPhase(phase);
+                const executionRequests = context.getExecutionRequestsForPhase(phase);
+                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 enqueuedCallResult = await this.simulateEnqueuedCall(phase, context, callRequest, executionRequest);
+                    returnValues.push(new NestedProcessReturnValues(enqueuedCallResult.output));
+                    if (enqueuedCallResult.reverted) {
+                        reverted = true;
+                        revertReason = enqueuedCallResult.revertReason;
+                    }
+                }
+                return {
+                    phase,
+                    durationMs: phaseTimer.ms(),
+                    returnValues,
+                    reverted,
+                    revertReason,
+                };
+            }
+            /**
+             * Simulate an enqueued public call.
+             * @param phase - The current phase of public execution
+             * @param context - WILL BE MUTATED. The context of the currently executing public transaction portion
+             * @param callRequest - The enqueued call to execute
+             * @param executionRequest - The execution request (includes args)
+             * @returns The result of execution.
+             */
+            async simulateEnqueuedCall(phase, context, callRequest, executionRequest) {
+                const stateManager = context.state.getActiveStateManager();
+                const address = executionRequest.callContext.contractAddress;
+                const selector = executionRequest.callContext.functionSelector;
+                const fnName = await getPublicFunctionDebugName(this.worldStateDB, address, selector, executionRequest.args);
+                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 result = await this.simulateEnqueuedCallInternal(context.state.getActiveStateManager(), executionRequest, allocatedGas, context.getTransactionFee(phase), fnName);
+                const gasUsed = allocatedGas.sub(result.gasLeft);
+                context.consumeGas(phase, gasUsed);
+                this.log.verbose(`[AVM] Enqueued public call consumed ${gasUsed.l2Gas} L2 gas ending with ${result.gasLeft.l2Gas} L2 gas left.`);
+                // TODO(dbanks12): remove once AVM proves entire public tx
+                context.updateProvingRequest(this.realAvmProvingRequests, phase, fnName, stateManager, executionRequest, result, allocatedGas);
+                stateManager.traceEnqueuedCall(callRequest, executionRequest.args, result.reverted);
+                if (result.reverted) {
+                    const culprit = `${executionRequest.callContext.contractAddress}:${executionRequest.callContext.functionSelector}`;
+                    context.revert(phase, result.revertReason, culprit); // throws if in setup (non-revertible) phase
+                }
+                return result;
+            }
+            /**
+             * Simulate an enqueued public call, without modifying the context (PublicTxContext).
+             * Resulting modifcations to the context can be applied by the caller.
+             *
+             * This function can be mocked for testing to skip actual AVM simulation
+             * while still simulating phases and generating a proving request.
+             *
+             * @param stateManager - The state manager for AvmSimulation
+             * @param context - The context of the currently executing public transaction portion
+             * @param executionRequest - The execution request (includes args)
+             * @param allocatedGas - The gas allocated to the enqueued call
+             * @param fnName - The name of the function
+             * @returns The result of execution.
+             */
+            async simulateEnqueuedCallInternal(stateManager, executionRequest, allocatedGas, transactionFee, fnName) {
+                const address = executionRequest.callContext.contractAddress;
+                const sender = executionRequest.callContext.msgSender;
+                const selector = executionRequest.callContext.functionSelector;
+                this.log.verbose(`[AVM] Executing enqueued public call to external function ${fnName}@${address} with ${allocatedGas.l2Gas} allocated L2 gas.`);
+                const timer = new Timer();
+                const simulator = AvmSimulator.create(stateManager, address, sender, selector, transactionFee, this.globalVariables, executionRequest.callContext.isStaticCall, executionRequest.args, allocatedGas);
+                const avmCallResult = await simulator.execute();
+                const result = avmCallResult.finalize();
+                this.log.verbose(`[AVM] Simulation of enqueued public call ${fnName} completed. reverted: ${result.reverted}${result.reverted ? ', reason: ' + result.revertReason : ''}.`, {
+                    eventName: 'avm-simulation',
+                    appCircuitName: fnName,
+                    duration: timer.ms(),
+                });
+                if (result.reverted) {
+                    this.metrics.recordFunctionSimulationFailure();
+                }
+                else {
+                    this.metrics.recordFunctionSimulation(timer.ms(), allocatedGas.sub(result.gasLeft).l2Gas, fnName);
+                }
+                return result;
+            }
+            /**
+             * Insert the non-revertible accumulated data from private into the public state.
+             */
+            async insertNonRevertiblesFromPrivate(context) {
+                const stateManager = context.state.getActiveStateManager();
+                await stateManager.writeSiloedNullifiersFromPrivate(context.nonRevertibleAccumulatedDataFromPrivate.nullifiers);
+            }
+            /**
+             * Insert the revertible accumulated data from private into the public state.
+             * Start by forking state so we can rollback to the end of setup if app logic or teardown reverts.
+             */
+            async insertRevertiblesFromPrivate(context) {
+                // Fork the state manager so we can rollback to end of setup if app logic reverts.
+                context.state.fork();
+                const stateManager = context.state.getActiveStateManager();
+                await stateManager.writeSiloedNullifiersFromPrivate(context.revertibleAccumulatedDataFromPrivate.nullifiers);
+            }
+        },
+        (() => {
+            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+            _simulateEnqueuedCall_decorators = [trackSpan('PublicTxSimulator.simulateEnqueuedCall', (phase, context, _callRequest, executionRequest) => ({
+                    [Attributes.TX_HASH]: context.getTxHash().toString(),
+                    [Attributes.TARGET_ADDRESS]: executionRequest.callContext.contractAddress.toString(),
+                    [Attributes.SENDER_ADDRESS]: executionRequest.callContext.msgSender.toString(),
+                    [Attributes.SIMULATOR_PHASE]: TxExecutionPhase[phase].toString(),
+                }))];
+            _simulateEnqueuedCallInternal_decorators = [trackSpan('PublicTxSimulator.simulateEnqueuedCallInternal', (_stateManager, _executionRequest, _allocatedGas, _transactionFee, fnName) => ({
+                    [Attributes.APP_CIRCUIT_NAME]: fnName,
+                }))];
+            __esDecorate(_a, null, _simulateEnqueuedCall_decorators, { kind: "method", name: "simulateEnqueuedCall", static: false, private: false, access: { has: obj => "simulateEnqueuedCall" in obj, get: obj => obj.simulateEnqueuedCall }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(_a, null, _simulateEnqueuedCallInternal_decorators, { kind: "method", name: "simulateEnqueuedCallInternal", static: false, private: false, access: { has: obj => "simulateEnqueuedCallInternal" in obj, get: obj => obj.simulateEnqueuedCallInternal }, metadata: _metadata }, null, _instanceExtraInitializers);
+            if (_metadata) Object.defineProperty(_a, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+        })(),
+        _a;
+})();
+export { PublicTxSimulator };
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"public_tx_simulator.js","sourceRoot":"","sources":["../../src/public/public_tx_simulator.ts"],"names":[],"mappings":"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"}

package/dest/public/side_effect_trace.d.ts

@@ -41,8 +41,8 @@ export declare class PublicSideEffectTrace implements PublicSideEffectTraceInter
     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;
+    traceNullifierCheck(siloedNullifier: Fr, exists: boolean, lowLeafPreimage?: NullifierLeafPreimage, lowLeafIndex?: Fr, lowLeafPath?: Fr[]): void;
+    traceNewNullifier(siloedNullifier: 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;

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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"}