Fixes to rpcgovernance.cpp (#1030)
* Fixes to rpcgovernance.cpp - Replaced use of non-unique public key with vin in vote-conf, vote-alias and vote-many - Replaced use of non-threadsafe CmasternodeMan::Find function with Get - Added LOCK(cs_main) to getgovernanceinfo * Fixed rpcgovernance.cpp voting error messages
This commit is contained in:
parent
fcb985a93f
commit
ce28ad4206
@ -250,20 +250,20 @@ UniValue gobject(const UniValue& params, bool fHelp)
|
||||
UniValue statusObj(UniValue::VOBJ);
|
||||
UniValue returnObj(UniValue::VOBJ);
|
||||
|
||||
CMasternode* pmn = mnodeman.Find(activeMasternode.pubKeyMasternode);
|
||||
if(pmn == NULL)
|
||||
{
|
||||
CMasternode mn;
|
||||
bool mnFound = mnodeman.Get(activeMasternode.vin, mn);
|
||||
|
||||
if(!mnFound) {
|
||||
failed++;
|
||||
statusObj.push_back(Pair("result", "failed"));
|
||||
statusObj.push_back(Pair("errorMessage", "Can't find masternode by pubkey"));
|
||||
statusObj.push_back(Pair("errorMessage", "Can't find masternode by collateral output"));
|
||||
resultsObj.push_back(Pair("dash.conf", statusObj));
|
||||
|
||||
returnObj.push_back(Pair("overall", strprintf("Voted successfully %d time(s) and failed %d time(s).", success, failed)));
|
||||
returnObj.push_back(Pair("detail", resultsObj));
|
||||
return returnObj;
|
||||
}
|
||||
|
||||
CGovernanceVote vote(pmn->vin, hash, eVoteSignal, eVoteOutcome);
|
||||
CGovernanceVote vote(mn.vin, hash, eVoteSignal, eVoteOutcome);
|
||||
if(!vote.Sign(activeMasternode.keyMasternode, activeMasternode.pubKeyMasternode)) {
|
||||
failed++;
|
||||
statusObj.push_back(Pair("result", "failed"));
|
||||
@ -347,17 +347,28 @@ UniValue gobject(const UniValue& params, bool fHelp)
|
||||
continue;
|
||||
}
|
||||
|
||||
CMasternode* pmn = mnodeman.Find(pubKeyMasternode);
|
||||
if(pmn == NULL)
|
||||
{
|
||||
uint256 nTxHash;
|
||||
nTxHash.SetHex(mne.getTxHash());
|
||||
|
||||
int nOutputIndex = 0;
|
||||
if(!ParseInt32(mne.getOutputIndex(), &nOutputIndex)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
CTxIn vin(COutPoint(nTxHash, nOutputIndex));
|
||||
|
||||
CMasternode mn;
|
||||
bool mnFound = mnodeman.Get(vin, mn);
|
||||
|
||||
if(!mnFound) {
|
||||
failed++;
|
||||
statusObj.push_back(Pair("result", "failed"));
|
||||
statusObj.push_back(Pair("errorMessage", "Can't find masternode by pubkey"));
|
||||
statusObj.push_back(Pair("errorMessage", "Can't find masternode by collateral output"));
|
||||
resultsObj.push_back(Pair(mne.getAlias(), statusObj));
|
||||
continue;
|
||||
}
|
||||
|
||||
CGovernanceVote vote(pmn->vin, hash, eVoteSignal, eVoteOutcome);
|
||||
CGovernanceVote vote(mn.vin, hash, eVoteSignal, eVoteOutcome);
|
||||
if(!vote.Sign(keyMasternode, pubKeyMasternode)){
|
||||
failed++;
|
||||
statusObj.push_back(Pair("result", "failed"));
|
||||
@ -457,8 +468,20 @@ UniValue gobject(const UniValue& params, bool fHelp)
|
||||
|
||||
// SEARCH FOR THIS MASTERNODE ON THE NETWORK, THE NODE MUST BE ACTIVE TO VOTE
|
||||
|
||||
CMasternode* pmn = mnodeman.Find(pubKeyMasternode);
|
||||
if(pmn == NULL) {
|
||||
uint256 nTxHash;
|
||||
nTxHash.SetHex(mne.getTxHash());
|
||||
|
||||
int nOutputIndex = 0;
|
||||
if(!ParseInt32(mne.getOutputIndex(), &nOutputIndex)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
CTxIn vin(COutPoint(nTxHash, nOutputIndex));
|
||||
|
||||
CMasternode mn;
|
||||
bool mnFound = mnodeman.Get(vin, mn);
|
||||
|
||||
if(!mnFound) {
|
||||
failed++;
|
||||
statusObj.push_back(Pair("result", "failed"));
|
||||
statusObj.push_back(Pair("errorMessage", "Masternode must be publically available on network to vote. Masternode not found."));
|
||||
@ -468,7 +491,7 @@ UniValue gobject(const UniValue& params, bool fHelp)
|
||||
|
||||
// CREATE NEW GOVERNANCE OBJECT VOTE WITH OUTCOME/SIGNAL
|
||||
|
||||
CGovernanceVote vote(pmn->vin, hash, eVoteSignal, eVoteOutcome);
|
||||
CGovernanceVote vote(vin, hash, eVoteSignal, eVoteOutcome);
|
||||
if(!vote.Sign(keyMasternode, pubKeyMasternode)) {
|
||||
failed++;
|
||||
statusObj.push_back(Pair("result", "failed"));
|
||||
@ -711,9 +734,10 @@ UniValue voteraw(const UniValue& params, bool fHelp)
|
||||
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Malformed base64 encoding");
|
||||
}
|
||||
|
||||
CMasternode* pmn = mnodeman.Find(vin);
|
||||
if(pmn == NULL)
|
||||
{
|
||||
CMasternode mn;
|
||||
bool mnFound = mnodeman.Get(vin, mn);
|
||||
|
||||
if(!mnFound) {
|
||||
throw JSONRPCError(RPC_INTERNAL_ERROR, "Failure to find masternode in list : " + vin.ToString());
|
||||
}
|
||||
|
||||
@ -759,7 +783,11 @@ UniValue getgovernanceinfo(const UniValue& params, bool fHelp)
|
||||
int nLastSuperblock, nNextSuperblock;
|
||||
|
||||
// Get current block height
|
||||
int nBlockHeight = (int)chainActive.Height();
|
||||
int nBlockHeight = 0;
|
||||
{
|
||||
LOCK(cs_main);
|
||||
nBlockHeight = (int)chainActive.Height();
|
||||
}
|
||||
|
||||
// Get chain parameters
|
||||
int nSuperblockStartBlock = Params().GetConsensus().nSuperblockStartBlock;
|
||||
|
Loading…
Reference in New Issue
Block a user