@aztec/simulator 0.31.0 → 0.32.1

package/src/avm/avm_gas_cost.ts

@@ -1,3 +1,4 @@
+import { TypeTag } from './avm_memory_types.js';
 import { Opcode } from './serialization/instruction_serialization.js';
 
 /** Gas cost in L1, L2, and DA for a given instruction. */
@@ -7,6 +8,11 @@ export type GasCost = {
   daGas: number;
 };
 
+/** Creates a new instance with all values set to zero except the ones set. */
+export function makeGasCost(gasCost: Partial<GasCost>) {
+  return { ...EmptyGasCost, ...gasCost };
+}
+
 /** Gas cost of zero across all gas dimensions. */
 export const EmptyGasCost = {
   l1Gas: 0,
@@ -14,18 +20,21 @@ export const EmptyGasCost = {
   daGas: 0,
 };
 
-/** Dimensions of gas usage: L1, L2, and DA */
+/** Dimensions of gas usage: L1, L2, and DA. */
 export const GasDimensions = ['l1Gas', 'l2Gas', 'daGas'] as const;
 
+/** Null object to represent a gas cost that's dynamic instead of fixed for a given instruction. */
+export const DynamicGasCost = Symbol('DynamicGasCost');
+
 /** Temporary default gas cost. We should eventually remove all usage of this variable in favor of actual gas for each opcode. */
 const TemporaryDefaultGasCost = { l1Gas: 0, l2Gas: 10, daGas: 0 };
 
 /** Gas costs for each instruction. */
-export const GasCosts: Record<Opcode, GasCost> = {
-  [Opcode.ADD]: TemporaryDefaultGasCost,
-  [Opcode.SUB]: TemporaryDefaultGasCost,
-  [Opcode.MUL]: TemporaryDefaultGasCost,
-  [Opcode.DIV]: TemporaryDefaultGasCost,
+export const GasCosts = {
+  [Opcode.ADD]: DynamicGasCost,
+  [Opcode.SUB]: DynamicGasCost,
+  [Opcode.MUL]: DynamicGasCost,
+  [Opcode.DIV]: DynamicGasCost,
   [Opcode.FDIV]: TemporaryDefaultGasCost,
   [Opcode.EQ]: TemporaryDefaultGasCost,
   [Opcode.LT]: TemporaryDefaultGasCost,
@@ -55,7 +64,7 @@ export const GasCosts: Record<Opcode, GasCost> = {
   [Opcode.BLOCKL1GASLIMIT]: TemporaryDefaultGasCost,
   [Opcode.BLOCKL2GASLIMIT]: TemporaryDefaultGasCost,
   [Opcode.BLOCKDAGASLIMIT]: TemporaryDefaultGasCost,
-  [Opcode.CALLDATACOPY]: TemporaryDefaultGasCost,
+  [Opcode.CALLDATACOPY]: DynamicGasCost,
   // Gas
   [Opcode.L1GASLEFT]: TemporaryDefaultGasCost,
   [Opcode.L2GASLEFT]: TemporaryDefaultGasCost,
@@ -66,7 +75,7 @@ export const GasCosts: Record<Opcode, GasCost> = {
   [Opcode.INTERNALCALL]: TemporaryDefaultGasCost,
   [Opcode.INTERNALRETURN]: TemporaryDefaultGasCost,
   // Memory
-  [Opcode.SET]: TemporaryDefaultGasCost,
+  [Opcode.SET]: DynamicGasCost,
   [Opcode.MOV]: TemporaryDefaultGasCost,
   [Opcode.CMOV]: TemporaryDefaultGasCost,
   // World state
@@ -91,4 +100,33 @@ export const GasCosts: Record<Opcode, GasCost> = {
   [Opcode.POSEIDON]: TemporaryDefaultGasCost,
   [Opcode.SHA256]: TemporaryDefaultGasCost, // temp - may be removed, but alot of contracts rely on i: TemporaryDefaultGasCost,
   [Opcode.PEDERSEN]: TemporaryDefaultGasCost, // temp - may be removed, but alot of contracts rely on i: TemporaryDefaultGasCost,t
+} as const;
+
+/** Constants used in base cost calculations. */
+export const GasCostConstants = {
+  SET_COST_PER_BYTE: 100,
+  CALLDATACOPY_COST_PER_BYTE: 10,
+  ARITHMETIC_COST_PER_BYTE: 10,
+  ARITHMETIC_COST_PER_INDIRECT_ACCESS: 5,
 };
+
+/** Returns a multiplier based on the size of the type represented by the tag. Throws on uninitialized or invalid. */
+export function getGasCostMultiplierFromTypeTag(tag: TypeTag) {
+  switch (tag) {
+    case TypeTag.UINT8:
+      return 1;
+    case TypeTag.UINT16:
+      return 2;
+    case TypeTag.UINT32:
+      return 4;
+    case TypeTag.UINT64:
+      return 8;
+    case TypeTag.UINT128:
+      return 16;
+    case TypeTag.FIELD:
+      return 32;
+    case TypeTag.INVALID:
+    case TypeTag.UNINITIALIZED:
+      throw new Error(`Invalid tag type for gas cost multiplier: ${TypeTag[tag]}`);
+  }
+}

package/src/avm/avm_machine_state.ts

@@ -1,6 +1,6 @@
-import { Fr } from '@aztec/circuits.js';
+import { type Fr } from '@aztec/circuits.js';
 
-import { GasCost, GasDimensions } from './avm_gas_cost.js';
+import { type GasCost, GasDimensions } from './avm_gas_cost.js';
 import { TaggedMemory } from './avm_memory_types.js';
 import { AvmContractCallResults } from './avm_message_call_result.js';
 import { OutOfGasError } from './errors.js';

package/src/avm/avm_memory_types.ts

@@ -1,6 +1,6 @@
 import { toBufferBE } from '@aztec/foundation/bigint-buffer';
 import { Fr } from '@aztec/foundation/fields';
-import { DebugLogger, createDebugLogger } from '@aztec/foundation/log';
+import { type DebugLogger, createDebugLogger } from '@aztec/foundation/log';
 
 import { strict as assert } from 'assert';
 

package/src/avm/avm_message_call_result.ts

@@ -1,4 +1,4 @@
-import { Fr } from '@aztec/foundation/fields';
+import { type Fr } from '@aztec/foundation/fields';
 
 /**
  * Results of an contract call's execution in the AVM.

package/src/avm/avm_simulator.ts

@@ -1,4 +1,4 @@
-import { DebugLogger, createDebugLogger } from '@aztec/foundation/log';
+import { type DebugLogger, createDebugLogger } from '@aztec/foundation/log';
 
 import { strict as assert } from 'assert';
 

package/src/avm/errors.ts

@@ -1,4 +1,4 @@
-import { AztecAddress } from '@aztec/circuits.js';
+import { type AztecAddress } from '@aztec/circuits.js';
 
 /**
  * Avm-specific errors should derive from this

package/src/avm/fixtures/index.ts

@@ -8,7 +8,12 @@ import { Fr } from '@aztec/foundation/fields';
 import { mock } from 'jest-mock-extended';
 import merge from 'lodash.merge';
 
-import { CommitmentsDB, MessageLoadOracleInputs, PublicContractsDB, PublicStateDB } from '../../index.js';
+import {
+  type CommitmentsDB,
+  MessageLoadOracleInputs,
+  type PublicContractsDB,
+  type PublicStateDB,
+} from '../../index.js';
 import { AvmContext } from '../avm_context.js';
 import { AvmContextInputs, AvmExecutionEnvironment } from '../avm_execution_environment.js';
 import { AvmMachineState } from '../avm_machine_state.js';
@@ -89,9 +94,9 @@ export function initGlobalVariables(overrides?: Partial<GlobalVariables>): Globa
  */
 export function initMachineState(overrides?: Partial<AvmMachineState>): AvmMachineState {
   return AvmMachineState.fromState({
-    l1GasLeft: overrides?.l1GasLeft ?? 1e6,
-    l2GasLeft: overrides?.l2GasLeft ?? 1e6,
-    daGasLeft: overrides?.daGasLeft ?? 1e6,
+    l1GasLeft: overrides?.l1GasLeft ?? 100e6,
+    l2GasLeft: overrides?.l2GasLeft ?? 100e6,
+    daGasLeft: overrides?.daGasLeft ?? 100e6,
   });
 }
 

package/src/avm/journal/host_storage.ts

@@ -1,4 +1,4 @@
-import { CommitmentsDB, PublicContractsDB, PublicStateDB } from '../../public/db.js';
+import { type CommitmentsDB, type PublicContractsDB, type PublicStateDB } from '../../public/db.js';
 
 /**
  * Host storage

package/src/avm/journal/journal.ts

@@ -3,11 +3,11 @@ import { AztecAddress, EthAddress, L2ToL1Message } from '@aztec/circuits.js';
 import { EventSelector } from '@aztec/foundation/abi';
 import { Fr } from '@aztec/foundation/fields';
 
-import { HostStorage } from './host_storage.js';
+import { type HostStorage } from './host_storage.js';
 import { Nullifiers } from './nullifiers.js';
 import { PublicStorage } from './public_storage.js';
 import { WorldStateAccessTrace } from './trace.js';
-import { TracedL1toL2MessageCheck, TracedNoteHashCheck, TracedNullifierCheck } from './trace_types.js';
+import { type TracedL1toL2MessageCheck, type TracedNoteHashCheck, type TracedNullifierCheck } from './trace_types.js';
 
 /**
  * Data held within the journal

package/src/avm/journal/trace.ts

@@ -1,6 +1,6 @@
 import { Fr } from '@aztec/foundation/fields';
 
-import { TracedL1toL2MessageCheck, TracedNoteHashCheck, TracedNullifierCheck } from './trace_types.js';
+import { type TracedL1toL2MessageCheck, type TracedNoteHashCheck, type TracedNullifierCheck } from './trace_types.js';
 
 export class WorldStateAccessTrace {
   public accessCounter: number;

package/src/avm/journal/trace_types.ts

@@ -1,4 +1,4 @@
-import { Fr } from '@aztec/foundation/fields';
+import { type Fr } from '@aztec/foundation/fields';
 
 //export type TracedContractCall = {
 //  callPointer: Fr;

package/src/avm/opcodes/addressing_mode.ts

@@ -1,6 +1,6 @@
 import { strict as assert } from 'assert';
 
-import { TaggedMemory } from '../avm_memory_types.js';
+import { type TaggedMemory } from '../avm_memory_types.js';
 
 export enum AddressingMode {
   DIRECT,
@@ -12,7 +12,7 @@ export enum AddressingMode {
 export class Addressing {
   public constructor(
     /** The addressing mode for each operand. The length of this array is the number of operands of the instruction. */
-    private readonly modePerOperand: AddressingMode[],
+    public readonly modePerOperand: AddressingMode[],
   ) {
     assert(modePerOperand.length <= 8, 'At most 8 operands are supported');
   }

package/src/avm/opcodes/arithmetic.ts

@@ -1,84 +1,71 @@
 import type { AvmContext } from '../avm_context.js';
-import { Field, TypeTag } from '../avm_memory_types.js';
+import { type GasCost, GasCostConstants, getGasCostMultiplierFromTypeTag, makeGasCost } from '../avm_gas_cost.js';
+import { type Field, type MemoryValue, TypeTag } from '../avm_memory_types.js';
 import { Opcode, OperandType } from '../serialization/instruction_serialization.js';
+import { Addressing, AddressingMode } from './addressing_mode.js';
 import { Instruction } from './instruction.js';
 import { ThreeOperandInstruction } from './instruction_impl.js';
 
-export class Add extends ThreeOperandInstruction {
-  static readonly type: string = 'ADD';
-  static readonly opcode = Opcode.ADD;
-
-  constructor(indirect: number, inTag: number, aOffset: number, bOffset: number, dstOffset: number) {
-    super(indirect, inTag, aOffset, bOffset, dstOffset);
-  }
-
+export abstract class ThreeOperandArithmeticInstruction extends ThreeOperandInstruction {
   async execute(context: AvmContext): Promise<void> {
     context.machineState.memory.checkTags(this.inTag, this.aOffset, this.bOffset);
 
     const a = context.machineState.memory.get(this.aOffset);
     const b = context.machineState.memory.get(this.bOffset);
 
-    const dest = a.add(b);
+    const dest = this.compute(a, b);
     context.machineState.memory.set(this.dstOffset, dest);
 
     context.machineState.incrementPc();
   }
-}
 
-export class Sub extends ThreeOperandInstruction {
-  static readonly type: string = 'SUB';
-  static readonly opcode = Opcode.SUB;
+  protected gasCost(): GasCost {
+    const indirectCount = Addressing.fromWire(this.indirect).modePerOperand.filter(
+      mode => mode === AddressingMode.INDIRECT,
+    ).length;
 
-  constructor(indirect: number, inTag: number, aOffset: number, bOffset: number, dstOffset: number) {
-    super(indirect, inTag, aOffset, bOffset, dstOffset);
+    const l2Gas =
+      indirectCount * GasCostConstants.ARITHMETIC_COST_PER_INDIRECT_ACCESS +
+      getGasCostMultiplierFromTypeTag(this.inTag) * GasCostConstants.ARITHMETIC_COST_PER_BYTE;
+    return makeGasCost({ l2Gas });
   }
 
-  async execute(context: AvmContext): Promise<void> {
-    const a = context.machineState.memory.get(this.aOffset);
-    const b = context.machineState.memory.get(this.bOffset);
+  protected abstract compute(a: MemoryValue, b: MemoryValue): MemoryValue;
+}
 
-    const dest = a.sub(b);
-    context.machineState.memory.set(this.dstOffset, dest);
+export class Add extends ThreeOperandArithmeticInstruction {
+  static readonly type: string = 'ADD';
+  static readonly opcode = Opcode.ADD;
 
-    context.machineState.incrementPc();
+  protected compute(a: MemoryValue, b: MemoryValue): MemoryValue {
+    return a.add(b);
   }
 }
 
-export class Mul extends ThreeOperandInstruction {
-  static type: string = 'MUL';
-  static readonly opcode = Opcode.MUL;
+export class Sub extends ThreeOperandArithmeticInstruction {
+  static readonly type: string = 'SUB';
+  static readonly opcode = Opcode.SUB;
 
-  constructor(indirect: number, inTag: number, aOffset: number, bOffset: number, dstOffset: number) {
-    super(indirect, inTag, aOffset, bOffset, dstOffset);
+  protected compute(a: MemoryValue, b: MemoryValue): MemoryValue {
+    return a.sub(b);
   }
+}
 
-  async execute(context: AvmContext): Promise<void> {
-    const a = context.machineState.memory.get(this.aOffset);
-    const b = context.machineState.memory.get(this.bOffset);
-
-    const dest = a.mul(b);
-    context.machineState.memory.set(this.dstOffset, dest);
+export class Mul extends ThreeOperandArithmeticInstruction {
+  static type: string = 'MUL';
+  static readonly opcode = Opcode.MUL;
 
-    context.machineState.incrementPc();
+  protected compute(a: MemoryValue, b: MemoryValue): MemoryValue {
+    return a.mul(b);
   }
 }
 
-export class Div extends ThreeOperandInstruction {
+export class Div extends ThreeOperandArithmeticInstruction {
   static type: string = 'DIV';
   static readonly opcode = Opcode.DIV;
 
-  constructor(indirect: number, inTag: number, aOffset: number, bOffset: number, dstOffset: number) {
-    super(indirect, inTag, aOffset, bOffset, dstOffset);
-  }
-
-  async execute(context: AvmContext): Promise<void> {
-    const a = context.machineState.memory.get(this.aOffset);
-    const b = context.machineState.memory.get(this.bOffset);
-
-    const dest = a.div(b);
-    context.machineState.memory.set(this.dstOffset, dest);
-
-    context.machineState.incrementPc();
+  protected compute(a: MemoryValue, b: MemoryValue): MemoryValue {
+    return a.div(b);
   }
 }
 

package/src/avm/opcodes/bitwise.ts

@@ -1,5 +1,5 @@
 import type { AvmContext } from '../avm_context.js';
-import { IntegralValue } from '../avm_memory_types.js';
+import { type IntegralValue } from '../avm_memory_types.js';
 import { Opcode } from '../serialization/instruction_serialization.js';
 import { ThreeOperandInstruction, TwoOperandInstruction } from './instruction_impl.js';
 

package/src/avm/opcodes/control_flow.ts

@@ -1,5 +1,5 @@
 import type { AvmContext } from '../avm_context.js';
-import { IntegralValue } from '../avm_memory_types.js';
+import { type IntegralValue } from '../avm_memory_types.js';
 import { InstructionExecutionError } from '../errors.js';
 import { Opcode, OperandType } from '../serialization/instruction_serialization.js';
 import { Instruction } from './instruction.js';

package/src/avm/opcodes/environment_getters.ts

@@ -1,4 +1,4 @@
-import { Fr } from '@aztec/circuits.js';
+import { type Fr } from '@aztec/circuits.js';
 
 import type { AvmContext } from '../avm_context.js';
 import type { AvmExecutionEnvironment } from '../avm_execution_environment.js';

package/src/avm/opcodes/hashing.ts

@@ -1,7 +1,7 @@
 import { toBigIntBE } from '@aztec/foundation/bigint-buffer';
 import { keccak, pedersenHash, poseidonHash, sha256 } from '@aztec/foundation/crypto';
 
-import { AvmContext } from '../avm_context.js';
+import { type AvmContext } from '../avm_context.js';
 import { Field } from '../avm_memory_types.js';
 import { Opcode, OperandType } from '../serialization/instruction_serialization.js';
 import { Addressing } from './addressing_mode.js';
@@ -166,7 +166,7 @@ export class Pedersen extends Instruction {
 
     // We hash a set of field elements
     const messageSize = Number(context.machineState.memory.get(messageSizeOffset).toBigInt());
-    const hashData = context.machineState.memory.getSlice(messageOffset, messageSize).map(word => word.toBuffer());
+    const hashData = context.machineState.memory.getSlice(messageOffset, messageSize);
 
     // No domain sep for now
     const hash = pedersenHash(hashData);

package/src/avm/opcodes/instruction.ts

@@ -1,9 +1,9 @@
 import { strict as assert } from 'assert';
 
 import type { AvmContext } from '../avm_context.js';
-import { EmptyGasCost, GasCost, GasCosts } from '../avm_gas_cost.js';
-import { BufferCursor } from '../serialization/buffer_cursor.js';
-import { Opcode, OperandType, deserialize, serialize } from '../serialization/instruction_serialization.js';
+import { DynamicGasCost, type GasCost, GasCosts } from '../avm_gas_cost.js';
+import { type BufferCursor } from '../serialization/buffer_cursor.js';
+import { Opcode, type OperandType, deserialize, serialize } from '../serialization/instruction_serialization.js';
 
 type InstructionConstructor = {
   new (...args: any[]): Instruction;
@@ -29,8 +29,12 @@ export abstract class Instruction {
    * Loads default gas cost for the instruction from the GasCosts table.
    * Instruction sub-classes can override this if their gas cost is not fixed.
    */
-  public gasCost(): GasCost {
-    return GasCosts[this.opcode] ?? EmptyGasCost;
+  protected gasCost(): GasCost {
+    const gasCost = GasCosts[this.opcode];
+    if (gasCost === DynamicGasCost) {
+      throw new Error(`Instruction ${this.type} must define its own gas cost`);
+    }
+    return gasCost;
   }
 
   /**

package/src/avm/opcodes/memory.ts

@@ -1,4 +1,5 @@
 import type { AvmContext } from '../avm_context.js';
+import { type GasCost, GasCostConstants, getGasCostMultiplierFromTypeTag, makeGasCost } from '../avm_gas_cost.js';
 import { Field, TaggedMemory, TypeTag } from '../avm_memory_types.js';
 import { InstructionExecutionError } from '../errors.js';
 import { BufferCursor } from '../serialization/buffer_cursor.js';
@@ -79,6 +80,10 @@ export class Set extends Instruction {
 
     context.machineState.incrementPc();
   }
+
+  protected gasCost(): GasCost {
+    return makeGasCost({ l2Gas: GasCostConstants.SET_COST_PER_BYTE * getGasCostMultiplierFromTypeTag(this.inTag) });
+  }
 }
 
 export class CMov extends Instruction {
@@ -193,4 +198,8 @@ export class CalldataCopy extends Instruction {
 
     context.machineState.incrementPc();
   }
+
+  protected gasCost(): GasCost {
+    return makeGasCost({ l2Gas: GasCostConstants.CALLDATACOPY_COST_PER_BYTE * this.copySize });
+  }
 }

package/src/avm/temporary_executor_migration.ts

@@ -1,21 +1,21 @@
 // All code in this file needs to die once the public executor is phased out.
-import { FunctionL2Logs } from '@aztec/circuit-types';
+import { UnencryptedFunctionL2Logs } from '@aztec/circuit-types';
 import {
   ContractStorageRead,
   ContractStorageUpdateRequest,
-  GlobalVariables,
+  type GlobalVariables,
   L2ToL1Message,
-  ReadRequest,
+  type ReadRequest,
   SideEffect,
-  SideEffectLinkedToNoteHash,
+  type 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';
 
 /** Temporary Method
  *
@@ -96,7 +96,7 @@ export function temporaryConvertAvmResults(
   const nullifierReadRequests: ReadRequest[] = [];
   const nullifierNonExistentReadRequests: ReadRequest[] = [];
   const newNullifiers: SideEffectLinkedToNoteHash[] = [];
-  const unencryptedLogs = FunctionL2Logs.empty();
+  const unencryptedLogs = UnencryptedFunctionL2Logs.empty();
   const newL2ToL1Messages = newWorldState.newL1Messages.map(() => L2ToL1Message.empty());
   // TODO keep track of side effect counters
   const startSideEffectCounter = Fr.ZERO;

package/src/client/client_execution_context.ts

@@ -1,35 +1,37 @@
 import {
-  AuthWitness,
-  AztecNode,
-  FunctionL2Logs,
+  type AuthWitness,
+  type AztecNode,
+  EncryptedFunctionL2Logs,
+  EncryptedL2Log,
   L1NotePayload,
   Note,
-  NoteStatus,
+  type NoteStatus,
   TaggedNote,
-  UnencryptedL2Log,
+  UnencryptedFunctionL2Logs,
+  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';
@@ -56,7 +58,7 @@ export class ClientExecutionContext extends ViewDataOracle {
    * They should act as references for the read requests output by an app circuit via public inputs.
    */
   private gotNotes: Map<bigint, bigint> = new Map();
-  private encryptedLogs: Buffer[] = [];
+  private encryptedLogs: EncryptedL2Log[] = [];
   private unencryptedLogs: UnencryptedL2Log[] = [];
   private nestedExecutions: ExecutionResult[] = [];
   private enqueuedPublicFunctionCalls: PublicCallRequest[] = [];
@@ -144,14 +146,14 @@ export class ClientExecutionContext extends ViewDataOracle {
    * Return the encrypted logs emitted during this execution.
    */
   public getEncryptedLogs() {
-    return new FunctionL2Logs(this.encryptedLogs);
+    return new EncryptedFunctionL2Logs(this.encryptedLogs);
   }
 
   /**
    * Return the encrypted logs emitted during this execution.
    */
   public getUnencryptedLogs() {
-    return new FunctionL2Logs(this.unencryptedLogs.map(log => log.toBuffer()));
+    return new UnencryptedFunctionL2Logs(this.unencryptedLogs);
   }
 
   /**
@@ -304,7 +306,7 @@ export class ClientExecutionContext extends ViewDataOracle {
     const l1NotePayload = new L1NotePayload(note, contractAddress, storageSlot, noteTypeId);
     const taggedNote = new TaggedNote(l1NotePayload);
     const encryptedNote = taggedNote.toEncryptedBuffer(publicKey, this.curve);
-    this.encryptedLogs.push(encryptedNote);
+    this.encryptedLogs.push(new EncryptedL2Log(encryptedNote));
   }
 
   /**

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.