zcash_client_sqlite: Ensure we identify the sending account in z->t t…

…ransactions.
zcash · Mar 10, 2024 · 0036600 · 0036600
1 parent c08fe2d
commit 0036600
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/zcash_client_sqlite/src/lib.rs b/zcash_client_sqlite/src/lib.rs
@@ -867,8 +867,7 @@ impl<P: consensus::Parameters> WalletWrite for WalletDb<rusqlite::Connection, P>
                         )?;
 
                         if matches!(recipient, Recipient::InternalAccount(_, _)) {
-                            todo!();
-                            //wallet::orchard::put_received_note(wdb.conn.0, output, tx_ref, None)?;
+                            wallet::orchard::put_received_note(wdb.conn.0, output, tx_ref, None)?;
                         }
                     }
                     TransferType::Incoming => {
@@ -883,8 +882,7 @@ impl<P: consensus::Parameters> WalletWrite for WalletDb<rusqlite::Connection, P>
                             }
                         }
 
-                        todo!()
-                        //wallet::orchard::put_received_note(wdb.conn.0, output, tx_ref, None)?;
+                        wallet::orchard::put_received_note(wdb.conn.0, output, tx_ref, None)?;
                     }
                 }
             }
@@ -897,15 +895,22 @@ impl<P: consensus::Parameters> WalletWrite for WalletDb<rusqlite::Connection, P>
 
             // If we have some transparent outputs:
             if d_tx.tx().transparent_bundle().iter().any(|b| !b.vout.is_empty()) {
-                let nullifiers = wdb.get_sapling_nullifiers(NullifierQuery::All)?;
-                // If the transaction contains shielded spends from our wallet, we will store z->t
+                // If the transaction contains spends from our wallet, we will store z->t
                 // transactions we observe in the same way they would be stored by
                 // create_spend_to_address.
-                if let Some((account_id, _)) = nullifiers.iter().find(
+                let sapling_nullifiers = wdb.get_sapling_nullifiers(NullifierQuery::All)?;
+                let orchard_nullifiers = wdb.get_orchard_nullifiers(NullifierQuery::All)?;
+                let from_account = sapling_nullifiers.iter().find(
                     |(_, nf)|
                         d_tx.tx().sapling_bundle().iter().flat_map(|b| b.shielded_spends().iter())
                         .any(|input| nf == input.nullifier())
-                ) {
+                ).map(|(account_id, _)| account_id).or_else(|| orchard_nullifiers.iter().find(
+                    |(_, nf)|
+                        d_tx.tx().orchard_bundle().iter().flat_map(|b| b.actions().iter())
+                        .any(|input| nf == input.nullifier())
+                ).map(|(account_id, _)| account_id));
+
+                if let Some(account_id) = from_account {
                     for (output_index, txout) in d_tx.tx().transparent_bundle().iter().flat_map(|b| b.vout.iter()).enumerate() {
                         if let Some(address) = txout.recipient_address() {
                             wallet::put_sent_output(