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

Define current votes by creation time instead of arrival time (#1360)

Browse Source
This commit is contained in:
Tim Flynn 2017-02-23 07:29:00 -05:00 committed by UdjinM6
parent 636fb33e71
commit 0bc6d92334
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/governance-object.cpp
View File

@ -140,6 +140,16 @@ bool CGovernanceObject::ProcessVote(CNode* pfrom,
it2 = recVote.mapInstances.insert(vote_instance_m_t::value_type(int(eSignal), vote_instance_t())).first; it2 = recVote.mapInstances.insert(vote_instance_m_t::value_type(int(eSignal), vote_instance_t())).first;
} }
vote_instance_t& voteInstance = it2->second; vote_instance_t& voteInstance = it2->second;
// Reject obsolete votes
if(vote.GetTimestamp() < voteInstance.nCreationTime) {
std::ostringstream ostr;
ostr << "CGovernanceObject::ProcessVote -- Obsolete vote" << "\n";
LogPrint("gobject", ostr.str().c_str());
exception = CGovernanceException(ostr.str(), GOVERNANCE_EXCEPTION_NONE);
return false;
}
int64_t nNow = GetTime(); int64_t nNow = GetTime();
int64_t nVoteTimeUpdate = voteInstance.nTime; int64_t nVoteTimeUpdate = voteInstance.nTime;
if(governance.AreRateChecksEnabled()) { if(governance.AreRateChecksEnabled()) {
@ -168,7 +178,7 @@ bool CGovernanceObject::ProcessVote(CNode* pfrom,
governance.AddInvalidVote(vote); governance.AddInvalidVote(vote);
return false; return false;
} }
voteInstance = vote_instance_t(vote.GetOutcome(), nVoteTimeUpdate); voteInstance = vote_instance_t(vote.GetOutcome(), nVoteTimeUpdate, vote.GetTimestamp());
fileVotes.AddVote(vote); fileVotes.AddVote(vote);
mnodeman.AddGovernanceVote(vote.GetVinMasternode(), vote.GetParentHash()); mnodeman.AddGovernanceVote(vote.GetVinMasternode(), vote.GetParentHash());
fDirtyCache = true; fDirtyCache = true;

7
src/governance-object.h
View File

@ -62,10 +62,12 @@ struct vote_instance_t {
vote_outcome_enum_t eOutcome; vote_outcome_enum_t eOutcome;
int64_t nTime; int64_t nTime;
int64_t nCreationTime;
vote_instance_t(vote_outcome_enum_t eOutcomeIn = VOTE_OUTCOME_NONE, int64_t nTimeIn = 0) vote_instance_t(vote_outcome_enum_t eOutcomeIn = VOTE_OUTCOME_NONE, int64_t nTimeIn = 0, int64_t nCreationTimeIn = 0)
: eOutcome(eOutcomeIn), : eOutcome(eOutcomeIn),
nTime(nTimeIn) nTime(nTimeIn),
nCreationTime(nCreationTimeIn)
{} {}
ADD_SERIALIZE_METHODS; ADD_SERIALIZE_METHODS;
@ -76,6 +78,7 @@ struct vote_instance_t {
int nOutcome = int(eOutcome); int nOutcome = int(eOutcome);
READWRITE(nOutcome); READWRITE(nOutcome);
READWRITE(nTime); READWRITE(nTime);
READWRITE(nCreationTime);
if(ser_action.ForRead()) { if(ser_action.ForRead()) {
eOutcome = vote_outcome_enum_t(nOutcome); eOutcome = vote_outcome_enum_t(nOutcome);
} }

6
src/governance.cpp
View File

@ -20,7 +20,7 @@ std::map<uint256, int64_t> mapAskedForGovernanceObject;
int nSubmittedFinalBudget; int nSubmittedFinalBudget;
const std::string CGovernanceManager::SERIALIZATION_VERSION_STRING = "CGovernanceManager-Version-10"; const std::string CGovernanceManager::SERIALIZATION_VERSION_STRING = "CGovernanceManager-Version-11";
CGovernanceManager::CGovernanceManager() CGovernanceManager::CGovernanceManager()
: pCurrentBlockIndex(NULL), : pCurrentBlockIndex(NULL),
@ -593,10 +593,10 @@ std::vector<CGovernanceVote> CGovernanceManager::GetCurrentVotes(const uint256&
for (vote_instance_m_it it3 = voteRecord.mapInstances.begin(); it3 != voteRecord.mapInstances.end(); ++it3) { for (vote_instance_m_it it3 = voteRecord.mapInstances.begin(); it3 != voteRecord.mapInstances.end(); ++it3) {
int signal = (it3->first); int signal = (it3->first);
int outcome = ((it3->second).eOutcome); int outcome = ((it3->second).eOutcome);
int64_t nTime = ((it3->second).nTime); int64_t nCreationTime = ((it3->second).nCreationTime);
CGovernanceVote vote = CGovernanceVote(mnCollateralOutpoint, nParentHash, (vote_signal_enum_t)signal, (vote_outcome_enum_t)outcome); CGovernanceVote vote = CGovernanceVote(mnCollateralOutpoint, nParentHash, (vote_signal_enum_t)signal, (vote_outcome_enum_t)outcome);
vote.SetTime(nTime); vote.SetTime(nCreationTime);
vecResult.push_back(vote); vecResult.push_back(vote);
} }