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

Continue, rather than quit mining while looking for tip

Browse Source
This commit is contained in:
miketout
2018-05-06 13:44:36 -07:00
parent 39267c3553
commit 05f6e6339e
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/miner.cpp
View File

@@ -731,9 +731,9 @@ void static BitcoinMiner_noeq(CWallet *pwallet)
void static BitcoinMiner_noeq() void static BitcoinMiner_noeq()
#endif #endif
{ {
LogPrintf("KomodoMiner started\n"); LogPrintf("%s miner started\n", ASSETCHAINS_ALGORITHMS[ASSETCHAINS_ALGO]);
SetThreadPriority(THREAD_PRIORITY_LOWEST); SetThreadPriority(THREAD_PRIORITY_LOWEST);
RenameThread("komodo-miner"); RenameThread("verushash-miner");
#ifdef ENABLE_WALLET #ifdef ENABLE_WALLET
// Each thread has its own key // Each thread has its own key
@@ -757,7 +757,7 @@ void static BitcoinMiner_noeq()
miningTimer.start(); miningTimer.start();
try { try {
fprintf(stderr,"Komodo miner mining %s with %s\n",ASSETCHAINS_SYMBOL,ASSETCHAINS_ALGORITHMS[ASSETCHAINS_ALGO]); fprintf(stderr,"Mining %s with %s\n", ASSETCHAINS_SYMBOL, ASSETCHAINS_ALGORITHMS[ASSETCHAINS_ALGO]);
while (true) while (true)
{ {
if (chainparams.MiningRequiresPeers()) if (chainparams.MiningRequiresPeers())
@@ -803,10 +803,11 @@ void static BitcoinMiner_noeq()
if (!pblocktemplate.get()) if (!pblocktemplate.get())
{ {
if (GetArg("-mineraddress", "").empty()) { if (GetArg("-mineraddress", "").empty()) {
LogPrintf("Error in KomodoMiner: Keypool ran out, please call keypoolrefill before restarting the mining thread\n"); LogPrintf("Error in %s miner: Keypool ran out, please call keypoolrefill before restarting the mining thread\n",
ASSETCHAINS_ALGORITHMS[ASSETCHAINS_ALGO]);
} else { } else {
// Should never reach here, because -mineraddress validity is checked in init.cpp // Should never reach here, because -mineraddress validity is checked in init.cpp
LogPrintf("Error in KomodoMiner: Invalid -mineraddress\n"); LogPrintf("Error in %s miner: Invalid %s -mineraddress\n", ASSETCHAINS_ALGORITHMS[ASSETCHAINS_ALGO], ASSETCHAINS_SYMBOL);
} }
return; return;
} }
@@ -840,9 +841,11 @@ void static BitcoinMiner_noeq()
Mining_start = 0; Mining_start = 0;
// try again if we're not ready
if ( pindexPrev != chainActive.Tip() ) if ( pindexPrev != chainActive.Tip() )
break; {
printf("Block %d added to chain", chainActive.Tip()->nHeight);
continue;
}
while (true) while (true)
{ {
@@ -907,7 +910,7 @@ void static BitcoinMiner_noeq()
if ((UintToArith256(pblock->nNonce) & mask) == mask) if ((UintToArith256(pblock->nNonce) & mask) == mask)
{ {
fprintf(stderr,"%lu hashes - working\n", ASSETCHAINS_NONCEMASK[ASSETCHAINS_ALGO]); fprintf(stderr,"%lu khash - working\n", (ASSETCHAINS_NONCEMASK[ASSETCHAINS_ALGO] + 1) / 1024);
break; break;
} }
@@ -919,7 +922,6 @@ void static BitcoinMiner_noeq()
if ( pindexPrev != chainActive.Tip() ) if ( pindexPrev != chainActive.Tip() )
{ {
fprintf(stderr,"Tip advanced, block %i\n", chainActive.Tip()->nHeight);
break; break;
} }