Consensus: Budget: Fix instant killing of proposals

random-zebra · random-zebra · commit b0c6dc1f75f2 · 2020-12-17T19:09:16.000+01:00
- raise the threshold required to 30%
- never kill a proposal before its start
diff --git a/src/budget/budgetproposal.cpp b/src/budget/budgetproposal.cpp
@@ -79,10 +79,10 @@ void CBudgetProposal::SyncVotes(CNode* pfrom, bool fPartial, int& nInvCount) con
     }
 }
 
-bool CBudgetProposal::IsHeavilyDownvoted()
+bool CBudgetProposal::IsHeavilyDownvoted(bool fNewRules)
 {
-    if (GetNays() - GetYeas() > mnodeman.CountEnabled(ActiveProtocol()) / 10) {
-        strInvalid = "Active removal";
+    if (GetNays() - GetYeas() > (fNewRules ? 3 : 1) * mnodeman.CountEnabled(ActiveProtocol()) / 10) {
+        strInvalid = "Heavily Downvoted";
         return true;
     }
     return false;
@@ -162,8 +162,12 @@ bool CBudgetProposal::UpdateValid(int nCurrentHeight)
 {
     fValid = false;
 
-    if (IsHeavilyDownvoted()) {
-        return false;
+    // !TODO: remove after v5 enforcement and use fixed multiplier (3)
+    bool fNewRules = Params().GetConsensus().NetworkUpgradeActive(nCurrentHeight, Consensus::UPGRADE_V5_0);
+
+    // Never kill a proposal before the first superblock
+    if (!fNewRules || nCurrentHeight > nBlockStart) {
+        if (IsHeavilyDownvoted(fNewRules)) return false;
     }
 
     if (IsExpired(nCurrentHeight)) {
diff --git a/src/budget/budgetproposal.h b/src/budget/budgetproposal.h
@@ -27,7 +27,7 @@ class CBudgetProposal
     std::string strInvalid;
 
     // Functions used inside UpdateValid()/IsWellFormed - setting strInvalid
-    bool IsHeavilyDownvoted();
+    bool IsHeavilyDownvoted(bool fNewRules);
     bool IsExpired(int nCurrentHeight);
     bool CheckStartEnd();
     bool CheckAmount(const CAmount& nTotalBudget);

Original file line number	Diff line number	Diff line change
`@@ -79,10 +79,10 @@ void CBudgetProposal::SyncVotes(CNode* pfrom, bool fPartial, int& nInvCount) con`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`
`82`		`-bool CBudgetProposal::IsHeavilyDownvoted()`
	`82`	`+bool CBudgetProposal::IsHeavilyDownvoted(bool fNewRules)`
`83`	`83`	`{`
`84`		`- if (GetNays() - GetYeas() > mnodeman.CountEnabled(ActiveProtocol()) / 10) {`
`85`		`- strInvalid = "Active removal";`
	`84`	`+ if (GetNays() - GetYeas() > (fNewRules ? 3 : 1) * mnodeman.CountEnabled(ActiveProtocol()) / 10) {`
	`85`	`+ strInvalid = "Heavily Downvoted";`
`86`	`86`	`return true;`
`87`	`87`	`}`
`88`	`88`	`return false;`
`@@ -162,8 +162,12 @@ bool CBudgetProposal::UpdateValid(int nCurrentHeight)`
`162`	`162`	`{`
`163`	`163`	`fValid = false;`
`164`	`164`
`165`		`- if (IsHeavilyDownvoted()) {`
`166`		`- return false;`
	`165`	`+ // !TODO: remove after v5 enforcement and use fixed multiplier (3)`
	`166`	`+ bool fNewRules = Params().GetConsensus().NetworkUpgradeActive(nCurrentHeight, Consensus::UPGRADE_V5_0);`
	`167`	`+`
	`168`	`+ // Never kill a proposal before the first superblock`
	`169`	`+ if (!fNewRules \|\| nCurrentHeight > nBlockStart) {`
	`170`	`+ if (IsHeavilyDownvoted(fNewRules)) return false;`
`167`	`171`	`}`
`168`	`172`
`169`	`173`	`if (IsExpired(nCurrentHeight)) {`