@aztec/simulator 0.65.2 → 0.67.0

package/src/public/public_tx_simulator.ts

@@ -10,16 +10,10 @@ import {
   UnencryptedFunctionL2Logs,
 } from '@aztec/circuit-types';
 import { type AvmSimulationStats } from '@aztec/circuit-types/stats';
-import {
-  type Fr,
-  Gas,
-  type GlobalVariables,
-  MAX_L2_GAS_PER_ENQUEUED_CALL,
-  type PublicCallRequest,
-  type RevertCode,
-} from '@aztec/circuits.js';
-import { type DebugLogger, createDebugLogger } from '@aztec/foundation/log';
+import { type Fr, type Gas, type GlobalVariables, type PublicCallRequest, type RevertCode } from '@aztec/circuits.js';
+import { type Logger, createLogger } from '@aztec/foundation/log';
 import { Timer } from '@aztec/foundation/timer';
+import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 import { Attributes, type TelemetryClient, type Tracer, trackSpan } from '@aztec/telemetry-client';
 
 import { strict as assert } from 'assert';
@@ -29,6 +23,7 @@ import { type AvmPersistableStateManager, AvmSimulator } from '../avm/index.js';
 import { NullifierCollisionError } from '../avm/journal/nullifiers.js';
 import { getPublicFunctionDebugName } from '../common/debug_fn_name.js';
 import { ExecutorMetrics } from './executor_metrics.js';
+import { computeFeePayerBalanceStorageSlot } from './fee_payment.js';
 import { type WorldStateDB } from './public_db_sources.js';
 import { PublicTxContext } from './public_tx_context.js';
 
