Scan for better chains in ThreadImport

random-zebra · random-zebra · commit efe193fc49bb · 2021-06-22T16:45:56.000+02:00
>>> based on bitcoin/bitcoin@316623f without switching to AcceptBlock in LoadExternalBlockFile, as we need to sequentially Accept and ActivateBestChain for PoS validation
diff --git a/src/consensus/zerocoin_verify.cpp b/src/consensus/zerocoin_verify.cpp
@@ -7,7 +7,6 @@
 #include "chainparams.h"
 #include "consensus/consensus.h"
 #include "guiinterface.h"        // for ui_interface
-#include "init.h"                // for ShutdownRequested()
 #include "invalid.h"
 #include "script/interpreter.h"
 #include "spork.h"               // for sporkManager
diff --git a/src/init.cpp b/src/init.cpp
@@ -689,11 +689,11 @@ struct CImportingNow {
 void ThreadImport(const std::vector<fs::path>& vImportFiles)
 {
     util::ThreadRename("pivx-loadblk");
+    CImportingNow imp;
     ScheduleBatchPriority();
 
     // -reindex
     if (fReindex) {
-        CImportingNow imp;
         int nFile = 0;
         while (true) {
             FlatFilePos pos(nFile, 0);
@@ -720,7 +720,6 @@ void ThreadImport(const std::vector<fs::path>& vImportFiles)
     if (fs::exists(pathBootstrap)) {
         FILE* file = fsbridge::fopen(pathBootstrap, "rb");
         if (file) {
-            CImportingNow imp;
             fs::path pathBootstrapOld = GetDataDir() / "bootstrap.dat.old";
             LogPrintf("Importing bootstrap.dat...\n");
             LoadExternalBlockFile(file);
@@ -734,7 +733,6 @@ void ThreadImport(const std::vector<fs::path>& vImportFiles)
     for (const fs::path& path : vImportFiles) {
         FILE* file = fsbridge::fopen(path, "rb");
         if (file) {
-            CImportingNow imp;
             LogPrintf("Importing blocks file %s...\n", path.string());
             LoadExternalBlockFile(file);
         } else {
@@ -747,6 +745,13 @@ void ThreadImport(const std::vector<fs::path>& vImportFiles)
         StartShutdown();
     }
 
+    // scan for better chains in the block chain database, that are not yet connected in the active best chain
+    CValidationState state;
+    if (!ActivateBestChain(state)) {
+        LogPrintf("Failed to connect best block");
+        StartShutdown();
+    }
+
     // force UpdatedBlockTip to initialize nCachedBlockHeight for DS, MN payments and budgets
     // but don't call it directly to prevent triggering of other listeners like zmq etc.
     pEvoNotificationInterface->InitializeCurrentBlockTip();
@@ -1744,13 +1749,6 @@ bool AppInitMain()
     if (gArgs.IsArgSet("-blocknotify"))
         uiInterface.NotifyBlockTip.connect(BlockNotifyCallback);
 
-    // scan for better chains in the block chain database, that are not yet connected in the active best chain
-    CValidationState state;
-    if (!ActivateBestChain(state)) {
-        strErrors << "Failed to connect best block";
-        StartShutdown();
-        return false;
-    }
     // update g_best_block if needed
     {
         LOCK(g_best_block_mutex);
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -3122,7 +3122,8 @@ static bool AcceptBlock(const CBlock& block, CValidationState& state, CBlockInde
 {
     AssertLockHeld(cs_main);
 
-    CBlockIndex*& pindex = *ppindex;
+    CBlockIndex* pindexDummy = nullptr;
+    CBlockIndex*& pindex = ppindex ? *ppindex : pindexDummy;
 
     const Consensus::Params& consensus = Params().GetConsensus();
 
@@ -3973,7 +3974,7 @@ bool LoadExternalBlockFile(FILE* fileIn, FlatFilePos* dbp)
                     if (state.IsError())
                         break;
                 } else if (hash != Params().GetConsensus().hashGenesisBlock && mapBlockIndex[hash]->nHeight % 1000 == 0) {
-                    LogPrintf("Block Import: already had block %s at height %d\n", hash.ToString(), mapBlockIndex[hash]->nHeight);
+                    LogPrint(BCLog::REINDEX, "Block Import: already had block %s at height %d\n", hash.ToString(), mapBlockIndex[hash]->nHeight);
                 }
 
                 // Recursively process earlier encountered successors of this block
@@ -3986,7 +3987,7 @@ bool LoadExternalBlockFile(FILE* fileIn, FlatFilePos* dbp)
                     while (range.first != range.second) {
                         std::multimap<uint256, FlatFilePos>::iterator it = range.first;
                         if (ReadBlockFromDisk(block, it->second)) {
-                            LogPrintf("%s: Processing out of order child %s of %s\n", __func__, block.GetHash().ToString(),
+                            LogPrint(BCLog::REINDEX, "%s: Processing out of order child %s of %s\n", __func__, block.GetHash().ToString(),
                                 head.ToString());
                             CValidationState dummy;
                             std::shared_ptr<const CBlock> block_ptr = std::make_shared<const CBlock>(block);
