@aztec/simulator 0.0.1-commit.2ed92850 → 0.0.1-commit.3469e52

package/src/public/avm/avm_execution_environment.ts

@@ -3,8 +3,6 @@ import type { PublicSimulatorConfig } from '@aztec/stdlib/avm';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { GlobalVariables } from '@aztec/stdlib/tx';
 
-import type { CallData } from './calldata.js';
-
 /**
  * Contains variables that remain constant during AVM execution
  * These variables are provided by the public kernel circuit
@@ -17,13 +15,13 @@ export class AvmExecutionEnvironment {
     public readonly transactionFee: Fr,
     public readonly globals: GlobalVariables,
     public readonly isStaticCall: boolean,
-    public readonly calldata: CallData,
+    public readonly calldata: Fr[],
     public readonly config: PublicSimulatorConfig,
   ) {}
 
   private deriveEnvironmentForNestedCallInternal(
     targetAddress: AztecAddress,
-    calldata: CallData,
+    calldata: Fr[],
     isStaticCall: boolean,
   ): AvmExecutionEnvironment {
     return new AvmExecutionEnvironment(
@@ -38,14 +36,11 @@ export class AvmExecutionEnvironment {
     );
   }
 
-  public deriveEnvironmentForNestedCall(targetAddress: AztecAddress, calldata: CallData): AvmExecutionEnvironment {
+  public deriveEnvironmentForNestedCall(targetAddress: AztecAddress, calldata: Fr[]): AvmExecutionEnvironment {
     return this.deriveEnvironmentForNestedCallInternal(targetAddress, calldata, /*isStaticCall=*/ false);
   }
 
-  public deriveEnvironmentForNestedStaticCall(
-    targetAddress: AztecAddress,
-    calldata: CallData,
-  ): AvmExecutionEnvironment {
+  public deriveEnvironmentForNestedStaticCall(targetAddress: AztecAddress, calldata: Fr[]): AvmExecutionEnvironment {
     return this.deriveEnvironmentForNestedCallInternal(targetAddress, calldata, /*isStaticCall=*/ true);
   }
 }

package/src/public/avm/avm_machine_state.ts

@@ -2,7 +2,6 @@ import type { Fr } from '@aztec/foundation/curves/bn254';
 
 import type { Gas } from './avm_gas.js';
 import { TaggedMemory } from './avm_memory_types.js';
-import { type ReturnData, ReturnDataArray } from './calldata.js';
 import { type AvmRevertReason, OutOfGasError } from './errors.js';
 
 /**
@@ -40,7 +39,7 @@ export class AvmMachineState {
   /** program counter of the next instruction, byte based */
   public nextPc: number = 0;
   /** return/revertdata of the last nested call. */
-  public nestedReturndata: ReturnData = new ReturnDataArray([]);
+  public nestedReturndata: Fr[] = [];
   /** Tracks whether the last external call was successful */
   public nestedCallSuccess: boolean = false;
   /**
@@ -67,7 +66,7 @@ export class AvmMachineState {
   /** Signals that execution has reverted normally (this does not cover exceptional halts) */
   private reverted: boolean = false;
   /** Output data must NOT be modified once it is set */
-  private output: ReturnData = new ReturnDataArray([]);
+  private output: Fr[] = [];
 
   // Metrics only - not needed for execution
   /** instruction counter, including nested calls */
