From 88d0c5b0500a77058a0f5921fb76288f9161b4d5 Mon Sep 17 00:00:00 2001 From: madagaga Date: Sat, 9 Jun 2018 23:14:00 +0200 Subject: [PATCH] Revert "Do not add locked outputs to AvailableCoins" --- src/rpc/masternode.cpp | 2 +- src/wallet/wallet.cpp | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/rpc/masternode.cpp b/src/rpc/masternode.cpp index 5c22ac4e63e2b..d0fb9a448a402 100644 --- a/src/rpc/masternode.cpp +++ b/src/rpc/masternode.cpp @@ -138,7 +138,7 @@ UniValue masternode(const UniValue& params, bool fHelp) " current - Print info on current masternode winner to be paid the next block (calculated locally)\n" " genkey - Generate new masternodeprivkey\n" #ifdef ENABLE_WALLET - " outputs - Print masternode compatible (unlocked) outputs\n" + " outputs - Print masternode compatible outputs\n" " start-alias - Start single remote masternode by assigned alias configured in masternode.conf\n" " start- - Start remote masternodes configured in masternode.conf (: 'all', 'missing', 'disabled')\n" #endif // ENABLE_WALLET diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index ac595916be804..39ec3b9fa3331 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -2395,10 +2395,7 @@ void CWallet::AvailableCoins(vector& vCoins, bool fOnlyConfirmed, const found = true; } if(!found) continue; - // Do not add locked coins - if(IsLockedCoin((*it).first, i)) - continue; - + isminetype mine = IsMine(pcoin->vout[i]); if (!(IsSpent(wtxid, i)) && mine != ISMINE_NO && (!IsLockedCoin((*it).first, i) || nCoinType == ONLY_1000) &&