Handle situations when we have evodb records but no blocks anymore

src/evo/deterministicmns.cpp

@@ -1126,7 +1126,8 @@ bool CDeterministicMNManager::UpgradeDBIfNeeded()
     LOCK(cs_main);
 
     if (chainActive.Tip() == nullptr) {
-        return true;
+        // should have no records
+        return evoDb.IsEmpty();
     }
 
     if (evoDb.GetRawDB().Exists(EVODB_BEST_BLOCK)) {

src/evo/evodb.h

@@ -98,6 +98,8 @@ class CEvoDB
 
     bool CommitRootTransaction();
 
+    bool IsEmpty() { return db.IsEmpty(); }
+
     bool VerifyBestBlock(const uint256& hash);
     void WriteBestBlock(const uint256& hash);
 

src/init.cpp

@@ -62,6 +62,7 @@
 
 #include <evo/deterministicmns.h>
 #include <llmq/quorums_init.h>
+#include <llmq/quorums_blockprocessor.h>
 
 #include <stdint.h>
 #include <stdio.h>
@@ -1981,7 +1982,13 @@ bool AppInitMain()
                     assert(chainActive.Tip() != NULL);
                 }
 
-                if (!deterministicMNManager->UpgradeDBIfNeeded()) {
+                if (is_coinsview_empty && !evoDb->IsEmpty()) {
+                    // EvoDB processed some blocks earlier but we have no blocks anymore, something is wrong
+                    strLoadError = _("Error initializing block database");
+                    break;
+                }
+
+                if (!deterministicMNManager->UpgradeDBIfNeeded() || !llmq::quorumBlockProcessor->UpgradeDB()) {
                     strLoadError = _("Error upgrading evo database");
                     break;
                 }

src/llmq/quorums_blockprocessor.cpp

@@ -268,12 +268,18 @@ bool CQuorumBlockProcessor::UndoBlock(const CBlock& block, const CBlockIndex* pi
 }
 
 // TODO remove this with 0.15.0
-void CQuorumBlockProcessor::UpgradeDB()
+bool CQuorumBlockProcessor::UpgradeDB()
 {
     LOCK(cs_main);
+
+    if (chainActive.Tip() == nullptr) {
+        // should have no records
+        return evoDb.IsEmpty();
+    }
+
     uint256 bestBlock;
     if (evoDb.GetRawDB().Read(DB_BEST_BLOCK_UPGRADE, bestBlock) && bestBlock == chainActive.Tip()->GetBlockHash()) {
-        return;
+        return true;
     }
 
     LogPrintf("CQuorumBlockProcessor::%s -- Upgrading DB...\n", __func__);
@@ -283,7 +289,7 @@ void CQuorumBlockProcessor::UpgradeDB()
         while (pindex) {
             if (fPruneMode && !(pindex->nStatus & BLOCK_HAVE_DATA)) {
                 // Too late, we already pruned blocks we needed to reprocess commitments
-                throw std::runtime_error(std::string(__func__) + ": Quorum Commitments DB upgrade failed, you need to re-download the blockchain");
+                return false;
             }
             CBlock block;
             bool r = ReadBlockFromDisk(block, pindex, Params().GetConsensus());
@@ -310,6 +316,7 @@ void CQuorumBlockProcessor::UpgradeDB()
     }
 
     LogPrintf("CQuorumBlockProcessor::%s -- Upgrade done...\n", __func__);
+    return true;
 }
 
 bool CQuorumBlockProcessor::GetCommitmentsFromBlock(const CBlock& block, const CBlockIndex* pindex, std::map<Consensus::LLMQType, CFinalCommitment>& ret, CValidationState& state)

src/llmq/quorums_blockprocessor.h

@@ -37,7 +37,7 @@ class CQuorumBlockProcessor
 public:
     explicit CQuorumBlockProcessor(CEvoDB& _evoDb) : evoDb(_evoDb) {}
 
-    void UpgradeDB();
+    bool UpgradeDB();
 
     void ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStream& vRecv, CConnman& connman);
 

src/llmq/quorums_init.cpp

@@ -64,8 +64,6 @@ void DestroyLLMQSystem()
 
 void StartLLMQSystem()
 {
-    quorumBlockProcessor->UpgradeDB();
-
     if (blsWorker) {
         blsWorker->Start();
     }