Changed reward structure, version bump

Author: modzer0hax

configure.ac

@@ -1,7 +1,7 @@
 dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 1)
-define(_CLIENT_VERSION_MINOR, 1)
+define(_CLIENT_VERSION_MINOR, 2)
 define(_CLIENT_VERSION_REVISION, 0)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)

src/main.cpp

@@ -1651,6 +1651,8 @@ int64_t GetBlockValue(int nHeight)
 	if (nHeight > 867240) nSubsidy = COIN * 3;
 
 	if (nHeight <= 2016) nSubsidy /= 10000 ;
+
+    if (nHeight >= 50000) nSubsidy /= 10;
 
 	return nSubsidy;
 }
@@ -1668,7 +1670,7 @@ int64_t GetMasternodePayment(int nHeight, int64_t blockValue, int nMasternodeCou
             return 0;
     }
 
-    if (nHeight > 19710) {
+    if (nHeight > 19710 && nHeight < 50000) {
         ret = blockValue  / 100 * 90;
     } else {
         ret = blockValue  / 100 * 60;

src/masternode-payments.cpp

@@ -529,7 +529,7 @@ bool CMasternodeBlockPayees::IsTransactionValid(const CTransaction& txNew)
 	int nMasternode_Drift_Count = 0;
     std::string strPayeesPossible = "";
 
-    CAmount nReward = GetBlockValue(nBlockHeight);
+    CAmount nReward = GetBlockValue(nBlockHeight-1);
 
     if (IsSporkActive(SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT)) {
         // Get a stable number of masternodes by ignoring newly activated (< 8000 sec old) masternodes
@@ -542,7 +542,7 @@ bool CMasternodeBlockPayees::IsTransactionValid(const CTransaction& txNew)
         nMasternode_Drift_Count = mnodeman.size() + Params().MasternodeCountDrift();
     }
 
-    CAmount requiredMasternodePayment = GetMasternodePayment(nBlockHeight, nReward, nMasternode_Drift_Count);
+    CAmount requiredMasternodePayment = GetMasternodePayment(nBlockHeight-1, nReward, nMasternode_Drift_Count);
 
     //require at least 6 signatures
     BOOST_FOREACH (CMasternodePayee& payee, vecPayments)

src/version.h

@@ -13,7 +13,7 @@
  * network protocol versioning
  */
 
-static const int PROTOCOL_VERSION = 70714;
+static const int PROTOCOL_VERSION = 70716;
 
 //! initial proto version, to be increased after version/verack negotiation
 static const int INIT_PROTO_VERSION = 209;