fix: refuse to create new clsig if we switched to a different fork wh…

…ile we were signing
dashpay · Dec 20, 2024 · 0fc0bec · 0fc0bec
1 parent dd96032
commit 0fc0bec
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/llmq/chainlocks.cpp b/src/llmq/chainlocks.cpp
@@ -519,7 +519,11 @@ MessageProcessingResult CChainLocksHandler::HandleNewRecoveredSig(const llmq::CR
             // already got the same or a better CLSIG through the CLSIG message
             return {};
         }
-
+        const auto pindex = m_chainstate.m_chain.Tip()->GetAncestor(lastSignedHeight);
+        if (pindex == nullptr || pindex->GetBlockHash() != lastSignedMsgHash) {
+            // we switched to a different fork while we were signing
+            return {};
+        }
 
         clsig = CChainLockSig(lastSignedHeight, lastSignedMsgHash, recoveredSig.sig.Get());
     }