neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Add collateraladdress into masternode/protx list rpc output (#2740)

Browse Source
This commit is contained in:
UdjinM6 2019-03-06 10:01:03 +03:00 committed by Alexander Block
parent 43612a2720
commit a11e2f9eba
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/evo/deterministicmns.cpp
View File

@ -83,6 +83,15 @@ void CDeterministicMN::ToJson(UniValue& obj) const
obj.push_back(Pair("proTxHash", proTxHash.ToString())); obj.push_back(Pair("proTxHash", proTxHash.ToString()));
obj.push_back(Pair("collateralHash", collateralOutpoint.hash.ToString())); obj.push_back(Pair("collateralHash", collateralOutpoint.hash.ToString()));
obj.push_back(Pair("collateralIndex", (int)collateralOutpoint.n)); obj.push_back(Pair("collateralIndex", (int)collateralOutpoint.n));
Coin coin;
if (GetUTXOCoin(collateralOutpoint, coin)) {
CTxDestination dest;
if (ExtractDestination(coin.out.scriptPubKey, dest)) {
obj.push_back(Pair("collateralAddress", CBitcoinAddress(dest).ToString()));
}
}
obj.push_back(Pair("operatorReward", (double)nOperatorReward / 100)); obj.push_back(Pair("operatorReward", (double)nOperatorReward / 100));
obj.push_back(Pair("state", stateObj)); obj.push_back(Pair("state", stateObj));
} }

15
src/rpc/masternode.cpp
View File

@ -890,17 +890,26 @@ UniValue masternodelist(const JSONRPCRequest& request)
std::string strOutpoint = mnpair.first.ToStringShort(); std::string strOutpoint = mnpair.first.ToStringShort();
CScript payeeScript; CScript payeeScript;
std::string collateralAddressStr = "UNKNOWN";
if (deterministicMNManager->IsDeterministicMNsSporkActive()) { if (deterministicMNManager->IsDeterministicMNsSporkActive()) {
auto dmn = deterministicMNManager->GetListAtChainTip().GetMNByCollateral(mn.outpoint); auto dmn = deterministicMNManager->GetListAtChainTip().GetMNByCollateral(mn.outpoint);
if (dmn) { if (dmn) {
payeeScript = dmn->pdmnState->scriptPayout; payeeScript = dmn->pdmnState->scriptPayout;
Coin coin;
if (GetUTXOCoin(dmn->collateralOutpoint, coin)) {
CTxDestination collateralDest;
if (ExtractDestination(coin.out.scriptPubKey, collateralDest)) {
collateralAddressStr = CBitcoinAddress(collateralDest).ToString();
}
}
} }
} else { } else {
payeeScript = GetScriptForDestination(mn.keyIDCollateralAddress); payeeScript = GetScriptForDestination(mn.keyIDCollateralAddress);
collateralAddressStr = CBitcoinAddress(mn.keyIDCollateralAddress).ToString();
} }
CTxDestination payeeDest; CTxDestination payeeDest;
std::string payeeStr = "UNKOWN"; std::string payeeStr = "UNKNOWN";
if (ExtractDestination(payeeScript, payeeDest)) { if (ExtractDestination(payeeScript, payeeDest)) {
payeeStr = CBitcoinAddress(payeeDest).ToString(); payeeStr = CBitcoinAddress(payeeDest).ToString();
} }
@ -965,7 +974,8 @@ UniValue masternodelist(const JSONRPCRequest& request)
(int64_t)mn.lastPing.sigTime << " " << (int64_t)mn.lastPing.sigTime << " " <<
(int64_t)(mn.lastPing.sigTime - mn.sigTime) << " " << (int64_t)(mn.lastPing.sigTime - mn.sigTime) << " " <<
mn.GetLastPaidTime() << " " << mn.GetLastPaidTime() << " " <<
mn.GetLastPaidBlock(); mn.GetLastPaidBlock() << " " <<
collateralAddressStr;
std::string strInfo = streamInfo.str(); std::string strInfo = streamInfo.str();
if (strFilter !="" && strInfo.find(strFilter) == std::string::npos && if (strFilter !="" && strInfo.find(strFilter) == std::string::npos &&
strOutpoint.find(strFilter) == std::string::npos) continue; strOutpoint.find(strFilter) == std::string::npos) continue;
@ -983,6 +993,7 @@ UniValue masternodelist(const JSONRPCRequest& request)
objMN.push_back(Pair("lastpaidblock", mn.GetLastPaidBlock())); objMN.push_back(Pair("lastpaidblock", mn.GetLastPaidBlock()));
objMN.push_back(Pair("owneraddress", CBitcoinAddress(mn.keyIDOwner).ToString())); objMN.push_back(Pair("owneraddress", CBitcoinAddress(mn.keyIDOwner).ToString()));
objMN.push_back(Pair("votingaddress", CBitcoinAddress(mn.keyIDVoting).ToString())); objMN.push_back(Pair("votingaddress", CBitcoinAddress(mn.keyIDVoting).ToString()));
objMN.push_back(Pair("collateraladdress", collateralAddressStr));
obj.push_back(Pair(strOutpoint, objMN)); obj.push_back(Pair(strOutpoint, objMN));
} else if (strMode == "keyid") { } else if (strMode == "keyid") {
if (strFilter !="" && strOutpoint.find(strFilter) == std::string::npos) continue; if (strFilter !="" && strOutpoint.find(strFilter) == std::string::npos) continue;