@aztec/pxe 4.0.0-nightly.20250907 → 4.0.0-nightly.20260108

package/src/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.ts

@@ -0,0 +1,129 @@
+import type { BlockNumber } from '@aztec/foundation/branded-types';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { AztecNode } from '@aztec/stdlib/interfaces/client';
+import type { DirectionalAppTaggingSecret, TxScopedL2Log } from '@aztec/stdlib/logs';
+
+import type { RecipientTaggingStore } from '../../storage/tagging_store/recipient_tagging_store.js';
+import { UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN } from '../index.js';
+import { findHighestIndexes } from './utils/find_highest_indexes.js';
+import { loadLogsForRange } from './utils/load_logs_for_range.js';
+
+/**
+ * Loads private logs for `app` and  sender-recipient pair defined by `secret` and updates the highest aged and
+ * finalized indexes in the db. At most load logs from blocks up to and including `anchorBlockNumber`.
+ *
+ * @dev This function can be safely executed "in parallel" for other sender-recipient pairs because the data in
+ * in the tagging data provider is indexed by the secret and hence completely disjoint.
+ */
+export async function loadPrivateLogsForSenderRecipientPair(
+  secret: DirectionalAppTaggingSecret,
+  app: AztecAddress,
+  aztecNode: AztecNode,
+  taggingStore: RecipientTaggingStore,
+  anchorBlockNumber: BlockNumber,
+): Promise<TxScopedL2Log[]> {
+  // # Explanation of how the algorithm works
+  // When we perform the sync we will look at logs that correspond to the tagging index range
+  // (highestAgedIndex, highestFinalizedIndex + WINDOW_LEN]
+  //
+  // highestAgedIndex is the highest index that was used in a tx that is included in a block at least
+  //                  `MAX_INCLUDE_BY_TIMESTAMP_DURATION` seconds ago.
+  // highestFinalizedIndex is the highest index that was used in a tx that is included in a finalized block.
+  //
+  // "(" denotes an open end of the range - the index is not included in the range.
+  // "]" denotes a closed end of the range - the index is included in the range.
+  //
+  // ## Explanation of highestAgedIndex
+  //
+  // highestAgedIndex is chosen such that for all tagging indexes `i <= highestAgedIndex` we know that no new logs can
+  // ever appear.
+  //
+  // This relies on the "maximum inclusion timestamp" rule enforced by the kernel and rollup circuits:
+  // - a transaction's maximum inclusion timestamp is at most `MAX_INCLUDE_BY_TIMESTAMP_DURATION` seconds after
+  //   the timestamp of its anchor block; and
+  // - a rollup only includes transactions whose inclusion timestamp is >= the L2 block's timestamp.
+  //
+  // Suppose some device used index `I` in a transaction anchored to block `B_N` at time `N`, and that block is now at
+  // least `MAX_INCLUDE_BY_TIMESTAMP_DURATION` seconds in the past. Then there is no possibility of any *other* device
+  // trying to use an index <= `I` while anchoring to a *newer* block than `B_N` because if we were anchoring to
+  // a newer block than `B_N` then we would already have seen the log with index `I` and hence the device would have
+  // chosen a larger index.
+  //    If that *other* device would anchor to a block older than `B_N` then that tx could never be included in a block
+  // because it would already have been expired.
+  //
+  // Therefore, once we see that index `I` has been used in a block that is at least `MAX_INCLUDE_BY_TIMESTAMP_DURATION`
+  // seconds old, we can safely stop syncing logs for all indexes <= `I` and set highestAgedIndex = `I`.
+  //
+  // ## Explanation of the upper bound `highestFinalizedIndex + WINDOW_LEN`
+  //
+  // When a sender chooses a tagging index, they will select an index that is at most `WINDOW_LEN` greater than
+  // the highest finalized index. If that index was already used, they will throw an error. For this reason we
+  // don't have to look further than `highestFinalizedIndex + WINDOW_LEN`.
+
+  let finalizedBlockNumber: number, currentTimestamp: bigint;
+  {
+    const [l2Tips, latestBlockHeader] = await Promise.all([aztecNode.getL2Tips(), aztecNode.getBlockHeader('latest')]);
+
+    if (!latestBlockHeader) {
+      throw new Error('Node failed to return latest block header when syncing logs');
+    }
+
+    [finalizedBlockNumber, currentTimestamp] = [l2Tips.finalized.number, latestBlockHeader.globalVariables.timestamp];
+  }
+
+  let start: number, end: number;
+  {
+    const currentHighestAgedIndex = await taggingStore.getHighestAgedIndex(secret);
+    const currentHighestFinalizedIndex = await taggingStore.getHighestFinalizedIndex(secret);
+
+    // We don't want to include the highest aged index so we start from `currentHighestAgedIndex + 1` (or 0 if not set)
+    start = currentHighestAgedIndex === undefined ? 0 : currentHighestAgedIndex + 1;
+
+    // The highest index a sender can choose is "highest finalized index + window length" but given that
+    // `loadLogsForRange` expects an exclusive `end` we add 1.
+    end = (currentHighestFinalizedIndex ?? 0) + UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN + 1;
+  }
+
+  const logs: TxScopedL2Log[] = [];
+
+  while (true) {
+    // Get private logs with their block timestamps and corresponding tagging indexes
+    const privateLogsWithIndexes = await loadLogsForRange(secret, app, aztecNode, start, end, anchorBlockNumber);
+
+    if (privateLogsWithIndexes.length === 0) {
+      break;
+    }
+
+    logs.push(...privateLogsWithIndexes.map(({ log }) => log));
+
+    const { highestAgedIndex, highestFinalizedIndex } = findHighestIndexes(
+      privateLogsWithIndexes,
+      currentTimestamp,
+      finalizedBlockNumber,
+    );
+
+    // Store updates in data provider and update local variables
+    if (highestAgedIndex !== undefined) {
+      await taggingStore.updateHighestAgedIndex(secret, highestAgedIndex);
+    }
+
+    if (highestFinalizedIndex === undefined) {
+      // We have not found a new highest finalized index, so there is no need to move the window forward.
+      break;
+    }
+
+    if (highestAgedIndex !== undefined && highestAgedIndex > highestFinalizedIndex) {
+      // This is just a sanity check as this should never happen.
+      throw new Error('Highest aged index lower than highest finalized index invariant violated');
+    }
+
+    await taggingStore.updateHighestFinalizedIndex(secret, highestFinalizedIndex);
+
+    // For the next iteration we want to look only at indexes for which we have not attempted to load logs yet while
+    // ensuring that we do not look further than WINDOW_LEN ahead of the highest finalized index.
+    start = end;
+    end = highestFinalizedIndex + UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN + 1; // `end` is exclusive so we add 1.
+  }
+
+  return logs;
+}

