Fix conflicting duplicates

mintlayer · Mar 5, 2025 · f87218f · f87218f
1 parent aa3e06a
commit f87218f
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/wallet/src/account/output_cache/mod.rs b/wallet/src/account/output_cache/mod.rs
@@ -834,9 +834,17 @@ impl OutputCache {
                                 );
                                 Ok(())
                             }
-                            TxState::Abandoned
-                            | TxState::Confirmed(..)
-                            | TxState::Conflicted(..) => {
+                            TxState::Conflicted(..) => {
+                                // It's possible to try to mark descendant as conflicting twice
+                                // because unconfirmed_descendants contains a tx as child and as parent.
+                                // So it's not an error only if done during this function call.
+                                ensure!(
+                                    conflicting_txs_with_descendants.contains(&tx_id),
+                                    WalletError::CannotMarkTxAsConflictedIfInState(*tx.state())
+                                );
+                                Ok(())
+                            }
+                            TxState::Abandoned | TxState::Confirmed(..) => {
                                 Err(WalletError::CannotMarkTxAsConflictedIfInState(*tx.state()))
                             }
                         },