@aztec/simulator 0.0.1-commit.d431d1c → 0.0.1-commit.d58ff9d0

package/src/public/avm/serialization/instruction_serialization.ts

@@ -1,249 +0,0 @@
-import { Fr } from '@aztec/foundation/curves/bn254';
-
-import { strict as assert } from 'assert';
-
-import { TaggedMemory } from '../avm_memory_types.js';
-import { BufferCursor } from './buffer_cursor.js';
-
-/**
- * All AVM opcodes. (Keep in sync with cpp counterpart code avm_opcode.hpp and rs in opcodes.rs).
- * Source: https://yp-aztec.netlify.app/docs/public-vm/instruction-set
- */
-export enum Opcode {
-  // Compute
-  ADD_8,
-  ADD_16,
-  SUB_8,
-  SUB_16,
-  MUL_8,
-  MUL_16,
-  DIV_8,
-  DIV_16,
-  FDIV_8,
-  FDIV_16,
-  EQ_8,
-  EQ_16,
-  LT_8,
-  LT_16,
-  LTE_8,
-  LTE_16,
-  AND_8,
-  AND_16,
-  OR_8,
-  OR_16,
-  XOR_8,
-  XOR_16,
-  NOT_8,
-  NOT_16,
-  SHL_8,
-  SHL_16,
-  SHR_8,
-  SHR_16,
-  CAST_8,
-  CAST_16,
-  // Execution environment
-  GETENVVAR_16,
-  CALLDATACOPY,
-  SUCCESSCOPY,
-  RETURNDATASIZE,
-  RETURNDATACOPY,
-  // Control flow
-  JUMP_32,
-  JUMPI_32,
-  INTERNALCALL,
-  INTERNALRETURN,
-  // Memory
-  SET_8,
-  SET_16,
-  SET_32,
-  SET_64,
-  SET_128,
-  SET_FF,
-  MOV_8,
-  MOV_16,
-  // World state
-  SLOAD,
-  SSTORE,
-  NOTEHASHEXISTS,
-  EMITNOTEHASH,
-  NULLIFIEREXISTS,
-  EMITNULLIFIER,
-  L1TOL2MSGEXISTS,
-  GETCONTRACTINSTANCE,
-  EMITUNENCRYPTEDLOG,
-  SENDL2TOL1MSG,
-  // External calls
-  CALL,
-  STATICCALL,
-  RETURN,
-  REVERT_8,
-  REVERT_16,
-  // Misc
-  DEBUGLOG,
-  // Gadgets
-  POSEIDON2,
-  SHA256COMPRESSION,
-  KECCAKF1600,
-  ECADD,
-  // Conversion
-  TORADIXBE,
-}
-
-export const MAX_OPCODE_VALUE = Math.max(
-  ...Object.values(Opcode)
-    .map(k => +k)
-    .filter(k => !isNaN(k)),
-);
-
-// Possible types for an instruction's operand in its wire format.
-// The counterpart cpp file is: vm2/simulation/lib/serialization.hpp.
-export enum OperandType {
-  UINT8,
-  UINT16,
-  UINT32,
-  UINT64,
-  UINT128,
-  FF,
-  TAG,
-}
-
-// Define a type that represents the possible types of the deserialized values.
-type DeserializedValue = number | bigint;
-
-type OperandNativeType = number | bigint;
-type OperandWriter = (value: any) => void;
-
-// Specifies how to read and write each operand type.
-const OPERAND_SPEC = new Map<OperandType, [number, (offset: number) => OperandNativeType, OperandWriter]>([
-  [OperandType.UINT8, [1, Buffer.prototype.readUint8, Buffer.prototype.writeUint8]],
-  [OperandType.UINT16, [2, Buffer.prototype.readUint16BE, Buffer.prototype.writeUint16BE]],
-  [OperandType.UINT32, [4, Buffer.prototype.readUint32BE, Buffer.prototype.writeUint32BE]],
-  [OperandType.UINT64, [8, readUint64BE, writeUint64BE]],
-  [OperandType.UINT128, [16, readUint128BE, writeUint128BE]],
-  [OperandType.FF, [32, readUint254BE, writeUint254BE]],
-  [OperandType.TAG, [1, Buffer.prototype.readUint8, Buffer.prototype.writeUint8]],
-]);
-
-/**
- * Returns the size of an operand in bytes.
- * Should not be called with unknown operand types.
- * @param operandType
- * @returns number size in bytes
- * @throws AssertionError if the operand type is unknown
- */
-export function getOperandSize(operandType: OperandType): number {
-  assert(OPERAND_SPEC.has(operandType), `Unknown operand type: ${operandType}`);
-  return OPERAND_SPEC.get(operandType)![0];
-}
-
-function readUintBE(buf: Buffer, offset: number, totalBytes: number): bigint {
-  let value: bigint = 0n;
-  for (let i = 0; i < totalBytes; ++i) {
-    value <<= 8n;
-    value |= BigInt(buf.readUint8(i + offset));
-  }
-  return value;
-}
-
-function writeUintBE(buf: Buffer, value: bigint, totalBytes: number): void {
-  for (let offset = totalBytes - 1; offset >= 0; --offset) {
-    buf.writeUint8(Number(value & 0xffn), offset);
-    value >>= 8n;
-  }
-}
-
-function readUint64BE(this: Buffer, offset: number): bigint {
-  return readUintBE(this, offset, 8);
-}
-
-function writeUint64BE(this: Buffer, value: bigint): void {
-  writeUintBE(this, value, 8);
-}
-
-function readUint254BE(this: Buffer, offset: number): bigint {
-  let value = readUintBE(this, offset, 32);
-
-  // In circuit, we only support values up to Fr.MODULUS and any deserialized value
-  // would naturally undergo a modulus reduction.
-  if (value >= Fr.MODULUS) {
-    value = value % Fr.MODULUS;
-  }
-
-  return value;
-}
-
-function writeUint254BE(this: Buffer, value: bigint): void {
-  writeUintBE(this, value, 32);
-}
-
-function readUint128BE(this: Buffer, offset: number): bigint {
-  return readUintBE(this, offset, 16);
-}
-
-function writeUint128BE(this: Buffer, value: bigint): void {
-  writeUintBE(this, value, 16);
-}
-
-/**
- * Reads an array of operands from a buffer.
- * @param cursor Buffer to read from. Might be longer than needed.
- * @param operands Specification of the operand types.
- * @returns An array as big as {@code operands}, with the converted TS values.
- */
-export function deserialize(cursor: BufferCursor | Buffer, operands: OperandType[]): DeserializedValue[] {
-  const argValues: DeserializedValue[] = [];
-  if (Buffer.isBuffer(cursor)) {
-    cursor = new BufferCursor(cursor);
-  }
-
-  for (const opType of operands) {
-    const [sizeBytes, reader, _writer] = OPERAND_SPEC.get(opType)!;
-    const value = reader.call(cursor.buffer(), cursor.position());
-    argValues.push(value);
-    cursor.advance(sizeBytes);
-  }
-
-  // We first want to detect other parsing errors (e.g., instruction size
-  // is longer than remaining bytes) first and therefore tag validation is done after completion
-  // of parsing above. Order of errors need to match with circuit.
-  for (let i = 0; i < operands.length; i++) {
-    if (operands[i] === OperandType.TAG) {
-      // We parsed a single byte (readUInt8()) and therefore value is of number type (not bigint)
-      // We need to cast to number because checkIsValidTag expects a number.
-      TaggedMemory.checkIsValidTag(Number(argValues[i] ?? 0));
-    }
-  }
-
-  return argValues;
-}
-
-/**
- * Serializes a class using the specified operand types.
- * More specifically, this serializes {@code [cls.constructor.opcode, ...Object.values(cls)]}.
- * Observe in particular that:
- *   (1) the first operand type specified must correspond to the opcode;
- *   (2) the rest of the operand types must be specified in the order returned by {@code Object.values()}.
- * @param operands Type specification for the values to be serialized.
- * @param cls The class to be serialized.
- * @returns
- */
-export function serializeAs(operands: OperandType[], opcode: Opcode, cls: any): Buffer {
-  const chunks: Buffer[] = [];
-
-  const rawClassValues: any[] = [opcode, ...Object.values(cls)];
-  assert(
-    rawClassValues.length === operands.length,
-    `Got ${rawClassValues.length} values but only ${operands.length} serialization operands are specified!`,
-  );
-  const classValues = rawClassValues as OperandNativeType[];
-
-  for (let i = 0; i < operands.length; i++) {
-    const opType = operands[i];
-    const [sizeBytes, _reader, writer] = OPERAND_SPEC.get(opType)!;
-    const buf = Buffer.alloc(sizeBytes);
-    writer.call(buf, classValues[i]);
-    chunks.push(buf);
-  }
-
-  return Buffer.concat(chunks);
-}

