decryptedIncoming and decryptedOutgoing

AztecProtocol · Jun 5, 2024 · daa6177 · daa6177
1 parent 6370db9
commit daa6177
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 10 deletions.
diff --git a/yarn-project/circuit-types/src/stats/stats.ts b/yarn-project/circuit-types/src/stats/stats.ts
@@ -175,8 +175,10 @@ export type NoteProcessorStats = {
   seen: number;
   /** How many notes had decryption deferred due to a missing contract */
   deferred: number;
-  /** How many notes were successfully decrypted. */
-  decrypted: number;
+  /** How many incoming notes were successfully decrypted. */
+  decryptedIncoming: number;
+  /** How many outgoing notes were successfully decrypted. */
+  decryptedOutgoing: number;
   /** How many notes failed processing. */
   failed: number;
   /** How many blocks were spanned.  */

diff --git a/yarn-project/end-to-end/src/e2e_pending_note_hashes_contract.test.ts b/yarn-project/end-to-end/src/e2e_pending_note_hashes_contract.test.ts
@@ -307,8 +307,8 @@ describe('e2e_pending_note_hashes_contract', () => {
     await deployedContract.methods.test_emit_bad_note_log(owner, outgoingViewer).send().wait();
 
     const syncStats = await wallet.getSyncStats();
-    // Expect two decryptable note logs to be emitted
-    expect(syncStats[owner.toString()].decrypted).toEqual(2);
+    // Expect two incoming decryptable note logs to be emitted
+    expect(syncStats[owner.toString()].decryptedIncoming).toEqual(2);
     // Expect one note log to be dropped
     expect(syncStats[owner.toString()].failed).toEqual(1);
   });

diff --git a/yarn-project/pxe/src/note_processor/note_processor.ts b/yarn-project/pxe/src/note_processor/note_processor.ts
@@ -46,7 +46,15 @@ export class NoteProcessor {
   public readonly timer: Timer = new Timer();
 
   /** Stats accumulated for this processor. */
-  public readonly stats: NoteProcessorStats = { seen: 0, decrypted: 0, deferred: 0, failed: 0, blocks: 0, txs: 0 };
+  public readonly stats: NoteProcessorStats = {
+    seen: 0,
+    decryptedIncoming: 0,
+    decryptedOutgoing: 0,
+    deferred: 0,
+    failed: 0,
+    blocks: 0,
+    txs: 0,
+  };
 
   private constructor(
     public readonly account: AztecAddress,
@@ -182,11 +190,11 @@ export class NoteProcessor {
 
               if (incomingNote) {
                 incomingNotes.push(incomingNote);
-                this.stats.decrypted++;
+                this.stats.decryptedIncoming++;
               }
               if (outgoingNote) {
                 outgoingNotes.push(outgoingNote);
-                this.stats.decrypted++;
+                this.stats.decryptedOutgoing++;
               }
               if (incomingDeferredNote) {
                 deferredNoteDaosIncoming.push(incomingDeferredNote);
@@ -314,7 +322,7 @@ export class NoteProcessor {
       }
 
       incomingNotes.push(incomingNote);
-      this.stats.decrypted++;
+      this.stats.decryptedIncoming++;
     }
 
     return incomingNotes;

diff --git a/yarn-project/scripts/src/benchmarks/aggregate.ts b/yarn-project/scripts/src/benchmarks/aggregate.ts
@@ -171,8 +171,8 @@ function processCircuitWitnessGeneration(entry: CircuitWitnessGenerationStats, r
  * Processes an entry with event name 'note-processor-caught-up' and updates results
  */
 function processNoteProcessorCaughtUp(entry: NoteProcessorCaughtUpStats, results: BenchmarkCollectedResults) {
-  const { decrypted, blocks, dbSize } = entry;
-  if (BENCHMARK_HISTORY_CHAIN_LENGTHS.includes(blocks) && decrypted > 0) {
+  const { decryptedIncoming, decryptedOutgoing, blocks, dbSize } = entry;
+  if (BENCHMARK_HISTORY_CHAIN_LENGTHS.includes(blocks) && (decryptedIncoming > 0 || decryptedOutgoing > 0)) {
     append(results, 'pxe_database_size_in_bytes', blocks, dbSize);
   }
 }