package/src/tagging/recipient_sync/utils/find_highest_indexes.ts

@@ -0,0 +1,34 @@
+import { MAX_INCLUDE_BY_TIMESTAMP_DURATION } from '@aztec/constants';
+import type { TxScopedL2Log } from '@aztec/stdlib/logs';
+
+/**
+ * Finds the highest aged and the highest finalized tagging indexes.
+ */
+export function findHighestIndexes(
+  privateLogsWithIndexes: Array<{ log: TxScopedL2Log; taggingIndex: number }>,
+  currentTimestamp: bigint,
+  finalizedBlockNumber: number,
+): { highestAgedIndex: number | undefined; highestFinalizedIndex: number | undefined } {
+  let highestAgedIndex = undefined;
+  let highestFinalizedIndex = undefined;
+
+  for (const { log, taggingIndex } of privateLogsWithIndexes) {
+    const ageInSeconds = currentTimestamp - log.blockTimestamp;
+
+    if (
+      ageInSeconds >= BigInt(MAX_INCLUDE_BY_TIMESTAMP_DURATION) &&
+      (highestAgedIndex === undefined || taggingIndex > highestAgedIndex)
+    ) {
+      highestAgedIndex = taggingIndex;
+    }
+
+    if (
+      log.blockNumber <= finalizedBlockNumber &&
+      (highestFinalizedIndex === undefined || taggingIndex > highestFinalizedIndex)
+    ) {
+      highestFinalizedIndex = taggingIndex;
+    }
+  }
+
+  return { highestAgedIndex, highestFinalizedIndex };
+}

