sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-26 20:42:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove compatibility code from governance RPCs and directly use deterministicMNManager

Browse Source
This commit is contained in:
Alexander Block 2018-12-17 14:00:19 +01:00
parent b49ef5d712
commit bc29fe160e
1 changed files with 62 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

201
src/rpc/governance.cpp
View File

@ -412,10 +412,9 @@ UniValue gobject_vote_conf(const JSONRPCRequest& request)
UniValue statusObj(UniValue::VOBJ); UniValue statusObj(UniValue::VOBJ);
UniValue returnObj(UniValue::VOBJ); UniValue returnObj(UniValue::VOBJ);
CMasternode mn; auto dmn = deterministicMNManager->GetListAtChainTip().GetValidMNByCollateral(activeMasternodeInfo.outpoint);
bool fMnFound = mnodeman.Get(activeMasternodeInfo.outpoint, mn);
if (!fMnFound) { if (!dmn) {
nFailed++; nFailed++;
statusObj.push_back(Pair("result", "failed")); statusObj.push_back(Pair("result", "failed"));
statusObj.push_back(Pair("errorMessage", "Can't find masternode by collateral output")); statusObj.push_back(Pair("errorMessage", "Can't find masternode by collateral output"));
@ -425,19 +424,16 @@ UniValue gobject_vote_conf(const JSONRPCRequest& request)
return returnObj; return returnObj;
} }
CGovernanceVote vote(mn.outpoint, hash, eVoteSignal, eVoteOutcome); CGovernanceVote vote(dmn->collateralOutpoint, hash, eVoteSignal, eVoteOutcome);
bool signSuccess = false; bool signSuccess = false;
if (deterministicMNManager->IsDIP3Active()) { if (govObjType == GOVERNANCE_OBJECT_PROPOSAL && eVoteSignal == VOTE_SIGNAL_FUNDING) {
if (govObjType == GOVERNANCE_OBJECT_PROPOSAL && eVoteSignal == VOTE_SIGNAL_FUNDING) { throw JSONRPCError(RPC_INVALID_PARAMETER, "Can't use vote-conf for proposals");
throw JSONRPCError(RPC_INVALID_PARAMETER, "Can't use vote-conf for proposals when deterministic masternodes are active");
}
if (activeMasternodeInfo.blsKeyOperator) {
signSuccess = vote.Sign(*activeMasternodeInfo.blsKeyOperator);
}
} else {
signSuccess = vote.Sign(activeMasternodeInfo.legacyKeyOperator, activeMasternodeInfo.legacyKeyIDOperator);
} }
if (activeMasternodeInfo.blsKeyOperator) {
signSuccess = vote.Sign(*activeMasternodeInfo.blsKeyOperator);
}
if (!signSuccess) { if (!signSuccess) {
nFailed++; nFailed++;
statusObj.push_back(Pair("result", "failed")); statusObj.push_back(Pair("result", "failed"));
@ -466,9 +462,9 @@ UniValue gobject_vote_conf(const JSONRPCRequest& request)
return returnObj; return returnObj;
} }
UniValue VoteWithMasternodeList(const std::vector<CMasternodeConfig::CMasternodeEntry>& entries, UniValue VoteWithMasternodes(const std::map<uint256, CKey>& keys,
const uint256& hash, vote_signal_enum_t eVoteSignal, const uint256& hash, vote_signal_enum_t eVoteSignal,
vote_outcome_enum_t eVoteOutcome) vote_outcome_enum_t eVoteOutcome)
{ {
int govObjType; int govObjType;
{ {
@ -483,59 +479,31 @@ UniValue VoteWithMasternodeList(const std::vector<CMasternodeConfig::CMasternode
int nSuccessful = 0; int nSuccessful = 0;
int nFailed = 0; int nFailed = 0;
auto mnList = deterministicMNManager->GetListAtChainTip();
UniValue resultsObj(UniValue::VOBJ); UniValue resultsObj(UniValue::VOBJ);
for (const auto& mne : entries) { for (const auto& p : keys) {
CPubKey pubKeyOperator; const auto& proTxHash = p.first;
CKey keyOperator; const auto& key = p.second;
UniValue statusObj(UniValue::VOBJ); UniValue statusObj(UniValue::VOBJ);
if (!CMessageSigner::GetKeysFromSecret(mne.getPrivKey(), keyOperator, pubKeyOperator)) { auto dmn = mnList.GetValidMN(proTxHash);
if (!dmn) {
nFailed++; nFailed++;
statusObj.push_back(Pair("result", "failed")); statusObj.push_back(Pair("result", "failed"));
statusObj.push_back(Pair("errorMessage", "Masternode signing error, could not set key correctly")); statusObj.push_back(Pair("errorMessage", "Can't find masternode by proTxHash"));
resultsObj.push_back(Pair(mne.getAlias(), statusObj)); resultsObj.push_back(Pair(proTxHash.ToString(), statusObj));
continue; continue;
} }
uint256 nTxHash; CGovernanceVote vote(dmn->collateralOutpoint, hash, eVoteSignal, eVoteOutcome);
nTxHash.SetHex(mne.getTxHash()); if (!vote.Sign(key, key.GetPubKey().GetID())) {
int nOutputIndex = 0;
if (!ParseInt32(mne.getOutputIndex(), &nOutputIndex)) {
continue;
}
COutPoint outpoint(nTxHash, nOutputIndex);
CMasternode mn;
bool fMnFound = mnodeman.Get(outpoint, mn);
if (!fMnFound) {
nFailed++;
statusObj.push_back(Pair("result", "failed"));
statusObj.push_back(Pair("errorMessage", "Can't find masternode by collateral output"));
resultsObj.push_back(Pair(mne.getAlias(), statusObj));
continue;
}
if (deterministicMNManager->IsDIP3Active()) {
if (govObjType == GOVERNANCE_OBJECT_PROPOSAL && mn.keyIDVoting != pubKeyOperator.GetID()) {
nFailed++;
statusObj.push_back(Pair("result", "failed"));
statusObj.push_back(Pair("errorMessage", "Can't vote on proposal when key does not match voting key"));
resultsObj.push_back(Pair(mne.getAlias(), statusObj));
continue;
}
}
CGovernanceVote vote(mn.outpoint, hash, eVoteSignal, eVoteOutcome);
if (!vote.Sign(keyOperator, pubKeyOperator.GetID())) {
nFailed++; nFailed++;
statusObj.push_back(Pair("result", "failed")); statusObj.push_back(Pair("result", "failed"));
statusObj.push_back(Pair("errorMessage", "Failure to sign.")); statusObj.push_back(Pair("errorMessage", "Failure to sign."));
resultsObj.push_back(Pair(mne.getAlias(), statusObj)); resultsObj.push_back(Pair(proTxHash.ToString(), statusObj));
continue; continue;
} }
@ -549,7 +517,7 @@ UniValue VoteWithMasternodeList(const std::vector<CMasternodeConfig::CMasternode
statusObj.push_back(Pair("errorMessage", exception.GetMessage())); statusObj.push_back(Pair("errorMessage", exception.GetMessage()));
} }
resultsObj.push_back(Pair(mne.getAlias(), statusObj)); resultsObj.push_back(Pair(proTxHash.ToString(), statusObj));
} }
UniValue returnObj(UniValue::VOBJ); UniValue returnObj(UniValue::VOBJ);
@ -559,11 +527,12 @@ UniValue VoteWithMasternodeList(const std::vector<CMasternodeConfig::CMasternode
return returnObj; return returnObj;
} }
#ifdef ENABLE_WALLET
void gobject_vote_many_help() void gobject_vote_many_help()
{ {
throw std::runtime_error( throw std::runtime_error(
"gobject vote-many <governance-hash> <vote> <vote-outcome>\n" "gobject vote-many <governance-hash> <vote> <vote-outcome>\n"
"Vote on a governance object by all masternodes (using masternode.conf setup)\n" "Vote on a governance object by all masternodes for which the voting key is present in the local wallet\n"
"\nArguments:\n" "\nArguments:\n"
"1. governance-hash (string, required) hash of the governance object\n" "1. governance-hash (string, required) hash of the governance object\n"
"2. vote (string, required) vote, possible values: [funding|valid|delete|endorsed]\n" "2. vote (string, required) vote, possible values: [funding|valid|delete|endorsed]\n"
@ -592,66 +561,33 @@ UniValue gobject_vote_many(const JSONRPCRequest& request)
throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid vote outcome. Please use one of the following: 'yes', 'no' or 'abstain'"); throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid vote outcome. Please use one of the following: 'yes', 'no' or 'abstain'");
} }
std::vector<CMasternodeConfig::CMasternodeEntry> entries = masternodeConfig.getEntries(); if (!pwalletMain) {
#ifdef ENABLE_WALLET
// This is a hack to maintain code-level backwards compatibility with masternode.conf and the deterministic masternodes.
// Deterministic masternode keys are managed inside the wallet instead of masternode.conf
// This allows voting on proposals when you have the MN voting key in your wallet
// We can remove this when we remove support for masternode.conf and only support wallet based masternode
// management
if (deterministicMNManager->IsDIP3Active()) {
if (!pwalletMain) {
throw JSONRPCError(RPC_INVALID_PARAMETER, "vote-many not supported when wallet is disabled.");
}
entries.clear();
auto mnList = deterministicMNManager->GetListAtChainTip();
mnList.ForEachMN(true, [&](const CDeterministicMNCPtr& dmn) {
bool found = false;
for (const auto &mne : entries) {
uint256 nTxHash;
nTxHash.SetHex(mne.getTxHash());
int nOutputIndex = 0;
if(!ParseInt32(mne.getOutputIndex(), &nOutputIndex)) {
continue;
}
if (nTxHash == dmn->collateralOutpoint.hash && (uint32_t)nOutputIndex == dmn->collateralOutpoint.n) {
found = true;
break;
}
}
if (!found) {
CKey ownerKey;
if (pwalletMain->GetKey(dmn->pdmnState->keyIDVoting, ownerKey)) {
CBitcoinSecret secret(ownerKey);
CMasternodeConfig::CMasternodeEntry mne(dmn->proTxHash.ToString(), dmn->pdmnState->addr.ToStringIPPort(false), secret.ToString(), dmn->collateralOutpoint.hash.ToString(), itostr(dmn->collateralOutpoint.n));
entries.push_back(mne);
}
}
});
}
#else
if (deterministicMNManager->IsDIP3Active()) {
throw JSONRPCError(RPC_INVALID_PARAMETER, "vote-many not supported when wallet is disabled."); throw JSONRPCError(RPC_INVALID_PARAMETER, "vote-many not supported when wallet is disabled.");
} }
#endif
return VoteWithMasternodeList(entries, hash, eVoteSignal, eVoteOutcome); std::map<uint256, CKey> votingKeys;
auto mnList = deterministicMNManager->GetListAtChainTip();
mnList.ForEachMN(true, [&](const CDeterministicMNCPtr& dmn) {
CKey votingKey;
if (pwalletMain->GetKey(dmn->pdmnState->keyIDVoting, votingKey)) {
votingKeys.emplace(dmn->proTxHash, votingKey);
}
});
return VoteWithMasternodes(votingKeys, hash, eVoteSignal, eVoteOutcome);
} }
void gobject_vote_alias_help() void gobject_vote_alias_help()
{ {
throw std::runtime_error( throw std::runtime_error(
"gobject vote-alias <governance-hash> <vote> <vote-outcome> <alias-name>\n" "gobject vote-alias <governance-hash> <vote> <vote-outcome> <alias-name>\n"
"Vote on a governance object by masternode alias (using masternode.conf setup)\n" "Vote on a governance object by masternode's voting key (if present in local wallet)\n"
"\nArguments:\n" "\nArguments:\n"
"1. governance-hash (string, required) hash of the governance object\n" "1. governance-hash (string, required) hash of the governance object\n"
"2. vote (string, required) vote, possible values: [funding|valid|delete|endorsed]\n" "2. vote (string, required) vote, possible values: [funding|valid|delete|endorsed]\n"
"3. vote-outcome (string, required) vote outcome, possible values: [yes|no|abstain]\n" "3. vote-outcome (string, required) vote outcome, possible values: [yes|no|abstain]\n"
"4. alias-name (string, required) masternode alias or proTxHash after DIP3 activation" "4. protx-hash (string, required) masternode's proTxHash"
); );
} }
@ -676,41 +612,27 @@ UniValue gobject_vote_alias(const JSONRPCRequest& request)
throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid vote outcome. Please use one of the following: 'yes', 'no' or 'abstain'"); throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid vote outcome. Please use one of the following: 'yes', 'no' or 'abstain'");
} }
std::vector<CMasternodeConfig::CMasternodeEntry> entries; if (!pwalletMain) {
if (deterministicMNManager->IsDIP3Active()) {
#ifdef ENABLE_WALLET
if (!pwalletMain) {
throw JSONRPCError(RPC_INVALID_PARAMETER, "vote-alias not supported when wallet is disabled");
}
uint256 proTxHash = ParseHashV(request.params[4], "alias-name");
auto dmn = deterministicMNManager->GetListAtChainTip().GetValidMN(proTxHash);
if (!dmn) {
throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid or unknown proTxHash");
}
CKey votingKey;
if (!pwalletMain->GetKey(dmn->pdmnState->keyIDVoting, votingKey)) {
throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Voting ekey %s not known by wallet", CBitcoinAddress(dmn->pdmnState->keyIDVoting).ToString()));
}
CBitcoinSecret secret(votingKey);
CMasternodeConfig::CMasternodeEntry mne(dmn->proTxHash.ToString(), dmn->pdmnState->addr.ToStringIPPort(false), secret.ToString(), dmn->collateralOutpoint.hash.ToString(), itostr(dmn->collateralOutpoint.n));
entries.push_back(mne);
#else
throw JSONRPCError(RPC_INVALID_PARAMETER, "vote-alias not supported when wallet is disabled"); throw JSONRPCError(RPC_INVALID_PARAMETER, "vote-alias not supported when wallet is disabled");
#endif
} else {
std::string strAlias = request.params[4].get_str();
for (const auto& mne : masternodeConfig.getEntries()) {
if (strAlias == mne.getAlias())
entries.push_back(mne);
}
} }
return VoteWithMasternodeList(entries, hash, eVoteSignal, eVoteOutcome); uint256 proTxHash = ParseHashV(request.params[4], "protx-hash");
auto dmn = deterministicMNManager->GetListAtChainTip().GetValidMN(proTxHash);
if (!dmn) {
throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid or unknown proTxHash");
}
CKey votingKey;
if (!pwalletMain->GetKey(dmn->pdmnState->keyIDVoting, votingKey)) {
throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Voting key %s not known by wallet", CBitcoinAddress(dmn->pdmnState->keyIDVoting).ToString()));
}
std::map<uint256, CKey> votingKeys;
votingKeys.emplace(proTxHash, votingKey);
return VoteWithMasternodes(votingKeys, hash, eVoteSignal, eVoteOutcome);
} }
#endif
UniValue ListObjects(const std::string& strCachedSignal, const std::string& strType, int nStartTime) UniValue ListObjects(const std::string& strCachedSignal, const std::string& strType, int nStartTime)
{ {
@ -1063,10 +985,12 @@ UniValue gobject(const JSONRPCRequest& request)
return gobject_submit(request); return gobject_submit(request);
} else if (strCommand == "vote-conf") { } else if (strCommand == "vote-conf") {
return gobject_vote_conf(request); return gobject_vote_conf(request);
#ifdef ENABLE_WALLET
} else if (strCommand == "vote-many") { } else if (strCommand == "vote-many") {
return gobject_vote_many(request); return gobject_vote_many(request);
} else if (strCommand == "vote-alias") { } else if (strCommand == "vote-alias") {
return gobject_vote_alias(request); return gobject_vote_alias(request);
#endif
} else if (strCommand == "list") { } else if (strCommand == "list") {
// USERS CAN QUERY THE SYSTEM FOR A LIST OF VARIOUS GOVERNANCE ITEMS // USERS CAN QUERY THE SYSTEM FOR A LIST OF VARIOUS GOVERNANCE ITEMS
return gobject_list(request); return gobject_list(request);
@ -1133,10 +1057,9 @@ UniValue voteraw(const JSONRPCRequest& request)
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Malformed base64 encoding"); throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Malformed base64 encoding");
} }
CMasternode mn; auto dmn = deterministicMNManager->GetListAtChainTip().GetValidMNByCollateral(outpoint);
bool fMnFound = mnodeman.Get(outpoint, mn);
if (!fMnFound) { if (!dmn) {
throw JSONRPCError(RPC_INTERNAL_ERROR, "Failure to find masternode in list : " + outpoint.ToStringShort()); throw JSONRPCError(RPC_INTERNAL_ERROR, "Failure to find masternode in list : " + outpoint.ToStringShort());
} }