package/src/public/avm/test_utils.ts

@@ -1,64 +0,0 @@
-import { Fr } from '@aztec/foundation/curves/bn254';
-import type { ContractClassPublic, ContractInstanceWithAddress } from '@aztec/stdlib/contract';
-
-import type { jest } from '@jest/globals';
-import { mock } from 'jest-mock-extended';
-
-import type { PublicContractsDB, PublicTreesDB } from '../public_db_sources.js';
-import type { PublicSideEffectTraceInterface } from '../side_effect_trace_interface.js';
-
-export function mockTraceFork(trace: PublicSideEffectTraceInterface, nestedTrace?: PublicSideEffectTraceInterface) {
-  (trace as jest.Mocked<PublicSideEffectTraceInterface>).fork.mockReturnValue(
-    nestedTrace ?? mock<PublicSideEffectTraceInterface>(),
-  );
-}
-
-export function mockStorageRead(worldStateDB: PublicTreesDB, value: Fr) {
-  (worldStateDB as jest.Mocked<PublicTreesDB>).storageRead.mockResolvedValue(value);
-}
-
-export function mockNoteHashCount(mockedTrace: PublicSideEffectTraceInterface, count: number) {
-  (mockedTrace as jest.Mocked<PublicSideEffectTraceInterface>).getNoteHashCount.mockReturnValue(count);
-}
-
-export function mockStorageReadWithMap(worldStateDB: PublicTreesDB, mockedStorage: Map<bigint, Fr>) {
-  (worldStateDB as jest.Mocked<PublicTreesDB>).storageRead.mockImplementation((_address, slot) =>
-    Promise.resolve(mockedStorage.get(slot.toBigInt()) ?? Fr.ZERO),
-  );
-}
-
-export function mockGetNoteHash(worldStateDB: PublicTreesDB, _leafIndex: bigint, value?: Fr) {
-  (worldStateDB as jest.Mocked<PublicTreesDB>).getNoteHash.mockImplementation((index: bigint) => {
-    if (index == _leafIndex && value) {
-      return Promise.resolve(value);
-    } else {
-      return Promise.resolve(Fr.ZERO);
-    }
-  });
-}
-
-export function mockCheckNullifierExists(worldStateDB: PublicTreesDB, exists: boolean, _ignoredValue?: Fr) {
-  (worldStateDB as jest.Mocked<PublicTreesDB>).checkNullifierExists.mockResolvedValue(exists);
-}
-
-export function mockGetL1ToL2LeafValue(worldStateDB: PublicTreesDB, leafIndex: bigint, value?: Fr) {
-  (worldStateDB as jest.Mocked<PublicTreesDB>).getL1ToL2LeafValue.mockImplementation((index: bigint) => {
-    if (index == leafIndex && value) {
-      return Promise.resolve(value);
-    } else {
-      return Promise.resolve(Fr.ZERO!);
-    }
-  });
-}
-
-export function mockGetContractInstance(contractsDB: PublicContractsDB, contractInstance: ContractInstanceWithAddress) {
-  (contractsDB as jest.Mocked<PublicContractsDB>).getContractInstance.mockResolvedValue(contractInstance);
-}
-
-export function mockGetContractClass(contractsDB: PublicContractsDB, contractClass: ContractClassPublic) {
-  (contractsDB as jest.Mocked<PublicContractsDB>).getContractClass.mockResolvedValue(contractClass);
-}
-
-export function mockGetBytecodeCommitment(contractsDB: PublicContractsDB, commitment: Fr) {
-  (contractsDB as jest.Mocked<PublicContractsDB>).getBytecodeCommitment.mockResolvedValue(commitment);
-}