@@ -130,7 +129,7 @@ export class AvmMachineState {
    * Output data must NOT be modified once it is set
    * @param output
    */
-  public return(output: ReturnData) {
+  public return(output: Fr[]) {
     this.halted = true;
     this.output = output;
   }
@@ -140,7 +139,7 @@ export class AvmMachineState {
    * Output data must NOT be modified once it is set
    * @param output
    */
-  public revert(output: ReturnData) {
+  public revert(output: Fr[]) {
     this.halted = true;
     this.reverted = true;
     this.output = output;
@@ -154,7 +153,7 @@ export class AvmMachineState {
     return this.reverted;
   }
 
-  public getOutput(): ReturnData {
+  public getOutput(): Fr[] {
     return this.output;
   }
 

package/src/public/avm/avm_memory_types.ts

@@ -369,10 +369,6 @@ export class TaggedMemory implements TaggedMemoryInterface {
    * Check tags for all memory in the specified range.
    */
   public checkTagsRange(tag: TypeTag, startOffset: number, size: number) {
-    if (startOffset + size > TaggedMemory.MAX_MEMORY_SIZE) {
-      throw new MemorySliceOutOfRangeError(startOffset, size);
-    }
-
     for (let offset = startOffset; offset < startOffset + size; offset++) {
       this.checkTag(tag, offset);
     }

package/src/public/avm/avm_simulator.ts

@@ -15,7 +15,6 @@ import { AvmExecutionEnvironment } from './avm_execution_environment.js';
 import type { Gas } from './avm_gas.js';
 import { AvmMachineState } from './avm_machine_state.js';
 import type { AvmSimulatorInterface } from './avm_simulator_interface.js';
-import { type CallData, ReturnDataArray } from './calldata.js';
 import { AvmRevertReason, InvalidProgramCounterError } from './errors.js';
 import type { Instruction } from './opcodes/instruction.js';
 import { revertReasonFromExceptionalHalt, revertReasonFromExplicitRevert } from './revert_reason.js';
@@ -50,7 +49,7 @@ export class AvmSimulator implements AvmSimulatorInterface {
     // This will be used by the CALL opcode to create a new simulator. It is required to
     // avoid a dependency cycle.
     context.provideSimulator = AvmSimulator.build;
-    this.log = createLogger(`simulator:avm(calldata[0]: ${context.environment.calldata.read(0)})`);
+    this.log = createLogger(`simulator:avm(calldata[0]: ${context.environment.calldata[0]})`);
     // Turn on tallying if explicitly enabled or if trace logging
     if (enableTallying || this.log.isLevelEnabled('trace')) {
       this.tallyPrintFunction = this.printOpcodeTallies;
@@ -75,7 +74,7 @@ export class AvmSimulator implements AvmSimulatorInterface {
     transactionFee: Fr,
     globals: GlobalVariables,
     isStaticCall: boolean,
-    calldata: CallData,
+    calldata: Fr[],
     allocatedGas: Gas,
     config: PublicSimulatorConfig,
   ) {
@@ -184,9 +183,7 @@ export class AvmSimulator implements AvmSimulatorInterface {
 
       const output = machineState.getOutput();
       const reverted = machineState.getReverted();
-      const revertReason = reverted
-        ? await revertReasonFromExplicitRevert(output.bestEffortReadAll(), this.context)
-        : undefined;
+      const revertReason = reverted ? await revertReasonFromExplicitRevert(output, this.context) : undefined;
       const results = new AvmContractCallResult(
         reverted,
         output,
@@ -223,7 +220,7 @@ export class AvmSimulator implements AvmSimulatorInterface {
       // Note: "exceptional halts" cannot return data, hence [].
       const results = new AvmContractCallResult(
         /*reverted=*/ true,
-        /*output=*/ new ReturnDataArray([]),
+        /*output=*/ [],
         noGasLeft,
         revertReason,
         machineState.instrCounter,
@@ -253,7 +250,7 @@ export class AvmSimulator implements AvmSimulatorInterface {
     this.log.warn(message);
     return new AvmContractCallResult(
       /*reverted=*/ true,
-      /*output=*/ new ReturnDataArray([]),
+      /*output=*/ [],
       /*gasLeft=*/ { l2Gas: 0, daGas: 0 }, // consumes all allocated gas
       revertReason,
     );

package/src/public/avm/fixtures/avm_simulation_tester.ts

@@ -13,7 +13,6 @@ import { SimpleContractDataSource } from '../../fixtures/simple_contract_data_so
 import { PublicContractsDB, PublicTreesDB } from '../../public_db_sources.js';
 import { PublicPersistableStateManager } from '../../state_manager/state_manager.js';
 import { AvmSimulator } from '../avm_simulator.js';
-import { CallDataArray } from '../calldata.js';
 import { BaseAvmSimulationTester } from './base_avm_simulation_tester.js';
 import { initContext, initExecutionEnvironment } from './initializers.js';
 import {
@@ -90,7 +89,7 @@ export class AvmSimulationTester extends BaseAvmSimulationTester {
       collectCallMetadata: true,
     });
     const environment = initExecutionEnvironment({
-      calldata: new CallDataArray(calldata),
+      calldata,
       globals,
       address,
       sender,
@@ -106,12 +105,7 @@ export class AvmSimulationTester extends BaseAvmSimulationTester {
     if (result.reverted) {
       this.logger.error(`Error in ${fnName}:`);
       this.logger.error(
-        resolveContractAssertionMessage(
-          fnName,
-          result.revertReason!,
-          result.output.bestEffortReadAll(),
-          contractArtifact,
-        )!,
+        resolveContractAssertionMessage(fnName, result.revertReason!, result.output, contractArtifact)!,
       );
     } else {
       this.logger.info(`Simulation of function ${fnName} succeeded!`);

package/src/public/avm/fixtures/initializers.ts

@@ -19,7 +19,6 @@ import { AvmContext } from '../avm_context.js';
 import { AvmExecutionEnvironment } from '../avm_execution_environment.js';
 import { AvmMachineState } from '../avm_machine_state.js';
 import { AvmSimulator } from '../avm_simulator.js';
-import { CallDataArray } from '../calldata.js';
 import { DEFAULT_TIMESTAMP } from './utils.js';
 
 /**
@@ -71,7 +70,7 @@ export function initExecutionEnvironment(overrides?: Partial<AvmExecutionEnviron
     overrides?.transactionFee ?? Fr.zero(),
     overrides?.globals ?? GlobalVariables.empty(),
     overrides?.isStaticCall ?? false,
-    overrides?.calldata ?? new CallDataArray([]),
+    overrides?.calldata ?? [],
     overrides?.config ?? PublicSimulatorConfig.empty(),
   );
 }

package/src/public/avm/opcodes/accrued_substate.ts

@@ -1,5 +1,3 @@
-import { MAX_ETH_ADDRESS_VALUE } from '@aztec/constants';
-
 import { NullifierCollisionError } from '../../side_effect_errors.js';
 import type { AvmContext } from '../avm_context.js';
 import { TypeTag, Uint1 } from '../avm_memory_types.js';
@@ -284,10 +282,6 @@ export class SendL2ToL1Message extends Instruction {
     memory.checkTags(TypeTag.FIELD, recipientOffset, contentOffset);
 
     const recipient = memory.get(recipientOffset).toFr();
-
-    if (recipient.toBigInt() > MAX_ETH_ADDRESS_VALUE) {
-      throw new InstructionExecutionError(`SENDL2TOL1MSG: Recipient address is too large`);
-    }
     const content = memory.get(contentOffset).toFr();
     context.persistableState.writeL2ToL1Message(context.environment.address, recipient, content);
   }

package/src/public/avm/opcodes/contract.ts

@@ -67,6 +67,9 @@ export class GetContractInstance extends Instruction {
       }
     }
 
-    memory.setSlice(dstOffset, [new Uint1(exists ? 1 : 0), memberValue]);
+    const existsOffset = dstOffset;
+    const memberValueOffset = dstOffset + 1;
+    memory.set(existsOffset, new Uint1(exists ? 1 : 0));
+    memory.set(memberValueOffset, memberValue);
   }
 }

package/src/public/avm/opcodes/external_calls.ts

@@ -1,7 +1,6 @@
 import type { AvmContext } from '../avm_context.js';
 import type { AvmContractCallResult } from '../avm_contract_call_result.js';
 import { type Field, TypeTag, Uint1 } from '../avm_memory_types.js';
-import { CallDataMemory, ReturnDataMemory } from '../calldata.js';
 import { Opcode, OperandType } from '../serialization/instruction_serialization.js';
 import { Addressing } from './addressing_mode.js';
 import { Instruction } from './instruction.js';
@@ -46,8 +45,8 @@ abstract class ExternalCall extends Instruction {
     memory.checkTag(TypeTag.UINT32, argsSizeOffset);
 
     const calldataSize = memory.get(argsSizeOffset).toNumber();
-
-    const calldata = new CallDataMemory(memory, argsOffset, calldataSize);
+    // This is a DOS vector. CalldataSize is chosen by the bytecode, and can be arbitrarily large leading to a OOM here.
+    const calldata = memory.getSlice(argsOffset, calldataSize).map(f => f.toFr());
 
     const callAddress = memory.getAs<Field>(addrOffset);
     // If we are already in a static call, we propagate the environment.
@@ -74,8 +73,8 @@ abstract class ExternalCall extends Instruction {
     const success = !nestedCallResults.reverted;
 
     // Save return/revert data for later.
-    const returnData = nestedCallResults.output;
-    context.machineState.nestedReturndata = returnData;
+    const fullReturnData = nestedCallResults.output;
+    context.machineState.nestedReturndata = fullReturnData;
 
     // Track the success status directly
     context.machineState.nestedCallSuccess = success;
@@ -90,7 +89,7 @@ abstract class ExternalCall extends Instruction {
     // (in Noir code).
     if (!success) {
       context.machineState.collectedRevertInfo = {
-        revertDataRepresentative: returnData.bestEffortReadAll(),
+        revertDataRepresentative: fullReturnData,
         recursiveRevertReason: nestedCallResults.revertReason!,
       };
     }
@@ -196,7 +195,7 @@ export class Return extends Instruction {
     memory.checkTag(TypeTag.UINT32, returnSizeOffset);
     const returnSize = memory.get(returnSizeOffset).toNumber();
 
-    const output = new ReturnDataMemory(memory, returnOffset, returnSize);
+    const output = memory.getSlice(returnOffset, returnSize).map(word => word.toFr());
 
     context.machineState.return(output);
   }
@@ -244,7 +243,7 @@ export class Revert extends Instruction {
 
     memory.checkTag(TypeTag.UINT32, retSizeOffset);
     const retSize = memory.get(retSizeOffset).toNumber();
-    const output = new ReturnDataMemory(memory, returnOffset, retSize);
+    const output = memory.getSlice(returnOffset, retSize).map(word => word.toFr());
 
     context.machineState.revert(output);
   }

package/src/public/avm/opcodes/memory.ts

@@ -242,7 +242,7 @@ export class ReturndataSize extends Instruction {
     const operands = [this.dstOffset];
     const [dstOffset] = addressing.resolve(operands, memory);
 
-    memory.set(dstOffset, new Uint32(context.machineState.nestedReturndata.length()));
+    memory.set(dstOffset, new Uint32(context.machineState.nestedReturndata.length));
   }
 }
 

package/src/public/avm/opcodes/storage.ts

@@ -5,9 +5,7 @@ import { Opcode, OperandType } from '../serialization/instruction_serialization.
 import { Addressing } from './addressing_mode.js';
 import { Instruction } from './instruction.js';
 
-export class SStore extends Instruction {
-  static readonly type: string = 'SSTORE';
-  static readonly opcode = Opcode.SSTORE;
+abstract class BaseStorageInstruction extends Instruction {
   // Informs (de)serialization. See Instruction.deserialize.
   public static readonly wireFormat: OperandType[] = [
     OperandType.UINT8,
@@ -17,12 +15,21 @@ export class SStore extends Instruction {
   ];
 
   constructor(
-    private addressingMode: number,
-    private srcOffset: number,
-    private slotOffset: number,
+    protected addressingMode: number,
+    protected aOffset: number,
+    protected bOffset: number,
   ) {
     super();
   }
+}
+
+export class SStore extends BaseStorageInstruction {
+  static readonly type: string = 'SSTORE';
+  static readonly opcode = Opcode.SSTORE;
+
+  constructor(addressingMode: number, srcOffset: number, slotOffset: number) {
+    super(addressingMode, srcOffset, slotOffset);
+  }
 
   public async execute(context: AvmContext): Promise<void> {
     if (context.environment.isStaticCall) {
@@ -36,7 +43,7 @@ export class SStore extends Instruction {
       this.baseGasCost(addressing.indirectOperandsCount(), addressing.relativeOperandsCount()),
     );
 
-    const operands = [this.srcOffset, this.slotOffset];
+    const operands = [this.aOffset, this.bOffset];
     const [srcOffset, slotOffset] = addressing.resolve(operands, memory);
     // We read before tag checking since it's needed for gas cost calculation
     const slot = memory.get(slotOffset).toFr();
@@ -53,25 +60,12 @@ export class SStore extends Instruction {
   }
 }
 
-export class SLoad extends Instruction {
+export class SLoad extends BaseStorageInstruction {
   static readonly type: string = 'SLOAD';
   static readonly opcode = Opcode.SLOAD;
-  // Informs (de)serialization. See Instruction.deserialize.
-  public static readonly wireFormat: OperandType[] = [
-    OperandType.UINT8,
-    OperandType.UINT8,
-    OperandType.UINT16,
-    OperandType.UINT16,
-    OperandType.UINT16,
-  ];
 
-  constructor(
-    private addressingMode: number,
-    private slotOffset: number,
-    private contractAddressOffset: number,
-    private dstOffset: number,
-  ) {
-    super();
+  constructor(addressingMode: number, slotOffset: number, dstOffset: number) {
+    super(addressingMode, slotOffset, dstOffset);
   }
 
   public async execute(context: AvmContext): Promise<void> {
@@ -82,14 +76,12 @@ export class SLoad extends Instruction {
       this.baseGasCost(addressing.indirectOperandsCount(), addressing.relativeOperandsCount()),
     );
 
-    const operands = [this.slotOffset, this.contractAddressOffset, this.dstOffset];
-    const [slotOffset, contractAddressOffset, dstOffset] = addressing.resolve(operands, memory);
+    const operands = [this.aOffset, this.bOffset];
+    const [slotOffset, dstOffset] = addressing.resolve(operands, memory);
     memory.checkTag(TypeTag.FIELD, slotOffset);
-    memory.checkTag(TypeTag.FIELD, contractAddressOffset);
 
     const slot = memory.get(slotOffset).toFr();
-    const contractAddress = memory.get(contractAddressOffset).toAztecAddress();
-    const value = await context.persistableState.readStorage(contractAddress, slot);
+    const value = await context.persistableState.readStorage(context.environment.address, slot);
     memory.set(dstOffset, new Field(value));
   }
 }

package/src/public/debug_fn_name.ts

@@ -1,21 +1,20 @@
+import type { Fr } from '@aztec/foundation/curves/bn254';
 import { FunctionSelector } from '@aztec/stdlib/abi';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 
-import type { CallData } from './avm/calldata.js';
 import type { PublicContractsDBInterface } from './db_interfaces.js';
 
 export async function getPublicFunctionDebugName(
   db: PublicContractsDBInterface,
   contractAddress: AztecAddress,
-  calldata: CallData,
+  calldata: Fr[],
 ): Promise<string> {
   // Public function is dispatched and therefore the target function is passed in the first argument.
-  const selectorField = calldata.read(0);
-  if (!selectorField) {
+  if (!calldata[0]) {
     return `<calldata[0] undefined> (Contract Address: ${contractAddress})`;
   }
-  const fallbackName = `<calldata[0]:${selectorField.toString()}> (Contract Address: ${contractAddress})`;
-  const selector = FunctionSelector.fromFieldOrUndefined(selectorField);
+  const fallbackName = `<calldata[0]:${calldata[0].toString()}> (Contract Address: ${contractAddress})`;
+  const selector = FunctionSelector.fromFieldOrUndefined(calldata[0]);
   if (!selector) {
     return fallbackName;
   }
@@ -33,14 +32,13 @@ export async function getPublicFunctionDebugName(
 export async function getPublicFunctionSelectorAndName(
   db: PublicContractsDBInterface,
   contractAddress: AztecAddress,
-  calldata: CallData,
+  calldata: Fr[],
 ): Promise<{ functionSelector?: FunctionSelector; functionName?: string }> {
   // Public function is dispatched and therefore the target function is passed in the first argument.
-  const selectorField = calldata.read(0);
-  if (!selectorField) {
+  if (!calldata[0]) {
     return {};
   }
-  const selector = FunctionSelector.fromFieldOrUndefined(selectorField);
+  const selector = FunctionSelector.fromFieldOrUndefined(calldata[0]);
   if (!selector) {
     return {};
   }

package/src/public/fixtures/opcode_spammer.ts

@@ -966,63 +966,34 @@ export const SPAM_CONFIGS: Partial<Record<Opcode, SpamConfig[]>> = {
   [Opcode.SLOAD]: [
     {
       label: 'Cold read (slot not written)',
-      setup: [
-        { offset: 0, value: new Field(Fr.random()) }, // random slot
-        () => [
-          // Get current contract address into offset 1
-          new GetEnvVar(/*addressing_mode=*/ 0, /*dstOffset=*/ 1, /*varEnum=*/ 0).as(
-            Opcode.GETENVVAR_16,
-            GetEnvVar.wireFormat16,
-          ),
-        ],
-      ],
-      targetInstructions: () => [
-        new SLoad(/*addressing_mode=*/ 0, /*slotOffset=*/ 0, /*contractAddressOffset=*/ 1, /*dstOffset=*/ 2),
-      ],
+      setup: [{ offset: 0, value: new Field(Fr.random()) }], // random slot
+      targetInstructions: () => [new SLoad(/*addressing_mode=*/ 0, /*slotOffset=*/ 0, /*dstOffset=*/ 1)],
     },
     {
       label: 'Warm read (from tree)',
       // Uses pre-inserted storage from insertWarmTreeEntries() which is called after contract deployment
-      setup: [
-        { offset: 0, value: new Field(WARM_STORAGE_SLOT) }, // pre-inserted slot
-        () => [
-          // Get current contract address into offset 1
-          new GetEnvVar(/*addressing_mode=*/ 0, /*dstOffset=*/ 1, /*varEnum=*/ 0).as(
-            Opcode.GETENVVAR_16,
-            GetEnvVar.wireFormat16,
-          ),
-        ],
-      ],
-      targetInstructions: () => [
-        new SLoad(/*addressing_mode=*/ 0, /*slotOffset=*/ 0, /*contractAddressOffset=*/ 1, /*dstOffset=*/ 2),
-      ],
+      setup: [{ offset: 0, value: new Field(WARM_STORAGE_SLOT) }], // pre-inserted slot
+      targetInstructions: () => [new SLoad(/*addressing_mode=*/ 0, /*slotOffset=*/ 0, /*dstOffset=*/ 1)],
     },
     {
       label: 'Warm read (SSTORE first, unique slot per SLOAD)',
-      // Memory layout: slot (incremented), value, constant 1, contract address (from GETENVVAR), revertSize, loaded value
+      // Memory layout: slot (incremented), value, constant 1, revertSize, loaded value
       setup: [
         { offset: 0, value: new Field(Fr.random()) }, // slot (will be incremented)
         { offset: 1, value: new Field(Fr.random()) }, // value to store
         { offset: 2, value: new Field(1n) }, // constant 1 for ADD
-        () => [
-          // Get current contract address into offset 3
-          new GetEnvVar(/*addressing_mode=*/ 0, /*dstOffset=*/ 3, /*varEnum=*/ 0).as(
-            Opcode.GETENVVAR_16,
-            GetEnvVar.wireFormat16,
-          ),
-        ],
-        { offset: 4, value: new Uint32(0n) }, // revertSize
+        { offset: 3, value: new Uint32(0n) }, // revertSize
       ],
       targetInstructions: () => [
         new SStore(/*addressing_mode=*/ 0, /*srcOffset=*/ 1, /*slotOffset=*/ 0),
-        new SLoad(/*addressing_mode=*/ 0, /*slotOffset=*/ 0, /*contractAddressOffset=*/ 3, /*dstOffset=*/ 5),
+        new SLoad(/*addressing_mode=*/ 0, /*slotOffset=*/ 0, /*dstOffset=*/ 4),
         new Add(/*addressing_mode=*/ 0, /*aOffset=*/ 0, /*bOffset=*/ 2, /*dstOffset=*/ 0).as(
           Opcode.ADD_8,
           Add.wireFormat8,
         ), // slot++
       ],
       cleanupInstructions: () => [
-        new Revert(/*addressing_mode=*/ 0, /*retSizeOffset=*/ 4, /*returnOffset=*/ 0).as(
+        new Revert(/*addressing_mode=*/ 0, /*retSizeOffset=*/ 3, /*returnOffset=*/ 0).as(
           Opcode.REVERT_8,
           Revert.wireFormat8,
         ),

package/src/public/fuzzing/avm_simulator_bin.ts

@@ -3,7 +3,6 @@ import { EthAddress } from '@aztec/foundation/eth-address';
 import {
   AvmCircuitPublicInputs,
   type AvmTxHint,
-  PublicTxEffect,
   deserializeFromMessagePack,
   serializeWithMessagePack,
 } from '@aztec/stdlib/avm';
@@ -59,13 +58,7 @@ async function simulateWithFuzzer(
   rawPublicDataWrites: any[], // Public data tree writes to apply before simulation
   rawNoteHashes: any[], // Note hashes to apply before simulation
   protocolContracts: ProtocolContracts, // Protocol contracts mapping from C++
-): Promise<{
-  reverted: boolean;
-  output: Fr[];
-  revertReason?: string;
-  publicInputs: AvmCircuitPublicInputs;
-  publicTxEffect: PublicTxEffect;
-}> {
+): Promise<{ reverted: boolean; output: Fr[]; revertReason?: string; publicInputs: AvmCircuitPublicInputs }> {
   const worldStateService = await openExistingWorldState(dataDir, mapSizeKb);
 
   const simulator = await AvmFuzzerSimulator.create(worldStateService, globals, protocolContracts);
@@ -97,7 +90,6 @@ async function simulateWithFuzzer(
     output,
     revertReason: result.findRevertReason()?.message,
     publicInputs: result.publicInputs!,
-    publicTxEffect: result.publicTxEffect,
   };
 }
 
@@ -127,7 +119,6 @@ async function execute(base64Line: string): Promise<void> {
       output: result.output,
       revertReason: result.revertReason ?? '',
       endTreeSnapshots: result.publicInputs.endTreeSnapshots,
-      publicTxEffect: result.publicTxEffect,
     });
     const base64Response = resultBuffer.toString('base64') + '\n';
     await writeOutput(base64Response);
@@ -138,7 +129,6 @@ async function execute(base64Line: string): Promise<void> {
       output: [] as Fr[],
       revertReason: `Unexpected Error ${error.message}`,
       endTreeSnapshots: TreeSnapshots.empty(),
-      publicTxEffect: PublicTxEffect.empty(),
     });
     await writeOutput(errorResult.toString('base64') + '\n');
   }

package/src/public/public_tx_simulator/public_tx_simulator.ts

@@ -19,7 +19,6 @@ import {
 import { strict as assert } from 'assert';
 
 import type { AvmFinalizedCallResult } from '../avm/avm_contract_call_result.js';
-import { CallDataArray } from '../avm/calldata.js';
 import { AvmSimulator } from '../avm/index.js';
 import { getPublicFunctionDebugName } from '../debug_fn_name.js';
 import { HintingMerkleWriteOperations, HintingPublicContractsDB } from '../hinting_db_sources.js';
@@ -268,7 +267,7 @@ export class PublicTxSimulator implements PublicTxSimulatorInterface {
 
       const enqueuedCallResult = await this.simulateEnqueuedCall(phase, context, callRequest);
 
-      returnValues.push(new NestedProcessReturnValues(enqueuedCallResult.output.bestEffortReadAll()));
+      returnValues.push(new NestedProcessReturnValues(enqueuedCallResult.output));
 
       if (enqueuedCallResult.reverted) {
         reverted = true;
@@ -298,11 +297,7 @@ export class PublicTxSimulator implements PublicTxSimulatorInterface {
   ): Promise<AvmFinalizedCallResult> {
     const stateManager = context.state.getActiveStateManager();
     const contractAddress = callRequest.request.contractAddress;
-    const fnName = await getPublicFunctionDebugName(
-      this.contractsDB,
-      contractAddress,
-      new CallDataArray(callRequest.calldata),
-    );
+    const fnName = await getPublicFunctionDebugName(this.contractsDB, contractAddress, callRequest.calldata);
 
     const allocatedGas = context.getGasLeftAtPhase(phase);
 
@@ -362,7 +357,7 @@ export class PublicTxSimulator implements PublicTxSimulatorInterface {
       transactionFee,
       this.globalVariables,
       request.isStaticCall,
-      new CallDataArray(calldata),
+      calldata,
       allocatedGas,
       this.config,
     );

package/dest/public/avm/calldata.d.ts

@@ -1,51 +0,0 @@
-import type { Fr } from '@aztec/foundation/schemas';
-import { TaggedMemory } from './avm_memory_types.js';
-export interface LazyReader {
-    bestEffortReadAll(readCap?: number): Fr[];
-    readAll(): Fr[];
-    read(idx: number): Fr | undefined;
-    slice(start: number, end: number): Fr[];
-    length(): number;
-}
-export declare class LazyReaderMemory implements LazyReader {
-    private memory;
-    private offset;
-    private size;
-    constructor(memory: TaggedMemory, offset: number, size: number);
-    bestEffortReadAll(readCap?: number): Fr[];
-    read(idx: number): Fr | undefined;
-    slice(start: number, end: number): Fr[];
-    readAll(): Fr[];
-    length(): number;
-}
-export declare class LazyReaderArray implements LazyReader {
-    private array;
-    constructor(array: Fr[]);
-    bestEffortReadAll(readCap?: number): Fr[];
-    read(idx: number): Fr | undefined;
-    slice(start: number, end: number): Fr[];
-    readAll(): Fr[];
-    length(): number;
-}
-declare const CallDataBrand: unique symbol;
-declare const ReturnDataBrand: unique symbol;
-export type CallData = LazyReader & {
-    readonly [CallDataBrand]: true;
-};
-export type ReturnData = LazyReader & {
-    readonly [ReturnDataBrand]: true;
-};
-export declare class CallDataArray extends LazyReaderArray implements CallData {
-    readonly [CallDataBrand]: true;
-}
-export declare class CallDataMemory extends LazyReaderMemory implements CallData {
-    readonly [CallDataBrand]: true;
-}
-export declare class ReturnDataArray extends LazyReaderArray implements ReturnData {
-    readonly [ReturnDataBrand]: true;
-}
-export declare class ReturnDataMemory extends LazyReaderMemory implements ReturnData {
-    readonly [ReturnDataBrand]: true;
-}
-export {};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2FsbGRhdGEuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9wdWJsaWMvYXZtL2NhbGxkYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBRXBELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUtyRCxNQUFNLFdBQVcsVUFBVTtJQUN6QixpQkFBaUIsQ0FBQyxPQUFPLENBQUMsRUFBRSxNQUFNLEdBQUcsRUFBRSxFQUFFLENBQUM7SUFDMUMsT0FBTyxJQUFJLEVBQUUsRUFBRSxDQUFDO0lBQ2hCLElBQUksQ0FBQyxHQUFHLEVBQUUsTUFBTSxHQUFHLEVBQUUsR0FBRyxTQUFTLENBQUM7SUFDbEMsS0FBSyxDQUFDLEtBQUssRUFBRSxNQUFNLEVBQUUsR0FBRyxFQUFFLE1BQU0sR0FBRyxFQUFFLEVBQUUsQ0FBQztJQUN4QyxNQUFNLElBQUksTUFBTSxDQUFDO0NBQ2xCO0FBRUQscUJBQWEsZ0JBQWlCLFlBQVcsVUFBVTtJQUUvQyxPQUFPLENBQUMsTUFBTTtJQUNkLE9BQU8sQ0FBQyxNQUFNO0lBQ2QsT0FBTyxDQUFDLElBQUk7SUFIZCxZQUNVLE1BQU0sRUFBRSxZQUFZLEVBQ3BCLE1BQU0sRUFBRSxNQUFNLEVBQ2QsSUFBSSxFQUFFLE1BQU0sRUFDbEI7SUFFRyxpQkFBaUIsQ0FBQyxPQUFPLFNBQStCLEdBQUcsRUFBRSxFQUFFLENBR3JFO0lBRU0sSUFBSSxDQUFDLEdBQUcsRUFBRSxNQUFNLEdBQUcsRUFBRSxHQUFHLFNBQVMsQ0FLdkM7SUFFTSxLQUFLLENBQUMsS0FBSyxFQUFFLE1BQU0sRUFBRSxHQUFHLEVBQUUsTUFBTSxHQUFHLEVBQUUsRUFBRSxDQUk3QztJQUVNLE9BQU8sSUFBSSxFQUFFLEVBQUUsQ0FFckI7SUFFTSxNQUFNLElBQUksTUFBTSxDQUV0QjtDQUNGO0FBRUQscUJBQWEsZUFBZ0IsWUFBVyxVQUFVO0lBQ3BDLE9BQU8sQ0FBQyxLQUFLO0lBQXpCLFlBQW9CLEtBQUssRUFBRSxFQUFFLEVBQUUsRUFBSTtJQUU1QixpQkFBaUIsQ0FBQyxPQUFPLFNBQStCLEdBQUcsRUFBRSxFQUFFLENBRXJFO0lBRU0sSUFBSSxDQUFDLEdBQUcsRUFBRSxNQUFNLEdBQUcsRUFBRSxHQUFHLFNBQVMsQ0FFdkM7SUFFTSxLQUFLLENBQUMsS0FBSyxFQUFFLE1BQU0sRUFBRSxHQUFHLEVBQUUsTUFBTSxHQUFHLEVBQUUsRUFBRSxDQUU3QztJQUVNLE9BQU8sSUFBSSxFQUFFLEVBQUUsQ0FFckI7SUFFTSxNQUFNLElBQUksTUFBTSxDQUV0QjtDQUNGO0FBR0QsT0FBTyxDQUFDLE1BQU0sYUFBYSxFQUFFLE9BQU8sTUFBTSxDQUFDO0FBQzNDLE9BQU8sQ0FBQyxNQUFNLGVBQWUsRUFBRSxPQUFPLE1BQU0sQ0FBQztBQUU3QyxNQUFNLE1BQU0sUUFBUSxHQUFHLFVBQVUsR0FBRztJQUNsQyxRQUFRLENBQUMsQ0FBQyxhQUFhLENBQUMsRUFBRSxJQUFJLENBQUM7Q0FDaEMsQ0FBQztBQUVGLE1BQU0sTUFBTSxVQUFVLEdBQUcsVUFBVSxHQUFHO0lBQ3BDLFFBQVEsQ0FBQyxDQUFDLGVBQWUsQ0FBQyxFQUFFLElBQUksQ0FBQztDQUNsQyxDQUFDO0FBRUYscUJBQWEsYUFBYyxTQUFRLGVBQWdCLFlBQVcsUUFBUTtJQUNwRSxTQUFpQixDQUFDLGFBQWEsQ0FBQyxFQUFFLElBQUksQ0FBQztDQUN4QztBQUVELHFCQUFhLGNBQWUsU0FBUSxnQkFBaUIsWUFBVyxRQUFRO0lBQ3RFLFNBQWlCLENBQUMsYUFBYSxDQUFDLEVBQUUsSUFBSSxDQUFDO0NBQ3hDO0FBRUQscUJBQWEsZUFBZ0IsU0FBUSxlQUFnQixZQUFXLFVBQVU7SUFDeEUsU0FBaUIsQ0FBQyxlQUFlLENBQUMsRUFBRSxJQUFJLENBQUM7Q0FDMUM7QUFFRCxxQkFBYSxnQkFBaUIsU0FBUSxnQkFBaUIsWUFBVyxVQUFVO0lBQzFFLFNBQWlCLENBQUMsZUFBZSxDQUFDLEVBQUUsSUFBSSxDQUFDO0NBQzFDIn0=