@aztec/simulator 0.63.0 → 0.64.0

package/dest/public/public_tx_simulator.js

@@ -1,23 +1,29 @@
 import { NestedProcessReturnValues, TxExecutionPhase, UnencryptedFunctionL2Logs, } from '@aztec/circuit-types';
-import { Gas, MAX_L2_GAS_PER_ENQUEUED_CALL } from '@aztec/circuits.js';
+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 { 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, globalVariables, worldStateDB, publicExecutor, realAvmProvingRequests = true) {
+    constructor(db, worldStateDB, client, globalVariables, realAvmProvingRequests = true, doMerkleOperations = false) {
         this.db = db;
-        this.globalVariables = globalVariables;
         this.worldStateDB = worldStateDB;
-        this.publicExecutor = publicExecutor;
+        this.globalVariables = globalVariables;
         this.realAvmProvingRequests = realAvmProvingRequests;
+        this.doMerkleOperations = doMerkleOperations;
         this.log = createDebugLogger(`aztec:public_tx_simulator`);
+        this.metrics = new ExecutorMetrics(client, 'PublicTxSimulator');
     }
-    static create(db, publicExecutor, globalVariables, worldStateDB, realAvmProvingRequests = true) {
-        return new PublicTxSimulator(db, globalVariables, worldStateDB, publicExecutor, realAvmProvingRequests);
-    }
+    /**
+     * 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);
+        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.
@@ -63,9 +69,19 @@ export class PublicTxSimulator {
             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).
@@ -83,6 +99,11 @@ export class 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
@@ -100,10 +121,15 @@ export class PublicTxSimulator {
         }
         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);
-        const txStateManager = context.state.getActiveStateManager();
         this.log.debug(`Beginning processing in phase ${TxExecutionPhase[phase]} for tx ${context.getTxHash()}`);
         const returnValues = [];
         let reverted = false;
@@ -115,25 +141,11 @@ export class PublicTxSimulator {
             }
             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));
+            const enqueuedCallResult = await this.simulateEnqueuedCall(phase, context, callRequest, executionRequest);
+            returnValues.push(new NestedProcessReturnValues(enqueuedCallResult.output));
             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 {
@@ -144,5 +156,73 @@ export class PublicTxSimulator {
             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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHVibGljX3R4X3NpbXVsYXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wdWJsaWMvcHVibGljX3R4X3NpbXVsYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBSUwseUJBQXlCLEVBR3pCLGdCQUFnQixFQUNoQix5QkFBeUIsR0FDMUIsTUFBTSxzQkFBc0IsQ0FBQztBQUM5QixPQUFPLEVBQUUsR0FBRyxFQUF3Qiw0QkFBNEIsRUFBbUIsTUFBTSxvQkFBb0IsQ0FBQztBQUM5RyxPQUFPLEVBQW9CLGlCQUFpQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDNUUsT0FBTyxFQUFFLEtBQUssRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBS2hELE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQW9CekQsTUFBTSxPQUFPLGlCQUFpQjtJQUc1QixZQUNVLEVBQTRCLEVBQzVCLGVBQWdDLEVBQ2hDLFlBQTBCLEVBQzFCLGNBQThCLEVBQzlCLHlCQUFrQyxJQUFJO1FBSnRDLE9BQUUsR0FBRixFQUFFLENBQTBCO1FBQzVCLG9CQUFlLEdBQWYsZUFBZSxDQUFpQjtRQUNoQyxpQkFBWSxHQUFaLFlBQVksQ0FBYztRQUMxQixtQkFBYyxHQUFkLGNBQWMsQ0FBZ0I7UUFDOUIsMkJBQXNCLEdBQXRCLHNCQUFzQixDQUFnQjtRQUU5QyxJQUFJLENBQUMsR0FBRyxHQUFHLGlCQUFpQixDQUFDLDJCQUEyQixDQUFDLENBQUM7SUFDNUQsQ0FBQztJQUVELE1BQU0sQ0FBQyxNQUFNLENBQ1gsRUFBNEIsRUFDNUIsY0FBOEIsRUFDOUIsZUFBZ0MsRUFDaEMsWUFBMEIsRUFDMUIseUJBQWtDLElBQUk7UUFFdEMsT0FBTyxJQUFJLGlCQUFpQixDQUFDLEVBQUUsRUFBRSxlQUFlLEVBQUUsWUFBWSxFQUFFLGNBQWMsRUFBRSxzQkFBc0IsQ0FBQyxDQUFDO0lBQzFHLENBQUM7SUFFRCxLQUFLLENBQUMsUUFB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
+//# 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

@@ -3,7 +3,7 @@
 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 AvmContractCallResult, type AvmFinalizedCallResult } from '../avm/avm_contract_call_result.js';
 import { type AvmExecutionEnvironment } from '../avm/avm_execution_environment.js';
 import { type EnqueuedPublicCallExecutionResultWithSideEffects, type PublicFunctionCallResult } from './execution.js';
 import { type PublicSideEffectTraceInterface } from './side_effect_trace_interface.js';
@@ -40,7 +40,7 @@ export declare class PublicSideEffectTrace implements PublicSideEffectTraceInter
     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;
+    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;
@@ -59,8 +59,6 @@ export declare class PublicSideEffectTrace implements PublicSideEffectTraceInter
     nestedEnvironment: AvmExecutionEnvironment, 
     /** How much gas was available for this public execution. */
     startGasLeft: Gas, 
-    /** How much gas was left after this public execution. */
-    endGasLeft: Gas, 
     /** Bytecode used for this execution. */
     bytecode: Buffer, 
     /** The call's results */
@@ -83,19 +81,15 @@ export declare class PublicSideEffectTrace implements PublicSideEffectTraceInter
     avmEnvironment: AvmExecutionEnvironment, 
     /** How much gas was available for this public execution. */
     startGasLeft: Gas, 
-    /** How much gas was left after this public execution. */
-    endGasLeft: Gas, 
     /** Bytecode used for this execution. */
     bytecode: Buffer, 
     /** The call's results */
-    avmCallResults: AvmContractCallResult, 
+    avmCallResults: AvmFinalizedCallResult, 
     /** Function name for logging */
     functionName?: string): PublicFunctionCallResult;
     toPublicEnqueuedCallExecutionResult(
-    /** How much gas was left after this public execution. */
-    _endGasLeft: Gas, 
     /** The call's results */
-    _avmCallResults: AvmContractCallResult): EnqueuedPublicCallExecutionResultWithSideEffects;
+    _avmCallResults: AvmFinalizedCallResult): EnqueuedPublicCallExecutionResultWithSideEffects;
     private enforceLimitOnNullifierChecks;
     getUnencryptedLogs(): UnencryptedL2Log[];
 }

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

