@aztec/simulator 0.82.0 → 0.82.1

package/src/public/index.ts

@@ -1,9 +1,8 @@
 export * from '../common/db_interfaces.js';
 export * from './public_tx_simulator/public_tx_simulator.js';
-export { type EnqueuedPublicCallExecutionResult, type PublicFunctionCallResult } from './execution.js';
 export * from './public_db_sources.js';
 export { PublicProcessor, PublicProcessorFactory } from './public_processor/public_processor.js';
 export { SideEffectTrace } from './side_effect_trace.js';
-export { getExecutionRequestsByPhase } from './utils.js';
 export { PublicTxSimulationTester } from './fixtures/index.js';
 export * from './avm/index.js';
+export { getCallRequestsWithCalldataByPhase } from './utils.js';

package/src/public/public_db_sources.ts

@@ -271,7 +271,7 @@ export class PublicContractsDB implements PublicContractsDBInterface {
   }
 
   public async getDebugFunctionName(address: AztecAddress, selector: FunctionSelector): Promise<string | undefined> {
-    return await this.dataSource.getContractFunctionName(address, selector);
+    return await this.dataSource.getDebugFunctionName(address, selector);
   }
 }
 

package/src/public/public_processor/public_processor.ts

@@ -321,7 +321,7 @@ export class PublicProcessor implements Traceable {
     this.log.verbose(
       !tx.hasPublicCalls()
         ? `Processed tx ${processedTx.hash} with no public calls in ${time}ms`
-        : `Processed tx ${processedTx.hash} with ${tx.enqueuedPublicFunctionCalls.length} public calls in ${time}ms`,
+        : `Processed tx ${processedTx.hash} with ${tx.numberOfPublicCalls()} public calls in ${time}ms`,
       {
         txHash: processedTx.hash,
         txFee: processedTx.txEffect.transactionFee.toBigInt(),

package/src/public/public_tx_simulator/public_tx_context.ts

@@ -26,7 +26,7 @@ import {
 import { MerkleTreeId } from '@aztec/stdlib/trees';
 import {
   type GlobalVariables,
-  type PublicExecutionRequest,
+  PublicCallRequestWithCalldata,
   type StateReference,
   TreeSnapshots,
   type Tx,
@@ -42,7 +42,7 @@ import { AvmPersistableStateManager } from '../avm/index.js';
 import { HintingPublicContractsDB } from '../hinting_db_sources.js';
 import type { PublicTreesDB } from '../public_db_sources.js';
 import { SideEffectArrayLengths, SideEffectTrace } from '../side_effect_trace.js';
-import { getCallRequestsByPhase, getExecutionRequestsByPhase } from '../utils.js';
+import { getCallRequestsWithCalldataByPhase } from '../utils.js';
 
 /**
  * The transaction-level context for public execution.
@@ -70,12 +70,9 @@ export class PublicTxContext {
     private readonly gasSettings: GasSettings,
     private readonly gasUsedByPrivate: Gas,
     private readonly gasAllocatedToPublic: Gas,
-    private readonly setupCallRequests: PublicCallRequest[],
-    private readonly appLogicCallRequests: PublicCallRequest[],
-    private readonly teardownCallRequests: PublicCallRequest[],
-    private readonly setupExecutionRequests: PublicExecutionRequest[],
-    private readonly appLogicExecutionRequests: PublicExecutionRequest[],
-    private readonly teardownExecutionRequests: PublicExecutionRequest[],
+    private readonly setupCallRequests: PublicCallRequestWithCalldata[],
+    private readonly appLogicCallRequests: PublicCallRequestWithCalldata[],
+    private readonly teardownCallRequests: PublicCallRequestWithCalldata[],
     public readonly nonRevertibleAccumulatedDataFromPrivate: PrivateToPublicAccumulatedData,
     public readonly revertibleAccumulatedDataFromPrivate: PrivateToPublicAccumulatedData,
     public readonly feePayer: AztecAddress,
@@ -135,12 +132,9 @@ export class PublicTxContext {
       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),
+      getCallRequestsWithCalldataByPhase(tx, TxExecutionPhase.SETUP),
+      getCallRequestsWithCalldataByPhase(tx, TxExecutionPhase.APP_LOGIC),
+      getCallRequestsWithCalldataByPhase(tx, TxExecutionPhase.TEARDOWN),
       tx.data.forPublic!.nonRevertibleAccumulatedData,
       tx.data.forPublic!.revertibleAccumulatedData,
       tx.data.feePayer,
@@ -218,7 +212,7 @@ export class PublicTxContext {
   /**
    * Get the call requests for the specified phase (including args hashes).
    */
-  getCallRequestsForPhase(phase: TxExecutionPhase): PublicCallRequest[] {
+  getCallRequestsForPhase(phase: TxExecutionPhase): PublicCallRequestWithCalldata[] {
     switch (phase) {
       case TxExecutionPhase.SETUP:
         return this.setupCallRequests;
@@ -229,20 +223,6 @@ export class PublicTxContext {
     }
   }
 
-  /**
-   * Get the call requests for the specified phase (including actual args).
-   */
-  getExecutionRequestsForPhase(phase: TxExecutionPhase): PublicExecutionRequest[] {
-    switch (phase) {
-      case TxExecutionPhase.SETUP:
-        return this.setupExecutionRequests;
-      case TxExecutionPhase.APP_LOGIC:
-        return this.appLogicExecutionRequests;
-      case TxExecutionPhase.TEARDOWN:
-        return this.teardownExecutionRequests;
-    }
-  }
-
   /**
    * How much gas is left as of the specified phase?
    */
@@ -353,10 +333,10 @@ export class PublicTxContext {
       /*startGasUsed=*/ this.gasUsedByPrivate,
       this.gasSettings,
       this.feePayer,
-      this.setupCallRequests,
-      this.appLogicCallRequests,
+      this.setupCallRequests.map(r => r.request),
+      this.appLogicCallRequests.map(r => r.request),
       /*teardownCallRequest=*/ this.teardownCallRequests.length
-        ? this.teardownCallRequests[0]
+        ? this.teardownCallRequests[0].request
         : PublicCallRequest.empty(),
       endTreeSnapshots,
       /*endGasUsed=*/ this.getTotalGasUsed(),

package/src/public/public_tx_simulator/public_tx_simulator.ts

@@ -13,13 +13,12 @@ import {
 } from '@aztec/stdlib/avm';
 import { SimulationError } from '@aztec/stdlib/errors';
 import type { Gas, GasUsed } from '@aztec/stdlib/gas';
-import type { PublicCallRequest } from '@aztec/stdlib/kernel';
 import { ProvingRequestType } from '@aztec/stdlib/proofs';
 import type { AvmSimulationStats } from '@aztec/stdlib/stats';
 import {
   type GlobalVariables,
   NestedProcessReturnValues,
-  PublicExecutionRequest,
+  PublicCallRequestWithCalldata,
   Tx,
   TxExecutionPhase,
 } from '@aztec/stdlib/tx';
@@ -83,7 +82,7 @@ export class PublicTxSimulator {
       const startTime = process.hrtime.bigint();
 
       const txHash = await tx.getTxHash();
-      this.log.debug(`Simulating ${tx.enqueuedPublicFunctionCalls.length} public calls for tx ${txHash}`, { txHash });
+      this.log.debug(`Simulating ${tx.publicFunctionCalldata.length} public calls for tx ${txHash}`, { txHash });
 
       const context = await PublicTxContext.create(
         this.treesDB,
@@ -232,13 +231,11 @@ export class PublicTxSimulator {
    */
   private async simulatePhase(phase: TxExecutionPhase, context: PublicTxContext): Promise<ProcessedPhase> {
     const callRequests = context.getCallRequestsForPhase(phase);
-    const executionRequests = context.getExecutionRequestsForPhase(phase);
 
     this.log.debug(`Processing phase ${TxExecutionPhase[phase]} for tx ${context.txHash}`, {
       txHash: context.txHash.toString(),
       phase: TxExecutionPhase[phase],
       callRequests: callRequests.length,
-      executionRequests: executionRequests.length,
     });
 
     const returnValues: NestedProcessReturnValues[] = [];
@@ -251,9 +248,8 @@ export class PublicTxSimulator {
       }
 
       const callRequest = callRequests[i];
-      const executionRequest = executionRequests[i];
 
-      const enqueuedCallResult = await this.simulateEnqueuedCall(phase, context, callRequest, executionRequest);
+      const enqueuedCallResult = await this.simulateEnqueuedCall(phase, context, callRequest);
 
       returnValues.push(new NestedProcessReturnValues(enqueuedCallResult.output));
 
@@ -276,44 +272,42 @@ export class PublicTxSimulator {
    * 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)
+   * @param callRequest - The public function call request, including the calldata.
    * @returns The result of execution.
    */
-  @trackSpan('PublicTxSimulator.simulateEnqueuedCall', (phase, context, _callRequest, executionRequest) => ({
+  @trackSpan('PublicTxSimulator.simulateEnqueuedCall', (phase, context, callRequest) => ({
     [Attributes.TX_HASH]: context.txHash.toString(),
-    [Attributes.TARGET_ADDRESS]: executionRequest.callContext.contractAddress.toString(),
-    [Attributes.SENDER_ADDRESS]: executionRequest.callContext.msgSender.toString(),
+    [Attributes.TARGET_ADDRESS]: callRequest.request.contractAddress.toString(),
+    [Attributes.SENDER_ADDRESS]: callRequest.request.msgSender.toString(),
     [Attributes.SIMULATOR_PHASE]: TxExecutionPhase[phase].toString(),
   }))
   private async simulateEnqueuedCall(
     phase: TxExecutionPhase,
     context: PublicTxContext,
-    callRequest: PublicCallRequest,
-    executionRequest: PublicExecutionRequest,
+    callRequest: PublicCallRequestWithCalldata,
   ): Promise<AvmFinalizedCallResult> {
     const stateManager = context.state.getActiveStateManager();
-    const address = executionRequest.callContext.contractAddress;
-    const fnName = await getPublicFunctionDebugName(this.contractsDB, address, executionRequest.args);
+    const contractAddress = callRequest.request.contractAddress;
+    const fnName = await getPublicFunctionDebugName(this.contractsDB, contractAddress, callRequest.calldata);
 
     const allocatedGas = context.getGasLeftAtPhase(phase);
 
     // The reason we need enqueued hints at all (and cannot just use the public inputs) is
     // because they don't have the actual calldata, just the hash of it.
     // If/when we pass the whole TX to C++, we can remove this class of hints.
-    stateManager.traceEnqueuedCall(callRequest);
+    stateManager.traceEnqueuedCall(callRequest.request);
     context.hints.enqueuedCalls.push(
       new AvmEnqueuedCallHint(
-        executionRequest.callContext.msgSender,
-        executionRequest.callContext.contractAddress,
-        executionRequest.args,
-        executionRequest.callContext.isStaticCall,
+        callRequest.request.msgSender,
+        contractAddress,
+        callRequest.calldata,
+        callRequest.request.isStaticCall,
       ),
     );
 
     const result = await this.simulateEnqueuedCallInternal(
       context.state.getActiveStateManager(),
-      executionRequest,
+      callRequest,
       allocatedGas,
       /*transactionFee=*/ context.getTransactionFee(phase),
       fnName,
@@ -326,7 +320,7 @@ export class PublicTxSimulator {
     );
 
     if (result.reverted) {
-      const culprit = `${executionRequest.callContext.contractAddress}:${executionRequest.callContext.functionSelector}`;
+      const culprit = `${contractAddress}:${callRequest.functionSelector}`;
       context.revert(phase, result.revertReason, culprit); // throws if in setup (non-revertible) phase
     }
 
@@ -342,26 +336,26 @@ export class PublicTxSimulator {
    *
    * @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 callRequest - The public function call request, including the calldata.
    * @param allocatedGas - The gas allocated to the enqueued call
    * @param fnName - The name of the function
    * @returns The result of execution.
    */
   @trackSpan(
     'PublicTxSimulator.simulateEnqueuedCallInternal',
-    (_stateManager, _executionRequest, _allocatedGas, _transactionFee, fnName) => ({
+    (_stateManager, _callRequest, _allocatedGas, _transactionFee, fnName) => ({
       [Attributes.APP_CIRCUIT_NAME]: fnName,
     }),
   )
   private async simulateEnqueuedCallInternal(
     stateManager: AvmPersistableStateManager,
-    executionRequest: PublicExecutionRequest,
+    { request, calldata }: PublicCallRequestWithCalldata,
     allocatedGas: Gas,
     transactionFee: Fr,
     fnName: string,
   ): Promise<AvmFinalizedCallResult> {
-    const address = executionRequest.callContext.contractAddress;
-    const sender = executionRequest.callContext.msgSender;
+    const address = request.contractAddress;
+    const sender = request.msgSender;
 
     this.log.debug(
       `Executing enqueued public call to external function ${fnName}@${address} with ${allocatedGas.l2Gas} allocated L2 gas.`,
@@ -374,8 +368,8 @@ export class PublicTxSimulator {
       sender,
       transactionFee,
       this.globalVariables,
-      executionRequest.callContext.isStaticCall,
-      executionRequest.args,
+      request.isStaticCall,
+      calldata,
       allocatedGas,
     );
     const avmCallResult = await simulator.execute();

package/src/public/utils.ts

@@ -1,29 +1,13 @@
-import type { PublicCallRequest } from '@aztec/stdlib/kernel';
-import { type PublicExecutionRequest, type Tx, TxExecutionPhase } from '@aztec/stdlib/tx';
+import { PublicCallRequestWithCalldata, type Tx, TxExecutionPhase } from '@aztec/stdlib/tx';
 
-export function getExecutionRequestsByPhase(tx: Tx, phase: TxExecutionPhase): PublicExecutionRequest[] {
+export function getCallRequestsWithCalldataByPhase(tx: Tx, phase: TxExecutionPhase): PublicCallRequestWithCalldata[] {
   switch (phase) {
     case TxExecutionPhase.SETUP:
-      return tx.getNonRevertiblePublicExecutionRequests();
+      return tx.getNonRevertiblePublicCallRequestsWithCalldata();
     case TxExecutionPhase.APP_LOGIC:
-      return tx.getRevertiblePublicExecutionRequests();
+      return tx.getRevertiblePublicCallRequestsWithCalldata();
     case TxExecutionPhase.TEARDOWN: {
-      const request = tx.getPublicTeardownExecutionRequest();
-      return request ? [request] : [];
-    }
-    default:
-      throw new Error(`Unknown phase: ${phase}`);
-  }
-}
-
-export function getCallRequestsByPhase(tx: Tx, phase: TxExecutionPhase): PublicCallRequest[] {
-  switch (phase) {
-    case TxExecutionPhase.SETUP:
-      return tx.data.getNonRevertiblePublicCallRequests();
-    case TxExecutionPhase.APP_LOGIC:
-      return tx.data.getRevertiblePublicCallRequests();
-    case TxExecutionPhase.TEARDOWN: {
-      const request = tx.data.getTeardownPublicCallRequest();
+      const request = tx.getTeardownPublicCallRequestWithCalldata();
       return request ? [request] : [];
     }
     default:

package/dest/public/execution.d.ts

@@ -1,108 +0,0 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-import type { Fr } from '@aztec/foundation/fields';
-import { type AvmExecutionHints, type ContractStorageRead, type ContractStorageUpdateRequest, type PublicDataUpdateRequest, PublicInnerCallRequest } from '@aztec/stdlib/avm';
-import type { SimulationError } from '@aztec/stdlib/errors';
-import { Gas } from '@aztec/stdlib/gas';
-import type { NoteHash, Nullifier, ReadRequest, TreeLeafReadRequest } from '@aztec/stdlib/kernel';
-import type { PublicLog } from '@aztec/stdlib/logs';
-import type { L2ToL1Message, ScopedL2ToL1Message } from '@aztec/stdlib/messaging';
-import type { PublicExecutionRequest } from '@aztec/stdlib/tx';
-export interface PublicSideEffects {
-    /** The contract storage update requests performed. */
-    publicDataWrites: PublicDataUpdateRequest[];
-    /** The new note hashes to be inserted into the note hashes tree. */
-    noteHashes: NoteHash[];
-    /** The new nullifiers to be inserted into the nullifier tree. */
-    nullifiers: Nullifier[];
-    /** The new l2 to l1 messages generated to be inserted into the messages tree. */
-    l2ToL1Messages: ScopedL2ToL1Message[];
-    /** Public logs emitted during execution. */
-    publicLogs: PublicLog[];
-}
-export interface EnqueuedPublicCallExecutionResult {
-    /** How much gas was left after this public execution. */
-    endGasLeft: Gas;
-    /** The side effect counter after execution */
-    endSideEffectCounter: Fr;
-    /** The return values of the function. */
-    returnValues: Fr[];
-    /** Whether the execution reverted. */
-    reverted: boolean;
-    /** The revert reason if the execution reverted. */
-    revertReason?: SimulationError;
-}
-export interface EnqueuedPublicCallExecutionResultWithSideEffects {
-    /** How much gas was left after this public execution. */
-    endGasLeft: Gas;
-    /** The side effect counter after execution */
-    endSideEffectCounter: Fr;
-    /** The return values of the function. */
-    returnValues: Fr[];
-    /** Whether the execution reverted. */
-    reverted: boolean;
-    /** The revert reason if the execution reverted. */
-    revertReason?: SimulationError;
-    /** The public side effects of the function. */
-    sideEffects: PublicSideEffects;
-}
-/**
- * The public function execution result.
- */
-export interface PublicFunctionCallResult {
-    /** The execution request that triggered this result. */
-    executionRequest: PublicExecutionRequest;
-    /** The side effect counter at the start of the function call. */
-    startSideEffectCounter: Fr;
-    /** The side effect counter after executing this function call */
-    endSideEffectCounter: Fr;
-    /** How much gas was available for this public execution. */
-    startGasLeft: Gas;
-    /** How much gas was left after this public execution. */
-    endGasLeft: Gas;
-    /** Transaction fee set for this tx. */
-    transactionFee: Fr;
-    /** Bytecode used for this execution. */
-    bytecode?: Buffer;
-    /** Calldata used for this execution. */
-    calldata: Fr[];
-    /** The return values of the function. */
-    returnValues: Fr[];
-    /** Whether the execution reverted. */
-    reverted: boolean;
-    /** The revert reason if the execution reverted. */
-    revertReason?: SimulationError;
-    /** The contract storage reads performed by the function. */
-    contractStorageReads: ContractStorageRead[];
-    /** The contract storage update requests performed by the function. */
-    contractStorageUpdateRequests: ContractStorageUpdateRequest[];
-    /** The new note hashes to be inserted into the note hashes tree. */
-    noteHashes: NoteHash[];
-    /** The new l2 to l1 messages generated in this call. */
-    l2ToL1Messages: L2ToL1Message[];
-    /** The new nullifiers to be inserted into the nullifier tree. */
-    nullifiers: Nullifier[];
-    /** The note hash read requests emitted in this call. */
-    noteHashReadRequests: TreeLeafReadRequest[];
-    /** The nullifier read requests emitted in this call. */
-    nullifierReadRequests: ReadRequest[];
-    /** The nullifier non existent read requests emitted in this call. */
-    nullifierNonExistentReadRequests: ReadRequest[];
-    /** L1 to L2 message read requests emitted in this call. */
-    l1ToL2MsgReadRequests: TreeLeafReadRequest[];
-    /**
-     * The public logs emitted in this call.
-     * Note: PublicLog has no counter - unsure if this is needed bc this struct is unused
-     */
-    publicLogs: PublicLog[];
-    /** The requests to call public functions made by this call. */
-    publicCallRequests: PublicInnerCallRequest[];
-    /** The results of nested calls. */
-    nestedExecutions: this[];
-    /** Hints for proving AVM execution. */
-    avmCircuitHints: AvmExecutionHints;
-    /** The name of the function that was executed. Only used for logging. */
-    functionName: string;
-}
-export declare function resultToPublicCallRequest(result: PublicFunctionCallResult): Promise<PublicInnerCallRequest>;
-//# sourceMappingURL=execution.d.ts.map

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

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

package/dest/public/execution.js

@@ -1,9 +0,0 @@
-import { PublicCallStackItemCompressed, PublicInnerCallRequest, RevertCode } from '@aztec/stdlib/avm';
-import { Gas } from '@aztec/stdlib/gas';
-import { computeVarArgsHash } from '@aztec/stdlib/hash';
-export async function resultToPublicCallRequest(result) {
-    const request = result.executionRequest;
-    const item = new PublicCallStackItemCompressed(request.callContext.contractAddress, request.callContext, await computeVarArgsHash(request.args), await computeVarArgsHash(result.returnValues), // TODO(@just-mitch): need better mapping from simulator to revert code.
-    result.reverted ? RevertCode.APP_LOGIC_REVERTED : RevertCode.OK, Gas.from(result.startGasLeft), Gas.from(result.endGasLeft));
-    return new PublicInnerCallRequest(item, result.startSideEffectCounter.toNumber());
-}

package/src/public/execution.ts

@@ -1,140 +0,0 @@
-import type { Fr } from '@aztec/foundation/fields';
-import {
-  type AvmExecutionHints,
-  type ContractStorageRead,
-  type ContractStorageUpdateRequest,
-  PublicCallStackItemCompressed,
-  type PublicDataUpdateRequest,
-  PublicInnerCallRequest,
-  RevertCode,
-} from '@aztec/stdlib/avm';
-import type { SimulationError } from '@aztec/stdlib/errors';
-import { Gas } from '@aztec/stdlib/gas';
-import { computeVarArgsHash } from '@aztec/stdlib/hash';
-import type { NoteHash, Nullifier, ReadRequest, TreeLeafReadRequest } from '@aztec/stdlib/kernel';
-import type { PublicLog } from '@aztec/stdlib/logs';
-import type { L2ToL1Message, ScopedL2ToL1Message } from '@aztec/stdlib/messaging';
-import type { PublicExecutionRequest } from '@aztec/stdlib/tx';
-
-export interface PublicSideEffects {
-  /** The contract storage update requests performed. */
-  publicDataWrites: PublicDataUpdateRequest[];
-  /** The new note hashes to be inserted into the note hashes tree. */
-  noteHashes: NoteHash[];
-  /** The new nullifiers to be inserted into the nullifier tree. */
-  nullifiers: Nullifier[];
-  /** The new l2 to l1 messages generated to be inserted into the messages tree. */
-  l2ToL1Messages: ScopedL2ToL1Message[];
-  /** Public logs emitted during execution. */
-  publicLogs: PublicLog[];
-}
-
-export interface EnqueuedPublicCallExecutionResult {
-  /** How much gas was left after this public execution. */
-  endGasLeft: Gas;
-  /** The side effect counter after execution */
-  endSideEffectCounter: Fr;
-
-  /** The return values of the function. */
-  returnValues: Fr[];
-  /** Whether the execution reverted. */
-  reverted: boolean;
-  /** The revert reason if the execution reverted. */
-  revertReason?: SimulationError;
-}
-
-export interface EnqueuedPublicCallExecutionResultWithSideEffects {
-  /** How much gas was left after this public execution. */
-  endGasLeft: Gas;
-  /** The side effect counter after execution */
-  endSideEffectCounter: Fr;
-
-  /** The return values of the function. */
-  returnValues: Fr[];
-  /** Whether the execution reverted. */
-  reverted: boolean;
-  /** The revert reason if the execution reverted. */
-  revertReason?: SimulationError;
-
-  /** The public side effects of the function. */
-  sideEffects: PublicSideEffects;
-}
-
-/**
- * The public function execution result.
- */
-export interface PublicFunctionCallResult {
-  /** The execution request that triggered this result. */
-  executionRequest: PublicExecutionRequest;
-
-  /** The side effect counter at the start of the function call. */
-  startSideEffectCounter: Fr;
-  /** The side effect counter after executing this function call */
-  endSideEffectCounter: Fr;
-  /** How much gas was available for this public execution. */
-  startGasLeft: Gas;
-  /** How much gas was left after this public execution. */
-  endGasLeft: Gas;
-  /** Transaction fee set for this tx. */
-  transactionFee: Fr;
-
-  /** Bytecode used for this execution. */
-  bytecode?: Buffer;
-  /** Calldata used for this execution. */
-  calldata: Fr[];
-  /** The return values of the function. */
-  returnValues: Fr[];
-  /** Whether the execution reverted. */
-  reverted: boolean;
-  /** The revert reason if the execution reverted. */
-  revertReason?: SimulationError;
-
-  /** The contract storage reads performed by the function. */
-  contractStorageReads: ContractStorageRead[];
-  /** The contract storage update requests performed by the function. */
-  contractStorageUpdateRequests: ContractStorageUpdateRequest[];
-  /** The new note hashes to be inserted into the note hashes tree. */
-  noteHashes: NoteHash[];
-  /** The new l2 to l1 messages generated in this call. */
-  l2ToL1Messages: L2ToL1Message[];
-  /** The new nullifiers to be inserted into the nullifier tree. */
-  nullifiers: Nullifier[];
-  /** The note hash read requests emitted in this call. */
-  noteHashReadRequests: TreeLeafReadRequest[];
-  /** The nullifier read requests emitted in this call. */
-  nullifierReadRequests: ReadRequest[];
-  /** The nullifier non existent read requests emitted in this call. */
-  nullifierNonExistentReadRequests: ReadRequest[];
-  /** L1 to L2 message read requests emitted in this call. */
-  l1ToL2MsgReadRequests: TreeLeafReadRequest[];
-  /**
-   * The public logs emitted in this call.
-   * Note: PublicLog has no counter - unsure if this is needed bc this struct is unused
-   */
-  publicLogs: PublicLog[];
-  /** The requests to call public functions made by this call. */
-  publicCallRequests: PublicInnerCallRequest[];
-  /** The results of nested calls. */
-  nestedExecutions: this[];
-
-  /** Hints for proving AVM execution. */
-  avmCircuitHints: AvmExecutionHints;
-
-  /** The name of the function that was executed. Only used for logging. */
-  functionName: string;
-}
-
-export async function resultToPublicCallRequest(result: PublicFunctionCallResult) {
-  const request = result.executionRequest;
-  const item = new PublicCallStackItemCompressed(
-    request.callContext.contractAddress,
-    request.callContext,
-    await computeVarArgsHash(request.args),
-    await computeVarArgsHash(result.returnValues),
-    // TODO(@just-mitch): need better mapping from simulator to revert code.
-    result.reverted ? RevertCode.APP_LOGIC_REVERTED : RevertCode.OK,
-    Gas.from(result.startGasLeft),
-    Gas.from(result.endGasLeft),
-  );
-  return new PublicInnerCallRequest(item, result.startSideEffectCounter.toNumber());
-}