zcash_client_sqlite: Use consistent criteria for detecting what accounts fund a transaction.

zcash_client_backend/CHANGELOG.md

@@ -103,6 +103,8 @@ and this library adheres to Rust's notion of
     feature flag.
 - `zcash_client_backend::proto`:
   - `ProposalDecodingError` has a new variant `TransparentMemo`.
+- `zcash_client_backend::wallet::Recipient::InternalAccount` is now a structured
+  variant with an additional `external_address` field.
 - `zcash_client_backend::zip321::render::amount_str` now takes a
   `NonNegativeAmount` rather than a signed `Amount` as its argument.
 - `zcash_client_backend::zip321::parse::parse_amount` now parses a

zcash_client_backend/src/data_api/wallet.rs

@@ -1049,10 +1049,11 @@
                     memo.clone(),
                 )?;
                 sapling_output_meta.push((
-                    Recipient::InternalAccount(
-                        account,
-                        PoolType::Shielded(ShieldedProtocol::Sapling),
-                    ),
+                    Recipient::InternalAccount {
+                        receiving_account: account,
+                        external_address: None,
+                        note: PoolType::Shielded(ShieldedProtocol::Sapling),
+                    },
                     change_value.value(),
                     Some(memo),
                 ))
@@ -1072,10 +1073,11 @@
                         memo.clone(),
                     )?;
                     orchard_output_meta.push((
-                        Recipient::InternalAccount(
-                            account,
-                            PoolType::Shielded(ShieldedProtocol::Orchard),
-                        ),
+                        Recipient::InternalAccount {
+                            receiving_account: account,
+                            external_address: None,
+                            note: PoolType::Shielded(ShieldedProtocol::Orchard),
+                        },
                         change_value.value(),
                         Some(memo),
                     ))

zcash_client_backend/src/decrypt.rs

@@ -166,12 +166,8 @@ pub fn decrypt_transaction<'a, P: consensus::Parameters, AccountId: Copy>(
         .flat_map(|bundle| {
             ufvks
                 .iter()
-                .flat_map(move |(account, ufvk)| {
-                    ufvk.orchard()
-                        .into_iter()
-                        .map(|fvk| (account.to_owned(), fvk))
-                })
-                .flat_map(move |(account, fvk)| {
+                .flat_map(|(account, ufvk)| ufvk.orchard().into_iter().map(|fvk| (*account, fvk)))
+                .flat_map(|(account, fvk)| {
                     let ivk_external = orchard::keys::PreparedIncomingViewingKey::new(
                         &fvk.to_ivk(Scope::External),
                     );

zcash_client_backend/src/wallet.rs

@@ -2,6 +2,7 @@
 //! light client.
 
 use incrementalmerkletree::Position;
+use zcash_keys::address::Address;
 use zcash_note_encryption::EphemeralKeyBytes;
 use zcash_primitives::{
     consensus::BlockHeight,
@@ -70,7 +71,11 @@
     Transparent(TransparentAddress),
     Sapling(sapling::PaymentAddress),
     Unified(UnifiedAddress, PoolType),
-    InternalAccount(AccountId, N),
+    InternalAccount {
+        receiving_account: AccountId,
+        external_address: Option<Address>,
+        note: N,
+    },
 }
 
 impl<AccountId, N> Recipient<AccountId, N> {
@@ -79,7 +84,15 @@
             Recipient::Transparent(t) => Recipient::Transparent(t),
             Recipient::Sapling(s) => Recipient::Sapling(s),
             Recipient::Unified(u, p) => Recipient::Unified(u, p),
-            Recipient::InternalAccount(a, n) => Recipient::InternalAccount(a, f(n)),
+            Recipient::InternalAccount {
+                receiving_account,
+                external_address,
+                note,
+            } => Recipient::InternalAccount {
+                receiving_account,
+                external_address,
+                note: f(note),
+            },
         }
     }
 }
@@ -90,7 +103,15 @@
             Recipient::Transparent(t) => Some(Recipient::Transparent(t)),
             Recipient::Sapling(s) => Some(Recipient::Sapling(s)),
             Recipient::Unified(u, p) => Some(Recipient::Unified(u, p)),
-            Recipient::InternalAccount(a, n) => n.map(|n0| Recipient::InternalAccount(a, n0)),
+            Recipient::InternalAccount {
+                receiving_account,
+                external_address,
+                note,
+            } => note.map(|n0| Recipient::InternalAccount {
+                receiving_account,
+                external_address,
+                note: n0,
+            }),
         }
     }
 }