@aztec/simulator 0.82.2 → 0.82.3-nightly.20250330

package/dest/public/hinting_db_sources.js

@@ -1,4 +1,9 @@
-import { AvmBytecodeCommitmentHint, AvmContractClassHint, AvmContractInstanceHint } from '@aztec/stdlib/avm';
+import { Fr } from '@aztec/foundation/fields';
+import { createLogger } from '@aztec/foundation/log';
+import { AvmBytecodeCommitmentHint, AvmContractClassHint, AvmContractInstanceHint, AvmGetLeafPreimageHintNullifierTree, AvmGetLeafPreimageHintPublicDataTree, AvmGetLeafValueHint, AvmGetPreviousValueIndexHint, AvmGetSiblingPathHint } from '@aztec/stdlib/avm';
+import { AppendOnlyTreeSnapshot, MerkleTreeId, getTreeName } from '@aztec/stdlib/trees';
+import { strict as assert } from 'assert';
+import { PublicTreesDB } from './public_db_sources.js';
 /**
  * A public contracts database that forwards requests and collects AVM hints.
  */ export class HintingPublicContractsDB {
@@ -34,3 +39,99 @@ import { AvmBytecodeCommitmentHint, AvmContractClassHint, AvmContractInstanceHin
         return await this.db.getDebugFunctionName(contractAddress, selector);
     }
 }
+/**
+ * A public trees database that forwards requests and collects AVM hints.
+ */ export class HintingPublicTreesDB extends PublicTreesDB {
+    hints;
+    static log = createLogger('HintingPublicTreesDB');
+    constructor(db, hints){
+        super(db), this.hints = hints;
+    }
+    // Getters.
+    async getSiblingPath(treeId, index) {
+        const path = await super.getSiblingPath(treeId, index);
+        const key = await this.getHintKey(treeId);
+        this.hints.getSiblingPathHints.push(new AvmGetSiblingPathHint(key, treeId, index, path.toFields()));
+        return Promise.resolve(path);
+    }
+    async getPreviousValueIndex(treeId, value) {
+        const result = await super.getPreviousValueIndex(treeId, value);
+        if (result === undefined) {
+            throw new Error(`getPreviousValueIndex(${getTreeName(treeId)}, ${value}}) returned undefined. Possible wrong tree setup or corrupted state.`);
+        }
+        const key = await this.getHintKey(treeId);
+        this.hints.getPreviousValueIndexHints.push(new AvmGetPreviousValueIndexHint(key, treeId, new Fr(value), result.index, result.alreadyPresent));
+        return result;
+    }
+    async getLeafPreimage(treeId, index) {
+        const preimage = await super.getLeafPreimage(treeId, index);
+        if (preimage) {
+            const key = await this.getHintKey(treeId);
+            switch(treeId){
+                case MerkleTreeId.PUBLIC_DATA_TREE:
+                    this.hints.getLeafPreimageHintsPublicDataTree.push(new AvmGetLeafPreimageHintPublicDataTree(key, index, preimage.asLeaf(), preimage.getNextIndex(), new Fr(preimage.getNextKey())));
+                    break;
+                case MerkleTreeId.NULLIFIER_TREE:
+                    this.hints.getLeafPreimageHintsNullifierTree.push(new AvmGetLeafPreimageHintNullifierTree(key, index, preimage.asLeaf(), preimage.getNextIndex(), new Fr(preimage.getNextKey())));
+                    break;
+                default:
+                    // Use getLeafValue for the other trees.
+                    throw new Error('getLeafPreimage only supported for PublicDataTree and NullifierTree!');
+                    break;
+            }
+        }
+        return preimage;
+    }
+    async getLeafValue(treeId, index) {
+        // Use getLeafPreimage for PublicDataTree and NullifierTree.
+        assert(treeId == MerkleTreeId.NOTE_HASH_TREE || treeId == MerkleTreeId.L1_TO_L2_MESSAGE_TREE);
+        const value = await super.getLeafValue(treeId, index);
+        if (value) {
+            const key = await this.getHintKey(treeId);
+            // We can cast to Fr because we know the type of the tree.
+            this.hints.getLeafValueHints.push(new AvmGetLeafValueHint(key, treeId, index, value));
+        }
+        return value;
+    }
+    // State modification.
+    async sequentialInsert(treeId, leaves) {
+        HintingPublicTreesDB.log.debug('sequentialInsert not hinted yet!');
+        const beforeState = await this.getHintKey(treeId);
+        const result = await super.sequentialInsert(treeId, leaves);
+        const afterState = await this.getHintKey(treeId);
+        HintingPublicTreesDB.log.debug(`Evolved tree state (${getTreeName(treeId)}): ${beforeState.root}, ${beforeState.nextAvailableLeafIndex} -> ${afterState.root}, ${afterState.nextAvailableLeafIndex}.`);
+        return result;
+    }
+    async revertCheckpoint() {
+        HintingPublicTreesDB.log.debug('revertCheckpoint not hinted yet!');
+        // TODO(fcarreiro): we probably want to hint on StateReference hash.
+        // WARNING: is this enough? we might actually need the number of the checkpoint or similar...
+        // We will need to keep a stack of checkpoints on the C++ side.
+        const beforeState = {
+            [MerkleTreeId.PUBLIC_DATA_TREE]: await this.getHintKey(MerkleTreeId.PUBLIC_DATA_TREE),
+            [MerkleTreeId.NULLIFIER_TREE]: await this.getHintKey(MerkleTreeId.NULLIFIER_TREE),
+            [MerkleTreeId.NOTE_HASH_TREE]: await this.getHintKey(MerkleTreeId.NOTE_HASH_TREE),
+            [MerkleTreeId.L1_TO_L2_MESSAGE_TREE]: await this.getHintKey(MerkleTreeId.L1_TO_L2_MESSAGE_TREE),
+            [MerkleTreeId.ARCHIVE]: await this.getHintKey(MerkleTreeId.ARCHIVE)
+        };
+        await super.revertCheckpoint();
+        const afterState = {
+            [MerkleTreeId.PUBLIC_DATA_TREE]: await this.getHintKey(MerkleTreeId.PUBLIC_DATA_TREE),
+            [MerkleTreeId.NULLIFIER_TREE]: await this.getHintKey(MerkleTreeId.NULLIFIER_TREE),
+            [MerkleTreeId.NOTE_HASH_TREE]: await this.getHintKey(MerkleTreeId.NOTE_HASH_TREE),
+            [MerkleTreeId.L1_TO_L2_MESSAGE_TREE]: await this.getHintKey(MerkleTreeId.L1_TO_L2_MESSAGE_TREE),
+            [MerkleTreeId.ARCHIVE]: await this.getHintKey(MerkleTreeId.ARCHIVE)
+        };
+        HintingPublicTreesDB.log.debug('Evolved tree state:');
+        for (const treeId of Object.keys(beforeState)){
+            const id = treeId;
+            const treeName = getTreeName(id);
+            HintingPublicTreesDB.log.debug(`${treeName}: ${beforeState[id].root}, ${beforeState[id].nextAvailableLeafIndex} -> ${afterState[id].root}, ${afterState[id].nextAvailableLeafIndex}.`);
+        }
+    }
+    // Private methods.
+    async getHintKey(treeId) {
+        const treeInfo = await super.getTreeInfo(treeId);
+        return new AppendOnlyTreeSnapshot(Fr.fromBuffer(treeInfo.root), Number(treeInfo.size));
+    }
+}

