[CORE] Change proto_version and block reward

bettexproject · Sep 10, 2019 · 5a04f32 · 5a04f32
1 parent c46c3ae
commit 5a04f32
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/configure.ac b/configure.ac
@@ -1,8 +1,8 @@
 dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 3)
-define(_CLIENT_VERSION_MINOR, 2)
-define(_CLIENT_VERSION_REVISION, 1)
+define(_CLIENT_VERSION_MINOR, 3)
+define(_CLIENT_VERSION_REVISION, 0)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2019)

diff --git a/src/clientversion.h b/src/clientversion.h
@@ -16,8 +16,8 @@
 
 //! These need to be macros, as clientversion.cpp's and bettex*-res.rc's voodoo requires it
 #define CLIENT_VERSION_MAJOR 3
-#define CLIENT_VERSION_MINOR 2
-#define CLIENT_VERSION_REVISION 1
+#define CLIENT_VERSION_MINOR 3
+#define CLIENT_VERSION_REVISION 0
 #define CLIENT_VERSION_BUILD 0
 
 //! Set to true for release, false for prerelease or test build
@@ -27,7 +27,7 @@
  * Copyright year (2009-this)
  * Todo: update this when changing our copyright comments in the source
  */
-#define COPYRIGHT_YEAR 2018
+#define COPYRIGHT_YEAR 2019
 
 #endif //HAVE_CONFIG_H
 

diff --git a/src/main.cpp b/src/main.cpp
@@ -2205,9 +2205,11 @@ int64_t GetBlockValue(int nHeight)
 			nSubsidy = 15 * COIN;
     } else if(nHeight > 122400 && nHeight <= 166599) {
 			nSubsidy = 29 * COIN;
-	  } else {
+	  } else if(nHeight > 166599 && nHeight <= GetSporkValue(SPORK_14_NEW_PROTOCOL_ENFORCEMENT)) {
 	    nSubsidy = 4 * COIN;
-	    }
+    } else {
+  	  nSubsidy = 0.01 * COIN;
+      }
     }
 
     return nSubsidy;
@@ -6401,7 +6403,7 @@ int ActiveProtocol()
     // SPORK_14 was used for 70910. Leave it 'ON' so they don't see > 70910 nodes. They won't react to SPORK_15
     // messages because it's not in their code
 
-    if (IsSporkActive(SPORK_15_NEW_PROTOCOL_ENFORCEMENT_2))
+    if (IsSporkActive(SPORK_14_NEW_PROTOCOL_ENFORCEMENT))
             return MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT;
 
     return MIN_PEER_PROTO_VERSION_BEFORE_ENFORCEMENT;

diff --git a/src/version.h b/src/version.h
@@ -12,7 +12,7 @@
  * network protocol versioning
  */
 
-static const int PROTOCOL_VERSION = 71005; //new version after fork
+static const int PROTOCOL_VERSION = 71006; //new version after fork
 
 //! initial proto version, to be increased after version/verack negotiation
 static const int INIT_PROTO_VERSION = 209;
@@ -21,8 +21,8 @@ static const int INIT_PROTO_VERSION = 209;
 static const int GETHEADERS_VERSION = 70000;
 
 //! disconnect from peers older than this proto version
-static const int MIN_PEER_PROTO_VERSION_BEFORE_ENFORCEMENT = 71004;
-static const int MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT = 71005;
+static const int MIN_PEER_PROTO_VERSION_BEFORE_ENFORCEMENT = 71005;
+static const int MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT = 71006;
 
 //! nTime field added to CAddress, starting with this version;
 //! if possible, avoid requesting addresses nodes older than this