package/dest/public/side_effect_trace.js

@@ -3,7 +3,6 @@ import { AvmAppendTreeHint, AvmContractBytecodeHints, AvmContractInstanceHint, A
 import { Fr } from '@aztec/foundation/fields';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { assert } from 'console';
-import { createSimulationError } from '../common/errors.js';
 import { resultToPublicCallRequest, } from './execution.js';
 import { SideEffectLimitReachedError } from './side_effect_errors.js';
 const emptyPublicDataPath = () => new Array(PUBLIC_DATA_TREE_HEIGHT).fill(Fr.zero());
@@ -85,7 +84,7 @@ export class PublicSideEffectTrace {
         this.avmCircuitHints.noteHashReadRequest.items.push(new AvmAppendTreeHint(leafIndex, noteHash, path));
         // NOTE: counter does not increment for note hash checks (because it doesn't rely on pending note hashes)
     }
-    traceNewNoteHash(_contractAddress, noteHash, leafIndex, path = emptyNoteHashPath()) {
+    traceNewNoteHash(_contractAddress, noteHash, leafIndex = Fr.zero(), path = emptyNoteHashPath()) {
         if (this.noteHashes.length >= MAX_NOTE_HASHES_PER_TX) {
             throw new SideEffectLimitReachedError('note hash', MAX_NOTE_HASHES_PER_TX);
         }
@@ -190,8 +189,6 @@ export class PublicSideEffectTrace {
     nestedEnvironment, 
     /** How much gas was available for this public execution. */
     startGasLeft, 
-    /** How much gas was left after this public execution. */
-    endGasLeft, 
     /** Bytecode used for this execution. */
     bytecode, 
     /** The call's results */
@@ -203,14 +200,14 @@ export class PublicSideEffectTrace {
         // one for max unique contract calls, and another based on max nullifier reads.
         // Since this trace function happens _after_ a nested call, such threshold limits must take
         // place in another trace function that occurs _before_ a nested call.
-        const result = nestedCallTrace.toPublicFunctionCallResult(nestedEnvironment, startGasLeft, endGasLeft, bytecode, avmCallResults, functionName);
+        const result = nestedCallTrace.toPublicFunctionCallResult(nestedEnvironment, startGasLeft, bytecode, avmCallResults.finalize(), functionName);
         this.sideEffectCounter = result.endSideEffectCounter.toNumber();
         // when a nested call returns, caller accepts its updated counter
         this.allUnencryptedLogs.push(...result.allUnencryptedLogs.logs);
         // NOTE: eventually if the AVM circuit processes an entire enqueued call,
         // this function will accept all of the nested's side effects into this instance
         this.nestedExecutions.push(result);
-        const gasUsed = new Gas(result.startGasLeft.daGas - result.endGasLeft.daGas, result.startGasLeft.l2Gas - result.endGasLeft.l2Gas);
+        const gasUsed = new Gas(result.startGasLeft.daGas - avmCallResults.gasLeft.daGas, result.startGasLeft.l2Gas - avmCallResults.gasLeft.l2Gas);
         this.publicCallRequests.push(resultToPublicCallRequest(result));
         this.avmCircuitHints.externalCalls.items.push(new AvmExternalCallHint(
         /*success=*/ new Fr(result.reverted ? 0 : 1), result.returnValues, gasUsed, result.endSideEffectCounter, nestedEnvironment.address));
@@ -235,8 +232,6 @@ export class PublicSideEffectTrace {
     avmEnvironment, 
     /** How much gas was available for this public execution. */
     startGasLeft, 
-    /** How much gas was left after this public execution. */
-    endGasLeft, 
     /** Bytecode used for this execution. */
     bytecode, 
     /** The call's results */
@@ -248,15 +243,13 @@ export class PublicSideEffectTrace {
             startSideEffectCounter: new Fr(this.startSideEffectCounter),
             endSideEffectCounter: new Fr(this.sideEffectCounter),
             startGasLeft,
-            endGasLeft,
+            endGasLeft: avmCallResults.gasLeft,
             transactionFee: avmEnvironment.transactionFee,
             bytecode,
             calldata: avmEnvironment.calldata,
             returnValues: avmCallResults.output,
             reverted: avmCallResults.reverted,
-            revertReason: avmCallResults.revertReason
-                ? createSimulationError(avmCallResults.revertReason, avmCallResults.output)
-                : undefined,
+            revertReason: avmCallResults.revertReason,
             contractStorageReads: this.contractStorageReads,
             contractStorageUpdateRequests: this.contractStorageUpdateRequests,
             noteHashReadRequests: this.noteHashReadRequests,
@@ -277,8 +270,6 @@ export class PublicSideEffectTrace {
         };
     }
     toPublicEnqueuedCallExecutionResult(
-    /** How much gas was left after this public execution. */
-    _endGasLeft, 
     /** The call's results */
     _avmCallResults) {
         throw new Error('Not implemented');
@@ -313,4 +304,4 @@ function createPublicExecutionRequest(avmEnvironment) {
     });
     return new PublicExecutionRequest(callContext, avmEnvironment.calldata);
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"side_effect_trace.js","sourceRoot":"","sources":["../../src/public/side_effect_trace.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"side_effect_trace.js","sourceRoot":"","sources":["../../src/public/side_effect_trace.ts"],"names":[],"mappings":"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"}

package/dest/public/side_effect_trace_interface.d.ts

@@ -4,7 +4,7 @@ import { type UnencryptedL2Log } from '@aztec/circuit-types';
 import { type ContractClassIdPreimage, type Gas, type NullifierLeafPreimage, type PublicCallRequest, type PublicDataTreeLeafPreimage, type SerializableContractInstance } from '@aztec/circuits.js';
 import { type AztecAddress } from '@aztec/foundation/aztec-address';
 import { type Fr } from '@aztec/foundation/fields';
-import { type AvmContractCallResult } from '../avm/avm_contract_call_result.js';
+import { type AvmContractCallResult, type AvmFinalizedCallResult } from '../avm/avm_contract_call_result.js';
 import { type AvmExecutionEnvironment } from '../avm/avm_execution_environment.js';
 import { type EnqueuedPublicCallExecutionResultWithSideEffects, type PublicFunctionCallResult } from './execution.js';
 export interface PublicSideEffectTraceInterface {
@@ -30,8 +30,6 @@ export interface PublicSideEffectTraceInterface {
     nestedEnvironment: AvmExecutionEnvironment, 
     /** How much gas was available for this public execution. */
     startGasLeft: Gas, 
-    /** How much gas was left after this public execution. */
-    endGasLeft: Gas, 
     /** Bytecode used for this execution. */
     bytecode: Buffer, 
     /** The call's results */
@@ -46,21 +44,17 @@ export interface PublicSideEffectTraceInterface {
     /** Did the call revert? */
     reverted: boolean): void;
     toPublicEnqueuedCallExecutionResult(
-    /** How much gas was left after this public execution. */
-    endGasLeft: Gas, 
     /** The call's results */
-    avmCallResults: AvmContractCallResult): EnqueuedPublicCallExecutionResultWithSideEffects;
+    avmCallResults: AvmFinalizedCallResult): EnqueuedPublicCallExecutionResultWithSideEffects;
     toPublicFunctionCallResult(
     /** The execution environment of the nested call. */
     avmEnvironment: AvmExecutionEnvironment, 
     /** How much gas was available for this public execution. */
     startGasLeft: Gas, 
-    /** How much gas was left after this public execution. */
-    endGasLeft: Gas, 
     /** Bytecode used for this execution. */
     bytecode: Buffer, 
     /** The call's results */
-    avmCallResults: AvmContractCallResult, 
+    avmCallResults: AvmFinalizedCallResult, 
     /** Function name for logging */
     functionName: string): PublicFunctionCallResult;
     getUnencryptedLogs(): UnencryptedL2Log[];

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

@@ -1 +1 @@
-{"version":3,"file":"side_effect_trace_interface.d.ts","sourceRoot":"","sources":["../../src/public/side_effect_trace_interface.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EACL,KAAK,uBAAuB,EAC5B,KAAK,GAAG,EACR,KAAK,qBAAqB,EAC1B,KAAK,iBAAiB,EACtB,KAAK,0BAA0B,EAC/B,KAAK,4BAA4B,EAClC,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAEnD,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAChF,OAAO,EAAE,KAAK,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AACnF,OAAO,EAAE,KAAK,gDAAgD,EAAE,KAAK,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAEtH,MAAM,WAAW,8BAA8B;IAC7C,IAAI,IAAI,8BAA8B,CAAC;IACvC,KAAK,CAAC,WAAW,EAAE,8BAA8B,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAC7E,UAAU,IAAI,MAAM,CAAC;IAErB,sBAAsB,CACpB,eAAe,EAAE,YAAY,EAC7B,IAAI,EAAE,EAAE,EACR,KAAK,EAAE,EAAE,EACT,YAAY,CAAC,EAAE,0BAA0B,EACzC,SAAS,CAAC,EAAE,EAAE,EACd,IAAI,CAAC,EAAE,EAAE,EAAE,GACV,IAAI,CAAC;IACR,uBAAuB,CACrB,eAAe,EAAE,YAAY,EAC7B,IAAI,EAAE,EAAE,EAAE,sDAAsD;IAChE,KAAK,EAAE,EAAE,EACT,eAAe,CAAC,EAAE,0BAA0B,EAC5C,YAAY,CAAC,EAAE,EAAE,EACjB,WAAW,CAAC,EAAE,EAAE,EAAE,EAClB,eAAe,CAAC,EAAE,0BAA0B,EAC5C,aAAa,CAAC,EAAE,EAAE,EAAE,GACnB,IAAI,CAAC;IACR,kBAAkB,CAAC,eAAe,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC;IACnH,gBAAgB,CAAC,eAAe,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE,EAAE,SAAS,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC;IACjG,mBAAmB,CACjB,eAAe,EAAE,YAAY,EAC7B,SAAS,EAAE,EAAE,EACb,MAAM,EAAE,OAAO,EACf,eAAe,CAAC,EAAE,qBAAqB,EACvC,YAAY,CAAC,EAAE,EAAE,EACjB,WAAW,CAAC,EAAE,EAAE,EAAE,GACjB,IAAI,CAAC;IACR,iBAAiB,CACf,eAAe,EAAE,YAAY,EAC7B,SAAS,EAAE,EAAE,EACb,eAAe,CAAC,EAAE,qBAAqB,EACvC,YAAY,CAAC,EAAE,EAAE,EACjB,WAAW,CAAC,EAAE,EAAE,EAAE,EAClB,aAAa,CAAC,EAAE,EAAE,EAAE,GACnB,IAAI,CAAC;IACR,uBAAuB,CACrB,eAAe,EAAE,YAAY,EAC7B,OAAO,EAAE,EAAE,EACX,YAAY,EAAE,EAAE,EAChB,MAAM,EAAE,OAAO,EACf,IAAI,CAAC,EAAE,EAAE,EAAE,GACV,IAAI,CAAC;IACR,qBAAqB,CAAC,eAAe,EAAE,YAAY,EAAE,SAAS,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,GAAG,IAAI,CAAC;IACvF,mBAAmB,CAAC,eAAe,EAAE,YAAY,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC;IACpE,wBAAwB,CACtB,eAAe,EAAE,YAAY,EAC7B,MAAM,EAAE,OAAO,EACf,QAAQ,CAAC,EAAE,4BAA4B,GACtC,IAAI,CAAC;IACR,gBAAgB,CACd,eAAe,EAAE,YAAY,EAC7B,MAAM,EAAE,OAAO,EACf,QAAQ,CAAC,EAAE,MAAM,EACjB,gBAAgB,CAAC,EAAE,4BAA4B,EAC/C,aAAa,CAAC,EAAE,uBAAuB,GACtC,IAAI,CAAC;IACR,eAAe;IACb,oCAAoC;IACpC,eAAe,EAAE,8BAA8B;IAC/C,oDAAoD;IACpD,iBAAiB,EAAE,uBAAuB;IAC1C,4DAA4D;IAC5D,YAAY,EAAE,GAAG;IACjB,yDAAyD;IACzD,UAAU,EAAE,GAAG;IACf,wCAAwC;IACxC,QAAQ,EAAE,MAAM;IAChB,yBAAyB;IACzB,cAAc,EAAE,qBAAqB;IACrC,oBAAoB;IACpB,YAAY,EAAE,MAAM,GACnB,IAAI,CAAC;IACR,iBAAiB;IACf,6DAA6D;IAC7D,iBAAiB,EAAE,iBAAiB;IACpC,0BAA0B;IAC1B,QAAQ,EAAE,EAAE,EAAE;IACd,2BAA2B;IAC3B,QAAQ,EAAE,OAAO,GAChB,IAAI,CAAC;IACR,mCAAmC;IACjC,yDAAyD;IACzD,UAAU,EAAE,GAAG;IACf,yBAAyB;IACzB,cAAc,EAAE,qBAAqB,GACpC,gDAAgD,CAAC;IACpD,0BAA0B;IACxB,oDAAoD;IACpD,cAAc,EAAE,uBAAuB;IACvC,4DAA4D;IAC5D,YAAY,EAAE,GAAG;IACjB,yDAAyD;IACzD,UAAU,EAAE,GAAG;IACf,wCAAwC;IACxC,QAAQ,EAAE,MAAM;IAChB,yBAAyB;IACzB,cAAc,EAAE,qBAAqB;IACrC,gCAAgC;IAChC,YAAY,EAAE,MAAM,GACnB,wBAAwB,CAAC;IAC5B,kBAAkB,IAAI,gBAAgB,EAAE,CAAC;CAC1C"}
+{"version":3,"file":"side_effect_trace_interface.d.ts","sourceRoot":"","sources":["../../src/public/side_effect_trace_interface.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EACL,KAAK,uBAAuB,EAC5B,KAAK,GAAG,EACR,KAAK,qBAAqB,EAC1B,KAAK,iBAAiB,EACtB,KAAK,0BAA0B,EAC/B,KAAK,4BAA4B,EAClC,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAEnD,OAAO,EAAE,KAAK,qBAAqB,EAAE,KAAK,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAC7G,OAAO,EAAE,KAAK,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AACnF,OAAO,EAAE,KAAK,gDAAgD,EAAE,KAAK,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAEtH,MAAM,WAAW,8BAA8B;IAC7C,IAAI,IAAI,8BAA8B,CAAC;IACvC,KAAK,CAAC,WAAW,EAAE,8BAA8B,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAC7E,UAAU,IAAI,MAAM,CAAC;IAErB,sBAAsB,CACpB,eAAe,EAAE,YAAY,EAC7B,IAAI,EAAE,EAAE,EACR,KAAK,EAAE,EAAE,EACT,YAAY,CAAC,EAAE,0BAA0B,EACzC,SAAS,CAAC,EAAE,EAAE,EACd,IAAI,CAAC,EAAE,EAAE,EAAE,GACV,IAAI,CAAC;IACR,uBAAuB,CACrB,eAAe,EAAE,YAAY,EAC7B,IAAI,EAAE,EAAE,EAAE,sDAAsD;IAChE,KAAK,EAAE,EAAE,EACT,eAAe,CAAC,EAAE,0BAA0B,EAC5C,YAAY,CAAC,EAAE,EAAE,EACjB,WAAW,CAAC,EAAE,EAAE,EAAE,EAClB,eAAe,CAAC,EAAE,0BAA0B,EAC5C,aAAa,CAAC,EAAE,EAAE,EAAE,GACnB,IAAI,CAAC;IACR,kBAAkB,CAAC,eAAe,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC;IACnH,gBAAgB,CAAC,eAAe,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE,EAAE,SAAS,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC;IACjG,mBAAmB,CACjB,eAAe,EAAE,YAAY,EAC7B,SAAS,EAAE,EAAE,EACb,MAAM,EAAE,OAAO,EACf,eAAe,CAAC,EAAE,qBAAqB,EACvC,YAAY,CAAC,EAAE,EAAE,EACjB,WAAW,CAAC,EAAE,EAAE,EAAE,GACjB,IAAI,CAAC;IACR,iBAAiB,CACf,eAAe,EAAE,YAAY,EAC7B,SAAS,EAAE,EAAE,EACb,eAAe,CAAC,EAAE,qBAAqB,EACvC,YAAY,CAAC,EAAE,EAAE,EACjB,WAAW,CAAC,EAAE,EAAE,EAAE,EAClB,aAAa,CAAC,EAAE,EAAE,EAAE,GACnB,IAAI,CAAC;IACR,uBAAuB,CACrB,eAAe,EAAE,YAAY,EAC7B,OAAO,EAAE,EAAE,EACX,YAAY,EAAE,EAAE,EAChB,MAAM,EAAE,OAAO,EACf,IAAI,CAAC,EAAE,EAAE,EAAE,GACV,IAAI,CAAC;IACR,qBAAqB,CAAC,eAAe,EAAE,YAAY,EAAE,SAAS,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,GAAG,IAAI,CAAC;IACvF,mBAAmB,CAAC,eAAe,EAAE,YAAY,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC;IACpE,wBAAwB,CACtB,eAAe,EAAE,YAAY,EAC7B,MAAM,EAAE,OAAO,EACf,QAAQ,CAAC,EAAE,4BAA4B,GACtC,IAAI,CAAC;IACR,gBAAgB,CACd,eAAe,EAAE,YAAY,EAC7B,MAAM,EAAE,OAAO,EACf,QAAQ,CAAC,EAAE,MAAM,EACjB,gBAAgB,CAAC,EAAE,4BAA4B,EAC/C,aAAa,CAAC,EAAE,uBAAuB,GACtC,IAAI,CAAC;IACR,eAAe;IACb,oCAAoC;IACpC,eAAe,EAAE,8BAA8B;IAC/C,oDAAoD;IACpD,iBAAiB,EAAE,uBAAuB;IAC1C,4DAA4D;IAC5D,YAAY,EAAE,GAAG;IACjB,wCAAwC;IACxC,QAAQ,EAAE,MAAM;IAChB,yBAAyB;IACzB,cAAc,EAAE,qBAAqB;IACrC,oBAAoB;IACpB,YAAY,EAAE,MAAM,GACnB,IAAI,CAAC;IACR,iBAAiB;IACf,6DAA6D;IAC7D,iBAAiB,EAAE,iBAAiB;IACpC,0BAA0B;IAC1B,QAAQ,EAAE,EAAE,EAAE;IACd,2BAA2B;IAC3B,QAAQ,EAAE,OAAO,GAChB,IAAI,CAAC;IACR,mCAAmC;IACjC,yBAAyB;IACzB,cAAc,EAAE,sBAAsB,GACrC,gDAAgD,CAAC;IACpD,0BAA0B;IACxB,oDAAoD;IACpD,cAAc,EAAE,uBAAuB;IACvC,4DAA4D;IAC5D,YAAY,EAAE,GAAG;IACjB,wCAAwC;IACxC,QAAQ,EAAE,MAAM;IAChB,yBAAyB;IACzB,cAAc,EAAE,sBAAsB;IACtC,gCAAgC;IAChC,YAAY,EAAE,MAAM,GACnB,wBAAwB,CAAC;IAC5B,kBAAkB,IAAI,gBAAgB,EAAE,CAAC;CAC1C"}

package/dest/public/transitional_adapters.d.ts

@@ -3,7 +3,6 @@ import { AvmCircuitPublicInputs, Fr, Gas, type GasSettings, type GlobalVariables
 import { type AvmPersistableStateManager } from '../avm/journal/journal.js';
 import { type PublicEnqueuedCallSideEffectTrace } from './enqueued_call_side_effect_trace.js';
 import { type EnqueuedPublicCallExecutionResult } from './execution.js';
-import { type WorldStateDB } from './public_db_sources.js';
 export declare function generateAvmCircuitPublicInputs(trace: PublicEnqueuedCallSideEffectTrace, globalVariables: GlobalVariables, startStateReference: StateReference, startGasUsed: Gas, gasSettings: GasSettings, setupCallRequests: PublicCallRequest[], appLogicCallRequests: PublicCallRequest[], teardownCallRequests: PublicCallRequest[], nonRevertibleAccumulatedDataFromPrivate: PrivateToPublicAccumulatedData, revertibleAccumulatedDataFromPrivate: PrivateToPublicAccumulatedData, endStateReference: StateReference, endGasUsed: Gas, transactionFee: Fr, revertCode: RevertCode): AvmCircuitPublicInputs;
-export declare function generateAvmProvingRequest(real: boolean, worldStateDB: WorldStateDB, stateManager: AvmPersistableStateManager, historicalHeader: Header, globalVariables: GlobalVariables, executionRequest: PublicExecutionRequest, result: EnqueuedPublicCallExecutionResult, allocatedGas: Gas, transactionFee: Fr): Promise<AvmProvingRequest>;
+export declare function generateAvmProvingRequest(real: boolean, fnName: string, stateManager: AvmPersistableStateManager, historicalHeader: Header, globalVariables: GlobalVariables, executionRequest: PublicExecutionRequest, result: EnqueuedPublicCallExecutionResult, allocatedGas: Gas, transactionFee: Fr): AvmProvingRequest;
 //# sourceMappingURL=transitional_adapters.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"transitional_adapters.d.ts","sourceRoot":"","sources":["../../src/public/transitional_adapters.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,iBAAiB,EAAsB,KAAK,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAC/G,OAAO,EAEL,sBAAsB,EAItB,EAAE,EACF,GAAG,EACH,KAAK,WAAW,EAChB,KAAK,eAAe,EACpB,KAAK,MAAM,EAsBX,KAAK,8BAA8B,EACnC,iBAAiB,EAKjB,UAAU,EACV,KAAK,cAAc,EAKpB,MAAM,oBAAoB,CAAC;AAM5B,OAAO,EAAE,KAAK,0BAA0B,EAAE,MAAM,2BAA2B,CAAC;AAE5E,OAAO,EAAE,KAAK,iCAAiC,EAAE,MAAM,sCAAsC,CAAC;AAC9F,OAAO,EAAE,KAAK,iCAAiC,EAAiC,MAAM,gBAAgB,CAAC;AAEvG,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAE3D,wBAAgB,8BAA8B,CAC5C,KAAK,EAAE,iCAAiC,EACxC,eAAe,EAAE,eAAe,EAChC,mBAAmB,EAAE,cAAc,EACnC,YAAY,EAAE,GAAG,EACjB,WAAW,EAAE,WAAW,EACxB,iBAAiB,EAAE,iBAAiB,EAAE,EACtC,oBAAoB,EAAE,iBAAiB,EAAE,EACzC,oBAAoB,EAAE,iBAAiB,EAAE,EACzC,uCAAuC,EAAE,8BAA8B,EACvE,oCAAoC,EAAE,8BAA8B,EACpE,iBAAiB,EAAE,cAAc,EACjC,UAAU,EAAE,GAAG,EACf,cAAc,EAAE,EAAE,EAClB,UAAU,EAAE,UAAU,GACrB,sBAAsB,CA2HxB;AAED,wBAAsB,yBAAyB,CAC7C,IAAI,EAAE,OAAO,EACb,YAAY,EAAE,YAAY,EAC1B,YAAY,EAAE,0BAA0B,EACxC,gBAAgB,EAAE,MAAM,EACxB,eAAe,EAAE,eAAe,EAChC,gBAAgB,EAAE,sBAAsB,EACxC,MAAM,EAAE,iCAAiC,EACzC,YAAY,EAAE,GAAG,EACjB,cAAc,EAAE,EAAE,GACjB,OAAO,CAAC,iBAAiB,CAAC,CA4B5B"}
+{"version":3,"file":"transitional_adapters.d.ts","sourceRoot":"","sources":["../../src/public/transitional_adapters.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,iBAAiB,EAAsB,KAAK,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAC/G,OAAO,EAEL,sBAAsB,EAItB,EAAE,EACF,GAAG,EACH,KAAK,WAAW,EAChB,KAAK,eAAe,EACpB,KAAK,MAAM,EAsBX,KAAK,8BAA8B,EACnC,iBAAiB,EAKjB,UAAU,EACV,KAAK,cAAc,EAKpB,MAAM,oBAAoB,CAAC;AAO5B,OAAO,EAAE,KAAK,0BAA0B,EAAE,MAAM,2BAA2B,CAAC;AAC5E,OAAO,EAAE,KAAK,iCAAiC,EAAE,MAAM,sCAAsC,CAAC;AAC9F,OAAO,EAAE,KAAK,iCAAiC,EAAiC,MAAM,gBAAgB,CAAC;AAEvG,wBAAgB,8BAA8B,CAC5C,KAAK,EAAE,iCAAiC,EACxC,eAAe,EAAE,eAAe,EAChC,mBAAmB,EAAE,cAAc,EACnC,YAAY,EAAE,GAAG,EACjB,WAAW,EAAE,WAAW,EACxB,iBAAiB,EAAE,iBAAiB,EAAE,EACtC,oBAAoB,EAAE,iBAAiB,EAAE,EACzC,oBAAoB,EAAE,iBAAiB,EAAE,EACzC,uCAAuC,EAAE,8BAA8B,EACvE,oCAAoC,EAAE,8BAA8B,EACpE,iBAAiB,EAAE,cAAc,EACjC,UAAU,EAAE,GAAG,EACf,cAAc,EAAE,EAAE,EAClB,UAAU,EAAE,UAAU,GACrB,sBAAsB,CA2HxB;AAED,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,OAAO,EACb,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,0BAA0B,EACxC,gBAAgB,EAAE,MAAM,EACxB,eAAe,EAAE,eAAe,EAChC,gBAAgB,EAAE,sBAAsB,EACxC,MAAM,EAAE,iCAAiC,EACzC,YAAY,EAAE,GAAG,EACjB,cAAc,EAAE,EAAE,GACjB,iBAAiB,CA8BnB"}