package/dest/public/index.d.ts

@@ -1,5 +1,5 @@
 export * from '../common/db_interfaces.js';
-export * from './public_tx_simulator/public_tx_simulator.js';
+export * from './public_tx_simulator/index.js';
 export * from './public_db_sources.js';
 export { PublicProcessor, PublicProcessorFactory } from './public_processor/public_processor.js';
 export { SideEffectTrace } from './side_effect_trace.js';

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/public/index.ts"],"names":[],"mappings":"AAAA,cAAc,4BAA4B,CAAC;AAC3C,cAAc,8CAA8C,CAAC;AAC7D,cAAc,wBAAwB,CAAC;AACvC,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAC;AACjG,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,cAAc,gBAAgB,CAAC;AAC/B,OAAO,EAAE,kCAAkC,EAAE,MAAM,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/public/index.ts"],"names":[],"mappings":"AAAA,cAAc,4BAA4B,CAAC;AAC3C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,wBAAwB,CAAC;AACvC,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAC;AACjG,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,cAAc,gBAAgB,CAAC;AAC/B,OAAO,EAAE,kCAAkC,EAAE,MAAM,YAAY,CAAC"}

package/dest/public/index.js

@@ -1,5 +1,5 @@
 export * from '../common/db_interfaces.js';
-export * from './public_tx_simulator/public_tx_simulator.js';
+export * from './public_tx_simulator/index.js';
 export * from './public_db_sources.js';
 export { PublicProcessor, PublicProcessorFactory } from './public_processor/public_processor.js';
 export { SideEffectTrace } from './side_effect_trace.js';

package/dest/public/public_db_sources.d.ts

@@ -5,7 +5,7 @@ import type { IndexedTreeLeafPreimage, SiblingPath } from '@aztec/foundation/tre
 import type { FunctionSelector } from '@aztec/stdlib/abi';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { type ContractClassPublic, type ContractDataSource, type ContractInstanceWithAddress } from '@aztec/stdlib/contract';
-import type { BatchInsertionResult, IndexedTreeId, MerkleTreeLeafType, MerkleTreeReadOperations, MerkleTreeWriteOperations, SequentialInsertionResult, TreeInfo } from '@aztec/stdlib/interfaces/server';
+import type { BatchInsertionResult, IndexedTreeId, MerkleTreeLeafType, MerkleTreeWriteOperations, SequentialInsertionResult, TreeInfo } from '@aztec/stdlib/interfaces/server';
 import { MerkleTreeId } from '@aztec/stdlib/trees';
 import type { BlockHeader, StateReference, Tx } from '@aztec/stdlib/tx';
 import type { PublicContractsDBInterface, PublicStateDBInterface } from '../common/db_interfaces.js';
