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

Don't add non-current wd's to seen map (#1417)

Browse Source
This commit is contained in:
Tim Flynn 2017-03-24 06:34:10 -04:00 committed by UdjinM6
parent 92eaefb830
commit e6543b9c7c
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/governance.cpp
View File

@ -219,14 +219,18 @@ void CGovernanceManager::ProcessMessage(CNode* pfrom, std::string& strCommand, C
govobj.UpdateSentinelVariables(); //this sets local vars in object govobj.UpdateSentinelVariables(); //this sets local vars in object
if(AddGovernanceObject(govobj, pfrom)) bool fAddToSeen = true;
if(AddGovernanceObject(govobj, fAddToSeen, pfrom))
{ {
LogPrintf("MNGOVERNANCEOBJECT -- %s new\n", strHash); LogPrintf("MNGOVERNANCEOBJECT -- %s new\n", strHash);
govobj.Relay(); govobj.Relay();
} }
// UPDATE THAT WE'VE SEEN THIS OBJECT if(fAddToSeen) {
mapSeenGovernanceObjects.insert(std::make_pair(nHash, SEEN_OBJECT_IS_VALID)); // UPDATE THAT WE'VE SEEN THIS OBJECT
mapSeenGovernanceObjects.insert(std::make_pair(nHash, SEEN_OBJECT_IS_VALID));
}
masternodeSync.AddedGovernanceItem(); masternodeSync.AddedGovernanceItem();
@ -305,13 +309,15 @@ void CGovernanceManager::CheckOrphanVotes(CGovernanceObject& govobj, CGovernance
fRateChecksEnabled = true; fRateChecksEnabled = true;
} }
bool CGovernanceManager::AddGovernanceObject(CGovernanceObject& govobj, CNode* pfrom) bool CGovernanceManager::AddGovernanceObject(CGovernanceObject& govobj, bool& fAddToSeen, CNode* pfrom)
{ {
LOCK2(cs_main, cs); LOCK2(cs_main, cs);
std::string strError = ""; std::string strError = "";
DBG( cout << "CGovernanceManager::AddGovernanceObject START" << endl; ); DBG( cout << "CGovernanceManager::AddGovernanceObject START" << endl; );
fAddToSeen = true;
uint256 nHash = govobj.GetHash(); uint256 nHash = govobj.GetHash();
// MAKE SURE THIS OBJECT IS OK // MAKE SURE THIS OBJECT IS OK
@ -341,6 +347,8 @@ bool CGovernanceManager::AddGovernanceObject(CGovernanceObject& govobj, CNode* p
} }
if(!UpdateCurrentWatchdog(govobj)) { if(!UpdateCurrentWatchdog(govobj)) {
// Allow wd's which are not current to be reprocessed
fAddToSeen = false;
if(pfrom && (nHashWatchdogCurrent != uint256())) { if(pfrom && (nHashWatchdogCurrent != uint256())) {
pfrom->PushInventory(CInv(MSG_GOVERNANCE_OBJECT, nHashWatchdogCurrent)); pfrom->PushInventory(CInv(MSG_GOVERNANCE_OBJECT, nHashWatchdogCurrent));
} }
@ -1007,7 +1015,8 @@ void CGovernanceManager::CheckMasternodeOrphanObjects()
continue; continue;
} }
if(AddGovernanceObject(govobj)) { bool fAddToSeen = true;
if(AddGovernanceObject(govobj, fAddToSeen)) {
LogPrintf("CGovernanceManager::CheckMasternodeOrphanObjects -- %s new\n", govobj.GetHash().ToString()); LogPrintf("CGovernanceManager::CheckMasternodeOrphanObjects -- %s new\n", govobj.GetHash().ToString());
govobj.Relay(); govobj.Relay();
mapMasternodeOrphanObjects.erase(it++); mapMasternodeOrphanObjects.erase(it++);

2
src/governance.h
View File

@ -288,7 +288,7 @@ public:
std::vector<CGovernanceObject*> GetAllNewerThan(int64_t nMoreThanTime); std::vector<CGovernanceObject*> GetAllNewerThan(int64_t nMoreThanTime);
bool IsBudgetPaymentBlock(int nBlockHeight); bool IsBudgetPaymentBlock(int nBlockHeight);
bool AddGovernanceObject(CGovernanceObject& govobj, CNode* pfrom = NULL); bool AddGovernanceObject(CGovernanceObject& govobj, bool& fAddToSeen, CNode* pfrom = NULL);
std::string GetRequiredPaymentsString(int nBlockHeight); std::string GetRequiredPaymentsString(int nBlockHeight);

3
src/rpcgovernance.cpp
View File

@ -221,7 +221,8 @@ UniValue gobject(const UniValue& params, bool fHelp)
governance.AddSeenGovernanceObject(govobj.GetHash(), SEEN_OBJECT_IS_VALID); governance.AddSeenGovernanceObject(govobj.GetHash(), SEEN_OBJECT_IS_VALID);
govobj.Relay(); govobj.Relay();
LogPrintf("gobject(submit) -- Adding locally created governance object - %s\n", strHash); LogPrintf("gobject(submit) -- Adding locally created governance object - %s\n", strHash);
governance.AddGovernanceObject(govobj); bool fAddToSeen = true;
governance.AddGovernanceObject(govobj, fAddToSeen);
return govobj.GetHash().ToString(); return govobj.GetHash().ToString();
} }