package/src/tagging/recipient_sync/utils/load_logs_for_range.ts

@@ -0,0 +1,43 @@
+import type { BlockNumber } from '@aztec/foundation/branded-types';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { AztecNode } from '@aztec/stdlib/interfaces/client';
+import type { DirectionalAppTaggingSecret, PreTag, TxScopedL2Log } from '@aztec/stdlib/logs';
+import { SiloedTag, Tag } from '@aztec/stdlib/logs';
+
+/**
+ * Gets private logs with their corresponding block timestamps and tagging indexes for the given index range, `app` and
+ * `secret`. At most load logs from blocks up to and including `anchorBlockNumber`. `start` is inclusive and `end` is
+ * exclusive.
+ */
+export async function loadLogsForRange(
+  secret: DirectionalAppTaggingSecret,
+  app: AztecAddress,
+  aztecNode: AztecNode,
+  start: number,
+  end: number,
+  anchorBlockNumber: BlockNumber,
+): Promise<Array<{ log: TxScopedL2Log; taggingIndex: number }>> {
+  // Derive tags for the window
+  const preTags: PreTag[] = Array(end - start)
+    .fill(0)
+    .map((_, i) => ({ secret, index: start + i }));
+  const siloedTags = await Promise.all(preTags.map(preTag => Tag.compute(preTag))).then(tags =>
+    Promise.all(tags.map(tag => SiloedTag.compute(tag, app))),
+  );
+
+  const logs = await aztecNode.getPrivateLogsByTags(siloedTags);
+
+  // Pair logs with their corresponding tagging indexes
+  const logsWithIndexes: Array<{ log: TxScopedL2Log; taggingIndex: number }> = [];
+  for (let i = 0; i < logs.length; i++) {
+    const logsForTag = logs[i];
+    const taggingIndex = preTags[i].index;
+    for (const log of logsForTag) {
+      if (log.blockNumber <= anchorBlockNumber) {
+        logsWithIndexes.push({ log, taggingIndex });
+      }
+    }
+  }
+
+  return logsWithIndexes;
+}

package/src/tagging/sender_sync/sync_sender_tagging_indexes.ts

