From 2cd9be7e7afda882bddc522d55158ac9e592ac8e Mon Sep 17 00:00:00 2001 From: grapeLux2 Date: Fri, 17 Jan 2020 17:58:33 +0000 Subject: [PATCH 1/2] remove duplicate code --- src/rpcdarksend.cpp | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/src/rpcdarksend.cpp b/src/rpcdarksend.cpp index 2b7a7abc..ec0ee572 100644 --- a/src/rpcdarksend.cpp +++ b/src/rpcdarksend.cpp @@ -565,20 +565,7 @@ UniValue masternode(const UniValue& params, bool fHelp) { return resultObj; } - - if (strCommand == "outputs") { - // Find possible candidates - vector possibleCoins = activeMasternode.SelectCoinsMasternode(); - - UniValue obj(UniValue::VOBJ); - for (COutput& out : possibleCoins) { - obj.push_back(Pair(out.tx->GetHash().ToString().c_str(), boost::lexical_cast(out.i))); - } - - return obj; - - } - + return NullUniValue; } From 5233ac6ab80020297ce0968b6003f5a2b322e48f Mon Sep 17 00:00:00 2001 From: grape_lux 2 <33639665+grapeLux2@users.noreply.github.com> Date: Fri, 17 Jan 2020 23:10:23 +0000 Subject: [PATCH 2/2] [RPC] masternode output: include alias name in order to identify easily which TXID belongs to which alias name --- src/rpcdarksend.cpp | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/src/rpcdarksend.cpp b/src/rpcdarksend.cpp index ec0ee572..338feae7 100644 --- a/src/rpcdarksend.cpp +++ b/src/rpcdarksend.cpp @@ -475,14 +475,26 @@ UniValue masternode(const UniValue& params, bool fHelp) { } } - if (strCommand == "outputs"){ + if (strCommand == "outputs") { // Find possible candidates vector possibleCoins = activeMasternode.SelectCoinsMasternode(); - UniValue obj(UniValue::VOBJ); - for (const auto& out : possibleCoins) { - obj.push_back(Pair(out.tx->GetHash().ToString().c_str(), boost::lexical_cast(out.i))); + + for (COutput& out : possibleCoins) { + + for (CMasternodeConfig::CMasternodeEntry mne : masternodeConfig.getEntries()) { // check if the TXID is currently in masternode.conf, + + std::string MNC = mne.getTxHash(); // TXID from masternode in masternode.conf + std::string possibleMN = out.tx->GetHash().ToString(); // TXID for 16120 LUX tx + if (possibleMN==MNC){ + obj.push_back(Pair(out.tx->GetHash().ToString().c_str(), boost::lexical_cast(out.i) + " TXID is being used by a MN in your wallet," + " MN alias = " + mne.getAlias().c_str()) ); + }else{ + obj.push_back(Pair(out.tx->GetHash().ToString().c_str(), boost::lexical_cast(out.i))); + } + } + } + return obj; }