DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

More anti-forking on startup for slow connections

Browse Source
This commit is contained in:
Michael Toutonghi
2018-05-15 05:32:09 -07:00
parent 3d3a117bde
commit dfcf8255ef
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/miner.cpp
View File

@@ -785,7 +785,7 @@ int32_t waitForPeers(const CChainParams &chainparams)
} }
if (!fvNodesEmpty ) if (!fvNodesEmpty )
break; break;
MilliSleep(1000); MilliSleep(1000 + rand() % 1900);
} while (true); } while (true);
} }
} }
@@ -995,18 +995,17 @@ void static BitcoinMiner_noeq()
// try a nice clean peer connection to start // try a nice clean peer connection to start
waitForPeers(chainparams); waitForPeers(chainparams);
sleep(5); MilliSleep(5000 + rand() % 5000);
CBlockIndex *curTip = chainActive.Tip(), *lastTip; CBlockIndex *curTip = chainActive.Tip(), *lastTip;
do { do {
lastTip = curTip; lastTip = curTip;
printf("Verifying block height %d \n", lastTip->nHeight); printf("Verifying block height %d \n", lastTip->nHeight);
MilliSleep(3000 + rand() % 1900); MilliSleep(1000 + rand() % 5000);
curTip = chainActive.Tip(); curTip = chainActive.Tip();
} while (curTip != lastTip); } while (curTip != lastTip);
SetThreadPriority(THREAD_PRIORITY_LOWEST); SetThreadPriority(THREAD_PRIORITY_LOWEST);
sleep(5);
printf("Mining height %d\n", chainActive.Tip()->nHeight + 1); printf("Mining height %d\n", chainActive.Tip()->nHeight + 1);
miningTimer.start(); miningTimer.start();
@@ -1017,11 +1016,22 @@ void static BitcoinMiner_noeq()
{ {
miningTimer.stop(); miningTimer.stop();
waitForPeers(chainparams); waitForPeers(chainparams);
CBlockIndex* pindexPrev = chainActive.Tip();
// prevent forking on startup before the diff algorithm kicks in
if (pindexPrev < 70)
{
do {
lastTip = pindexPrev;
MilliSleep(3000 + rand() % 5000);
pindexPrev = chainActive.Tip();
} while (pindexPrev != lastTip);
}
miningTimer.start(); miningTimer.start();
// Create new block // Create new block
unsigned int nTransactionsUpdatedLast = mempool.GetTransactionsUpdated(); unsigned int nTransactionsUpdatedLast = mempool.GetTransactionsUpdated();
CBlockIndex* pindexPrev = chainActive.Tip();
if ( Mining_height != pindexPrev->nHeight+1 ) if ( Mining_height != pindexPrev->nHeight+1 )
{ {
Mining_height = pindexPrev->nHeight+1; Mining_height = pindexPrev->nHeight+1;