@aztec/pxe 0.0.1-commit.03f7ef2 → 0.0.1-commit.0b941701

package/dest/storage/{tagging_data_provider/sender_tagging_data_provider.js → tagging_store/sender_tagging_store.js}

@@ -1,11 +1,12 @@
 import { toArray } from '@aztec/foundation/iterable';
 import { TxHash } from '@aztec/stdlib/tx';
-import { UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN } from '../../tagging/sync/sync_sender_tagging_indexes.js';
+import { UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN } from '../../tagging/constants.js';
 /**
  * Data provider of tagging data used when syncing the sender tagging indexes. The recipient counterpart of this class
- * is called RecipientTaggingDataProvider. We have the providers separate for the sender and recipient because
+ * is called RecipientTaggingStore. We have the data stores separate for sender and recipient because
  * the algorithms are completely disjoint and there is not data reuse between the two.
- */ export class SenderTaggingDataProvider {
+ */ export class SenderTaggingStore {
+    storeName = 'sender_tagging';
     #store;
     // Stores the pending indexes for each directional app tagging secret. Pending here means that the tx that contained
     // the private logs with tags corresponding to these indexes has not been finalized yet.
@@ -15,15 +16,95 @@ import { UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN } from '../../tagging/sync/sync_
     // the smaller ones are irrelevant due to tx atomicity.
     //
     // TODO(#17615): This assumes no logs are used in the non-revertible phase.
+    //
+    // directional app tagging secret => { pending index, txHash }[]
     #pendingIndexes;
+    // jobId => directional app tagging secret => { pending index, txHash }[]
+    #pendingIndexesForJob;
     // Stores the last (highest) finalized index for each directional app tagging secret. We care only about the last
     // index because unlike the pending indexes, it will never happen that a finalized index would be removed and hence
     // we don't need to store the history.
+    //
+    // directional app tagging secret => highest finalized index
     #lastFinalizedIndexes;
+    // jobId => directional app tagging secret => highest finalized index
+    #lastFinalizedIndexesForJob;
     constructor(store){
         this.#store = store;
         this.#pendingIndexes = this.#store.openMap('pending_indexes');
         this.#lastFinalizedIndexes = this.#store.openMap('last_finalized_indexes');
+        this.#pendingIndexesForJob = new Map();
+        this.#lastFinalizedIndexesForJob = new Map();
+    }
+    #getPendingIndexesForJob(jobId) {
+        let pendingIndexesForJob = this.#pendingIndexesForJob.get(jobId);
+        if (!pendingIndexesForJob) {
+            pendingIndexesForJob = new Map();
+            this.#pendingIndexesForJob.set(jobId, pendingIndexesForJob);
+        }
+        return pendingIndexesForJob;
+    }
+    #getLastFinalizedIndexesForJob(jobId) {
+        let jobStagedLastFinalizedIndexes = this.#lastFinalizedIndexesForJob.get(jobId);
+        if (!jobStagedLastFinalizedIndexes) {
+            jobStagedLastFinalizedIndexes = new Map();
+            this.#lastFinalizedIndexesForJob.set(jobId, jobStagedLastFinalizedIndexes);
+        }
+        return jobStagedLastFinalizedIndexes;
+    }
+    async #readPendingIndexes(jobId, secret) {
+        const jobStagedPendingIndexes = this.#getPendingIndexesForJob(jobId);
+        const pendingIndexes = jobStagedPendingIndexes.get(secret);
+        // We return the staged version of this if it exists, if not, we read from the DB.
+        // If the DB also has nothing, we return an empty array [].
+        return pendingIndexes !== undefined ? pendingIndexes : await this.#pendingIndexes.getAsync(secret) ?? [];
+    }
+    #writePendingIndexes(jobId, secret, pendingIndexes) {
+        this.#getPendingIndexesForJob(jobId).set(secret, pendingIndexes);
+    }
+    /**
+   * Returns a job view of all the secrets that have a corresponding list of pending indexes either in persistent
+   * storage or the current job.
+   */ async #readSecretsWithPendingIndexes(jobId) {
+        const storedSecrets = new Set(await toArray(this.#pendingIndexes.keysAsync()));
+        const stagedSecrets = this.#getPendingIndexesForJob(jobId).keys();
+        return [
+            ...storedSecrets.union(new Set(stagedSecrets))
+        ];
+    }
+    async #readLastFinalizedIndex(jobId, secret) {
+        return this.#getLastFinalizedIndexesForJob(jobId).get(secret) ?? await this.#lastFinalizedIndexes.getAsync(secret);
+    }
+    #writeLastFinalizedIndex(jobId, secret, lastFinalizedIndex) {
+        this.#getLastFinalizedIndexesForJob(jobId).set(secret, lastFinalizedIndex);
+    }
+    /**
+   * Writes all job-specific in-memory data to persistent storage.
+   *
+   * @remark This method must run in a DB transaction context. It's designed to be called from JobCoordinator#commitJob.
+   */ async commit(jobId) {
+        const pendingIndexesForJob = this.#pendingIndexesForJob.get(jobId);
+        if (pendingIndexesForJob) {
+            for (const [secret, pendingIndexes] of pendingIndexesForJob.entries()){
+                if (pendingIndexes.length === 0) {
+                    await this.#pendingIndexes.delete(secret);
+                } else {
+                    await this.#pendingIndexes.set(secret, pendingIndexes);
+                }
+            }
+        }
+        const lastFinalizedIndexesForJob = this.#lastFinalizedIndexesForJob.get(jobId);
+        if (lastFinalizedIndexesForJob) {
+            for (const [secret, lastFinalizedIndex] of lastFinalizedIndexesForJob.entries()){
+                await this.#lastFinalizedIndexes.set(secret, lastFinalizedIndex);
+            }
+        }
+        return this.discardStaged(jobId);
+    }
+    discardStaged(jobId) {
+        this.#pendingIndexesForJob.delete(jobId);
+        this.#lastFinalizedIndexesForJob.delete(jobId);
+        return Promise.resolve();
     }
     /**
    * Stores pending indexes.
@@ -33,6 +114,7 @@ import { UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN } from '../../tagging/sync/sync_
    * @param preTags - The pre-tags containing the directional app tagging secrets and the indexes that are to be
    * stored in the db.
    * @param txHash - The tx in which the pretags were used in private logs.
+   * @param jobId - job context for staged writes to this store. See `JobCoordinator` for more details.
    * @throws If any two pre-tags contain the same directional app tagging secret. This is enforced because we care
    * only about the highest index for a given secret that was used in the tx. Hence this check is a good way to catch
    * bugs.
@@ -45,7 +127,7 @@ import { UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN } from '../../tagging/sync/sync_
    * @throws If the newly stored pending index is lower than or equal to the last finalized index for the same secret.
    * This is enforced because this should never happen if the syncing is done correctly as we look for logs from higher
    * indexes than finalized ones.
-   */ async storePendingIndexes(preTags, txHash) {
+   */ async storePendingIndexes(preTags, txHash, jobId) {
         // The secrets in pre-tags should be unique because we always store just the highest index per given secret-txHash
         // pair. Below we check that this is the case.
         const secretsSet = new Set(preTags.map((preTag)=>preTag.secret.toString()));
@@ -55,7 +137,7 @@ import { UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN } from '../../tagging/sync/sync_
         for (const { secret, index } of preTags){
             // First we check that for any secret the highest used index in tx is not further than window length from
             // the highest finalized index.
-            const finalizedIndex = await this.getLastFinalizedIndex(secret) ?? 0;
+            const finalizedIndex = await this.getLastFinalizedIndex(secret, jobId) ?? 0;
             if (index > finalizedIndex + UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN) {
                 throw new Error(`Highest used index ${index} is further than window length from the highest finalized index ${finalizedIndex}.
           Tagging window length ${UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN} is configured too low. Contact the Aztec team
@@ -63,13 +145,13 @@ import { UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN } from '../../tagging/sync/sync_
             }
             // Throw if the new pending index is lower than or equal to the last finalized index
             const secretStr = secret.toString();
-            const lastFinalizedIndex = await this.#lastFinalizedIndexes.getAsync(secretStr);
+            const lastFinalizedIndex = await this.#readLastFinalizedIndex(jobId, secretStr);
             if (lastFinalizedIndex !== undefined && index <= lastFinalizedIndex) {
                 throw new Error(`Cannot store pending index ${index} for secret ${secretStr}: ` + `it is lower than or equal to the last finalized index ${lastFinalizedIndex}`);
             }
             // Check if this secret + txHash combination already exists
             const txHashStr = txHash.toString();
-            const existingForSecret = await this.#pendingIndexes.getAsync(secretStr) ?? [];
+            const existingForSecret = await this.#readPendingIndexes(jobId, secretStr);
             const existingForSecretAndTx = existingForSecret.find((entry)=>entry.txHash === txHashStr);
             if (existingForSecretAndTx) {
                 // If it exists with a different index, throw an error
@@ -79,7 +161,7 @@ import { UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN } from '../../tagging/sync/sync_
             // If it exists with the same index, ignore the update (no-op)
             } else {
                 // If it doesn't exist, add it
-                await this.#pendingIndexes.set(secretStr, [
+                this.#writePendingIndexes(jobId, secretStr, [
                     ...existingForSecret,
                     {
                         index,
@@ -97,8 +179,8 @@ import { UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN } from '../../tagging/sync/sync_
    * @param endIndex - The upper bound of the index range (exclusive).
    * @returns An array of unique transaction hashes for pending transactions that contain indexes in the range
    * [startIndex, endIndex). Returns an empty array if no pending indexes exist in the range.
-   */ async getTxHashesOfPendingIndexes(secret, startIndex, endIndex) {
-        const existing = await this.#pendingIndexes.getAsync(secret.toString()) ?? [];
+   */ async getTxHashesOfPendingIndexes(secret, startIndex, endIndex, jobId) {
+        const existing = await this.#readPendingIndexes(jobId, secret.toString());
         const txHashes = existing.filter((entry)=>entry.index >= startIndex && entry.index < endIndex).map((entry)=>entry.txHash);
         return Array.from(new Set(txHashes)).map(TxHash.fromString);
     }
@@ -106,20 +188,20 @@ import { UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN } from '../../tagging/sync/sync_
    * Returns the last (highest) finalized index for a given secret.
    * @param secret - The secret to get the last finalized index for.
    * @returns The last (highest) finalized index for the given secret.
-   */ getLastFinalizedIndex(secret) {
-        return this.#lastFinalizedIndexes.getAsync(secret.toString());
+   */ getLastFinalizedIndex(secret, jobId) {
+        return this.#readLastFinalizedIndex(jobId, secret.toString());
     }
     /**
    * Returns the last used index for a given directional app tagging secret, considering both finalized and pending
    * indexes.
    * @param secret - The directional app tagging secret to query the last used index for.
    * @returns The last used index.
-   */ async getLastUsedIndex(secret) {
+   */ async getLastUsedIndex(secret, jobId) {
         const secretStr = secret.toString();
-        const pendingTxScopedIndexes = await this.#pendingIndexes.getAsync(secretStr) ?? [];
+        const pendingTxScopedIndexes = await this.#readPendingIndexes(jobId, secretStr);
         const pendingIndexes = pendingTxScopedIndexes.map((entry)=>entry.index);
         if (pendingTxScopedIndexes.length === 0) {
-            return this.#lastFinalizedIndexes.getAsync(secretStr);
+            return this.#readLastFinalizedIndex(jobId, secretStr);
         }
         // As the last used index we return the highest one from the pending indexes. Note that this value will be always
         // higher than the last finalized index because we prune lower pending indexes when a tx is finalized.
@@ -127,21 +209,21 @@ import { UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN } from '../../tagging/sync/sync_
     }
     /**
    * Drops all pending indexes corresponding to the given transaction hashes.
-   */ async dropPendingIndexes(txHashes) {
+   */ async dropPendingIndexes(txHashes, jobId) {
         if (txHashes.length === 0) {
             return;
         }
-        const txHashStrs = new Set(txHashes.map((txHash)=>txHash.toString()));
-        const allSecrets = await toArray(this.#pendingIndexes.keysAsync());
+        const txHashStrings = new Set(txHashes.map((txHash)=>txHash.toString()));
+        const allSecrets = await this.#readSecretsWithPendingIndexes(jobId);
         for (const secret of allSecrets){
-            const pendingData = await this.#pendingIndexes.getAsync(secret);
+            const pendingData = await this.#readPendingIndexes(jobId, secret);
             if (pendingData) {
-                const filtered = pendingData.filter((item)=>!txHashStrs.has(item.txHash));
+                const filtered = pendingData.filter((item)=>!txHashStrings.has(item.txHash));
                 if (filtered.length === 0) {
-                    await this.#pendingIndexes.delete(secret);
+                    this.#writePendingIndexes(jobId, secret, []);
                 } else if (filtered.length !== pendingData.length) {
                     // Some items were filtered out, so update the pending data
-                    await this.#pendingIndexes.set(secret, filtered);
+                    this.#writePendingIndexes(jobId, secret, filtered);
                 }
             // else: No items were filtered out (txHashes not found for this secret) --> no-op
             }
@@ -150,15 +232,15 @@ import { UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN } from '../../tagging/sync/sync_
     /**
    * Updates pending indexes corresponding to the given transaction hashes to be finalized and prunes any lower pending
    * indexes.
-   */ async finalizePendingIndexes(txHashes) {
+   */ async finalizePendingIndexes(txHashes, jobId) {
         if (txHashes.length === 0) {
             return;
         }
         for (const txHash of txHashes){
             const txHashStr = txHash.toString();
-            const allSecrets = await toArray(this.#pendingIndexes.keysAsync());
+            const allSecrets = await this.#readSecretsWithPendingIndexes(jobId);
             for (const secret of allSecrets){
-                const pendingData = await this.#pendingIndexes.getAsync(secret);
+                const pendingData = await this.#readPendingIndexes(jobId, secret);
                 if (!pendingData) {
                     continue;
                 }
@@ -171,14 +253,14 @@ import { UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN } from '../../tagging/sync/sync_
                     // values are irrelevant.
                     throw new Error(`Multiple pending indexes found for tx hash ${txHashStr} and secret ${secret}`);
                 }
-                let lastFinalized = await this.#lastFinalizedIndexes.getAsync(secret);
+                let lastFinalized = await this.#readLastFinalizedIndex(jobId, secret);
                 const newFinalized = matchingIndexes[0];
                 if (newFinalized < (lastFinalized ?? 0)) {
                     // This should never happen because when last finalized index was finalized we should have pruned the lower
                     // pending indexes.
                     throw new Error(`New finalized index ${newFinalized} is smaller than the current last finalized index ${lastFinalized}`);
                 }
-                await this.#lastFinalizedIndexes.set(secret, newFinalized);
+                this.#writeLastFinalizedIndex(jobId, secret, newFinalized);
                 lastFinalized = newFinalized;
                 // When we add pending indexes, we ensure they are higher than the last finalized index. However, because we
                 // cannot control the order in which transactions are finalized, there may be pending indexes that are now
@@ -186,9 +268,9 @@ import { UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN } from '../../tagging/sync/sync_
                 // outdated pending indexes.
                 const remainingItemsOfHigherIndex = pendingData.filter((item)=>item.index > (lastFinalized ?? 0));
                 if (remainingItemsOfHigherIndex.length === 0) {
-                    await this.#pendingIndexes.delete(secret);
+                    this.#writePendingIndexes(jobId, secret, []);
                 } else {
-                    await this.#pendingIndexes.set(secret, remainingItemsOfHigherIndex);
+                    this.#writePendingIndexes(jobId, secret, remainingItemsOfHigherIndex);
                 }
             }
         }

package/dest/tagging/constants.d.ts

@@ -1,2 +1,2 @@
-export declare const WINDOW_HALF_SIZE = 10;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uc3RhbnRzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGFnZ2luZy9jb25zdGFudHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsZUFBTyxNQUFNLGdCQUFnQixLQUFLLENBQUMifQ==
+export declare const UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN = 20;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uc3RhbnRzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGFnZ2luZy9jb25zdGFudHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBU0EsZUFBTyxNQUFNLHNDQUFzQyxLQUFLLENBQUMifQ==

package/dest/tagging/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/tagging/constants.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,gBAAgB,KAAK,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/tagging/constants.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,sCAAsC,KAAK,CAAC"}

package/dest/tagging/constants.js

@@ -1,3 +1,10 @@
-// Half the size of the window we slide over the tagging indexes.
-// TODO(#17775): Move this to the recipient log sync function once it's implemented in this directory.
-export const WINDOW_HALF_SIZE = 10;
+// This window has to be as large as the largest expected number of logs emitted in a tx for a given directional app
+// tagging secret. If we get more tag indexes consumed than this window, an error is thrown in `PXE::proveTx` function.
+// This is set to a larger value than MAX_PRIVATE_LOGS_PER_TX (currently 64) because there could be more than
+// MAX_PRIVATE_LOGS_PER_TX indexes consumed in case the logs are squashed. This happens when the log contains a note
+// and the note is nullified in the same tx.
+//
+// Having a large window significantly slowed down `e2e_l1_with_wall_time` test as there we perform sync for more than
+// 1000 secrets. For this reason we set it to a relatively low value of 20. 20 should be sufficient for all the use
+// cases.
+export const UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN = 20;

package/dest/tagging/get_all_logs_by_tags.d.ts

@@ -0,0 +1,24 @@
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { L2BlockHash } from '@aztec/stdlib/block';
+import type { AztecNode } from '@aztec/stdlib/interfaces/client';
+import type { SiloedTag, Tag, TxScopedL2Log } from '@aztec/stdlib/logs';
+/**
+ * Fetches all private logs for the given tags, automatically paginating through all pages.
+ * @param aztecNode - The Aztec node to query.
+ * @param tags - The siloed tags to search for.
+ * @param anchorBlockHash - reference block for the Aztec node query, throws if block is not found there (typically
+ * because of reorgs).
+ * @returns An array of log arrays, one per tag, containing all logs across all pages.
+ */
+export declare function getAllPrivateLogsByTags(aztecNode: AztecNode, tags: SiloedTag[], anchorBlockHash: L2BlockHash): Promise<TxScopedL2Log[][]>;
+/**
+ * Fetches all public logs for the given tags from a contract, automatically paginating through all pages.
+ * @param aztecNode - The Aztec node to query.
+ * @param contractAddress - The contract address to search logs for.
+ * @param tags - The tags to search for.
+ * @param anchorBlockHash - reference block for the Aztec node query, throws if block is not found there (typically
+ * because of reorgs).
+ * @returns An array of log arrays, one per tag, containing all logs across all pages.
+ */
+export declare function getAllPublicLogsByTagsFromContract(aztecNode: AztecNode, contractAddress: AztecAddress, tags: Tag[], anchorBlockHash: L2BlockHash): Promise<TxScopedL2Log[][]>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0X2FsbF9sb2dzX2J5X3RhZ3MuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90YWdnaW5nL2dldF9hbGxfbG9nc19ieV90YWdzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBRXZELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ2pFLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxHQUFHLEVBQUUsYUFBYSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUE2QnhFOzs7Ozs7O0dBT0c7QUFDSCx3QkFBZ0IsdUJBQXVCLENBQ3JDLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLElBQUksRUFBRSxTQUFTLEVBQUUsRUFDakIsZUFBZSxFQUFFLFdBQVcsR0FDM0IsT0FBTyxDQUFDLGFBQWEsRUFBRSxFQUFFLENBQUMsQ0FFNUI7QUFFRDs7Ozs7Ozs7R0FRRztBQUNILHdCQUFnQixrQ0FBa0MsQ0FDaEQsU0FBUyxFQUFFLFNBQVMsRUFDcEIsZUFBZSxFQUFFLFlBQVksRUFDN0IsSUFBSSxFQUFFLEdBQUcsRUFBRSxFQUNYLGVBQWUsRUFBRSxXQUFXLEdBQzNCLE9BQU8sQ0FBQyxhQUFhLEVBQUUsRUFBRSxDQUFDLENBSTVCIn0=

package/dest/tagging/get_all_logs_by_tags.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"get_all_logs_by_tags.d.ts","sourceRoot":"","sources":["../../src/tagging/get_all_logs_by_tags.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAEvD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AA6BxE;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,SAAS,EAAE,EACjB,eAAe,EAAE,WAAW,GAC3B,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAE5B;AAED;;;;;;;;GAQG;AACH,wBAAgB,kCAAkC,CAChD,SAAS,EAAE,SAAS,EACpB,eAAe,EAAE,YAAY,EAC7B,IAAI,EAAE,GAAG,EAAE,EACX,eAAe,EAAE,WAAW,GAC3B,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAI5B"}

package/dest/tagging/get_all_logs_by_tags.js

@@ -0,0 +1,46 @@
+import { MAX_LOGS_PER_TAG } from '@aztec/stdlib/interfaces/api-limit';
+/**
+ * Generic pagination helper that fetches all pages of results.
+ * @param numTags - The number of tags being queried (determines result array size).
+ * @param fetchPage - Function that fetches a single page of results given a page number.
+ * @returns An array of arrays, one per tag, containing all results across all pages.
+ */ async function getAllPages(numTags, fetchPage) {
+    const allResultsPerTag = Array.from({
+        length: numTags
+    }, ()=>[]);
+    let page = 0;
+    let hasMore = true;
+    while(hasMore){
+        const resultsPage = await fetchPage(page);
+        hasMore = false;
+        for(let i = 0; i < resultsPage.length; i++){
+            allResultsPerTag[i].push(...resultsPage[i]);
+            if (resultsPage[i].length === MAX_LOGS_PER_TAG) {
+                hasMore = true;
+            }
+        }
+        page++;
+    }
+    return allResultsPerTag;
+}
+/**
+ * Fetches all private logs for the given tags, automatically paginating through all pages.
+ * @param aztecNode - The Aztec node to query.
+ * @param tags - The siloed tags to search for.
+ * @param anchorBlockHash - reference block for the Aztec node query, throws if block is not found there (typically
+ * because of reorgs).
+ * @returns An array of log arrays, one per tag, containing all logs across all pages.
+ */ export function getAllPrivateLogsByTags(aztecNode, tags, anchorBlockHash) {
+    return getAllPages(tags.length, (page)=>aztecNode.getPrivateLogsByTags(tags, page, anchorBlockHash));
+}
+/**
+ * Fetches all public logs for the given tags from a contract, automatically paginating through all pages.
+ * @param aztecNode - The Aztec node to query.
+ * @param contractAddress - The contract address to search logs for.
+ * @param tags - The tags to search for.
+ * @param anchorBlockHash - reference block for the Aztec node query, throws if block is not found there (typically
+ * because of reorgs).
+ * @returns An array of log arrays, one per tag, containing all logs across all pages.
+ */ export function getAllPublicLogsByTagsFromContract(aztecNode, contractAddress, tags, anchorBlockHash) {
+    return getAllPages(tags.length, (page)=>aztecNode.getPublicLogsByTagsFromContract(contractAddress, tags, page, anchorBlockHash));
+}

package/dest/tagging/index.d.ts

@@ -1,5 +1,17 @@
-export * from './constants.js';
-export * from './utils.js';
+/**
+ * This directory contains the sender and recipient synchronization algorithms that use tagging.
+ *
+ * The objective of the sender sync algorithm is to determine which tags have already been used by a sender, thereby
+ * deciding which tag should be used next.
+ *
+ * The objective of the recipient sync algorithm is to load and process the corresponding logs.
+ *
+ * @module tagging
+ */
+export { loadPrivateLogsForSenderRecipientPair } from './recipient_sync/load_private_logs_for_sender_recipient_pair.js';
+export { syncSenderTaggingIndexes } from './sender_sync/sync_sender_tagging_indexes.js';
+export { UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN } from './constants.js';
+export { getAllPrivateLogsByTags, getAllPublicLogsByTagsFromContract } from './get_all_logs_by_tags.js';
 export { DirectionalAppTaggingSecret, Tag, SiloedTag } from '@aztec/stdlib/logs';
 export { type PreTag } from '@aztec/stdlib/logs';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90YWdnaW5nL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsZ0JBQWdCLENBQUM7QUFDL0IsY0FBYyxZQUFZLENBQUM7QUFDM0IsT0FBTyxFQUFFLDJCQUEyQixFQUFFLEdBQUcsRUFBRSxTQUFTLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNqRixPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90YWdnaW5nL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7Ozs7R0FTRztBQUVILE9BQU8sRUFBRSxxQ0FBcUMsRUFBRSxNQUFNLGlFQUFpRSxDQUFDO0FBQ3hILE9BQU8sRUFBRSx3QkFBd0IsRUFBRSxNQUFNLDhDQUE4QyxDQUFDO0FBQ3hGLE9BQU8sRUFBRSxzQ0FBc0MsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBQ3hFLE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxrQ0FBa0MsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBR3hHLE9BQU8sRUFBRSwyQkFBMkIsRUFBRSxHQUFHLEVBQUUsU0FBUyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDakYsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFFLE1BQU0sb0JBQW9CLENBQUMifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/tagging/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,YAAY,CAAC;AAC3B,OAAO,EAAE,2BAA2B,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACjF,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,oBAAoB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/tagging/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,qCAAqC,EAAE,MAAM,iEAAiE,CAAC;AACxH,OAAO,EAAE,wBAAwB,EAAE,MAAM,8CAA8C,CAAC;AACxF,OAAO,EAAE,sCAAsC,EAAE,MAAM,gBAAgB,CAAC;AACxE,OAAO,EAAE,uBAAuB,EAAE,kCAAkC,EAAE,MAAM,2BAA2B,CAAC;AAGxG,OAAO,EAAE,2BAA2B,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACjF,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,oBAAoB,CAAC"}

package/dest/tagging/index.js

@@ -1,3 +1,15 @@
-export * from './constants.js';
-export * from './utils.js';
+/**
+ * This directory contains the sender and recipient synchronization algorithms that use tagging.
+ *
+ * The objective of the sender sync algorithm is to determine which tags have already been used by a sender, thereby
+ * deciding which tag should be used next.
+ *
+ * The objective of the recipient sync algorithm is to load and process the corresponding logs.
+ *
+ * @module tagging
+ */ export { loadPrivateLogsForSenderRecipientPair } from './recipient_sync/load_private_logs_for_sender_recipient_pair.js';
+export { syncSenderTaggingIndexes } from './sender_sync/sync_sender_tagging_indexes.js';
+export { UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN } from './constants.js';
+export { getAllPrivateLogsByTags, getAllPublicLogsByTagsFromContract } from './get_all_logs_by_tags.js';
+// Re-export tagging-related types from stdlib
 export { DirectionalAppTaggingSecret, Tag, SiloedTag } from '@aztec/stdlib/logs';

package/dest/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.d.ts

@@ -1,8 +1,9 @@
 import type { BlockNumber } from '@aztec/foundation/branded-types';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { L2BlockHash } from '@aztec/stdlib/block';
 import type { AztecNode } from '@aztec/stdlib/interfaces/client';
 import type { DirectionalAppTaggingSecret, TxScopedL2Log } from '@aztec/stdlib/logs';
-import type { NewRecipientTaggingDataProvider } from './new_recipient_tagging_data_provider.js';
+import type { RecipientTaggingStore } from '../../storage/tagging_store/recipient_tagging_store.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`.
@@ -10,5 +11,5 @@ import type { NewRecipientTaggingDataProvider } from './new_recipient_tagging_da
  * @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 declare function loadPrivateLogsForSenderRecipientPair(secret: DirectionalAppTaggingSecret, app: AztecAddress, aztecNode: AztecNode, taggingDataProvider: NewRecipientTaggingDataProvider, anchorBlockNumber: BlockNumber): Promise<TxScopedL2Log[]>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9hZF9wcml2YXRlX2xvZ3NfZm9yX3NlbmRlcl9yZWNpcGllbnRfcGFpci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3RhZ2dpbmcvcmVjaXBpZW50X3N5bmMvbG9hZF9wcml2YXRlX2xvZ3NfZm9yX3NlbmRlcl9yZWNpcGllbnRfcGFpci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNuRSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNqRSxPQUFPLEtBQUssRUFBRSwyQkFBMkIsRUFBRSxhQUFhLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUdyRixPQUFPLEtBQUssRUFBRSwrQkFBK0IsRUFBRSxNQUFNLDBDQUEwQyxDQUFDO0FBSWhHOzs7Ozs7R0FNRztBQUNILHdCQUFzQixxQ0FBcUMsQ0FDekQsTUFBTSxFQUFFLDJCQUEyQixFQUNuQyxHQUFHLEVBQUUsWUFBWSxFQUNqQixTQUFTLEVBQUUsU0FBUyxFQUNwQixtQkFBbUIsRUFBRSwrQkFBK0IsRUFDcEQsaUJBQWlCLEVBQUUsV0FBVyxHQUM3QixPQUFPLENBQUMsYUFBYSxFQUFFLENBQUMsQ0F5RzFCIn0=
+export declare function loadPrivateLogsForSenderRecipientPair(secret: DirectionalAppTaggingSecret, app: AztecAddress, aztecNode: AztecNode, taggingStore: RecipientTaggingStore, anchorBlockNumber: BlockNumber, anchorBlockHash: L2BlockHash, jobId: string): Promise<TxScopedL2Log[]>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9hZF9wcml2YXRlX2xvZ3NfZm9yX3NlbmRlcl9yZWNpcGllbnRfcGFpci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3RhZ2dpbmcvcmVjaXBpZW50X3N5bmMvbG9hZF9wcml2YXRlX2xvZ3NfZm9yX3NlbmRlcl9yZWNpcGllbnRfcGFpci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNuRSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUN2RCxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNqRSxPQUFPLEtBQUssRUFBRSwyQkFBMkIsRUFBRSxhQUFhLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUVyRixPQUFPLEtBQUssRUFBRSxxQkFBcUIsRUFBRSxNQUFNLHdEQUF3RCxDQUFDO0FBS3BHOzs7Ozs7R0FNRztBQUNILHdCQUFzQixxQ0FBcUMsQ0FDekQsTUFBTSxFQUFFLDJCQUEyQixFQUNuQyxHQUFHLEVBQUUsWUFBWSxFQUNqQixTQUFTLEVBQUUsU0FBUyxFQUNwQixZQUFZLEVBQUUscUJBQXFCLEVBQ25DLGlCQUFpQixFQUFFLFdBQVcsRUFDOUIsZUFBZSxFQUFFLFdBQVcsRUFDNUIsS0FBSyxFQUFFLE1BQU0sR0FDWixPQUFPLENBQUMsYUFBYSxFQUFFLENBQUMsQ0FvSDFCIn0=

package/dest/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"load_private_logs_for_sender_recipient_pair.d.ts","sourceRoot":"","sources":["../../../src/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,KAAK,EAAE,2BAA2B,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAGrF,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,0CAA0C,CAAC;AAIhG;;;;;;GAMG;AACH,wBAAsB,qCAAqC,CACzD,MAAM,EAAE,2BAA2B,EACnC,GAAG,EAAE,YAAY,EACjB,SAAS,EAAE,SAAS,EACpB,mBAAmB,EAAE,+BAA+B,EACpD,iBAAiB,EAAE,WAAW,GAC7B,OAAO,CAAC,aAAa,EAAE,CAAC,CAyG1B"}
+{"version":3,"file":"load_private_logs_for_sender_recipient_pair.d.ts","sourceRoot":"","sources":["../../../src/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,KAAK,EAAE,2BAA2B,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAErF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wDAAwD,CAAC;AAKpG;;;;;;GAMG;AACH,wBAAsB,qCAAqC,CACzD,MAAM,EAAE,2BAA2B,EACnC,GAAG,EAAE,YAAY,EACjB,SAAS,EAAE,SAAS,EACpB,YAAY,EAAE,qBAAqB,EACnC,iBAAiB,EAAE,WAAW,EAC9B,eAAe,EAAE,WAAW,EAC5B,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,aAAa,EAAE,CAAC,CAoH1B"}

package/dest/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.js

@@ -1,4 +1,4 @@
-import { UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN } from '../sync/sync_sender_tagging_indexes.js';
+import { UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN } from '../constants.js';
 import { findHighestIndexes } from './utils/find_highest_indexes.js';
 import { loadLogsForRange } from './utils/load_logs_for_range.js';
 /**
@@ -7,7 +7,7 @@ import { loadLogsForRange } from './utils/load_logs_for_range.js';
  *
  * @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, app, aztecNode, taggingDataProvider, anchorBlockNumber) {
+ */ export async function loadPrivateLogsForSenderRecipientPair(secret, app, aztecNode, taggingStore, anchorBlockNumber, anchorBlockHash, jobId) {
     // # 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]
@@ -55,14 +55,14 @@ import { loadLogsForRange } from './utils/load_logs_for_range.js';
             throw new Error('Node failed to return latest block header when syncing logs');
         }
         [finalizedBlockNumber, currentTimestamp] = [
-            l2Tips.finalized.number,
+            l2Tips.finalized.block.number,
             latestBlockHeader.globalVariables.timestamp
         ];
     }
     let start, end;
     {
-        const currentHighestAgedIndex = await taggingDataProvider.getHighestAgedIndex(secret);
-        const currentHighestFinalizedIndex = await taggingDataProvider.getHighestFinalizedIndex(secret);
+        const currentHighestAgedIndex = await taggingStore.getHighestAgedIndex(secret, jobId);
+        const currentHighestFinalizedIndex = await taggingStore.getHighestFinalizedIndex(secret, jobId);
         // 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
@@ -72,7 +72,7 @@ import { loadLogsForRange } from './utils/load_logs_for_range.js';
     const logs = [];
     while(true){
         // Get private logs with their block timestamps and corresponding tagging indexes
-        const privateLogsWithIndexes = await loadLogsForRange(secret, app, aztecNode, start, end, anchorBlockNumber);
+        const privateLogsWithIndexes = await loadLogsForRange(secret, app, aztecNode, start, end, anchorBlockNumber, anchorBlockHash);
         if (privateLogsWithIndexes.length === 0) {
             break;
         }
@@ -80,7 +80,7 @@ import { loadLogsForRange } from './utils/load_logs_for_range.js';
         const { highestAgedIndex, highestFinalizedIndex } = findHighestIndexes(privateLogsWithIndexes, currentTimestamp, finalizedBlockNumber);
         // Store updates in data provider and update local variables
         if (highestAgedIndex !== undefined) {
-            await taggingDataProvider.updateHighestAgedIndex(secret, highestAgedIndex);
+            await taggingStore.updateHighestAgedIndex(secret, highestAgedIndex, jobId);
         }
         if (highestFinalizedIndex === undefined) {
             break;
@@ -89,7 +89,7 @@ import { loadLogsForRange } from './utils/load_logs_for_range.js';
             // 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 taggingDataProvider.updateHighestFinalizedIndex(secret, highestFinalizedIndex);
+        await taggingStore.updateHighestFinalizedIndex(secret, highestFinalizedIndex, jobId);
         // 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;

package/dest/tagging/recipient_sync/utils/load_logs_for_range.d.ts

@@ -1,5 +1,6 @@
 import type { BlockNumber } from '@aztec/foundation/branded-types';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { L2BlockHash } from '@aztec/stdlib/block';
 import type { AztecNode } from '@aztec/stdlib/interfaces/client';
 import type { DirectionalAppTaggingSecret, TxScopedL2Log } from '@aztec/stdlib/logs';
 /**
@@ -7,8 +8,8 @@ import type { DirectionalAppTaggingSecret, TxScopedL2Log } from '@aztec/stdlib/l
  * `secret`. At most load logs from blocks up to and including `anchorBlockNumber`. `start` is inclusive and `end` is
  * exclusive.
  */
-export declare function loadLogsForRange(secret: DirectionalAppTaggingSecret, app: AztecAddress, aztecNode: AztecNode, start: number, end: number, anchorBlockNumber: BlockNumber): Promise<Array<{
+export declare function loadLogsForRange(secret: DirectionalAppTaggingSecret, app: AztecAddress, aztecNode: AztecNode, start: number, end: number, anchorBlockNumber: BlockNumber, anchorBlockHash: L2BlockHash): Promise<Array<{
     log: TxScopedL2Log;
     taggingIndex: number;
 }>>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9hZF9sb2dzX2Zvcl9yYW5nZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL3RhZ2dpbmcvcmVjaXBpZW50X3N5bmMvdXRpbHMvbG9hZF9sb2dzX2Zvcl9yYW5nZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNuRSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNqRSxPQUFPLEtBQUssRUFBRSwyQkFBMkIsRUFBVSxhQUFhLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUc3Rjs7OztHQUlHO0FBQ0gsd0JBQXNCLGdCQUFnQixDQUNwQyxNQUFNLEVBQUUsMkJBQTJCLEVBQ25DLEdBQUcsRUFBRSxZQUFZLEVBQ2pCLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLEtBQUssRUFBRSxNQUFNLEVBQ2IsR0FBRyxFQUFFLE1BQU0sRUFDWCxpQkFBaUIsRUFBRSxXQUFXLEdBQzdCLE9BQU8sQ0FBQyxLQUFLLENBQUM7SUFBRSxHQUFHLEVBQUUsYUFBYSxDQUFDO0lBQUMsWUFBWSxFQUFFLE1BQU0sQ0FBQTtDQUFFLENBQUMsQ0FBQyxDQXdCOUQifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9hZF9sb2dzX2Zvcl9yYW5nZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL3RhZ2dpbmcvcmVjaXBpZW50X3N5bmMvdXRpbHMvbG9hZF9sb2dzX2Zvcl9yYW5nZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNuRSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUN2RCxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNqRSxPQUFPLEtBQUssRUFBRSwyQkFBMkIsRUFBVSxhQUFhLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUs3Rjs7OztHQUlHO0FBQ0gsd0JBQXNCLGdCQUFnQixDQUNwQyxNQUFNLEVBQUUsMkJBQTJCLEVBQ25DLEdBQUcsRUFBRSxZQUFZLEVBQ2pCLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLEtBQUssRUFBRSxNQUFNLEVBQ2IsR0FBRyxFQUFFLE1BQU0sRUFDWCxpQkFBaUIsRUFBRSxXQUFXLEVBQzlCLGVBQWUsRUFBRSxXQUFXLEdBQzNCLE9BQU8sQ0FBQyxLQUFLLENBQUM7SUFBRSxHQUFHLEVBQUUsYUFBYSxDQUFDO0lBQUMsWUFBWSxFQUFFLE1BQU0sQ0FBQTtDQUFFLENBQUMsQ0FBQyxDQTBCOUQifQ==

package/dest/tagging/recipient_sync/utils/load_logs_for_range.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"load_logs_for_range.d.ts","sourceRoot":"","sources":["../../../../src/tagging/recipient_sync/utils/load_logs_for_range.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,KAAK,EAAE,2BAA2B,EAAU,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAG7F;;;;GAIG;AACH,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,2BAA2B,EACnC,GAAG,EAAE,YAAY,EACjB,SAAS,EAAE,SAAS,EACpB,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,MAAM,EACX,iBAAiB,EAAE,WAAW,GAC7B,OAAO,CAAC,KAAK,CAAC;IAAE,GAAG,EAAE,aAAa,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC,CAwB9D"}
+{"version":3,"file":"load_logs_for_range.d.ts","sourceRoot":"","sources":["../../../../src/tagging/recipient_sync/utils/load_logs_for_range.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,KAAK,EAAE,2BAA2B,EAAU,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAK7F;;;;GAIG;AACH,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,2BAA2B,EACnC,GAAG,EAAE,YAAY,EACjB,SAAS,EAAE,SAAS,EACpB,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,MAAM,EACX,iBAAiB,EAAE,WAAW,EAC9B,eAAe,EAAE,WAAW,GAC3B,OAAO,CAAC,KAAK,CAAC;IAAE,GAAG,EAAE,aAAa,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC,CA0B9D"}

package/dest/tagging/recipient_sync/utils/load_logs_for_range.js

@@ -1,16 +1,19 @@
 import { SiloedTag, Tag } from '@aztec/stdlib/logs';
+import { getAllPrivateLogsByTags } from '../../get_all_logs_by_tags.js';
 /**
  * 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, app, aztecNode, start, end, anchorBlockNumber) {
+ */ export async function loadLogsForRange(secret, app, aztecNode, start, end, anchorBlockNumber, anchorBlockHash) {
     // Derive tags for the window
     const preTags = 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);
+    // 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 logs = await getAllPrivateLogsByTags(aztecNode, siloedTags, anchorBlockHash);
     // Pair logs with their corresponding tagging indexes
     const logsWithIndexes = [];
     for(let i = 0; i < logs.length; i++){

package/dest/tagging/{sync → sender_sync}/sync_sender_tagging_indexes.d.ts

@@ -1,8 +1,8 @@
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { L2BlockHash } from '@aztec/stdlib/block';
 import type { AztecNode } from '@aztec/stdlib/interfaces/server';
 import type { DirectionalAppTaggingSecret } from '@aztec/stdlib/logs';
-import type { SenderTaggingDataProvider } from '../../storage/tagging_data_provider/sender_tagging_data_provider.js';
-export declare const UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN = 95;
+import type { SenderTaggingStore } from '../../storage/tagging_store/sender_tagging_store.js';
 /**
  * Syncs tagging indexes. This function needs to be called whenever a private log is being sent.
  *
@@ -17,5 +17,5 @@ export declare const UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN = 95;
  * @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 declare function syncSenderTaggingIndexes(secret: DirectionalAppTaggingSecret, app: AztecAddress, aztecNode: AztecNode, taggingDataProvider: SenderTaggingDataProvider): Promise<void>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3luY19zZW5kZXJfdGFnZ2luZ19pbmRleGVzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdGFnZ2luZy9zeW5jL3N5bmNfc2VuZGVyX3RhZ2dpbmdfaW5kZXhlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNqRSxPQUFPLEtBQUssRUFBRSwyQkFBMkIsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRXRFLE9BQU8sS0FBSyxFQUFFLHlCQUF5QixFQUFFLE1BQU0scUVBQXFFLENBQUM7QUFtQnJILGVBQU8sTUFBTSxzQ0FBc0MsS0FBSyxDQUFDO0FBRXpEOzs7Ozs7Ozs7Ozs7O0dBYUc7QUFDSCx3QkFBc0Isd0JBQXdCLENBQzVDLE1BQU0sRUFBRSwyQkFBMkIsRUFDbkMsR0FBRyxFQUFFLFlBQVksRUFDakIsU0FBUyxFQUFFLFNBQVMsRUFDcEIsbUJBQW1CLEVBQUUseUJBQXlCLEdBQzdDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FtRWYifQ==
+export declare function syncSenderTaggingIndexes(secret: DirectionalAppTaggingSecret, app: AztecAddress, aztecNode: AztecNode, taggingStore: SenderTaggingStore, anchorBlockHash: L2BlockHash, jobId: string): Promise<void>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3luY19zZW5kZXJfdGFnZ2luZ19pbmRleGVzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdGFnZ2luZy9zZW5kZXJfc3luYy9zeW5jX3NlbmRlcl90YWdnaW5nX2luZGV4ZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDdkQsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDakUsT0FBTyxLQUFLLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUV0RSxPQUFPLEtBQUssRUFBRSxrQkFBa0IsRUFBRSxNQUFNLHFEQUFxRCxDQUFDO0FBSzlGOzs7Ozs7Ozs7Ozs7O0dBYUc7QUFDSCx3QkFBc0Isd0JBQXdCLENBQzVDLE1BQU0sRUFBRSwyQkFBMkIsRUFDbkMsR0FBRyxFQUFFLFlBQVksRUFDakIsU0FBUyxFQUFFLFNBQVMsRUFDcEIsWUFBWSxFQUFFLGtCQUFrQixFQUNoQyxlQUFlLEVBQUUsV0FBVyxFQUM1QixLQUFLLEVBQUUsTUFBTSxHQUNaLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FtRWYifQ==

package/dest/tagging/sender_sync/sync_sender_tagging_indexes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sync_sender_tagging_indexes.d.ts","sourceRoot":"","sources":["../../../src/tagging/sender_sync/sync_sender_tagging_indexes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,oBAAoB,CAAC;AAEtE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qDAAqD,CAAC;AAK9F;;;;;;;;;;;;;GAaG;AACH,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,2BAA2B,EACnC,GAAG,EAAE,YAAY,EACjB,SAAS,EAAE,SAAS,EACpB,YAAY,EAAE,kBAAkB,EAChC,eAAe,EAAE,WAAW,EAC5B,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,CAAC,CAmEf"}