@aztec/pxe 0.0.1-commit.d1f2d6c → 0.0.1-commit.d431d1c

package/dest/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.js

@@ -1,6 +1,5 @@
 import { SiloedTag, Tag } from '@aztec/stdlib/logs';
 import { TxHash } from '@aztec/stdlib/tx';
-import { getAllPrivateLogsByTags } from '../../get_all_logs_by_tags.js';
 /**
  * Loads tagging indexes from the Aztec node and stores them in the tagging data provider.
  * @remarks This function is one of two places by which a pending index can get to the tagging data provider. The other
@@ -14,14 +13,14 @@ import { getAllPrivateLogsByTags } from '../../get_all_logs_by_tags.js';
  * @param taggingStore - The data provider to store pending indexes.
  * @param jobId - Job identifier, used to keep writes in-memory until they can be persisted in a data integrity
  * preserving way.
- */ export async function loadAndStoreNewTaggingIndexes(secret, app, start, end, aztecNode, taggingStore, anchorBlockHash, jobId) {
+ */ export async function loadAndStoreNewTaggingIndexes(secret, app, start, end, aztecNode, taggingStore, jobId) {
     // We compute the tags for the current window of indexes
     const preTagsForWindow = Array(end - start).fill(0).map((_, i)=>({
             secret,
             index: start + i
         }));
     const siloedTagsForWindow = await Promise.all(preTagsForWindow.map(async (preTag)=>SiloedTag.compute(await Tag.compute(preTag), app)));
-    const txsForTags = await getTxsContainingTags(siloedTagsForWindow, aztecNode, anchorBlockHash);
+    const txsForTags = await getTxsContainingTags(siloedTagsForWindow, aztecNode);
     const highestIndexMap = getTxHighestIndexMap(txsForTags, preTagsForWindow);
     // Now we iterate over the map, reconstruct the preTags and tx hash and store them in the db.
     for (const [txHashStr, highestIndex] of highestIndexMap.entries()){
@@ -36,10 +35,8 @@ import { getAllPrivateLogsByTags } from '../../get_all_logs_by_tags.js';
 }
 // Returns txs that used the given tags. A tag might have been used in multiple txs and for this reason we return
 // an array for each tag.
-async function getTxsContainingTags(tags, aztecNode, anchorBlockHash) {
-    // We use the utility function below to retrieve all logs for the tags across all pages, so we don't need to handle
-    // pagination here.
-    const allLogs = await getAllPrivateLogsByTags(aztecNode, tags, anchorBlockHash);
+async function getTxsContainingTags(tags, aztecNode) {
+    const allLogs = await aztecNode.getPrivateLogsByTags(tags);
     return allLogs.map((logs)=>logs.map((log)=>log.txHash));
 }
 // Returns a map of txHash to the highest index for that txHash.

package/dest/tree_membership/tree_membership_service.d.ts

@@ -0,0 +1,50 @@
+import type { L1_TO_L2_MSG_TREE_HEIGHT } from '@aztec/constants';
+import type { Fr } from '@aztec/foundation/curves/bn254';
+import type { SiblingPath } from '@aztec/foundation/trees';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { L2BlockHash } from '@aztec/stdlib/block';
+import type { AztecNode } from '@aztec/stdlib/interfaces/server';
+import { MerkleTreeId, NullifierMembershipWitness, PublicDataWitness } from '@aztec/stdlib/trees';
+export declare class TreeMembershipService {
+    #private;
+    private readonly aztecNode;
+    constructor(aztecNode: AztecNode);
+    /**
+     * Gets the index of a nullifier in the nullifier tree.
+     * @returns - The index of the nullifier. Undefined if it does not exist in the tree.
+     */
+    getNullifierIndex(nullifier: Fr): Promise<bigint | undefined>;
+    /**
+     * Fetches the index and sibling path of a leaf at a given block from a given tree.
+     * @param blockHash - The block hash at which to get the membership witness.
+     * @param treeId - Id of the tree to get the sibling path from.
+     * @param leafValue - The leaf value
+     * @returns The index and sibling path concatenated [index, sibling_path]
+     */
+    getMembershipWitness(blockHash: L2BlockHash, treeId: MerkleTreeId, leafValue: Fr): Promise<Fr[]>;
+    /**
+     * Returns a low nullifier membership witness for a given nullifier at a given block.
+     * @param blockHash - The block hash at which to get the index.
+     * @param nullifier - Nullifier we try to find the low nullifier witness for.
+     * @returns The low nullifier membership witness (if found).
+     * @remarks Low nullifier witness can be used to perform a nullifier non-inclusion proof by leveraging the "linked
+     * list structure" of leaves and proving that a lower nullifier is pointing to a bigger next value than the nullifier
+     * we are trying to prove non-inclusion for.
+     */
+    getLowNullifierMembershipWitness(blockHash: L2BlockHash, nullifier: Fr): Promise<NullifierMembershipWitness | undefined>;
+    /**
+     * Returns a witness for a given slot of the public data tree at a given block.
+     * @param blockHash - The block hash at which to get the witness.
+     * @param leafSlot - The slot of the public data in the public data tree.
+     */
+    getPublicDataWitness(blockHash: L2BlockHash, leafSlot: Fr): Promise<PublicDataWitness | undefined>;
+    /**
+     * Looks for the L1 to L2 membership witness of a message at the Aztec node, given its hash.
+     * @param contractAddress - Address of a contract by which the message was emitted.
+     * @dev Contract address and secret are only used to compute the nullifier to get non-nullified messages.
+     * The message nullifier is computed locally, so the secret is not sent to the node.
+     * @returns The l1 to l2 membership witness (index of message in the tree and sibling path).
+     */
+    getL1ToL2MembershipWitness(contractAddress: AztecAddress, messageHash: Fr, secret: Fr): Promise<[bigint, SiblingPath<typeof L1_TO_L2_MSG_TREE_HEIGHT>]>;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJlZV9tZW1iZXJzaGlwX3NlcnZpY2UuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90cmVlX21lbWJlcnNoaXAvdHJlZV9tZW1iZXJzaGlwX3NlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsd0JBQXdCLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUNqRSxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUN6RCxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUMzRCxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNoRSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDbEQsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFakUsT0FBTyxFQUFFLFlBQVksRUFBRSwwQkFBMEIsRUFBRSxpQkFBaUIsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBTWxHLHFCQUFhLHFCQUFxQjs7SUFDcEIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxTQUFTO0lBQXRDLFlBQTZCLFNBQVMsRUFBRSxTQUFTLEVBQUk7SUFFckQ7OztPQUdHO0lBQ1UsaUJBQWlCLENBQUMsU0FBUyxFQUFFLEVBQUUsR0FBRyxPQUFPLENBQUMsTUFBTSxHQUFHLFNBQVMsQ0FBQyxDQUd6RTtJQUVEOzs7Ozs7T0FNRztJQUNVLG9CQUFvQixDQUFDLFNBQVMsRUFBRSxXQUFXLEVBQUUsTUFBTSxFQUFFLFlBQVksRUFBRSxTQUFTLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQVE1RztJQUVEOzs7Ozs7OztPQVFHO0lBQ0ksZ0NBQWdDLENBQ3JDLFNBQVMsRUFBRSxXQUFXLEVBQ3RCLFNBQVMsRUFBRSxFQUFFLEdBQ1osT0FBTyxDQUFDLDBCQUEwQixHQUFHLFNBQVMsQ0FBQyxDQUVqRDtJQUVEOzs7O09BSUc7SUFDSSxvQkFBb0IsQ0FBQyxTQUFTLEVBQUUsV0FBVyxFQUFFLFFBQVEsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLGlCQUFpQixHQUFHLFNBQVMsQ0FBQyxDQUV4RztJQUVEOzs7Ozs7T0FNRztJQUNJLDBCQUEwQixDQUMvQixlQUFlLEVBQUUsWUFBWSxFQUM3QixXQUFXLEVBQUUsRUFBRSxFQUNmLE1BQU0sRUFBRSxFQUFFLEdBQ1QsT0FBTyxDQUFDLENBQUMsTUFBTSxFQUFFLFdBQVcsQ0FBQyxPQUFPLHdCQUF3QixDQUFDLENBQUMsQ0FBQyxDQUVqRTtDQWdCRiJ9

package/dest/tree_membership/tree_membership_service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tree_membership_service.d.ts","sourceRoot":"","sources":["../../src/tree_membership/tree_membership_service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AACjE,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAEjE,OAAO,EAAE,YAAY,EAAE,0BAA0B,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAMlG,qBAAa,qBAAqB;;IACpB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAAtC,YAA6B,SAAS,EAAE,SAAS,EAAI;IAErD;;;OAGG;IACU,iBAAiB,CAAC,SAAS,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAGzE;IAED;;;;;;OAMG;IACU,oBAAoB,CAAC,SAAS,EAAE,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC,CAQ5G;IAED;;;;;;;;OAQG;IACI,gCAAgC,CACrC,SAAS,EAAE,WAAW,EACtB,SAAS,EAAE,EAAE,GACZ,OAAO,CAAC,0BAA0B,GAAG,SAAS,CAAC,CAEjD;IAED;;;;OAIG;IACI,oBAAoB,CAAC,SAAS,EAAE,WAAW,EAAE,QAAQ,EAAE,EAAE,GAAG,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC,CAExG;IAED;;;;;;OAMG;IACI,0BAA0B,CAC/B,eAAe,EAAE,YAAY,EAC7B,WAAW,EAAE,EAAE,EACf,MAAM,EAAE,EAAE,GACT,OAAO,CAAC,CAAC,MAAM,EAAE,WAAW,CAAC,OAAO,wBAAwB,CAAC,CAAC,CAAC,CAEjE;CAgBF"}

package/dest/tree_membership/tree_membership_service.js

@@ -0,0 +1,75 @@
+import { getNonNullifiedL1ToL2MessageWitness } from '@aztec/stdlib/messaging';
+import { MerkleTreeId } from '@aztec/stdlib/trees';
+// TODO: REmove this class as it no longer seems valuable. The only somewhat real functionality in this class is in
+// the `getMembershipWitness` method that is used by `utilityGetMembershipWitness` oracle by then in Aztec.nr we
+// have helper functions around that oracle for archive and note hash tree and the generic method itself is not used
+// anywhere else - make sense to just have simple specific handlers for the archive and note hash trees and drop this.
+export class TreeMembershipService {
+    aztecNode;
+    constructor(aztecNode){
+        this.aztecNode = aztecNode;
+    }
+    /**
+   * Gets the index of a nullifier in the nullifier tree.
+   * @returns - The index of the nullifier. Undefined if it does not exist in the tree.
+   */ async getNullifierIndex(nullifier) {
+        const [leafIndex] = await this.aztecNode.findLeavesIndexes('latest', MerkleTreeId.NULLIFIER_TREE, [
+            nullifier
+        ]);
+        return leafIndex?.data;
+    }
+    /**
+   * Fetches the index and sibling path of a leaf at a given block from a given tree.
+   * @param blockHash - The block hash at which to get the membership witness.
+   * @param treeId - Id of the tree to get the sibling path from.
+   * @param leafValue - The leaf value
+   * @returns The index and sibling path concatenated [index, sibling_path]
+   */ async getMembershipWitness(blockHash, treeId, leafValue) {
+        const witness = await this.#tryGetMembershipWitness(blockHash, treeId, leafValue);
+        if (!witness) {
+            throw new Error(`Leaf value ${leafValue} not found in tree ${MerkleTreeId[treeId]} at block hash ${blockHash.toString()}`);
+        }
+        return witness;
+    }
+    /**
+   * Returns a low nullifier membership witness for a given nullifier at a given block.
+   * @param blockHash - The block hash at which to get the index.
+   * @param nullifier - Nullifier we try to find the low nullifier witness for.
+   * @returns The low nullifier membership witness (if found).
+   * @remarks Low nullifier witness can be used to perform a nullifier non-inclusion proof by leveraging the "linked
+   * list structure" of leaves and proving that a lower nullifier is pointing to a bigger next value than the nullifier
+   * we are trying to prove non-inclusion for.
+   */ getLowNullifierMembershipWitness(blockHash, nullifier) {
+        return this.aztecNode.getLowNullifierMembershipWitness(blockHash, nullifier);
+    }
+    /**
+   * Returns a witness for a given slot of the public data tree at a given block.
+   * @param blockHash - The block hash at which to get the witness.
+   * @param leafSlot - The slot of the public data in the public data tree.
+   */ getPublicDataWitness(blockHash, leafSlot) {
+        return this.aztecNode.getPublicDataWitness(blockHash, leafSlot);
+    }
+    /**
+   * Looks for the L1 to L2 membership witness of a message at the Aztec node, given its hash.
+   * @param contractAddress - Address of a contract by which the message was emitted.
+   * @dev Contract address and secret are only used to compute the nullifier to get non-nullified messages.
+   * The message nullifier is computed locally, so the secret is not sent to the node.
+   * @returns The l1 to l2 membership witness (index of message in the tree and sibling path).
+   */ getL1ToL2MembershipWitness(contractAddress, messageHash, secret) {
+        return getNonNullifiedL1ToL2MessageWitness(this.aztecNode, contractAddress, messageHash, secret);
+    }
+    async #tryGetMembershipWitness(blockHash, treeId, value) {
+        switch(treeId){
+            case MerkleTreeId.NULLIFIER_TREE:
+                return (await this.aztecNode.getNullifierMembershipWitness(blockHash, value))?.withoutPreimage().toFields();
+            case MerkleTreeId.NOTE_HASH_TREE:
+                return (await this.aztecNode.getNoteHashMembershipWitness(blockHash, value))?.toFields();
+            case MerkleTreeId.PUBLIC_DATA_TREE:
+                return (await this.aztecNode.getPublicDataWitness(blockHash, value))?.withoutPreimage().toFields();
+            case MerkleTreeId.ARCHIVE:
+                return (await this.aztecNode.getArchiveMembershipWitness(blockHash, value))?.toFields();
+            default:
+                throw new Error('Not implemented');
+        }
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/pxe",
-  "version": "0.0.1-commit.d1f2d6c",
+  "version": "0.0.1-commit.d431d1c",
   "type": "module",
   "exports": {
     "./server": "./dest/entrypoints/server/index.js",
@@ -61,19 +61,19 @@
     ]
   },
   "dependencies": {
-    "@aztec/bb-prover": "0.0.1-commit.d1f2d6c",
-    "@aztec/bb.js": "0.0.1-commit.d1f2d6c",
-    "@aztec/builder": "0.0.1-commit.d1f2d6c",
-    "@aztec/constants": "0.0.1-commit.d1f2d6c",
-    "@aztec/ethereum": "0.0.1-commit.d1f2d6c",
-    "@aztec/foundation": "0.0.1-commit.d1f2d6c",
-    "@aztec/key-store": "0.0.1-commit.d1f2d6c",
-    "@aztec/kv-store": "0.0.1-commit.d1f2d6c",
-    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.d1f2d6c",
-    "@aztec/noir-types": "0.0.1-commit.d1f2d6c",
-    "@aztec/protocol-contracts": "0.0.1-commit.d1f2d6c",
-    "@aztec/simulator": "0.0.1-commit.d1f2d6c",
-    "@aztec/stdlib": "0.0.1-commit.d1f2d6c",
+    "@aztec/bb-prover": "0.0.1-commit.d431d1c",
+    "@aztec/bb.js": "0.0.1-commit.d431d1c",
+    "@aztec/builder": "0.0.1-commit.d431d1c",
+    "@aztec/constants": "0.0.1-commit.d431d1c",
+    "@aztec/ethereum": "0.0.1-commit.d431d1c",
+    "@aztec/foundation": "0.0.1-commit.d431d1c",
+    "@aztec/key-store": "0.0.1-commit.d431d1c",
+    "@aztec/kv-store": "0.0.1-commit.d431d1c",
+    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.d431d1c",
+    "@aztec/noir-types": "0.0.1-commit.d431d1c",
+    "@aztec/protocol-contracts": "0.0.1-commit.d431d1c",
+    "@aztec/simulator": "0.0.1-commit.d431d1c",
+    "@aztec/stdlib": "0.0.1-commit.d431d1c",
     "koa": "^2.16.1",
     "koa-router": "^13.1.1",
     "lodash.omit": "^4.5.0",
@@ -82,8 +82,8 @@
     "viem": "npm:@aztec/viem@2.38.2"
   },
   "devDependencies": {
-    "@aztec/merkle-tree": "0.0.1-commit.d1f2d6c",
-    "@aztec/noir-test-contracts.js": "0.0.1-commit.d1f2d6c",
+    "@aztec/merkle-tree": "0.0.1-commit.d431d1c",
+    "@aztec/noir-test-contracts.js": "0.0.1-commit.d431d1c",
     "@jest/globals": "^30.0.0",
     "@types/jest": "^30.0.0",
     "@types/lodash.omit": "^4.5.7",

package/src/block_synchronizer/block_synchronizer.ts

@@ -9,9 +9,8 @@ import {
   type L2BlockStreamEventHandler,
 } from '@aztec/stdlib/block';
 import type { AztecNode } from '@aztec/stdlib/interfaces/client';
-import type { BlockHeader } from '@aztec/stdlib/tx';
 
-import type { BlockSynchronizerConfig } from '../config/index.js';
+import type { PXEConfig } from '../config/index.js';
 import type { AnchorBlockStore } from '../storage/anchor_block_store/anchor_block_store.js';
 import type { NoteStore } from '../storage/note_store/note_store.js';
 import type { PrivateEventStore } from '../storage/private_event_store/private_event_store.js';
@@ -33,7 +32,7 @@ export class BlockSynchronizer implements L2BlockStreamEventHandler {
     private noteStore: NoteStore,
     private privateEventStore: PrivateEventStore,
     private l2TipsStore: L2TipsKVStore,
-    private config: Partial<BlockSynchronizerConfig> = {},
+    config: Partial<Pick<PXEConfig, 'l2BlockBatchSize'>> = {},
     loggerOrSuffix?: string | Logger,
   ) {
     this.log =
@@ -43,7 +42,7 @@ export class BlockSynchronizer implements L2BlockStreamEventHandler {
     this.blockStream = this.createBlockStream(config);
   }
 
-  protected createBlockStream(config: Partial<BlockSynchronizerConfig>): L2BlockStream {
+  protected createBlockStream(config: Partial<Pick<PXEConfig, 'l2BlockBatchSize'>>) {
     return new L2BlockStream(this.node, this.l2TipsStore, this, createLogger('pxe:block_stream'), {
       batchSize: config.l2BlockBatchSize,
       // Skipping finalized blocks makes us sync much faster - we only need to download blocks other than the latest one
@@ -58,51 +57,19 @@ export class BlockSynchronizer implements L2BlockStreamEventHandler {
 
     switch (event.type) {
       case 'blocks-added': {
-        if (this.config.syncChainTip === undefined || this.config.syncChainTip === 'proposed') {
-          const lastBlock = event.blocks.at(-1)!;
-          await this.updateAnchorBlockHeader(lastBlock.header);
-        }
-        break;
-      }
-      case 'chain-checkpointed': {
-        if (this.config.syncChainTip === 'checkpointed') {
-          // Get the last block header from the checkpoint
-          const lastBlock = event.checkpoint.checkpoint.blocks.at(-1)!;
-          await this.updateAnchorBlockHeader(lastBlock.header);
-        }
-        break;
-      }
-      case 'chain-proven': {
-        if (this.config.syncChainTip === 'proven') {
-          const blockHeader = await this.node.getBlockHeader(BlockNumber(event.block.number));
-          if (blockHeader) {
-            await this.updateAnchorBlockHeader(blockHeader);
-          }
-        }
-        break;
-      }
-      case 'chain-finalized': {
-        if (this.config.syncChainTip === 'finalized') {
-          const blockHeader = await this.node.getBlockHeader(BlockNumber(event.block.number));
-          if (blockHeader) {
-            await this.updateAnchorBlockHeader(blockHeader);
-          }
-        }
+        const lastBlock = event.blocks.at(-1)!;
+        this.log.verbose(`Updated pxe last block to ${lastBlock.number}`, {
+          blockHash: lastBlock.hash(),
+          archive: lastBlock.archive.root.toString(),
+          header: lastBlock.header.toInspect(),
+        });
+        await this.anchorBlockStore.setHeader(lastBlock.header);
         break;
       }
       case 'chain-pruned': {
-        const currentAnchorBlockHeader = await this.anchorBlockStore.getBlockHeader();
-        const currentAnchorBlockNumber = currentAnchorBlockHeader.getBlockNumber();
-        if (currentAnchorBlockNumber <= event.block.number) {
-          this.log.verbose(
-            `Ignoring prune event to block ${event.block.number} greater than current anchor block ${currentAnchorBlockNumber}`,
-            { pruneEvent: event, currentAnchorBlockHeader: currentAnchorBlockHeader.toInspect() },
-          );
-          return;
-        }
-
         this.log.warn(`Pruning data after block ${event.block.number} due to reorg`);
 
+        const oldAnchorBlockNumber = (await this.anchorBlockStore.getBlockHeader()).getBlockNumber();
         // Note that the following is not necessarily the anchor block that will be used in the transaction - if
         // the chain has already moved past the reorg, we'll also see blocks-added events that will push the anchor
         // forward.
@@ -116,21 +83,15 @@ export class BlockSynchronizer implements L2BlockStreamEventHandler {
 
         // Operations are wrapped in a single transaction to ensure atomicity.
         await this.store.transactionAsync(async () => {
-          await this.noteStore.rollback(event.block.number, currentAnchorBlockNumber);
-          await this.privateEventStore.rollback(event.block.number, currentAnchorBlockNumber);
-          await this.updateAnchorBlockHeader(newAnchorBlockHeader);
+          await this.noteStore.rollback(event.block.number, oldAnchorBlockNumber);
+          await this.privateEventStore.rollback(event.block.number, oldAnchorBlockNumber);
+          await this.anchorBlockStore.setHeader(newAnchorBlockHeader);
         });
         break;
       }
     }
   }
 
-  /** Updates the anchor block header to the target block */
-  private async updateAnchorBlockHeader(blockHeader: BlockHeader) {
-    this.log.verbose(`Updated pxe last block to ${blockHeader.getBlockNumber()}`, blockHeader.toInspect());
-    await this.anchorBlockStore.setHeader(blockHeader);
-  }
-
   /**
    * Syncs PXE and the node by downloading the metadata of the latest blocks, allowing simulations to use
    * recent data (e.g. notes), and handling any reorgs that might have occurred.

package/src/config/index.ts

@@ -24,8 +24,6 @@ export interface KernelProverConfig {
 export interface BlockSynchronizerConfig {
   /** Maximum amount of blocks to pull from the stream in one request when synchronizing */
   l2BlockBatchSize: number;
-  /** Which chain tip to sync to (proposed, checkpointed, proven, finalized) */
-  syncChainTip?: 'proposed' | 'checkpointed' | 'proven' | 'finalized';
 }
 
 export type PXEConfig = KernelProverConfig & DataStoreConfig & ChainConfig & BlockSynchronizerConfig;
@@ -55,18 +53,6 @@ export const pxeConfigMappings: ConfigMappingsType<PXEConfig> = {
     description: 'Enable real proofs',
     ...booleanConfigHelper(true),
   },
-  syncChainTip: {
-    env: 'PXE_SYNC_CHAIN_TIP',
-    description: 'Which chain tip to sync to (proposed, checkpointed, proven, finalized)',
-    defaultValue: 'proposed',
-    parseEnv: (val: string) => {
-      const allowedValues = ['proposed', 'checkpointed', 'proven', 'finalized'];
-      if (allowedValues.includes(val)) {
-        return val;
-      }
-      throw new Error(`Invalid value for PXE_SYNC_CHAIN_TIP: ${val}. Allowed values are: ${allowedValues.join(', ')}`);
-    },
-  },
 };
 
 /**

package/src/contract_function_simulator/contract_function_simulator.ts

@@ -85,7 +85,7 @@ import { ExecutionNoteCache } from './execution_note_cache.js';
 import { ExecutionTaggingIndexCache } from './execution_tagging_index_cache.js';
 import { HashedValuesCache } from './hashed_values_cache.js';
 import { Oracle } from './oracle/oracle.js';
-import { executePrivateFunction } from './oracle/private_execution.js';
+import { executePrivateFunction, verifyCurrentClassId } from './oracle/private_execution.js';
 import { PrivateExecutionOracle } from './oracle/private_execution_oracle.js';
 import { UtilityExecutionOracle } from './oracle/utility_execution_oracle.js';
 
@@ -138,6 +138,12 @@ export class ContractFunctionSimulator {
   ): Promise<PrivateExecutionResult> {
     const simulatorSetupTimer = new Timer();
 
+    await this.contractStore.syncPrivateState(contractAddress, selector, privateSyncCall =>
+      this.runUtility(privateSyncCall, [], anchorBlockHeader, scopes, jobId),
+    );
+
+    await verifyCurrentClassId(contractAddress, this.aztecNode, this.contractStore, anchorBlockHeader);
+
     const entryPointArtifact = await this.contractStore.getFunctionArtifactWithDebugMetadata(contractAddress, selector);
 
     if (entryPointArtifact.functionType !== FunctionType.PRIVATE) {
@@ -262,6 +268,8 @@ export class ContractFunctionSimulator {
     scopes: AztecAddress[] | undefined,
     jobId: string,
   ): Promise<Fr[]> {
+    await verifyCurrentClassId(call.to, this.aztecNode, this.contractStore, anchorBlockHeader);
+
     const entryPointArtifact = await this.contractStore.getFunctionArtifactWithDebugMetadata(call.to, call.selector);
 
     if (entryPointArtifact.functionType !== FunctionType.UTILITY) {

package/src/contract_function_simulator/oracle/interfaces.ts

@@ -1,8 +1,7 @@
-import type { ARCHIVE_HEIGHT, L1_TO_L2_MSG_TREE_HEIGHT, NOTE_HASH_TREE_HEIGHT } from '@aztec/constants';
+import type { L1_TO_L2_MSG_TREE_HEIGHT } from '@aztec/constants';
 import type { BlockNumber } from '@aztec/foundation/branded-types';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { Point } from '@aztec/foundation/curves/grumpkin';
-import { MembershipWitness } from '@aztec/foundation/trees';
 import type { FunctionSelector, NoteSelector } from '@aztec/stdlib/abi';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { L2BlockHash } from '@aztec/stdlib/block';
@@ -10,7 +9,7 @@ import type { CompleteAddress, ContractInstance } from '@aztec/stdlib/contract';
 import type { KeyValidationRequest } from '@aztec/stdlib/kernel';
 import type { ContractClassLog, Tag } from '@aztec/stdlib/logs';
 import type { Note, NoteStatus } from '@aztec/stdlib/note';
-import { type NullifierMembershipWitness, PublicDataWitness } from '@aztec/stdlib/trees';
+import { type MerkleTreeId, type NullifierMembershipWitness, PublicDataWitness } from '@aztec/stdlib/trees';
 import type { BlockHeader } from '@aztec/stdlib/tx';
 
 import type { UtilityContext } from '../noir-structs/utility_context.js';
@@ -67,14 +66,7 @@ export interface IUtilityExecutionOracle {
   utilityGetUtilityContext(): UtilityContext;
   utilityGetKeyValidationRequest(pkMHash: Fr): Promise<KeyValidationRequest>;
   utilityGetContractInstance(address: AztecAddress): Promise<ContractInstance>;
-  utilityGetNoteHashMembershipWitness(
-    blockHash: L2BlockHash,
-    leafValue: Fr,
-  ): Promise<MembershipWitness<typeof NOTE_HASH_TREE_HEIGHT> | undefined>;
-  utilityGetArchiveMembershipWitness(
-    blockHash: L2BlockHash,
-    leafValue: Fr,
-  ): Promise<MembershipWitness<typeof ARCHIVE_HEIGHT> | undefined>;
+  utilityGetMembershipWitness(blockHash: L2BlockHash, treeId: MerkleTreeId, leafValue: Fr): Promise<Fr[] | undefined>;
   utilityGetNullifierMembershipWitness(
     blockHash: L2BlockHash,
     nullifier: Fr,
@@ -155,7 +147,6 @@ export interface IPrivateExecutionOracle {
   ): void;
   privateNotifyNullifiedNote(innerNullifier: Fr, noteHash: Fr, counter: number): Promise<void>;
   privateNotifyCreatedNullifier(innerNullifier: Fr): Promise<void>;
-  privateIsNullifierPending(innerNullifier: Fr, contractAddress: AztecAddress): Promise<boolean>;
   privateNotifyCreatedContractClassLog(log: ContractClassLog, counter: number): void;
   privateCallPrivateFunction(
     targetContractAddress: AztecAddress,

package/src/contract_function_simulator/oracle/oracle.ts

@@ -14,6 +14,7 @@ import { FunctionSelector, NoteSelector } from '@aztec/stdlib/abi';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { L2BlockHash } from '@aztec/stdlib/block';
 import { ContractClassLog, ContractClassLogFields } from '@aztec/stdlib/logs';
+import { MerkleTreeId } from '@aztec/stdlib/trees';
 
 import type { IMiscOracle, IPrivateExecutionOracle, IUtilityExecutionOracle } from './interfaces.js';
 import { packAsHintedNote } from './note_packing_utils.js';
@@ -137,32 +138,26 @@ export class Oracle {
     ].map(toACVMField);
   }
 
-  async utilityGetNoteHashMembershipWitness(
+  async utilityGetMembershipWitness(
     [blockHash]: ACVMField[],
+    [treeId]: ACVMField[],
     [leafValue]: ACVMField[],
   ): Promise<(ACVMField | ACVMField[])[]> {
     const parsedBlockHash = L2BlockHash.fromString(blockHash);
+    const parsedTreeId = Fr.fromString(treeId).toNumber();
     const parsedLeafValue = Fr.fromString(leafValue);
 
-    const witness = await this.handlerAsUtility().utilityGetNoteHashMembershipWitness(parsedBlockHash, parsedLeafValue);
-    if (!witness) {
-      throw new Error(`Leaf ${leafValue} not found in the note hash tree at block hash ${parsedBlockHash.toString()}.`);
-    }
-    return witness.toNoirRepresentation();
-  }
-
-  async utilityGetArchiveMembershipWitness(
-    [blockHash]: ACVMField[],
-    [leafValue]: ACVMField[],
-  ): Promise<(ACVMField | ACVMField[])[]> {
-    const parsedBlockHash = L2BlockHash.fromString(blockHash);
-    const parsedLeafValue = Fr.fromString(leafValue);
-
-    const witness = await this.handlerAsUtility().utilityGetArchiveMembershipWitness(parsedBlockHash, parsedLeafValue);
+    const witness = await this.handlerAsUtility().utilityGetMembershipWitness(
+      parsedBlockHash,
+      parsedTreeId,
+      parsedLeafValue,
+    );
     if (!witness) {
-      throw new Error(`Leaf ${leafValue} not found in the archive tree at block hash ${parsedBlockHash.toString()}.`);
+      throw new Error(
+        `Leaf ${leafValue} not found in the tree ${MerkleTreeId[parsedTreeId]} at block hash ${parsedBlockHash.toString()}.`,
+      );
     }
-    return witness.toNoirRepresentation();
+    return [toACVMField(witness[0]), witness.slice(1).map(toACVMField)];
   }
 
   async utilityGetNullifierMembershipWitness(
@@ -346,14 +341,6 @@ export class Oracle {
     return [];
   }
 
-  async privateIsNullifierPending([innerNullifier]: ACVMField[], [contractAddress]: ACVMField[]): Promise<ACVMField[]> {
-    const isPending = await this.handlerAsPrivate().privateIsNullifierPending(
-      Fr.fromString(innerNullifier),
-      AztecAddress.fromString(contractAddress),
-    );
-    return [toACVMField(isPending)];
-  }
-
   async utilityCheckNullifierExists([innerNullifier]: ACVMField[]): Promise<ACVMField[]> {
     const exists = await this.handlerAsUtility().utilityCheckNullifierExists(Fr.fromString(innerNullifier));
     return [toACVMField(exists)];

package/src/contract_function_simulator/oracle/private_execution.ts

@@ -14,7 +14,6 @@ import {
 import {
   type FunctionArtifact,
   type FunctionArtifactWithContractName,
-  type FunctionCall,
   type FunctionSelector,
   countArgumentsSize,
 } from '@aztec/stdlib/abi';
@@ -181,7 +180,7 @@ export async function readCurrentClassId(
  * provider (i.e. PXE's own storage).
  * @param header - The header of the block at which to verify the current class id.
  */
-async function verifyCurrentClassId(
+export async function verifyCurrentClassId(
   contractAddress: AztecAddress,
   aztecNode: AztecNode,
   contractStore: ContractStore,
@@ -199,21 +198,3 @@ async function verifyCurrentClassId(
     );
   }
 }
-
-/**
- * Ensures the contract's private state is synchronized and that the PXE holds the current class artifact for
- * the contract.
- */
-export async function ensureContractSynced(
-  contractAddress: AztecAddress,
-  functionToInvokeAfterSync: FunctionSelector | null,
-  utilityExecutor: (call: FunctionCall) => Promise<any>,
-  aztecNode: AztecNode,
-  contractStore: ContractStore,
-  header: BlockHeader,
-): Promise<void> {
-  await Promise.all([
-    contractStore.syncPrivateState(contractAddress, functionToInvokeAfterSync, utilityExecutor),
-    verifyCurrentClassId(contractAddress, aztecNode, contractStore, header),
-  ]);
-}

package/src/contract_function_simulator/oracle/private_execution_oracle.ts

@@ -14,7 +14,6 @@ import {
 } from '@aztec/stdlib/abi';
 import type { AuthWitness } from '@aztec/stdlib/auth-witness';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { L2BlockHash } from '@aztec/stdlib/block';
 import { siloNullifier } from '@aztec/stdlib/hash';
 import type { AztecNode } from '@aztec/stdlib/interfaces/client';
 import { PrivateContextInputs } from '@aztec/stdlib/kernel';
@@ -47,7 +46,7 @@ import { ExecutionTaggingIndexCache } from '../execution_tagging_index_cache.js'
 import type { HashedValuesCache } from '../hashed_values_cache.js';
 import { pickNotes } from '../pick_notes.js';
 import type { IPrivateExecutionOracle, NoteData } from './interfaces.js';
-import { ensureContractSynced, executePrivateFunction } from './private_execution.js';
+import { executePrivateFunction, verifyCurrentClassId } from './private_execution.js';
 import { UtilityExecutionOracle } from './utility_execution_oracle.js';
 
 /**
@@ -266,15 +265,7 @@ export class PrivateExecutionOracle extends UtilityExecutionOracle implements IP
       // This is a tagging secret we've not yet used in this tx, so first sync our store to make sure its indices
       // are up to date. We do this here because this store is not synced as part of the global sync because
       // that'd be wasteful as most tagging secrets are not used in each tx.
-      const anchorBlockHash = L2BlockHash.fromField(await this.anchorBlockHeader.hash());
-      await syncSenderTaggingIndexes(
-        secret,
-        this.contractAddress,
-        this.aztecNode,
-        this.senderTaggingStore,
-        anchorBlockHash,
-        this.jobId,
-      );
+      await syncSenderTaggingIndexes(secret, this.contractAddress, this.aztecNode, this.senderTaggingStore, this.jobId);
 
       const lastUsedIndex = await this.senderTaggingStore.getLastUsedIndex(secret, this.jobId);
       // If lastUsedIndex is undefined, we've never used this secret, so start from 0
@@ -365,7 +356,7 @@ export class PrivateExecutionOracle extends UtilityExecutionOracle implements IP
 
     const pendingNullifiers = this.noteCache.getNullifiers(this.callContext.contractAddress);
 
-    const noteService = new NoteService(this.noteStore, this.aztecNode, this.anchorBlockStore, this.jobId);
+    const noteService = new NoteService(this.noteStore, this.aztecNode, this.anchorBlockStore);
     const dbNotes = await noteService.getNotes(
       this.callContext.contractAddress,
       owner,
@@ -472,19 +463,6 @@ export class PrivateExecutionOracle extends UtilityExecutionOracle implements IP
     return this.noteCache.nullifierCreated(this.callContext.contractAddress, innerNullifier);
   }
 
-  /**
-   * Check if a nullifier has been emitted in the same transaction, i.e. if privateNotifyCreatedNullifier has been
-   * called for this inner nullifier from the contract with the specified address.
-   * @param innerNullifier - The inner nullifier to check.
-   * @param contractAddress - Address of the contract that emitted the nullifier.
-   * @returns A boolean indicating whether the nullifier is pending or not.
-   */
-  public async privateIsNullifierPending(innerNullifier: Fr, contractAddress: AztecAddress): Promise<boolean> {
-    const siloedNullifier = await siloNullifier(contractAddress, innerNullifier);
-    const isNullifierPending = this.noteCache.getNullifiers(contractAddress).has(siloedNullifier.toBigInt());
-    return Promise.resolve(isNullifierPending);
-  }
-
   /**
    * Emit a contract class log.
    * This fn exists because we only carry a poseidon hash through the kernels, and need to
@@ -541,14 +519,9 @@ export class PrivateExecutionOracle extends UtilityExecutionOracle implements IP
 
     isStaticCall = isStaticCall || this.callContext.isStaticCall;
 
-    await ensureContractSynced(
-      targetContractAddress,
-      functionSelector,
-      this.utilityExecutor,
-      this.aztecNode,
-      this.contractStore,
-      this.anchorBlockHeader,
-    );
+    await verifyCurrentClassId(targetContractAddress, this.aztecNode, this.contractStore, this.anchorBlockHeader);
+
+    await this.contractStore.syncPrivateState(targetContractAddress, functionSelector, this.utilityExecutor);
 
     const targetArtifact = await this.contractStore.getFunctionArtifactWithDebugMetadata(
       targetContractAddress,