@aztec/pxe 0.0.1-commit.42ee6df9b → 0.0.1-commit.431c48d

package/src/tagging/reconcile_tagging_index_ranges.ts

@@ -0,0 +1,102 @@
+import { type AppTaggingSecret, SiloedTag, type TaggingIndexRange } from '@aztec/stdlib/logs';
+
+/**
+ * Reconciles tagging index ranges recorded by the PXE during private execution against the set of siloed tags whose
+ * private logs survived to the final kernel output.
+ *
+ * Each input range is the contiguous `[lowestIndex, highestIndex]` set of indexes that the tagging index cache
+ * reserved for a given tagging secret while a tx was being executed. The kernel may then squash some of those logs
+ * (e.g. when a note is created and nullified within the same tx, taking its log with it), so the actual on-chain
+ * footprint can be a strict subset of what was reserved.
+ *
+ * For each input range, this function shrinks `[lowestIndex, highestIndex]` so that both bounds correspond to indexes
+ * that actually survived, trimming any dropped indices at the front or the back. It is possible that some interior
+ * indexes were also dropped, leaving gaps between the lowest and highest indices, but we ignore those and accept the
+ * resulting inefficiency rather than complicate the tagging model with one in which transactions may use interleaved
+ * indices.
+ *
+ * Trimming tailing indices (e.g. `highestIndex`) is highly useful as it lets us reuse those indices in future
+ * transactions. Trimming indices at the front (e.g. `lowestIndex`) is not as impactful since we will not ever use a
+ * tagging index if a larger one exists (same as with gaps), but it does help in both making the consistency check
+ * between database and transaction effects cheaper (as there's fewer logs to test) and making the database more
+ * accurately reflect reality.
+ *
+ * Ranges with no surviving indexes are dropped from the output entirely.
+ *
+ * Example scenario:
+ *   - used indexes 3 to 7, kerel squashed indexes 3, 5, and 7:
+ *      - range: [3, 7]
+ *      - survived: set(3, 5, 7)
+ *      - output: [4, 6]  (trimmed from both ends, gap at 5 is tolerated)
+ *
+ * @param ranges - The tagging index ranges as recorded during private execution (pre-squash).
+ * @param survivingTags - The set of siloed tag values (as strings) of private logs that survived kernel squashing.
+ * @returns The reconciled ranges, with bounds tightened to surviving indexes and fully-squashed ranges removed.
+ */
+export async function reconcileTaggingIndexRangesAgainstSurvivingTags(
+  ranges: TaggingIndexRange[],
+  survivingTags: Set<string>,
+): Promise<TaggingIndexRange[]> {
+  const reconciled: TaggingIndexRange[] = [];
+
+  for (const range of ranges) {
+    const newLowestIndex = await findFirstSurvivingIndex(
+      range.extendedSecret,
+      range.lowestIndex,
+      range.highestIndex,
+      survivingTags,
+    );
+    if (newLowestIndex === undefined) {
+      // No index in this range corresponds to a surviving log: the entire range was squashed.
+      continue;
+    }
+
+    // newLowestIndex is itself a survivor, so the backward scan is guaranteed to find at least that index.
+    const newHighestIndex = await findLastSurvivingIndex(
+      range.extendedSecret,
+      newLowestIndex,
+      range.highestIndex,
+      survivingTags,
+    );
+
+    reconciled.push({
+      extendedSecret: range.extendedSecret,
+      lowestIndex: newLowestIndex,
+      highestIndex: newHighestIndex!,
+    });
+  }
+
+  return reconciled;
+}
+
+/** Scans `[start, end]` ascending and returns the first index whose siloed tag is in `survivingTags`. */
+async function findFirstSurvivingIndex(
+  secret: AppTaggingSecret,
+  start: number,
+  end: number,
+  survivingTags: Set<string>,
+): Promise<number | undefined> {
+  for (let index = start; index <= end; index++) {
+    const tag = await SiloedTag.compute({ extendedSecret: secret, index });
+    if (survivingTags.has(tag.value.toString())) {
+      return index;
+    }
+  }
+  return undefined;
+}
+
+/** Scans `[start, end]` descending and returns the first index whose siloed tag is in `survivingTags`. */
+async function findLastSurvivingIndex(
+  secret: AppTaggingSecret,
+  start: number,
+  end: number,
+  survivingTags: Set<string>,
+): Promise<number | undefined> {
+  for (let index = end; index >= start; index--) {
+    const tag = await SiloedTag.compute({ extendedSecret: secret, index });
+    if (survivingTags.has(tag.value.toString())) {
+      return index;
+    }
+  }
+  return undefined;
+}

