better approach

AztecProtocol · Nov 20, 2024 · aa56f47 · aa56f47
1 parent 8b53b70
commit aa56f47
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 59 deletions.
diff --git a/yarn-project/pxe/src/database/pxe_database.ts b/yarn-project/pxe/src/database/pxe_database.ts
@@ -201,6 +201,11 @@ export interface PxeDatabase extends ContractArtifactDatabase, ContractInstanceD
    */
   getTaggingSecretsIndexesAsSender(appTaggingSecrets: Fr[]): Promise<number[]>;
 
+  /**
+   * Sets the index for the provided app siloed tagging secrets
+   * To be used when the generated tags have been "seen" as a sender
+   * @param appTaggingSecrets - The app siloed tagging secrets.
+   */
   setTaggingSecretsIndexesAsSender(indexedTaggingSecrets: IndexedTaggingSecret[]): Promise<void>;
 
   /**

diff --git a/yarn-project/pxe/src/simulator_oracle/index.ts b/yarn-project/pxe/src/simulator_oracle/index.ts
@@ -295,7 +295,7 @@ export class SimulatorOracle implements DBOracle {
     );
 
     const [index] = await this.db.getTaggingSecretsIndexesAsSender([secret]);
-    await this.db.setTaggingSecretsIndexesAsSender([new IndexedTaggingSecret(secret, index)]);
+    await this.db.setTaggingSecretsIndexesAsSender([new IndexedTaggingSecret(secret, index + 1)]);
   }
 
   async #calculateTaggingSecret(contractAddress: AztecAddress, sender: AztecAddress, recipient: AztecAddress) {
@@ -335,19 +335,38 @@ export class SimulatorOracle implements DBOracle {
     return appTaggingSecrets.map((secret, i) => new IndexedTaggingSecret(secret, indexes[i]));
   }
 
-  async #getAppTaggingSecretAsSender(
+  /**
+   * Updates the local index of the shared tagging secret of a sender / recipient pair
+   * if a log with a larger index is found from the node.
+   * @param contractAddress - The address of the contract that the logs are tagged for
+   * @param sender - The address of the sender, we must know the sender's ivsk_m.
+   * @param recipient - The address of the recipient.
+   */
+  public async syncTaggedLogsAsSender(
     contractAddress: AztecAddress,
     sender: AztecAddress,
     recipient: AztecAddress,
-  ): Promise<IndexedTaggingSecret> {
-    const senderCompleteAddress = await this.getCompleteAddress(sender);
-    const senderIvsk = await this.keyStore.getMasterIncomingViewingSecretKey(sender);
+  ): Promise<void> {
+    const contractName = await this.contractDataOracle.getDebugContractName(contractAddress);
+    const appTaggingSecret = await this.#calculateTaggingSecret(contractAddress, sender, recipient);
+    let [currentIndex] = await this.db.getTaggingSecretsIndexesAsSender([appTaggingSecret]);
 
-    const sharedSecret = computeTaggingSecret(senderCompleteAddress, senderIvsk, recipient);
-    const appTaggingSecret = poseidon2Hash([sharedSecret.x, sharedSecret.y, contractAddress]);
-    const [index] = await this.db.getTaggingSecretsIndexesAsSender([appTaggingSecret]);
+    while (true) {
+      const currentIndexedAppTaggingSecret = new IndexedTaggingSecret(appTaggingSecret, currentIndex);
+      const currentTag = currentIndexedAppTaggingSecret.computeTag(recipient);
+
+      const [possibleLog] = await this.aztecNode.getLogsByTags([currentTag]);
 
-    return new IndexedTaggingSecret(appTaggingSecret, index);
+      if (possibleLog !== undefined) {
+        currentIndex++;
+      } else {
+        this.log.debug(
+          `Syncing logs for sender ${sender}, secret ${appTaggingSecret}:${currentIndex} at contract: ${contractName}(${contractAddress})`,
+        );
+        await this.db.setTaggingSecretsIndexesAsRecipient([new IndexedTaggingSecret(appTaggingSecret, currentIndex)]);
+        break;
+      }
+    }
   }
 
   /**
@@ -363,34 +382,6 @@ export class SimulatorOracle implements DBOracle {
     scopes?: AztecAddress[],
   ): Promise<Map<string, TxScopedL2Log[]>> {
     const recipients = scopes ? scopes : await this.keyStore.getAccounts();
-
-    const result = await this.#syncTaggedLogs(contractAddress, recipients);
-
-    for (const [key, value] of result) {
-      result.set(
-        key,
-        value.filter(log => log.blockNumber <= maxBlockNumber),
-      );
-    }
-
-    return result;
-  }
-
-  public async syncTaggedLogsAsSender(
-    contractAddress: AztecAddress,
-    sender: AztecAddress,
-    recipient: AztecAddress,
-  ): Promise<Map<string, TxScopedL2Log[]>> {
-    const result = await this.#syncTaggedLogs(contractAddress, [recipient], sender);
-
-    return result;
-  }
-
-  async #syncTaggedLogs(
-    contractAddress: AztecAddress,
-    recipients: AztecAddress[],
-    asSender?: AztecAddress,
-  ): Promise<Map<string, TxScopedL2Log[]>> {
     const result = new Map<string, TxScopedL2Log[]>();
     const contractName = await this.contractDataOracle.getDebugContractName(contractAddress);
     for (const recipient of recipients) {
@@ -402,12 +393,7 @@ export class SimulatorOracle implements DBOracle {
       // length, since we don't really know the note they correspond to until we decrypt them.
 
       // 1. Get all the secrets for the recipient and sender pairs (#9365)
-      const appTaggingSecrets: IndexedTaggingSecret[] = [];
-      if (asSender === undefined) {
-        appTaggingSecrets.push(...(await this.#getAppTaggingSecretsForContacts(contractAddress, recipient)));
-      } else {
-        appTaggingSecrets.push(await this.#getAppTaggingSecretAsSender(contractAddress, asSender, recipient));
-      }
+      const appTaggingSecrets = await this.#getAppTaggingSecretsForContacts(contractAddress, recipient);
 
       // 1.1 Set up a sliding window with an offset. Chances are the sender might have messed up
       // and inadvertedly incremented their index without use getting any logs (for example, in case
@@ -485,27 +471,22 @@ export class SimulatorOracle implements DBOracle {
             newTaggingSecrets.push(newTaggingSecret);
           }
         });
-        if (asSender === undefined) {
-          await this.db.setTaggingSecretsIndexesAsRecipient(
-            Object.keys(secretsToIncrement).map(
-              secret => new IndexedTaggingSecret(Fr.fromString(secret), secretsToIncrement[secret]),
-            ),
-          );
-        } else {
-          await this.db.setTaggingSecretsIndexesAsSender(
-            Object.keys(secretsToIncrement).map(
-              secret => new IndexedTaggingSecret(Fr.fromString(secret), secretsToIncrement[secret]),
-            ),
-          );
-        }
-
+        await this.db.setTaggingSecretsIndexesAsRecipient(
+          Object.keys(secretsToIncrement).map(
+            secret => new IndexedTaggingSecret(Fr.fromString(secret), secretsToIncrement[secret]),
+          ),
+        );
         currentTagggingSecrets = newTaggingSecrets;
       }
 
       result.set(
         recipient.toString(),
-        // Duplicates are likely to happen due to the sliding window, so we filter them out
-        logs.filter((log, index, self) => index === self.findIndex(otherLog => otherLog.equals(log))),
+        // Remove logs with a block number higher than the max block number
+        // Duplicates are likely to happen due to the sliding window, so we also filter them out
+        logs.filter(
+          (log, index, self) =>
+            log.blockNumber <= maxBlockNumber && index === self.findIndex(otherLog => otherLog.equals(log)),
+        ),
       );
     }
     return result;