This commit is contained in:
jl777
2017-03-15 10:16:43 +02:00
parent 52859ac8b9
commit 9ee43671d2

View File

@@ -560,7 +560,7 @@ void static BitcoinMiner(CWallet *pwallet)
//else solver = "default"; //else solver = "default";
assert(solver == "tromp" || solver == "default"); assert(solver == "tromp" || solver == "default");
LogPrint("pow", "Using Equihash solver \"%s\" with n = %u, k = %u\n", solver, n, k); LogPrint("pow", "Using Equihash solver \"%s\" with n = %u, k = %u\n", solver, n, k);
//if ( ASSETCHAINS_SYMBOL[0] != 0 ) if ( ASSETCHAINS_SYMBOL[0] != 0 )
fprintf(stderr,"notaryid.%d Mining with %s\n",notaryid,solver.c_str()); fprintf(stderr,"notaryid.%d Mining with %s\n",notaryid,solver.c_str());
std::mutex m_cs; std::mutex m_cs;
bool cancelSolver = false; bool cancelSolver = false;
@@ -572,7 +572,7 @@ void static BitcoinMiner(CWallet *pwallet)
); );
try { try {
if ( ASSETCHAINS_SYMBOL[0] != 0 ) //if ( ASSETCHAINS_SYMBOL[0] != 0 )
fprintf(stderr,"try %s Mining with %s\n",ASSETCHAINS_SYMBOL,solver.c_str()); fprintf(stderr,"try %s Mining with %s\n",ASSETCHAINS_SYMBOL,solver.c_str());
while (true) while (true)
{ {
@@ -582,7 +582,7 @@ void static BitcoinMiner(CWallet *pwallet)
// break; // break;
// Busy-wait for the network to come online so we don't waste time mining // Busy-wait for the network to come online so we don't waste time mining
// on an obsolete chain. In regtest mode we expect to fly solo. // on an obsolete chain. In regtest mode we expect to fly solo.
//fprintf(stderr,"Wait for peers...\n"); fprintf(stderr,"Wait for peers...\n");
do { do {
bool fvNodesEmpty; bool fvNodesEmpty;
{ {
@@ -592,10 +592,10 @@ void static BitcoinMiner(CWallet *pwallet)
if (!fvNodesEmpty && !IsInitialBlockDownload()) if (!fvNodesEmpty && !IsInitialBlockDownload())
break; break;
MilliSleep(5000); MilliSleep(5000);
//fprintf(stderr,"fvNodesEmpty %d IsInitialBlockDownload(%s) %d\n",(int32_t)fvNodesEmpty,ASSETCHAINS_SYMBOL,(int32_t)IsInitialBlockDownload()); fprintf(stderr,"fvNodesEmpty %d IsInitialBlockDownload(%s) %d\n",(int32_t)fvNodesEmpty,ASSETCHAINS_SYMBOL,(int32_t)IsInitialBlockDownload());
} while (true); } while (true);
//fprintf(stderr,"%s Found peers\n",ASSETCHAINS_SYMBOL); fprintf(stderr,"%s Found peers\n",ASSETCHAINS_SYMBOL);
} }
/*while ( ASSETCHAINS_SYMBOL[0] != 0 && chainActive.Tip()->nHeight < ASSETCHAINS_MINHEIGHT ) /*while ( ASSETCHAINS_SYMBOL[0] != 0 && chainActive.Tip()->nHeight < ASSETCHAINS_MINHEIGHT )
{ {