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

Do not try to check or verify mns until synced to some stage (#1261)

Browse Source 
Verification creates new conections, which we also use to sync but then we disconnect on ProcessMasternodeConnections every minute which at least could lead to excessive node load (for our peers). But could also interfere with sync process itself and we'd better keep them separate.
This commit is contained in:
UdjinM6 2017-01-15 02:29:08 +04:00 committed by GitHub
parent e8479675a8
commit f995a264e2
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/masternodeman.cpp
View File

@ -173,8 +173,9 @@ void CMasternodeMan::Check()
void CMasternodeMan::CheckAndRemove() void CMasternodeMan::CheckAndRemove()
{ {
LogPrintf("CMasternodeMan::CheckAndRemove\n"); if(!masternodeSync.IsMasternodeListSynced()) return;
LogPrintf("CMasternodeMan::CheckAndRemove\n");
{ {
// Need LOCK2 here to ensure consistent locking order because code below locks cs_main // Need LOCK2 here to ensure consistent locking order because code below locks cs_main
@ -202,7 +203,12 @@ void CMasternodeMan::CheckAndRemove()
it = vMasternodes.erase(it); it = vMasternodes.erase(it);
fMasternodesRemoved = true; fMasternodesRemoved = true;
} else { } else {
if(pCurrentBlockIndex && !fAskedForMnbRecovery && it->IsNewStartRequired() && !IsMnbRecoveryRequested(hash)) { bool fAsk = pCurrentBlockIndex &&
!fAskedForMnbRecovery &&
masternodeSync.IsSynced() &&
it->IsNewStartRequired() &&
!IsMnbRecoveryRequested(hash);
if(fAsk) {
// this mn is in a non-recoverable state and we haven't asked other nodes yet // this mn is in a non-recoverable state and we haven't asked other nodes yet
std::set<CNetAddr> setRequested; std::set<CNetAddr> setRequested;
// calulate only once and only when it's needed // calulate only once and only when it's needed
@ -919,6 +925,7 @@ void CMasternodeMan::ProcessMessage(CNode* pfrom, std::string& strCommand, CData
void CMasternodeMan::DoFullVerificationStep() void CMasternodeMan::DoFullVerificationStep()
{ {
if(activeMasternode.vin == CTxIn()) return; if(activeMasternode.vin == CTxIn()) return;
if(!masternodeSync.IsSynced()) return;
std::vector<std::pair<int, CMasternode> > vecMasternodeRanks = GetMasternodeRanks(pCurrentBlockIndex->nHeight - 1, MIN_POSE_PROTO_VERSION); std::vector<std::pair<int, CMasternode> > vecMasternodeRanks = GetMasternodeRanks(pCurrentBlockIndex->nHeight - 1, MIN_POSE_PROTO_VERSION);