From 7870406cf2791e8b4cc06afbbcb36108229c91e2 Mon Sep 17 00:00:00 2001 From: David Cachau Date: Fri, 29 Nov 2019 00:30:44 +0100 Subject: [PATCH 1/2] Return masternodes networks addresses --- src/rpcmasternode.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/rpcmasternode.cpp b/src/rpcmasternode.cpp index 3267b521..3d535983 100755 --- a/src/rpcmasternode.cpp +++ b/src/rpcmasternode.cpp @@ -240,16 +240,19 @@ Value masternode(const Array& params, bool fHelp) Value listmasternodes(const Array& params, bool fHelp) { std::string strFilter = ""; + bool returnNetworkAddress = false; - if (params.size() == 1) strFilter = params[0].get_str(); + if (params.size() >= 1) strFilter = params[0].get_str(); + if (params.size() == 2) returnNetworkAddress = (params[1].get_str() == "true" ? true : false); - if (fHelp || (params.size() > 1)) + if (fHelp || (params.size() > 2)) throw runtime_error( "listmasternodes ( \"filter\" )\n" "\nGet a ranked list of masternodes\n" "\nArguments:\n" "1. \"filter\" (string, optional) Filter search text. Partial match by txhash, status, or addr.\n" + "2. network (boolean, optional, default=false) Return the network address of masternodes.\n" "\nResult:\n" "[\n" @@ -302,6 +305,7 @@ Value listmasternodes(const Array& params, bool fHelp) obj.push_back(Pair("rank", (strStatus == "ENABLED" ? s.first : 0))); obj.push_back(Pair("network", strNetwork)); + if (returnNetworkAddress) obj.push_back(Pair("networkaddr", mn->addr.ToString())); obj.push_back(Pair("txhash", strTxHash)); obj.push_back(Pair("outidx", (uint64_t)oIdx)); obj.push_back(Pair("tier", (uint64_t)mn->tier)); From d230acbfc4b8ae16ad9ff8f255c5d95abed817bd Mon Sep 17 00:00:00 2001 From: David Cachau Date: Sun, 1 Dec 2019 12:16:00 +0100 Subject: [PATCH 2/2] Add network arg on command help for listmasternode --- src/rpcmasternode.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rpcmasternode.cpp b/src/rpcmasternode.cpp index 3d535983..aa5f1e43 100755 --- a/src/rpcmasternode.cpp +++ b/src/rpcmasternode.cpp @@ -247,7 +247,7 @@ Value listmasternodes(const Array& params, bool fHelp) if (fHelp || (params.size() > 2)) throw runtime_error( - "listmasternodes ( \"filter\" )\n" + "listmasternodes ( \"filter\" network )\n" "\nGet a ranked list of masternodes\n" "\nArguments:\n"