Do not check cumulative before FCC (#1559)

Co-authored-by: Prasanna Loganathar <[email protected]>
DeFiCh · Nov 14, 2022 · 409bf5e · 409bf5e
1 parent 01a44aa
commit 409bf5e
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/src/masternodes/mn_checks.cpp b/src/masternodes/mn_checks.cpp
@@ -2182,7 +2182,7 @@ class CCustomTxApplyVisitor : public CCustomTxVisitor
         }
 
         // Validate GovVariables before storing
-        if (obj.govVar->GetName() == "ATTRIBUTES") {
+        if (height >= static_cast<uint32_t>(consensus.FortCanningCrunchHeight) && obj.govVar->GetName() == "ATTRIBUTES") {
 
             auto govVar = mnview.GetAttributes();
             if (!govVar) {
@@ -2195,10 +2195,8 @@ class CCustomTxApplyVisitor : public CCustomTxVisitor
             CCustomCSView govCache(mnview);
             for (const auto& [varHeight, var] : storedGovVars) {
                 if (var->GetName() == "ATTRIBUTES") {
-                    if (!(res = govVar->Import(var->Export())) ||
-                        !(res = govVar->Validate(govCache)) ||
-                        !(res = govVar->Apply(govCache, varHeight))) {
-                        return Res::Err("%s: Cumulative application of Gov vars failed: %s", obj.govVar->GetName(), res.msg);
+                    if (res = govVar->Import(var->Export()); !res) {
+                        return Res::Err("%s: Failed to import stored vars: %s", obj.govVar->GetName(), res.msg);
                     }
                 }
             }