@@ -0,0 +1,96 @@
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { AztecNode } from '@aztec/stdlib/interfaces/server';
+import type { DirectionalAppTaggingSecret } from '@aztec/stdlib/logs';
+
+import type { SenderTaggingStore } from '../../storage/tagging_store/sender_tagging_store.js';
+import { UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN } from '../index.js';
+import { getStatusChangeOfPending } from './utils/get_status_change_of_pending.js';
+import { loadAndStoreNewTaggingIndexes } from './utils/load_and_store_new_tagging_indexes.js';
+
+/**
+ * Syncs tagging indexes. This function needs to be called whenever a private log is being sent.
+ *
+ * @param secret - The secret that's unique for (sender, recipient, contract) tuple while the direction of
+ * sender -> recipient matters.
+ * @param app - The address of the contract that the logs are tagged for. Needs to be provided because we perform
+ * second round of siloing in this function which is necessary because kernels do it as well (they silo first field
+ * of the private log which corresponds to the tag).
+ * @remarks When syncing the indexes as sender we don't care about the log contents - we only care about the highest
+ * pending and highest finalized indexes as that guides the next index choice when sending a log. The next index choice
+ * is simply the highest pending index plus one (or finalized if pending is undefined).
+ * @dev This function looks for new indexes, adds them to pending, then it checks status of each pending index and
+ * updates its status accordingly.
+ */
+export async function syncSenderTaggingIndexes(
+  secret: DirectionalAppTaggingSecret,
+  app: AztecAddress,
+  aztecNode: AztecNode,
+  taggingStore: SenderTaggingStore,
+): Promise<void> {
+  // # Explanation of how syncing works
+  //
+  // When choosing an index, we select: highest pending index + 1 (or highest finalized index + 1 if no pending).
+  // If the chosen index is more than WINDOW_LEN from the highest finalized index, we throw an error. By having this
+  // hard limit we give a guarantee to a recipient that he doesn't need to look further than WINDOW_LEN ahead of the
+  // highest finalized index.
+  //
+  // This function synchronizes the finalized and pending indexes by iteratively querying the node for a window of
+  // indexes at a time, storing all those indexes as pending, and then checking the status of each pending index to
+  // update its finalization status accordingly. If we stumble upon a window with no indexes, we stop the loop.
+  //
+  // Stopping at that point is safe because of the limit described above - there can never be an index that is more
+  // than WINDOW_LEN from the highest finalized index.
+  //
+  // # Note on performance
+  // Each window advance requires two queries (logs + tx status). For example, syncing indexes 0–500 with a window of
+  // 100 takes at least 10 round trips (5 windows × 2 queries).
+
+  const finalizedIndex = await taggingStore.getLastFinalizedIndex(secret);
+
+  let start = finalizedIndex === undefined ? 0 : finalizedIndex + 1;
+  let end = start + UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN;
+
+  let previousFinalizedIndex = finalizedIndex;
+  let newFinalizedIndex = undefined;
+
+  while (true) {
+    // Load and store indexes for the current window. These indexes may already exist in the database if txs using
+    // them were previously sent from this PXE. Any duplicates are handled by the tagging data provider.
+    await loadAndStoreNewTaggingIndexes(secret, app, start, end, aztecNode, taggingStore);
+
+    // Retrieve all indexes within the current window from storage and update their status accordingly.
+    const pendingTxHashes = await taggingStore.getTxHashesOfPendingIndexes(secret, start, end);
+    if (pendingTxHashes.length === 0) {
+      break;
+    }
+
+    const { txHashesToFinalize, txHashesToDrop } = await getStatusChangeOfPending(pendingTxHashes, aztecNode);
+
+    await taggingStore.dropPendingIndexes(txHashesToDrop);
+    await taggingStore.finalizePendingIndexes(txHashesToFinalize);
+
+    // We check if the finalized index has been updated.
+    newFinalizedIndex = await taggingStore.getLastFinalizedIndex(secret);
+    if (previousFinalizedIndex !== newFinalizedIndex) {
+      // A new finalized index was found, so we'll run the loop again. For example:
+      // - Previous finalized index: 10
+      // - New finalized index: 13
+      // - Window length: 10
+      //
+      // In the last iteration, we processed indexes 11-20. To avoid reprocessing the same logs,
+      // we'll only look at the new indexes 21-23:
+      //
+      //    Previous window: [11, 12, 13, 14, 15, 16, 17, 18, 19, 20]
+      //    New window:                                             [21, 22, 23]
+
+      const previousEnd = end;
+      // Add 1 because `end` is exclusive and the known finalized index is not included in the window.
+      end = newFinalizedIndex! + UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN + 1;
+      start = previousEnd;
+      previousFinalizedIndex = newFinalizedIndex;
+    } else {
+      // No new finalized index was found, so we don't need to process the next window.
+      break;
+    }
+  }
+}

package/src/tagging/sender_sync/utils/get_status_change_of_pending.ts