package/src/public/debug_fn_name.ts

@@ -1,50 +0,0 @@
-import type { Fr } from '@aztec/foundation/curves/bn254';
-import { FunctionSelector } from '@aztec/stdlib/abi';
-import type { AztecAddress } from '@aztec/stdlib/aztec-address';
-
-import type { PublicContractsDBInterface } from './db_interfaces.js';
-
-export async function getPublicFunctionDebugName(
-  db: PublicContractsDBInterface,
-  contractAddress: AztecAddress,
-  calldata: Fr[],
-): Promise<string> {
-  // Public function is dispatched and therefore the target function is passed in the first argument.
-  if (!calldata[0]) {
-    return `<calldata[0] undefined> (Contract Address: ${contractAddress})`;
-  }
-  const fallbackName = `<calldata[0]:${calldata[0].toString()}> (Contract Address: ${contractAddress})`;
-  const selector = FunctionSelector.fromFieldOrUndefined(calldata[0]);
-  if (!selector) {
-    return fallbackName;
-  }
-  return (await db.getDebugFunctionName(contractAddress, selector)) ?? fallbackName;
-}
-
-/**
- * Get the function selector and optional debug name for a public function.
- * Returns the selector and name separately, with name only populated if a debug name is available.
- * @param db - The contracts database
- * @param contractAddress - The contract address
- * @param calldata - The calldata (selector is in calldata[0])
- * @returns An object with functionSelector (always if calldata[0] exists) and functionName (only if debug name found)
- */
-export async function getPublicFunctionSelectorAndName(
-  db: PublicContractsDBInterface,
-  contractAddress: AztecAddress,
-  calldata: Fr[],
-): Promise<{ functionSelector?: FunctionSelector; functionName?: string }> {
-  // Public function is dispatched and therefore the target function is passed in the first argument.
-  if (!calldata[0]) {
-    return {};
-  }
-  const selector = FunctionSelector.fromFieldOrUndefined(calldata[0]);
-  if (!selector) {
-    return {};
-  }
-  const debugName = await db.getDebugFunctionName(contractAddress, selector);
-  return {
-    functionSelector: selector,
-    functionName: debugName ?? undefined,
-  };
-}

