refactor: protect GovernanceStore::cs, add accessor to remove ext. use

Author: kwvg

src/governance/governance.cpp

@@ -568,6 +568,12 @@ void CGovernanceManager::CheckAndRemove()
 }
 
 const CGovernanceObject* CGovernanceManager::FindConstGovernanceObject(const uint256& nHash) const
+{
+    LOCK(cs);
+    return FindConstGovernanceObjectInternal(nHash);
+}
+
+const CGovernanceObject* CGovernanceManager::FindConstGovernanceObjectInternal(const uint256& nHash) const
 {
     AssertLockHeld(cs);
 
@@ -1039,7 +1045,7 @@ void CGovernanceManager::RequestGovernanceObject(CNode* pfrom, const uint256& nH
     size_t nVoteCount = 0;
     if (fUseFilter) {
         LOCK(cs);
-        const CGovernanceObject* pObj = FindConstGovernanceObject(nHash);
+        const CGovernanceObject* pObj = FindConstGovernanceObjectInternal(nHash);
 
         if (pObj) {
             filter = CBloomFilter(Params().GetConsensus().nGovernanceFilterElements, GOVERNANCE_FILTER_FP_RATE, GetRand<int>(/*nMax=*/999999), BLOOM_UPDATE_ALL);
@@ -1562,7 +1568,7 @@ std::vector<CSuperblock_sptr> CGovernanceManager::GetActiveTriggersInternal() co
 
     // LOOK AT THESE OBJECTS AND COMPILE A VALID LIST OF TRIGGERS
     for (const auto& pair : mapTrigger) {
-        const CGovernanceObject* pObj = FindConstGovernanceObject(pair.first);
+        const CGovernanceObject* pObj = FindConstGovernanceObjectInternal(pair.first);
         if (pObj) {
             vecResults.push_back(pair.second);
         }

src/governance/governance.h

@@ -177,11 +177,10 @@ class GovernanceStore
     static constexpr int MAX_CACHE_SIZE = 1000000;
     static const std::string SERIALIZATION_VERSION_STRING;
 
-public:
+protected:
     // critical section to protect the inner data structures
     mutable RecursiveMutex cs;
 
-protected:
     // keep track of the scanning errors
     std::map<uint256, CGovernanceObject> mapObjects GUARDED_BY(cs);
     // mapErasedGovernanceObjects contains key-value pairs, where
@@ -298,7 +297,6 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
     [[nodiscard]] MessageProcessingResult ProcessMessage(CNode& peer, CConnman& connman, std::string_view msg_type,
                                                          CDataStream& vRecv) EXCLUSIVE_LOCKS_REQUIRED(!cs_relay);
 
-    const CGovernanceObject* FindConstGovernanceObject(const uint256& nHash) const EXCLUSIVE_LOCKS_REQUIRED(cs);
     CGovernanceObject* FindGovernanceObjectByDataHash(const uint256& nDataHash) override EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
     // These commands are only used in RPC
@@ -339,6 +337,8 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
     void AddPostponedObject(const CGovernanceObject& govobj)
         EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
+    const CGovernanceObject* FindConstGovernanceObject(const uint256& nHash) const EXCLUSIVE_LOCKS_REQUIRED(!cs);
+
     // Thread-safe accessors for trigger management
     std::vector<std::shared_ptr<CSuperblock>> GetActiveTriggers() const override
         EXCLUSIVE_LOCKS_REQUIRED(!cs);
@@ -409,6 +409,8 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
     std::vector<std::shared_ptr<CSuperblock>> GetActiveTriggersInternal() const
         EXCLUSIVE_LOCKS_REQUIRED(cs);
 
+    const CGovernanceObject* FindConstGovernanceObjectInternal(const uint256& nHash) const EXCLUSIVE_LOCKS_REQUIRED(cs);
+
     void ExecuteBestSuperblock(const CDeterministicMNList& tip_mn_list, int nBlockHeight);
 
     void RequestGovernanceObject(CNode* pfrom, const uint256& nHash, CConnman& connman, bool fUseFilter = false) const;

src/rpc/governance.cpp

@@ -414,7 +414,6 @@ static UniValue VoteWithMasternodes(const JSONRPCRequest& request, const CWallet
     const NodeContext& node = EnsureAnyNodeContext(request.context);
     CHECK_NONFATAL(node.govman);
     {
-        LOCK(node.govman->cs);
         const CGovernanceObject *pGovObj = node.govman->FindConstGovernanceObject(hash);
         if (!pGovObj) {
             throw JSONRPCError(RPC_INVALID_PARAMETER, "Governance object not found");
@@ -604,7 +603,7 @@ static UniValue ListObjects(CGovernanceManager& govman, const CDeterministicMNLi
         g_txindex->BlockUntilSyncedToCurrentChain();
     }
 
-    LOCK2(cs_main, govman.cs);
+    LOCK(cs_main);
 
     std::vector<CGovernanceObject> objs;
     govman.GetAllNewerThan(objs, nStartTime);
@@ -729,7 +728,7 @@ static RPCHelpMan gobject_get()
     const ChainstateManager& chainman = EnsureChainman(node);
 
     CHECK_NONFATAL(node.govman);
-    LOCK2(cs_main, node.govman->cs);
+    LOCK(cs_main);
     const CGovernanceObject* pGovObj = node.govman->FindConstGovernanceObject(hash);
 
     if (pGovObj == nullptr) {
@@ -828,7 +827,6 @@ static RPCHelpMan gobject_getcurrentvotes()
     const NodeContext& node = EnsureAnyNodeContext(request.context);
 
     CHECK_NONFATAL(node.govman);
-    LOCK(node.govman->cs);
     const CGovernanceObject* pGovObj = node.govman->FindConstGovernanceObject(hash);
 
     if (pGovObj == nullptr) {
@@ -924,7 +922,6 @@ static RPCHelpMan voteraw()
     const NodeContext& node = EnsureAnyNodeContext(request.context);
     CHECK_NONFATAL(node.govman);
     GovernanceObject govObjType = [&]() {
-        LOCK(node.govman->cs);
         const CGovernanceObject *pGovObj = node.govman->FindConstGovernanceObject(hashGovObj);
         if (!pGovObj) {
             throw JSONRPCError(RPC_INVALID_PARAMETER, "Governance object not found");