@@ -0,0 +1,44 @@
+import type { AztecNode } from '@aztec/stdlib/interfaces/server';
+import { TxHash, TxStatus } from '@aztec/stdlib/tx';
+
+/**
+ * Based on receipts obtained from `aztecNode` returns which pending transactions changed their status to finalized or
+ * dropped.
+ */
+export async function getStatusChangeOfPending(
+  pending: TxHash[],
+  aztecNode: AztecNode,
+): Promise<{ txHashesToFinalize: TxHash[]; txHashesToDrop: TxHash[] }> {
+  // Get receipts for all pending tx hashes and the finalized block number.
+  const [receipts, { finalized }] = await Promise.all([
+    Promise.all(pending.map(pendingTxHash => aztecNode.getTxReceipt(pendingTxHash))),
+    aztecNode.getL2Tips(),
+  ]);
+
+  const txHashesToFinalize: TxHash[] = [];
+  const txHashesToDrop: TxHash[] = [];
+
+  for (let i = 0; i < receipts.length; i++) {
+    const receipt = receipts[i];
+    const txHash = pending[i];
+
+    if (receipt.status === TxStatus.SUCCESS && receipt.blockNumber && receipt.blockNumber <= finalized.number) {
+      // Tx has been included in a block and the corresponding block is finalized --> we mark the indexes as
+      // finalized.
+      txHashesToFinalize.push(txHash);
+    } else if (
+      receipt.status === TxStatus.DROPPED ||
+      receipt.status === TxStatus.APP_LOGIC_REVERTED ||
+      receipt.status === TxStatus.TEARDOWN_REVERTED ||
+      receipt.status === TxStatus.BOTH_REVERTED
+    ) {
+      // Tx was dropped or reverted --> we drop the corresponding pending indexes.
+      // TODO(#17615): Don't drop pending indexes corresponding to non-revertible phases.
+      txHashesToDrop.push(txHash);
+    } else {
+      // Tx is still pending or the corresponding block is not yet finalized --> we don't do anything.
+    }
+  }
+
+  return { txHashesToFinalize, txHashesToDrop };
+}

package/src/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.ts

@@ -0,0 +1,72 @@
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { AztecNode } from '@aztec/stdlib/interfaces/server';
+import type { DirectionalAppTaggingSecret, PreTag } from '@aztec/stdlib/logs';
+import { SiloedTag, Tag } from '@aztec/stdlib/logs';
+import { TxHash } from '@aztec/stdlib/tx';
+
+import type { SenderTaggingStore } from '../../../storage/tagging_store/sender_tagging_store.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
+ * place is when a tx is being sent from this PXE.
+ * @param secret - The directional app tagging secret that's unique for (sender, recipient, contract) tuple.
+ * @param app - The address of the contract that the logs are tagged for. Used for siloing tags to match
+ * kernel circuit behavior.
+ * @param start - The starting index (inclusive) of the window to process.
+ * @param end - The ending index (exclusive) of the window to process.
+ * @param aztecNode - The Aztec node instance to query for logs.
+ * @param taggingStore - The data provider to store pending indexes.
+ */
+export async function loadAndStoreNewTaggingIndexes(
+  secret: DirectionalAppTaggingSecret,
+  app: AztecAddress,
+  start: number,
+  end: number,
+  aztecNode: AztecNode,
+  taggingStore: SenderTaggingStore,
+) {
+  // We compute the tags for the current window of indexes
+  const preTagsForWindow: PreTag[] = 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);
+  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()) {
+    const txHash = TxHash.fromString(txHashStr);
+    await taggingStore.storePendingIndexes([{ secret, index: highestIndex }], txHash);
+  }
+}
+
+// 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: SiloedTag[], aztecNode: AztecNode): Promise<TxHash[][]> {
+  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.
+function getTxHighestIndexMap(txHashesForTags: TxHash[][], preTagsForWindow: PreTag[]): Map<string, number> {
+  if (txHashesForTags.length !== preTagsForWindow.length) {
+    throw new Error(
+      `Number of tx hashes arrays does not match number of pre-tags. ${txHashesForTags.length} !== ${preTagsForWindow.length}`,
+    );
+  }
+
+  const highestIndexMap = new Map<string, number>();
+  for (let i = 0; i < txHashesForTags.length; i++) {
+    const taggingIndex = preTagsForWindow[i].index;
+    const txHashesForTag = txHashesForTags[i];
+    for (const txHash of txHashesForTag) {
+      const key = txHash.toString();
+      highestIndexMap.set(key, Math.max(highestIndexMap.get(key) ?? 0, taggingIndex));
+    }
+  }
+  return highestIndexMap;
+}

