Fix calculation of balances and available coins.

morcos · morcos · commit 68d4282774d6 · 2016-03-18T09:56:30.000-04:00
No longer consider coins which aren't in our mempool.

Add test for regression in abandonconflict.py
diff --git a/qa/rpc-tests/abandonconflict.py b/qa/rpc-tests/abandonconflict.py
@@ -83,6 +83,12 @@ def run_test(self):
         # inputs are still spent, but change not received
         newbalance = self.nodes[0].getbalance()
         assert(newbalance == balance - Decimal("24.9996"))
+        # Unconfirmed received funds that are not in mempool, also shouldn't show
+        # up in unconfirmed balance
+        unconfbalance = self.nodes[0].getunconfirmedbalance() + self.nodes[0].getbalance()
+        assert(unconfbalance == newbalance)
+        # Also shouldn't show up in listunspent
+        assert(not txABC2 in [utxo["txid"] for utxo in self.nodes[0].listunspent(0)])
         balance = newbalance
 
         # Abandon original transaction and verify inputs are available again
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -1578,7 +1578,7 @@ CAmount CWallet::GetUnconfirmedBalance() const
         for (map<uint256, CWalletTx>::const_iterator it = mapWallet.begin(); it != mapWallet.end(); ++it)
         {
             const CWalletTx* pcoin = &(*it).second;
-            if (!CheckFinalTx(*pcoin) || (!pcoin->IsTrusted() && pcoin->GetDepthInMainChain() == 0))
+            if (!pcoin->IsTrusted() && pcoin->GetDepthInMainChain() == 0 && pcoin->InMempool())
                 nTotal += pcoin->GetAvailableCredit();
         }
     }
@@ -1623,7 +1623,7 @@ CAmount CWallet::GetUnconfirmedWatchOnlyBalance() const
         for (map<uint256, CWalletTx>::const_iterator it = mapWallet.begin(); it != mapWallet.end(); ++it)
         {
             const CWalletTx* pcoin = &(*it).second;
-            if (!CheckFinalTx(*pcoin) || (!pcoin->IsTrusted() && pcoin->GetDepthInMainChain() == 0))
+            if (!pcoin->IsTrusted() && pcoin->GetDepthInMainChain() == 0 && pcoin->InMempool())
                 nTotal += pcoin->GetAvailableWatchOnlyCredit();
         }
     }
@@ -1668,6 +1668,11 @@ void CWallet::AvailableCoins(vector<COutput>& vCoins, bool fOnlyConfirmed, const
             if (nDepth < 0)
                 continue;
 
+            // We should not consider coins which aren't at least in our mempool
+            // It's possible for these to be conflicted via ancestors which we may never be able to detect
+            if (nDepth == 0 && !pcoin->InMempool())
+                continue;
+
             for (unsigned int i = 0; i < pcoin->vout.size(); i++) {
                 isminetype mine = IsMine(pcoin->vout[i]);
                 if (!(IsSpent(wtxid, i)) && mine != ISMINE_NO &&

Original file line number	Diff line number	Diff line change
`@@ -1578,7 +1578,7 @@ CAmount CWallet::GetUnconfirmedBalance() const`
`1578`	`1578`	`for (map<uint256, CWalletTx>::const_iterator it = mapWallet.begin(); it != mapWallet.end(); ++it)`
`1579`	`1579`	`{`
`1580`	`1580`	`const CWalletTx* pcoin = &(*it).second;`
`1581`		`- if (!CheckFinalTx(*pcoin) \|\| (!pcoin->IsTrusted() && pcoin->GetDepthInMainChain() == 0))`
	`1581`	`+ if (!pcoin->IsTrusted() && pcoin->GetDepthInMainChain() == 0 && pcoin->InMempool())`
`1582`	`1582`	`nTotal += pcoin->GetAvailableCredit();`
`1583`	`1583`	`}`
`1584`	`1584`	`}`
`@@ -1623,7 +1623,7 @@ CAmount CWallet::GetUnconfirmedWatchOnlyBalance() const`
`1623`	`1623`	`for (map<uint256, CWalletTx>::const_iterator it = mapWallet.begin(); it != mapWallet.end(); ++it)`
`1624`	`1624`	`{`
`1625`	`1625`	`const CWalletTx* pcoin = &(*it).second;`
`1626`		`- if (!CheckFinalTx(*pcoin) \|\| (!pcoin->IsTrusted() && pcoin->GetDepthInMainChain() == 0))`
	`1626`	`+ if (!pcoin->IsTrusted() && pcoin->GetDepthInMainChain() == 0 && pcoin->InMempool())`
`1627`	`1627`	`nTotal += pcoin->GetAvailableWatchOnlyCredit();`
`1628`	`1628`	`}`
`1629`	`1629`	`}`
`@@ -1668,6 +1668,11 @@ void CWallet::AvailableCoins(vector<COutput>& vCoins, bool fOnlyConfirmed, const`
`1668`	`1668`	`if (nDepth < 0)`
`1669`	`1669`	`continue;`
`1670`	`1670`
	`1671`	`+ // We should not consider coins which aren't at least in our mempool`
	`1672`	`+ // It's possible for these to be conflicted via ancestors which we may never be able to detect`
	`1673`	`+ if (nDepth == 0 && !pcoin->InMempool())`
	`1674`	`+ continue;`
	`1675`	`+`
`1671`	`1676`	`for (unsigned int i = 0; i < pcoin->vout.size(); i++) {`
`1672`	`1677`	`isminetype mine = IsMine(pcoin->vout[i]);`
`1673`	`1678`	`if (!(IsSpent(wtxid, i)) && mine != ISMINE_NO &&`