Merge branch 'bat/dont-update-witness-maps-of-unowned-notes' (#4693)

* origin/bat/dont-update-witness-maps-of-unowned-notes:
  changelog
  Don't update witness maps of unowned notes

Author: tzemanovic

.changelog/unreleased/improvements/4693-dont-update-witness-maps-of-unowned-notes.md

@@ -0,0 +1 @@
+ - When using the ledger client, we update witness maps manually. We now add notes to the witness map only if there were successfully trial decrypted. ([\#2693](https://github.com/anoma/namada/pull/4693))

crates/shielded_token/src/masp/shielded_sync/dispatcher.rs

@@ -409,7 +409,11 @@ where
             if needs_witness_map_update
                 && Some(&masp_indexed_tx) > last_witnessed_tx.as_ref()
             {
-                self.ctx.update_witness_map(masp_indexed_tx, &stx_batch)?;
+                self.ctx.update_witness_map(
+                    masp_indexed_tx,
+                    &stx_batch,
+                    &self.cache.trial_decrypted,
+                )?;
             }
             let first_note_pos = self.ctx.note_index[&masp_indexed_tx];
             let mut vk_heights = BTreeMap::new();

crates/shielded_token/src/masp/shielded_sync/utils.rs

@@ -233,6 +233,11 @@ impl TrialDecrypted {
     pub fn is_empty(&self) -> bool {
         self.inner.is_empty()
     }
+
+    /// Check if the tx with  [`MaspIndexedTx`] was successfully decrypted
+    pub fn has_indexed_tx(&self, ix: &MaspIndexedTx) -> bool {
+        self.inner.contains_key(ix)
+    }
 }
 
 /// A cache of fetched indexed transactions.

crates/shielded_token/src/masp/shielded_wallet.rs

@@ -47,7 +47,7 @@ use namada_wallet::{DatedKeypair, DatedSpendingKey};
 use rand::prelude::StdRng;
 use rand_core::{OsRng, SeedableRng};
 
-use super::utils::MaspIndexedTx;
+use super::utils::{MaspIndexedTx, TrialDecrypted};
 use crate::masp::utils::MaspClient;
 use crate::masp::{
     ContextSyncStatus, Conversions, MaspAmount, MaspDataLogEntry, MaspFeeData,
@@ -146,6 +146,7 @@ impl<U: ShieldedUtils + MaybeSend + MaybeSync> ShieldedWallet<U> {
         &mut self,
         masp_indexed_tx: MaspIndexedTx,
         shielded: &Transaction,
+        trial_decrypted: &TrialDecrypted,
     ) -> Result<(), eyre::Error> {
         let mut note_pos = self.tree.size();
         self.note_index.insert(masp_indexed_tx, note_pos);
@@ -166,10 +167,13 @@ impl<U: ShieldedUtils + MaybeSend + MaybeSync> ShieldedWallet<U> {
             self.tree.append(node).map_err(|()| {
                 eyre!("note commitment tree is full".to_string())
             })?;
-            // Finally, make it easier to construct merkle paths to this new
-            // note
-            let witness = IncrementalWitness::<Node>::from_tree(&self.tree);
-            self.witness_map.insert(note_pos, witness);
+
+            if trial_decrypted.has_indexed_tx(&masp_indexed_tx) {
+                // Finally, make it easier to construct merkle paths to this new
+                // notes that we own
+                let witness = IncrementalWitness::<Node>::from_tree(&self.tree);
+                self.witness_map.insert(note_pos, witness);
+            }
             note_pos = checked!(note_pos + 1).unwrap();
         }
         Ok(())