From 9b7b24620b7ebaf31a40e6b4d81f8a4e80b19f13 Mon Sep 17 00:00:00 2001 From: Liquid Date: Thu, 15 Feb 2024 18:29:58 -0600 Subject: [PATCH] Update Protocol Version 70927 Update message tests version --- src/validation.cpp | 10 +++++----- src/version.h | 6 +++--- test/functional/test_framework/messages.py | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/validation.cpp b/src/validation.cpp index c9cdc58ce3ae3..f087d59551f08 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -4211,13 +4211,13 @@ void static CheckBlockIndex() int ActiveProtocol() { // SPORK_14 is used for 70926 (v5.5.0), commented out now. - if (sporkManager.IsSporkActive(SPORK_14_NEW_PROTOCOL_ENFORCEMENT)) - return MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT; - - // SPORK_15 is used for 70923 (v5.3.0), commented out now. - //if (sporkManager.IsSporkActive(SPORK_15_NEW_PROTOCOL_ENFORCEMENT_2)) + //if (sporkManager.IsSporkActive(SPORK_14_NEW_PROTOCOL_ENFORCEMENT)) // return MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT; + // SPORK_15 is used for 70927 (v5.6.0), commented out now. + if (sporkManager.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 f5d75e801e86f..b8b08d9cea4a5 100644 --- a/src/version.h +++ b/src/version.h @@ -11,14 +11,14 @@ * 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; //! disconnect from peers older than this proto version -static const int MIN_PEER_PROTO_VERSION_BEFORE_ENFORCEMENT = 70923; -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; //! Version where BIP155 was introduced static const int MIN_BIP155_PROTOCOL_VERSION = 70923; diff --git a/test/functional/test_framework/messages.py b/test/functional/test_framework/messages.py index fb727d925243e..694397c96bd5a 100755 --- a/test/functional/test_framework/messages.py +++ b/test/functional/test_framework/messages.py @@ -31,7 +31,7 @@ from .util import hex_str_to_bytes MIN_VERSION_SUPPORTED = 60001 -MY_VERSION = 70925 +MY_VERSION = 70926 MY_SUBVERSION = "/python-mininode-tester:0.0.3/" MY_RELAY = 1 # from version 70001 onwards, fRelay should be appended to version messages (BIP37)