@aztec/simulator 0.0.1-commit.c2eed6949 → 0.0.1-commit.c52d6e7

package/src/public/cdb_ipc_server.ts

@@ -0,0 +1,198 @@
+/**
+ * UDS server for AVM CDB requests.
+ *
+ * Transport (socket, framing, per-connection response ordering) is handled by the shared
+ * `UdsIpcServer` from `@aztec/ipc-runtime`; message dispatch comes from the generated CDB
+ * server. This class only implements the generated handler interface and routes requests to
+ * PublicContractsDB instances by fork ID.
+ */
+import {
+  type CdbAddContracts,
+  type CdbAddContractsResponse,
+  type CdbCommitCheckpoint,
+  type CdbCommitCheckpointResponse,
+  type CdbCreateCheckpoint,
+  type CdbCreateCheckpointResponse,
+  type CdbGetBytecodeCommitment,
+  type CdbGetBytecodeCommitmentResponse,
+  type CdbGetContractClass,
+  type CdbGetContractClassResponse,
+  type CdbGetContractInstance,
+  type CdbGetContractInstanceResponse,
+  type CdbGetDebugFunctionName,
+  type CdbGetDebugFunctionNameResponse,
+  type Handler as CdbHandler,
+  type CdbRevertCheckpoint,
+  type CdbRevertCheckpointResponse,
+  handleRequest,
+} from '@aztec/cdb';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { type Logger, createLogger } from '@aztec/foundation/log';
+import { UdsIpcServer } from '@aztec/ipc-runtime';
+import { FunctionSelector } from '@aztec/stdlib/abi';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { ContractDeploymentData, type ContractInstanceWithAddress } from '@aztec/stdlib/contract';
+
+import { Decoder, Encoder } from 'msgpackr';
+import * as os from 'node:os';
+import * as path from 'node:path';
+import { threadId } from 'node:worker_threads';
+
+import type { PublicContractsDB } from './public_db_sources.js';
+
+const encoder = new Encoder({ useRecords: false });
+const decoder = new Decoder({ useRecords: false });
+
+let instanceCounter = 0;
+
+function toFieldBuffer(field: Fr | AztecAddress): Buffer {
+  return field.toBuffer();
+}
+
+/** Serializes contract instances to the AVM CDB wire shape. */
+export function serializeContractInstance(instance: ContractInstanceWithAddress): Record<string, unknown> {
+  return {
+    salt: toFieldBuffer(instance.salt),
+    deployer: toFieldBuffer(instance.deployer),
+    currentContractClassId: toFieldBuffer(instance.currentContractClassId),
+    originalContractClassId: toFieldBuffer(instance.originalContractClassId),
+    initializationHash: toFieldBuffer(instance.initializationHash),
+    immutablesHash: toFieldBuffer(instance.immutablesHash),
+    publicKeys: {
+      npkMHash: toFieldBuffer(instance.publicKeys.npkMHash),
+      ivpkM: {
+        x: toFieldBuffer(instance.publicKeys.ivpkM.x),
+        y: toFieldBuffer(instance.publicKeys.ivpkM.y),
+      },
+      ovpkMHash: toFieldBuffer(instance.publicKeys.ovpkMHash),
+      tpkMHash: toFieldBuffer(instance.publicKeys.tpkMHash),
+      mspkMHash: toFieldBuffer(instance.publicKeys.mspkMHash),
+      fbpkMHash: toFieldBuffer(instance.publicKeys.fbpkMHash),
+    },
+  };
+}
+
+/** Serializes contract classes to the AVM CDB wire shape. */
+function serializeContractClass(contractClass: {
+  id: Fr;
+  artifactHash: Fr;
+  privateFunctionsRoot: Fr;
+  packedBytecode: Buffer;
+}): Record<string, unknown> {
+  return {
+    id: toFieldBuffer(contractClass.id),
+    artifactHash: toFieldBuffer(contractClass.artifactHash),
+    privateFunctionsRoot: toFieldBuffer(contractClass.privateFunctionsRoot),
+    packedBytecode: contractClass.packedBytecode,
+  };
+}
+
+/** Routes AVM CDB IPC requests to registered PublicContractsDB forks. */
+export class CdbIpcServer implements CdbHandler {
+  public readonly ipcPath: string;
+  private server: Promise<UdsIpcServer>;
+  private log: Logger;
+  /** Maps WSDB fork IDs to contracts DB/timestamp pairs for concurrent simulations. */
+  private forks = new Map<number, { db: PublicContractsDB; timestamp: bigint }>();
+
+  constructor() {
+    this.log = createLogger('cdb-ipc-server');
+    this.ipcPath = path.join(os.tmpdir(), `cdb-ts-${process.pid}-${threadId}-${instanceCounter++}.sock`);
+
+    // Listen asynchronously; the C++ AVM retries connecting until the socket is up.
+    this.server = UdsIpcServer.listen(this.ipcPath, (_clientId, request) => handleRequest(this, request));
+    this.server.then(
+      () => this.log.debug(`CDB IPC server listening on ${this.ipcPath}`),
+      err => this.log.error(`CDB IPC server failed to listen on ${this.ipcPath}`, { err }),
+    );
+  }
+
+  /** Register a PublicContractsDB for a given WSDB fork ID. */
+  registerFork(forkId: number, contractsDB: PublicContractsDB, timestamp: bigint): void {
+    this.forks.set(forkId, { db: contractsDB, timestamp });
+  }
+
+  /** Unregister a fork's contracts DB (call after simulation completes). */
+  unregisterFork(forkId: number): void {
+    this.forks.delete(forkId);
+  }
+
+  /** Close the server and all active connections. */
+  async close(): Promise<void> {
+    const server = await this.server.catch(() => undefined);
+    await server?.close();
+  }
+
+  async [Symbol.asyncDispose](): Promise<void> {
+    await this.close();
+  }
+
+  /** Look up the contracts DB for a given fork ID, throwing if not registered. */
+  private getFork(forkId: number): { db: PublicContractsDB; timestamp: bigint } {
+    const fork = this.forks.get(forkId);
+    if (!fork) {
+      const registered = Array.from(this.forks.keys()).sort((a, b) => a - b);
+      throw new Error(
+        `CDB server: no contracts DB registered for forkId ${forkId} (registered=[${registered.join(',')}])`,
+      );
+    }
+    return fork;
+  }
+
+  async getContractInstance(command: CdbGetContractInstance): Promise<CdbGetContractInstanceResponse> {
+    const { db, timestamp } = this.getFork(command.forkId);
+    const address = AztecAddress.fromBuffer(Buffer.from(command.address));
+    const instance = await db.getContractInstance(address, timestamp);
+    return { instance: instance ? encoder.encode(serializeContractInstance(instance)) : null };
+  }
+
+  async getContractClass(command: CdbGetContractClass): Promise<CdbGetContractClassResponse> {
+    const { db } = this.getFork(command.forkId);
+    const classId = Fr.fromBuffer(Buffer.from(command.classId));
+    const contractClass = await db.getContractClass(classId);
+    return { contractClass: contractClass ? encoder.encode(serializeContractClass(contractClass)) : null };
+  }
+
+  async getBytecodeCommitment(command: CdbGetBytecodeCommitment): Promise<CdbGetBytecodeCommitmentResponse> {
+    const { db } = this.getFork(command.forkId);
+    const classId = Fr.fromBuffer(Buffer.from(command.classId));
+    const commitment = await db.getBytecodeCommitment(classId);
+    return { commitment: commitment ? toFieldBuffer(commitment) : null };
+  }
+
+  async getDebugFunctionName(command: CdbGetDebugFunctionName): Promise<CdbGetDebugFunctionNameResponse> {
+    const { db } = this.getFork(command.forkId);
+    const address = AztecAddress.fromBuffer(Buffer.from(command.address));
+    const selectorField = Fr.fromBuffer(Buffer.from(command.selector));
+    const selector = FunctionSelector.fromFieldOrUndefined(selectorField);
+    const name = selector ? await db.getDebugFunctionName(address, selector) : undefined;
+    return { name: name ?? null };
+  }
+
+  addContracts(command: CdbAddContracts): Promise<CdbAddContractsResponse> {
+    const { db } = this.getFork(command.forkId);
+    const contractDeploymentData = ContractDeploymentData.fromPlainObject(
+      decoder.decode(command.contractDeploymentData),
+    );
+    db.addContractsFromLogs(contractDeploymentData);
+    return Promise.resolve({});
+  }
+
+  createCheckpoint(command: CdbCreateCheckpoint): Promise<CdbCreateCheckpointResponse> {
+    const { db } = this.getFork(command.forkId);
+    db.createCheckpoint();
+    return Promise.resolve({});
+  }
+
+  commitCheckpoint(command: CdbCommitCheckpoint): Promise<CdbCommitCheckpointResponse> {
+    const { db } = this.getFork(command.forkId);
+    db.commitCheckpoint();
+    return Promise.resolve({});
+  }
+
+  revertCheckpoint(command: CdbRevertCheckpoint): Promise<CdbRevertCheckpointResponse> {
+    const { db } = this.getFork(command.forkId);
+    db.revertCheckpoint();
+    return Promise.resolve({});
+  }
+}

