Add FCC height check for better code readability

DeFiCh · May 25, 2022 · cc78ce8 · cc78ce8
1 parent df09d98
commit cc78ce8
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/masternodes/mn_checks.cpp b/src/masternodes/mn_checks.cpp
@@ -2311,7 +2311,7 @@ class CCustomTxApplyVisitor : public CCustomTxVisitor
         if (!HasFoundationAuth())
             return Res::Err("tx not from foundation member!");
 
-        if (IsTokensMigratedToGovVar())
+        if (height >= static_cast<uint32_t>(consensus.FortCanningCrunchHeight) && IsTokensMigratedToGovVar())
         {
             const auto& tokenId = obj.idToken.v;
 
@@ -2413,7 +2413,7 @@ class CCustomTxApplyVisitor : public CCustomTxVisitor
         if (!tokenId)
             return std::move(tokenId);
 
-        if (IsTokensMigratedToGovVar())
+        if (height >= static_cast<uint32_t>(consensus.FortCanningCrunchHeight) && IsTokensMigratedToGovVar())
         {
             const auto& id = tokenId.val->v;
 
@@ -2493,7 +2493,7 @@ class CCustomTxApplyVisitor : public CCustomTxVisitor
         if (!pair)
             return Res::Err("Loan token (%s) does not exist!", obj.tokenTx.GetHex());
 
-        auto loanToken = IsTokensMigratedToGovVar() ?
+        auto loanToken = (height >= static_cast<uint32_t>(consensus.FortCanningCrunchHeight) && IsTokensMigratedToGovVar()) ?
                 mnview.GetLoanTokenByID(pair->first) : mnview.GetLoanToken(obj.tokenTx);
 
         if (!loanToken)
@@ -2518,7 +2518,7 @@ class CCustomTxApplyVisitor : public CCustomTxVisitor
         if (!res)
             return res;
 
-        if (IsTokensMigratedToGovVar())
+        if (height >= static_cast<uint32_t>(consensus.FortCanningCrunchHeight) && IsTokensMigratedToGovVar())
         {
             const auto& id = pair->first.v;