Properly compute walletTransactions

js/pivx_shield.ts

@@ -30,6 +30,11 @@ interface TransactionResult {
   decrypted_new_notes: [Note, string][];
   commitment_tree: string;
   nullifiers: string[];
+  /**
+   * hex of the transactions belonging to the wallet
+   * i.e. either the spend or output belongs to us
+   */
+  wallet_transactions: string[];
 }
 
 interface Transaction {
@@ -313,7 +318,6 @@ export class PIVXShield {
 
   async handleBlocks(blocks: Block[]) {
     if (blocks.length === 0) return [];
-    const walletTransactions: string[] = [];
     if (
       !blocks.every((block, i) => {
         if (i === 0) {
@@ -339,6 +343,7 @@ export class PIVXShield {
       decrypted_new_notes,
       nullifiers,
       commitment_tree,
+      wallet_transactions,
     } = await this.callWorker<TransactionResult>(
       "handle_blocks",
       this.commitmentTree,
@@ -365,7 +370,7 @@ export class PIVXShield {
     await this.removeSpentNotes(nullifiers);
     this.lastProcessedBlock = blocks[blocks.length - 1].height;
 
-    return walletTransactions;
+    return wallet_transactions;
   }
 
   /**

src/transaction.rs

@@ -128,6 +128,7 @@ pub struct JSTxSaplingData {
     pub decrypted_new_notes: Vec<(Note, String)>,
     pub nullifiers: Vec<String>,
     pub commitment_tree: String,
+    pub wallet_transactions: Vec<String>,
 }
 
 #[derive(Serialize, Deserialize)]
@@ -164,19 +165,23 @@ pub fn handle_blocks(
         .collect::<Vec<_>>();
     let mut nullifiers = vec![];
     let mut new_notes = vec![];
+    let mut wallet_transactions = vec![];
     for block in blocks {
         for tx in block.txs {
-            nullifiers.extend(
-                handle_transaction(
-                    &mut tree,
-                    &tx,
-                    key.clone(),
-                    is_testnet,
-                    &mut comp_note,
-                    &mut new_notes,
-                )
-                .map_err(|_| "Couldn't handle transaction")?,
-            );
+            let old_note_length = new_notes.len();
+            let tx_nullifiers = handle_transaction(
+                &mut tree,
+                &tx,
+                key.clone(),
+                is_testnet,
+                &mut comp_note,
+                &mut new_notes,
+            )
+            .map_err(|_| "Couldn't handle transaction")?;
+            if !tx_nullifiers.is_empty() || old_note_length != new_notes.len() {
+                wallet_transactions.push(tx);
+            }
+            nullifiers.extend(tx_nullifiers);
         }
     }
 
@@ -196,6 +201,7 @@ pub fn handle_blocks(
         decrypted_notes: ser_comp_note,
         nullifiers: ser_nullifiers,
         commitment_tree: hex::encode(buff),
+        wallet_transactions,
         decrypted_new_notes: ser_new_comp_note,
     })?)
 }