Merge #7715: Fix calculation of balances and available coins.

68d4282 Fix calculation of balances and available coins. (Alex Morcos)
This commit is contained in:
Wladimir J. van der Laan 2016-03-23 15:07:30 +01:00 committed by Alexander Block
parent 760d58e3dc
commit f933c67266

View File

@ -2383,6 +2383,11 @@ void CWallet::AvailableCoins(vector<COutput>& vCoins, bool fOnlyConfirmed, const
if (nDepth == 0 && !pcoin->InMempool()) if (nDepth == 0 && !pcoin->InMempool())
continue; 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++) { for (unsigned int i = 0; i < pcoin->vout.size(); i++) {
bool found = false; bool found = false;
if(nCoinType == ONLY_DENOMINATED) { if(nCoinType == ONLY_DENOMINATED) {