package/src/tagging/sender_sync/sync_sender_tagging_indexes.ts

@@ -1,17 +1,19 @@
-import type { BlockHash } from '@aztec/stdlib/block';
+import type { BlockNumber } from '@aztec/foundation/branded-types';
 import type { AztecNode } from '@aztec/stdlib/interfaces/server';
-import type { ExtendedDirectionalAppTaggingSecret } from '@aztec/stdlib/logs';
+import type { AppTaggingSecret } from '@aztec/stdlib/logs';
 
 import type { SenderTaggingStore } from '../../storage/tagging_store/sender_tagging_store.js';
-import { UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN } from '../constants.js';
-import { getStatusChangeOfPending } from './utils/get_status_change_of_pending.js';
+import { unfinalizedTaggingIndexesWindowEnd } from '../constants.js';
+import type { LogQueryAnchor } from '../get_all_logs_by_tags.js';
 import { loadAndStoreNewTaggingIndexes } from './utils/load_and_store_new_tagging_indexes.js';
+import { resolvePendingTxs } from './utils/resolve_pending_txs.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, app) tuple while the direction of
- * sender -> recipient matters.
+ * @param secret - The sender-side tagging `AppTaggingSecret`.
+ * @param finalizedBlockNumber - The locally-synced finalized tip, used to tell whether the block a discovered log
+ * sits in is finalized.
  * @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).