package/src/public/fixtures/custom_bytecode_tests.ts

@@ -1,228 +0,0 @@
-import { strict as assert } from 'assert';
-
-import { TypeTag } from '../avm/avm_memory_types.js';
-import { Addressing, AddressingMode } from '../avm/opcodes/addressing_mode.js';
-import { Add, CalldataCopy, Jump, Return, Set } from '../avm/opcodes/index.js';
-import { encodeToBytecode } from '../avm/serialization/bytecode_serialization.js';
-import {
-  MAX_OPCODE_VALUE,
-  Opcode,
-  OperandType,
-  getOperandSize,
-} from '../avm/serialization/instruction_serialization.js';
-import { deployAndExecuteCustomBytecode } from './custom_bytecode_tester.js';
-import { PublicTxSimulationTester } from './public_tx_simulation_tester.js';
-
-// First instruction resolved a base address (offset 0) which is uninitialized and therefore
-// of invalid tag (FF). This will trigger an exceptional halt.
-export async function addressingWithBaseTagIssueTest(isIndirect: boolean, tester: PublicTxSimulationTester) {
-  const addressingMode = Addressing.fromModes([
-    isIndirect ? AddressingMode.INDIRECT_RELATIVE : AddressingMode.RELATIVE,
-    AddressingMode.DIRECT,
-    AddressingMode.DIRECT,
-  ]);
-
-  const bytecode = encodeToBytecode([
-    new CalldataCopy(/*addressing_mode=*/ addressingMode.toWire(), /*copySize=*/ 1, /*cdOffset=*/ 0, /*dstOffset=*/ 0),
-    new Return(/*addressing_mode=*/ 0, /*copySizeOffset=*/ 0, /*returnOffset=*/ 0),
-  ]);
-
-  const txLabel = isIndirect ? 'AddressingWithBaseTagInvalidIndirect' : 'AddressingWithBaseTagInvalidDirect';
-  return await deployAndExecuteCustomBytecode(bytecode, tester, txLabel);
-}
-
-// First instruction sets a value with tag U64 at offset 0. Then a CalldataCopy instruction
-// uses INDIRECT addressing to read from offset 0, which should fail because the value at
-// offset 0 has tag U64 (not U32), making it an invalid address tag.
-export async function addressingWithIndirectTagIssueTest(tester: PublicTxSimulationTester) {
-  // Set a U64 value at offset 0 - this will be used as an indirect address
-  const addressingMode = Addressing.fromModes([
-    AddressingMode.INDIRECT, // First operand (cdOffset) uses indirect addressing
-    AddressingMode.DIRECT,
-    AddressingMode.DIRECT,
-  ]);
-
-  const bytecode = encodeToBytecode([
-    // Set a U64 value at offset 0 - this has the wrong tag for an address (should be U32)
-    new Set(/*addressing_mode=*/ 0, /*dstOffset=*/ 0, TypeTag.UINT64, /*value=*/ 100n).as(
-      Opcode.SET_64,
-      Set.wireFormat64,
-    ),
-    // Try to use indirect addressing: read from offset 0, which contains a U64 value
-    // This should fail because U64 is not a valid address tag (must be U32)
-    new CalldataCopy(/*addressing_mode=*/ addressingMode.toWire(), /*copySize=*/ 1, /*cdOffset=*/ 0, /*dstOffset=*/ 1),
-    new Return(/*addressing_mode=*/ 0, /*copySizeOffset=*/ 0, /*returnOffset=*/ 0),
-  ]);
-
-  const txLabel = 'AddressingWithIndirectTagInvalid';
-  return await deployAndExecuteCustomBytecode(bytecode, tester, txLabel);
-}
-
-// First instruction sets a value 10 with tag U32 at offset 1 (direct, no relative).
-// Then an ADD_16 instruction uses INDIRECT addressing for the first operand (offset 1)
-// and RELATIVE addressing for the second operand (offset 2). The indirect addressing
-// succeeds (reads U32 value 10 from offset 1, uses it as address), but the relative
-// addressing fails because the base address at offset 0 has the wrong tag (uninitialized/invalid).
-export async function addressingWithIndirectThenRelativeTagIssueTest(tester: PublicTxSimulationTester) {
-  const addressingMode = Addressing.fromModes([
-    AddressingMode.INDIRECT, // First operand (aOffset) uses indirect addressing, no relative
-    AddressingMode.RELATIVE, // Second operand (bOffset) uses relative addressing
-    AddressingMode.DIRECT, // Third operand (dstOffset) uses direct addressing
-  ]);
-
-  const bytecode = encodeToBytecode([
-    // Set a U32 value 10 at offset 1 - this will be used as an indirect address
-    new Set(/*addressing_mode=*/ 0, /*dstOffset=*/ 1, TypeTag.UINT32, /*value=*/ 10).as(
-      Opcode.SET_32,
-      Set.wireFormat32,
-    ),
-    // ADD_16: first operand uses indirect addressing (reads from offset 1, gets value 10, uses as address - succeeds)
-    //         second operand uses relative addressing (tries to read base from offset 0, but offset 0 has wrong tag - fails)
-    new Add(/*addressing_mode=*/ addressingMode.toWire(), /*aOffset=*/ 1, /*bOffset=*/ 2, /*dstOffset=*/ 3).as(
-      Opcode.ADD_16,
-      Add.wireFormat16,
-    ),
-    new Return(/*addressing_mode=*/ 0, /*copySizeOffset=*/ 0, /*returnOffset=*/ 0),
-  ]);
-
-  const txLabel = 'AddressingWithIndirectThenRelativeTagInvalid';
-  return await deployAndExecuteCustomBytecode(bytecode, tester, txLabel);
-}
-
-// First instruction sets UINT32_MAX at offset 0 (base address) with tag U32.
-// Then an ADD_8 instruction uses INDIRECT_RELATIVE addressing for the first operand (offset 1)
-// and INDIRECT addressing for the second operand (offset 2). The relative addressing
-// for the first operand will overflow (UINT32_MAX + 1 >= MAX_MEMORY_SIZE), causing the instruction to fail.
-// The second operand will also fail (indirect addressing from offset 2 which is uninitialized with tag FF).
-export async function addressingWithRelativeOverflowAndIndirectTagIssueTest(tester: PublicTxSimulationTester) {
-  const addressingMode = Addressing.fromModes([
-    AddressingMode.INDIRECT_RELATIVE, // First operand (aOffset) uses both indirect and relative addressing
-    AddressingMode.INDIRECT, // Second operand (bOffset) uses indirect addressing only
-    AddressingMode.DIRECT, // Third operand (dstOffset) uses direct addressing
-  ]);
-
-  // UINT32_MAX = 2^32 - 1 = 4294967295
-  const UINT32_MAX = 0xffffffff;
-
-  const bytecode = encodeToBytecode([
-    // Set UINT32_MAX at offset 0 as base address - this will cause overflow when adding relative offset 1
-    new Set(/*addressing_mode=*/ 0, /*dstOffset=*/ 0, TypeTag.UINT32, /*value=*/ UINT32_MAX).as(
-      Opcode.SET_32,
-      Set.wireFormat32,
-    ),
-    new Add(/*addressing_mode=*/ addressingMode.toWire(), /*aOffset=*/ 1, /*bOffset=*/ 2, /*dstOffset=*/ 3).as(
-      Opcode.ADD_8,
-      Add.wireFormat8,
-    ),
-    new Return(/*addressing_mode=*/ 0, /*copySizeOffset=*/ 0, /*returnOffset=*/ 0),
-  ]);
-
-  const txLabel = 'AddressingWithRelativeOverflowAndIndirectTagInvalid';
-  return await deployAndExecuteCustomBytecode(bytecode, tester, txLabel);
-}
-
-export async function pcOutOfRangeTest(tester: PublicTxSimulationTester) {
-  const bytecode = encodeToBytecode([
-    new Jump(/*jumpOffset=*/ 123), // Jump to out-of-range pc offset.
-    new Return(/*addressing_mode=*/ 0, /*copySizeOffset=*/ 0, /*returnOffset=*/ 0),
-  ]);
-
-  const txLabel = 'PcOutOfRange';
-  return await deployAndExecuteCustomBytecode(bytecode, tester, txLabel);
-}
-
-export async function invalidOpcodeTest(tester: PublicTxSimulationTester) {
-  let bytecode = encodeToBytecode([
-    new Set(/*addressing_mode=*/ 0, /*dstOffset=*/ 0, TypeTag.UINT32, /*value=*/ 0).as(Opcode.SET_8, Set.wireFormat8),
-  ]);
-
-  const offsetReturnOpcodeByte = bytecode.length;
-
-  bytecode = Buffer.concat([
-    bytecode,
-    encodeToBytecode([new Return(/*addressing_mode=*/ 0, /*copySizeOffset=*/ 0, /*returnOffset=*/ 0)]),
-  ]);
-
-  // Manipulate the Return opcode to make the opcode invalid (out of range).
-  bytecode[offsetReturnOpcodeByte] = MAX_OPCODE_VALUE + 1; // opcode is invalid.
-
-  const txLabel = 'InvalidOpcode';
-  return await deployAndExecuteCustomBytecode(bytecode, tester, txLabel);
-}
-
-// Single invalid byte in the bytecode.
-export async function invalidByteTest(tester: PublicTxSimulationTester) {
-  const invalidOpcode = MAX_OPCODE_VALUE + 7;
-  assert(invalidOpcode < 256, 'Invalid opcode must fit in a single byte');
-  const bytecode = Buffer.from([invalidOpcode]);
-
-  const txLabel = 'InvalidByte';
-  return await deployAndExecuteCustomBytecode(bytecode, tester, txLabel);
-}
-
-// Truncate the last instruction in the bytecode.
-export async function instructionTruncatedTest(tester: PublicTxSimulationTester) {
-  let bytecode = encodeToBytecode([
-    new Set(/*addressing_mode=*/ 0, /*dstOffset=*/ 0, TypeTag.UINT32, /*value=*/ 0).as(Opcode.SET_8, Set.wireFormat8),
-  ]);
-
-  // Truncate the bytecode.
-  bytecode = bytecode.subarray(0, -1);
-
-  const txLabel = 'InstructionTruncated';
-  return await deployAndExecuteCustomBytecode(bytecode, tester, txLabel);
-}
-
-// Invalid tag value byte in an instruction.
-export async function invalidTagValueTest(tester: PublicTxSimulationTester) {
-  const bytecode = encodeToBytecode([
-    new Set(/*addressing_mode=*/ 0, /*dstOffset=*/ 0, TypeTag.UINT32, /*value=*/ 0).as(Opcode.SET_8, Set.wireFormat8),
-    new Return(/*addressing_mode=*/ 0, /*copySizeOffset=*/ 0, /*returnOffset=*/ 0),
-  ]);
-
-  const tagOffset = getTagOffsetInInstruction(Set.wireFormat8);
-  assert(bytecode[tagOffset].valueOf() == TypeTag.UINT32.valueOf(), 'Set instruction tag should be UINT32 in test');
-  bytecode[tagOffset] = TypeTag.INVALID;
-
-  const txLabel = 'InvalidTagValue';
-  return await deployAndExecuteCustomBytecode(bytecode, tester, txLabel);
-}
-
-// Combine an invalid tag in the last instruction that is truncated.
-export async function invalidTagValueAndInstructionTruncatedTest(tester: PublicTxSimulationTester) {
-  let bytecode = encodeToBytecode([
-    // Important: value argument must be a bigint otherwise a type error will be thrown.
-    new Set(/*addressing_mode=*/ 0, /*dstOffset=*/ 0, TypeTag.UINT128, /*value=*/ 0n).as(
-      Opcode.SET_128,
-      Set.wireFormat128,
-    ),
-  ]);
-
-  // Truncate the bytecode.
-  bytecode = bytecode.subarray(0, -5);
-  const tagOffset = getTagOffsetInInstruction(Set.wireFormat128);
-  assert(bytecode[tagOffset].valueOf() == TypeTag.UINT128.valueOf(), 'Set instruction tag should be UINT128 in test');
-  bytecode[tagOffset] = 0x6f; // Invalid tag value.
-
-  const txLabel = 'InvalidTagValueAndInstructionTruncated';
-  return await deployAndExecuteCustomBytecode(bytecode, tester, txLabel);
-}
-
-/**
- * Returns the offset of the tag in an instruction.
- * @details Loops over the wire format operand type entries until it finds the tag.
- * Returns the byte offset of the tag based on each operand size that is passed.
- *
- * @param wireFormat array of operand types
- * @returns byte offset of the tag
- */
-function getTagOffsetInInstruction(wireFormat: OperandType[]): number {
-  let offset = 0;
-  for (const operand of wireFormat) {
-    if (operand === OperandType.TAG) {
-      break;
-    }
-    offset += getOperandSize(operand);
-  }
-  return offset;
-}

