@aztec/simulator 0.0.0-test.1 → 0.0.1-commit.5daedc8

package/dest/public/avm/test_utils.js

@@ -1,10 +1,5 @@
 import { Fr } from '@aztec/foundation/fields';
-import { computePublicBytecodeCommitment } from '@aztec/stdlib/contract';
 import { mock } from 'jest-mock-extended';
-export async function mockGetBytecode(worldStateDB, bytecode) {
-    const commitment = await computePublicBytecodeCommitment(bytecode);
-    worldStateDB.getBytecodeCommitment.mockResolvedValue(commitment);
-}
 export function mockTraceFork(trace, nestedTrace) {
     trace.fork.mockReturnValue(nestedTrace ?? mock());
 }
@@ -17,36 +12,33 @@ export function mockNoteHashCount(mockedTrace, count) {
 export function mockStorageReadWithMap(worldStateDB, mockedStorage) {
     worldStateDB.storageRead.mockImplementation((_address, slot)=>Promise.resolve(mockedStorage.get(slot.toBigInt()) ?? Fr.ZERO));
 }
-export function mockGetBytecodeCommitment(worldStateDB, commitment) {
-    worldStateDB.getBytecodeCommitment.mockResolvedValue(commitment);
-}
-export function mockNoteHashExists(worldStateDB, _leafIndex, value) {
-    worldStateDB.getCommitmentValue.mockImplementation((index)=>{
-        if (index == _leafIndex.toBigInt()) {
+export function mockGetNoteHash(worldStateDB, _leafIndex, value) {
+    worldStateDB.getNoteHash.mockImplementation((index)=>{
+        if (index == _leafIndex && value) {
             return Promise.resolve(value);
         } else {
-            // This is ok for now since the traceing functions handle it
-            return Promise.resolve(undefined);
+            return Promise.resolve(Fr.ZERO);
         }
     });
 }
-export function mockGetNullifierIndex(worldStateDB, leafIndex, _ignoredValue) {
-    worldStateDB.getNullifierIndex.mockResolvedValue(leafIndex.toBigInt());
+export function mockCheckNullifierExists(worldStateDB, exists, _ignoredValue) {
+    worldStateDB.checkNullifierExists.mockResolvedValue(exists);
 }
-export function mockL1ToL2MessageExists(worldStateDB, leafIndex, value, valueAtOtherIndices) {
+export function mockGetL1ToL2LeafValue(worldStateDB, leafIndex, value) {
     worldStateDB.getL1ToL2LeafValue.mockImplementation((index)=>{
-        if (index == leafIndex.toBigInt()) {
+        if (index == leafIndex && value) {
             return Promise.resolve(value);
         } else {
-            // any indices other than mockAtLeafIndex will return a different value
-            // (or undefined if no value is specified for other indices)
-            return Promise.resolve(valueAtOtherIndices);
+            return Promise.resolve(Fr.ZERO);
         }
     });
 }
-export function mockGetContractInstance(worldStateDB, contractInstance) {
-    worldStateDB.getContractInstance.mockResolvedValue(contractInstance);
+export function mockGetContractInstance(contractsDB, contractInstance) {
+    contractsDB.getContractInstance.mockResolvedValue(contractInstance);
+}
+export function mockGetContractClass(contractsDB, contractClass) {
+    contractsDB.getContractClass.mockResolvedValue(contractClass);
 }
-export function mockGetContractClass(worldStateDB, contractClass) {
-    worldStateDB.getContractClass.mockResolvedValue(contractClass);
+export function mockGetBytecodeCommitment(contractsDB, commitment) {
+    contractsDB.getBytecodeCommitment.mockResolvedValue(commitment);
 }

package/dest/public/contracts_db_checkpoint.d.ts

@@ -0,0 +1,16 @@
+import type { Fr } from '@aztec/foundation/fields';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { ContractClassPublic, ContractInstanceWithAddress } from '@aztec/stdlib/contract';
+export declare class ContractsDbCheckpoint {
+    private instances;
+    private classes;
+    private bytecodeCommitments;
+    addInstance(address: AztecAddress, instance: ContractInstanceWithAddress): void;
+    addClass(classId: Fr, contractClass: ContractClassPublic): void;
+    addBytecodeCommitment(classId: Fr, commitment: Fr): void;
+    getInstance(address: AztecAddress): ContractInstanceWithAddress | undefined;
+    getClass(classId: Fr): ContractClassPublic | undefined;
+    getBytecodeCommitment(classId: Fr): Fr | undefined;
+    deepCopy(): ContractsDbCheckpoint;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3RzX2RiX2NoZWNrcG9pbnQuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wdWJsaWMvY29udHJhY3RzX2RiX2NoZWNrcG9pbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsRUFBRSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDbkQsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUUvRixxQkFBYSxxQkFBcUI7SUFDaEMsT0FBTyxDQUFDLFNBQVMsQ0FBdUQ7SUFDeEUsT0FBTyxDQUFDLE9BQU8sQ0FBK0M7SUFDOUQsT0FBTyxDQUFDLG1CQUFtQixDQUE4QjtJQUVsRCxXQUFXLENBQUMsT0FBTyxFQUFFLFlBQVksRUFBRSxRQUFRLEVBQUUsMkJBQTJCLEdBQUcsSUFBSSxDQUVyRjtJQUVNLFFBQVEsQ0FBQyxPQUFPLEVBQUUsRUFBRSxFQUFFLGFBQWEsRUFBRSxtQkFBbUIsR0FBRyxJQUFJLENBRXJFO0lBRU0scUJBQXFCLENBQUMsT0FBTyxFQUFFLEVBQUUsRUFBRSxVQUFVLEVBQUUsRUFBRSxHQUFHLElBQUksQ0FFOUQ7SUFFTSxXQUFXLENBQUMsT0FBTyxFQUFFLFlBQVksR0FBRywyQkFBMkIsR0FBRyxTQUFTLENBRWpGO0lBRU0sUUFBUSxDQUFDLE9BQU8sRUFBRSxFQUFFLEdBQUcsbUJBQW1CLEdBQUcsU0FBUyxDQUU1RDtJQUVNLHFCQUFxQixDQUFDLE9BQU8sRUFBRSxFQUFFLEdBQUcsRUFBRSxHQUFHLFNBQVMsQ0FFeEQ7SUFFTSxRQUFRLElBQUkscUJBQXFCLENBTXZDO0NBQ0YifQ==

package/dest/public/contracts_db_checkpoint.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"contracts_db_checkpoint.d.ts","sourceRoot":"","sources":["../../src/public/contracts_db_checkpoint.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,mBAAmB,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAE/F,qBAAa,qBAAqB;IAChC,OAAO,CAAC,SAAS,CAAuD;IACxE,OAAO,CAAC,OAAO,CAA+C;IAC9D,OAAO,CAAC,mBAAmB,CAA8B;IAElD,WAAW,CAAC,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,2BAA2B,GAAG,IAAI,CAErF;IAEM,QAAQ,CAAC,OAAO,EAAE,EAAE,EAAE,aAAa,EAAE,mBAAmB,GAAG,IAAI,CAErE;IAEM,qBAAqB,CAAC,OAAO,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,GAAG,IAAI,CAE9D;IAEM,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,2BAA2B,GAAG,SAAS,CAEjF;IAEM,QAAQ,CAAC,OAAO,EAAE,EAAE,GAAG,mBAAmB,GAAG,SAAS,CAE5D;IAEM,qBAAqB,CAAC,OAAO,EAAE,EAAE,GAAG,EAAE,GAAG,SAAS,CAExD;IAEM,QAAQ,IAAI,qBAAqB,CAMvC;CACF"}

package/dest/public/contracts_db_checkpoint.js

@@ -0,0 +1,30 @@
+export class ContractsDbCheckpoint {
+    instances = new Map();
+    classes = new Map();
+    bytecodeCommitments = new Map();
+    addInstance(address, instance) {
+        this.instances.set(address.toString(), instance);
+    }
+    addClass(classId, contractClass) {
+        this.classes.set(classId.toString(), contractClass);
+    }
+    addBytecodeCommitment(classId, commitment) {
+        this.bytecodeCommitments.set(classId.toString(), commitment);
+    }
+    getInstance(address) {
+        return this.instances.get(address.toString());
+    }
+    getClass(classId) {
+        return this.classes.get(classId.toString());
+    }
+    getBytecodeCommitment(classId) {
+        return this.bytecodeCommitments.get(classId.toString());
+    }
+    deepCopy() {
+        const copy = new ContractsDbCheckpoint();
+        this.instances.forEach((value, key)=>copy.instances.set(key, value));
+        this.classes.forEach((value, key)=>copy.classes.set(key, value));
+        this.bytecodeCommitments.forEach((value, key)=>copy.bytecodeCommitments.set(key, value));
+        return copy;
+    }
+}

package/dest/public/db_interfaces.d.ts

@@ -0,0 +1,68 @@
+import type { Fr } from '@aztec/foundation/fields';
+import type { FunctionSelector } from '@aztec/stdlib/abi';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { ContractClassPublic, ContractInstanceWithAddress } from '@aztec/stdlib/contract';
+import type { UInt64 } from '@aztec/stdlib/types';
+/**
+ * Database interface for providing access to public state.
+ */
+export interface PublicStateDBInterface {
+    /**
+     * Reads a value from public storage, returning zero if none.
+     * @param contract - Owner of the storage.
+     * @param slot - Slot to read in the contract storage.
+     * @returns The current value in the storage slot.
+     */
+    storageRead(contract: AztecAddress, slot: Fr): Promise<Fr>;
+    /**
+     * Records a write to public storage.
+     * @param contract - Owner of the storage.
+     * @param slot - Slot to read in the contract storage.
+     * @param newValue - The new value to store.
+     */
+    storageWrite(contract: AztecAddress, slot: Fr, newValue: Fr): Promise<void>;
+}
+/**
+ * Database interface for providing access to public contract data.
+ */
+export interface PublicContractsDBInterface {
+    /**
+     * Returns a contract instance given its address and the given timestamp, or undefined if not exists.
+     * @param address - Address of the contract.
+     * @param timestamp - Timestamp to get the contract instance at. Contract updates might change the instance.
+     * @returns The contract instance or undefined if not found.
+     */
+    getContractInstance(address: AztecAddress, timestamp: UInt64): Promise<ContractInstanceWithAddress | undefined>;
+    /**
+     * Returns a publicly deployed contract class.
+     * @param contractClassId - ID of the contract class.
+     * @returns The contract class or undefined if not found
+     */
+    getContractClass(contractClassId: Fr): Promise<ContractClassPublic | undefined>;
+    /**
+     * Returns the commitment to the bytecode of a contract class.
+     * @param contractClassId - ID of the contract class.
+     * @returns The commitment to the bytecode or undefined if not found.
+     */
+    getBytecodeCommitment(contractClassId: Fr): Promise<Fr | undefined>;
+    /**
+     * Returns the function name of a contract's function given its selector.
+     * @param contractAddress - Address of the contract.
+     * @param selector - Selector of the function.
+     * @returns The name of the function or undefined if not found.
+     */
+    getDebugFunctionName(contractAddress: AztecAddress, selector: FunctionSelector): Promise<string | undefined>;
+    /**
+     * Creates a checkpoint of the current contract state.
+     */
+    createCheckpoint(): void;
+    /**
+     * Commits the current checkpoint, merging its state with the parent.
+     */
+    commitCheckpoint(): void;
+    /**
+     * Reverts the current checkpoint, discarding its state.
+     */
+    revertCheckpoint(): void;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGJfaW50ZXJmYWNlcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3B1YmxpYy9kYl9pbnRlcmZhY2VzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQ25ELE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDMUQsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUMvRixPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUVsRDs7R0FFRztBQUNILE1BQU0sV0FBVyxzQkFBc0I7SUFDckM7Ozs7O09BS0c7SUFDSCxXQUFXLENBQUMsUUFBUSxFQUFFLFlBQVksRUFBRSxJQUFJLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxFQUFFLENBQUMsQ0FBQztJQUUzRDs7Ozs7T0FLRztJQUNILFlBQVksQ0FBQyxRQUFRLEVBQUUsWUFBWSxFQUFFLElBQUksRUFBRSxFQUFFLEVBQUUsUUFBUSxFQUFFLEVBQUUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7Q0FDN0U7QUFFRDs7R0FFRztBQUNILE1BQU0sV0FBVywwQkFBMEI7SUFDekM7Ozs7O09BS0c7SUFDSCxtQkFBbUIsQ0FBQyxPQUFPLEVBQUUsWUFBWSxFQUFFLFNBQVMsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLDJCQUEyQixHQUFHLFNBQVMsQ0FBQyxDQUFDO0lBRWhIOzs7O09BSUc7SUFDSCxnQkFBZ0IsQ0FBQyxlQUFlLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxtQkFBbUIsR0FBRyxTQUFTLENBQUMsQ0FBQztJQUVoRjs7OztPQUlHO0lBQ0gscUJBQXFCLENBQUMsZUFBZSxFQUFFLEVBQUUsR0FBRyxPQUFPLENBQUMsRUFBRSxHQUFHLFNBQVMsQ0FBQyxDQUFDO0lBRXBFOzs7OztPQUtHO0lBQ0gsb0JBQW9CLENBQUMsZUFBZSxFQUFFLFlBQVksRUFBRSxRQUFRLEVBQUUsZ0JBQWdCLEdBQUcsT0FBTyxDQUFDLE1BQU0sR0FBRyxTQUFTLENBQUMsQ0FBQztJQUU3Rzs7T0FFRztJQUNILGdCQUFnQixJQUFJLElBQUksQ0FBQztJQUV6Qjs7T0FFRztJQUNILGdCQUFnQixJQUFJLElBQUksQ0FBQztJQUV6Qjs7T0FFRztJQUNILGdCQUFnQixJQUFJLElBQUksQ0FBQztDQUMxQiJ9

package/dest/public/db_interfaces.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"db_interfaces.d.ts","sourceRoot":"","sources":["../../src/public/db_interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,mBAAmB,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAC/F,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAElD;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC;;;;;OAKG;IACH,WAAW,CAAC,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAAC;IAE3D;;;;;OAKG;IACH,YAAY,CAAC,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7E;AAED;;GAEG;AACH,MAAM,WAAW,0BAA0B;IACzC;;;;;OAKG;IACH,mBAAmB,CAAC,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,2BAA2B,GAAG,SAAS,CAAC,CAAC;IAEhH;;;;OAIG;IACH,gBAAgB,CAAC,eAAe,EAAE,EAAE,GAAG,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC,CAAC;IAEhF;;;;OAIG;IACH,qBAAqB,CAAC,eAAe,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC,CAAC;IAEpE;;;;;OAKG;IACH,oBAAoB,CAAC,eAAe,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAE7G;;OAEG;IACH,gBAAgB,IAAI,IAAI,CAAC;IAEzB;;OAEG;IACH,gBAAgB,IAAI,IAAI,CAAC;IAEzB;;OAEG;IACH,gBAAgB,IAAI,IAAI,CAAC;CAC1B"}

package/dest/public/db_interfaces.js

@@ -0,0 +1,3 @@
+/**
+ * Database interface for providing access to public contract data.
+ */ export { };

package/dest/public/debug_fn_name.d.ts

@@ -0,0 +1,5 @@
+import type { Fr } from '@aztec/foundation/fields';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { PublicContractsDBInterface } from './db_interfaces.js';
+export declare function getPublicFunctionDebugName(db: PublicContractsDBInterface, contractAddress: AztecAddress, calldata: Fr[]): Promise<string>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVidWdfZm5fbmFtZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3B1YmxpYy9kZWJ1Z19mbl9uYW1lLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBRW5ELE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBRWhFLE9BQU8sS0FBSyxFQUFFLDBCQUEwQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFckUsd0JBQXNCLDBCQUEwQixDQUM5QyxFQUFFLEVBQUUsMEJBQTBCLEVBQzlCLGVBQWUsRUFBRSxZQUFZLEVBQzdCLFFBQVEsRUFBRSxFQUFFLEVBQUUsR0FDYixPQUFPLENBQUMsTUFBTSxDQUFDLENBT2pCIn0=

package/dest/public/debug_fn_name.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"debug_fn_name.d.ts","sourceRoot":"","sources":["../../src/public/debug_fn_name.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAEnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,oBAAoB,CAAC;AAErE,wBAAsB,0BAA0B,CAC9C,EAAE,EAAE,0BAA0B,EAC9B,eAAe,EAAE,YAAY,EAC7B,QAAQ,EAAE,EAAE,EAAE,GACb,OAAO,CAAC,MAAM,CAAC,CAOjB"}

package/dest/public/debug_fn_name.js

@@ -0,0 +1,9 @@
+import { FunctionSelector } from '@aztec/stdlib/abi';
+export async function getPublicFunctionDebugName(db, contractAddress, calldata) {
+    // 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 selector = FunctionSelector.fromField(calldata[0]);
+    return await db.getDebugFunctionName(contractAddress, selector) ?? selector.toString();
+}

package/dest/public/executor_metrics.d.ts

@@ -1,13 +1,21 @@
+import type { RevertCode } from '@aztec/stdlib/avm';
+import type { GasUsed } from '@aztec/stdlib/gas';
 import { type TelemetryClient, type Tracer } from '@aztec/telemetry-client';
-export declare class ExecutorMetrics {
+import type { ExecutorMetricsInterface } from './executor_metrics_interface.js';
+export declare class ExecutorMetrics implements ExecutorMetricsInterface {
     readonly tracer: Tracer;
     private fnCount;
     private fnDuration;
     private manaPerSecond;
+    private manaUsed;
+    private totalInstructionsExecuted;
+    private txHashing;
     private privateEffectsInsertions;
     constructor(client: TelemetryClient, name?: string);
-    recordFunctionSimulation(durationMs: number, manaUsed: number, fnName: string): void;
-    recordFunctionSimulationFailure(): void;
+    startRecordingTxSimulation(_txLabel: string): void;
+    stopRecordingTxSimulation(_txLabel: string, _gasUsed?: GasUsed, _revertedCode?: RevertCode): void;
+    recordEnqueuedCallSimulation(fnName: string, durationMs: number, manaUsed: number, totalInstructionsExecuted: number): void;
+    recordEnqueuedCallSimulationFailure(_fnName: string, _durationMs: number, _manaUsed: number, _totalInstructionsExecuted: number): void;
     recordPrivateEffectsInsertion(durationUs: number, type: 'revertible' | 'non-revertible'): void;
 }
-//# sourceMappingURL=executor_metrics.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXhlY3V0b3JfbWV0cmljcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3B1YmxpYy9leGVjdXRvcl9tZXRyaWNzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ3BELE9BQU8sS0FBSyxFQUFFLE9BQU8sRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ2pELE9BQU8sRUFJTCxLQUFLLGVBQWUsRUFDcEIsS0FBSyxNQUFNLEVBR1osTUFBTSx5QkFBeUIsQ0FBQztBQUVqQyxPQUFPLEtBQUssRUFBRSx3QkFBd0IsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBRWhGLHFCQUFhLGVBQWdCLFlBQVcsd0JBQXdCO0lBQzlELFNBQWdCLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFDL0IsT0FBTyxDQUFDLE9BQU8sQ0FBZ0I7SUFDL0IsT0FBTyxDQUFDLFVBQVUsQ0FBWTtJQUM5QixPQUFPLENBQUMsYUFBYSxDQUFZO0lBQ2pDLE9BQU8sQ0FBQyxRQUFRLENBQVk7SUFDNUIsT0FBTyxDQUFDLHlCQUF5QixDQUFZO0lBQzdDLE9BQU8sQ0FBQyxTQUFTLENBQVk7SUFDN0IsT0FBTyxDQUFDLHdCQUF3QixDQUFZO0lBRTVDLFlBQVksTUFBTSxFQUFFLGVBQWUsRUFBRSxJQUFJLFNBQW1CLEVBMkMzRDtJQUVELDBCQUEwQixDQUFDLFFBQVEsRUFBRSxNQUFNLFFBRTFDO0lBRUQseUJBQXlCLENBQUMsUUFBUSxFQUFFLE1BQU0sRUFBRSxRQUFRLENBQUMsRUFBRSxPQUFPLEVBQUUsYUFBYSxDQUFDLEVBQUUsVUFBVSxRQUV6RjtJQUVELDRCQUE0QixDQUMxQixNQUFNLEVBQUUsTUFBTSxFQUNkLFVBQVUsRUFBRSxNQUFNLEVBQ2xCLFFBQVEsRUFBRSxNQUFNLEVBQ2hCLHlCQUF5QixFQUFFLE1BQU0sUUFxQmxDO0lBRUQsbUNBQW1DLENBQ2pDLE9BQU8sRUFBRSxNQUFNLEVBQ2YsV0FBVyxFQUFFLE1BQU0sRUFDbkIsU0FBUyxFQUFFLE1BQU0sRUFDakIsMEJBQTBCLEVBQUUsTUFBTSxRQUtuQztJQUVELDZCQUE2QixDQUFDLFVBQVUsRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLFlBQVksR0FBRyxnQkFBZ0IsUUFJdEY7Q0FDRiJ9

package/dest/public/executor_metrics.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"executor_metrics.d.ts","sourceRoot":"","sources":["../../src/public/executor_metrics.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,eAAe,EACpB,KAAK,MAAM,EAGZ,MAAM,yBAAyB,CAAC;AAEjC,qBAAa,eAAe;IAC1B,SAAgB,MAAM,EAAE,MAAM,CAAC;IAC/B,OAAO,CAAC,OAAO,CAAgB;IAC/B,OAAO,CAAC,UAAU,CAAY;IAC9B,OAAO,CAAC,aAAa,CAAY;IACjC,OAAO,CAAC,wBAAwB,CAAY;gBAEhC,MAAM,EAAE,eAAe,EAAE,IAAI,SAAmB;IA2B5D,wBAAwB,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAe7E,+BAA+B;IAM/B,6BAA6B,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,GAAG,gBAAgB;CAKxF"}
+{"version":3,"file":"executor_metrics.d.ts","sourceRoot":"","sources":["../../src/public/executor_metrics.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAIL,KAAK,eAAe,EACpB,KAAK,MAAM,EAGZ,MAAM,yBAAyB,CAAC;AAEjC,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAEhF,qBAAa,eAAgB,YAAW,wBAAwB;IAC9D,SAAgB,MAAM,EAAE,MAAM,CAAC;IAC/B,OAAO,CAAC,OAAO,CAAgB;IAC/B,OAAO,CAAC,UAAU,CAAY;IAC9B,OAAO,CAAC,aAAa,CAAY;IACjC,OAAO,CAAC,QAAQ,CAAY;IAC5B,OAAO,CAAC,yBAAyB,CAAY;IAC7C,OAAO,CAAC,SAAS,CAAY;IAC7B,OAAO,CAAC,wBAAwB,CAAY;IAE5C,YAAY,MAAM,EAAE,eAAe,EAAE,IAAI,SAAmB,EA2C3D;IAED,0BAA0B,CAAC,QAAQ,EAAE,MAAM,QAE1C;IAED,yBAAyB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,OAAO,EAAE,aAAa,CAAC,EAAE,UAAU,QAEzF;IAED,4BAA4B,CAC1B,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,yBAAyB,EAAE,MAAM,QAqBlC;IAED,mCAAmC,CACjC,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,0BAA0B,EAAE,MAAM,QAKnC;IAED,6BAA6B,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,GAAG,gBAAgB,QAItF;CACF"}

package/dest/public/executor_metrics.js

@@ -4,6 +4,9 @@ export class ExecutorMetrics {
     fnCount;
     fnDuration;
     manaPerSecond;
+    manaUsed;
+    totalInstructionsExecuted;
+    txHashing;
     privateEffectsInsertions;
     constructor(client, name = 'PublicExecutor'){
         this.tracer = client.getTracer(name);
@@ -21,19 +24,47 @@ export class ExecutorMetrics {
             unit: 'mana/s',
             valueType: ValueType.INT
         });
-        this.privateEffectsInsertions = meter.createHistogram(Metrics.PUBLIC_EXECUTION_PRIVATE_EFFECTS_INSERTION, {
+        this.manaUsed = meter.createHistogram(Metrics.PUBLIC_EXECUTOR_SIMULATION_MANA_USED, {
+            description: 'Total mana used',
+            unit: 'mana',
+            valueType: ValueType.INT
+        });
+        this.totalInstructionsExecuted = meter.createHistogram(Metrics.PUBLIC_EXECUTOR_SIMULATION_TOTAL_INSTRUCTIONS, {
+            description: 'Total number of instructions executed',
+            unit: '#instructions',
+            valueType: ValueType.INT
+        });
+        this.txHashing = meter.createHistogram(Metrics.PUBLIC_EXECUTOR_TX_HASHING, {
+            description: 'Tx hashing time',
+            unit: 'ms',
+            valueType: ValueType.INT
+        });
+        this.privateEffectsInsertions = meter.createHistogram(Metrics.PUBLIC_EXECUTOR_PRIVATE_EFFECTS_INSERTION, {
             description: 'Private effects insertion time',
             unit: 'us',
             valueType: ValueType.INT
         });
     }
-    recordFunctionSimulation(durationMs, manaUsed, fnName) {
+    startRecordingTxSimulation(_txLabel) {
+    // do nothing (unimplemented)
+    }
+    stopRecordingTxSimulation(_txLabel, _gasUsed, _revertedCode) {
+    // do nothing (unimplemented)
+    }
+    recordEnqueuedCallSimulation(fnName, durationMs, manaUsed, totalInstructionsExecuted) {
         this.fnCount.add(1, {
             [Attributes.OK]: true,
-            [Attributes.APP_CIRCUIT_NAME]: fnName,
-            [Attributes.MANA_USED]: manaUsed
+            [Attributes.APP_CIRCUIT_NAME]: fnName
+        });
+        this.manaUsed.record(Math.ceil(manaUsed), {
+            [Attributes.APP_CIRCUIT_NAME]: fnName
+        });
+        this.totalInstructionsExecuted.record(Math.ceil(totalInstructionsExecuted), {
+            [Attributes.APP_CIRCUIT_NAME]: fnName
+        });
+        this.fnDuration.record(Math.ceil(durationMs), {
+            [Attributes.APP_CIRCUIT_NAME]: fnName
         });
-        this.fnDuration.record(Math.ceil(durationMs));
         if (durationMs > 0 && manaUsed > 0) {
             const manaPerSecond = Math.round(manaUsed * 1000 / durationMs);
             this.manaPerSecond.record(manaPerSecond, {
@@ -41,7 +72,7 @@ export class ExecutorMetrics {
             });
         }
     }
-    recordFunctionSimulationFailure() {
+    recordEnqueuedCallSimulationFailure(_fnName, _durationMs, _manaUsed, _totalInstructionsExecuted) {
         this.fnCount.add(1, {
             [Attributes.OK]: false
         });

package/dest/public/executor_metrics_interface.d.ts

@@ -0,0 +1,10 @@
+import type { RevertCode } from '@aztec/stdlib/avm';
+import type { GasUsed } from '@aztec/stdlib/gas';
+export interface ExecutorMetricsInterface {
+    startRecordingTxSimulation(txLabel: string): void;
+    stopRecordingTxSimulation(txLabel: string, gasUsed?: GasUsed, revertedCode?: RevertCode): void;
+    recordEnqueuedCallSimulation(fnName: string, durationMs: number, manaUsed: number, totalInstructions: number): void;
+    recordEnqueuedCallSimulationFailure(fnName: string, durationMs: number, manaUsed: number, totalInstructionsExecuted: number): void;
+    recordPrivateEffectsInsertion(durationUs: number, type: 'revertible' | 'non-revertible'): void;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXhlY3V0b3JfbWV0cmljc19pbnRlcmZhY2UuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wdWJsaWMvZXhlY3V0b3JfbWV0cmljc19pbnRlcmZhY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDcEQsT0FBTyxLQUFLLEVBQUUsT0FBTyxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFFakQsTUFBTSxXQUFXLHdCQUF3QjtJQUN2QywwQkFBMEIsQ0FBQyxPQUFPLEVBQUUsTUFBTSxHQUFHLElBQUksQ0FBQztJQUNsRCx5QkFBeUIsQ0FBQyxPQUFPLEVBQUUsTUFBTSxFQUFFLE9BQU8sQ0FBQyxFQUFFLE9BQU8sRUFBRSxZQUFZLENBQUMsRUFBRSxVQUFVLEdBQUcsSUFBSSxDQUFDO0lBQy9GLDRCQUE0QixDQUFDLE1BQU0sRUFBRSxNQUFNLEVBQUUsVUFBVSxFQUFFLE1BQU0sRUFBRSxRQUFRLEVBQUUsTUFBTSxFQUFFLGlCQUFpQixFQUFFLE1BQU0sR0FBRyxJQUFJLENBQUM7SUFDcEgsbUNBQW1DLENBQ2pDLE1BQU0sRUFBRSxNQUFNLEVBQ2QsVUFBVSxFQUFFLE1BQU0sRUFDbEIsUUFBUSxFQUFFLE1BQU0sRUFDaEIseUJBQXlCLEVBQUUsTUFBTSxHQUNoQyxJQUFJLENBQUM7SUFDUiw2QkFBNkIsQ0FBQyxVQUFVLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxZQUFZLEdBQUcsZ0JBQWdCLEdBQUcsSUFBSSxDQUFDO0NBQ2hHIn0=

package/dest/public/executor_metrics_interface.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"executor_metrics_interface.d.ts","sourceRoot":"","sources":["../../src/public/executor_metrics_interface.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAEjD,MAAM,WAAW,wBAAwB;IACvC,0BAA0B,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAClD,yBAAyB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,EAAE,YAAY,CAAC,EAAE,UAAU,GAAG,IAAI,CAAC;IAC/F,4BAA4B,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACpH,mCAAmC,CACjC,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,yBAAyB,EAAE,MAAM,GAChC,IAAI,CAAC;IACR,6BAA6B,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,GAAG,gBAAgB,GAAG,IAAI,CAAC;CAChG"}

package/dest/public/executor_metrics_interface.js

@@ -0,0 +1 @@
+export { };

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

@@ -0,0 +1,10 @@
+import type { Logger } from '@aztec/foundation/log';
+import type { ContractArtifact } from '@aztec/stdlib/abi';
+import { PublicTxSimulationTester } from './public_tx_simulation_tester.js';
+/**
+ * THIS TEST IS BRITTLE! If it breaks, don't try fixing it.
+ * `.skip` it or literally just delete it and notify AVM team.
+ * You do NOT need permission to remove this test!
+ */
+export declare function ammTest(tester: PublicTxSimulationTester, logger: Logger, tokenArtifact: ContractArtifact, ammArtifact: ContractArtifact, expectToBeTrue: (x: boolean) => void): Promise<void>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYW1tX3Rlc3QuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9wdWJsaWMvZml4dHVyZXMvYW1tX3Rlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBR0EsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFcEQsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUkxRCxPQUFPLEVBQUUsd0JBQXdCLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQztBQUk1RTs7OztHQUlHO0FBQ0gsd0JBQXNCLE9BQU8sQ0FDM0IsTUFBTSxFQUFFLHdCQUF3QixFQUNoQyxNQUFNLEVBQUUsTUFBTSxFQUNkLGFBQWEsRUFBRSxnQkFBZ0IsRUFDL0IsV0FBVyxFQUFFLGdCQUFnQixFQUM3QixjQUFjLEVBQUUsQ0FBQyxDQUFDLEVBQUUsT0FBTyxLQUFLLElBQUksaUJBcUdyQyJ9

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

@@ -0,0 +1 @@
+{"version":3,"file":"amm_test.d.ts","sourceRoot":"","sources":["../../../src/public/fixtures/amm_test.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAI1D,OAAO,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AAI5E;;;;GAIG;AACH,wBAAsB,OAAO,CAC3B,MAAM,EAAE,wBAAwB,EAChC,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,gBAAgB,EAC/B,WAAW,EAAE,gBAAgB,EAC7B,cAAc,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,IAAI,iBAqGrC"}

package/dest/public/fixtures/amm_test.js

@@ -0,0 +1,213 @@
+import { GeneratorIndex } from '@aztec/constants';
+import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto';
+import { Fr } from '@aztec/foundation/fields';
+import { Timer } from '@aztec/foundation/timer';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { setUpToken } from './token_test.js';
+const INITIAL_TOKEN_BALANCE = 1_000_000_000n;
+/**
+ * THIS TEST IS BRITTLE! If it breaks, don't try fixing it.
+ * `.skip` it or literally just delete it and notify AVM team.
+ * You do NOT need permission to remove this test!
+ */ export async function ammTest(tester, logger, tokenArtifact, ammArtifact, expectToBeTrue) {
+    const timer = new Timer();
+    const admin = AztecAddress.fromNumber(42);
+    const sender = AztecAddress.fromNumber(111);
+    logger.debug(`Deploying tokens`);
+    const token0 = await setUpToken(tester, tokenArtifact, admin, expectToBeTrue, /*seed=*/ 0);
+    const token1 = await setUpToken(tester, tokenArtifact, admin, expectToBeTrue, /*seed=*/ 1);
+    const liquidityToken = await setUpToken(tester, tokenArtifact, admin, expectToBeTrue, /*seed=*/ 2);
+    logger.debug(`Deploying AMM`);
+    const constructorArgs = [
+        token0,
+        token1,
+        liquidityToken
+    ];
+    const amm = await tester.registerAndDeployContract(constructorArgs, /*deployer=*/ admin, ammArtifact, /*skipNullifierInsertion=*/ false, /*seed=*/ 3);
+    // EXECUTE! This means that if using AvmProvingTester subclass, it will PROVE the transaction!
+    const ammConstructorResult = await tester.executeTxWithLabel(/*txLabel=*/ 'AMM/constructor', /*sender=*/ admin, /*setupCalls=*/ [], /*appCalls=*/ [
+        {
+            fnName: 'constructor',
+            args: constructorArgs,
+            address: amm.address
+        }
+    ]);
+    expectToBeTrue(ammConstructorResult.revertCode.isOK());
+    logger.debug(`Setting AMM as minter for liquidity token`);
+    // set the AMM as the minter for the liquidity token
+    // EXECUTE! This means that if using AvmProvingTester subclass, it will PROVE the transaction!
+    const setMinterResult = await tester.executeTxWithLabel(/*txLabel=*/ 'AMM/set_minter', /*sender=*/ admin, /*setupCalls=*/ [], /*appCalls=*/ [
+        {
+            fnName: 'set_minter',
+            args: [
+                /*minter=*/ amm,
+                /*approve=*/ true
+            ],
+            address: liquidityToken.address
+        }
+    ]);
+    expectToBeTrue(setMinterResult.revertCode.isOK());
+    logger.debug(`Adding liquidity`);
+    const amount0Max = INITIAL_TOKEN_BALANCE * 6n / 10n;
+    const amount0Min = INITIAL_TOKEN_BALANCE * 4n / 10n;
+    const amount1Max = INITIAL_TOKEN_BALANCE * 5n / 10n;
+    const amount1Min = INITIAL_TOKEN_BALANCE * 4n / 10n;
+    const addLiquidityResult = await addLiquidity(tester, sender, /*amm=*/ amm, /*token0=*/ token0, /*token1=*/ token1, /*liquidityToken=*/ liquidityToken, /*amount0Max=*/ amount0Max, /*amount1Max=*/ amount1Max, /*amount0Min=*/ amount0Min, /*amount1Min=*/ amount1Min);
+    expectToBeTrue(addLiquidityResult.revertCode.isOK());
+    logger.debug(`Swapping tokens`);
+    const swapResult = await swapExactTokensForTokens(tester, sender, /*amm=*/ amm, /*tokenIn=*/ token0, /*tokenOut=*/ token1, /*amountIn=*/ amount0Min / 10n, /*amountOutMin=*/ amount1Min / 100n);
+    expectToBeTrue(swapResult.revertCode.isOK());
+    logger.debug(`Removing liquidity`);
+    const removeLiquidityResult = await removeLiquidity(tester, sender, /*amm=*/ amm, /*token0=*/ token0, /*token1=*/ token1, /*liquidityToken=*/ liquidityToken, /*liquidity=*/ 100n, /*amount0Min=*/ 1n, /*amount1Min=*/ 1n);
+    expectToBeTrue(removeLiquidityResult.revertCode.isOK());
+    logger.info(`AMM public tx simulator test took ${timer.ms()}ms\n`);
+}
+async function addLiquidity(tester, sender, amm, token0, token1, liquidityToken, amount0Max, amount1Max, amount0Min, amount1Min, _nonce) {
+    const refundToken0PartialNote = {
+        commitment: new Fr(42)
+    };
+    const refundToken1PartialNote = {
+        commitment: new Fr(66)
+    };
+    const liquidityPartialNote = {
+        commitment: new Fr(99)
+    };
+    const refundToken0PartialNoteValidityCommitment = await computePartialNoteValidityCommitment(refundToken0PartialNote, amm.address);
+    const refundToken1PartialNoteValidityCommitment = await computePartialNoteValidityCommitment(refundToken1PartialNote, amm.address);
+    const liquidityPartialNoteValidityCommitment = await computePartialNoteValidityCommitment(liquidityPartialNote, amm.address);
+    // We need to inject the validity commitments into the nullifier tree as that would be performed by the private token
+    // functions that are not invoked in this test.
+    await tester.insertNullifier(token0.address, refundToken0PartialNoteValidityCommitment);
+    await tester.insertNullifier(token1.address, refundToken1PartialNoteValidityCommitment);
+    await tester.insertNullifier(liquidityToken.address, liquidityPartialNoteValidityCommitment);
+    // EXECUTE! This means that if using AvmProvingTester subclass, it will PROVE the transaction!
+    return await tester.executeTxWithLabel(/*txLabel=*/ 'AMM/add_liquidity', /*sender=*/ sender, /*setupCalls=*/ [], /*appCalls=*/ [
+        // token0.transfer_to_public enqueues a call to _increase_public_balance
+        {
+            sender: token0.address,
+            fnName: '_increase_public_balance',
+            args: [
+                /*to=*/ amm.address,
+                /*amount=*/ amount0Max
+            ],
+            address: token0.address
+        },
+        // token1.transfer_to_public enqueues a call to _increase_public_balance
+        {
+            sender: token1.address,
+            fnName: '_increase_public_balance',
+            args: [
+                /*to=*/ amm.address,
+                /*amount=*/ amount1Max
+            ],
+            address: token1.address
+        },
+        // amm.add_liquidity enqueues a call to _add_liquidity
+        {
+            sender: amm.address,
+            fnName: '_add_liquidity',
+            args: [
+                /*config=*/ {
+                    token0: token0.address,
+                    token1: token1.address,
+                    // eslint-disable-next-line camelcase
+                    liquidity_token: liquidityToken.address
+                },
+                refundToken0PartialNote,
+                refundToken1PartialNote,
+                liquidityPartialNote,
+                amount0Max,
+                amount1Max,
+                amount0Min,
+                amount1Min
+            ],
+            address: amm.address
+        }
+    ]);
+}
+async function swapExactTokensForTokens(tester, sender, amm, tokenIn, tokenOut, amountIn, amountOutMin, _nonce) {
+    const tokenOutPartialNote = {
+        commitment: new Fr(166)
+    };
+    const tokenOutPartialNoteValidityCommitment = await computePartialNoteValidityCommitment(tokenOutPartialNote, amm.address);
+    // We need to inject the validity commitment into the nullifier tree as that would be performed by the private token
+    // function that is not invoked in this test.
+    await tester.insertNullifier(tokenOut.address, tokenOutPartialNoteValidityCommitment);
+    // EXECUTE! This means that if using AvmProvingTester subclass, it will PROVE the transaction!
+    return await tester.executeTxWithLabel(/*txLabel=*/ 'AMM/swap_exact_tokens_for_tokens', /*sender=*/ sender, /*setupCalls=*/ [], /*appCalls=*/ [
+        // tokenIn.transfer_to_public enqueues a call to _increase_public_balance
+        {
+            sender: tokenIn.address,
+            fnName: '_increase_public_balance',
+            args: [
+                /*to=*/ amm.address,
+                /*amount=*/ amountIn
+            ],
+            address: tokenIn.address
+        },
+        {
+            sender: amm.address,
+            fnName: '_swap_exact_tokens_for_tokens',
+            args: [
+                tokenIn.address,
+                tokenOut.address,
+                amountIn,
+                amountOutMin,
+                tokenOutPartialNote
+            ],
+            address: amm.address
+        }
+    ]);
+}
+async function removeLiquidity(tester, sender, amm, token0, token1, liquidityToken, liquidity, amount0Min, amount1Min, _nonce) {
+    const token0PartialNote = {
+        commitment: new Fr(111)
+    };
+    const token1PartialNote = {
+        commitment: new Fr(222)
+    };
+    const token0PartialNoteValidityCommitment = await computePartialNoteValidityCommitment(token0PartialNote, amm.address);
+    const token1PartialNoteValidityCommitment = await computePartialNoteValidityCommitment(token1PartialNote, amm.address);
+    // We need to inject the validity commitments into the nullifier tree as that would be performed by the private token
+    // functions that are not invoked in this test.
+    await tester.insertNullifier(token0.address, token0PartialNoteValidityCommitment);
+    await tester.insertNullifier(token1.address, token1PartialNoteValidityCommitment);
+    // EXECUTE! This means that if using AvmProvingTester subclass, it will PROVE the transaction!
+    return await tester.executeTxWithLabel(/*txLabel=*/ 'AMM/remove_liquidity', /*sender=*/ sender, /*setupCalls=*/ [], /*appCalls=*/ [
+        // liquidityToken.transfer_to_public enqueues a call to _increase_public_balance
+        {
+            sender: liquidityToken.address,
+            fnName: '_increase_public_balance',
+            args: [
+                /*to=*/ amm.address,
+                /*amount=*/ liquidity
+            ],
+            address: liquidityToken.address
+        },
+        // amm.remove_liquidity enqueues a call to _remove_liquidity
+        {
+            sender: amm.address,
+            fnName: '_remove_liquidity',
+            args: [
+                /*config=*/ {
+                    token0: token0.address,
+                    token1: token1.address,
+                    // eslint-disable-next-line camelcase
+                    liquidity_token: liquidityToken.address
+                },
+                liquidity,
+                token0PartialNote,
+                token1PartialNote,
+                amount0Min,
+                amount1Min
+            ],
+            address: amm.address
+        }
+    ]);
+}
+async function computePartialNoteValidityCommitment(partialNote, completer) {
+    return await poseidon2HashWithSeparator([
+        partialNote.commitment,
+        completer
+    ], GeneratorIndex.PARTIAL_NOTE_VALIDITY_COMMITMENT);
+}

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

@@ -0,0 +1,6 @@
+import type { Logger } from '@aztec/foundation/log';
+import type { ContractArtifact } from '@aztec/stdlib/abi';
+import { PublicTxSimulationTester } from './public_tx_simulation_tester.js';
+export declare function bulkTest(tester: PublicTxSimulationTester, logger: Logger, avmTestContractArtifact: ContractArtifact): Promise<import("../index.js").PublicTxResult>;
+export declare function megaBulkTest(tester: PublicTxSimulationTester, logger: Logger, avmTestContractArtifact: ContractArtifact): Promise<import("../index.js").PublicTxResult>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnVsa190ZXN0LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcHVibGljL2ZpeHR1cmVzL2J1bGtfdGVzdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUVwRCxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBRzFELE9BQU8sRUFBRSx3QkFBd0IsRUFBRSxNQUFNLGtDQUFrQyxDQUFDO0FBRTVFLHdCQUFzQixRQUFRLENBQzVCLE1BQU0sRUFBRSx3QkFBd0IsRUFDaEMsTUFBTSxFQUFFLE1BQU0sRUFDZCx1QkFBdUIsRUFBRSxnQkFBZ0IsaURBa0YxQztBQUVELHdCQUFzQixZQUFZLENBQ2hDLE1BQU0sRUFBRSx3QkFBd0IsRUFDaEMsTUFBTSxFQUFFLE1BQU0sRUFDZCx1QkFBdUIsRUFBRSxnQkFBZ0IsaURBc0UxQyJ9

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

@@ -0,0 +1 @@
+{"version":3,"file":"bulk_test.d.ts","sourceRoot":"","sources":["../../../src/public/fixtures/bulk_test.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAG1D,OAAO,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AAE5E,wBAAsB,QAAQ,CAC5B,MAAM,EAAE,wBAAwB,EAChC,MAAM,EAAE,MAAM,EACd,uBAAuB,EAAE,gBAAgB,iDAkF1C;AAED,wBAAsB,YAAY,CAChC,MAAM,EAAE,wBAAwB,EAChC,MAAM,EAAE,MAAM,EACd,uBAAuB,EAAE,gBAAgB,iDAsE1C"}