Call HandleFullyConfirmedBlock when ChainLocks are enabled but not en…

…forced (#2844) Otherwise IS locks never get removed before DIP8 activates via BIP9.
dashpay · Apr 8, 2019 · b5bc7c9 · b5bc7c9
1 parent 9fa09b9
commit b5bc7c9
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/llmq/quorums_instantsend.cpp b/src/llmq/quorums_instantsend.cpp
@@ -818,7 +818,10 @@ void CInstantSendManager::NotifyChainLock(const CBlockIndex* pindexChainLock)
 
 void CInstantSendManager::UpdatedBlockTip(const CBlockIndex* pindexNew)
 {
-    if (sporkManager.IsSporkActive(SPORK_19_CHAINLOCKS_ENABLED)) {
+    // TODO remove this after DIP8 has activated
+    bool fDIP0008Active = VersionBitsState(pindexNew->pprev, Params().GetConsensus(), Consensus::DEPLOYMENT_DIP0008, versionbitscache) == THRESHOLD_ACTIVE;
+
+    if (sporkManager.IsSporkActive(SPORK_19_CHAINLOCKS_ENABLED) && fDIP0008Active) {
         // Nothing to do here. We should keep all islocks and let chainlocks handle them.
         return;
     }