fix: CSigningSharesManager supposed to use _active_ chain but not the chain that has been active during it's creation

Author: knst

src/active/context.cpp

@@ -38,8 +38,7 @@ ActiveContext::ActiveContext(CBLSWorker& bls_worker, ChainstateManager& chainman
     nodeman{std::make_unique<CActiveMasternodeManager>(connman, dmnman, operator_sk)},
     dkgdbgman{std::make_unique<llmq::CDKGDebugManager>()},
     qdkgsman{std::make_unique<llmq::CDKGSessionManager>(dmnman, qsnapman, chainman, sporkman, db_params, quorums_watch)},
-    shareman{std::make_unique<llmq::CSigSharesManager>(connman, chainman.ActiveChainstate(), sigman, peerman, *nodeman,
-                                                       qman, sporkman)},
+    shareman{std::make_unique<llmq::CSigSharesManager>(connman, chainman, sigman, peerman, *nodeman, qman, sporkman)},
     gov_signer{std::make_unique<GovernanceSigner>(connman, dmnman, govman, *nodeman, chainman, mn_sync)},
     ehf_sighandler{std::make_unique<llmq::CEHFSignalsHandler>(chainman, mnhfman, sigman, *shareman, qman)},
     qman_handler{std::make_unique<llmq::QuorumParticipant>(bls_worker, connman, dmnman, qman, qsnapman, *nodeman, chainman,

src/llmq/signing_shares.cpp

@@ -180,11 +180,11 @@ void CSigSharesNodeState::RemoveSession(const uint256& signHash)
 
 //////////////////////
 
-CSigSharesManager::CSigSharesManager(CConnman& connman, CChainState& chainstate, CSigningManager& _sigman,
+CSigSharesManager::CSigSharesManager(CConnman& connman, const ChainstateManager& chainman, CSigningManager& _sigman,
                                      PeerManager& peerman, const CActiveMasternodeManager& mn_activeman,
                                      const CQuorumManager& _qman, const CSporkManager& sporkman) :
     m_connman{connman},
-    m_chainstate{chainstate},
+    m_chainman{chainman},
     sigman{_sigman},
     m_peerman{peerman},
     m_mn_activeman{mn_activeman},
@@ -719,7 +719,7 @@ bool CSigSharesManager::AsyncSignIfMember(Consensus::LLMQType llmqType, CSigning
             // the quorum list and no recovered signature has been created in the mean time
             const auto& llmq_params_opt = Params().GetLLMQ(llmqType);
             assert(llmq_params_opt.has_value());
-            return SelectQuorumForSigning(llmq_params_opt.value(), m_chainstate.m_chain, qman, id);
+            return SelectQuorumForSigning(llmq_params_opt.value(), m_chainman.ActiveChain(), qman, id);
         } else {
             return qman.GetQuorum(llmqType, quorumHash);
         }

src/llmq/signing_shares.h

@@ -28,6 +28,7 @@
 #include <vector>
 
 class CActiveMasternodeManager;
+class ChainstateManager;
 class CNode;
 class CConnman;
 class CDeterministicMN;
@@ -408,7 +409,7 @@ class CSigSharesManager : public llmq::CRecoveredSigsListener
     FastRandomContext rnd GUARDED_BY(cs);
 
     CConnman& m_connman;
-    CChainState& m_chainstate;
+    const ChainstateManager& m_chainman;
     CSigningManager& sigman;
     PeerManager& m_peerman;
     const CActiveMasternodeManager& m_mn_activeman;
@@ -422,7 +423,7 @@ class CSigSharesManager : public llmq::CRecoveredSigsListener
     CSigSharesManager() = delete;
     CSigSharesManager(const CSigSharesManager&) = delete;
     CSigSharesManager& operator=(const CSigSharesManager&) = delete;
-    explicit CSigSharesManager(CConnman& connman, CChainState& chainstate, CSigningManager& _sigman,
+    explicit CSigSharesManager(CConnman& connman, const ChainstateManager& chainman, CSigningManager& _sigman,
                                PeerManager& peerman, const CActiveMasternodeManager& mn_activeman,
                                const CQuorumManager& _qman, const CSporkManager& sporkman);
     ~CSigSharesManager() override;