zcash_client_backend: Ensure consistency between sent & stored memos.

zcash · Aug 2, 2023 · 110a9b3 · 110a9b3
1 parent f0b2fc3
commit 110a9b3
Showing 1 changed file with 12 additions and 13 deletions.
diff --git a/zcash_client_backend/src/data_api/wallet.rs b/zcash_client_backend/src/data_api/wallet.rs
@@ -545,30 +545,29 @@ where
     for payment in proposal.transaction_request().payments() {
         match &payment.recipient_address {
             RecipientAddress::Unified(ua) => {
+                let memo = payment
+                    .memo
+                    .as_ref()
+                    .map_or_else(MemoBytes::empty, |m| m.clone());
                 builder.add_sapling_output(
                     external_ovk,
                     *ua.sapling().expect("TODO: Add Orchard support to builder"),
                     payment.amount,
-                    payment.memo.clone().unwrap_or_else(MemoBytes::empty),
+                    memo.clone(),
                 )?;
                 sapling_output_meta.push((
                     Recipient::Unified(ua.clone(), PoolType::Shielded(ShieldedProtocol::Sapling)),
                     payment.amount,
-                    payment.memo.clone(),
+                    Some(memo),
                 ));
             }
             RecipientAddress::Shielded(addr) => {
-                builder.add_sapling_output(
-                    external_ovk,
-                    *addr,
-                    payment.amount,
-                    payment.memo.clone().unwrap_or_else(MemoBytes::empty),
-                )?;
-                sapling_output_meta.push((
-                    Recipient::Sapling(*addr),
-                    payment.amount,
-                    payment.memo.clone(),
-                ));
+                let memo = payment
+                    .memo
+                    .as_ref()
+                    .map_or_else(MemoBytes::empty, |m| m.clone());
+                builder.add_sapling_output(external_ovk, *addr, payment.amount, memo.clone())?;
+                sapling_output_meta.push((Recipient::Sapling(*addr), payment.amount, Some(memo)));
             }
             RecipientAddress::Transparent(to) => {
                 if payment.memo.is_some() {