From 57d3559c047f4da2988aed4b1c329b23864a6d6b Mon Sep 17 00:00:00 2001 From: Evan Duffield Date: Mon, 26 May 2014 12:34:07 -0700 Subject: [PATCH] fork to stop masternode payments --- src/clientversion.h | 2 +- src/main.cpp | 3 ++- src/main.h | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/clientversion.h b/src/clientversion.h index 6154936d6408a..933ba3d9fb81d 100644 --- 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 index 06e2b5c813c55..06a231c1340d4 100644 --- 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 index 10ef901a59a07..41b18de7588c1 100644 --- 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; }