@@ -126,7 +126,7 @@ declare class ForwardMerkleTree implements MerkleTreeWriteOperations {
  * A class that provides access to the merkle trees, and other helper methods.
  */
 export declare class PublicTreesDB extends ForwardMerkleTree implements PublicStateDBInterface {
-    db: MerkleTreeWriteOperations;
+    private readonly db;
     private logger;
     constructor(db: MerkleTreeWriteOperations);
     /**
@@ -148,6 +148,5 @@ export declare class PublicTreesDB extends ForwardMerkleTree implements PublicSt
     getNoteHash(leafIndex: bigint): Promise<Fr | undefined>;
     getNullifierIndex(nullifier: Fr): Promise<bigint | undefined>;
 }
-export declare function readPublicState(db: MerkleTreeReadOperations, contract: AztecAddress, slot: Fr): Promise<Fr>;
 export {};
 //# sourceMappingURL=public_db_sources.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"public_db_sources.d.ts","sourceRoot":"","sources":["../../src/public/public_db_sources.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAG9C,OAAO,KAAK,EAAE,uBAAuB,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAGpF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAE1D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EACL,KAAK,mBAAmB,EACxB,KAAK,kBAAkB,EACvB,KAAK,2BAA2B,EAEjC,MAAM,wBAAwB,CAAC;AAEhC,OAAO,KAAK,EACV,oBAAoB,EACpB,aAAa,EACb,kBAAkB,EAClB,wBAAwB,EACxB,yBAAyB,EACzB,yBAAyB,EACzB,QAAQ,EACT,MAAM,iCAAiC,CAAC;AAGzC,OAAO,EAAE,YAAY,EAAmC,MAAM,qBAAqB,CAAC;AACpF,OAAO,KAAK,EAAE,WAAW,EAAE,cAAc,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAExE,OAAO,KAAK,EAAE,0BAA0B,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAGrG;;;;;GAKG;AACH,qBAAa,iBAAkB,YAAW,0BAA0B;IAgBtD,OAAO,CAAC,UAAU;IAR9B,OAAO,CAAC,2BAA2B,CAAyB;IAC5D,OAAO,CAAC,wBAAwB,CAAyB;IACzD,OAAO,CAAC,UAAU,CAAyB;IAE3C,OAAO,CAAC,uBAAuB,CAAyB;IAExD,OAAO,CAAC,GAAG,CAAmD;gBAE1C,UAAU,EAAE,kBAAkB;IAElD;;;OAGG;IACU,eAAe,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAOnD;;;OAGG;IACU,4BAA4B,CAAC,EAAE,EAAE,EAAE;IAKhD;;;OAGG;IACU,yBAAyB,CAAC,EAAE,EAAE,EAAE;IAK7C;;;;OAIG;YACW,+BAA+B;IAW7C;;;;OAIG;YACW,4BAA4B;IAW1C;;;;OAIG;IACH,OAAO,CAAC,iCAAiC;IAQzC;;;;OAIG;IACH,OAAO,CAAC,8BAA8B;IAQtC;;;;;OAKG;YACW,0BAA0B;IAoBxC;;;;;OAKG;IACH,OAAO,CAAC,4BAA4B;IAcpC;;OAEG;IACI,mBAAmB;IAM1B;;;OAGG;IACI,oBAAoB,CAAC,kBAAkB,GAAE,OAAe;IAqBlD,mBAAmB,CAC9B,OAAO,EAAE,YAAY,EACrB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,2BAA2B,GAAG,SAAS,CAAC;IAUtC,gBAAgB,CAAC,eAAe,EAAE,EAAE,GAAG,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC;IAU/E,qBAAqB,CAAC,eAAe,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC;IAyBnE,oBAAoB,CAAC,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;CAGlH;AAED;;;;;;GAMG;AACH,cAAM,iBAAkB,YAAW,yBAAyB;IAC9C,OAAO,CAAC,QAAQ,CAAC,UAAU;gBAAV,UAAU,EAAE,yBAAyB;IAElE,WAAW,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,QAAQ,CAAC;IAIpD,iBAAiB,IAAI,OAAO,CAAC,cAAc,CAAC;IAI5C,gBAAgB,IAAI,WAAW;IAI/B,cAAc,CAAC,CAAC,SAAS,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IAI9F,qBAAqB,CAAC,EAAE,SAAS,aAAa,EAC5C,MAAM,EAAE,EAAE,EACV,KAAK,EAAE,MAAM,GACZ,OAAO,CACN;QACE,KAAK,EAAE,MAAM,CAAC;QACd,cAAc,EAAE,OAAO,CAAC;KACzB,GACD,SAAS,CACZ;IAID,eAAe,CAAC,EAAE,SAAS,aAAa,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,uBAAuB,GAAG,SAAS,CAAC;IAIlH,eAAe,CAAC,EAAE,SAAS,YAAY,EACrC,MAAM,EAAE,EAAE,EACV,MAAM,EAAE,kBAAkB,CAAC,EAAE,CAAC,EAAE,GAC/B,OAAO,CAAC,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;IAIlC,oBAAoB,CAAC,EAAE,SAAS,YAAY,EAC1C,MAAM,EAAE,EAAE,EACV,MAAM,EAAE,kBAAkB,CAAC,EAAE,CAAC,EAAE,EAChC,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;IAIlC,YAAY,CAAC,EAAE,SAAS,YAAY,EAClC,MAAM,EAAE,EAAE,EACV,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,kBAAkB,CAAC,OAAO,MAAM,CAAC,GAAG,SAAS,CAAC;IAIzD,6BAA6B,CAAC,EAAE,SAAS,YAAY,EACnD,MAAM,EAAE,EAAE,EACV,WAAW,EAAE,MAAM,EAAE,GACpB,OAAO,CAAC,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;IAIlC,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAIjC,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAIjC,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAIjC,YAAY,CAAC,EAAE,SAAS,YAAY,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,kBAAkB,CAAC,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAIlG,aAAa,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAIjD,WAAW,CAAC,UAAU,SAAS,MAAM,EAAE,wBAAwB,SAAS,MAAM,EAAE,EAAE,SAAS,aAAa,EACtG,MAAM,EAAE,EAAE,EACV,MAAM,EAAE,MAAM,EAAE,EAChB,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,oBAAoB,CAAC,UAAU,EAAE,wBAAwB,CAAC,CAAC;IAItE,gBAAgB,CAAC,UAAU,SAAS,MAAM,EAAE,EAAE,SAAS,aAAa,EAClE,MAAM,EAAE,EAAE,EACV,MAAM,EAAE,MAAM,EAAE,GACf,OAAO,CAAC,yBAAyB,CAAC,UAAU,CAAC,CAAC;IAIjD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAGvB;AAED;;GAEG;AACH,qBAAa,aAAc,SAAQ,iBAAkB,YAAW,sBAAsB;IAGjE,EAAE,EAAE,yBAAyB;IAFhD,OAAO,CAAC,MAAM,CAA6C;gBAExC,EAAE,EAAE,yBAAyB;IAIhD;;;;;OAKG;IACU,WAAW,CAAC,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC;IAIvE;;;;;;OAMG;IACU,YAAY,CAAC,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAM3E,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC;IAW9D,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC;IAWvD,iBAAiB,CAAC,SAAS,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;CAU3E;AAED,wBAAsB,eAAe,CAAC,EAAE,EAAE,wBAAwB,EAAE,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAcjH"}
+{"version":3,"file":"public_db_sources.d.ts","sourceRoot":"","sources":["../../src/public/public_db_sources.ts"],"names":[],"mappings":"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"}

package/dest/public/public_db_sources.js

@@ -260,7 +260,16 @@ import { TxContractCache } from './tx_contract_cache.js';
    * @param slot - Slot to read in the contract storage.
    * @returns The current value in the storage slot.
    */ async storageRead(contract, slot) {
-        return await readPublicState(this.db, contract, slot);
+        const leafSlot = (await computePublicDataTreeLeafSlot(contract, slot)).toBigInt();
+        const lowLeafResult = await this.getPreviousValueIndex(MerkleTreeId.PUBLIC_DATA_TREE, leafSlot);
+        if (!lowLeafResult) {
+            throw new Error('Low leaf not found');
+        }
+        // TODO(fcarreiro): We need this for the hints. Might move it to the hinting layer.
+        await this.getSiblingPath(MerkleTreeId.PUBLIC_DATA_TREE, lowLeafResult.index);
+        // Unconditionally fetching the preimage for the hints. Move it to the hinting layer?
+        const preimage = await this.getLeafPreimage(MerkleTreeId.PUBLIC_DATA_TREE, lowLeafResult.index);
+        return lowLeafResult.alreadyPresent ? preimage.value : Fr.ZERO;
     }
     /**
    * Records a write to public storage.
@@ -271,13 +280,15 @@ import { TxContractCache } from './tx_contract_cache.js';
    */ async storageWrite(contract, slot, newValue) {
         const leafSlot = await computePublicDataTreeLeafSlot(contract, slot);
         const publicDataWrite = new PublicDataWrite(leafSlot, newValue);
-        await this.db.sequentialInsert(MerkleTreeId.PUBLIC_DATA_TREE, [
+        await this.sequentialInsert(MerkleTreeId.PUBLIC_DATA_TREE, [
             publicDataWrite.toBuffer()
         ]);
     }
     async getL1ToL2LeafValue(leafIndex) {
         const timer = new Timer();
-        const leafValue = await this.db.getLeafValue(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, leafIndex);
+        const leafValue = await this.getLeafValue(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, leafIndex);
+        // TODO(fcarreiro): We need this for the hints. Might move it to the hinting layer.
+        await this.getSiblingPath(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, leafIndex);
         this.logger.debug(`[DB] Fetched L1 to L2 message leaf value`, {
             eventName: 'public-db-access',
             duration: timer.ms(),
@@ -287,7 +298,9 @@ import { TxContractCache } from './tx_contract_cache.js';
     }
     async getNoteHash(leafIndex) {
         const timer = new Timer();
-        const leafValue = await this.db.getLeafValue(MerkleTreeId.NOTE_HASH_TREE, leafIndex);
+        const leafValue = await this.getLeafValue(MerkleTreeId.NOTE_HASH_TREE, leafIndex);
+        // TODO(fcarreiro): We need this for the hints. Might move it to the hinting layer.
+        await this.getSiblingPath(MerkleTreeId.NOTE_HASH_TREE, leafIndex);
         this.logger.debug(`[DB] Fetched note hash leaf value`, {
             eventName: 'public-db-access',
             duration: timer.ms(),
@@ -297,9 +310,15 @@ import { TxContractCache } from './tx_contract_cache.js';
     }
     async getNullifierIndex(nullifier) {
         const timer = new Timer();
-        const index = (await this.db.findLeafIndices(MerkleTreeId.NULLIFIER_TREE, [
-            nullifier.toBuffer()
-        ]))[0];
+        const lowLeafResult = await this.getPreviousValueIndex(MerkleTreeId.NULLIFIER_TREE, nullifier.toBigInt());
+        if (!lowLeafResult) {
+            throw new Error('Low leaf not found');
+        }
+        // TODO(fcarreiro): We need this for the hints. Might move it to the hinting layer.
+        await this.getSiblingPath(MerkleTreeId.NULLIFIER_TREE, lowLeafResult.index);
+        // TODO(fcarreiro): We need this for the hints. Might move it to the hinting layer.
+        await this.getLeafPreimage(MerkleTreeId.NULLIFIER_TREE, lowLeafResult.index);
+        const index = lowLeafResult.alreadyPresent ? lowLeafResult.index : undefined;
         this.logger.debug(`[DB] Fetched nullifier index`, {
             eventName: 'public-db-access',
             duration: timer.ms(),
@@ -308,12 +327,3 @@ import { TxContractCache } from './tx_contract_cache.js';
         return index;
     }
 }
-export async function readPublicState(db, contract, slot) {
-    const leafSlot = (await computePublicDataTreeLeafSlot(contract, slot)).toBigInt();
-    const lowLeafResult = await db.getPreviousValueIndex(MerkleTreeId.PUBLIC_DATA_TREE, leafSlot);
-    if (!lowLeafResult || !lowLeafResult.alreadyPresent) {
-        return Fr.ZERO;
-    }
-    const preimage = await db.getLeafPreimage(MerkleTreeId.PUBLIC_DATA_TREE, lowLeafResult.index);
-    return preimage.value;
-}

package/dest/public/public_processor/public_processor.d.ts

@@ -7,7 +7,7 @@ import type { MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server'
 import { type FailedTx, GlobalVariables, NestedProcessReturnValues, type ProcessedTx, Tx, type TxValidator } from '@aztec/stdlib/tx';
 import { type TelemetryClient, type Traceable, type Tracer } from '@aztec/telemetry-client';
 import { PublicContractsDB, PublicTreesDB } from '../public_db_sources.js';
-import { PublicTxSimulator } from '../public_tx_simulator/public_tx_simulator.js';
+import { type PublicTxSimulator } from '../public_tx_simulator/index.js';
 /**
  * Creates new instances of PublicProcessor given the provided merkle tree db and contract data source.
  */
@@ -43,7 +43,8 @@ export declare class PublicProcessor implements Traceable {
     /**
      * Run each tx through the public circuit and the public kernel circuit if needed.
      * @param txs - Txs to process.
-     * @param processedTxHandler - Handler for processed txs in the context of block building or proving.
+     * @param limits - Limits for processing the txs.
+     * @param validator - Pre-process validator and nullifier cache to use for processing the txs.
      * @returns The list of processed txs with their circuit simulation outputs.
      */
     process(txs: Iterable<Tx> | AsyncIterable<Tx>, limits?: {
@@ -51,9 +52,8 @@ export declare class PublicProcessor implements Traceable {
         maxBlockSize?: number;
         maxBlockGas?: Gas;
         deadline?: Date;
-    }, validators?: {
+    }, validator?: {
         preprocessValidator?: TxValidator<Tx>;
-        postprocessValidator?: TxValidator<ProcessedTx>;
         nullifierCache?: {
             addNullifiers: (nullifiers: Buffer[]) => void;
         };

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

@@ -1 +1 @@
-{"version":3,"file":"public_processor.d.ts","sourceRoot":"","sources":["../../../src/public/public_processor/public_processor.ts"],"names":[],"mappings":";;AAIA,OAAO,EAAE,KAAK,YAAY,EAAkC,MAAM,yBAAyB,CAAC;AAM5F,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,iCAAiC,CAAC;AAEjF,OAAO,EACL,KAAK,QAAQ,EACb,eAAe,EACf,yBAAyB,EACzB,KAAK,WAAW,EAChB,EAAE,EAEF,KAAK,WAAW,EAGjB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAEL,KAAK,eAAe,EACpB,KAAK,SAAS,EACd,KAAK,MAAM,EAGZ,MAAM,yBAAyB,CAAC;AAGjC,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAC3E,OAAO,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAGlF;;GAEG;AACH,qBAAa,sBAAsB;IAE/B,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,eAAe;gBAFf,kBAAkB,EAAE,kBAAkB,EACtC,YAAY,EAAE,YAAY,EAC1B,eAAe,GAAE,eAAsC;IAGjE;;;;;;OAMG;IACI,MAAM,CACX,UAAU,EAAE,yBAAyB,EACrC,eAAe,EAAE,eAAe,EAChC,kBAAkB,EAAE,OAAO,GAC1B,eAAe;IAsBlB,SAAS,CAAC,uBAAuB,CAC/B,OAAO,EAAE,aAAa,EACtB,WAAW,EAAE,iBAAiB,EAC9B,eAAe,EAAE,eAAe,EAChC,kBAAkB,EAAE,OAAO,EAC3B,kBAAkB,EAAE,OAAO,EAC3B,eAAe,EAAE,eAAe;CAWnC;AASD;;;GAGG;AACH,qBAAa,eAAgB,YAAW,SAAS;IAG7C,SAAS,CAAC,eAAe,EAAE,eAAe;IAC1C,SAAS,CAAC,OAAO,EAAE,aAAa;IAChC,SAAS,CAAC,WAAW,EAAE,iBAAiB;IACxC,SAAS,CAAC,iBAAiB,EAAE,iBAAiB;IAC9C,OAAO,CAAC,YAAY;IAEpB,OAAO,CAAC,GAAG;IARb,OAAO,CAAC,OAAO,CAAyB;gBAE5B,eAAe,EAAE,eAAe,EAChC,OAAO,EAAE,aAAa,EACtB,WAAW,EAAE,iBAAiB,EAC9B,iBAAiB,EAAE,iBAAiB,EACtC,YAAY,EAAE,YAAY,EAClC,eAAe,GAAE,eAAsC,EAC/C,GAAG,yCAA6C;IAK1D,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED;;;;;OAKG;IACU,OAAO,CAClB,GAAG,EAAE,QAAQ,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,EAAE,CAAC,EACrC,MAAM,GAAE;QACN,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,WAAW,CAAC,EAAE,GAAG,CAAC;QAClB,QAAQ,CAAC,EAAE,IAAI,CAAC;KACZ,EACN,UAAU,GAAE;QACV,mBAAmB,CAAC,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC;QACtC,oBAAoB,CAAC,EAAE,WAAW,CAAC,WAAW,CAAC,CAAC;QAChD,cAAc,CAAC,EAAE;YAAE,aAAa,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,IAAI,CAAA;SAAE,CAAC;KAC/D,GACL,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,EAAE,yBAAyB,EAAE,CAAC,CAAC;YAwKtD,SAAS;YA2BT,gCAAgC;IAyC9C,kFAAkF;YACpE,uBAAuB;IA+BrC;;;;OAIG;YACW,4BAA4B;YAwB5B,oBAAoB;YA6BpB,wBAAwB;CA8CvC"}
+{"version":3,"file":"public_processor.d.ts","sourceRoot":"","sources":["../../../src/public/public_processor/public_processor.ts"],"names":[],"mappings":";;AAIA,OAAO,EAAE,KAAK,YAAY,EAAkC,MAAM,yBAAyB,CAAC;AAM5F,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,iCAAiC,CAAC;AAEjF,OAAO,EACL,KAAK,QAAQ,EACb,eAAe,EACf,yBAAyB,EACzB,KAAK,WAAW,EAChB,EAAE,EAEF,KAAK,WAAW,EAGjB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAEL,KAAK,eAAe,EACpB,KAAK,SAAS,EACd,KAAK,MAAM,EAGZ,MAAM,yBAAyB,CAAC;AAGjC,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAC3E,OAAO,EAAE,KAAK,iBAAiB,EAA8B,MAAM,iCAAiC,CAAC;AAGrG;;GAEG;AACH,qBAAa,sBAAsB;IAE/B,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,eAAe;gBAFf,kBAAkB,EAAE,kBAAkB,EACtC,YAAY,EAAE,YAAY,EAC1B,eAAe,GAAE,eAAsC;IAGjE;;;;;;OAMG;IACI,MAAM,CACX,UAAU,EAAE,yBAAyB,EACrC,eAAe,EAAE,eAAe,EAChC,kBAAkB,EAAE,OAAO,GAC1B,eAAe;IAsBlB,SAAS,CAAC,uBAAuB,CAC/B,OAAO,EAAE,aAAa,EACtB,WAAW,EAAE,iBAAiB,EAC9B,eAAe,EAAE,eAAe,EAChC,kBAAkB,EAAE,OAAO,EAC3B,kBAAkB,EAAE,OAAO,EAC3B,eAAe,EAAE,eAAe,GAC/B,iBAAiB;CAUrB;AASD;;;GAGG;AACH,qBAAa,eAAgB,YAAW,SAAS;IAG7C,SAAS,CAAC,eAAe,EAAE,eAAe;IAC1C,SAAS,CAAC,OAAO,EAAE,aAAa;IAChC,SAAS,CAAC,WAAW,EAAE,iBAAiB;IACxC,SAAS,CAAC,iBAAiB,EAAE,iBAAiB;IAC9C,OAAO,CAAC,YAAY;IAEpB,OAAO,CAAC,GAAG;IARb,OAAO,CAAC,OAAO,CAAyB;gBAE5B,eAAe,EAAE,eAAe,EAChC,OAAO,EAAE,aAAa,EACtB,WAAW,EAAE,iBAAiB,EAC9B,iBAAiB,EAAE,iBAAiB,EACtC,YAAY,EAAE,YAAY,EAClC,eAAe,GAAE,eAAsC,EAC/C,GAAG,yCAA6C;IAK1D,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED;;;;;;OAMG;IACU,OAAO,CAClB,GAAG,EAAE,QAAQ,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,EAAE,CAAC,EACrC,MAAM,GAAE;QACN,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,WAAW,CAAC,EAAE,GAAG,CAAC;QAClB,QAAQ,CAAC,EAAE,IAAI,CAAC;KACZ,EACN,SAAS,GAAE;QACT,mBAAmB,CAAC,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC;QACtC,cAAc,CAAC,EAAE;YAAE,aAAa,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,IAAI,CAAA;SAAE,CAAC;KAC/D,GACL,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,EAAE,yBAAyB,EAAE,CAAC,CAAC;YAoJtD,SAAS;YA2BT,gCAAgC;IAyC9C,kFAAkF;YACpE,uBAAuB;IA+BrC;;;;OAIG;YACW,4BAA4B;YAwB5B,oBAAoB;YA6BpB,wBAAwB;CA8CvC"}

package/dest/public/public_processor/public_processor.js

@@ -19,7 +19,7 @@ import { NestedProcessReturnValues, Tx, TxExecutionPhase, makeProcessedTxFromPri
 import { Attributes, getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
 import { ForkCheckpoint } from '@aztec/world-state/native';
 import { PublicContractsDB, PublicTreesDB } from '../public_db_sources.js';
-import { PublicTxSimulator } from '../public_tx_simulator/public_tx_simulator.js';
+import { TelemetryPublicTxSimulator } from '../public_tx_simulator/index.js';
 import { PublicProcessorMetrics } from './public_processor_metrics.js';
 /**
  * Creates new instances of PublicProcessor given the provided merkle tree db and contract data source.
@@ -45,7 +45,7 @@ import { PublicProcessorMetrics } from './public_processor_metrics.js';
         return new PublicProcessor(globalVariables, treesDB, contractsDB, publicTxSimulator, this.dateProvider, this.telemetryClient);
     }
     createPublicTxSimulator(treesDB, contractsDB, globalVariables, doMerkleOperations, skipFeeEnforcement, telemetryClient) {
-        return new PublicTxSimulator(treesDB, contractsDB, globalVariables, doMerkleOperations, skipFeeEnforcement, telemetryClient);
+        return new TelemetryPublicTxSimulator(treesDB, contractsDB, globalVariables, doMerkleOperations, skipFeeEnforcement, telemetryClient);
     }
 }
 class PublicProcessorTimeoutError extends Error {
@@ -80,11 +80,12 @@ class PublicProcessorTimeoutError extends Error {
     /**
    * Run each tx through the public circuit and the public kernel circuit if needed.
    * @param txs - Txs to process.
-   * @param processedTxHandler - Handler for processed txs in the context of block building or proving.
+   * @param limits - Limits for processing the txs.
+   * @param validator - Pre-process validator and nullifier cache to use for processing the txs.
    * @returns The list of processed txs with their circuit simulation outputs.
-   */ async process(txs, limits = {}, validators = {}) {
+   */ async process(txs, limits = {}, validator = {}) {
         const { maxTransactions, maxBlockSize, deadline, maxBlockGas } = limits;
-        const { preprocessValidator, postprocessValidator, nullifierCache } = validators;
+        const { preprocessValidator, nullifierCache } = validator;
         const result = [];
         const failed = [];
         const timer = new Timer();
@@ -169,28 +170,6 @@ class PublicProcessorTimeoutError extends Error {
                     await checkpoint.revert();
                     continue;
                 }
-                // Re-validate the transaction
-                if (postprocessValidator) {
-                    // Only accept processed transactions that are not double-spends,
-                    // public functions emitting nullifiers would pass earlier check but fail here.
-                    // Note that we're checking all nullifiers generated in the private execution twice,
-                    // we could store the ones already checked and skip them here as an optimization.
-                    // TODO(palla/txs): Can we get into this case? AVM validates this. We should be able to remove it.
-                    const result = await postprocessValidator.validateTx(processedTx);
-                    if (result.result !== 'valid') {
-                        const reason = result.reason.join(', ');
-                        this.log.error(`Rejecting tx ${processedTx.hash} after processing: ${reason}.`);
-                        failed.push({
-                            tx,
-                            error: new Error(`Tx failed post-process validation: ${reason}`)
-                        });
-                        // Need to revert the checkpoint here and don't go any further
-                        await checkpoint.revert();
-                        continue;
-                    } else {
-                        this.log.trace(`Tx ${txHash.toString()} is valid post processing.`);
-                    }
-                }
                 if (!tx.hasPublicCalls()) {
                     // If there are no public calls, perform all tree insertions for side effects from private
                     // When there are public calls, the PublicTxSimulator & AVM handle tree insertions.
@@ -347,7 +326,7 @@ class PublicProcessorTimeoutError extends Error {
             if (phase.reverted) {
                 this.metrics.recordRevertedPhase(phase.phase);
             } else {
-                this.metrics.recordPhaseDuration(phase.phase, phase.durationMs);
+                this.metrics.recordPhaseDuration(phase.phase, phase.durationMs ?? 0);
             }
         });
         const siloedContractClassLogs = await tx.filterContractClassLogs(tx.data.getNonEmptyContractClassLogsHashes(), true);

package/dest/public/public_tx_simulator/apps_tests/amm_test.d.ts

@@ -0,0 +1,9 @@
+import type { Logger } from '@aztec/foundation/log';
+import { PublicTxSimulationTester } from '../../fixtures/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): Promise<void>;
+//# sourceMappingURL=amm_test.d.ts.map

package/dest/public/public_tx_simulator/apps_tests/amm_test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"amm_test.d.ts","sourceRoot":"","sources":["../../../../src/public/public_tx_simulator/apps_tests/amm_test.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAKpD,OAAO,EAAE,wBAAwB,EAAE,MAAM,+CAA+C,CAAC;AAIzF;;;;GAIG;AACH,wBAAsB,OAAO,CAAC,MAAM,EAAE,wBAAwB,EAAE,MAAM,EAAE,MAAM,iBAoG7E"}

package/dest/public/public_tx_simulator/apps_tests/amm_test.js

@@ -0,0 +1,237 @@
+import { Fr } from '@aztec/foundation/fields';
+import { AMMContractArtifact } from '@aztec/noir-contracts.js/AMM';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { deployToken } 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) {
+    const startTime = performance.now();
+    const admin = AztecAddress.fromNumber(42);
+    const sender = AztecAddress.fromNumber(111);
+    logger.debug(`Deploying tokens`);
+    const token0 = await deployToken(tester, admin, /*seed=*/ 0);
+    const token1 = await deployToken(tester, admin, /*seed=*/ 1);
+    const liquidityToken = await deployToken(tester, admin, /*seed=*/ 2);
+    logger.debug(`Deploying AMM`);
+    const constructorArgs = [
+        token0,
+        token1,
+        liquidityToken
+    ];
+    const amm = await tester.registerAndDeployContract(constructorArgs, /*deployer=*/ admin, AMMContractArtifact, /*skipNullifierInsertion=*/ false, /*seed=*/ 3);
+    const ammConstructorResult = await tester.simulateTxWithLabel(/*txLabel=*/ 'constructor', /*sender=*/ admin, /*setupCalls=*/ [], /*appCalls=*/ [
+        {
+            fnName: 'constructor',
+            args: constructorArgs,
+            address: amm.address
+        }
+    ]);
+    expect(ammConstructorResult.revertCode.isOK()).toBe(true);
+    logger.debug(`Setting AMM as minter for liquidity token`);
+    // set the AMM as the minter for the liquidity token
+    const setMinterResult = await tester.simulateTxWithLabel(/*txLabel=*/ 'set_minter', /*sender=*/ admin, /*setupCalls=*/ [], /*appCalls=*/ [
+        {
+            fnName: 'set_minter',
+            args: [
+                /*minter=*/ amm,
+                /*approve=*/ true
+            ],
+            address: liquidityToken.address
+        }
+    ]);
+    expect(setMinterResult.revertCode.isOK()).toBe(true);
+    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);
+    expect(addLiquidityResult.revertCode.isOK()).toBe(true);
+    logger.debug(`Swapping tokens`);
+    const swapResult = await swapExactTokensForTokens(tester, sender, /*amm=*/ amm, /*tokenIn=*/ token0, /*tokenOut=*/ token1, /*amountIn=*/ amount0Min / 10n, /*amountOutMin=*/ amount1Min / 100n);
+    expect(swapResult.revertCode.isOK()).toBe(true);
+    logger.debug(`Removing liquidity`);
+    const removeLiquidityResult = await removeLiquidity(tester, sender, /*amm=*/ amm, /*token0=*/ token0, /*token1=*/ token1, /*liquidityToken=*/ liquidityToken, /*liquidity=*/ 100n, /*amount0Min=*/ 1n, /*amount1Min=*/ 1n);
+    expect(removeLiquidityResult.revertCode.isOK()).toBe(true);
+    const endTime = performance.now();
+    logger.info(`AMM public tx simulator test took ${endTime - startTime}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)
+    };
+    return await tester.simulateTxWithLabel(/*txLabel=*/ '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
+        },
+        // token0.prepare_private_balance_increase enqueues a call to _store_balances_set_partial_note
+        {
+            sender: token0.address,
+            fnName: '_store_balances_set_partial_note',
+            args: [
+                refundToken0PartialNote
+            ],
+            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
+        },
+        // token1.prepare_private_balance_increase enqueues a call to _store_balances_set_partial_note
+        {
+            sender: token1.address,
+            fnName: '_store_balances_set_partial_note',
+            args: [
+                refundToken1PartialNote
+            ],
+            address: token1.address
+        },
+        // liquidityToken.prepare_private_balance_increase enqueues a call to _store_balances_set_partial_note
+        {
+            sender: liquidityToken.address,
+            fnName: '_store_balances_set_partial_note',
+            args: [
+                liquidityPartialNote
+            ],
+            address: liquidityToken.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(66)
+    };
+    return await tester.simulateTxWithLabel(/*txLabel=*/ '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
+        },
+        // tokenOut.prepare_private_balance_increase enqueues a call to _store_balances_set_partial_note
+        {
+            sender: tokenOut.address,
+            fnName: '_store_balances_set_partial_note',
+            args: [
+                tokenOutPartialNote
+            ],
+            address: tokenOut.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)
+    };
+    return await tester.simulateTxWithLabel(/*txLabel=*/ '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
+        },
+        // token0.prepare_private_balance_increase enqueues a call to _store_balances_set_partial_note
+        {
+            sender: token0.address,
+            fnName: '_store_balances_set_partial_note',
+            args: [
+                token0PartialNote
+            ],
+            address: token0.address
+        },
+        // token1.prepare_private_balance_increase enqueues a call to _store_balances_set_partial_note
+        {
+            sender: token1.address,
+            fnName: '_store_balances_set_partial_note',
+            args: [
+                token1PartialNote
+            ],
+            address: token1.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
+        }
+    ]);
+}

package/dest/public/public_tx_simulator/apps_tests/token_test.d.ts

@@ -0,0 +1,7 @@
+import type { Logger } from '@aztec/foundation/log';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract';
+import { PublicTxSimulationTester } from '../../fixtures/public_tx_simulation_tester.js';
+export declare function tokenTest(tester: PublicTxSimulationTester, logger: Logger): Promise<void>;
+export declare function deployToken(tester: PublicTxSimulationTester, admin: AztecAddress, seed?: number): Promise<ContractInstanceWithAddress>;
+//# sourceMappingURL=token_test.d.ts.map

package/dest/public/public_tx_simulator/apps_tests/token_test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"token_test.d.ts","sourceRoot":"","sources":["../../../../src/public/public_tx_simulator/apps_tests/token_test.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAE1E,OAAO,EAAE,wBAAwB,EAAE,MAAM,+CAA+C,CAAC;AAEzF,wBAAsB,SAAS,CAAC,MAAM,EAAE,wBAAwB,EAAE,MAAM,EAAE,MAAM,iBA4E/E;AAED,wBAAsB,WAAW,CAAC,MAAM,EAAE,wBAAwB,EAAE,KAAK,EAAE,YAAY,EAAE,IAAI,SAAI,wCAwBhG"}