Use new MUTXO field abandoned_at in resync and wallet-block updater

Neptune-Crypto · Jul 24, 2023 · b47f076 · b47f076
1 parent c64116b
commit b47f076
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/src/models/state/mod.rs b/src/models/state/mod.rs
@@ -370,6 +370,11 @@ impl GlobalState {
         'outer: for i in 0..num_monitored_utxos {
             let mut monitored_utxo = monitored_utxos.get(i).clone();
 
+            // Ignore those MUTXOs that were marked as abandoned
+            if monitored_utxo.abandoned_at.is_some() {
+                continue;
+            }
+
             // ignore synced ones
             if monitored_utxo.is_synced_to(&tip_hash) {
                 continue;

diff --git a/src/models/state/wallet/wallet_state.rs b/src/models/state/wallet/wallet_state.rs
@@ -349,9 +349,17 @@ impl WalletState {
                         "Strong key must be unique in wallet DB"
                     );
                 }
-                None => warn!(
-                    "Unable to find valid membership proof for UTXO with digest {utxo_digest}"
-                ),
+                None => {
+                    // Was MUTXO marked as abandoned? Then this is fine. Otherwise, log a warning.
+                    // TODO: If MUTXO was spent, maybe we also don't want to maintain it?
+                    if monitored_utxo.abandoned_at.is_some() {
+                        debug!("Monitored UTXO with digest {utxo_digest} was marked as abandoned. Skipping.");
+                    } else {
+                        warn!(
+                        "Unable to find valid membership proof for UTXO with digest {utxo_digest}"
+                    );
+                    }
+                }
             }
         }