mn_net: store local DMN protxhash instead of access the activeMnManag…

…er object. Removing the following circular dependency: "activemasternode -> net -> tiertwo/net_masternodes -> activemasternode"
PIVX-Project · Jan 17, 2022 · 693bff6 · 693bff6
1 parent 6015d90
commit 693bff6
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 5 deletions.
diff --git a/src/activemasternode.cpp b/src/activemasternode.cpp
@@ -13,6 +13,7 @@
 #include "messagesigner.h"
 #include "netbase.h"
 #include "protocol.h"
+#include "tiertwo/net_masternodes.h"
 #include "tiertwo/tiertwo_sync_state.h"
 #include "validation.h"
 
@@ -133,6 +134,7 @@ void CActiveDeterministicMasternodeManager::Init(const CBlockIndex* pindexTip)
     LogPrintf("%s: proTxHash=%s, proTx=%s\n", __func__, dmn->proTxHash.ToString(), dmn->ToString());
 
     info.proTxHash = dmn->proTxHash;
+    g_connman->GetTierTwoConnMan()->setLocalDMN(info.proTxHash);
 
     if (info.service != dmn->pdmnState->addr) {
         state = MASTERNODE_ERROR;

diff --git a/src/activemasternode.h b/src/activemasternode.h
@@ -8,7 +8,6 @@
 
 #include "key.h"
 #include "evo/deterministicmns.h"
-#include "net.h"
 #include "operationresult.h"
 #include "sync.h"
 #include "validationinterface.h"

diff --git a/src/evo/mnauth.cpp b/src/evo/mnauth.cpp
@@ -8,12 +8,13 @@
 #include "activemasternode.h"
 #include "chainparams.h"
 #include "consensus/validation.h"
-#include "tiertwo/masternode_meta_manager.h"
+#include "net.h" // for CSerializedNetMsg
 #include "netmessagemaker.h"
 #include "llmq/quorums_utils.h"
-#include "util/system.h" // for fMasternode and gArgs access
+#include "tiertwo/masternode_meta_manager.h"
 #include "tiertwo/net_masternodes.h"
 #include "tiertwo/tiertwo_sync_state.h"
+#include "util/system.h" // for fMasternode and gArgs access
 
 #include "version.h" // for MNAUTH_NODE_VER_VERSION
 

diff --git a/src/tiertwo/net_masternodes.cpp b/src/tiertwo/net_masternodes.cpp
@@ -5,12 +5,12 @@
 
 #include "tiertwo/net_masternodes.h"
 
-#include "activemasternode.h"
 #include "chainparams.h"
 #include "evo/deterministicmns.h"
 #include "scheduler.h"
 #include "tiertwo/masternode_meta_manager.h" // for g_mmetaman
 #include "tiertwo/tiertwo_sync_state.h"
+#include "net.h"
 #include "netmessagemaker.h"
 
 TierTwoConnMan::TierTwoConnMan(CConnman* _connman) : connman(_connman) {}
@@ -237,7 +237,7 @@ void TierTwoConnMan::ThreadOpenMasternodeConnections()
                         }
 
                         // Don't try to connect to ourselves
-                        if (activeMasternodeManager && activeMasternodeManager->GetInfo()->proTxHash == proRegTxHash) {
+                        if (WITH_LOCK(cs_vPendingMasternodes, return local_dmn_pro_tx_hash && *local_dmn_pro_tx_hash == proRegTxHash)) {
                             continue;
                         }
 

diff --git a/src/tiertwo/net_masternodes.h b/src/tiertwo/net_masternodes.h
@@ -55,6 +55,9 @@ class TierTwoConnMan
     // Adds the DMNs to the pending to probe list
     void addPendingProbeConnections(const std::set<uint256>& proTxHashes);
 
+    // Set the local DMN so the node does not try to connect to himself
+    void setLocalDMN(const uint256& pro_tx_hash) { WITH_LOCK(cs_vPendingMasternodes, local_dmn_pro_tx_hash = pro_tx_hash;); }
+
     // Manages the MN connections
     void ThreadOpenMasternodeConnections();
     void start(CScheduler& scheduler, const TierTwoConnMan::Options& options);
@@ -72,6 +75,9 @@ class TierTwoConnMan
     std::map<QuorumTypeAndHash, std::set<uint256>> masternodeQuorumRelayMembers GUARDED_BY(cs_vPendingMasternodes);
     std::set<uint256> masternodePendingProbes GUARDED_BY(cs_vPendingMasternodes);
 
+    // The local DMN
+    Optional<uint256> local_dmn_pro_tx_hash GUARDED_BY(cs_vPendingMasternodes){nullopt};
+
     // parent connections manager
     CConnman* connman;
 

diff --git a/test/lint/lint-circular-dependencies.sh b/test/lint/lint-circular-dependencies.sh
@@ -24,6 +24,7 @@ EXPECTED_CIRCULAR_DEPENDENCIES=(
     "masternode-payments -> validation -> masternode-payments"
     "masternode-sync -> masternodeman -> masternode-sync"
     "masternodeman -> validation -> masternodeman"
+    "net -> tiertwo/net_masternodes -> net"
     "policy/fees -> txmempool -> policy/fees"
     "policy/policy -> validation -> policy/policy"
     "qt/pivx/addresseswidget -> qt/pivx/pivxgui -> qt/pivx/addresseswidget"
@@ -55,6 +56,7 @@ EXPECTED_CIRCULAR_DEPENDENCIES=(
     "chain -> legacy/stakemodifier -> validation -> undo -> chain"
     "chain -> legacy/stakemodifier -> validation -> pow -> chain"
     "evo/deterministicmns -> masternodeman -> validation -> validationinterface -> evo/deterministicmns"
+    "evo/deterministicmns -> llmq/quorums_utils -> net -> tiertwo/net_masternodes -> evo/deterministicmns"
 )
 
 EXIT_CODE=0