From ef1ee92c1edb67d563028b937b46f7625b3357b2 Mon Sep 17 00:00:00 2001 From: yurykk Date: Sun, 31 Jul 2022 14:04:03 +0200 Subject: [PATCH] 3.3.9.1 --- configure.ac | 2 +- src/main.cpp | 12 ++++++------ src/version.h | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index c7dc0e67a..33a847941 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 3) define(_CLIENT_VERSION_MINOR, 3) define(_CLIENT_VERSION_REVISION, 9) -define(_CLIENT_VERSION_BUILD, 0) +define(_CLIENT_VERSION_BUILD, 1) define(_CLIENT_VERSION_IS_RELEASE, true) define(_COPYRIGHT_YEAR, 2020) AC_INIT([TWINS Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[win.win],[twins]) diff --git a/src/main.cpp b/src/main.cpp index 7987c5b90..ed48bb870 100755 --- a/src/main.cpp +++ b/src/main.cpp @@ -6587,13 +6587,13 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, // it was the one which was commented out int ActiveProtocol() { - // SPORK_14 reserved for future use, commented out now( was for 70925) - // if (IsSporkActive(SPORK_14_NEW_PROTOCOL_ENFORCEMENT)) - // return MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT; + // SPORK_14 is used for 70927 + if (IsSporkActive(SPORK_14_NEW_PROTOCOL_ENFORCEMENT)) + return MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT; - // SPORK_15 is used for 70926 - if (IsSporkActive(SPORK_15_NEW_PROTOCOL_ENFORCEMENT_2)) - return MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT; + // SPORK_15 reserved for future use, commented out now( was for 70926) + // if (IsSporkActive(SPORK_15_NEW_PROTOCOL_ENFORCEMENT_2)) + // return MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT; return MIN_PEER_PROTO_VERSION_BEFORE_ENFORCEMENT; } diff --git a/src/version.h b/src/version.h index 0a27d6d4a..b4721a6d7 100644 --- a/src/version.h +++ b/src/version.h @@ -12,7 +12,7 @@ * network protocol versioning */ -static const int PROTOCOL_VERSION = 70926; +static const int PROTOCOL_VERSION = 70927; //! 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 = 70077; //! disconnect from peers older than this proto version -static const int MIN_PEER_PROTO_VERSION_BEFORE_ENFORCEMENT = 70925; -static const int MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT = 70926; +static const int MIN_PEER_PROTO_VERSION_BEFORE_ENFORCEMENT = 70926; +static const int MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT = 70927; //! masternodes older than this proto version use old strMessage format for mnannounce static const int MIN_PEER_MNANNOUNCE = 70913;