Bugfix: Wallet: When getting balance w/ min_conf, include UTXOs that were spent more recently

luke-jr · luke-jr · commit cfa948da1c5a · 2018-11-22T05:23:03.000Z
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -594,7 +594,7 @@ void CWallet::SyncMetaData(std::pair<TxSpends::iterator, TxSpends::iterator> ran
  * Outpoint is spent if any non-conflicted transaction
  * spends it:
  */
-bool CWallet::IsSpent(interfaces::Chain::Lock& locked_chain, const uint256& hash, unsigned int n) const
+bool CWallet::IsSpent(interfaces::Chain::Lock& locked_chain, const uint256& hash, unsigned int n, const int min_depth) const
 {
     const COutPoint outpoint(hash, n);
     std::pair<TxSpends::const_iterator, TxSpends::const_iterator> range;
@@ -606,6 +606,7 @@ bool CWallet::IsSpent(interfaces::Chain::Lock& locked_chain, const uint256& hash
         std::map<uint256, CWalletTx>::const_iterator mit = mapWallet.find(wtxid);
         if (mit != mapWallet.end()) {
             int depth = mit->second.GetDepthInMainChain(locked_chain);
+            if (depth < min_depth) continue;
             if (depth > 0  || (depth == 0 && !mit->second.isAbandoned()))
                 return true; // Spent
         }
@@ -1861,7 +1862,7 @@ CAmount CWalletTx::GetImmatureCredit(interfaces::Chain::Lock& locked_chain, bool
     return 0;
 }
 
-CAmount CWalletTx::GetAvailableCredit(interfaces::Chain::Lock& locked_chain, bool fUseCache, const isminefilter& filter) const
+CAmount CWalletTx::GetAvailableCredit(interfaces::Chain::Lock& locked_chain, bool fUseCache, const isminefilter& filter, const int min_depth) const
 {
     if (pwallet == nullptr)
         return 0;
@@ -1889,7 +1890,7 @@ CAmount CWalletTx::GetAvailableCredit(interfaces::Chain::Lock& locked_chain, boo
     uint256 hashTx = GetHash();
     for (unsigned int i = 0; i < tx->vout.size(); i++)
     {
-        if (!pwallet->IsSpent(locked_chain, hashTx, i))
+        if (!pwallet->IsSpent(locked_chain, hashTx, i, min_depth))
         {
             const CTxOut &txout = tx->vout[i];
             nCredit += pwallet->GetCredit(txout, filter);
@@ -2054,7 +2055,7 @@ CAmount CWallet::GetBalance(const isminefilter& filter, const int min_depth, con
 
             if (pcoin->GetDepthInMainChain(*locked_chain) < min_depth) continue;
 
-            nTotal += pcoin->GetAvailableCredit(*locked_chain, true, filter);
+            nTotal += pcoin->GetAvailableCredit(*locked_chain, true, filter, min_depth);
         }
     }
 
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -485,7 +485,7 @@ class CWalletTx : public CMerkleTx
     // annotation "EXCLUSIVE_LOCKS_REQUIRED(cs_main, pwallet->cs_wallet)". The
     // annotation "NO_THREAD_SAFETY_ANALYSIS" was temporarily added to avoid
     // having to resolve the issue of member access into incomplete type CWallet.
-    CAmount GetAvailableCredit(interfaces::Chain::Lock& locked_chain, bool fUseCache=true, const isminefilter& filter=ISMINE_SPENDABLE) const NO_THREAD_SAFETY_ANALYSIS;
+    CAmount GetAvailableCredit(interfaces::Chain::Lock& locked_chain, bool fUseCache=true, const isminefilter& filter=ISMINE_SPENDABLE, int min_depth = 0) const NO_THREAD_SAFETY_ANALYSIS;
     CAmount GetImmatureWatchOnlyCredit(interfaces::Chain::Lock& locked_chain, const bool fUseCache=true) const;
     CAmount GetChange() const;
 
@@ -815,7 +815,7 @@ class CWallet final : public CCryptoKeyStore, public CValidationInterface
     bool SelectCoinsMinConf(const CAmount& nTargetValue, const CoinEligibilityFilter& eligibility_filter, std::vector<OutputGroup> groups,
         std::set<CInputCoin>& setCoinsRet, CAmount& nValueRet, const CoinSelectionParams& coin_selection_params, bool& bnb_used) const;
 
-    bool IsSpent(interfaces::Chain::Lock& locked_chain, const uint256& hash, unsigned int n) const EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);
+    bool IsSpent(interfaces::Chain::Lock& locked_chain, const uint256& hash, unsigned int n, int min_depth = 0) const EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);
     std::vector<OutputGroup> GroupOutputs(const std::vector<COutput>& outputs, bool single_coin) const;
 
     bool IsLockedCoin(uint256 hash, unsigned int n) const EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);

Original file line number	Diff line number	Diff line change
`@@ -594,7 +594,7 @@ void CWallet::SyncMetaData(std::pair<TxSpends::iterator, TxSpends::iterator> ran`
`594`	`594`	`* Outpoint is spent if any non-conflicted transaction`
`595`	`595`	`* spends it:`
`596`	`596`	`*/`
`597`		`-bool CWallet::IsSpent(interfaces::Chain::Lock& locked_chain, const uint256& hash, unsigned int n) const`
	`597`	`+bool CWallet::IsSpent(interfaces::Chain::Lock& locked_chain, const uint256& hash, unsigned int n, const int min_depth) const`
`598`	`598`	`{`
`599`	`599`	`const COutPoint outpoint(hash, n);`
`600`	`600`	`std::pair<TxSpends::const_iterator, TxSpends::const_iterator> range;`
`@@ -606,6 +606,7 @@ bool CWallet::IsSpent(interfaces::Chain::Lock& locked_chain, const uint256& hash`
`606`	`606`	`std::map<uint256, CWalletTx>::const_iterator mit = mapWallet.find(wtxid);`
`607`	`607`	`if (mit != mapWallet.end()) {`
`608`	`608`	`int depth = mit->second.GetDepthInMainChain(locked_chain);`
	`609`	`+ if (depth < min_depth) continue;`
`609`	`610`	`if (depth > 0 \|\| (depth == 0 && !mit->second.isAbandoned()))`
`610`	`611`	`return true; // Spent`
`611`	`612`	`}`
`@@ -1861,7 +1862,7 @@ CAmount CWalletTx::GetImmatureCredit(interfaces::Chain::Lock& locked_chain, bool`
`1861`	`1862`	`return 0;`
`1862`	`1863`	`}`
`1863`	`1864`
`1864`		`-CAmount CWalletTx::GetAvailableCredit(interfaces::Chain::Lock& locked_chain, bool fUseCache, const isminefilter& filter) const`
	`1865`	`+CAmount CWalletTx::GetAvailableCredit(interfaces::Chain::Lock& locked_chain, bool fUseCache, const isminefilter& filter, const int min_depth) const`
`1865`	`1866`	`{`
`1866`	`1867`	`if (pwallet == nullptr)`
`1867`	`1868`	`return 0;`
`@@ -1889,7 +1890,7 @@ CAmount CWalletTx::GetAvailableCredit(interfaces::Chain::Lock& locked_chain, boo`
`1889`	`1890`	`uint256 hashTx = GetHash();`
`1890`	`1891`	`for (unsigned int i = 0; i < tx->vout.size(); i++)`
`1891`	`1892`	`{`
`1892`		`- if (!pwallet->IsSpent(locked_chain, hashTx, i))`
	`1893`	`+ if (!pwallet->IsSpent(locked_chain, hashTx, i, min_depth))`
`1893`	`1894`	`{`
`1894`	`1895`	`const CTxOut &txout = tx->vout[i];`
`1895`	`1896`	`nCredit += pwallet->GetCredit(txout, filter);`
`@@ -2054,7 +2055,7 @@ CAmount CWallet::GetBalance(const isminefilter& filter, const int min_depth, con`
`2054`	`2055`
`2055`	`2056`	`if (pcoin->GetDepthInMainChain(*locked_chain) < min_depth) continue;`
`2056`	`2057`
`2057`		`- nTotal += pcoin->GetAvailableCredit(*locked_chain, true, filter);`
	`2058`	`+ nTotal += pcoin->GetAvailableCredit(*locked_chain, true, filter, min_depth);`
`2058`	`2059`	`}`
`2059`	`2060`	`}`
`2060`	`2061`