package/src/tree_membership/tree_membership_service.ts

@@ -0,0 +1,112 @@
+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 type { BlockParameter } from '@aztec/stdlib/block';
+import type { AztecNode } from '@aztec/stdlib/interfaces/server';
+import { getNonNullifiedL1ToL2MessageWitness } from '@aztec/stdlib/messaging';
+import { MerkleTreeId, NullifierMembershipWitness, PublicDataWitness } from '@aztec/stdlib/trees';
+
+import type { AnchorBlockStore } from '../storage/anchor_block_store/anchor_block_store.js';
+
+export class TreeMembershipService {
+  constructor(
+    private readonly aztecNode: AztecNode,
+    private readonly anchorBlockStore: AnchorBlockStore,
+  ) {}
+
+  /**
+   * 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.
+   */
+  public getNullifierIndex(nullifier: Fr) {
+    return this.#findLeafIndex('latest', MerkleTreeId.NULLIFIER_TREE, nullifier);
+  }
+
+  /**
+   * Fetches the index and sibling path of a leaf at a given block from a given tree.
+   * @param blockNumber - The block number 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]
+   */
+  public async getMembershipWitness(blockNumber: BlockParameter, treeId: MerkleTreeId, leafValue: Fr): Promise<Fr[]> {
+    const witness = await this.#tryGetMembershipWitness(blockNumber, treeId, leafValue);
+    if (!witness) {
+      throw new Error(`Leaf value ${leafValue} not found in tree ${MerkleTreeId[treeId]} at block ${blockNumber}`);
+    }
+    return witness;
+  }
+
+  /**
+   * Returns a low nullifier membership witness for a given nullifier at a given block.
+   * @param blockNumber - The block number 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.
+   */
+  public async getLowNullifierMembershipWitness(
+    blockNumber: BlockParameter,
+    nullifier: Fr,
+  ): Promise<NullifierMembershipWitness | undefined> {
+    const anchorBlockNumber = (await this.anchorBlockStore.getBlockHeader()).getBlockNumber();
+    if (blockNumber !== 'latest' && blockNumber > anchorBlockNumber) {
+      throw new Error(`Block number ${blockNumber} is higher than current block ${anchorBlockNumber}`);
+    }
+    return this.aztecNode.getLowNullifierMembershipWitness(blockNumber, nullifier);
+  }
+
+  /**
+   * Returns a witness for a given slot of the public data tree at a given block.
+   * @param blockNumber - The block number at which to get the witness.
+   * @param leafSlot - The slot of the public data in the public data tree.
+   */
+  public async getPublicDataWitness(blockNumber: BlockParameter, leafSlot: Fr): Promise<PublicDataWitness | undefined> {
+    const anchorBlockNumber = (await this.anchorBlockStore.getBlockHeader()).getBlockNumber();
+    if (blockNumber !== 'latest' && blockNumber > anchorBlockNumber) {
+      throw new Error(`Block number ${blockNumber} is higher than current block ${anchorBlockNumber}`);
+    }
+    return await this.aztecNode.getPublicDataWitness(blockNumber, 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).
+   */
+  public getL1ToL2MembershipWitness(
+    contractAddress: AztecAddress,
+    messageHash: Fr,
+    secret: Fr,
+  ): Promise<[bigint, SiblingPath<typeof L1_TO_L2_MSG_TREE_HEIGHT>]> {
+    return getNonNullifiedL1ToL2MessageWitness(this.aztecNode, contractAddress, messageHash, secret);
+  }
+
+  async #tryGetMembershipWitness(
+    blockNumber: BlockParameter,
+    treeId: MerkleTreeId,
+    value: Fr,
+  ): Promise<Fr[] | undefined> {
+    switch (treeId) {
+      case MerkleTreeId.NULLIFIER_TREE:
+        return (await this.aztecNode.getNullifierMembershipWitness(blockNumber, value))?.withoutPreimage().toFields();
+      case MerkleTreeId.NOTE_HASH_TREE:
+        return (await this.aztecNode.getNoteHashMembershipWitness(blockNumber, value))?.toFields();
+      case MerkleTreeId.PUBLIC_DATA_TREE:
+        return (await this.aztecNode.getPublicDataWitness(blockNumber, value))?.withoutPreimage().toFields();
+      case MerkleTreeId.ARCHIVE:
+        return (await this.aztecNode.getArchiveMembershipWitness(blockNumber, value))?.toFields();
+      default:
+        throw new Error('Not implemented');
+    }
+  }
+
+  async #findLeafIndex(blockNumber: BlockParameter, treeId: MerkleTreeId, leafValue: Fr): Promise<bigint | undefined> {
+    const [leafIndex] = await this.aztecNode.findLeavesIndexes(blockNumber, treeId, [leafValue]);
+    return leafIndex?.data;
+  }
+}

