@aztec/simulator 3.0.0-nightly.20251211 → 3.0.0-nightly.20251213

package/dest/public/fixtures/simple_contract_data_source.d.ts

@@ -32,13 +32,5 @@ export declare class SimpleContractDataSource implements ContractDataSource {
     registerContractFunctionSignatures(_signatures: string[]): Promise<void>;
     addContractClass(contractClass: ContractClassPublic): Promise<void>;
     addContractInstance(contractInstance: ContractInstanceWithAddress): Promise<void>;
-    /**
-     * FIXME: This is temporary
-     * Helper method for fuzzer: registers a contract with raw bytecode at a given address.
-     * Creates a minimal ContractClassPublic and ContractInstanceWithAddress.
-     * @param address - The contract address
-     * @param bytecode - The raw AVM bytecode
-     */
-    addContractWithBytecode(address: AztecAddress, bytecode: Buffer): Promise<void>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2ltcGxlX2NvbnRyYWN0X2RhdGFfc291cmNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcHVibGljL2ZpeHR1cmVzL3NpbXBsZV9jb250cmFjdF9kYXRhX3NvdXJjZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNuRSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFFcEQsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUM1RSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxrQkFBa0IsRUFBRSwyQkFBMkIsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBS25IOzs7Ozs7R0FNRztBQUNILHFCQUFhLHdCQUF5QixZQUFXLGtCQUFrQjtJQUMxRCxNQUFNLHlDQUErQztJQUc1RCxPQUFPLENBQUMsZUFBZSxDQUErQztJQUV0RSxPQUFPLENBQUMsaUJBQWlCLENBQXVEO0lBRWhGLE9BQU8sQ0FBQyxpQkFBaUIsQ0FBNEM7SUFFckUsT0FBTyxDQUFDLGlCQUFpQixDQUFrQztJQUkzRDs7O09BR0c7SUFDRyxjQUFjLENBQ2xCLGdCQUFnQixFQUFFLGdCQUFnQixFQUNsQyxhQUFhLEVBQUUsbUJBQW1CLEVBQ2xDLGdCQUFnQixFQUFFLDJCQUEyQixpQkFLOUM7SUFFSyxtQkFBbUIsQ0FBQyxPQUFPLEVBQUUsRUFBRSxFQUFFLFFBQVEsRUFBRSxnQkFBZ0IsaUJBY2hFO0lBSUQsY0FBYyxJQUFJLE9BQU8sQ0FBQyxXQUFXLENBQUMsQ0FFckM7SUFFRCxnQkFBZ0IsQ0FBQyxFQUFFLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxtQkFBbUIsR0FBRyxTQUFTLENBQUMsQ0FFakU7SUFFRCxxQkFBcUIsQ0FBQyxHQUFHLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxFQUFFLEdBQUcsU0FBUyxDQUFDLENBRXREO0lBRUQsV0FBVyxDQUFDLE9BQU8sRUFBRSxZQUFZLEdBQUcsT0FBTyxDQUFDLDJCQUEyQixHQUFHLFNBQVMsQ0FBQyxDQUVuRjtJQUVELG1CQUFtQixJQUFJLE9BQU8sQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUVuQztJQUVLLG1CQUFtQixDQUFDLE9BQU8sRUFBRSxZQUFZLEdBQUcsT0FBTyxDQUFDLGdCQUFnQixHQUFHLFNBQVMsQ0FBQyxDQVN0RjtJQUVLLG9CQUFvQixDQUFDLE9BQU8sRUFBRSxZQUFZLEVBQUUsUUFBUSxFQUFFLGdCQUFnQixHQUFHLE9BQU8sQ0FBQyxNQUFNLEdBQUcsU0FBUyxDQUFDLENBYXpHO0lBRUQsa0NBQWtDLENBQUMsV0FBVyxFQUFFLE1BQU0sRUFBRSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FFdkU7SUFFRCxnQkFBZ0IsQ0FBQyxhQUFhLEVBQUUsbUJBQW1CLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUdsRTtJQUVELG1CQUFtQixDQUFDLGdCQUFnQixFQUFFLDJCQUEyQixHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FHaEY7SUFFRDs7Ozs7O09BTUc7SUFDRyx1QkFBdUIsQ0FBQyxPQUFPLEVBQUUsWUFBWSxFQUFFLFFBQVEsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQTZCcEY7Q0FDRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2ltcGxlX2NvbnRyYWN0X2RhdGFfc291cmNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcHVibGljL2ZpeHR1cmVzL3NpbXBsZV9jb250cmFjdF9kYXRhX3NvdXJjZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNuRSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFFcEQsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUM1RSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxrQkFBa0IsRUFBRSwyQkFBMkIsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBSW5IOzs7Ozs7R0FNRztBQUNILHFCQUFhLHdCQUF5QixZQUFXLGtCQUFrQjtJQUMxRCxNQUFNLHlDQUErQztJQUc1RCxPQUFPLENBQUMsZUFBZSxDQUErQztJQUV0RSxPQUFPLENBQUMsaUJBQWlCLENBQXVEO0lBRWhGLE9BQU8sQ0FBQyxpQkFBaUIsQ0FBNEM7SUFFckUsT0FBTyxDQUFDLGlCQUFpQixDQUFrQztJQUkzRDs7O09BR0c7SUFDRyxjQUFjLENBQ2xCLGdCQUFnQixFQUFFLGdCQUFnQixFQUNsQyxhQUFhLEVBQUUsbUJBQW1CLEVBQ2xDLGdCQUFnQixFQUFFLDJCQUEyQixpQkFLOUM7SUFFSyxtQkFBbUIsQ0FBQyxPQUFPLEVBQUUsRUFBRSxFQUFFLFFBQVEsRUFBRSxnQkFBZ0IsaUJBY2hFO0lBSUQsY0FBYyxJQUFJLE9BQU8sQ0FBQyxXQUFXLENBQUMsQ0FFckM7SUFFRCxnQkFBZ0IsQ0FBQyxFQUFFLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxtQkFBbUIsR0FBRyxTQUFTLENBQUMsQ0FFakU7SUFFRCxxQkFBcUIsQ0FBQyxHQUFHLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxFQUFFLEdBQUcsU0FBUyxDQUFDLENBRXREO0lBRUQsV0FBVyxDQUFDLE9BQU8sRUFBRSxZQUFZLEdBQUcsT0FBTyxDQUFDLDJCQUEyQixHQUFHLFNBQVMsQ0FBQyxDQUVuRjtJQUVELG1CQUFtQixJQUFJLE9BQU8sQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUVuQztJQUVLLG1CQUFtQixDQUFDLE9BQU8sRUFBRSxZQUFZLEdBQUcsT0FBTyxDQUFDLGdCQUFnQixHQUFHLFNBQVMsQ0FBQyxDQVN0RjtJQUVLLG9CQUFvQixDQUFDLE9BQU8sRUFBRSxZQUFZLEVBQUUsUUFBUSxFQUFFLGdCQUFnQixHQUFHLE9BQU8sQ0FBQyxNQUFNLEdBQUcsU0FBUyxDQUFDLENBYXpHO0lBRUQsa0NBQWtDLENBQUMsV0FBVyxFQUFFLE1BQU0sRUFBRSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FFdkU7SUFFRCxnQkFBZ0IsQ0FBQyxhQUFhLEVBQUUsbUJBQW1CLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUdsRTtJQUVELG1CQUFtQixDQUFDLGdCQUFnQixFQUFFLDJCQUEyQixHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FHaEY7Q0FDRiJ9

package/dest/public/fixtures/simple_contract_data_source.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"simple_contract_data_source.d.ts","sourceRoot":"","sources":["../../../src/public/fixtures/simple_contract_data_source.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEpD,OAAO,KAAK,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC5E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAKnH;;;;;;GAMG;AACH,qBAAa,wBAAyB,YAAW,kBAAkB;IAC1D,MAAM,yCAA+C;IAG5D,OAAO,CAAC,eAAe,CAA+C;IAEtE,OAAO,CAAC,iBAAiB,CAAuD;IAEhF,OAAO,CAAC,iBAAiB,CAA4C;IAErE,OAAO,CAAC,iBAAiB,CAAkC;IAI3D;;;OAGG;IACG,cAAc,CAClB,gBAAgB,EAAE,gBAAgB,EAClC,aAAa,EAAE,mBAAmB,EAClC,gBAAgB,EAAE,2BAA2B,iBAK9C;IAEK,mBAAmB,CAAC,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,gBAAgB,iBAchE;IAID,cAAc,IAAI,OAAO,CAAC,WAAW,CAAC,CAErC;IAED,gBAAgB,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC,CAEjE;IAED,qBAAqB,CAAC,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC,CAEtD;IAED,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,2BAA2B,GAAG,SAAS,CAAC,CAEnF;IAED,mBAAmB,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC,CAEnC;IAEK,mBAAmB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CAStF;IAEK,oBAAoB,CAAC,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAazG;IAED,kCAAkC,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAEvE;IAED,gBAAgB,CAAC,aAAa,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAGlE;IAED,mBAAmB,CAAC,gBAAgB,EAAE,2BAA2B,GAAG,OAAO,CAAC,IAAI,CAAC,CAGhF;IAED;;;;;;OAMG;IACG,uBAAuB,CAAC,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA6BpF;CACF"}
+{"version":3,"file":"simple_contract_data_source.d.ts","sourceRoot":"","sources":["../../../src/public/fixtures/simple_contract_data_source.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEpD,OAAO,KAAK,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC5E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAInH;;;;;;GAMG;AACH,qBAAa,wBAAyB,YAAW,kBAAkB;IAC1D,MAAM,yCAA+C;IAG5D,OAAO,CAAC,eAAe,CAA+C;IAEtE,OAAO,CAAC,iBAAiB,CAAuD;IAEhF,OAAO,CAAC,iBAAiB,CAA4C;IAErE,OAAO,CAAC,iBAAiB,CAAkC;IAI3D;;;OAGG;IACG,cAAc,CAClB,gBAAgB,EAAE,gBAAgB,EAClC,aAAa,EAAE,mBAAmB,EAClC,gBAAgB,EAAE,2BAA2B,iBAK9C;IAEK,mBAAmB,CAAC,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,gBAAgB,iBAchE;IAID,cAAc,IAAI,OAAO,CAAC,WAAW,CAAC,CAErC;IAED,gBAAgB,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC,CAEjE;IAED,qBAAqB,CAAC,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC,CAEtD;IAED,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,2BAA2B,GAAG,SAAS,CAAC,CAEnF;IAED,mBAAmB,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC,CAEnC;IAEK,mBAAmB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CAStF;IAEK,oBAAoB,CAAC,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAazG;IAED,kCAAkC,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAEvE;IAED,gBAAgB,CAAC,aAAa,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAGlE;IAED,mBAAmB,CAAC,gBAAgB,EAAE,2BAA2B,GAAG,OAAO,CAAC,IAAI,CAAC,CAGhF;CACF"}

package/dest/public/fixtures/simple_contract_data_source.js

@@ -1,6 +1,4 @@
-import { Fr } from '@aztec/foundation/curves/bn254';
 import { createLogger } from '@aztec/foundation/log';
-import { PublicKeys } from '@aztec/stdlib/keys';
 import { getFunctionSelector } from '../avm/fixtures/utils.js';
 /**
  * This class is used during public/avm testing to function as a database of
@@ -94,37 +92,4 @@ import { getFunctionSelector } from '../avm/fixtures/utils.js';
         this.contractInstances.set(contractInstance.address.toString(), contractInstance);
         return Promise.resolve();
     }
-    /**
-   * FIXME: This is temporary
-   * Helper method for fuzzer: registers a contract with raw bytecode at a given address.
-   * Creates a minimal ContractClassPublic and ContractInstanceWithAddress.
-   * @param address - The contract address
-   * @param bytecode - The raw AVM bytecode
-   */ async addContractWithBytecode(address, bytecode) {
-        // Generate a deterministic class ID from the bytecode
-        const classId = Fr.fromBufferReduce(bytecode.subarray(0, 32));
-        // Create minimal ContractClassPublic
-        const contractClass = {
-            id: classId,
-            version: 1,
-            artifactHash: Fr.ZERO,
-            privateFunctionsRoot: Fr.ZERO,
-            privateFunctions: [],
-            utilityFunctions: [],
-            packedBytecode: bytecode
-        };
-        // Create minimal ContractInstanceWithAddress
-        const contractInstance = {
-            address,
-            version: 1,
-            salt: Fr.ZERO,
-            deployer: address,
-            currentContractClassId: classId,
-            originalContractClassId: classId,
-            initializationHash: Fr.ZERO,
-            publicKeys: PublicKeys.default()
-        };
-        await this.addContractClass(contractClass);
-        await this.addContractInstance(contractInstance);
-    }
 }

package/dest/public/fuzzing/avm_fuzzer_simulator.d.ts

@@ -0,0 +1,46 @@
+import { AvmTxHint, type PublicTxResult } from '@aztec/stdlib/avm';
+import type { MerkleTreeWriteOperations } from '@aztec/stdlib/trees';
+import { GlobalVariables } from '@aztec/stdlib/tx';
+import type { NativeWorldStateService } from '@aztec/world-state';
+import { BaseAvmSimulationTester } from '../avm/fixtures/base_avm_simulation_tester.js';
+import { SimpleContractDataSource } from '../fixtures/simple_contract_data_source.js';
+/**
+ * Request structure for fuzzer simulation communication from C++.
+ * Matches the C++ FuzzerSimulationRequest struct
+ */
+export declare class FuzzerSimulationRequest {
+    readonly wsDataDir: string;
+    readonly wsMapSizeKb: number;
+    readonly tx: AvmTxHint;
+    readonly globals: GlobalVariables;
+    readonly contractClasses: any[];
+    readonly contractInstances: [any, any][];
+    constructor(wsDataDir: string, wsMapSizeKb: number, tx: AvmTxHint, globals: GlobalVariables, contractClasses: any[], contractInstances: [any, any][]);
+    static fromPlainObject(obj: any): FuzzerSimulationRequest;
+}
+/**
+ * A simulator class for the AVM fuzzer that extends BaseAvmSimulationTester.
+ * It provides methods for registering contracts from C++ msgpack data and simulating transactions.
+ */
+export declare class AvmFuzzerSimulator extends BaseAvmSimulationTester {
+    private simulator;
+    constructor(merkleTrees: MerkleTreeWriteOperations, contractDataSource: SimpleContractDataSource, globals: GlobalVariables);
+    /**
+     * Static factory method to create an AvmFuzzerSimulator.
+     */
+    static create(worldStateService: NativeWorldStateService, globals: GlobalVariables): Promise<AvmFuzzerSimulator>;
+    /**
+     * Simulate a transaction from a C++ AvmTxHint.
+     */
+    simulate(txHint: AvmTxHint): Promise<PublicTxResult>;
+    /**
+     * Add a contract class from C++ raw msgpack data.
+     */
+    addContractClassFromCpp(rawClass: any): Promise<void>;
+    /**
+     * Add a contract instance from C++ raw msgpack data.
+     * This also inserts the contract address nullifier into the nullifier tree.
+     */
+    addContractInstanceFromCpp(rawAddress: any, rawInstance: any): Promise<void>;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXZtX2Z1enplcl9zaW11bGF0b3IuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9wdWJsaWMvZnV6emluZy9hdm1fZnV6emVyX3NpbXVsYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFTQSxPQUFPLEVBQUUsU0FBUyxFQUFFLEtBQUssY0FBYyxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFZbkUsT0FBTyxLQUFLLEVBQUUseUJBQXlCLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNyRSxPQUFPLEVBQWUsZUFBZSxFQUF1RCxNQUFNLGtCQUFrQixDQUFDO0FBQ3JILE9BQU8sS0FBSyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFbEUsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sK0NBQStDLENBQUM7QUFDeEYsT0FBTyxFQUFFLHdCQUF3QixFQUFFLE1BQU0sNENBQTRDLENBQUM7QUFJdEY7OztHQUdHO0FBQ0gscUJBQWEsdUJBQXVCO2FBRWhCLFNBQVMsRUFBRSxNQUFNO2FBQ2pCLFdBQVcsRUFBRSxNQUFNO2FBQ25CLEVBQUUsRUFBRSxTQUFTO2FBQ2IsT0FBTyxFQUFFLGVBQWU7YUFDeEIsZUFBZSxFQUFFLEdBQUcsRUFBRTthQUN0QixpQkFBaUIsRUFBRSxDQUFDLEdBQUcsRUFBRSxHQUFHLENBQUMsRUFBRTtJQU5qRCxZQUNrQixTQUFTLEVBQUUsTUFBTSxFQUNqQixXQUFXLEVBQUUsTUFBTSxFQUNuQixFQUFFLEVBQUUsU0FBUyxFQUNiLE9BQU8sRUFBRSxlQUFlLEVBQ3hCLGVBQWUsRUFBRSxHQUFHLEVBQUUsRUFDdEIsaUJBQWlCLEVBQUUsQ0FBQyxHQUFHLEVBQUUsR0FBRyxDQUFDLEVBQUUsRUFDN0M7SUFFSixNQUFNLENBQUMsZUFBZSxDQUFDLEdBQUcsRUFBRSxHQUFHLEdBQUcsdUJBQXVCLENBWXhEO0NBQ0Y7QUFtSEQ7OztHQUdHO0FBQ0gscUJBQWEsa0JBQW1CLFNBQVEsdUJBQXVCO0lBQzdELE9BQU8sQ0FBQyxTQUFTLENBQW9CO0lBRXJDLFlBQ0UsV0FBVyxFQUFFLHlCQUF5QixFQUN0QyxrQkFBa0IsRUFBRSx3QkFBd0IsRUFDNUMsT0FBTyxFQUFFLGVBQWUsRUFXekI7SUFFRDs7T0FFRztJQUNILE9BQW9CLE1BQU0sQ0FDeEIsaUJBQWlCLEVBQUUsdUJBQXVCLEVBQzFDLE9BQU8sRUFBRSxlQUFlLEdBQ3ZCLE9BQU8sQ0FBQyxrQkFBa0IsQ0FBQyxDQUk3QjtJQUVEOztPQUVHO0lBQ1UsUUFBUSxDQUFDLE1BQU0sRUFBRSxTQUFTLEdBQUcsT0FBTyxDQUFDLGNBQWMsQ0FBQyxDQUdoRTtJQUVEOztPQUVHO0lBQ1UsdUJBQXVCLENBQUMsUUFBUSxFQUFFLEdBQUcsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBR2pFO0lBRUQ7OztPQUdHO0lBQ1UsMEJBQTBCLENBQUMsVUFBVSxFQUFFLEdBQUcsRUFBRSxXQUFXLEVBQUUsR0FBRyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FJeEY7Q0FDRiJ9

package/dest/public/fuzzing/avm_fuzzer_simulator.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"avm_fuzzer_simulator.d.ts","sourceRoot":"","sources":["../../../src/public/fuzzing/avm_fuzzer_simulator.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,SAAS,EAAE,KAAK,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAYnE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AACrE,OAAO,EAAe,eAAe,EAAuD,MAAM,kBAAkB,CAAC;AACrH,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAElE,OAAO,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAC;AACxF,OAAO,EAAE,wBAAwB,EAAE,MAAM,4CAA4C,CAAC;AAItF;;;GAGG;AACH,qBAAa,uBAAuB;aAEhB,SAAS,EAAE,MAAM;aACjB,WAAW,EAAE,MAAM;aACnB,EAAE,EAAE,SAAS;aACb,OAAO,EAAE,eAAe;aACxB,eAAe,EAAE,GAAG,EAAE;aACtB,iBAAiB,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE;IANjD,YACkB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,EAAE,EAAE,SAAS,EACb,OAAO,EAAE,eAAe,EACxB,eAAe,EAAE,GAAG,EAAE,EACtB,iBAAiB,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAC7C;IAEJ,MAAM,CAAC,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,uBAAuB,CAYxD;CACF;AAmHD;;;GAGG;AACH,qBAAa,kBAAmB,SAAQ,uBAAuB;IAC7D,OAAO,CAAC,SAAS,CAAoB;IAErC,YACE,WAAW,EAAE,yBAAyB,EACtC,kBAAkB,EAAE,wBAAwB,EAC5C,OAAO,EAAE,eAAe,EAWzB;IAED;;OAEG;IACH,OAAoB,MAAM,CACxB,iBAAiB,EAAE,uBAAuB,EAC1C,OAAO,EAAE,eAAe,GACvB,OAAO,CAAC,kBAAkB,CAAC,CAI7B;IAED;;OAEG;IACU,QAAQ,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,cAAc,CAAC,CAGhE;IAED;;OAEG;IACU,uBAAuB,CAAC,QAAQ,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAGjE;IAED;;;OAGG;IACU,0BAA0B,CAAC,UAAU,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAIxF;CACF"}

package/dest/public/fuzzing/{helpers.js → avm_fuzzer_simulator.js}

@@ -1,28 +1,47 @@
-import { CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS, MAX_ENQUEUED_CALLS_PER_TX, MAX_L2_TO_L1_MSGS_PER_TX, MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, MAX_PRIVATE_LOGS_PER_TX } from '@aztec/constants';
+import { MAX_ENQUEUED_CALLS_PER_TX, MAX_L2_TO_L1_MSGS_PER_TX, MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, MAX_PRIVATE_LOGS_PER_TX } from '@aztec/constants';
 import { padArrayEnd } from '@aztec/foundation/collection';
 import { Fr } from '@aztec/foundation/curves/bn254';
+import { AvmTxHint } from '@aztec/stdlib/avm';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { siloNullifier } from '@aztec/stdlib/hash';
+import { contractClassPublicFromPlainObject, contractInstanceWithAddressFromPlainObject } from '@aztec/stdlib/contract';
 import { PartialPrivateTailPublicInputsForPublic, PrivateKernelTailCircuitPublicInputs, PrivateToPublicAccumulatedData, PublicCallRequest } from '@aztec/stdlib/kernel';
 import { PrivateLog } from '@aztec/stdlib/logs';
 import { ScopedL2ToL1Message } from '@aztec/stdlib/messaging';
 import { ChonkProof } from '@aztec/stdlib/proofs';
-import { MerkleTreeId } from '@aztec/stdlib/trees';
-import { BlockHeader, HashedValues, Tx, TxConstantData, TxContext, TxHash } from '@aztec/stdlib/tx';
-// Registers a contract by inserting its address nullifier into the nullifier tree
-export async function registerContract(merkleTrees, contractAddress) {
-    const contractAddressNullifier = await siloNullifier(AztecAddress.fromNumber(CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS), contractAddress.toField());
-    await merkleTrees.sequentialInsert(MerkleTreeId.NULLIFIER_TREE, [
-        contractAddressNullifier.toBuffer()
-    ]);
+import { BlockHeader, GlobalVariables, HashedValues, Tx, TxConstantData, TxContext, TxHash } from '@aztec/stdlib/tx';
+import { BaseAvmSimulationTester } from '../avm/fixtures/base_avm_simulation_tester.js';
+import { SimpleContractDataSource } from '../fixtures/simple_contract_data_source.js';
+import { PublicContractsDB } from '../public_db_sources.js';
+import { PublicTxSimulator } from '../public_tx_simulator/public_tx_simulator.js';
+/**
+ * Request structure for fuzzer simulation communication from C++.
+ * Matches the C++ FuzzerSimulationRequest struct
+ */ export class FuzzerSimulationRequest {
+    wsDataDir;
+    wsMapSizeKb;
+    tx;
+    globals;
+    contractClasses;
+    contractInstances;
+    constructor(wsDataDir, wsMapSizeKb, tx, globals, contractClasses, contractInstances){
+        this.wsDataDir = wsDataDir;
+        this.wsMapSizeKb = wsMapSizeKb;
+        this.tx = tx;
+        this.globals = globals;
+        this.contractClasses = contractClasses;
+        this.contractInstances = contractInstances;
+    }
+    static fromPlainObject(obj) {
+        if (obj instanceof FuzzerSimulationRequest) {
+            return obj;
+        }
+        return new FuzzerSimulationRequest(obj.wsDataDir, obj.wsMapSizeKb, AvmTxHint.fromPlainObject(obj.tx), GlobalVariables.fromPlainObject(obj.globals), obj.contractClasses, obj.contractInstances);
+    }
 }
 /**
  * Creates a TypeScript Tx object from a deserialized C++ Tx (AvmTxHint-like structure).
  * This allows using PublicTxSimulator.simulate() with fuzzer-generated transactions.
- *
- * @param cppTx - Deserialized C++ Tx from msgpack (matches AvmTxHint structure)
- * @returns A TypeScript Tx suitable for PublicTxSimulator
- */ export async function createFuzzerTx(cppTx) {
+ */ async function createTxFromHint(cppTx) {
     // Create TxHash from the C++ tx hash string
     if (!cppTx.hash) {
         throw new Error(`cppTx.hash is undefined. Keys: ${Object.keys(cppTx || {}).join(', ')}`);
@@ -48,8 +67,6 @@ export async function registerContract(merkleTrees, contractAddress) {
     // Build TxConstantData
     const constants = new TxConstantData(BlockHeader.empty(), txContext, Fr.ZERO, Fr.ZERO);
     const data = new PrivateKernelTailCircuitPublicInputs(constants, cppTx.gasUsedByPrivate, cppTx.feePayer, 0n, forPublic, undefined);
-    // todo(ilyas): I don't think we need to construct this, but keeping for now - the hashing could get costly with
-    // large number of enqueued calls or large calldata so keep an eye on this!
     // Build publicFunctionCalldata from all enqueued calls
     // Calldata is already Fr[] after AvmTxHint.fromPlainObject
     const publicFunctionCalldata = [];
@@ -73,3 +90,47 @@ export async function registerContract(merkleTrees, contractAddress) {
     // Create the Tx
     return new Tx(txHash, data, ChonkProof.empty(), contractClassLogFields, publicFunctionCalldata);
 }
+/**
+ * A simulator class for the AVM fuzzer that extends BaseAvmSimulationTester.
+ * It provides methods for registering contracts from C++ msgpack data and simulating transactions.
+ */ export class AvmFuzzerSimulator extends BaseAvmSimulationTester {
+    simulator;
+    constructor(merkleTrees, contractDataSource, globals){
+        super(contractDataSource, merkleTrees);
+        const contractsDb = new PublicContractsDB(contractDataSource);
+        this.simulator = new PublicTxSimulator(merkleTrees, contractsDb, globals, {
+            skipFeeEnforcement: true,
+            collectDebugLogs: false,
+            collectHints: false,
+            collectStatistics: false,
+            collectCallMetadata: false
+        });
+    }
+    /**
+   * Static factory method to create an AvmFuzzerSimulator.
+   */ static async create(worldStateService, globals) {
+        const contractDataSource = new SimpleContractDataSource();
+        const merkleTrees = await worldStateService.fork();
+        return new AvmFuzzerSimulator(merkleTrees, contractDataSource, globals);
+    }
+    /**
+   * Simulate a transaction from a C++ AvmTxHint.
+   */ async simulate(txHint) {
+        const tx = await createTxFromHint(txHint);
+        return await this.simulator.simulate(tx);
+    }
+    /**
+   * Add a contract class from C++ raw msgpack data.
+   */ async addContractClassFromCpp(rawClass) {
+        const contractClass = contractClassPublicFromPlainObject(rawClass);
+        await this.contractDataSource.addContractClass(contractClass);
+    }
+    /**
+   * Add a contract instance from C++ raw msgpack data.
+   * This also inserts the contract address nullifier into the nullifier tree.
+   */ async addContractInstanceFromCpp(rawAddress, rawInstance) {
+        const address = AztecAddress.fromPlainObject(rawAddress);
+        const instance = contractInstanceWithAddressFromPlainObject(address, rawInstance);
+        await this.addContractInstance(instance);
+    }
+}

package/dest/public/fuzzing/avm_simulator_bin.js

@@ -1,13 +1,10 @@
 import { EthAddress } from '@aztec/foundation/eth-address';
-import { AvmTxHint, deserializeFromMessagePack } from '@aztec/stdlib/avm';
-import { GlobalVariables } from '@aztec/stdlib/tx';
+import { deserializeFromMessagePack, serializeWithMessagePack } from '@aztec/stdlib/avm';
+import { TreeSnapshots } from '@aztec/stdlib/tx';
 import { NativeWorldStateService } from '@aztec/world-state';
 import { writeSync } from 'fs';
 import { createInterface } from 'readline';
-import { SimpleContractDataSource } from '../fixtures/simple_contract_data_source.js';
-import { PublicContractsDB } from '../public_db_sources.js';
-import { PublicTxSimulator } from '../public_tx_simulator/public_tx_simulator.js';
-import { createFuzzerTx, registerContract } from './helpers.js';
+import { AvmFuzzerSimulator, FuzzerSimulationRequest } from './avm_fuzzer_simulator.js';
 // This cache holds opened world states to avoid reopening them for each invocation.
 // It's a map so that in the future we could support multiple world states (if we had multiple fuzzers).
 const worldStateCache = new Map();
@@ -26,33 +23,18 @@ async function openExistingWorldState(dataDir, mapSizeKb) {
     worldStateCache.set(dataDir, ws);
     return ws;
 }
-async function simulateWithPublicTxSimulator(dataDir, mapSizeKb, bytecode, cppTx, cppGlobals) {
+async function simulateWithFuzzer(dataDir, mapSizeKb, txHint, globals, rawContractClasses, rawContractInstances) {
     const worldStateService = await openExistingWorldState(dataDir, mapSizeKb);
-    const merkleTrees = await worldStateService.fork();
-    // todo(ilyas): enable this once we can handle multiple bytecodes across multiple enqueued calls
-    // Concat all the enqueued calls, extract the de-duplicated contract addresses so we can register them
-    //const teardownCalls = cppTx.teardownEnqueuedCall ? [cppTx.teardownEnqueuedCall] : [];
-    //const contractAddresses = new Set([...cppTx.setupEnqueuedCalls, ...cppTx.appLogicEnqueuedCalls, ...teardownCalls].map(
-    //    call => call.request.contractAddress,
-    //));
-    //await Promise.all([...contractAddresses].map(addr => registerContract(merkleTrees, addr)));
-    //await Promise.all(
-    //    [...contractAddresses].map(addr => contractDataSource.addContractWithBytecode(addr, bytecode)),
-    //);
-    const contractAddress = cppTx.appLogicEnqueuedCalls[0].request.contractAddress;
-    await registerContract(merkleTrees, contractAddress);
-    const contractDataSource = new SimpleContractDataSource();
-    await contractDataSource.addContractWithBytecode(contractAddress, bytecode);
-    const contractsDb = new PublicContractsDB(contractDataSource);
-    const publicTxSimulator = new PublicTxSimulator(merkleTrees, contractsDb, cppGlobals, {
-        skipFeeEnforcement: true,
-        collectDebugLogs: false,
-        collectHints: false,
-        collectStatistics: false,
-        collectCallMetadata: false
-    });
-    const tx = await createFuzzerTx(cppTx);
-    const result = await publicTxSimulator.simulate(tx);
+    const simulator = await AvmFuzzerSimulator.create(worldStateService, globals);
+    // Register contract classes from C++
+    for (const rawClass of rawContractClasses){
+        await simulator.addContractClassFromCpp(rawClass);
+    }
+    // Register contract instances from C++
+    for (const [rawAddress, rawInstance] of rawContractInstances){
+        await simulator.addContractInstanceFromCpp(rawAddress, rawInstance);
+    }
+    const result = await simulator.simulate(txHint);
     const output = result.getAppLogicReturnValues().flatMap((rv)=>rv?.values?.filter((v)=>v != null) ?? []);
     return {
         reverted: !result.revertCode.isOK(),
@@ -61,51 +43,30 @@ async function simulateWithPublicTxSimulator(dataDir, mapSizeKb, bytecode, cppTx
         publicInputs: result.publicInputs
     };
 }
-async function executeFromJson(jsonLine) {
+async function execute(base64Line) {
     try {
-        const input = JSON.parse(jsonLine.trim());
-        if (!input.bytecode || !input.ws_data_dir || !input.ws_map_size_kb || !input.tx || !input.globals) {
-            writeSync(process.stdout.fd, 'Error: JSON must contain "bytecode", "ws_data_dir", "ws_map_size_kb", "tx", and "globals" fields\n');
-            return;
-        }
-        const bytecode = Buffer.from(input.bytecode, 'base64');
-        const rawTx = deserializeFromMessagePack(Buffer.from(input.tx, 'base64'));
-        const tx = AvmTxHint.fromPlainObject(rawTx);
-        const rawGlobals = deserializeFromMessagePack(Buffer.from(input.globals, 'base64'));
-        const globals = GlobalVariables.fromPlainObject(rawGlobals);
-        const result = await simulateWithPublicTxSimulator(input.ws_data_dir, input.ws_map_size_kb, bytecode, tx, globals);
-        // todo(ilyas): Would be nice to serialize entire publicInputs for comparison, but it was extremely slow.
-        // Serialize endTreeSnapshots for comparison with C++ simulator
-        const endTreeSnapshots = {
-            l1ToL2MessageTree: {
-                root: result.publicInputs.endTreeSnapshots.l1ToL2MessageTree.root.toString(),
-                nextAvailableLeafIndex: result.publicInputs.endTreeSnapshots.l1ToL2MessageTree.nextAvailableLeafIndex
-            },
-            noteHashTree: {
-                root: result.publicInputs.endTreeSnapshots.noteHashTree.root.toString(),
-                nextAvailableLeafIndex: result.publicInputs.endTreeSnapshots.noteHashTree.nextAvailableLeafIndex
-            },
-            nullifierTree: {
-                root: result.publicInputs.endTreeSnapshots.nullifierTree.root.toString(),
-                nextAvailableLeafIndex: result.publicInputs.endTreeSnapshots.nullifierTree.nextAvailableLeafIndex
-            },
-            publicDataTree: {
-                root: result.publicInputs.endTreeSnapshots.publicDataTree.root.toString(),
-                nextAvailableLeafIndex: result.publicInputs.endTreeSnapshots.publicDataTree.nextAvailableLeafIndex
-            }
-        };
-        writeSync(process.stdout.fd, JSON.stringify({
+        // Decode base64 and deserialize the entire request from msgpack
+        const buffer = Buffer.from(base64Line.trim(), 'base64');
+        const rawRequest = deserializeFromMessagePack(buffer);
+        const request = FuzzerSimulationRequest.fromPlainObject(rawRequest);
+        // Run the TS simulation
+        const result = await simulateWithFuzzer(request.wsDataDir, request.wsMapSizeKb, request.tx, request.globals, request.contractClasses, request.contractInstances);
+        // Serialize the result to msgpack and encode it in base64 for output
+        const resultBuffer = serializeWithMessagePack({
             reverted: result.reverted,
-            output: result.output.map((v)=>v?.toString() ?? '0'),
-            revertReason: result.revertReason,
-            endTreeSnapshots
-        }) + '\n');
+            output: result.output,
+            revertReason: result.revertReason ?? '',
+            endTreeSnapshots: result.publicInputs.endTreeSnapshots
+        });
+        writeSync(process.stdout.fd, resultBuffer.toString('base64') + '\n');
     } catch (error) {
-        writeSync(process.stdout.fd, JSON.stringify({
+        const errorResult = serializeWithMessagePack({
             reverted: true,
             output: [],
-            revertReason: error.message
-        }) + '\n');
+            revertReason: `Unexpected Error ${error.message}`,
+            endTreeSnapshots: TreeSnapshots.empty()
+        });
+        writeSync(process.stdout.fd, errorResult.toString('base64') + '\n');
     }
 }
 function mainLoop() {
@@ -115,7 +76,7 @@ function mainLoop() {
     });
     rl.on('line', (line)=>{
         if (line.trim()) {
-            void executeFromJson(line);
+            void execute(line);
         }
     });
     rl.on('close', ()=>process.exit(0));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/simulator",
-  "version": "3.0.0-nightly.20251211",
+  "version": "3.0.0-nightly.20251213",
   "type": "module",
   "exports": {
     "./server": "./dest/server.js",
@@ -21,7 +21,7 @@
     "build:dev": "../scripts/tsc.sh --watch",
     "clean": "rm -rf ./dest .tsbuildinfo",
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}",
-    "build:fuzzer": "tsgo src/public/fuzzing/avm_simulator_bin.ts --outDir dest --rootDir src --module nodenext --moduleResolution nodenext --skipLibCheck --ignoreConfig"
+    "build:fuzzer": "yarn clean && ../scripts/tsc.sh"
   },
   "inherits": [
     "../package.common.json"
@@ -64,26 +64,26 @@
     ]
   },
   "dependencies": {
-    "@aztec/constants": "3.0.0-nightly.20251211",
-    "@aztec/foundation": "3.0.0-nightly.20251211",
-    "@aztec/native": "3.0.0-nightly.20251211",
-    "@aztec/noir-acvm_js": "3.0.0-nightly.20251211",
-    "@aztec/noir-noirc_abi": "3.0.0-nightly.20251211",
-    "@aztec/noir-protocol-circuits-types": "3.0.0-nightly.20251211",
-    "@aztec/noir-types": "3.0.0-nightly.20251211",
-    "@aztec/protocol-contracts": "3.0.0-nightly.20251211",
-    "@aztec/stdlib": "3.0.0-nightly.20251211",
-    "@aztec/telemetry-client": "3.0.0-nightly.20251211",
-    "@aztec/world-state": "3.0.0-nightly.20251211",
+    "@aztec/constants": "3.0.0-nightly.20251213",
+    "@aztec/foundation": "3.0.0-nightly.20251213",
+    "@aztec/native": "3.0.0-nightly.20251213",
+    "@aztec/noir-acvm_js": "3.0.0-nightly.20251213",
+    "@aztec/noir-noirc_abi": "3.0.0-nightly.20251213",
+    "@aztec/noir-protocol-circuits-types": "3.0.0-nightly.20251213",
+    "@aztec/noir-types": "3.0.0-nightly.20251213",
+    "@aztec/protocol-contracts": "3.0.0-nightly.20251213",
+    "@aztec/stdlib": "3.0.0-nightly.20251213",
+    "@aztec/telemetry-client": "3.0.0-nightly.20251213",
+    "@aztec/world-state": "3.0.0-nightly.20251213",
     "lodash.clonedeep": "^4.5.0",
     "lodash.merge": "^4.6.2",
     "tslib": "^2.4.0"
   },
   "devDependencies": {
-    "@aztec/kv-store": "3.0.0-nightly.20251211",
-    "@aztec/merkle-tree": "3.0.0-nightly.20251211",
-    "@aztec/noir-contracts.js": "3.0.0-nightly.20251211",
-    "@aztec/noir-test-contracts.js": "3.0.0-nightly.20251211",
+    "@aztec/kv-store": "3.0.0-nightly.20251213",
+    "@aztec/merkle-tree": "3.0.0-nightly.20251213",
+    "@aztec/noir-contracts.js": "3.0.0-nightly.20251213",
+    "@aztec/noir-test-contracts.js": "3.0.0-nightly.20251213",
     "@jest/globals": "^30.0.0",
     "@types/jest": "^30.0.0",
     "@types/lodash.clonedeep": "^4.5.7",

package/src/public/fixtures/simple_contract_data_source.ts

@@ -4,7 +4,6 @@ import { createLogger } from '@aztec/foundation/log';
 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 { PublicKeys } from '@aztec/stdlib/keys';
 
 import { getFunctionSelector } from '../avm/fixtures/utils.js';
 
@@ -120,42 +119,4 @@ export class SimpleContractDataSource implements ContractDataSource {
     this.contractInstances.set(contractInstance.address.toString(), contractInstance);
     return Promise.resolve();
   }
-
-  /**
-   * FIXME: This is temporary
-   * Helper method for fuzzer: registers a contract with raw bytecode at a given address.
-   * Creates a minimal ContractClassPublic and ContractInstanceWithAddress.
-   * @param address - The contract address
-   * @param bytecode - The raw AVM bytecode
-   */
-  async addContractWithBytecode(address: AztecAddress, bytecode: Buffer): Promise<void> {
-    // Generate a deterministic class ID from the bytecode
-    const classId = Fr.fromBufferReduce(bytecode.subarray(0, 32));
-
-    // Create minimal ContractClassPublic
-    const contractClass: ContractClassPublic = {
-      id: classId,
-      version: 1 as const,
-      artifactHash: Fr.ZERO,
-      privateFunctionsRoot: Fr.ZERO,
-      privateFunctions: [],
-      utilityFunctions: [],
-      packedBytecode: bytecode,
-    };
-
-    // Create minimal ContractInstanceWithAddress
-    const contractInstance: ContractInstanceWithAddress = {
-      address,
-      version: 1 as const,
-      salt: Fr.ZERO,
-      deployer: address, // Use the contract address as deployer
-      currentContractClassId: classId,
-      originalContractClassId: classId,
-      initializationHash: Fr.ZERO,
-      publicKeys: PublicKeys.default(),
-    };
-
-    await this.addContractClass(contractClass);
-    await this.addContractInstance(contractInstance);
-  }
 }

package/src/public/fuzzing/{helpers.ts → avm_fuzzer_simulator.ts}

@@ -1,5 +1,4 @@
 import {
-  CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS,
   MAX_ENQUEUED_CALLS_PER_TX,
   MAX_L2_TO_L1_MSGS_PER_TX,
   MAX_NOTE_HASHES_PER_TX,
@@ -8,9 +7,9 @@ import {
 } from '@aztec/constants';
 import { padArrayEnd } from '@aztec/foundation/collection';
 import { Fr } from '@aztec/foundation/curves/bn254';
-import type { AvmTxHint } from '@aztec/stdlib/avm';
+import { AvmTxHint, type PublicTxResult } from '@aztec/stdlib/avm';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { siloNullifier } from '@aztec/stdlib/hash';
+import { contractClassPublicFromPlainObject, contractInstanceWithAddressFromPlainObject } from '@aztec/stdlib/contract';
 import {
   PartialPrivateTailPublicInputsForPublic,
   PrivateKernelTailCircuitPublicInputs,
@@ -20,29 +19,49 @@ import {
 import { PrivateLog } from '@aztec/stdlib/logs';
 import { ScopedL2ToL1Message } from '@aztec/stdlib/messaging';
 import { ChonkProof } from '@aztec/stdlib/proofs';
-import { MerkleTreeId, type MerkleTreeWriteOperations } from '@aztec/stdlib/trees';
-import { BlockHeader, HashedValues, Tx, TxConstantData, TxContext, TxHash } from '@aztec/stdlib/tx';
-
-// Registers a contract by inserting its address nullifier into the nullifier tree
-export async function registerContract(
-  merkleTrees: MerkleTreeWriteOperations,
-  contractAddress: AztecAddress,
-): Promise<void> {
-  const contractAddressNullifier = await siloNullifier(
-    AztecAddress.fromNumber(CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS),
-    contractAddress.toField(),
-  );
-  await merkleTrees.sequentialInsert(MerkleTreeId.NULLIFIER_TREE, [contractAddressNullifier.toBuffer()]);
+import type { MerkleTreeWriteOperations } from '@aztec/stdlib/trees';
+import { BlockHeader, GlobalVariables, HashedValues, Tx, TxConstantData, TxContext, TxHash } from '@aztec/stdlib/tx';
+import type { NativeWorldStateService } from '@aztec/world-state';
+
+import { BaseAvmSimulationTester } from '../avm/fixtures/base_avm_simulation_tester.js';
+import { SimpleContractDataSource } from '../fixtures/simple_contract_data_source.js';
+import { PublicContractsDB } from '../public_db_sources.js';
+import { PublicTxSimulator } from '../public_tx_simulator/public_tx_simulator.js';
+
+/**
+ * Request structure for fuzzer simulation communication from C++.
+ * Matches the C++ FuzzerSimulationRequest struct
+ */
+export class FuzzerSimulationRequest {
+  constructor(
+    public readonly wsDataDir: string,
+    public readonly wsMapSizeKb: number,
+    public readonly tx: AvmTxHint,
+    public readonly globals: GlobalVariables,
+    public readonly contractClasses: any[], // Raw, processed by addContractClassFromCpp
+    public readonly contractInstances: [any, any][], // Raw pairs [address, instance]
+  ) {}
+
+  static fromPlainObject(obj: any): FuzzerSimulationRequest {
+    if (obj instanceof FuzzerSimulationRequest) {
+      return obj;
+    }
+    return new FuzzerSimulationRequest(
+      obj.wsDataDir,
+      obj.wsMapSizeKb,
+      AvmTxHint.fromPlainObject(obj.tx),
+      GlobalVariables.fromPlainObject(obj.globals),
+      obj.contractClasses,
+      obj.contractInstances,
+    );
+  }
 }
 
 /**
  * Creates a TypeScript Tx object from a deserialized C++ Tx (AvmTxHint-like structure).
  * This allows using PublicTxSimulator.simulate() with fuzzer-generated transactions.
- *
- * @param cppTx - Deserialized C++ Tx from msgpack (matches AvmTxHint structure)
- * @returns A TypeScript Tx suitable for PublicTxSimulator
  */
-export async function createFuzzerTx(cppTx: AvmTxHint): Promise<Tx> {
+async function createTxFromHint(cppTx: AvmTxHint): Promise<Tx> {
   // Create TxHash from the C++ tx hash string
   if (!cppTx.hash) {
     throw new Error(`cppTx.hash is undefined. Keys: ${Object.keys(cppTx || {}).join(', ')}`);
@@ -116,8 +135,6 @@ export async function createFuzzerTx(cppTx: AvmTxHint): Promise<Tx> {
     undefined, // forRollup - not needed for public simulation
   );
 
-  // todo(ilyas): I don't think we need to construct this, but keeping for now - the hashing could get costly with
-  // large number of enqueued calls or large calldata so keep an eye on this!
   // Build publicFunctionCalldata from all enqueued calls
   // Calldata is already Fr[] after AvmTxHint.fromPlainObject
   const publicFunctionCalldata: HashedValues[] = [];
@@ -152,3 +169,65 @@ export async function createFuzzerTx(cppTx: AvmTxHint): Promise<Tx> {
     publicFunctionCalldata,
   );
 }
+
+/**
+ * A simulator class for the AVM fuzzer that extends BaseAvmSimulationTester.
+ * It provides methods for registering contracts from C++ msgpack data and simulating transactions.
+ */
+export class AvmFuzzerSimulator extends BaseAvmSimulationTester {
+  private simulator: PublicTxSimulator;
+
+  constructor(
+    merkleTrees: MerkleTreeWriteOperations,
+    contractDataSource: SimpleContractDataSource,
+    globals: GlobalVariables,
+  ) {
+    super(contractDataSource, merkleTrees);
+    const contractsDb = new PublicContractsDB(contractDataSource);
+    this.simulator = new PublicTxSimulator(merkleTrees, contractsDb, globals, {
+      skipFeeEnforcement: true,
+      collectDebugLogs: false,
+      collectHints: false,
+      collectStatistics: false,
+      collectCallMetadata: false,
+    });
+  }
+
+  /**
+   * Static factory method to create an AvmFuzzerSimulator.
+   */
+  public static async create(
+    worldStateService: NativeWorldStateService,
+    globals: GlobalVariables,
+  ): Promise<AvmFuzzerSimulator> {
+    const contractDataSource = new SimpleContractDataSource();
+    const merkleTrees = await worldStateService.fork();
+    return new AvmFuzzerSimulator(merkleTrees, contractDataSource, globals);
+  }
+
+  /**
+   * Simulate a transaction from a C++ AvmTxHint.
+   */
+  public async simulate(txHint: AvmTxHint): Promise<PublicTxResult> {
+    const tx = await createTxFromHint(txHint);
+    return await this.simulator.simulate(tx);
+  }
+
+  /**
+   * Add a contract class from C++ raw msgpack data.
+   */
+  public async addContractClassFromCpp(rawClass: any): Promise<void> {
+    const contractClass = contractClassPublicFromPlainObject(rawClass);
+    await this.contractDataSource.addContractClass(contractClass);
+  }
+
+  /**
+   * Add a contract instance from C++ raw msgpack data.
+   * This also inserts the contract address nullifier into the nullifier tree.
+   */
+  public async addContractInstanceFromCpp(rawAddress: any, rawInstance: any): Promise<void> {
+    const address = AztecAddress.fromPlainObject(rawAddress);
+    const instance = contractInstanceWithAddressFromPlainObject(address, rawInstance);
+    await this.addContractInstance(instance);
+  }
+}

package/src/public/fuzzing/avm_simulator_bin.ts

@@ -1,16 +1,18 @@
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { EthAddress } from '@aztec/foundation/eth-address';
-import { AvmCircuitPublicInputs, AvmTxHint, deserializeFromMessagePack } from '@aztec/stdlib/avm';
-import { GlobalVariables } from '@aztec/stdlib/tx';
+import {
+  AvmCircuitPublicInputs,
+  type AvmTxHint,
+  deserializeFromMessagePack,
+  serializeWithMessagePack,
+} from '@aztec/stdlib/avm';
+import { GlobalVariables, TreeSnapshots } from '@aztec/stdlib/tx';
 import { NativeWorldStateService } from '@aztec/world-state';
 
 import { writeSync } from 'fs';
 import { createInterface } from 'readline';
 
-import { SimpleContractDataSource } from '../fixtures/simple_contract_data_source.js';
-import { PublicContractsDB } from '../public_db_sources.js';
-import { PublicTxSimulator } from '../public_tx_simulator/public_tx_simulator.js';
-import { createFuzzerTx, registerContract } from './helpers.js';
+import { AvmFuzzerSimulator, FuzzerSimulationRequest } from './avm_fuzzer_simulator.js';
 
 // This cache holds opened world states to avoid reopening them for each invocation.
 // It's a map so that in the future we could support multiple world states (if we had multiple fuzzers).
@@ -34,46 +36,33 @@ async function openExistingWorldState(dataDir: string, mapSizeKb: number): Promi
   return ws;
 }
 
-async function simulateWithPublicTxSimulator(
+async function simulateWithFuzzer(
   dataDir: string,
   mapSizeKb: number,
-  bytecode: Buffer,
-  cppTx: AvmTxHint,
-  cppGlobals: GlobalVariables,
+  txHint: AvmTxHint,
+  globals: GlobalVariables,
+  rawContractClasses: any[], // Replace these when we are moving contract classes to TS
+  rawContractInstances: [any, any][], // Replace these when we are moving contract instances to TS
 ): Promise<{ reverted: boolean; output: Fr[]; revertReason?: string; publicInputs: AvmCircuitPublicInputs }> {
   const worldStateService = await openExistingWorldState(dataDir, mapSizeKb);
-  const merkleTrees = await worldStateService.fork();
-
-  // todo(ilyas): enable this once we can handle multiple bytecodes across multiple enqueued calls
-  // Concat all the enqueued calls, extract the de-duplicated contract addresses so we can register them
-  //const teardownCalls = cppTx.teardownEnqueuedCall ? [cppTx.teardownEnqueuedCall] : [];
-  //const contractAddresses = new Set([...cppTx.setupEnqueuedCalls, ...cppTx.appLogicEnqueuedCalls, ...teardownCalls].map(
-  //    call => call.request.contractAddress,
-  //));
-  //await Promise.all([...contractAddresses].map(addr => registerContract(merkleTrees, addr)));
-  //await Promise.all(
-  //    [...contractAddresses].map(addr => contractDataSource.addContractWithBytecode(addr, bytecode)),
-  //);
-
-  const contractAddress = cppTx.appLogicEnqueuedCalls[0].request.contractAddress;
-  await registerContract(merkleTrees, contractAddress);
-  const contractDataSource = new SimpleContractDataSource();
-  await contractDataSource.addContractWithBytecode(contractAddress, bytecode);
-
-  const contractsDb = new PublicContractsDB(contractDataSource);
-
-  const publicTxSimulator = new PublicTxSimulator(merkleTrees, contractsDb, cppGlobals, {
-    skipFeeEnforcement: true,
-    collectDebugLogs: false,
-    collectHints: false,
-    collectStatistics: false,
-    collectCallMetadata: false,
-  });
 
-  const tx = await createFuzzerTx(cppTx);
-  const result = await publicTxSimulator.simulate(tx);
+  const simulator = await AvmFuzzerSimulator.create(worldStateService, globals);
+
+  // Register contract classes from C++
+  for (const rawClass of rawContractClasses) {
+    await simulator.addContractClassFromCpp(rawClass);
+  }
+
+  // Register contract instances from C++
+  for (const [rawAddress, rawInstance] of rawContractInstances) {
+    await simulator.addContractInstanceFromCpp(rawAddress, rawInstance);
+  }
+
+  const result = await simulator.simulate(txHint);
 
-  const output = result.getAppLogicReturnValues().flatMap(rv => rv?.values?.filter(v => v != null) ?? []);
+  const output = result
+    .getAppLogicReturnValues()
+    .flatMap((rv: { values?: Fr[] } | undefined) => rv?.values?.filter((v: Fr | null | undefined) => v != null) ?? []);
 
   return {
     reverted: !result.revertCode.isOK(),
@@ -83,64 +72,39 @@ async function simulateWithPublicTxSimulator(
   };
 }
 
-async function executeFromJson(jsonLine: string): Promise<void> {
+async function execute(base64Line: string): Promise<void> {
   try {
-    const input = JSON.parse(jsonLine.trim());
-    if (!input.bytecode || !input.ws_data_dir || !input.ws_map_size_kb || !input.tx || !input.globals) {
-      writeSync(
-        process.stdout.fd,
-        'Error: JSON must contain "bytecode", "ws_data_dir", "ws_map_size_kb", "tx", and "globals" fields\n',
-      );
-      return;
-    }
-
-    const bytecode = Buffer.from(input.bytecode, 'base64');
-    const rawTx: object = deserializeFromMessagePack(Buffer.from(input.tx, 'base64'));
-    const tx = AvmTxHint.fromPlainObject(rawTx);
-    const rawGlobals = deserializeFromMessagePack(Buffer.from(input.globals, 'base64'));
-    const globals = GlobalVariables.fromPlainObject(rawGlobals);
-
-    const result = await simulateWithPublicTxSimulator(input.ws_data_dir, input.ws_map_size_kb, bytecode, tx, globals);
-
-    // todo(ilyas): Would be nice to serialize entire publicInputs for comparison, but it was extremely slow.
-    // Serialize endTreeSnapshots for comparison with C++ simulator
-    const endTreeSnapshots = {
-      l1ToL2MessageTree: {
-        root: result.publicInputs.endTreeSnapshots.l1ToL2MessageTree.root.toString(),
-        nextAvailableLeafIndex: result.publicInputs.endTreeSnapshots.l1ToL2MessageTree.nextAvailableLeafIndex,
-      },
-      noteHashTree: {
-        root: result.publicInputs.endTreeSnapshots.noteHashTree.root.toString(),
-        nextAvailableLeafIndex: result.publicInputs.endTreeSnapshots.noteHashTree.nextAvailableLeafIndex,
-      },
-      nullifierTree: {
-        root: result.publicInputs.endTreeSnapshots.nullifierTree.root.toString(),
-        nextAvailableLeafIndex: result.publicInputs.endTreeSnapshots.nullifierTree.nextAvailableLeafIndex,
-      },
-      publicDataTree: {
-        root: result.publicInputs.endTreeSnapshots.publicDataTree.root.toString(),
-        nextAvailableLeafIndex: result.publicInputs.endTreeSnapshots.publicDataTree.nextAvailableLeafIndex,
-      },
-    };
-
-    writeSync(
-      process.stdout.fd,
-      JSON.stringify({
-        reverted: result.reverted,
-        output: result.output.map(v => v?.toString() ?? '0'),
-        revertReason: result.revertReason,
-        endTreeSnapshots,
-      }) + '\n',
+    // Decode base64 and deserialize the entire request from msgpack
+    const buffer = Buffer.from(base64Line.trim(), 'base64');
+    const rawRequest = deserializeFromMessagePack(buffer);
+    const request = FuzzerSimulationRequest.fromPlainObject(rawRequest);
+
+    // Run the TS simulation
+    const result = await simulateWithFuzzer(
+      request.wsDataDir,
+      request.wsMapSizeKb,
+      request.tx,
+      request.globals,
+      request.contractClasses,
+      request.contractInstances,
     );
+
+    // Serialize the result to msgpack and encode it in base64 for output
+    const resultBuffer = serializeWithMessagePack({
+      reverted: result.reverted,
+      output: result.output,
+      revertReason: result.revertReason ?? '',
+      endTreeSnapshots: result.publicInputs.endTreeSnapshots,
+    });
+    writeSync(process.stdout.fd, resultBuffer.toString('base64') + '\n');
   } catch (error: any) {
-    writeSync(
-      process.stdout.fd,
-      JSON.stringify({
-        reverted: true,
-        output: [],
-        revertReason: error.message,
-      }) + '\n',
-    );
+    const errorResult = serializeWithMessagePack({
+      reverted: true,
+      output: [] as string[],
+      revertReason: `Unexpected Error ${error.message}`,
+      endTreeSnapshots: TreeSnapshots.empty(),
+    });
+    writeSync(process.stdout.fd, errorResult.toString('base64') + '\n');
   }
 }
 
@@ -148,7 +112,7 @@ function mainLoop() {
   const rl = createInterface({ input: process.stdin, terminal: false });
   rl.on('line', (line: string) => {
     if (line.trim()) {
-      void executeFromJson(line);
+      void execute(line);
     }
   });
   rl.on('close', () => process.exit(0));

package/dest/public/fuzzing/helpers.d.ts

@@ -1,14 +0,0 @@
-import type { AvmTxHint } from '@aztec/stdlib/avm';
-import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { type MerkleTreeWriteOperations } from '@aztec/stdlib/trees';
-import { Tx } from '@aztec/stdlib/tx';
-export declare function registerContract(merkleTrees: MerkleTreeWriteOperations, contractAddress: AztecAddress): Promise<void>;
-/**
- * Creates a TypeScript Tx object from a deserialized C++ Tx (AvmTxHint-like structure).
- * This allows using PublicTxSimulator.simulate() with fuzzer-generated transactions.
- *
- * @param cppTx - Deserialized C++ Tx from msgpack (matches AvmTxHint structure)
- * @returns A TypeScript Tx suitable for PublicTxSimulator
- */
-export declare function createFuzzerTx(cppTx: AvmTxHint): Promise<Tx>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGVscGVycy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3B1YmxpYy9mdXp6aW5nL2hlbHBlcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBVUEsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDbkQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBVzNELE9BQU8sRUFBZ0IsS0FBSyx5QkFBeUIsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ25GLE9BQU8sRUFBNkIsRUFBRSxFQUFxQyxNQUFNLGtCQUFrQixDQUFDO0FBR3BHLHdCQUFzQixnQkFBZ0IsQ0FDcEMsV0FBVyxFQUFFLHlCQUF5QixFQUN0QyxlQUFlLEVBQUUsWUFBWSxHQUM1QixPQUFPLENBQUMsSUFBSSxDQUFDLENBTWY7QUFFRDs7Ozs7O0dBTUc7QUFDSCx3QkFBc0IsY0FBYyxDQUFDLEtBQUssRUFBRSxTQUFTLEdBQUcsT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQTZHbEUifQ==

package/dest/public/fuzzing/helpers.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../src/public/fuzzing/helpers.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAW3D,OAAO,EAAgB,KAAK,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AACnF,OAAO,EAA6B,EAAE,EAAqC,MAAM,kBAAkB,CAAC;AAGpG,wBAAsB,gBAAgB,CACpC,WAAW,EAAE,yBAAyB,EACtC,eAAe,EAAE,YAAY,GAC5B,OAAO,CAAC,IAAI,CAAC,CAMf;AAED;;;;;;GAMG;AACH,wBAAsB,cAAc,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,EAAE,CAAC,CA6GlE"}