package/src/public/fixtures/minimal_public_tx.ts

@@ -1,26 +0,0 @@
-import type { PublicTxResult } from '@aztec/stdlib/avm';
-import { ProtocolContracts } from '@aztec/stdlib/tx';
-
-import { TypeTag } from '../avm/avm_memory_types.js';
-import { Add, Return, Set } from '../avm/opcodes/index.js';
-import { encodeToBytecode } from '../avm/serialization/bytecode_serialization.js';
-import { Opcode } from '../avm/serialization/instruction_serialization.js';
-import { deployAndExecuteCustomBytecode } from './custom_bytecode_tester.js';
-import { PublicTxSimulationTester } from './public_tx_simulation_tester.js';
-
-export async function executeAvmMinimalPublicTx(tester: PublicTxSimulationTester): Promise<PublicTxResult> {
-  const minimalBytecode = encodeToBytecode([
-    new Set(/*indirect*/ 0, /*dstOffset*/ 0, TypeTag.UINT32, /*value*/ 1).as(Opcode.SET_8, Set.wireFormat8),
-    new Set(/*indirect*/ 0, /*dstOffset*/ 1, TypeTag.UINT32, /*value*/ 2).as(Opcode.SET_8, Set.wireFormat8),
-    new Add(/*addressing_mode=*/ 0, /*aOffset=*/ 0, /*bOffset=*/ 1, /*dstOffset=*/ 2).as(Opcode.ADD_8, Add.wireFormat8),
-    new Return(/*addressing_mode=*/ 0, /*copySizeOffset=*/ 0, /*returnOffset=*/ 2),
-  ]);
-
-  const result = await deployAndExecuteCustomBytecode(minimalBytecode, tester, 'MinimalTx', 'AvmMinimalContract');
-
-  // Modify the protocol contracts to be all zeros
-  result.hints!.protocolContracts = ProtocolContracts.empty();
-  result.publicInputs!.protocolContracts = ProtocolContracts.empty();
-
-  return result;
-}