package/dest/bin/index.d.ts

@@ -1,3 +0,0 @@
-#!/usr/bin/env -S node --no-warnings
-export {};
-//# sourceMappingURL=index.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/bin/index.ts"],"names":[],"mappings":""}

package/dest/bin/index.js

@@ -1,48 +0,0 @@
-#!/usr/bin/env -S node --no-warnings
-import { createNamespacedSafeJsonRpcServer } from '@aztec/foundation/json-rpc/server';
-import { createLogger } from '@aztec/foundation/log';
-import { PXESchema, createAztecNodeClient } from '@aztec/stdlib/interfaces/client';
-import http from 'http';
-import { getPXEServiceConfig } from '../config/index.js';
-import { createPXEService } from '../entrypoints/server/utils.js';
-const { PXE_PORT = 8080, AZTEC_NODE_URL = 'http://localhost:8079' } = process.env;
-const logger = createLogger('pxe:service');
-/**
- * Creates an http server that forwards calls to the PXE and starts it on the given port.
- * @param pxeService - PXE that answers queries to the created HTTP server.
- * @param port - Port to listen in.
- * @param maxBatchSize - Maximum allowed batch size for JSON RPC batch requests.
- * @returns A running http server.
- */ function startPXEHttpServer(pxeService, port, opts = {}) {
-    const rpcServer = createNamespacedSafeJsonRpcServer({
-        pxe: [
-            pxeService,
-            PXESchema
-        ]
-    }, opts);
-    const app = rpcServer.getApp();
-    // eslint-disable-next-line @typescript-eslint/no-misused-promises
-    const httpServer = http.createServer(app.callback());
-    httpServer.listen(port);
-    return httpServer;
-}
-/**
- * Create and start a new PXE HTTP Server
- */ async function main() {
-    logger.info(`Setting up PXE...`);
-    const pxeConfig = getPXEServiceConfig();
-    const nodeRpcClient = createAztecNodeClient(AZTEC_NODE_URL, {});
-    const pxeService = await createPXEService(nodeRpcClient, pxeConfig);
-    const shutdown = ()=>{
-        logger.info('Shutting down...');
-        process.exit(0);
-    };
-    process.once('SIGINT', shutdown);
-    process.once('SIGTERM', shutdown);
-    startPXEHttpServer(pxeService, PXE_PORT);
-    logger.info(`PXE listening on port ${PXE_PORT}`);
-}
-main().catch((err)=>{
-    logger.error(err);
-    process.exit(1);
-});