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

active masternode fixes

Browse Source
This commit is contained in:
UdjinM6 2015-07-23 05:19:37 +03:00
parent dec45ac67a
commit 6123770bf8
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/activemasternode.cpp
View File

@ -17,13 +17,15 @@ void CActiveMasternode::ManageStatus()
if (fDebug) LogPrintf("CActiveMasternode::ManageStatus() - Begin\n"); if (fDebug) LogPrintf("CActiveMasternode::ManageStatus() - Begin\n");
//need correct blocks to send ping //need correct blocks to send ping
if(IsInitialBlockDownload()) { if(!masternodeSync.IsSynced()) {
status = ACTIVE_MASTERNODE_SYNC_IN_PROCESS; status = ACTIVE_MASTERNODE_SYNC_IN_PROCESS;
LogPrintf("CActiveMasternode::ManageStatus() - Sync in progress. Must wait until sync is complete to start Masternode.\n"); LogPrintf("CActiveMasternode::ManageStatus() - %s\n", GetStatus());
return; return;
} }
if(status == ACTIVE_MASTERNODE_INITIAL || status == ACTIVE_MASTERNODE_SYNC_IN_PROCESS) { if(status == ACTIVE_MASTERNODE_SYNC_IN_PROCESS) status = ACTIVE_MASTERNODE_INITIAL;
if(status == ACTIVE_MASTERNODE_INITIAL) {
CMasternode *pmn; CMasternode *pmn;
pmn = mnodeman.Find(pubKeyMasternode); pmn = mnodeman.Find(pubKeyMasternode);
if(pmn != NULL) { if(pmn != NULL) {
@ -82,9 +84,9 @@ void CActiveMasternode::ManageStatus()
if(GetMasterNodeVin(vin, pubKeyCollateralAddress, keyCollateralAddress)) { if(GetMasterNodeVin(vin, pubKeyCollateralAddress, keyCollateralAddress)) {
if(GetInputAge(vin) < MASTERNODE_MIN_CONFIRMATIONS){ if(GetInputAge(vin) < MASTERNODE_MIN_CONFIRMATIONS){
notCapableReason = strprintf("Input must have least %d confirmations - %d confirmations", MASTERNODE_MIN_CONFIRMATIONS, GetInputAge(vin));
LogPrintf("CActiveMasternode::ManageStatus() - %s\n", notCapableReason);
status = ACTIVE_MASTERNODE_INPUT_TOO_NEW; status = ACTIVE_MASTERNODE_INPUT_TOO_NEW;
notCapableReason = strprintf("%s - %d confirmations", GetStatus(), GetInputAge(vin));
LogPrintf("CActiveMasternode::ManageStatus() - %s\n", notCapableReason);
return; return;
} }
@ -126,11 +128,11 @@ void CActiveMasternode::ManageStatus()
std::string CActiveMasternode::GetStatus() { std::string CActiveMasternode::GetStatus() {
switch (status) { switch (status) {
case ACTIVE_MASTERNODE_INITIAL: return "node just started, not yet activated"; case ACTIVE_MASTERNODE_INITIAL: return "Node just started, not yet activated";
case ACTIVE_MASTERNODE_SYNC_IN_PROCESS: return "sync in process. Must wait until client is synced to start"; case ACTIVE_MASTERNODE_SYNC_IN_PROCESS: return "Sync in progress. Must wait until sync is complete to start Masternode";
case ACTIVE_MASTERNODE_INPUT_TOO_NEW: return "masternode input must have at least 15 confirmations"; case ACTIVE_MASTERNODE_INPUT_TOO_NEW: return strprintf("Masternode input must have at least %d confirmations", MASTERNODE_MIN_CONFIRMATIONS);
case ACTIVE_MASTERNODE_NOT_CAPABLE: return "not capable masternode: " + notCapableReason; case ACTIVE_MASTERNODE_NOT_CAPABLE: return "Not capable masternode: " + notCapableReason;
case ACTIVE_MASTERNODE_STARTED: return "masternode successfully started"; case ACTIVE_MASTERNODE_STARTED: return "Masternode successfully started";
default: return "unknown"; default: return "unknown";
} }
} }
@ -193,8 +195,8 @@ bool CActiveMasternode::Register(std::string strService, std::string strKeyMaste
CKey keyMasternode; CKey keyMasternode;
//need correct blocks to send ping //need correct blocks to send ping
if(IsInitialBlockDownload()) { if(!masternodeSync.IsSynced()) {
errorMessage = "Sync in progress. Must wait until sync is complete to start Masternode."; errorMessage = GetStatus();
LogPrintf("CActiveMasternode::Register() - %s\n", errorMessage); LogPrintf("CActiveMasternode::Register() - %s\n", errorMessage);
return false; return false;
} }

8
src/darksend.cpp
View File

@ -2322,8 +2322,6 @@ void ThreadCheckDarkSendPool()
while (true) while (true)
{ {
c++;
MilliSleep(1000); MilliSleep(1000);
//LogPrintf("ThreadCheckDarkSendPool::check timeout\n"); //LogPrintf("ThreadCheckDarkSendPool::check timeout\n");
@ -2331,7 +2329,11 @@ void ThreadCheckDarkSendPool()
masternodeSync.Process(); masternodeSync.Process();
if(masternodeSync.IsSynced()) { if(masternodeSync.IsSynced()) {
//check if we should active or ping every few minutes
c++;
// check if we should activate or ping every few minutes,
// start right after sync is considered to be done
if(c % MASTERNODE_PING_SECONDS == 1) activeMasternode.ManageStatus(); if(c % MASTERNODE_PING_SECONDS == 1) activeMasternode.ManageStatus();
if(c % 60 == 0) if(c % 60 == 0)