From 1b7e60f7f67ceb18122fc0a24edd0d817da0d351 Mon Sep 17 00:00:00 2001 From: miketout Date: Mon, 27 Aug 2018 18:26:22 -0700 Subject: [PATCH] Reenable checkpoints for IsInSync() --- src/main.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index babfc3da9..d3f7f3849 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1936,7 +1936,6 @@ bool IsInitialBlockDownload() bool IsInSync() { const CChainParams& chainParams = Params(); - CBlockIndex *pbi; LOCK(cs_main); if (fImporting || fReindex) @@ -1946,20 +1945,23 @@ bool IsInSync() } if (fCheckpointsEnabled) { - pbi = Checkpoints::GetLastCheckpoint(chainParams.Checkpoints()); - if (fCheckpointsEnabled && pbi && (chainActive.Height() < pbi->nHeight)) + if (fCheckpointsEnabled && chainActive.Height() < Checkpoints::GetTotalBlocksEstimate(chainParams.Checkpoints())) { - //fprintf(stderr,"IsInSync: checkpoint -> initialdownload chainActive.Height().%d pbi->nHeight.%d\n", chainActive.Height(), pbi->nHeight); + //fprintf(stderr,"IsInSync: checkpoint -> initialdownload chainActive.Height().%d GetTotalBlocksEstimate(chainParams.Checkpoints().%d\n", chainActive.Height(), Checkpoints::GetTotalBlocksEstimate(chainParams.Checkpoints())); return false; } } - pbi = chainActive.Tip(); + + CBlockIndex *pbi = chainActive.Tip(); + int longestchain = komodo_longestchain(); if ( !pbi || (pindexBestHeader == 0) || ((pindexBestHeader->nHeight - 1) > pbi->nHeight) || - (komodo_longestchain() != 0 && komodo_longestchain() > pbi->nHeight) ) + (longestchain != 0 && longestchain > pbi->nHeight) ) return false; - + + //printf("IsInSync: checkpoint -> initialdownload chainActive.Height().%d longestchain.%d\n", chainActive.Height(), longestchain); + return true; }