@aztec/simulator 0.61.0 → 0.63.0

package/src/client/client_execution_context.ts

@@ -24,7 +24,7 @@ import {
 } from '@aztec/circuits.js';
 import { computeUniqueNoteHash, siloNoteHash } from '@aztec/circuits.js/hash';
 import { type FunctionAbi, type FunctionArtifact, type NoteSelector, countArgumentsSize } from '@aztec/foundation/abi';
-import { type AztecAddress } from '@aztec/foundation/aztec-address';
+import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto';
 import { Fr } from '@aztec/foundation/fields';
 import { applyStringFormatting, createDebugLogger } from '@aztec/foundation/log';
@@ -62,7 +62,7 @@ export class ClientExecutionContext extends ViewDataOracle {
   private noteHashNullifierCounterMap: Map<number, number> = new Map();
   private noteEncryptedLogs: CountedNoteLog[] = [];
   private encryptedLogs: CountedLog<EncryptedL2Log>[] = [];
-  private unencryptedLogs: CountedLog<UnencryptedL2Log>[] = [];
+  private contractClassLogs: CountedLog<UnencryptedL2Log>[] = [];
   private nestedExecutions: PrivateExecutionResult[] = [];
   private enqueuedPublicFunctionCalls: CountedPublicExecutionRequest[] = [];
   private publicTeardownFunctionCall: PublicExecutionRequest = PublicExecutionRequest.empty();
@@ -151,10 +151,10 @@ export class ClientExecutionContext extends ViewDataOracle {
   }
 
   /**
-   * Return the encrypted logs emitted during this execution.
+   * Return the contract class logs emitted during this execution.
    */
-  public getUnencryptedLogs() {
-    return this.unencryptedLogs;
+  public getContractClassLogs() {
+    return this.contractClassLogs;
   }
 
   /**
@@ -360,16 +360,6 @@ export class ClientExecutionContext extends ViewDataOracle {
     this.noteEncryptedLogs.push(encryptedLog);
   }
 
-  /**
-   * Emit an unencrypted log.
-   * @param log - The unencrypted log to be emitted.
-   */
-  public override emitUnencryptedLog(log: UnencryptedL2Log, counter: number) {
-    this.unencryptedLogs.push(new CountedLog(log, counter));
-    const text = log.toHumanReadable();
-    this.log.verbose(`Emitted unencrypted log: "${text.length > 100 ? text.slice(0, 100) + '...' : text}"`);
-  }
-
   /**
    * Emit a contract class unencrypted log.
    * This fn exists separately from emitUnencryptedLog because sha hashing the preimage
@@ -377,13 +367,11 @@ export class ClientExecutionContext extends ViewDataOracle {
    * See private_context.nr
    * @param log - The unencrypted log to be emitted.
    */
-  public override emitContractClassUnencryptedLog(log: UnencryptedL2Log, counter: number) {
-    this.unencryptedLogs.push(new CountedLog(log, counter));
+  public override emitContractClassLog(log: UnencryptedL2Log, counter: number) {
+    this.contractClassLogs.push(new CountedLog(log, counter));
     const text = log.toHumanReadable();
     this.log.verbose(
-      `Emitted unencrypted log from ContractClassRegisterer: "${
-        text.length > 100 ? text.slice(0, 100) + '...' : text
-      }"`,
+      `Emitted log from ContractClassRegisterer: "${text.length > 100 ? text.slice(0, 100) + '...' : text}"`,
     );
     return Fr.fromBuffer(log.hash());
   }
@@ -394,7 +382,7 @@ export class ClientExecutionContext extends ViewDataOracle {
       childExecutionResult.publicInputs.nullifiers.some(item => !item.isEmpty()) ||
       childExecutionResult.publicInputs.l2ToL1Msgs.some(item => !item.isEmpty()) ||
       childExecutionResult.publicInputs.encryptedLogsHashes.some(item => !item.isEmpty()) ||
-      childExecutionResult.publicInputs.unencryptedLogsHashes.some(item => !item.isEmpty())
+      childExecutionResult.publicInputs.contractClassLogsHashes.some(item => !item.isEmpty())
     ) {
       throw new Error(`Static call cannot update the state, emit L2->L1 messages or generate logs`);
     }
@@ -609,4 +597,19 @@ export class ClientExecutionContext extends ViewDataOracle {
   public getDebugFunctionName() {
     return this.db.getDebugFunctionName(this.contractAddress, this.callContext.functionSelector);
   }
+
+  public override async incrementAppTaggingSecretIndexAsSender(sender: AztecAddress, recipient: AztecAddress) {
+    await this.db.incrementAppTaggingSecretIndexAsSender(this.contractAddress, sender, recipient);
+  }
+
+  public override async syncNotes() {
+    const taggedLogsByRecipient = await this.db.syncTaggedLogs(
+      this.contractAddress,
+      this.historicalHeader.globalVariables.blockNumber.toNumber(),
+      this.scopes,
+    );
+    for (const [recipient, taggedLogs] of taggedLogsByRecipient.entries()) {
+      await this.db.processTaggedLogs(taggedLogs, AztecAddress.fromString(recipient));
+    }
+  }
 }

package/src/client/db_oracle.ts

@@ -1,9 +1,11 @@
 import {
   type L2Block,
+  type L2BlockNumber,
   type MerkleTreeId,
   type NoteStatus,
   type NullifierMembershipWitness,
   type PublicDataWitness,
+  type TxScopedL2Log,
 } from '@aztec/circuit-types';
 import {
   type CompleteAddress,
@@ -145,7 +147,7 @@ export interface DBOracle extends CommitmentsDB {
    * @param leafValue - The leaf value buffer.
    * @returns - The index of the leaf. Undefined if it does not exist in the tree.
    */
-  findLeafIndex(blockNumber: number, treeId: MerkleTreeId, leafValue: Fr): Promise<bigint | undefined>;
+  findLeafIndex(blockNumber: L2BlockNumber, treeId: MerkleTreeId, leafValue: Fr): Promise<bigint | undefined>;
 
   /**
    * Fetch the sibling path of the leaf in the respective tree
@@ -197,26 +199,47 @@ export interface DBOracle extends CommitmentsDB {
 
   /**
    * Returns the tagging secret for a given sender and recipient pair. For this to work, the ivpsk_m of the sender must be known.
-   * Includes the last known index used for tagging with this secret.
+   * Includes the next index to be used used for tagging with this secret.
    * @param contractAddress - The contract address to silo the secret for
    * @param sender - The address sending the note
    * @param recipient - The address receiving the note
    * @returns A tagging secret that can be used to tag notes.
    */
-  getAppTaggingSecret(
+  getAppTaggingSecretAsSender(
     contractAddress: AztecAddress,
     sender: AztecAddress,
     recipient: AztecAddress,
   ): Promise<IndexedTaggingSecret>;
 
   /**
-   * Returns the siloed tagging secrets for a given recipient and all the senders in the address book
+   * Increments the tagging secret for a given sender and recipient pair. For this to work, the ivpsk_m of the sender must be known.
    * @param contractAddress - The contract address to silo the secret for
-   * @param recipient - The address receiving the notes
-   * @returns A list of siloed tagging secrets
+   * @param sender - The address sending the note
+   * @param recipient - The address receiving the note
    */
-  getAppTaggingSecretsForSenders(
+  incrementAppTaggingSecretIndexAsSender(
     contractAddress: AztecAddress,
+    sender: AztecAddress,
     recipient: AztecAddress,
-  ): Promise<IndexedTaggingSecret[]>;
+  ): Promise<void>;
+
+  /**
+   * Synchronizes the logs tagged with the recipient's address and all the senders in the addressbook.
+   * Returns the unsynched logs and updates the indexes of the secrets used to tag them until there are no more logs to sync.
+   * @param contractAddress - The address of the contract that the logs are tagged for
+   * @param recipient - The address of the recipient
+   * @returns A list of encrypted logs tagged with the recipient's address
+   */
+  syncTaggedLogs(
+    contractAddress: AztecAddress,
+    maxBlockNumber: number,
+    scopes?: AztecAddress[],
+  ): Promise<Map<string, TxScopedL2Log[]>>;
+
+  /**
+   * Processes the tagged logs returned by syncTaggedLogs by decrypting them and storing them in the database.
+   * @param logs - The logs to process.
+   * @param recipient - The recipient of the logs.
+   */
+  processTaggedLogs(logs: TxScopedL2Log[], recipient: AztecAddress): Promise<void>;
 }

package/src/client/private_execution.ts

@@ -13,7 +13,7 @@ import { Timer } from '@aztec/foundation/timer';
 
 import { fromACVMField, witnessMapToFields } from '../acvm/deserialize.js';
 import { type ACVMWitness, Oracle, acvm, extractCallStack } from '../acvm/index.js';
-import { ExecutionError } from '../common/errors.js';
+import { ExecutionError, resolveAssertionMessageFromError } from '../common/errors.js';
 import { type ClientExecutionContext } from './client_execution_context.js';
 
 /**
@@ -33,6 +33,7 @@ export async function executePrivateFunction(
   const acvmCallback = new Oracle(context);
   const timer = new Timer();
   const acirExecutionResult = await acvm(acir, initialWitness, acvmCallback).catch((err: Error) => {
+    err.message = resolveAssertionMessageFromError(err, artifact);
     throw new ExecutionError(
       err.message,
       {
@@ -60,7 +61,7 @@ export async function executePrivateFunction(
 
   const noteEncryptedLogs = context.getNoteEncryptedLogs();
   const encryptedLogs = context.getEncryptedLogs();
-  const unencryptedLogs = context.getUnencryptedLogs();
+  const contractClassLogs = context.getContractClassLogs();
 
   const rawReturnValues = await context.unpackReturns(publicInputs.returnsHash);
 
@@ -75,7 +76,7 @@ export async function executePrivateFunction(
 
   return new PrivateExecutionResult(
     acir,
-    Buffer.from(artifact.verificationKey!, 'hex'),
+    Buffer.from(artifact.verificationKey!, 'base64'),
     partialWitness,
     publicInputs,
     noteHashLeafIndexMap,
@@ -87,7 +88,7 @@ export async function executePrivateFunction(
     publicTeardownFunctionCall,
     noteEncryptedLogs,
     encryptedLogs,
-    unencryptedLogs,
+    contractClassLogs,
   );
 }
 

package/src/client/unconstrained_execution.ts

@@ -5,7 +5,7 @@ import { createDebugLogger } from '@aztec/foundation/log';
 
 import { witnessMapToFields } from '../acvm/deserialize.js';
 import { Oracle, acvm, extractCallStack, toACVMWitness } from '../acvm/index.js';
-import { ExecutionError } from '../common/errors.js';
+import { ExecutionError, resolveAssertionMessageFromError } from '../common/errors.js';
 import { type ViewDataOracle } from './view_data_oracle.js';
 
 // docs:start:execute_unconstrained_function
@@ -25,6 +25,7 @@ export async function executeUnconstrainedFunction(
   const acir = artifact.bytecode;
   const initialWitness = toACVMWitness(0, args);
   const acirExecutionResult = await acvm(acir, initialWitness, new Oracle(oracle)).catch((err: Error) => {
+    err.message = resolveAssertionMessageFromError(err, artifact);
     throw new ExecutionError(
       err.message,
       {

package/src/client/view_data_oracle.ts

@@ -14,7 +14,7 @@ import {
   type KeyValidationRequest,
 } from '@aztec/circuits.js';
 import { siloNullifier } from '@aztec/circuits.js/hash';
-import { type AztecAddress } from '@aztec/foundation/aztec-address';
+import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
 import { applyStringFormatting, createDebugLogger } from '@aztec/foundation/log';
 
@@ -271,7 +271,7 @@ export class ViewDataOracle extends TypedOracle {
    * @param numberOfElements - Number of elements to read from the starting storage slot.
    */
   public override async storageRead(
-    contractAddress: Fr,
+    contractAddress: AztecAddress,
     startStorageSlot: Fr,
     blockNumber: number,
     numberOfElements: number,
@@ -296,26 +296,27 @@ export class ViewDataOracle extends TypedOracle {
 
   /**
    * Returns the tagging secret for a given sender and recipient pair, siloed to the current contract address.
-   * Includes the last known index used for tagging with this secret.
+   * Includes the next index to be used used for tagging with this secret.
    * For this to work, the ivpsk_m of the sender must be known.
    * @param sender - The address sending the note
    * @param recipient - The address receiving the note
    * @returns A tagging secret that can be used to tag notes.
    */
-  public override async getAppTaggingSecret(
+  public override async getAppTaggingSecretAsSender(
     sender: AztecAddress,
     recipient: AztecAddress,
   ): Promise<IndexedTaggingSecret> {
-    return await this.db.getAppTaggingSecret(this.contractAddress, sender, recipient);
+    return await this.db.getAppTaggingSecretAsSender(this.contractAddress, sender, recipient);
   }
 
-  /**
-   * Returns the siloed tagging secrets for a given recipient and all the senders in the address book
-   * @param contractAddress - The contract address to silo the secret for
-   * @param recipient - The address receiving the notes
-   * @returns A list of siloed tagging secrets
-   */
-  public override async getAppTaggingSecretsForSenders(recipient: AztecAddress): Promise<IndexedTaggingSecret[]> {
-    return await this.db.getAppTaggingSecretsForSenders(this.contractAddress, recipient);
+  public override async syncNotes() {
+    const taggedLogsByRecipient = await this.db.syncTaggedLogs(
+      this.contractAddress,
+      await this.aztecNode.getBlockNumber(),
+      this.scopes,
+    );
+    for (const [recipient, taggedLogs] of taggedLogsByRecipient.entries()) {
+      await this.db.processTaggedLogs(taggedLogs, AztecAddress.fromString(recipient));
+    }
   }
 }

package/src/common/errors.ts

@@ -1,4 +1,14 @@
-import { type FailingFunction, type NoirCallStack, SimulationError } from '@aztec/circuit-types';
+import {
+  type FailingFunction,
+  type NoirCallStack,
+  SimulationError,
+  type SourceCodeLocation,
+} from '@aztec/circuit-types';
+import { type Fr } from '@aztec/circuits.js';
+import type { BrilligFunctionId, FunctionAbi, FunctionDebugMetadata, OpcodeLocation } from '@aztec/foundation/abi';
+
+import { type RawAssertionPayload } from '@noir-lang/acvm_js';
+import { abiDecodeError } from '@noir-lang/noirc_abi';
 
 /**
  * An error that occurred during the execution of a function.
@@ -47,7 +57,7 @@ export function traverseCauseChain(error: Error, callback: (error: Error) => voi
  * @param error - The error thrown during execution.
  * @returns - A simulation error.
  */
-export function createSimulationError(error: Error): SimulationError {
+export function createSimulationError(error: Error, revertData?: Fr[]): SimulationError {
   let rootCause = error;
   let noirCallStack: NoirCallStack | undefined = undefined;
   const aztecCallStack: FailingFunction[] = [];
@@ -62,5 +72,111 @@ export function createSimulationError(error: Error): SimulationError {
     }
   });
 
-  return new SimulationError(rootCause.message, aztecCallStack, noirCallStack, { cause: rootCause });
+  return new SimulationError(rootCause.message, aztecCallStack, revertData, noirCallStack, { cause: rootCause });
+}
+
+/**
+ * Extracts a brillig location from an opcode location.
+ * @param opcodeLocation - The opcode location to extract from. It should be in the format `acirLocation.brilligLocation` or `acirLocation`.
+ * @returns The brillig location if the opcode location contains one.
+ */
+function extractBrilligLocation(opcodeLocation: string): string | undefined {
+  const splitted = opcodeLocation.split('.');
+  if (splitted.length === 2) {
+    return splitted[1];
+  }
+  return undefined;
+}
+
+/**
+ * Extracts the call stack from the location of a failing opcode and the debug metadata.
+ * One opcode can point to multiple calls due to inlining.
+ */
+function getSourceCodeLocationsFromOpcodeLocation(
+  opcodeLocation: string,
+  debug: FunctionDebugMetadata,
+  brilligFunctionId?: BrilligFunctionId,
+): SourceCodeLocation[] {
+  const { debugSymbols, files } = debug;
+
+  let callStack = debugSymbols.locations[opcodeLocation] || [];
+  if (callStack.length === 0) {
+    const brilligLocation = extractBrilligLocation(opcodeLocation);
+    if (brilligFunctionId !== undefined && brilligLocation !== undefined) {
+      callStack = debugSymbols.brillig_locations[brilligFunctionId][brilligLocation] || [];
+    }
+  }
+  return callStack.map(call => {
+    const { file: fileId, span } = call;
+
+    const { path, source } = files[fileId];
+
+    const locationText = source.substring(span.start, span.end);
+    const precedingText = source.substring(0, span.start);
+    const previousLines = precedingText.split('\n');
+    // Lines and columns in stacks are one indexed.
+    const line = previousLines.length;
+    const column = previousLines[previousLines.length - 1].length + 1;
+
+    return {
+      filePath: path,
+      line,
+      column,
+      fileSource: source,
+      locationText,
+    };
+  });
+}
+
+/**
+ * Extracts the source code locations for an array of opcode locations
+ * @param opcodeLocations - The opcode locations that caused the error.
+ * @param debug - The debug metadata of the function.
+ * @returns The source code locations.
+ */
+export function resolveOpcodeLocations(
+  opcodeLocations: OpcodeLocation[],
+  debug: FunctionDebugMetadata,
+  brilligFunctionId?: BrilligFunctionId,
+): SourceCodeLocation[] {
+  return opcodeLocations.flatMap(opcodeLocation =>
+    getSourceCodeLocationsFromOpcodeLocation(opcodeLocation, debug, brilligFunctionId),
+  );
+}
+
+export function resolveAssertionMessage(errorPayload: RawAssertionPayload, abi: FunctionAbi): string | undefined {
+  const decoded = abiDecodeError(
+    { parameters: [], error_types: abi.errorTypes, return_type: null }, // eslint-disable-line camelcase
+    errorPayload,
+  );
+
+  if (typeof decoded === 'string') {
+    return decoded;
+  } else {
+    return JSON.stringify(decoded);
+  }
+}
+
+export function resolveAssertionMessageFromRevertData(revertData: Fr[], abi: FunctionAbi): string | undefined {
+  if (revertData.length == 0) {
+    return undefined;
+  }
+
+  const [errorSelector, ...errorData] = revertData;
+
+  return resolveAssertionMessage(
+    {
+      selector: errorSelector.toBigInt().toString(),
+      data: errorData.map(f => f.toString()),
+    },
+    abi,
+  );
+}
+
+export function resolveAssertionMessageFromError(err: Error, abi: FunctionAbi): string {
+  if (typeof err === 'object' && err !== null && 'rawAssertionPayload' in err && err.rawAssertionPayload) {
+    return `Assertion failed: ${resolveAssertionMessage(err.rawAssertionPayload as RawAssertionPayload, abi)}`;
+  } else {
+    return err.message;
+  }
 }

package/src/mocks/fixtures.ts

@@ -1,90 +1,35 @@
-import {
-  type FunctionCall,
-  PublicExecutionRequest,
-  type SimulationError,
-  UnencryptedFunctionL2Logs,
-} from '@aztec/circuit-types';
-import {
-  ARGS_LENGTH,
-  AvmExecutionHints,
-  type AztecAddress,
-  CallContext,
-  type ContractStorageRead,
-  type ContractStorageUpdateRequest,
-  Fr,
-  Gas,
-} from '@aztec/circuits.js';
+import { SimulationError } from '@aztec/circuit-types';
+import { ARGS_LENGTH, Fr, Gas } from '@aztec/circuits.js';
 import { makeAztecAddress, makeSelector } from '@aztec/circuits.js/testing';
 import { FunctionType } from '@aztec/foundation/abi';
 import { padArrayEnd } from '@aztec/foundation/collection';
 
-import { type PublicExecutionResult, resultToPublicCallRequest } from '../public/execution.js';
+import { type EnqueuedPublicCallExecutionResult } from '../public/execution.js';
 
 export class PublicExecutionResultBuilder {
-  private _executionRequest: PublicExecutionRequest;
-  private _nestedExecutions: PublicExecutionResult[] = [];
-  private _contractStorageUpdateRequests: ContractStorageUpdateRequest[] = [];
-  private _contractStorageReads: ContractStorageRead[] = [];
   private _returnValues: Fr[] = [];
   private _reverted = false;
   private _revertReason: SimulationError | undefined = undefined;
 
-  constructor(executionRequest: PublicExecutionRequest) {
-    this._executionRequest = executionRequest;
-  }
-
-  static fromPublicExecutionRequest({
-    request,
-    returnValues = [new Fr(1n)],
-    nestedExecutions = [],
-    contractStorageUpdateRequests = [],
-    contractStorageReads = [],
-    revertReason = undefined,
-  }: {
-    request: PublicExecutionRequest;
-    returnValues?: Fr[];
-    nestedExecutions?: PublicExecutionResult[];
-    contractStorageUpdateRequests?: ContractStorageUpdateRequest[];
-    contractStorageReads?: ContractStorageRead[];
-    revertReason?: SimulationError;
-  }): PublicExecutionResultBuilder {
-    const builder = new PublicExecutionResultBuilder(request);
+  constructor() {}
 
-    builder.withNestedExecutions(...nestedExecutions);
-    builder.withContractStorageUpdateRequest(...contractStorageUpdateRequests);
-    builder.withContractStorageRead(...contractStorageReads);
-    builder.withReturnValues(...returnValues);
-    if (revertReason) {
-      builder.withReverted(revertReason);
+  static empty(basicRevert = false) {
+    const builder = new PublicExecutionResultBuilder();
+    if (basicRevert) {
+      builder.withReverted(new SimulationError('Simulation failed', []));
     }
-
     return builder;
   }
 
-  static fromFunctionCall({
-    from,
-    tx,
+  static fromPublicExecutionRequest({
     returnValues = [new Fr(1n)],
-    nestedExecutions = [],
-    contractStorageUpdateRequests = [],
-    contractStorageReads = [],
-    revertReason,
+    revertReason = undefined,
   }: {
-    from: AztecAddress;
-    tx: FunctionCall;
     returnValues?: Fr[];
-    nestedExecutions?: PublicExecutionResult[];
-    contractStorageUpdateRequests?: ContractStorageUpdateRequest[];
-    contractStorageReads?: ContractStorageRead[];
     revertReason?: SimulationError;
-  }) {
-    const builder = new PublicExecutionResultBuilder(
-      new PublicExecutionRequest(new CallContext(from, tx.to, tx.selector, false), tx.args),
-    );
+  }): PublicExecutionResultBuilder {
+    const builder = new PublicExecutionResultBuilder();
 
-    builder.withNestedExecutions(...nestedExecutions);
-    builder.withContractStorageUpdateRequest(...contractStorageUpdateRequests);
-    builder.withContractStorageRead(...contractStorageReads);
     builder.withReturnValues(...returnValues);
     if (revertReason) {
       builder.withReverted(revertReason);
@@ -93,21 +38,6 @@ export class PublicExecutionResultBuilder {
     return builder;
   }
 
-  withNestedExecutions(...nested: PublicExecutionResult[]): PublicExecutionResultBuilder {
-    this._nestedExecutions.push(...nested);
-    return this;
-  }
-
-  withContractStorageUpdateRequest(...request: ContractStorageUpdateRequest[]): PublicExecutionResultBuilder {
-    this._contractStorageUpdateRequests.push(...request);
-    return this;
-  }
-
-  withContractStorageRead(...reads: ContractStorageRead[]): PublicExecutionResultBuilder {
-    this._contractStorageReads.push(...reads);
-    return this;
-  }
-
   withReturnValues(...values: Fr[]): PublicExecutionResultBuilder {
     this._returnValues.push(...values);
     return this;
@@ -119,34 +49,13 @@ export class PublicExecutionResultBuilder {
     return this;
   }
 
-  build(overrides: Partial<PublicExecutionResult> = {}): PublicExecutionResult {
+  build(overrides: Partial<EnqueuedPublicCallExecutionResult> = {}): EnqueuedPublicCallExecutionResult {
     return {
-      executionRequest: this._executionRequest,
-      nestedExecutions: this._nestedExecutions,
-      publicCallRequests: this._nestedExecutions.map(resultToPublicCallRequest),
-      noteHashReadRequests: [],
-      nullifierReadRequests: [],
-      nullifierNonExistentReadRequests: [],
-      l1ToL2MsgReadRequests: [],
-      contractStorageUpdateRequests: this._contractStorageUpdateRequests,
-      returnValues: padArrayEnd(this._returnValues, Fr.ZERO, 4), // TODO(#5450) Need to use the proper return values here
-      noteHashes: [],
-      nullifiers: [],
-      l2ToL1Messages: [],
-      contractStorageReads: [],
-      unencryptedLogsHashes: [],
-      unencryptedLogs: UnencryptedFunctionL2Logs.empty(),
-      allUnencryptedLogs: UnencryptedFunctionL2Logs.empty(),
-      startSideEffectCounter: Fr.ZERO,
+      endGasLeft: Gas.empty(),
       endSideEffectCounter: Fr.ZERO,
+      returnValues: padArrayEnd(this._returnValues, Fr.ZERO, 4), // TODO(#5450) Need to use the proper return values here
       reverted: this._reverted,
       revertReason: this._revertReason,
-      startGasLeft: Gas.test(),
-      endGasLeft: Gas.test(),
-      transactionFee: Fr.ZERO,
-      calldata: [],
-      avmCircuitHints: AvmExecutionHints.empty(),
-      functionName: 'unknown',
       ...overrides,
     };
   }