governance: add lock annotations for cs_relay

Author: kwvg

src/governance/governance.cpp

@@ -117,6 +117,7 @@ bool CGovernanceManager::LoadCache(bool load_cache)
 
 void CGovernanceManager::RelayObject(const CGovernanceObject& obj)
 {
+    AssertLockNotHeld(cs_relay);
     if (!m_mn_sync.IsSynced()) {
         LogPrint(BCLog::GOBJECT, "%s -- won't relay until fully synced\n", __func__);
         return;
@@ -128,6 +129,7 @@ void CGovernanceManager::RelayObject(const CGovernanceObject& obj)
 
 void CGovernanceManager::RelayVote(const CGovernanceVote& vote)
 {
+    AssertLockNotHeld(cs_relay);
     if (!m_mn_sync.IsSynced()) {
         LogPrint(BCLog::GOBJECT, "%s -- won't relay until fully synced\n", __func__);
         return;
@@ -193,6 +195,7 @@ void CGovernanceManager::AddPostponedObject(const CGovernanceObject& govobj)
 
 MessageProcessingResult CGovernanceManager::ProcessMessage(CNode& peer, CConnman& connman, std::string_view msg_type, CDataStream& vRecv)
 {
+    AssertLockNotHeld(cs_relay);
     if (!IsValid()) return {};
     if (!m_mn_sync.IsBlockchainSynced()) return {};
 
@@ -335,6 +338,7 @@ MessageProcessingResult CGovernanceManager::ProcessMessage(CNode& peer, CConnman
 
 void CGovernanceManager::CheckOrphanVotes(CGovernanceObject& govobj)
 {
+    AssertLockNotHeld(cs_relay);
     uint256 nHash = govobj.GetHash();
     std::vector<vote_time_pair_t> vecVotePairs;
     cmmapOrphanVotes.GetAll(nHash, vecVotePairs);
@@ -361,6 +365,7 @@ void CGovernanceManager::CheckOrphanVotes(CGovernanceObject& govobj)
 
 void CGovernanceManager::AddGovernanceObject(CGovernanceObject& govobj, const CNode* pfrom)
 {
+    AssertLockNotHeld(cs_relay);
     uint256 nHash = govobj.GetHash();
     std::string strHash = nHash.ToString();
 
@@ -897,6 +902,7 @@ bool CGovernanceManager::MasternodeRateCheck(const CGovernanceObject& govobj, bo
 
 bool CGovernanceManager::ProcessVoteAndRelay(const CGovernanceVote& vote, CGovernanceException& exception, CConnman& connman)
 {
+    AssertLockNotHeld(cs_relay);
     bool fOK = ProcessVote(/*pfrom=*/nullptr, vote, exception, connman);
     if (fOK) {
         RelayVote(vote);
@@ -959,6 +965,7 @@ bool CGovernanceManager::ProcessVote(CNode* pfrom, const CGovernanceVote& vote,
 
 void CGovernanceManager::CheckPostponedObjects()
 {
+    AssertLockNotHeld(cs_relay);
     if (!m_mn_sync.IsSynced()) return;
 
     LOCK2(::cs_main, cs);
@@ -1308,6 +1315,7 @@ UniValue CGovernanceManager::ToJson() const
 
 void CGovernanceManager::UpdatedBlockTip(const CBlockIndex* pindex)
 {
+    AssertLockNotHeld(cs_relay);
     // Note this gets called from ActivateBestChain without cs_main being held
     // so it should be safe to lock our mutex here without risking a deadlock
     // On the other hand it should be safe for us to access pindex without holding a lock

src/governance/governance.h

@@ -287,8 +287,8 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
 
     bool IsValid() const override { return is_valid; }
 
-    void RelayObject(const CGovernanceObject& obj);
-    void RelayVote(const CGovernanceVote& vote);
+    void RelayObject(const CGovernanceObject& obj) EXCLUSIVE_LOCKS_REQUIRED(!cs_relay);
+    void RelayVote(const CGovernanceVote& vote) EXCLUSIVE_LOCKS_REQUIRED(!cs_relay);
 
     /**
      * This is called by AlreadyHave in net_processing.cpp as part of the inventory
@@ -300,7 +300,8 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
     [[nodiscard]] MessageProcessingResult SyncSingleObjVotes(CNode& peer, const uint256& nProp, const CBloomFilter& filter, CConnman& connman);
     [[nodiscard]] MessageProcessingResult SyncObjects(CNode& peer, CConnman& connman) const;
 
-    [[nodiscard]] MessageProcessingResult ProcessMessage(CNode& peer, CConnman& connman, std::string_view msg_type, CDataStream& vRecv);
+    [[nodiscard]] MessageProcessingResult ProcessMessage(CNode& peer, CConnman& connman, std::string_view msg_type, CDataStream& vRecv)
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_relay);
 
     void DoMaintenance(CConnman& connman);
 
@@ -313,13 +314,14 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
     std::vector<CGovernanceVote> GetCurrentVotes(const uint256& nParentHash, const COutPoint& mnCollateralOutpointFilter) const;
     void GetAllNewerThan(std::vector<CGovernanceObject>& objs, int64_t nMoreThanTime) const;
 
-    void AddGovernanceObject(CGovernanceObject& govobj, const CNode* pfrom = nullptr) override;
+    void AddGovernanceObject(CGovernanceObject& govobj, const CNode* pfrom = nullptr) override
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_relay);
 
     void CheckAndRemove();
 
     UniValue ToJson() const;
 
-    void UpdatedBlockTip(const CBlockIndex* pindex);
+    void UpdatedBlockTip(const CBlockIndex* pindex) EXCLUSIVE_LOCKS_REQUIRED(!cs_relay);
     int64_t GetLastDiffTime() const { return nTimeLastDiff; }
     void UpdateLastDiffTime(int64_t nTimeIn) { nTimeLastDiff = nTimeIn; }
 
@@ -344,9 +346,10 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
 
     bool MasternodeRateCheck(const CGovernanceObject& govobj, bool fUpdateFailStatus, bool fForce, bool& fRateCheckBypassed);
 
-    bool ProcessVoteAndRelay(const CGovernanceVote& vote, CGovernanceException& exception, CConnman& connman) override;
+    bool ProcessVoteAndRelay(const CGovernanceVote& vote, CGovernanceException& exception, CConnman& connman) override
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_relay);
 
-    void CheckPostponedObjects();
+    void CheckPostponedObjects() EXCLUSIVE_LOCKS_REQUIRED(!cs_relay);
 
     bool AreRateChecksEnabled() const
     {
@@ -413,7 +416,7 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
     /// Called to indicate a requested object or vote has been received
     bool AcceptMessage(const uint256& nHash);
 
-    void CheckOrphanVotes(CGovernanceObject& govobj);
+    void CheckOrphanVotes(CGovernanceObject& govobj) EXCLUSIVE_LOCKS_REQUIRED(!cs_relay);
 
     void RebuildIndexes();