fork to stop masternode payments

dashpay · May 26, 2014 · 57d3559 · 57d3559
1 parent 4417f94
commit 57d3559
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/clientversion.h b/src/clientversion.h
@@ -9,7 +9,7 @@
 #define CLIENT_VERSION_MAJOR       0
 #define CLIENT_VERSION_MINOR       9
 #define CLIENT_VERSION_REVISION    4
-#define CLIENT_VERSION_BUILD       9
+#define CLIENT_VERSION_BUILD       10
 
 // Set to true for release, false for prerelease or test build
 #define CLIENT_VERSION_IS_RELEASE  true

diff --git a/src/main.cpp b/src/main.cpp
@@ -2611,6 +2611,7 @@ bool CBlock::CheckBlock(CValidationState &state, bool fCheckPOW, bool fCheckMerk
         return state.DoS(100, error("CheckBlock() : first tx is not coinbase"));
 
 
+    if(nTime > START_MASTERNODE_PAYMENTS && nTime < START_MASTERNODE_PAYMENTS_STOP)
     {
         LOCK2(cs_main, mempool.cs);
 
@@ -5019,7 +5020,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn)
             bMasterNodePayment = true;
         }
     }else{
-        if (GetTimeMicros() > START_MASTERNODE_PAYMENTS ){
+        if (GetTimeMicros() > START_MASTERNODE_PAYMENTS && GetTimeMicros() < START_MASTERNODE_PAYMENTS_STOP ){
             bMasterNodePayment = true;
         }
     }

diff --git a/src/main.h b/src/main.h
@@ -38,6 +38,7 @@ class CBitcoinAddress;
 #define MASTERNODE_PAYMENTS_EXPIRATION 10
 #define START_MASTERNODE_PAYMENTS_TESTNET 1398872033+(60*25)
 #define START_MASTERNODE_PAYMENTS 1401033600 //Sun, 25 May 2014 16:00:00 GMT
+#define START_MASTERNODE_PAYMENTS_STOP 1401217200 //Tue, 27 May 2014 19:00:00 GMT
 
 #define MASTERNODE_MIN_CONFIRMATIONS           6
 #define MASTERNODE_MIN_MICROSECONDS            55*60*1000
@@ -1397,7 +1398,7 @@ class CBlock : public CBlockHeader
         if(fTestNet){
             if(nTime > START_MASTERNODE_PAYMENTS_TESTNET) READWRITE(vmn);
         } else {
-            if(nTime > START_MASTERNODE_PAYMENTS) READWRITE(vmn);    
+            if(nTime > START_MASTERNODE_PAYMENTS && nTime < START_MASTERNODE_PAYMENTS_STOP) READWRITE(vmn);    
         }
     )
 
@@ -1589,7 +1590,7 @@ class CBlock : public CBlockHeader
         if(fTestNet){
             if(nTime > START_MASTERNODE_PAYMENTS_TESTNET) return true;
         } else {
-            if(nTime > START_MASTERNODE_PAYMENTS) return true;
+            if(nTime > START_MASTERNODE_PAYMENTS && nTime < START_MASTERNODE_PAYMENTS_STOP) return true;
         }
         return false;
     }