wip

Author: benesjan

yarn-project/pxe/src/storage/tagging_data_provider/tagging_data_provider.ts

@@ -9,51 +9,50 @@ export class TaggingDataProvider {
   #store: AztecAsyncKVStore;
   #addressBook: AztecAsyncMap<string, true>;
 
-  // Stores the last index used for each tagging secret, taking direction into account
-  // This is necessary to avoid reusing the same index for the same secret, which happens if
-  // sender and recipient are the same
-  #taggingSecretIndexesForSenders: AztecAsyncMap<string, number>;
-  #taggingSecretIndexesForRecipients: AztecAsyncMap<string, number>;
+  // Stores the last index used for each directional app tagging secret, taking into account whether we are requesting
+  // the index as a sender or as a recipient because the sender and recipient can be in the same PXE.
+  #taggingSecretIndexesAsSenders: AztecAsyncMap<string, number>;
+  #taggingSecretIndexesAsRecipients: AztecAsyncMap<string, number>;
 
   constructor(store: AztecAsyncKVStore) {
     this.#store = store;
 
     this.#addressBook = this.#store.openMap('address_book');
 
-    this.#taggingSecretIndexesForSenders = this.#store.openMap('tagging_secret_indexes_for_senders');
-    this.#taggingSecretIndexesForRecipients = this.#store.openMap('tagging_secret_indexes_for_recipients');
+    this.#taggingSecretIndexesAsSenders = this.#store.openMap('tagging_secret_indexes_as_senders');
+    this.#taggingSecretIndexesAsRecipients = this.#store.openMap('tagging_secret_indexes_as_recipients');
   }
 
   setTaggingSecretIndexAsSender(directionalAppTaggingSecret: Fr, index: number) {
-    return this.#taggingSecretIndexesForSenders.set(directionalAppTaggingSecret.toString(), index);
+    return this.#taggingSecretIndexesAsSenders.set(directionalAppTaggingSecret.toString(), index);
   }
 
   setTaggingSecretsIndexesAsRecipient(indexedTaggingSecrets: IndexedTaggingSecret[]) {
     return Promise.all(
       indexedTaggingSecrets.map(({ directionalAppTaggingSecret, index }) =>
-        this.#taggingSecretIndexesForRecipients.set(`${directionalAppTaggingSecret.toString()}`, index),
+        this.#taggingSecretIndexesAsRecipients.set(`${directionalAppTaggingSecret.toString()}`, index),
       ),
     );
   }
 
   async getTaggingSecretsIndexAsSender(directionalAppTaggingSecret: Fr): Promise<number> {
-    return (await this.#taggingSecretIndexesForSenders.getAsync(directionalAppTaggingSecret.toString())) ?? 0;
+    return (await this.#taggingSecretIndexesAsSenders.getAsync(directionalAppTaggingSecret.toString())) ?? 0;
   }
 
   getTaggingSecretsIndexesAsRecipient(directionalAppTaggingSecrets: Fr[]): Promise<number[]> {
     return Promise.all(
       directionalAppTaggingSecrets.map(
-        async secret => (await this.#taggingSecretIndexesForRecipients.getAsync(secret.toString())) ?? 0,
+        async secret => (await this.#taggingSecretIndexesAsRecipients.getAsync(secret.toString())) ?? 0,
       ),
     );
   }
 
   resetNoteSyncData(): Promise<void> {
     return this.#store.transactionAsync(async () => {
-      const keysForSenders = await toArray(this.#taggingSecretIndexesForSenders.keysAsync());
-      await Promise.all(keysForSenders.map(secret => this.#taggingSecretIndexesForSenders.delete(secret)));
-      const keysForRecipients = await toArray(this.#taggingSecretIndexesForRecipients.keysAsync());
-      await Promise.all(keysForRecipients.map(secret => this.#taggingSecretIndexesForRecipients.delete(secret)));
+      const keysForSenders = await toArray(this.#taggingSecretIndexesAsSenders.keysAsync());
+      await Promise.all(keysForSenders.map(secret => this.#taggingSecretIndexesAsSenders.delete(secret)));
+      const keysForRecipients = await toArray(this.#taggingSecretIndexesAsRecipients.keysAsync());
+      await Promise.all(keysForRecipients.map(secret => this.#taggingSecretIndexesAsRecipients.delete(secret)));
     });
   }