TierTwo: Only relay data if we aren't on the initial synchronization phase.

furszy · furszy · commit ff181f1e25a4 · 2021-10-27T15:23:35.000-03:00
It simply makes no sense to relay mnb, votes, proposals, etc. to the peers from where we are synchronizing our initial state while we are doing it.
diff --git a/src/budget/budgetmanager.cpp b/src/budget/budgetmanager.cpp
@@ -1015,7 +1015,10 @@ int CBudgetManager::ProcessProposal(CBudgetProposal& proposal)
     if (!AddProposal(proposal)) {
         return 0;
     }
-    proposal.Relay();
+
+    // Relay only if we are synchronized
+    // Makes no sense to relay proposals to the peers from where we are syncing them.
+    if (masternodeSync.IsSynced()) proposal.Relay();
     masternodeSync.AddedBudgetItem(nHash);
 
     LogPrint(BCLog::MNBUDGET, "mprop (new) %s\n", nHash.ToString());
@@ -1058,7 +1061,9 @@ bool CBudgetManager::ProcessProposalVote(CBudgetVote& vote, CNode* pfrom, CValid
             return state.DoS(0, false, REJECT_INVALID, "bad-mvote", false, strprintf("%s (%s)", err, mn_protx_id));
         }
 
-        vote.Relay();
+        // Relay only if we are synchronized
+        // Makes no sense to relay votes to the peers from where we are syncing them.
+        if (masternodeSync.IsSynced()) vote.Relay();
         masternodeSync.AddedBudgetItem(voteID);
         LogPrint(BCLog::MNBUDGET, "mvote - new vote (%s) for proposal %s from dmn %s\n",
                 voteID.ToString(), vote.GetProposalHash().ToString(), mn_protx_id);
@@ -1093,7 +1098,9 @@ bool CBudgetManager::ProcessProposalVote(CBudgetVote& vote, CNode* pfrom, CValid
         return state.DoS(0, false, REJECT_INVALID, "bad-mvote", false, err);
     }
 
-    vote.Relay();
+    // Relay only if we are synchronized
+    // Makes no sense to relay votes to the peers from where we are syncing them.
+    if (masternodeSync.IsSynced()) vote.Relay();
     masternodeSync.AddedBudgetItem(voteID);
     LogPrint(BCLog::MNBUDGET, "mvote - new vote (%s) for proposal %s from dmn %s\n",
             voteID.ToString(), vote.GetProposalHash().ToString(), voteVin.prevout.ToString());
@@ -1111,7 +1118,10 @@ int CBudgetManager::ProcessFinalizedBudget(CFinalizedBudget& finalbudget, CNode*
     if (!AddFinalizedBudget(finalbudget, pfrom)) {
         return 0;
     }
-    finalbudget.Relay();
+
+    // Relay only if we are synchronized
+    // Makes no sense to relay finalizations to the peers from where we are syncing them.
+    if (masternodeSync.IsSynced()) finalbudget.Relay();
     masternodeSync.AddedBudgetItem(nHash);
 
     LogPrint(BCLog::MNBUDGET, "fbs (new) %s\n", nHash.ToString());
@@ -1153,7 +1163,9 @@ bool CBudgetManager::ProcessFinalizedBudgetVote(CFinalizedBudgetVote& vote, CNod
             return state.DoS(0, false, REJECT_INVALID, "bad-fbvote", false, strprintf("%s (%s)", err, mn_protx_id));
         }
 
-        vote.Relay();
+        // Relay only if we are synchronized
+        // Makes no sense to relay votes to the peers from where we are syncing them.
+        if (masternodeSync.IsSynced()) vote.Relay();
         masternodeSync.AddedBudgetItem(voteID);
         LogPrint(BCLog::MNBUDGET, "fbvote - new vote (%s) for budget %s from dmn %s\n",
                 voteID.ToString(), vote.GetBudgetHash().ToString(), mn_protx_id);
@@ -1187,7 +1199,9 @@ bool CBudgetManager::ProcessFinalizedBudgetVote(CFinalizedBudgetVote& vote, CNod
         return state.DoS(0, false, REJECT_INVALID, "bad-fbvote", false, err);
     }
 
-    vote.Relay();
+    // Relay only if we are synchronized
+    // Makes no sense to relay votes to the peers from where we are syncing them.
+    if (masternodeSync.IsSynced()) vote.Relay();
     masternodeSync.AddedBudgetItem(voteID);
     LogPrint(BCLog::MNBUDGET, "fbvote - new vote (%s) for budget %s from mn %s\n",
             voteID.ToString(), vote.GetBudgetHash().ToString(), voteVin.prevout.ToString());
diff --git a/src/masternode-payments.cpp b/src/masternode-payments.cpp
@@ -517,7 +517,9 @@ void CMasternodePayments::ProcessMessageMasternodePayments(CNode* pfrom, std::st
         }
 
         if (masternodePayments.AddWinningMasternode(winner)) {
-            winner.Relay();
+            // Relay only if we are synchronized.
+            // Makes no sense to relay MNWinners to the peers from where we are syncing them.
+            if (masternodeSync.IsSynced()) winner.Relay();
             masternodeSync.AddedMasternodeWinner(winner.GetHash());
         }
     }
diff --git a/src/masternode.cpp b/src/masternode.cpp
@@ -544,9 +544,10 @@ bool CMasternodeBroadcast::CheckInputsAndAdd(int nChainHeight, int& nDoS)
         activeMasternode.EnableHotColdMasterNode(vin, addr);
     }
 
+    // Relay only if we are synchronized and if the mnb address is not local.
+    // Makes no sense to relay MNBs to the peers from where we are syncing them.
     bool isLocal = (addr.IsRFC1918() || addr.IsLocal()) && !Params().IsRegTestNet();
-
-    if (!isLocal) Relay();
+    if (!isLocal && masternodeSync.IsSynced()) Relay();
 
     return true;
 }

Original file line number	Diff line number	Diff line change
`@@ -517,7 +517,9 @@ void CMasternodePayments::ProcessMessageMasternodePayments(CNode* pfrom, std::st`
`517`	`517`	`}`
`518`	`518`
`519`	`519`	`if (masternodePayments.AddWinningMasternode(winner)) {`
`520`		`- winner.Relay();`
	`520`	`+ // Relay only if we are synchronized.`
	`521`	`+ // Makes no sense to relay MNWinners to the peers from where we are syncing them.`
	`522`	`+ if (masternodeSync.IsSynced()) winner.Relay();`
`521`	`523`	`masternodeSync.AddedMasternodeWinner(winner.GetHash());`
`522`	`524`	`}`
`523`	`525`	`}`
Original file line number	Diff line number	Diff line change
`@@ -544,9 +544,10 @@ bool CMasternodeBroadcast::CheckInputsAndAdd(int nChainHeight, int& nDoS)`
`544`	`544`	`activeMasternode.EnableHotColdMasterNode(vin, addr);`
`545`	`545`	`}`
`546`	`546`
	`547`	`+ // Relay only if we are synchronized and if the mnb address is not local.`
	`548`	`+ // Makes no sense to relay MNBs to the peers from where we are syncing them.`
`547`	`549`	`bool isLocal = (addr.IsRFC1918() \|\| addr.IsLocal()) && !Params().IsRegTestNet();`
`548`		`-`
`549`		`- if (!isLocal) Relay();`
	`550`	`+ if (!isLocal && masternodeSync.IsSynced()) Relay();`
`550`	`551`
`551`	`552`	`return true;`
`552`	`553`	`}`