@@ -53,17 +48,16 @@ export type PublicTxResult = {
 export class PublicTxSimulator {
   metrics: ExecutorMetrics;
 
-  private log: DebugLogger;
+  private log: Logger;
 
   constructor(
     private db: MerkleTreeReadOperations,
     private worldStateDB: WorldStateDB,
     telemetryClient: TelemetryClient,
     private globalVariables: GlobalVariables,
-    private realAvmProvingRequests: boolean = true,
     private doMerkleOperations: boolean = false,
   ) {
-    this.log = createDebugLogger(`aztec:public_tx_simulator`);
+    this.log = createLogger(`simulator:public_tx_simulator`);
     this.metrics = new ExecutorMetrics(telemetryClient, 'PublicTxSimulator');
   }
 
@@ -75,8 +69,9 @@ export class PublicTxSimulator {
    * @param tx - The transaction to simulate.
    * @returns The result of the transaction's public execution.
    */
-  async simulate(tx: Tx): Promise<PublicTxResult> {
-    this.log.verbose(`Processing tx ${tx.getTxHash()}`);
+  public async simulate(tx: Tx): Promise<PublicTxResult> {
+    const txHash = tx.getTxHash();
+    this.log.debug(`Simulating ${tx.enqueuedPublicFunctionCalls.length} public calls for tx ${txHash}`, { txHash });
 
     const context = await PublicTxContext.create(
       this.db,
@@ -107,11 +102,14 @@ export class PublicTxSimulator {
       const appLogicResult: ProcessedPhase = await this.simulateAppLogicPhase(context);
       processedPhases.push(appLogicResult);
     }
+
     if (context.hasPhase(TxExecutionPhase.TEARDOWN)) {
       const teardownResult: ProcessedPhase = await this.simulateTeardownPhase(context);
       processedPhases.push(teardownResult);
     }
+
     context.halt();
+    await this.payFee(context);
 
     const endStateReference = await this.db.getStateReference();
 
@@ -210,7 +208,12 @@ export class PublicTxSimulator {
     const callRequests = context.getCallRequestsForPhase(phase);
     const executionRequests = context.getExecutionRequestsForPhase(phase);
 
-    this.log.debug(`Beginning processing in phase ${TxExecutionPhase[phase]} for tx ${context.getTxHash()}`);
+    this.log.debug(`Processing phase ${TxExecutionPhase[phase]} for tx ${context.getTxHash()}`, {
+      txHash: context.getTxHash().toString(),
+      phase: TxExecutionPhase[phase],
+      callRequests: callRequests.length,
+      executionRequests: executionRequests.length,
+    });
 
     const returnValues: NestedProcessReturnValues[] = [];
     let reverted = false;
@@ -265,40 +268,22 @@ export class PublicTxSimulator {
   ): Promise<AvmFinalizedCallResult> {
     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 fnName = await getPublicFunctionDebugName(this.worldStateDB, address, executionRequest.args);
+
+    const allocatedGas = context.getGasLeftAtPhase(phase);
 
     const result = await this.simulateEnqueuedCallInternal(
       context.state.getActiveStateManager(),
       executionRequest,
       allocatedGas,
-      context.getTransactionFee(phase),
+      /*transactionFee=*/ context.getTransactionFee(phase),
       fnName,
     );
 
-    const gasUsed = allocatedGas.sub(result.gasLeft);
+    const gasUsed = allocatedGas.sub(result.gasLeft); // by enqueued call
     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,
+    this.log.debug(
+      `Simulated enqueued public call consumed ${gasUsed.l2Gas} L2 gas ending with ${result.gasLeft.l2Gas} L2 gas left.`,
     );
 
     stateManager.traceEnqueuedCall(callRequest, executionRequest.args, result.reverted);
@@ -340,18 +325,16 @@ export class PublicTxSimulator {
   ): Promise<AvmFinalizedCallResult> {
     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.`,
+    this.log.debug(
+      `Executing enqueued public call to external function ${fnName}@${address} with ${allocatedGas.l2Gas} allocated L2 gas.`,
     );
     const timer = new Timer();
 
-    const simulator = AvmSimulator.create(
+    const simulator = await AvmSimulator.create(
       stateManager,
       address,
       sender,
-      selector,
       transactionFee,
       this.globalVariables,
       executionRequest.callContext.isStaticCall,
@@ -361,10 +344,10 @@ export class PublicTxSimulator {
     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 : ''
-      }.`,
+    this.log.debug(
+      result.reverted
+        ? `Simulation of enqueued public call ${fnName} reverted with reason ${result.revertReason}.`
+        : `Simulation of enqueued public call ${fnName} completed successfully.`,
       {
         eventName: 'avm-simulation',
         appCircuitName: fnName,
@@ -415,4 +398,30 @@ export class PublicTxSimulator {
       }
     }
   }
+
+  private async payFee(context: PublicTxContext) {
+    const txFee = context.getTransactionFee(TxExecutionPhase.TEARDOWN);
+
+    if (context.feePayer.isZero()) {
+      this.log.debug(`No one is paying the fee of ${txFee.toBigInt()}`);
+      return;
+    }
+
+    const feeJuiceAddress = ProtocolContractAddress.FeeJuice;
+    const balanceSlot = computeFeePayerBalanceStorageSlot(context.feePayer);
+
+    this.log.debug(`Deducting ${txFee.toBigInt()} balance in Fee Juice for ${context.feePayer}`);
+    const stateManager = context.state.getActiveStateManager();
+
+    const currentBalance = await stateManager.readStorage(feeJuiceAddress, balanceSlot);
+
+    if (currentBalance.lt(txFee)) {
+      throw new Error(
+        `Not enough balance for fee payer to pay for transaction (got ${currentBalance.toBigInt()} needs ${txFee.toBigInt()})`,
+      );
+    }
+
+    const updatedBalance = currentBalance.sub(txFee);
+    await stateManager.writeStorage(feeJuiceAddress, balanceSlot, updatedBalance, true);
+  }
 }

package/src/public/side_effect_trace_interface.ts

@@ -10,7 +10,7 @@ import {
 import { type AztecAddress } from '@aztec/foundation/aztec-address';
 import { type Fr } from '@aztec/foundation/fields';
 
-import { type AvmContractCallResult, type AvmFinalizedCallResult } from '../avm/avm_contract_call_result.js';
+import { 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';
 
@@ -31,6 +31,7 @@ export interface PublicSideEffectTraceInterface {
     contractAddress: AztecAddress,
     slot: Fr, // This is the storage slot not the computed leaf slot
     value: Fr,
+    protocolWrite: boolean,
     lowLeafPreimage?: PublicDataTreeLeafPreimage,
     lowLeafIndex?: Fr,
     lowLeafPath?: Fr[],
@@ -66,6 +67,9 @@ export interface PublicSideEffectTraceInterface {
     contractAddress: AztecAddress,
     exists: boolean,
     instance?: SerializableContractInstance,
+    lowLeafPreimage?: NullifierLeafPreimage,
+    lowLeafIndex?: Fr,
+    lowLeafPath?: Fr[],
   ): void;
   traceGetBytecode(
     contractAddress: AztecAddress,
@@ -73,20 +77,9 @@ export interface PublicSideEffectTraceInterface {
     bytecode?: Buffer,
     contractInstance?: SerializableContractInstance,
     contractClass?: ContractClassIdPreimage,
-  ): void;
-  traceNestedCall(
-    /** The trace of the nested call. */
-    nestedCallTrace: PublicSideEffectTraceInterface,
-    /** The execution environment of the nested call. */
-    nestedEnvironment: AvmExecutionEnvironment,
-    /** How much gas was available for this public execution. */
-    startGasLeft: Gas,
-    /** Bytecode used for this execution. */
-    bytecode: Buffer,
-    /** The call's results */
-    avmCallResults: AvmContractCallResult,
-    /** Function name */
-    functionName: string,
+    lowLeafPreimage?: NullifierLeafPreimage,
+    lowLeafIndex?: Fr,
+    lowLeafPath?: Fr[],
   ): void;
   traceEnqueuedCall(
     /** The call request from private that enqueued this call. */

package/src/public/transitional_adapters.ts

@@ -1,57 +1,29 @@
-import { type AvmProvingRequest, ProvingRequestType, type PublicExecutionRequest } from '@aztec/circuit-types';
 import {
-  AvmCircuitInputs,
-  AvmCircuitPublicInputs,
-  AztecAddress,
-  ContractStorageRead,
-  ContractStorageUpdateRequest,
+  type AvmCircuitPublicInputs,
+  type AztecAddress,
   Fr,
-  Gas,
+  type Gas,
   type GasSettings,
   type GlobalVariables,
-  type Header,
-  L2ToL1Message,
-  LogHash,
-  MAX_ENQUEUED_CALLS_PER_CALL,
-  MAX_L1_TO_L2_MSG_READ_REQUESTS_PER_CALL,
-  MAX_L2_TO_L1_MSGS_PER_CALL,
   MAX_L2_TO_L1_MSGS_PER_TX,
-  MAX_NOTE_HASHES_PER_CALL,
   MAX_NOTE_HASHES_PER_TX,
-  MAX_NOTE_HASH_READ_REQUESTS_PER_CALL,
-  MAX_NULLIFIERS_PER_CALL,
-  MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL,
-  MAX_NULLIFIER_READ_REQUESTS_PER_CALL,
-  MAX_PUBLIC_DATA_READS_PER_CALL,
-  MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL,
-  MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
-  MAX_UNENCRYPTED_LOGS_PER_CALL,
-  NoteHash,
-  Nullifier,
+  MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
   PrivateToAvmAccumulatedData,
   PrivateToAvmAccumulatedDataArrayLengths,
   type PrivateToPublicAccumulatedData,
   PublicCallRequest,
-  PublicCircuitPublicInputs,
   PublicDataWrite,
-  PublicInnerCallRequest,
-  ReadRequest,
-  RevertCode,
+  type RevertCode,
   type StateReference,
-  TreeLeafReadRequest,
   TreeSnapshots,
   countAccumulatedItems,
   mergeAccumulatedData,
 } from '@aztec/circuits.js';
-import { computeNoteHashNonce, computeUniqueNoteHash, computeVarArgsHash, siloNoteHash } from '@aztec/circuits.js/hash';
+import { computeNoteHashNonce, computeUniqueNoteHash, siloNoteHash } from '@aztec/circuits.js/hash';
 import { padArrayEnd } from '@aztec/foundation/collection';
 import { assertLength } from '@aztec/foundation/serialize';
 
-import { AvmFinalizedCallResult } from '../avm/avm_contract_call_result.js';
-import { AvmExecutionEnvironment } from '../avm/avm_execution_environment.js';
-import { type AvmPersistableStateManager } from '../avm/journal/journal.js';
 import { type PublicEnqueuedCallSideEffectTrace } from './enqueued_call_side_effect_trace.js';
-import { type EnqueuedPublicCallExecutionResult, type PublicFunctionCallResult } from './execution.js';
 
 export function generateAvmCircuitPublicInputs(
   trace: PublicEnqueuedCallSideEffectTrace,
@@ -59,12 +31,13 @@ export function generateAvmCircuitPublicInputs(
   startStateReference: StateReference,
   startGasUsed: Gas,
   gasSettings: GasSettings,
+  feePayer: AztecAddress,
   setupCallRequests: PublicCallRequest[],
   appLogicCallRequests: PublicCallRequest[],
   teardownCallRequests: PublicCallRequest[],
   nonRevertibleAccumulatedDataFromPrivate: PrivateToPublicAccumulatedData,
   revertibleAccumulatedDataFromPrivate: PrivateToPublicAccumulatedData,
-  endStateReference: StateReference,
+  endTreeSnapshots: TreeSnapshots,
   endGasUsed: Gas,
   transactionFee: Fr,
   revertCode: RevertCode,
@@ -75,18 +48,13 @@ export function generateAvmCircuitPublicInputs(
     startStateReference.partial.nullifierTree,
     startStateReference.partial.publicDataTree,
   );
-  const endTreeSnapshots = new TreeSnapshots(
-    endStateReference.l1ToL2MessageTree,
-    endStateReference.partial.noteHashTree,
-    endStateReference.partial.nullifierTree,
-    endStateReference.partial.publicDataTree,
-  );
 
   const avmCircuitPublicInputs = trace.toAvmCircuitPublicInputs(
     globalVariables,
     startTreeSnapshots,
     startGasUsed,
     gasSettings,
+    feePayer,
     setupCallRequests,
     appLogicCallRequests,
     teardownCallRequests.length ? teardownCallRequests[0] : PublicCallRequest.empty(),
@@ -118,6 +86,28 @@ export function generateAvmCircuitPublicInputs(
     revertibleAccumulatedDataFromPrivate,
   );
 
+  const txHash = avmCircuitPublicInputs.previousNonRevertibleAccumulatedData.nullifiers[0];
+
+  // Add nonces to revertible note hashes from private. These don't have nonces since we don't know
+  // the final position in the tx until the AVM has executed.
+  // TODO: Use the final position in the tx
+  for (
+    let revertibleIndex = 0;
+    revertibleIndex < avmCircuitPublicInputs.previousRevertibleAccumulatedData.noteHashes.length;
+    revertibleIndex++
+  ) {
+    const noteHash = avmCircuitPublicInputs.previousRevertibleAccumulatedData.noteHashes[revertibleIndex];
+    if (noteHash.isZero()) {
+      continue;
+    }
+    const indexInTx =
+      revertibleIndex + avmCircuitPublicInputs.previousNonRevertibleAccumulatedDataArrayLengths.noteHashes;
+
+    const nonce = computeNoteHashNonce(txHash, indexInTx);
+    const uniqueNoteHash = computeUniqueNoteHash(nonce, noteHash);
+    avmCircuitPublicInputs.previousRevertibleAccumulatedData.noteHashes[revertibleIndex] = uniqueNoteHash;
+  }
+
   // merge all revertible & non-revertible side effects into output accumulated data
   const noteHashesFromPrivate = revertCode.isOK()
     ? mergeAccumulatedData(
@@ -130,8 +120,7 @@ export function generateAvmCircuitPublicInputs(
     MAX_NOTE_HASHES_PER_TX,
   );
 
-  const txHash = avmCircuitPublicInputs.previousNonRevertibleAccumulatedData.nullifiers[0];
-
+  // Silo and add nonces for note hashes emitted by the AVM
   const scopedNoteHashesFromPublic = trace.getSideEffects().noteHashes;
   for (let i = 0; i < scopedNoteHashesFromPublic.length; i++) {
     const scopedNoteHash = scopedNoteHashesFromPublic[i];
@@ -139,9 +128,10 @@ export function generateAvmCircuitPublicInputs(
     if (!noteHash.isZero()) {
       const noteHashIndexInTx = i + countAccumulatedItems(noteHashesFromPrivate);
       const nonce = computeNoteHashNonce(txHash, noteHashIndexInTx);
-      const uniqueNoteHash = computeUniqueNoteHash(nonce, noteHash);
-      const siloedNoteHash = siloNoteHash(scopedNoteHash.contractAddress, uniqueNoteHash);
-      avmCircuitPublicInputs.accumulatedData.noteHashes[noteHashIndexInTx] = siloedNoteHash;
+      const siloedNoteHash = siloNoteHash(scopedNoteHash.contractAddress, noteHash);
+      const uniqueNoteHash = computeUniqueNoteHash(nonce, siloedNoteHash);
+
+      avmCircuitPublicInputs.accumulatedData.noteHashes[noteHashIndexInTx] = uniqueNoteHash;
     }
   }
 
@@ -156,181 +146,19 @@ export function generateAvmCircuitPublicInputs(
     MAX_L2_TO_L1_MSGS_PER_TX,
   );
 
-  const dedupedPublicDataWrites: Array<PublicDataWrite> = [];
-  const leafSlotOccurences: Map<bigint, number> = new Map();
-  for (const publicDataWrite of avmCircuitPublicInputs.accumulatedData.publicDataWrites) {
-    const slot = publicDataWrite.leafSlot.toBigInt();
-    const prevOccurrences = leafSlotOccurences.get(slot) || 0;
-    leafSlotOccurences.set(slot, prevOccurrences + 1);
-  }
-
+  // Maps slot to value. Maps in TS are iterable in insertion order, which is exactly what we want for
+  // squashing "to the left", where the first occurrence of a slot uses the value of the last write to it,
+  // and the rest occurrences are omitted
+  const squashedPublicDataWrites: Map<bigint, Fr> = new Map();
   for (const publicDataWrite of avmCircuitPublicInputs.accumulatedData.publicDataWrites) {
-    const slot = publicDataWrite.leafSlot.toBigInt();
-    const prevOccurrences = leafSlotOccurences.get(slot) || 0;
-    if (prevOccurrences === 1) {
-      dedupedPublicDataWrites.push(publicDataWrite);
-    } else {
-      leafSlotOccurences.set(slot, prevOccurrences - 1);
-    }
+    squashedPublicDataWrites.set(publicDataWrite.leafSlot.toBigInt(), publicDataWrite.value);
   }
 
   avmCircuitPublicInputs.accumulatedData.publicDataWrites = padArrayEnd(
-    dedupedPublicDataWrites,
+    Array.from(squashedPublicDataWrites.entries()).map(([slot, value]) => new PublicDataWrite(new Fr(slot), value)),
     PublicDataWrite.empty(),
-    MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
+    MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
   );
   //console.log(`AvmCircuitPublicInputs:\n${inspect(avmCircuitPublicInputs)}`);
   return avmCircuitPublicInputs;
 }
-
-export function generateAvmProvingRequest(
-  real: boolean,
-  fnName: string,
-  stateManager: AvmPersistableStateManager,
-  historicalHeader: Header,
-  globalVariables: GlobalVariables,
-  executionRequest: PublicExecutionRequest,
-  result: EnqueuedPublicCallExecutionResult,
-  allocatedGas: Gas,
-  transactionFee: Fr,
-): AvmProvingRequest {
-  const avmExecutionEnv = new AvmExecutionEnvironment(
-    executionRequest.callContext.contractAddress,
-    executionRequest.callContext.msgSender,
-    executionRequest.callContext.functionSelector,
-    /*contractCallDepth=*/ Fr.zero(),
-    transactionFee,
-    globalVariables,
-    executionRequest.callContext.isStaticCall,
-    executionRequest.args,
-  );
-
-  const avmCallResult = new AvmFinalizedCallResult(result.reverted, result.returnValues, result.endGasLeft);
-
-  // Generate an AVM proving request
-  let avmProvingRequest: AvmProvingRequest;
-  if (real) {
-    const deprecatedFunctionCallResult = stateManager.trace.toPublicFunctionCallResult(
-      avmExecutionEnv,
-      /*startGasLeft=*/ allocatedGas,
-      Buffer.alloc(0),
-      avmCallResult,
-      fnName,
-    );
-    const publicInputs = getPublicCircuitPublicInputs(historicalHeader, globalVariables, deprecatedFunctionCallResult);
-    avmProvingRequest = makeAvmProvingRequest(publicInputs, deprecatedFunctionCallResult);
-  } else {
-    avmProvingRequest = emptyAvmProvingRequest();
-  }
-  return avmProvingRequest;
-}
-
-function emptyAvmProvingRequest(): AvmProvingRequest {
-  return {
-    type: ProvingRequestType.PUBLIC_VM,
-    inputs: AvmCircuitInputs.empty(),
-  };
-}
-function makeAvmProvingRequest(inputs: PublicCircuitPublicInputs, result: PublicFunctionCallResult): AvmProvingRequest {
-  return {
-    type: ProvingRequestType.PUBLIC_VM,
-    inputs: new AvmCircuitInputs(
-      result.functionName,
-      result.calldata,
-      inputs,
-      result.avmCircuitHints,
-      AvmCircuitPublicInputs.empty(),
-    ),
-  };
-}
-
-function getPublicCircuitPublicInputs(
-  historicalHeader: Header,
-  globalVariables: GlobalVariables,
-  result: PublicFunctionCallResult,
-) {
-  const header = historicalHeader.clone(); // don't modify the original
-  header.state.partial.publicDataTree.root = Fr.zero(); // AVM doesn't check this yet
-
-  return PublicCircuitPublicInputs.from({
-    callContext: result.executionRequest.callContext,
-    proverAddress: AztecAddress.ZERO,
-    argsHash: computeVarArgsHash(result.executionRequest.args),
-    noteHashes: padArrayEnd(
-      result.noteHashes,
-      NoteHash.empty(),
-      MAX_NOTE_HASHES_PER_CALL,
-      `Too many note hashes. Got ${result.noteHashes.length} with max being ${MAX_NOTE_HASHES_PER_CALL}`,
-    ),
-    nullifiers: padArrayEnd(
-      result.nullifiers,
-      Nullifier.empty(),
-      MAX_NULLIFIERS_PER_CALL,
-      `Too many nullifiers. Got ${result.nullifiers.length} with max being ${MAX_NULLIFIERS_PER_CALL}`,
-    ),
-    l2ToL1Msgs: padArrayEnd(
-      result.l2ToL1Messages,
-      L2ToL1Message.empty(),
-      MAX_L2_TO_L1_MSGS_PER_CALL,
-      `Too many L2 to L1 messages. Got ${result.l2ToL1Messages.length} with max being ${MAX_L2_TO_L1_MSGS_PER_CALL}`,
-    ),
-    startSideEffectCounter: result.startSideEffectCounter,
-    endSideEffectCounter: result.endSideEffectCounter,
-    returnsHash: computeVarArgsHash(result.returnValues),
-    noteHashReadRequests: padArrayEnd(
-      result.noteHashReadRequests,
-      TreeLeafReadRequest.empty(),
-      MAX_NOTE_HASH_READ_REQUESTS_PER_CALL,
-      `Too many note hash read requests. Got ${result.noteHashReadRequests.length} with max being ${MAX_NOTE_HASH_READ_REQUESTS_PER_CALL}`,
-    ),
-    nullifierReadRequests: padArrayEnd(
-      result.nullifierReadRequests,
-      ReadRequest.empty(),
-      MAX_NULLIFIER_READ_REQUESTS_PER_CALL,
-      `Too many nullifier read requests. Got ${result.nullifierReadRequests.length} with max being ${MAX_NULLIFIER_READ_REQUESTS_PER_CALL}`,
-    ),
-    nullifierNonExistentReadRequests: padArrayEnd(
-      result.nullifierNonExistentReadRequests,
-      ReadRequest.empty(),
-      MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL,
-      `Too many nullifier non-existent read requests. Got ${result.nullifierNonExistentReadRequests.length} with max being ${MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL}`,
-    ),
-    l1ToL2MsgReadRequests: padArrayEnd(
-      result.l1ToL2MsgReadRequests,
-      TreeLeafReadRequest.empty(),
-      MAX_L1_TO_L2_MSG_READ_REQUESTS_PER_CALL,
-      `Too many L1 to L2 message read requests. Got ${result.l1ToL2MsgReadRequests.length} with max being ${MAX_L1_TO_L2_MSG_READ_REQUESTS_PER_CALL}`,
-    ),
-    contractStorageReads: padArrayEnd(
-      result.contractStorageReads,
-      ContractStorageRead.empty(),
-      MAX_PUBLIC_DATA_READS_PER_CALL,
-      `Too many public data reads. Got ${result.contractStorageReads.length} with max being ${MAX_PUBLIC_DATA_READS_PER_CALL}`,
-    ),
-    contractStorageUpdateRequests: padArrayEnd(
-      result.contractStorageUpdateRequests,
-      ContractStorageUpdateRequest.empty(),
-      MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL,
-      `Too many public data update requests. Got ${result.contractStorageUpdateRequests.length} with max being ${MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL}`,
-    ),
-    publicCallRequests: padArrayEnd(
-      result.publicCallRequests,
-      PublicInnerCallRequest.empty(),
-      MAX_ENQUEUED_CALLS_PER_CALL,
-      `Too many public call requests. Got ${result.publicCallRequests.length} with max being ${MAX_ENQUEUED_CALLS_PER_CALL}`,
-    ),
-    unencryptedLogsHashes: padArrayEnd(
-      result.unencryptedLogsHashes,
-      LogHash.empty(),
-      MAX_UNENCRYPTED_LOGS_PER_CALL,
-      `Too many unencrypted logs. Got ${result.unencryptedLogsHashes.length} with max being ${MAX_UNENCRYPTED_LOGS_PER_CALL}`,
-    ),
-    historicalHeader: header,
-    globalVariables: globalVariables,
-    startGasLeft: Gas.from(result.startGasLeft),
-    endGasLeft: Gas.from(result.endGasLeft),
-    transactionFee: result.transactionFee,
-    // TODO(@just-mitch): need better mapping from simulator to revert code.
-    revertCode: result.reverted ? RevertCode.APP_LOGIC_REVERTED : RevertCode.OK,
-  });
-}

package/dest/public/dual_side_effect_trace.d.ts

@@ -1,77 +0,0 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-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, type AvmFinalizedCallResult } from '../avm/avm_contract_call_result.js';
-import { type AvmExecutionEnvironment } from '../avm/avm_execution_environment.js';
-import { type PublicEnqueuedCallSideEffectTrace } from './enqueued_call_side_effect_trace.js';
-import { type EnqueuedPublicCallExecutionResultWithSideEffects, type PublicFunctionCallResult } from './execution.js';
-import { type PublicSideEffectTrace } from './side_effect_trace.js';
-import { type PublicSideEffectTraceInterface } from './side_effect_trace_interface.js';
-export declare class DualSideEffectTrace implements PublicSideEffectTraceInterface {
-    readonly innerCallTrace: PublicSideEffectTrace;
-    readonly enqueuedCallTrace: PublicEnqueuedCallSideEffectTrace;
-    constructor(innerCallTrace: PublicSideEffectTrace, enqueuedCallTrace: PublicEnqueuedCallSideEffectTrace);
-    fork(): DualSideEffectTrace;
-    merge(nestedTrace: this, reverted?: boolean): void;
-    getCounter(): number;
-    tracePublicStorageRead(contractAddress: AztecAddress, slot: Fr, value: Fr, leafPreimage: PublicDataTreeLeafPreimage, leafIndex: Fr, path: Fr[]): void;
-    tracePublicStorageWrite(contractAddress: AztecAddress, slot: Fr, value: Fr, lowLeafPreimage: PublicDataTreeLeafPreimage, lowLeafIndex: Fr, lowLeafPath: Fr[], newLeafPreimage: PublicDataTreeLeafPreimage, insertionPath: Fr[]): void;
-    traceNoteHashCheck(contractAddress: AztecAddress, noteHash: Fr, leafIndex: Fr, exists: boolean, path: Fr[]): void;
-    traceNewNoteHash(contractAddress: AztecAddress, noteHash: Fr, leafIndex: Fr, path: Fr[]): void;
-    traceNullifierCheck(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;
-    traceGetContractInstance(contractAddress: AztecAddress, exists: boolean, instance: SerializableContractInstance | undefined): void;
-    traceGetBytecode(contractAddress: AztecAddress, exists: boolean, bytecode: Buffer, contractInstance: SerializableContractInstance | undefined, contractClass: ContractClassIdPreimage | undefined): void;
-    /**
-     * Trace a nested call.
-     * Accept some results from a finished nested call's trace into this one.
-     */
-    traceNestedCall(
-    /** The trace of the nested call. */
-    nestedCallTrace: this, 
-    /** The execution environment of the nested call. */
-    nestedEnvironment: AvmExecutionEnvironment, 
-    /** How much gas was available for this public execution. */
-    startGasLeft: Gas, 
-    /** Bytecode used for this execution. */
-    bytecode: Buffer, 
-    /** The call's results */
-    avmCallResults: AvmContractCallResult, 
-    /** Function name for logging */
-    functionName?: string): void;
-    traceEnqueuedCall(
-    /** The call request from private that enqueued this call. */
-    publicCallRequest: PublicCallRequest, 
-    /** The call's calldata */
-    calldata: Fr[], 
-    /** Did the call revert? */
-    reverted: boolean): void;
-    /**
-     * Convert this trace to a PublicExecutionResult for use externally to the simulator.
-     */
-    toPublicEnqueuedCallExecutionResult(
-    /** The call's results */
-    avmCallResults: AvmFinalizedCallResult): EnqueuedPublicCallExecutionResultWithSideEffects;
-    /**
-     * Convert this trace to a PublicExecutionResult for use externally to the simulator.
-     */
-    toPublicFunctionCallResult(
-    /** The execution environment of the nested call. */
-    avmEnvironment: AvmExecutionEnvironment, 
-    /** How much gas was available for this public execution. */
-    startGasLeft: Gas, 
-    /** Bytecode used for this execution. */
-    bytecode: Buffer, 
-    /** The call's results */
-    avmCallResults: AvmFinalizedCallResult, 
-    /** Function name for logging */
-    functionName?: string): PublicFunctionCallResult;
-    getUnencryptedLogs(): UnencryptedL2Log[];
-}
-//# sourceMappingURL=dual_side_effect_trace.d.ts.map

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

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