diff --git a/configure.ac b/configure.ac index a9f70e1772f02..a1b74197debad 100644 --- 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, 2) -define(_CLIENT_VERSION_MINOR, 1) -define(_CLIENT_VERSION_REVISION, 0) +define(_CLIENT_VERSION_MINOR, 0) +define(_CLIENT_VERSION_REVISION, 5) define(_CLIENT_VERSION_BUILD, 0) define(_CLIENT_VERSION_IS_RELEASE, true) define(_COPYRIGHT_YEAR, 2016) diff --git a/src/clientversion.h b/src/clientversion.h index c09012a8d5470..b2f1b3292b5ab 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -15,8 +15,8 @@ //! These need to be macros, as clientversion.cpp's and darknet*-res.rc's voodoo requires it #define CLIENT_VERSION_MAJOR 2 -#define CLIENT_VERSION_MINOR 1 -#define CLIENT_VERSION_REVISION 0 +#define CLIENT_VERSION_MINOR 0 +#define CLIENT_VERSION_REVISION 5 #define CLIENT_VERSION_BUILD 0 //! Set to true for release, false for prerelease or test build diff --git a/src/version.h b/src/version.h index db3c6d6c1097a..3131060995feb 100644 --- a/src/version.h +++ b/src/version.h @@ -11,7 +11,7 @@ * network protocol versioning */ -static const int PROTOCOL_VERSION = 70700; +static const int PROTOCOL_VERSION = 70650; //! initial proto version, to be increased after version/verack negotiation static const int INIT_PROTO_VERSION = 209; @@ -20,11 +20,11 @@ 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 = 70700; -static const int MIN_PEER_PROTO_VERSION_POS = 70700; +static const int MIN_PEER_PROTO_VERSION = 70600; +static const int MIN_PEER_PROTO_VERSION_POS = 70600; //! minimum peer version accepted by ObfuscationPool -static const int MIN_POOL_PEER_PROTO_VERSION = 70700; +static const int MIN_POOL_PEER_PROTO_VERSION = 70600; //! minimum peer version for masternode budgets static const int MIN_BUDGET_PEER_PROTO_VERSION = 70106; @@ -35,8 +35,8 @@ static const int MIN_MNW_PEER_PROTO_VERSION = 70104; //! minimum peer version that can receive masternode payments // V1 - Last protocol version before update // V2 - Newest protocol version -static const int MIN_MASTERNODE_PAYMENT_PROTO_VERSION_1 = 70600; -static const int MIN_MASTERNODE_PAYMENT_PROTO_VERSION_2 = 70700; +static const int MIN_MASTERNODE_PAYMENT_PROTO_VERSION_1 = 70500; +static const int MIN_MASTERNODE_PAYMENT_PROTO_VERSION_2 = 70600; //! nTime field added to CAddress, starting with this version; //! if possible, avoid requesting addresses nodes older than this