Revert block rewards at height 123700

AegeusCoin · May 10, 2018 · ab6cade · ab6cade
1 parent 68488cc
commit ab6cade
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/configure.ac b/configure.ac
@@ -3,7 +3,7 @@ AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 1)
 define(_CLIENT_VERSION_MINOR, 1)
 define(_CLIENT_VERSION_REVISION, 0)
-define(_CLIENT_VERSION_BUILD, 0)
+define(_CLIENT_VERSION_BUILD, 1)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2018)
 AC_INIT([Aegeus Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[www.aegeus.io],[aegeus])

diff --git a/src/clientversion.h b/src/clientversion.h
@@ -17,7 +17,7 @@
 #define CLIENT_VERSION_MAJOR 1
 #define CLIENT_VERSION_MINOR 1
 #define CLIENT_VERSION_REVISION 0
-#define CLIENT_VERSION_BUILD 0
+#define CLIENT_VERSION_BUILD 1
 
 //! 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
@@ -1600,7 +1600,7 @@ int64_t GetBlockValue(int nHeight)
 
     if (nHeight < 2 && nHeight > 0) {
     	return 21000000 * COIN;
-    } else if (nHeight >= 123314) {
+    } else if (nHeight >= 123314 && nHeight < 123700) {
     	return 40 * COIN;
     }
 
@@ -1611,7 +1611,7 @@ int64_t GetMasternodePayment(int nHeight, int64_t blockValue, int nMasternodeCou
 {
     int64_t ret = 0;
 
-    if (nHeight >= 123314) {
+    if (nHeight >= 123314 && nHeight < 123700) {
       ret = 100 * COIN;
     } else {
       ret = blockValue / 2;
@@ -5332,8 +5332,8 @@ int ActiveProtocol()
             return MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT;
 */
 
-    if (chainActive.Tip()->nHeight >= 123314) {
-      return 70811;
+    if (chainActive.Tip()->nHeight >= 123700) {
+      return 70812;
     }
 
     return MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT;

diff --git a/src/version.h b/src/version.h
@@ -12,7 +12,7 @@
  * network protocol versioning
  */
 
-static const int PROTOCOL_VERSION = 70811;
+static const int PROTOCOL_VERSION = 70812;
 
 //! initial proto version, to be increased after version/verack negotiation
 static const int INIT_PROTO_VERSION = 209;
@@ -21,16 +21,16 @@ static const int INIT_PROTO_VERSION = 209;
 static const int GETHEADERS_VERSION = 70077;
 
 //! disconnect from peers older than this proto version
-static const int MIN_PEER_PROTO_VERSION_BEFORE_ENFORCEMENT = 70810;
-static const int MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT = 70810;
+static const int MIN_PEER_PROTO_VERSION_BEFORE_ENFORCEMENT = 70811;
+static const int MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT = 70811;
 
 //! nTime field added to CAddress, starting with this version;
 //! if possible, avoid requesting addresses nodes older than this
 static const int CADDR_TIME_VERSION = 31402;
 
 //! only request blocks from nodes outside this range of versions
 static const int NOBLKS_VERSION_START = 32000;
-static const int NOBLKS_VERSION_END = 70909;
+static const int NOBLKS_VERSION_END = 70812;
 
 //! BIP 0031, pong message, is enabled for all versions AFTER this one
 static const int BIP0031_VERSION = 60000;