Merge pull request #6 from absolute-community/revert-5-master

Revert "Do not add locked outputs to AvailableCoins"
absolute-community · Jun 9, 2018 · b4f16dc · b4f16dc
2 parents c208849 + 88d0c5b
commit b4f16dc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git 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-<mode> - Start remote masternodes configured in masternode.conf (<mode>: 'all', 'missing', 'disabled')\n"
 #endif // ENABLE_WALLET

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -2395,10 +2395,7 @@ void CWallet::AvailableCoins(vector<COutput>& 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) &&