@@ -19,10 +21,11 @@ import { loadAndStoreNewTaggingIndexes } from './utils/load_and_store_new_taggin
  * updates its status accordingly.
  */
 export async function syncSenderTaggingIndexes(
-  secret: ExtendedDirectionalAppTaggingSecret,
+  secret: AppTaggingSecret,
   aztecNode: AztecNode,
   taggingStore: SenderTaggingStore,
-  anchorBlockHash: BlockHash,
+  finalizedBlockNumber: BlockNumber,
+  anchor: LogQueryAnchor,
   jobId: string,
 ): Promise<void> {
   // # Explanation of how syncing works
@@ -40,49 +43,39 @@ export async function syncSenderTaggingIndexes(
   // 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).
+  // A window advance usually takes a single logs query: the finalization status of most txs the logs surface is
+  // derived from the log block numbers and the locally-synced finalized tip, without a per-tx node call. See
+  // `resolvePendingTxs` for the txs that the logs cannot settle and what they cost.
 
   const finalizedIndex = await taggingStore.getLastFinalizedIndex(secret, jobId);
 
   let start = finalizedIndex === undefined ? 0 : finalizedIndex + 1;
-  let end = start + UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN;
+  // The loop only extends the window when the finalized index moves,
+  // so this first window must cover the entire permitted range on its own.
+  let end = unfinalizedTaggingIndexesWindowEnd(finalizedIndex);
 
   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, start, end, aztecNode, taggingStore, anchorBlockHash, jobId);
+    const txsInLogs = await loadAndStoreNewTaggingIndexes(secret, start, end, aztecNode, taggingStore, anchor, jobId);
 
-    // Retrieve all indexes within the current window from storage and update their status accordingly.
-    const pendingTxHashes = await taggingStore.getTxHashesOfPendingIndexes(secret, start, end, jobId);
-    if (pendingTxHashes.length === 0) {
+    // Pending txs for this window: prior syncs, txs this PXE itself sent, and what the logs just stored.
+    const pendingTxs = await taggingStore.getPendingTxs(secret, start, end, jobId);
+    if (pendingTxs.length === 0) {
       break;
     }
 
-    const { txHashesToFinalize, txHashesToDrop, txHashesWithExecutionReverted } = await getStatusChangeOfPending(
-      pendingTxHashes,
-      aztecNode,
-    );
+    const { txHashesFinalizedFromLogs, txHashesFinalizedFromReceipts, txHashesDropped, receiptsWithExecutionReverted } =
+      await resolvePendingTxs(pendingTxs, txsInLogs, finalizedBlockNumber, aztecNode);
 
-    await taggingStore.dropPendingIndexes(txHashesToDrop, jobId);
-    await taggingStore.finalizePendingIndexes(txHashesToFinalize, jobId);
+    await taggingStore.dropPendingIndexes(txHashesDropped, jobId);
+    // The logs are queried per secret, so they only evidence this one's indexes. A receipt covers the whole tx.
+    await taggingStore.finalizePendingIndexesOfSecret(secret, txHashesFinalizedFromLogs, jobId);
+    await taggingStore.finalizePendingIndexes(txHashesFinalizedFromReceipts, jobId);
 
-    if (txHashesWithExecutionReverted.length > 0) {
-      const indexedTxEffects = await Promise.all(
-        txHashesWithExecutionReverted.map(txHash => aztecNode.getTxEffect(txHash)),
-      );
-      for (const indexedTxEffect of indexedTxEffects) {
-        if (indexedTxEffect === undefined) {
-          throw new Error(
-            'TxEffect not found for execution-reverted tx. This is either a bug or a reorg has occurred.',
-          );
-        }
-
-        await taggingStore.finalizePendingIndexesOfAPartiallyRevertedTx(indexedTxEffect.data, jobId);
-      }
+    for (const receipt of receiptsWithExecutionReverted) {
+      await taggingStore.finalizePendingIndexesOfAPartiallyRevertedTx(receipt.txEffect, jobId);
     }
 
     // We check if the finalized index has been updated.
@@ -100,8 +93,7 @@ export async function syncSenderTaggingIndexes(
       //    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;
+      end = unfinalizedTaggingIndexesWindowEnd(newFinalizedIndex);
       start = previousEnd;
       previousFinalizedIndex = newFinalizedIndex;
     } else {

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

@@ -0,0 +1,92 @@
+import type { BlockNumber } from '@aztec/foundation/branded-types';
+import { allToCompletion } from '@aztec/foundation/promise';
+import type { AztecNode } from '@aztec/stdlib/interfaces/server';
+import { TxHash, TxStatus } from '@aztec/stdlib/tx';
+
+import type { PendingTx } from '../../../storage/tagging_store/sender_tagging_store.js';
+import type { TxInLogs } from './load_and_store_new_tagging_indexes.js';
+
+/** A sync window's pending txs, grouped by what the window's logs evidence about each of them. */
+export type LogClassification = {
+  txHashesFinalized: TxHash[];
+  txHashesWithExecutionReverted: TxHash[];
+  txHashesAbsent: TxHash[];
+};
+
+/** Groups a window's pending txs by what its logs say about them. */
+export function classifyPendingTxsFromLogs(
+  pendingTxs: PendingTx[],
+  txsInLogs: Map<string, TxInLogs>,
+  finalizedBlockNumber: BlockNumber,
+): LogClassification {
+  const txHashesFinalized: TxHash[] = [];
+  const txHashesWithExecutionReverted: TxHash[] = [];
+  const txHashesAbsent: TxHash[] = [];
+
+  for (const pendingTx of pendingTxs) {
+    const txHash = TxHash.fromString(pendingTx.txHash);
+    const txInLogs = txsInLogs.get(pendingTx.txHash);
+    if (!txInLogs) {
+      txHashesAbsent.push(txHash);
+    } else if (txInLogs.blockNumber > finalizedBlockNumber) {
+      // A tx in the logs is mined in the log's block, so it is finalized exactly when that block is at or below the
+      // finalized tip. This one is not, so it belongs to no group until the tip catches up.
+    } else if (txInLogs.taggingIndexes.includes(pendingTx.highestIndex)) {
+      txHashesFinalized.push(txHash);
+    } else {
+      // A partially reverted tx: the revert dropped the logs carrying its higher indexes.
+      txHashesWithExecutionReverted.push(txHash);
+    }
+  }
+
+  return { txHashesFinalized, txHashesWithExecutionReverted, txHashesAbsent };
+}
+
+/** A batch of pending txs grouped by what their receipts report about them. */
+export type ReceiptClassification = {
+  txHashesFinalized: TxHash[];
+  txHashesDropped: TxHash[];
+  txHashesWithExecutionReverted: TxHash[];
+};
+
+/** Groups pending txs by what their receipts say, for the txs the logs could not resolve. */
+export async function classifyPendingTxsFromReceipts(
+  pending: TxHash[],
+  aztecNode: AztecNode,
+): Promise<ReceiptClassification> {
+  const receipts = await allToCompletion(pending.map(pendingTxHash => aztecNode.getTxReceipt(pendingTxHash)));
+
+  const txHashesFinalized: TxHash[] = [];
+  const txHashesDropped: TxHash[] = [];
+  const txHashesWithExecutionReverted: TxHash[] = [];
+
+  for (let i = 0; i < receipts.length; i++) {
+    const receipt = receipts[i];
+    const txHash = pending[i];
+
+    if (receipt.status === TxStatus.FINALIZED) {
+      // Tx has been included in a block and the corresponding block is finalized
+      if (receipt.hasExecutionSucceeded()) {
+        // No part of execution reverted - we just finalize all the indexes.
+        txHashesFinalized.push(txHash);
+      } else if (receipt.hasExecutionReverted()) {
+        // Tx was mined but execution reverted (app logic, teardown, or both). Some logs from the non-revertible
+        // phase may still be onchain. We check which tags made it onchain and finalize those; drop the rest.
+        txHashesWithExecutionReverted.push(txHash);
+      } else {
+        // Defensive check - this branch should never be triggered
+        throw new Error(
+          'Both hasExecutionSucceeded and hasExecutionReverted on the receipt returned false. This should never happen and it implies a bug. Please open an issue.',
+        );
+      }
+    } else if (receipt.isDropped()) {
+      // Tx was dropped from the mempool --> we drop the corresponding pending indexes.
+      txHashesDropped.push(txHash);
+    } else {
+      // Tx is still pending, not yet finalized, or was mined successfully but not yet finalized --> we don't do
+      // anything.
+    }
+  }
+
+  return { txHashesFinalized, txHashesDropped, txHashesWithExecutionReverted };
+}

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

@@ -1,85 +1,91 @@
-import type { BlockHash } from '@aztec/stdlib/block';
+import type { BlockNumber } from '@aztec/foundation/branded-types';
+import { allToCompletion } from '@aztec/foundation/promise';
 import type { AztecNode } from '@aztec/stdlib/interfaces/server';
-import type { ExtendedDirectionalAppTaggingSecret } from '@aztec/stdlib/logs';
-import { SiloedTag } from '@aztec/stdlib/logs';
+import { type AppTaggingSecret, type LogResult, SiloedTag } from '@aztec/stdlib/logs';
 import { TxHash } from '@aztec/stdlib/tx';
 
 import type { SenderTaggingStore } from '../../../storage/tagging_store/sender_tagging_store.js';
-import { getAllPrivateLogsByTags } from '../../get_all_logs_by_tags.js';
+import { type LogQueryAnchor, getAllPrivateLogsByTags } from '../../get_all_logs_by_tags.js';
 
 /**
- * Loads tagging indexes from the Aztec node and stores them in the tagging data provider.
+ * Loads tagging indexes from the Aztec node and stores them in the tagging data provider. Returns the txs the
+ * window's logs carried, keyed by tx hash string, with the block each was mined in and the window indexes it used,
+ * so the caller can classify their finalization status without further node queries.
  * @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 extendedSecret - The extended directional app tagging secret that's unique for (sender, recipient, app) tuple.
+ * @param extendedSecret - The app tagging secret whose indexes are being synced.
  * @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.
- * @param anchorBlockHash - Hash of a block to use as reference block when querying node.
+ * @param anchor - Block the log query is anchored to.
  * @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(
-  extendedSecret: ExtendedDirectionalAppTaggingSecret,
+  extendedSecret: AppTaggingSecret,
   start: number,
   end: number,
   aztecNode: AztecNode,
   taggingStore: SenderTaggingStore,
-  anchorBlockHash: BlockHash,
+  anchor: LogQueryAnchor,
   jobId: string,
-) {
+): Promise<Map<string, TxInLogs>> {
   // We compute the tags for the current window of indexes
-  const siloedTagsForWindow = await Promise.all(
+  const siloedTagsForWindow = await allToCompletion(
     Array.from({ length: end - start }, (_, i) => SiloedTag.compute({ extendedSecret, index: start + i })),
   );
 
-  const txsForTags = await getTxsContainingTags(siloedTagsForWindow, aztecNode, anchorBlockHash);
-  const txIndexesMap = getTxIndexesMap(txsForTags, start, siloedTagsForWindow.length);
+  const allLogs = await getAllPrivateLogsByTags(aztecNode, siloedTagsForWindow, anchor);
+  if (allLogs.length !== siloedTagsForWindow.length) {
+    throw new Error(
+      `Number of log arrays does not match number of tags. ${allLogs.length} !== ${siloedTagsForWindow.length}`,
+    );
+  }
+
+  const txsInLogs = getTxsInLogs(allLogs, start);
 
-  // Now we iterate over the map, construct the tagging index ranges and store them in the db.
-  for (const [txHashStr, indexes] of txIndexesMap.entries()) {
+  // Now we iterate over the map, construct the tagging index ranges and store them in the db. A tx already tracked
+  // in the store is merged rather than range-checked: if this PXE sent the tx and it partially reverted, the chain
+  // only shows the surviving sub-range of the prove-time entry (the finalized receipt step of the sync owns
+  // resolving that difference), and a tx from another PXE may straddle a sync window boundary, in which case the
+  // entry is widened so the next index choice covers the full onchain range.
+  for (const [txHashStr, { taggingIndexes }] of txsInLogs.entries()) {
     const txHash = TxHash.fromString(txHashStr);
-    const ranges = [{ extendedSecret, lowestIndex: Math.min(...indexes), highestIndex: Math.max(...indexes) }];
-    await taggingStore.storePendingIndexes(ranges, txHash, jobId);
+    const ranges = [
+      { extendedSecret, lowestIndex: Math.min(...taggingIndexes), highestIndex: Math.max(...taggingIndexes) },
+    ];
+    await taggingStore.mergePendingIndexes(ranges, txHash, jobId);
   }
-}
 
-// 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,
-  anchorBlockHash: BlockHash,
-): Promise<TxHash[][]> {
-  // 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);
-  return allLogs.map(logs => logs.map(log => log.txHash));
+  return txsInLogs;
 }
 
-// Returns a map of txHash to all indexes for that txHash.
-function getTxIndexesMap(txHashesForTags: TxHash[][], start: number, count: number): Map<string, number[]> {
-  if (txHashesForTags.length !== count) {
-    throw new Error(`Number of tx hashes arrays does not match number of tags. ${txHashesForTags.length} !== ${count}`);
-  }
+/** A tx that a sync window's logs carried. */
+export type TxInLogs = {
+  /** The block the tx was mined in, which decides whether it is finalized. */
+  blockNumber: BlockNumber;
+  /** The window's tagging indexes whose siloed tags this tx's logs carried. */
+  taggingIndexes: number[];
+};
 
-  const indexesMap = new Map<string, number[]>();
+// Returns a map of txHash to the block it was mined in and all window indexes used by it.
+function getTxsInLogs(logsForTags: LogResult[][], start: number): Map<string, TxInLogs> {
+  const txsInLogs = new Map<string, TxInLogs>();
   // Iterate over indexes
-  for (let i = 0; i < txHashesForTags.length; i++) {
+  for (let i = 0; i < logsForTags.length; i++) {
     const taggingIndex = start + i;
-    const txHashesForTag = txHashesForTags[i];
-    // iterate over tx hashes that used that index (tag)
-    for (const txHash of txHashesForTag) {
-      const key = txHash.toString();
-      const existing = indexesMap.get(key);
+    // iterate over logs that used that index (tag)
+    for (const log of logsForTags[i]) {
+      const key = log.txHash.toString();
+      const existing = txsInLogs.get(key);
       // Add the index to the tx's indexes
       if (existing) {
-        existing.push(taggingIndex);
+        existing.taggingIndexes.push(taggingIndex);
       } else {
-        indexesMap.set(key, [taggingIndex]);
+        txsInLogs.set(key, { blockNumber: log.blockNumber, taggingIndexes: [taggingIndex] });
       }
     }
   }
-  return indexesMap;
+  return txsInLogs;
 }

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

@@ -0,0 +1,65 @@
+import type { BlockNumber } from '@aztec/foundation/branded-types';
+import { allToCompletion } from '@aztec/foundation/promise';
+import type { AztecNode } from '@aztec/stdlib/interfaces/server';
+import { type MinedTxReceipt, type TxHash, type TxReceipt, TxStatus } from '@aztec/stdlib/tx';
+
+import type { PendingTx } from '../../../storage/tagging_store/sender_tagging_store.js';
+import { classifyPendingTxsFromLogs, classifyPendingTxsFromReceipts } from './classify_pending_txs.js';
+import type { TxInLogs } from './load_and_store_new_tagging_indexes.js';
+
+/** What a window's node reads established about each of its pending txs. */
+export type ResolvedPendingTxs = {
+  txHashesFinalizedFromLogs: TxHash[];
+  txHashesFinalizedFromReceipts: TxHash[];
+  txHashesDropped: TxHash[];
+  /** Both sources land here: the logs when a surviving tag fell inside the window, a receipt otherwise. */
+  receiptsWithExecutionReverted: MinedTxReceipt<{ includeTxEffect: true }>[];
+};
+
+/**
+ * Resolves a window's pending txs. All of the window's node reads happen here.
+ *
+ * The logs it is handed settle most txs on their own, as {@link classifyPendingTxsFromLogs} explains. Two groups are
+ * left over, and share one further round trip:
+ *
+ * - txs absent from the logs, whose receipt is what tells whether they are still in the mempool, dropped, or reverted;
+ * - txs the logs show as reverted, which only their tx effect resolves.
+ *
+ * A third round trip is paid only when those receipts reveal a reverted tx, since its effect cannot be requested
+ * before its status says it reverted.
+ */
+export async function resolvePendingTxs(
+  pendingTxs: PendingTx[],
+  txsInLogs: Map<string, TxInLogs>,
+  finalizedBlockNumber: BlockNumber,
+  aztecNode: AztecNode,
+): Promise<ResolvedPendingTxs> {
+  const statusFromLogs = classifyPendingTxsFromLogs(pendingTxs, txsInLogs, finalizedBlockNumber);
+
+  const [statusOfAbsent, receiptsOfRevertedInLogs] = await allToCompletion([
+    classifyPendingTxsFromReceipts(statusFromLogs.txHashesAbsent, aztecNode),
+    getReceiptsWithEffect(statusFromLogs.txHashesWithExecutionReverted, aztecNode),
+  ]);
+
+  const receiptsOfRevertedAbsent = await getReceiptsWithEffect(statusOfAbsent.txHashesWithExecutionReverted, aztecNode);
+
+  return {
+    txHashesFinalizedFromLogs: statusFromLogs.txHashesFinalized,
+    txHashesFinalizedFromReceipts: statusOfAbsent.txHashesFinalized,
+    txHashesDropped: statusOfAbsent.txHashesDropped,
+    // Both groups were judged finalized before this fetch, the first off our own tip and the second off an earlier
+    // receipt, so both are confirmed against what the node says now. Finalizing off a reorgeable block would burn
+    // the indexes.
+    receiptsWithExecutionReverted: [...receiptsOfRevertedInLogs, ...receiptsOfRevertedAbsent].filter(isFinalized),
+  };
+}
+
+function getReceiptsWithEffect(txHashes: TxHash[], aztecNode: AztecNode) {
+  return allToCompletion(txHashes.map(txHash => aztecNode.getTxReceipt(txHash, { includeTxEffect: true })));
+}
+
+function isFinalized(
+  receipt: TxReceipt<{ includeTxEffect: true }>,
+): receipt is MinedTxReceipt<{ includeTxEffect: true }> {
+  return receipt.status === TxStatus.FINALIZED;
+}

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

@@ -0,0 +1,46 @@
+import { BlockNumber, EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
+import { BlockHash } from '@aztec/stdlib/block';
+import type { MinedTxStatus, TxEffect, TxHash } from '@aztec/stdlib/tx';
+import { MinedTxReceipt, TxExecutionResult } from '@aztec/stdlib/tx';
+
+import type { PendingTx } from '../../../storage/tagging_store/sender_tagging_store.js';
+import type { TxInLogs } from './load_and_store_new_tagging_indexes.js';
+
+/** A tx the store holds as pending, tracked up to the given index. */
+export function pendingTx(txHash: TxHash, highestIndex: number): PendingTx {
+  return { txHash: txHash.toString(), highestIndex };
+}
+
+/** One tx as a window's logs show it: the block it was mined in and the tagging indexes its logs carried. */
+export function minedIn(blockNumber: number, taggingIndexes: number[]): TxInLogs {
+  return { blockNumber: BlockNumber(blockNumber), taggingIndexes };
+}
+
+/** Builds the tx-hash-keyed map a window's logs would produce. */
+export function txsInLogs(...entries: [TxHash, TxInLogs][]): Map<string, TxInLogs> {
+  return new Map(entries.map(([txHash, txInLogs]) => [txHash.toString(), txInLogs]));
+}
+
+/** The receipt of a mined tx, successful and without a tx effect unless stated otherwise. */
+export function minedReceipt(
+  txHash: TxHash,
+  status: MinedTxStatus,
+  blockNumber: number,
+  {
+    executionResult = TxExecutionResult.SUCCESS,
+    txEffect,
+  }: { executionResult?: TxExecutionResult; txEffect?: TxEffect } = {},
+): MinedTxReceipt {
+  return new MinedTxReceipt(
+    txHash,
+    status,
+    executionResult,
+    1n,
+    BlockHash.random(),
+    BlockNumber(blockNumber),
+    SlotNumber(Number(blockNumber)),
+    0,
+    EpochNumber(1),
+    txEffect,
+  );
+}

package/src/tagging/testing/tag_query_test_utils.ts

@@ -0,0 +1,11 @@
+import { type AppTaggingSecret, type PrivateLogsQuery, SiloedTag, type TagQuery } from '@aztec/stdlib/logs';
+
+/** Computes the siloed tag */
+export function computeSiloedTagForIndex(secret: AppTaggingSecret, index: number): Promise<SiloedTag> {
+  return SiloedTag.compute({ extendedSecret: secret, index });
+}
+
+/** Extracts the bare-tag set from a query */
+export function extractTags(query: PrivateLogsQuery): SiloedTag[] {
+  return query.tags.map((entry: TagQuery<SiloedTag>) => (entry instanceof SiloedTag ? entry : entry.tag));
+}

package/dest/contract_function_simulator/benchmarked_node.d.ts

@@ -1,9 +0,0 @@
-import type { AztecNode } from '@aztec/stdlib/interfaces/client';
-import type { NodeStats } from '@aztec/stdlib/tx';
-export type BenchmarkedNode = AztecNode & {
-    getStats(): NodeStats;
-};
-export declare class BenchmarkedNodeFactory {
-    static create(node: AztecNode): BenchmarkedNode;
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmVuY2htYXJrZWRfbm9kZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbnRyYWN0X2Z1bmN0aW9uX3NpbXVsYXRvci9iZW5jaG1hcmtlZF9ub2RlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ2pFLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBa0IsTUFBTSxrQkFBa0IsQ0FBQztBQWlCbEUsTUFBTSxNQUFNLGVBQWUsR0FBRyxTQUFTLEdBQUc7SUFBRSxRQUFRLElBQUksU0FBUyxDQUFBO0NBQUUsQ0FBQztBQUVwRSxxQkFBYSxzQkFBc0I7SUFDakMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxJQUFJLEVBQUUsU0FBUyxHQUFHLGVBQWUsQ0ErRTlDO0NBQ0YifQ==

package/dest/contract_function_simulator/benchmarked_node.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"benchmarked_node.d.ts","sourceRoot":"","sources":["../../src/contract_function_simulator/benchmarked_node.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,KAAK,EAAE,SAAS,EAAkB,MAAM,kBAAkB,CAAC;AAiBlE,MAAM,MAAM,eAAe,GAAG,SAAS,GAAG;IAAE,QAAQ,IAAI,SAAS,CAAA;CAAE,CAAC;AAEpE,qBAAa,sBAAsB;IACjC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,SAAS,GAAG,eAAe,CA+E9C;CACF"}