From 034919503d0b48f45e218dd80ad3074c9c6b036f Mon Sep 17 00:00:00 2001 From: jl777 Date: Wed, 15 Mar 2017 10:42:10 +0200 Subject: [PATCH] Test --- src/main.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index fa7023d0d..835714099 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1528,26 +1528,28 @@ bool IsInitialBlockDownload() LOCK(cs_main); if (fImporting || fReindex) { - fprintf(stderr,"IsInitialBlockDownload: fImporting %d || %d fReindex\n",(int32_t)fImporting,(int32_t)fReindex); + //fprintf(stderr,"IsInitialBlockDownload: fImporting %d || %d fReindex\n",(int32_t)fImporting,(int32_t)fReindex); return true; } if (fCheckpointsEnabled && chainActive.Height() < Checkpoints::GetTotalBlocksEstimate(chainParams.Checkpoints())) { - fprintf(stderr,"IsInitialBlockDownload: checkpoint -> initialdownload\n"); + //fprintf(stderr,"IsInitialBlockDownload: checkpoint -> initialdownload\n"); return true; } static bool lockIBDState = false; if (lockIBDState) { - fprintf(stderr,"lockIBDState true %d < %d\n",chainActive.Height(),pindexBestHeader->nHeight - 10); + //fprintf(stderr,"lockIBDState true %d < %d\n",chainActive.Height(),pindexBestHeader->nHeight - 10); return false; } - bool state; + bool state; CBlockIndex *ptr = chainActive.Tip(); + if ( ptr == 0 ) + ptr = pindexBestHeader; if ( ASSETCHAINS_SYMBOL[0] == 0 ) - state = (chainActive.Height() < pindexBestHeader->nHeight - 24*6) || - pindexBestHeader->GetBlockTime() < (GetTime() - chainParams.MaxTipAge()); - else state = (chainActive.Height() < pindexBestHeader->nHeight - 100); - fprintf(stderr,"state.%d ht.%d vs %d, t.%u %u\n",state,(int32_t)chainActive.Height(),(uint32_t)pindexBestHeader->nHeight,(int32_t)pindexBestHeader->GetBlockTime(),(uint32_t)(GetTime() - chainParams.MaxTipAge())); + state = (chainActive.Height() < ptr->nHeight - 24*6) || + ptr->GetBlockTime() < (GetTime() - chainParams.MaxTipAge()); + else state = (chainActive.Height() < ptr->nHeight - 100); + fprintf(stderr,"state.%d ht.%d vs %d, t.%u %u\n",state,(int32_t)chainActive.Height(),(uint32_t)ptr->nHeight,(int32_t)ptr->GetBlockTime(),(uint32_t)(GetTime() - chainParams.MaxTipAge())); if (!state) { lockIBDState = true;