Merge pull request #12 from absolute-community/revert-11-revert-8-The…

…Caat-patch-1

Re-Apply "Do not list locked coins - take 2""

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 outputs\n"
+                "  outputs      - Print masternode compatible (unlocked) 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
@@ -376,6 +376,9 @@ UniValue masternode(const UniValue& params, bool fHelp)
 
         UniValue obj(UniValue::VOBJ);
         BOOST_FOREACH(COutput& out, vPossibleCoins) {
+	    // Do not add locked coins
+	    if(pwalletMain->IsLockedCoin(out.tx->GetHash(), out.i))
+	        continue;
             obj.push_back(Pair(out.tx->GetHash().ToString(), strprintf("%d", out.i)));
         }