package/src/public/fixtures/amm_test.ts

@@ -25,8 +25,8 @@ export async function ammTest(
 ) {
   const timer = new Timer();
 
-  const admin = AztecAddress.fromNumber(42);
-  const sender = AztecAddress.fromNumber(111);
+  const admin = AztecAddress.fromNumberUnsafe(42);
+  const sender = AztecAddress.fromNumberUnsafe(111);
 
   logger.debug(`Deploying tokens`);
   const token0 = await setUpToken(tester, tokenArtifact, admin, expectToBeTrue, /*seed=*/ 0);

package/src/public/fixtures/bulk_test.ts

@@ -13,7 +13,7 @@ export async function bulkTest(
 ) {
   const timer = new Timer();
 
-  const deployer = AztecAddress.fromNumber(42);
+  const deployer = AztecAddress.fromNumberUnsafe(42);
   const avmTestContract = await tester.registerAndDeployContract(
     /*constructorArgs=*/ [],
     deployer,
@@ -25,14 +25,26 @@ export async function bulkTest(
   // Register multiple different protocol contracts (to ensure we don't dedup bytecode hashing events):
   await tester.registerAuthContract();
   await tester.registerInstanceRegistryContract();
+  await tester.registerClassRegistryContract();
 
   // Get a deployed contract instance to pass to the contract
   // for it to use as "expected" values when testing contract instance retrieval.
   const expectContractInstance = avmTestContract;
   const argsField = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10].map(x => new Fr(x));
-  const argsU8 = [1, 2, 3, 4, 5, 6, 7, 8].map(x => new Fr(x));
-  argsU8.push(new Fr(2n ** 128n + 9n)); // Trigger truncation from large (> 128 bits) value (canonical decomposition event)
-  argsU8.push(new Fr(2n ** 125n + 10n)); // Trigger truncation from small (< 128 bits) value (no canonical decomposition event)
+  const argsU8 = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10].map(x => new Fr(x));
+  // Pinned grumpkin-Poseidon2 Schnorr signature (mirrors the C++ `pinned_test_vector_large`
+  // and noir-lang/schnorr v0.4.0's `pinned_vector_large`). Passing these in as calldata
+  // (rather than baking them into Noir as constants) keeps MSM + Poseidon2 from being folded
+  // by the Noir compiler.
+  const schnorrInputs = [
+    Fr.fromHexString('0x065812e335a97c2108ea8cf4ccfe2f9dd6b117a0714f5e18461575be93f61da6'), // pubkey.x
+    Fr.fromHexString('0x1a915003e8ec534f9a15d926a7ded478e178468ccc4f28e236e67450a55ac622'), // pubkey.y
+    Fr.fromHexString('0xf3bc3b7147acb9c621fd9f72dbf15ffa'), // sig_s.lo
+    Fr.fromHexString('0x08599f379f0301dfefdbd0272554454d'), // sig_s.hi
+    Fr.fromHexString('0x97065383ebbbd76620398792bd259bc2'), // sig_e.lo
+    Fr.fromHexString('0x2ceaee87f45b7a417f0ffb05451a8c92'), // sig_e.hi
+    Fr.fromHexString('0x0123456789abcdef0fedcba9876543210123456789abcdef0fedcba987654321'), // message
+  ];
   const args = [
     argsField,
     argsU8,
@@ -40,6 +52,8 @@ export async function bulkTest(
     /*expectedDeployer=*/ expectContractInstance.deployer,
     /*expectedClassId=*/ expectContractInstance.currentContractClassId,
     /*expectedInitializationHash=*/ expectContractInstance.initializationHash,
+    /*expectedImmutablesHash=*/ expectContractInstance.immutablesHash,
+    /*schnorrInputs=*/ schnorrInputs,
     /*skip_strictly_limited_side_effects=*/ false,
   ];
 
@@ -62,7 +76,7 @@ export async function bulkTest(
       {
         address: avmTestContract.address,
         fnName: 'assert_calldata_copy',
-        args: [argsField.slice(3), /* with_selector: */ true],
+        args: [argsField.slice(0, 3), /* with_selector: */ true],
       },
       {
         address: avmTestContract.address,
@@ -100,7 +114,7 @@ export async function megaBulkTest(
 ) {
   const timer = new Timer();
 
-  const deployer = AztecAddress.fromNumber(42);
+  const deployer = AztecAddress.fromNumberUnsafe(42);
   const avmTestContract = await tester.registerAndDeployContract(
     /*constructorArgs=*/ [],
     deployer,
@@ -123,6 +137,15 @@ export async function megaBulkTest(
   //const argsField7 = [15, 2, 3, 4, 5, 6, 7, 8, 9, 10].map(x => new Fr(x));
   //const argsField8 = [17, 2, 3, 4, 5, 6, 7, 8, 9, 10].map(x => new Fr(x));
   const argsU8 = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10].map(x => new Fr(x));
+  const schnorrInputs = [
+    Fr.fromHexString('0x065812e335a97c2108ea8cf4ccfe2f9dd6b117a0714f5e18461575be93f61da6'), // pubkey.x
+    Fr.fromHexString('0x1a915003e8ec534f9a15d926a7ded478e178468ccc4f28e236e67450a55ac622'), // pubkey.y
+    Fr.fromHexString('0xf3bc3b7147acb9c621fd9f72dbf15ffa'), // sig_s.lo
+    Fr.fromHexString('0x08599f379f0301dfefdbd0272554454d'), // sig_s.hi
+    Fr.fromHexString('0x97065383ebbbd76620398792bd259bc2'), // sig_e.lo
+    Fr.fromHexString('0x2ceaee87f45b7a417f0ffb05451a8c92'), // sig_e.hi
+    Fr.fromHexString('0x0123456789abcdef0fedcba9876543210123456789abcdef0fedcba987654321'), // message
+  ];
   const genArgs = (argsField: Fr[]) => [
     argsField,
     argsU8,
@@ -130,6 +153,8 @@ export async function megaBulkTest(
     /*expectedDeployer=*/ expectContractInstance.deployer.toField(),
     /*expectedClassId=*/ expectContractInstance.currentContractClassId.toField(),
     /*expectedInitializationHash=*/ expectContractInstance.initializationHash.toField(),
+    /*expectedImmutablesHash=*/ expectContractInstance.immutablesHash.toField(),
+    /*schnorrInputs=*/ schnorrInputs,
     // Must skip strictly limited side effects (logs, messages) so we can spam the bulk test several times.
     /*skip_strictly_limited_side_effects=*/ true,
   ];

package/src/public/fixtures/custom_bytecode_tester.ts

@@ -17,7 +17,7 @@ export async function deployCustomBytecode(
   bytecode: Buffer,
   tester: PublicTxSimulationTester,
   contractName: string = 'CustomBytecodeContract',
-  deployer: AztecAddress = AztecAddress.fromNumber(42),
+  deployer: AztecAddress = AztecAddress.fromNumberUnsafe(42),
 ): Promise<ContractInstanceWithAddress> {
   const contractArtifact = emptyContractArtifact();
   contractArtifact.name = contractName;
@@ -75,7 +75,7 @@ export async function deployAndExecuteCustomBytecode(
   tester: PublicTxSimulationTester,
   txLabel: string = 'CustomBytecodeTest',
   contractName: string = 'CustomBytecodeContract',
-  deployer: AztecAddress = AztecAddress.fromNumber(42),
+  deployer: AztecAddress = AztecAddress.fromNumberUnsafe(42),
   calldata: any[] = [],
 ): Promise<PublicTxResult> {
   const testContract = await deployCustomBytecode(bytecode, tester, contractName, deployer);

package/src/public/fixtures/index.ts

@@ -1,15 +1,13 @@
 export * from './public_tx_simulation_tester.js';
+export * from './public_processor_test_env.js';
 export * from './utils.js';
 export * from './simple_contract_data_source.js';
-export { executeAvmMinimalPublicTx } from './minimal_public_tx.js';
 export { TestExecutorMetrics } from '../test_executor_metrics.js';
 export { ammTest } from './amm_test.js';
 export { bulkTest, megaBulkTest } from './bulk_test.js';
 export { tokenTest } from './token_test.js';
-export * from './custom_bytecode_tests.js';
 export {
   deployCustomBytecode,
   executeCustomBytecode,
   deployAndExecuteCustomBytecode,
 } from './custom_bytecode_tester.js';
-export { getSpamConfigsPerOpcode, testOpcodeSpamCase } from './opcode_spammer.js';

package/src/public/fixtures/public_processor_test_env.ts

@@ -0,0 +1,88 @@
+import { createLogger } from '@aztec/foundation/log';
+import { TestDateProvider } from '@aztec/foundation/timer';
+import { PublicSimulatorConfig } from '@aztec/stdlib/avm';
+import { GasFees } from '@aztec/stdlib/gas';
+import { GlobalVariables } from '@aztec/stdlib/tx';
+import { getTelemetryClient } from '@aztec/telemetry-client';
+import { NativeWorldStateService } from '@aztec/world-state';
+
+import { AvmSimulatorPool } from '../avm_simulator_pool.js';
+import { PublicContractsDB } from '../public_db_sources.js';
+import { GuardedMerkleTreeOperations } from '../public_processor/guarded_merkle_tree.js';
+import { PublicProcessor } from '../public_processor/public_processor.js';
+import { PublicTxSimulator } from '../public_tx_simulator/public_tx_simulator.js';
+import { PublicTxSimulationTester } from './public_tx_simulation_tester.js';
+import { SimpleContractDataSource } from './simple_contract_data_source.js';
+
+/** Options for {@link PublicProcessorTestEnv.create}. */
+export interface PublicProcessorTestEnvOptions {
+  /** Global variables shared by the processor and the tester. Defaults to empty with nonzero gas fees. */
+  globals?: GlobalVariables;
+  /** Simulator config for the processor's PublicTxSimulator. */
+  config?: Partial<PublicSimulatorConfig>;
+}
+
+function defaultGlobals(): GlobalVariables {
+  const globals = GlobalVariables.empty();
+  globals.gasFees = new GasFees(2, 3);
+  return globals;
+}
+
+const defaultConfig = PublicSimulatorConfig.from({
+  skipFeeEnforcement: false,
+  collectDebugLogs: true,
+  collectHints: false,
+  collectStatistics: false,
+  collectCallMetadata: true,
+});
+
+/**
+ * Bundles the real-AVM wiring shared by public-processor app tests: a live WSDB world state, a CDB IPC
+ * server, a spawned AVM simulator, a {@link PublicProcessor} backed by all three, and a setup-only
+ * {@link PublicTxSimulationTester} sharing the same fork and contract data source for building txs and
+ * seeding balances. Own it with `await using`, or call {@link Symbol.asyncDispose} from `afterEach`.
+ */
+export class PublicProcessorTestEnv implements AsyncDisposable {
+  private constructor(
+    public readonly processor: PublicProcessor,
+    public readonly tester: PublicTxSimulationTester,
+    public readonly contractsDB: PublicContractsDB,
+    public readonly globals: GlobalVariables,
+    private readonly worldStateService: NativeWorldStateService,
+    private readonly avmSimulator: AvmSimulatorPool,
+  ) {}
+
+  static async create(opts: PublicProcessorTestEnvOptions = {}): Promise<PublicProcessorTestEnv> {
+    const globals = opts.globals ?? defaultGlobals();
+    const config = opts.config ? PublicSimulatorConfig.from({ ...defaultConfig, ...opts.config }) : defaultConfig;
+
+    const contractDataSource = new SimpleContractDataSource();
+    const worldStateService = await NativeWorldStateService.tmp();
+    const merkleTrees = await worldStateService.fork();
+    const contractsDB = new PublicContractsDB(contractDataSource);
+
+    const forkId = merkleTrees.getRevision().forkId;
+    const avmSimulator = await AvmSimulatorPool.spawn({ wsdbIpcPath: worldStateService.getIpcPath() });
+
+    const simulator = new PublicTxSimulator(avmSimulator, globals, contractsDB, forkId, config, undefined);
+    const processor = new PublicProcessor(
+      globals,
+      new GuardedMerkleTreeOperations(merkleTrees),
+      contractsDB,
+      simulator,
+      new TestDateProvider(),
+      getTelemetryClient(),
+      createLogger('simulator:public-processor'),
+    );
+
+    const tester = new PublicTxSimulationTester(merkleTrees, contractDataSource, globals);
+
+    return new PublicProcessorTestEnv(processor, tester, contractsDB, globals, worldStateService, avmSimulator);
+  }
+
+  async [Symbol.asyncDispose](): Promise<void> {
+    await this.avmSimulator[Symbol.asyncDispose]();
+    await this.tester.close();
+    await this.worldStateService.close();
+  }
+}

package/src/public/fixtures/public_tx_simulation_tester.ts

@@ -1,9 +1,4 @@
-import {
-  DEFAULT_TEARDOWN_DA_GAS_LIMIT,
-  DEFAULT_TEARDOWN_L2_GAS_LIMIT,
-  PUBLIC_TX_L2_GAS_OVERHEAD,
-  TX_DA_GAS_OVERHEAD,
-} from '@aztec/constants';
+import { PUBLIC_TX_L2_GAS_OVERHEAD, TX_DA_GAS_OVERHEAD } from '@aztec/constants';
 import { asyncMap } from '@aztec/foundation/async-map';
 import { BlockNumber } from '@aztec/foundation/branded-types';
 import { Fr } from '@aztec/foundation/curves/bn254';
@@ -16,22 +11,24 @@ import { PublicCallRequest } from '@aztec/stdlib/kernel';
 import { GlobalVariables, PublicCallRequestWithCalldata, type Tx } from '@aztec/stdlib/tx';
 import { NativeWorldStateService } from '@aztec/world-state';
 
-import { BaseAvmSimulationTester } from '../avm/fixtures/base_avm_simulation_tester.js';
+import { BaseAvmSimulationTester } from '../avm/testing/base_avm_simulation_tester.js';
 import {
   DEFAULT_BLOCK_NUMBER,
   DEFAULT_TIMESTAMP,
   getContractFunctionAbi,
   getFunctionSelector,
-} from '../avm/fixtures/utils.js';
+} from '../avm/testing/utils.js';
+import { AvmSimulatorPool } from '../avm_simulator_pool.js';
 import { PublicContractsDB } from '../public_db_sources.js';
-import { MeasuredCppPublicTxSimulator } from '../public_tx_simulator/cpp_public_tx_simulator.js';
-import { MeasuredCppVsTsPublicTxSimulator } from '../public_tx_simulator/cpp_vs_ts_public_tx_simulator.js';
+import { MeasuredPublicTxSimulator } from '../public_tx_simulator/public_tx_simulator.js';
 import type { MeasuredPublicTxSimulatorInterface } from '../public_tx_simulator/public_tx_simulator_interface.js';
 import { TestExecutorMetrics } from '../test_executor_metrics.js';
 import { SimpleContractDataSource } from './simple_contract_data_source.js';
 import { type TestPrivateInsertions, createTxForPublicCalls } from './utils.js';
 
 const DEFAULT_GAS_FEES = new GasFees(2, 3);
+const TEARDOWN_DA_GAS_LIMIT = 98_304;
+const TEARDOWN_L2_GAS_LIMIT = 817_500;
 
 export type TestEnqueuedCall = {
   sender?: AztecAddress;
@@ -69,8 +66,9 @@ export type MeasuredSimulatorFactory = (
  */
 export class PublicTxSimulationTester extends BaseAvmSimulationTester {
   protected txCount: number = 0;
-  private simulator: MeasuredPublicTxSimulatorInterface;
+  private simulator: MeasuredPublicTxSimulatorInterface | undefined;
   private metricsPrefix?: string;
+  protected avmSimulator?: AvmSimulatorPool;
 
   constructor(
     merkleTree: MerkleTreeWriteOperations,
@@ -86,7 +84,9 @@ export class PublicTxSimulationTester extends BaseAvmSimulationTester {
     if (simulatorFactory) {
       this.simulator = simulatorFactory(merkleTree, contractsDB, globals, this.metrics, config);
     } else {
-      this.simulator = new MeasuredCppPublicTxSimulator(merkleTree, contractsDB, globals, this.metrics, config);
+      // No simulator — this tester can only be used for setup (setFeePayerBalance, createTx, etc.)
+      // To simulate, use PublicTxSimulationTester.create() or pass a simulatorFactory.
+      this.simulator = undefined;
     }
   }
 
@@ -94,15 +94,25 @@ export class PublicTxSimulationTester extends BaseAvmSimulationTester {
     worldStateService: NativeWorldStateService, // make sure to close this later
     globals: GlobalVariables = defaultGlobals(),
     metrics: TestExecutorMetrics = new TestExecutorMetrics(),
-    useCppSimulator = false,
     config: PublicSimulatorConfig = defaultConfig,
   ): Promise<PublicTxSimulationTester> {
     const contractDataSource = new SimpleContractDataSource();
     const merkleTree = await worldStateService.fork();
-    const simulatorFactory: MeasuredSimulatorFactory = useCppSimulator
-      ? (mt, cdb, g, m, c) => new MeasuredCppPublicTxSimulator(mt, cdb, g, m, c)
-      : (mt, cdb, g, m, c) => new MeasuredCppVsTsPublicTxSimulator(mt, cdb, g, m, c);
-    return new PublicTxSimulationTester(merkleTree, contractDataSource, globals, metrics, simulatorFactory, config);
+
+    const avmSimulator = await AvmSimulatorPool.spawn({ wsdbIpcPath: worldStateService.getIpcPath() });
+    const simulatorFactory: MeasuredSimulatorFactory = (mt, cdb, g, m, c) =>
+      new MeasuredPublicTxSimulator(avmSimulator, g, cdb, mt.getRevision().forkId, m, c, undefined);
+
+    const tester = new PublicTxSimulationTester(
+      merkleTree,
+      contractDataSource,
+      globals,
+      metrics,
+      simulatorFactory,
+      config,
+    );
+    tester.avmSimulator = avmSimulator;
+    return tester;
   }
 
   public setMetricsPrefix(prefix: string) {
@@ -137,10 +147,7 @@ export class PublicTxSimulationTester extends BaseAvmSimulationTester {
       teardownCallRequest,
       feePayer,
       /*gasUsedByPrivate*/ teardownCall
-        ? new Gas(
-            DEFAULT_TEARDOWN_DA_GAS_LIMIT + TX_DA_GAS_OVERHEAD,
-            DEFAULT_TEARDOWN_L2_GAS_LIMIT + PUBLIC_TX_L2_GAS_OVERHEAD,
-          )
+        ? new Gas(TEARDOWN_DA_GAS_LIMIT + TX_DA_GAS_OVERHEAD, TEARDOWN_L2_GAS_LIMIT + PUBLIC_TX_L2_GAS_OVERHEAD)
         : new Gas(TX_DA_GAS_OVERHEAD, PUBLIC_TX_L2_GAS_OVERHEAD),
       defaultGlobals(),
       gasLimits,
@@ -172,8 +179,6 @@ export class PublicTxSimulationTester extends BaseAvmSimulationTester {
     }
     const avmResult = await this.simulator.simulate(tx, fullTxLabel);
 
-    await this.#recordBytecodeSizes(fullTxLabel, [...setupCalls, ...appCalls, ...(teardownCall ? [teardownCall] : [])]);
-
     // Something like this is often useful for debugging:
     //if (avmResult.revertReason) {
     //  // resolve / enrich revert reason
@@ -203,18 +208,8 @@ export class PublicTxSimulationTester extends BaseAvmSimulationTester {
     teardownCall?: TestEnqueuedCall,
     feePayer?: AztecAddress,
     privateInsertions?: TestPrivateInsertions,
-    gasLimits?: Gas,
   ): Promise<PublicTxResult> {
-    return await this.simulateTx(
-      sender,
-      setupCalls,
-      appCalls,
-      teardownCall,
-      feePayer,
-      privateInsertions,
-      txLabel,
-      gasLimits,
-    );
+    return await this.simulateTx(sender, setupCalls, appCalls, teardownCall, feePayer, privateInsertions, txLabel);
   }
 
   /**
@@ -232,7 +227,6 @@ export class PublicTxSimulationTester extends BaseAvmSimulationTester {
     teardownCall?: TestEnqueuedCall,
     feePayer?: AztecAddress,
     privateInsertions?: TestPrivateInsertions,
-    gasLimits?: Gas,
   ): Promise<PublicTxResult> {
     return await this.simulateTxWithLabel(
       txLabel,
@@ -242,7 +236,6 @@ export class PublicTxSimulationTester extends BaseAvmSimulationTester {
       teardownCall,
       feePayer,
       privateInsertions,
-      gasLimits,
     );
   }
 
@@ -250,22 +243,31 @@ export class PublicTxSimulationTester extends BaseAvmSimulationTester {
     this.metrics.prettyPrint();
   }
 
+  /** Clean up IPC resources (AVM simulator pool and merkle tree fork) created by create(). */
+  public async close(): Promise<void> {
+    await this.avmSimulator?.[Symbol.asyncDispose]();
+    // Close the merkle tree fork to release IPC resources before the wsdb process is killed.
+    if (this.merkleTrees?.close) {
+      await this.merkleTrees.close().catch(() => {});
+    }
+  }
+
   /**
    * Cancel the current simulation if one is in progress.
-   * This signals the underlying simulator (e.g., C++) to stop at the next safe point.
+   * This signals the underlying simulator to stop at the next safe point.
    * Safe to call even if no simulation is in progress.
    *
    * @param waitTimeoutMs - If provided, wait up to this many ms for the simulation to actually stop.
    */
   public async cancel(waitTimeoutMs?: number): Promise<void> {
-    await this.simulator.cancel?.(waitTimeoutMs);
+    await this.simulator?.cancel?.(waitTimeoutMs);
   }
 
   /**
    * Get the underlying simulator for advanced test scenarios.
    * Use this when you need direct control over simulation (e.g., for testing cancellation).
    */
-  public getSimulator(): MeasuredPublicTxSimulatorInterface {
+  public getSimulator(): MeasuredPublicTxSimulatorInterface | undefined {
     return this.simulator;
   }
 
@@ -302,27 +304,6 @@ export class PublicTxSimulationTester extends BaseAvmSimulationTester {
 
     return new PublicCallRequestWithCalldata(request, calldata);
   }
-
-  // WARNING: Deduplicates by artifact name, so two different artifacts with the same name
-  // in a single tx would only record the first one's bytecode size.
-  async #recordBytecodeSizes(txLabel: string, calls: TestEnqueuedCall[]) {
-    const seenArtifactNames = new Set<string>();
-    for (const call of calls) {
-      const artifact = await this.contractDataSource.getContractArtifact(call.address);
-      if (!artifact || seenArtifactNames.has(artifact.name)) {
-        continue;
-      }
-      seenArtifactNames.add(artifact.name);
-      const instance = await this.contractDataSource.getContract(call.address);
-      if (!instance) {
-        continue;
-      }
-      const contractClass = await this.contractDataSource.getContractClass(instance.currentContractClassId);
-      if (contractClass) {
-        this.metrics.recordBytecodeSize(txLabel, artifact.name, contractClass.packedBytecode.length);
-      }
-    }
-  }
 }
 
 export function defaultGlobals() {

package/src/public/fixtures/simple_contract_data_source.ts

@@ -5,7 +5,7 @@ import type { ContractArtifact, FunctionSelector } from '@aztec/stdlib/abi';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { ContractClassPublic, ContractDataSource, ContractInstanceWithAddress } from '@aztec/stdlib/contract';
 
-import { getFunctionSelector } from '../avm/fixtures/utils.js';
+import { getFunctionSelector } from '../avm/testing/utils.js';
 
 /**
  * This class is used during public/avm testing to function as a database of

package/src/public/fixtures/token_test.ts

@@ -21,9 +21,9 @@ export async function tokenTest(
 ) {
   const timer = new Timer();
 
-  const admin = AztecAddress.fromNumber(42);
-  const sender = AztecAddress.fromNumber(111);
-  const receiver = AztecAddress.fromNumber(222);
+  const admin = AztecAddress.fromNumberUnsafe(42);
+  const sender = AztecAddress.fromNumberUnsafe(111);
+  const receiver = AztecAddress.fromNumberUnsafe(222);
 
   const token = await setUpToken(tester, tokenArtifact, admin, expectToBeTrue);