Merge pull request #100 from VitaeTeam/rel-4.6.0-fix

Bumped version and protocol for v4.6.1
VitaeTeam · Mar 5, 2021 · 9b14c34 · 9b14c34
2 parents 5536c88 + 6d7041d
commit 9b14c34
Show file tree

Hide file tree

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

diff --git a/src/clientversion.h b/src/clientversion.h
@@ -16,7 +16,7 @@
 //! These need to be macros, as clientversion.cpp's and vitae*-res.rc's voodoo requires it
 #define CLIENT_VERSION_MAJOR 4
 #define CLIENT_VERSION_MINOR 6
-#define CLIENT_VERSION_REVISION 0
+#define CLIENT_VERSION_REVISION 1
 #define CLIENT_VERSION_BUILD 0
 
 //! Set to true for release, false for prerelease or test build

diff --git a/src/main.cpp b/src/main.cpp
@@ -6730,7 +6730,7 @@ int ActiveProtocol()
 
 */
 
-    // SPORK_25 is used for 71025. Nodes < 71025 won't see it and still get their protocol version via SPORK_14 and their
+    // SPORK_25 is used for 71026. Nodes < 71026 won't see it and still get their protocol version via SPORK_14 and their
     // own ModifierUpgradeBlock()
 
     if (IsSporkActive(SPORK_25_NEW_PROTOCOL_ENFORCEMENT_6))

diff --git a/src/version.h b/src/version.h
@@ -11,7 +11,7 @@
  * network protocol versioning
  */
 
-static const int PROTOCOL_VERSION = 71025;
+static const int PROTOCOL_VERSION = 71026;
 
 //! initial proto version, to be increased after version/verack negotiation
 static const int INIT_PROTO_VERSION = 209;
@@ -21,7 +21,7 @@ static const int GETHEADERS_VERSION = 70077;
 
 //! disconnect from peers older than this proto version
 static const int MIN_PEER_PROTO_VERSION_BEFORE_ENFORCEMENT = 71010;
-static const int MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT = 71025;
+static const int MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT = 71026;
 
 //! masternodes older than this proto version use old strMessage format for mnannounce
 static const int MIN_PEER_MNANNOUNCE = 71024;