refactor: extract masternode-mode specific SetSecretKeyShare()

kwvg · kwvg · commit de0ce4efd29f · 2026-01-02T03:01:11.000+05:30
Also:
- Drop avoidable `CActiveMasternodeManager&amp;` arg by taking ref of hash
  we care about
diff --git a/src/llmq/quorums.cpp b/src/llmq/quorums.cpp
@@ -94,9 +94,9 @@ bool CQuorum::SetVerificationVector(const std::vector<CBLSPublicKey>& quorumVecI
     return true;
 }
 
-bool CQuorum::SetSecretKeyShare(const CBLSSecretKey& secretKeyShare, const CActiveMasternodeManager& mn_activeman)
+bool CQuorum::SetSecretKeyShare(const CBLSSecretKey& secretKeyShare, const uint256& protx_hash)
 {
-    if (!secretKeyShare.IsValid() || (secretKeyShare.GetPublicKey() != GetPubKeyShare(GetMemberIndex(mn_activeman.GetProTxHash())))) {
+    if (!secretKeyShare.IsValid() || (secretKeyShare.GetPublicKey() != GetPubKeyShare(GetMemberIndex(protx_hash)))) {
         return false;
     }
     LOCK(cs_vvec_shShare);
@@ -460,7 +460,7 @@ bool CQuorumManager::BuildQuorumContributions(const CFinalCommitmentPtr& fqc, co
         // allows to use the quorum as a non-member (verification through the quorum pub key)
         return false;
     }
-    if (!quorum->SetSecretKeyShare(blsWorker.AggregateSecretKeys(skContributions), *m_mn_activeman)) {
+    if (m_mn_activeman && !SetQuorumSecretKeyShare(*quorum, skContributions)) {
         LogPrint(BCLog::LLMQ, "CQuorumManager::%s -- failed to build skShare\n", __func__);
         // We don't bail out here as this is not a fatal error and still allows us to recover public key shares (as we
         // have a valid quorum vvec at this point)
@@ -472,6 +472,12 @@ bool CQuorumManager::BuildQuorumContributions(const CFinalCommitmentPtr& fqc, co
     return true;
 }
 
+bool CQuorumManager::SetQuorumSecretKeyShare(CQuorum& quorum, Span<CBLSSecretKey> skContributions) const
+{
+    assert(m_mn_activeman);
+    return quorum.SetSecretKeyShare(blsWorker.AggregateSecretKeys(skContributions), m_mn_activeman->GetProTxHash());
+}
+
 bool CQuorumManager::HasQuorum(Consensus::LLMQType llmqType, const CQuorumBlockProcessor& quorum_block_processor, const uint256& quorumHash)
 {
     return quorum_block_processor.HasMinedCommitment(llmqType, quorumHash);
@@ -758,8 +764,7 @@ MessageProcessingResult CQuorumManager::ProcessContribQDATA(CNode& pfrom, CDataS
             }
         }
 
-        CBLSSecretKey secretKeyShare = blsWorker.AggregateSecretKeys(vecSecretKeys);
-        if (!quorum.SetSecretKeyShare(secretKeyShare, *m_mn_activeman)) {
+        if (!quorum.SetSecretKeyShare(blsWorker.AggregateSecretKeys(vecSecretKeys), m_mn_activeman->GetProTxHash())) {
             return MisbehavingError{10, "invalid secret key share received"};
         }
     }
diff --git a/src/llmq/quorums.h b/src/llmq/quorums.h
@@ -208,7 +208,7 @@ class CQuorum
         LOCK(cs_vvec_shShare);
         quorumVvec = std::move(vvec_in);
     }
-    bool SetSecretKeyShare(const CBLSSecretKey& secretKeyShare, const CActiveMasternodeManager& mn_activeman)
+    bool SetSecretKeyShare(const CBLSSecretKey& secretKeyShare, const uint256& protx_hash)
         EXCLUSIVE_LOCKS_REQUIRED(!cs_vvec_shShare);
 
     bool HasVerificationVector() const EXCLUSIVE_LOCKS_REQUIRED(!cs_vvec_shShare);
@@ -342,6 +342,7 @@ class CQuorumManager
                                          gsl::not_null<const CBlockIndex*> pQuorumBaseBlockIndex,
                                          bool populate_cache) const EXCLUSIVE_LOCKS_REQUIRED(!cs_db, !cs_map_quorums);
     bool BuildQuorumContributions(const CFinalCommitmentPtr& fqc, const std::shared_ptr<CQuorum>& quorum) const;
+    bool SetQuorumSecretKeyShare(CQuorum& quorum, Span<CBLSSecretKey> skContributions) const;
 
     CQuorumCPtr GetQuorum(Consensus::LLMQType llmqType, gsl::not_null<const CBlockIndex*> pindex,
                           bool populate_cache = true) const EXCLUSIVE_LOCKS_REQUIRED(!cs_db, !cs_map_quorums);

Original file line number	Diff line number	Diff line change
`@@ -94,9 +94,9 @@ bool CQuorum::SetVerificationVector(const std::vector<CBLSPublicKey>& quorumVecI`
`94`	`94`	`return true;`
`95`	`95`	`}`
`96`	`96`
`97`		`-bool CQuorum::SetSecretKeyShare(const CBLSSecretKey& secretKeyShare, const CActiveMasternodeManager& mn_activeman)`
	`97`	`+bool CQuorum::SetSecretKeyShare(const CBLSSecretKey& secretKeyShare, const uint256& protx_hash)`
`98`	`98`	`{`
`99`		`- if (!secretKeyShare.IsValid() \|\| (secretKeyShare.GetPublicKey() != GetPubKeyShare(GetMemberIndex(mn_activeman.GetProTxHash())))) {`
	`99`	`+ if (!secretKeyShare.IsValid() \|\| (secretKeyShare.GetPublicKey() != GetPubKeyShare(GetMemberIndex(protx_hash)))) {`
`100`	`100`	`return false;`
`101`	`101`	`}`
`102`	`102`	`LOCK(cs_vvec_shShare);`
`@@ -460,7 +460,7 @@ bool CQuorumManager::BuildQuorumContributions(const CFinalCommitmentPtr& fqc, co`
`460`	`460`	`// allows to use the quorum as a non-member (verification through the quorum pub key)`
`461`	`461`	`return false;`
`462`	`462`	`}`
`463`		`- if (!quorum->SetSecretKeyShare(blsWorker.AggregateSecretKeys(skContributions), *m_mn_activeman)) {`
	`463`	`+ if (m_mn_activeman && !SetQuorumSecretKeyShare(*quorum, skContributions)) {`
`464`	`464`	`LogPrint(BCLog::LLMQ, "CQuorumManager::%s -- failed to build skShare\n", __func__);`
`465`	`465`	`// We don't bail out here as this is not a fatal error and still allows us to recover public key shares (as we`
`466`	`466`	`// have a valid quorum vvec at this point)`
`@@ -472,6 +472,12 @@ bool CQuorumManager::BuildQuorumContributions(const CFinalCommitmentPtr& fqc, co`
`472`	`472`	`return true;`
`473`	`473`	`}`
`474`	`474`
	`475`	`+bool CQuorumManager::SetQuorumSecretKeyShare(CQuorum& quorum, Span<CBLSSecretKey> skContributions) const`
	`476`	`+{`
	`477`	`+ assert(m_mn_activeman);`
	`478`	`+ return quorum.SetSecretKeyShare(blsWorker.AggregateSecretKeys(skContributions), m_mn_activeman->GetProTxHash());`
	`479`	`+}`
	`480`	`+`
`475`	`481`	`bool CQuorumManager::HasQuorum(Consensus::LLMQType llmqType, const CQuorumBlockProcessor& quorum_block_processor, const uint256& quorumHash)`
`476`	`482`	`{`
`477`	`483`	`return quorum_block_processor.HasMinedCommitment(llmqType, quorumHash);`
`@@ -758,8 +764,7 @@ MessageProcessingResult CQuorumManager::ProcessContribQDATA(CNode& pfrom, CDataS`
`758`	`764`	`}`
`759`	`765`	`}`
`760`	`766`
`761`		`- CBLSSecretKey secretKeyShare = blsWorker.AggregateSecretKeys(vecSecretKeys);`
`762`		`- if (!quorum.SetSecretKeyShare(secretKeyShare, *m_mn_activeman)) {`
	`767`	`+ if (!quorum.SetSecretKeyShare(blsWorker.AggregateSecretKeys(vecSecretKeys), m_mn_activeman->GetProTxHash())) {`
`763`	`768`	`return MisbehavingError{10, "invalid secret key share received"};`
`764`	`769`	`}`
`765`	`770`	`}`