Fix logic in GetMasternodePayment

VitaeTeam · Jan 23, 2021 · 33fe425 · 33fe425
1 parent d02e4e4
commit 33fe425
Showing 1 changed file with 6 additions and 11 deletions.
diff --git a/src/main.cpp b/src/main.cpp
@@ -2279,26 +2279,21 @@ CAmount GetMasternodePayment(int nHeight, int64_t blockValue, int nMasternodeCou
 {
     int64_t ret = 0;
 
-    if (Params().NetworkID() == CBaseChainParams::MAIN) {
-        if (nHeight < 209467) {
-            ret = blockValue * .25;
-        }
-    }
     if (Params().NetworkID() == CBaseChainParams::TESTNET) {
         if (nHeight < 200)
             return 0;
-        // Start TESTNET seesaw at block 138000
-        if (nHeight < 137910) {
-            ret = blockValue * .25;
-        }
     }
-
+    if(Params().NetworkID() == CBaseChainParams::MAIN && nHeight < 209467){
+        ret = blockValue * .25;
+    }
+    else if(Params().NetworkID() == CBaseChainParams::TESTNET && nHeight < 137910){
+        ret = blockValue * .25;
+    }
     // Keep seesaw protocol until removal spork is activated
     else if(nHeight < GetSporkValue(SPORK_22_REMOVE_SEESAW_BLOCK)){
         blockValue = blockValue * 0.6 ;
         ret = GetSeeSaw(nHeight, blockValue);
     }
-    // After seesaw removal, keep masternode payment constant at 2 VITAE
     else{
         ret = (blockValue * 4 )/ 10;
     }