@aztec/simulator 0.32.0 → 0.33.0

package/src/avm/opcodes/instruction_impl.ts

@@ -1,19 +1,34 @@
+import { type AvmContext } from '../avm_context.js';
+import { type MemoryValue } from '../avm_memory_types.js';
 import { OperandType } from '../serialization/instruction_serialization.js';
 import { Instruction } from './instruction.js';
 
+/** Wire format that informs deserialization for instructions with two operands. */
+export const TwoOperandWireFormat = [
+  OperandType.UINT8,
+  OperandType.UINT8,
+  OperandType.UINT8,
+  OperandType.UINT32,
+  OperandType.UINT32,
+];
+
+/** Wire format that informs deserialization for instructions with three operands. */
+export const ThreeOperandWireFormat = [
+  OperandType.UINT8,
+  OperandType.UINT8,
+  OperandType.UINT8,
+  OperandType.UINT32,
+  OperandType.UINT32,
+  OperandType.UINT32,
+];
+
 /**
  * Covers (de)serialization for an instruction with:
  * indirect, inTag, and two UINT32s.
  */
 export abstract class TwoOperandInstruction extends Instruction {
   // Informs (de)serialization. See Instruction.deserialize.
-  static readonly wireFormat: OperandType[] = [
-    OperandType.UINT8,
-    OperandType.UINT8,
-    OperandType.UINT8,
-    OperandType.UINT32,
-    OperandType.UINT32,
-  ];
+  static readonly wireFormat: OperandType[] = TwoOperandWireFormat;
 
   constructor(
     protected indirect: number,
@@ -31,14 +46,7 @@ export abstract class TwoOperandInstruction extends Instruction {
  */
 export abstract class ThreeOperandInstruction extends Instruction {
   // Informs (de)serialization. See Instruction.deserialize.
-  static readonly wireFormat: OperandType[] = [
-    OperandType.UINT8,
-    OperandType.UINT8,
-    OperandType.UINT8,
-    OperandType.UINT32,
-    OperandType.UINT32,
-    OperandType.UINT32,
-  ];
+  static readonly wireFormat: OperandType[] = ThreeOperandWireFormat;
 
   constructor(
     protected indirect: number,
@@ -50,3 +58,25 @@ export abstract class ThreeOperandInstruction extends Instruction {
     super();
   }
 }
+
+export abstract class GetterInstruction extends Instruction {
+  // Informs (de)serialization. See Instruction.deserialize.
+  static readonly wireFormat: OperandType[] = [OperandType.UINT8, OperandType.UINT8, OperandType.UINT32];
+
+  constructor(protected indirect: number, protected dstOffset: number) {
+    super();
+  }
+
+  public async execute(context: AvmContext): Promise<void> {
+    const memoryOperations = { writes: 1, indirect: this.indirect };
+    const memory = context.machineState.memory.track(this.type);
+    context.machineState.consumeGas(this.gasCost(memoryOperations));
+
+    memory.set(this.dstOffset, this.getValue(context));
+
+    memory.assert(memoryOperations);
+    context.machineState.incrementPc();
+  }
+
+  protected abstract getValue(env: AvmContext): MemoryValue;
+}

package/src/avm/opcodes/memory.ts

@@ -1,6 +1,6 @@
 import type { AvmContext } from '../avm_context.js';
-import { GasCost, GasCostConstants, getGasCostMultiplierFromTypeTag, makeGasCost } from '../avm_gas_cost.js';
-import { Field, TaggedMemory, TypeTag } from '../avm_memory_types.js';
+import { getBaseGasCost, getMemoryGasCost, mulGas, sumGas } from '../avm_gas.js';
+import { Field, type MemoryOperations, TaggedMemory, TypeTag } from '../avm_memory_types.js';
 import { InstructionExecutionError } from '../errors.js';
 import { BufferCursor } from '../serialization/buffer_cursor.js';
 import { Opcode, OperandType, deserialize, serialize } from '../serialization/instruction_serialization.js';
@@ -69,21 +69,22 @@ export class Set extends Instruction {
     return new this(...args);
   }
 
-  async execute(context: AvmContext): Promise<void> {
+  public async execute(context: AvmContext): Promise<void> {
+    const memoryOperations = { writes: 1, indirect: this.indirect };
+    const memory = context.machineState.memory.track(this.type);
+    context.machineState.consumeGas(this.gasCost(memoryOperations));
+
     // Per the YP, the tag cannot be a field.
     if ([TypeTag.FIELD, TypeTag.UNINITIALIZED, TypeTag.INVALID].includes(this.inTag)) {
       throw new InstructionExecutionError(`Invalid tag ${TypeTag[this.inTag]} for SET.`);
     }
 
     const res = TaggedMemory.integralFromTag(this.value, this.inTag);
-    context.machineState.memory.set(this.dstOffset, res);
+    memory.set(this.dstOffset, res);
 
+    memory.assert(memoryOperations);
     context.machineState.incrementPc();
   }
-
-  protected gasCost(): GasCost {
-    return makeGasCost({ l2Gas: GasCostConstants.SET_COST_PER_BYTE * getGasCostMultiplierFromTypeTag(this.inTag) });
-  }
 }
 
 export class CMov extends Instruction {
@@ -109,14 +110,19 @@ export class CMov extends Instruction {
     super();
   }
 
-  async execute(context: AvmContext): Promise<void> {
-    const a = context.machineState.memory.get(this.aOffset);
-    const b = context.machineState.memory.get(this.bOffset);
-    const cond = context.machineState.memory.get(this.condOffset);
+  public async execute(context: AvmContext): Promise<void> {
+    const memoryOperations = { reads: 3, writes: 1, indirect: this.indirect };
+    const memory = context.machineState.memory.track(this.type);
+    context.machineState.consumeGas(this.gasCost(memoryOperations));
+
+    const a = memory.get(this.aOffset);
+    const b = memory.get(this.bOffset);
+    const cond = memory.get(this.condOffset);
 
     // TODO: reconsider toBigInt() here
-    context.machineState.memory.set(this.dstOffset, cond.toBigInt() > 0 ? a : b);
+    memory.set(this.dstOffset, cond.toBigInt() > 0 ? a : b);
 
+    memory.assert(memoryOperations);
     context.machineState.incrementPc();
   }
 }
@@ -129,15 +135,20 @@ export class Cast extends TwoOperandInstruction {
     super(indirect, dstTag, aOffset, dstOffset);
   }
 
-  async execute(context: AvmContext): Promise<void> {
-    const a = context.machineState.memory.get(this.aOffset);
+  public async execute(context: AvmContext): Promise<void> {
+    const memoryOperations = { reads: 1, writes: 1, indirect: this.indirect };
+    const memory = context.machineState.memory.track(this.type);
+    context.machineState.consumeGas(this.gasCost(memoryOperations));
+
+    const a = memory.get(this.aOffset);
 
     // TODO: consider not using toBigInt()
     const casted =
       this.inTag == TypeTag.FIELD ? new Field(a.toBigInt()) : TaggedMemory.integralFromTag(a.toBigInt(), this.inTag);
 
-    context.machineState.memory.set(this.dstOffset, casted);
+    memory.set(this.dstOffset, casted);
 
+    memory.assert(memoryOperations);
     context.machineState.incrementPc();
   }
 }
@@ -157,16 +168,18 @@ export class Mov extends Instruction {
     super();
   }
 
-  async execute(context: AvmContext): Promise<void> {
-    const [srcOffset, dstOffset] = Addressing.fromWire(this.indirect).resolve(
-      [this.srcOffset, this.dstOffset],
-      context.machineState.memory,
-    );
+  public async execute(context: AvmContext): Promise<void> {
+    const memoryOperations = { reads: 1, writes: 1, indirect: this.indirect };
+    const memory = context.machineState.memory.track(this.type);
+    context.machineState.consumeGas(this.gasCost(memoryOperations));
+
+    const [srcOffset, dstOffset] = Addressing.fromWire(this.indirect).resolve([this.srcOffset, this.dstOffset], memory);
 
-    const a = context.machineState.memory.get(srcOffset);
+    const a = memory.get(srcOffset);
 
-    context.machineState.memory.set(dstOffset, a);
+    memory.set(dstOffset, a);
 
+    memory.assert(memoryOperations);
     context.machineState.incrementPc();
   }
 }
@@ -187,19 +200,26 @@ export class CalldataCopy extends Instruction {
     super();
   }
 
-  async execute(context: AvmContext): Promise<void> {
-    const [dstOffset] = Addressing.fromWire(this.indirect).resolve([this.dstOffset], context.machineState.memory);
+  public async execute(context: AvmContext): Promise<void> {
+    const memoryOperations = { writes: this.copySize, indirect: this.indirect };
+    const memory = context.machineState.memory.track(this.type);
+    context.machineState.consumeGas(this.gasCost(memoryOperations));
+
+    const [dstOffset] = Addressing.fromWire(this.indirect).resolve([this.dstOffset], memory);
 
     const transformedData = context.environment.calldata
       .slice(this.cdOffset, this.cdOffset + this.copySize)
       .map(f => new Field(f));
 
-    context.machineState.memory.setSlice(dstOffset, transformedData);
+    memory.setSlice(dstOffset, transformedData);
 
+    memory.assert(memoryOperations);
     context.machineState.incrementPc();
   }
 
-  protected gasCost(): GasCost {
-    return makeGasCost({ l2Gas: GasCostConstants.CALLDATACOPY_COST_PER_BYTE * this.copySize });
+  protected gasCost(memoryOps: Partial<MemoryOperations & { indirect: number }> = {}) {
+    const baseGasCost = mulGas(getBaseGasCost(this.opcode), this.copySize);
+    const memoryGasCost = getMemoryGasCost(memoryOps);
+    return sumGas(baseGasCost, memoryGasCost);
   }
 }

package/src/avm/opcodes/storage.ts

@@ -1,7 +1,8 @@
 import { Fr } from '@aztec/foundation/fields';
 
 import type { AvmContext } from '../avm_context.js';
-import { Field } from '../avm_memory_types.js';
+import { type Gas, getBaseGasCost, getMemoryGasCost, mulGas, sumGas } from '../avm_gas.js';
+import { Field, type MemoryOperations } from '../avm_memory_types.js';
 import { InstructionExecutionError } from '../errors.js';
 import { Opcode, OperandType } from '../serialization/instruction_serialization.js';
 import { Addressing } from './addressing_mode.js';
@@ -25,6 +26,12 @@ abstract class BaseStorageInstruction extends Instruction {
   ) {
     super();
   }
+
+  protected gasCost(memoryOps: Partial<MemoryOperations & { indirect: number }>): Gas {
+    const baseGasCost = mulGas(getBaseGasCost(this.opcode), this.size);
+    const memoryGasCost = getMemoryGasCost(memoryOps);
+    return sumGas(baseGasCost, memoryGasCost);
+  }
 }
 
 export class SStore extends BaseStorageInstruction {
@@ -35,24 +42,26 @@ export class SStore extends BaseStorageInstruction {
     super(indirect, srcOffset, srcSize, slotOffset);
   }
 
-  async execute(context: AvmContext): Promise<void> {
+  public async execute(context: AvmContext): Promise<void> {
     if (context.environment.isStaticCall) {
       throw new StaticCallStorageAlterError();
     }
 
-    const [srcOffset, slotOffset] = Addressing.fromWire(this.indirect).resolve(
-      [this.aOffset, this.bOffset],
-      context.machineState.memory,
-    );
+    const memoryOperations = { reads: this.size + 1, indirect: this.indirect };
+    const memory = context.machineState.memory.track(this.type);
+    context.machineState.consumeGas(this.gasCost(memoryOperations));
 
-    const slot = context.machineState.memory.get(slotOffset).toFr();
-    const data = context.machineState.memory.getSlice(srcOffset, this.size).map(field => field.toFr());
+    const [srcOffset, slotOffset] = Addressing.fromWire(this.indirect).resolve([this.aOffset, this.bOffset], memory);
+
+    const slot = memory.get(slotOffset).toFr();
+    const data = memory.getSlice(srcOffset, this.size).map(field => field.toFr());
 
     for (const [index, value] of Object.entries(data)) {
       const adjustedSlot = slot.add(new Fr(BigInt(index)));
       context.persistableState.writeStorage(context.environment.storageAddress, adjustedSlot, value);
     }
 
+    memory.assert(memoryOperations);
     context.machineState.incrementPc();
   }
 }
@@ -65,13 +74,17 @@ export class SLoad extends BaseStorageInstruction {
     super(indirect, slotOffset, size, dstOffset);
   }
 
-  async execute(context: AvmContext): Promise<void> {
+  public async execute(context: AvmContext): Promise<void> {
+    const memoryOperations = { writes: this.size, reads: 1, indirect: this.indirect };
+    const memory = context.machineState.memory.track(this.type);
+    context.machineState.consumeGas(this.gasCost(memoryOperations));
+
     const [aOffset, size, bOffset] = Addressing.fromWire(this.indirect).resolve(
       [this.aOffset, this.size, this.bOffset],
-      context.machineState.memory,
+      memory,
     );
 
-    const slot = context.machineState.memory.get(aOffset);
+    const slot = memory.get(aOffset);
 
     // Write each read value from storage into memory
     for (let i = 0; i < size; i++) {
@@ -80,10 +93,11 @@ export class SLoad extends BaseStorageInstruction {
         new Fr(slot.toBigInt() + BigInt(i)),
       );
 
-      context.machineState.memory.set(bOffset + i, new Field(data));
+      memory.set(bOffset + i, new Field(data));
     }
 
     context.machineState.incrementPc();
+    memory.assert(memoryOperations);
   }
 }
 

package/src/avm/serialization/bytecode_serialization.ts

@@ -1,3 +1,4 @@
+import { DAGasLeft, L1GasLeft, L2GasLeft } from '../opcodes/context_getters.js';
 import { Keccak, Pedersen, Poseidon2, Sha256 } from '../opcodes/hashing.js';
 import {
   Add,
@@ -18,6 +19,7 @@ import {
   FeePerL1Gas,
   FeePerL2Gas,
   FieldDiv,
+  GetContractInstance,
   InternalCall,
   InternalReturn,
   Jump,
@@ -101,9 +103,9 @@ const INSTRUCTION_SET = () =>
 
     // Machine State
     // Machine State - Gas
-    //[L1gasleft.opcode, L1gasleft],
-    //[L2gasleft.opcode, L2gasleft],
-    //[Dagasleft.opcode, Dagasleft],
+    [L1GasLeft.opcode, L1GasLeft],
+    [L2GasLeft.opcode, L2GasLeft],
+    [DAGasLeft.opcode, DAGasLeft],
     // Machine State - Internal Control Flow
     [Jump.opcode, Jump],
     [JumpI.opcode, JumpI],
@@ -126,6 +128,7 @@ const INSTRUCTION_SET = () =>
     // Accrued Substate
     [EmitUnencryptedLog.opcode, EmitUnencryptedLog],
     [SendL2ToL1Message.opcode, SendL2ToL1Message],
+    [GetContractInstance.opcode, GetContractInstance],
 
     // Control Flow - Contract Calls
     [Call.opcode, Call],

package/src/avm/serialization/instruction_serialization.ts

@@ -64,6 +64,7 @@ export enum Opcode {
   EMITNULLIFIER,
   L1TOL2MSGEXISTS,
   HEADERMEMBER,
+  GETCONTRACTINSTANCE,
   EMITUNENCRYPTEDLOG,
   SENDL2TOL1MSG,
   // External calls

package/src/avm/temporary_executor_migration.ts

@@ -3,19 +3,20 @@ import { UnencryptedFunctionL2Logs } from '@aztec/circuit-types';
 import {
   ContractStorageRead,
   ContractStorageUpdateRequest,
-  GlobalVariables,
+  type GlobalVariables,
   L2ToL1Message,
-  ReadRequest,
+  type ReadRequest,
   SideEffect,
   SideEffectLinkedToNoteHash,
 } from '@aztec/circuits.js';
 import { Fr } from '@aztec/foundation/fields';
 
 import { createSimulationError } from '../common/errors.js';
-import { PublicExecution, PublicExecutionResult } from '../public/execution.js';
+import { type PublicExecution, type PublicExecutionResult } from '../public/execution.js';
 import { AvmExecutionEnvironment } from './avm_execution_environment.js';
-import { AvmContractCallResults } from './avm_message_call_result.js';
-import { JournalData } from './journal/journal.js';
+import { type AvmContractCallResults } from './avm_message_call_result.js';
+import { type JournalData } from './journal/journal.js';
+import { Mov } from './opcodes/memory.js';
 
 /** Temporary Method
  *
@@ -95,7 +96,9 @@ export function temporaryConvertAvmResults(
   const nestedExecutions: PublicExecutionResult[] = [];
   const nullifierReadRequests: ReadRequest[] = [];
   const nullifierNonExistentReadRequests: ReadRequest[] = [];
-  const newNullifiers: SideEffectLinkedToNoteHash[] = [];
+  const newNullifiers: SideEffectLinkedToNoteHash[] = newWorldState.newNullifiers.map(
+    (nullifier, i) => new SideEffectLinkedToNoteHash(nullifier.toField(), Fr.zero(), new Fr(i + 1)),
+  );
   const unencryptedLogs = UnencryptedFunctionL2Logs.empty();
   const newL2ToL1Messages = newWorldState.newL1Messages.map(() => L2ToL1Message.empty());
   // TODO keep track of side effect counters
@@ -120,3 +123,14 @@ export function temporaryConvertAvmResults(
     revertReason: result.revertReason ? createSimulationError(result.revertReason) : undefined,
   };
 }
+
+export function isAvmBytecode(bytecode: Buffer): boolean {
+  const magicBuf = Buffer.from([
+    Mov.opcode, // opcode
+    0x00, // indirect
+    ...Buffer.from('000018ca', 'hex'), // srcOffset
+    ...Buffer.from('000018ca', 'hex'), // dstOffset
+  ]);
+  const magicSize = magicBuf.length;
+  return bytecode.subarray(-magicSize).equals(magicBuf);
+}

package/src/client/client_execution_context.ts

@@ -1,37 +1,37 @@
 import {
-  AuthWitness,
-  AztecNode,
+  type AuthWitness,
+  type AztecNode,
   EncryptedFunctionL2Logs,
   EncryptedL2Log,
   L1NotePayload,
   Note,
-  NoteStatus,
+  type NoteStatus,
   TaggedNote,
   UnencryptedFunctionL2Logs,
-  UnencryptedL2Log,
+  type UnencryptedL2Log,
 } from '@aztec/circuit-types';
 import {
   CallContext,
   FunctionData,
   FunctionSelector,
-  Header,
+  type Header,
   NoteHashReadRequestMembershipWitness,
   PublicCallRequest,
-  SideEffect,
+  type SideEffect,
   TxContext,
 } from '@aztec/circuits.js';
-import { Grumpkin } from '@aztec/circuits.js/barretenberg';
+import { type Grumpkin } from '@aztec/circuits.js/barretenberg';
 import { computePublicDataTreeLeafSlot, computeUniqueCommitment, siloNoteHash } from '@aztec/circuits.js/hash';
-import { FunctionAbi, FunctionArtifact, countArgumentsSize } from '@aztec/foundation/abi';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
-import { Fr, Point } from '@aztec/foundation/fields';
+import { type FunctionAbi, type FunctionArtifact, countArgumentsSize } from '@aztec/foundation/abi';
+import { type AztecAddress } from '@aztec/foundation/aztec-address';
+import { Fr, type Point } from '@aztec/foundation/fields';
 import { createDebugLogger } from '@aztec/foundation/log';
 
-import { NoteData, toACVMWitness } from '../acvm/index.js';
-import { PackedArgsCache } from '../common/packed_args_cache.js';
-import { DBOracle } from './db_oracle.js';
-import { ExecutionNoteCache } from './execution_note_cache.js';
-import { ExecutionResult, NoteAndSlot } from './execution_result.js';
+import { type NoteData, toACVMWitness } from '../acvm/index.js';
+import { type PackedArgsCache } from '../common/packed_args_cache.js';
+import { type DBOracle } from './db_oracle.js';
+import { type ExecutionNoteCache } from './execution_note_cache.js';
+import { type ExecutionResult, type NoteAndSlot } from './execution_result.js';
 import { pickNotes } from './pick_notes.js';
 import { executePrivateFunction } from './private_execution.js';
 import { ViewDataOracle } from './view_data_oracle.js';

package/src/client/db_oracle.ts

@@ -1,13 +1,19 @@
-import { L2Block, MerkleTreeId, NoteStatus, NullifierMembershipWitness, PublicDataWitness } from '@aztec/circuit-types';
-import { CompleteAddress, Header } from '@aztec/circuits.js';
-import { FunctionArtifactWithDebugMetadata, FunctionSelector } from '@aztec/foundation/abi';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
-import { EthAddress } from '@aztec/foundation/eth-address';
-import { Fr } from '@aztec/foundation/fields';
-import { ContractInstance } from '@aztec/types/contracts';
-
-import { KeyPair, NoteData } from '../acvm/index.js';
-import { CommitmentsDB } from '../public/db.js';
+import {
+  type L2Block,
+  type MerkleTreeId,
+  type NoteStatus,
+  type NullifierMembershipWitness,
+  type PublicDataWitness,
+} from '@aztec/circuit-types';
+import { type CompleteAddress, type Header } from '@aztec/circuits.js';
+import { type FunctionArtifactWithDebugMetadata, type FunctionSelector } from '@aztec/foundation/abi';
+import { type AztecAddress } from '@aztec/foundation/aztec-address';
+import { type EthAddress } from '@aztec/foundation/eth-address';
+import { type Fr } from '@aztec/foundation/fields';
+import { type ContractInstance } from '@aztec/types/contracts';
+
+import { type KeyPair, type NoteData } from '../acvm/index.js';
+import { type CommitmentsDB } from '../public/db.js';
 
 /**
  * Error thrown when a contract is not found in the database.

package/src/client/execution_note_cache.ts

@@ -1,8 +1,8 @@
 import { siloNullifier } from '@aztec/circuits.js/hash';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
+import { type AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
 
-import { NoteData } from '../acvm/index.js';
+import { type NoteData } from '../acvm/index.js';
 
 /**
  * Data that's accessible by all the function calls in an execution.

package/src/client/execution_result.ts

@@ -1,9 +1,13 @@
-import { EncryptedFunctionL2Logs, Note, UnencryptedFunctionL2Logs } from '@aztec/circuit-types';
-import { NoteHashReadRequestMembershipWitness, PrivateCallStackItem, PublicCallRequest } from '@aztec/circuits.js';
-import { DecodedReturn } from '@aztec/foundation/abi';
-import { Fr } from '@aztec/foundation/fields';
+import { type EncryptedFunctionL2Logs, type Note, type UnencryptedFunctionL2Logs } from '@aztec/circuit-types';
+import {
+  type NoteHashReadRequestMembershipWitness,
+  type PrivateCallStackItem,
+  type PublicCallRequest,
+} from '@aztec/circuits.js';
+import { type DecodedReturn } from '@aztec/foundation/abi';
+import { type Fr } from '@aztec/foundation/fields';
 
-import { ACVMField } from '../acvm/index.js';
+import { type ACVMField } from '../acvm/index.js';
 
 /**
  * The contents of a new note.

package/src/client/pick_notes.ts

@@ -1,4 +1,4 @@
-import { Comparator, Note } from '@aztec/circuit-types';
+import { Comparator, type Note } from '@aztec/circuit-types';
 import { Fr } from '@aztec/foundation/fields';
 
 export interface PropertySelector {

package/src/client/private_execution.ts

@@ -1,14 +1,14 @@
-import { FunctionData, PrivateCallStackItem, PrivateCircuitPublicInputs } from '@aztec/circuits.js';
-import { FunctionArtifactWithDebugMetadata, decodeReturnValues } from '@aztec/foundation/abi';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
+import { type FunctionData, PrivateCallStackItem, PrivateCircuitPublicInputs } from '@aztec/circuits.js';
+import { type AbiType, type FunctionArtifactWithDebugMetadata, decodeReturnValues } from '@aztec/foundation/abi';
+import { type AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
 import { createDebugLogger } from '@aztec/foundation/log';
 
 import { extractReturnWitness } from '../acvm/deserialize.js';
 import { Oracle, acvm, extractCallStack } from '../acvm/index.js';
 import { ExecutionError } from '../common/errors.js';
-import { ClientExecutionContext } from './client_execution_context.js';
-import { ExecutionResult } from './execution_result.js';
+import { type ClientExecutionContext } from './client_execution_context.js';
+import { type ExecutionResult } from './execution_result.js';
 import { AcirSimulator } from './simulator.js';
 
 /**
@@ -52,7 +52,13 @@ export async function executePrivateFunction(
   publicInputs.unencryptedLogPreimagesLength = new Fr(unencryptedLogs.getSerializedLength());
 
   const callStackItem = new PrivateCallStackItem(contractAddress, functionData, publicInputs);
-  const returnValues = decodeReturnValues(artifact, publicInputs.returnValues);
+
+  // Mocking the return type to be an array of 4 fields
+  // TODO: @LHerskind must be updated as we are progressing with the macros to get the information
+  const returnTypes: AbiType[] = [{ kind: 'array', length: 4, type: { kind: 'field' } }];
+  const mockArtifact = { ...artifact, returnTypes };
+  const returnValues = decodeReturnValues(mockArtifact, publicInputs.returnValues);
+
   const noteHashReadRequestPartialWitnesses = context.getNoteHashReadRequestPartialWitnesses(
     publicInputs.noteHashReadRequests,
   );

package/src/client/simulator.ts

@@ -1,26 +1,26 @@
-import { AztecNode, FunctionCall, Note, TxExecutionRequest } from '@aztec/circuit-types';
+import { type AztecNode, type FunctionCall, type Note, type TxExecutionRequest } from '@aztec/circuit-types';
 import { CallContext, FunctionData } from '@aztec/circuits.js';
 import { Grumpkin } from '@aztec/circuits.js/barretenberg';
 import {
-  ArrayType,
-  FunctionArtifactWithDebugMetadata,
+  type ArrayType,
+  type FunctionArtifactWithDebugMetadata,
   FunctionSelector,
   FunctionType,
   encodeArguments,
 } from '@aztec/foundation/abi';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
-import { EthAddress } from '@aztec/foundation/eth-address';
+import { type EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
-import { DebugLogger, createDebugLogger } from '@aztec/foundation/log';
+import { type DebugLogger, createDebugLogger } from '@aztec/foundation/log';
 
-import { WasmBlackBoxFunctionSolver, createBlackBoxSolver } from '@noir-lang/acvm_js';
+import { type WasmBlackBoxFunctionSolver, createBlackBoxSolver } from '@noir-lang/acvm_js';
 
 import { createSimulationError } from '../common/errors.js';
 import { PackedArgsCache } from '../common/packed_args_cache.js';
 import { ClientExecutionContext } from './client_execution_context.js';
-import { DBOracle } from './db_oracle.js';
+import { type DBOracle } from './db_oracle.js';
 import { ExecutionNoteCache } from './execution_note_cache.js';
-import { ExecutionResult } from './execution_result.js';
+import { type ExecutionResult } from './execution_result.js';
 import { executePrivateFunction } from './private_execution.js';
 import { executeUnconstrainedFunction } from './unconstrained_execution.js';
 import { ViewDataOracle } from './view_data_oracle.js';

package/src/client/unconstrained_execution.ts

@@ -1,14 +1,14 @@
-import { FunctionData } from '@aztec/circuits.js';
-import { DecodedReturn, FunctionArtifactWithDebugMetadata, decodeReturnValues } from '@aztec/foundation/abi';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
-import { Fr } from '@aztec/foundation/fields';
+import { type FunctionData } from '@aztec/circuits.js';
+import { type DecodedReturn, type FunctionArtifactWithDebugMetadata, decodeReturnValues } from '@aztec/foundation/abi';
+import { type AztecAddress } from '@aztec/foundation/aztec-address';
+import { type Fr } from '@aztec/foundation/fields';
 import { createDebugLogger } from '@aztec/foundation/log';
 
 import { extractReturnWitness } from '../acvm/deserialize.js';
 import { Oracle, acvm, extractCallStack, toACVMWitness } from '../acvm/index.js';
 import { ExecutionError } from '../common/errors.js';
 import { AcirSimulator } from './simulator.js';
-import { ViewDataOracle } from './view_data_oracle.js';
+import { type ViewDataOracle } from './view_data_oracle.js';
 
 // docs:start:execute_unconstrained_function
 /**