From 13bd6a15eb5d8d5920f5c51cffa12cab292cb7ff Mon Sep 17 00:00:00 2001 From: Evan Duffield Date: Thu, 2 Jul 2015 09:45:28 -0700 Subject: [PATCH] version/proto bump --- configure.ac | 2 +- src/clientversion.h | 2 +- src/instantx.h | 2 +- src/version.h | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 569ab21cd..b4873074c 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 0) define(_CLIENT_VERSION_MINOR, 12) define(_CLIENT_VERSION_REVISION, 0) -define(_CLIENT_VERSION_BUILD, 6) +define(_CLIENT_VERSION_BUILD, 7) define(_CLIENT_VERSION_IS_RELEASE, true) define(_COPYRIGHT_YEAR, 2015) AC_INIT([Dash Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[info@dashpay.io],[dash]) diff --git a/src/clientversion.h b/src/clientversion.h index eba345625..caaf788c3 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -17,7 +17,7 @@ #define CLIENT_VERSION_MAJOR 0 #define CLIENT_VERSION_MINOR 12 #define CLIENT_VERSION_REVISION 0 -#define CLIENT_VERSION_BUILD 6 +#define CLIENT_VERSION_BUILD 7 //! Set to true for release, false for prerelease or test build #define CLIENT_VERSION_IS_RELEASE true diff --git a/src/instantx.h b/src/instantx.h index ce8f4a707..2609bf1b8 100644 --- a/src/instantx.h +++ b/src/instantx.h @@ -27,7 +27,7 @@ class CConsensusVote; class CTransaction; class CTransactionLock; -static const int MIN_INSTANTX_PROTO_VERSION = 70082; +static const int MIN_INSTANTX_PROTO_VERSION = 70083; extern map mapTxLockReq; extern map mapTxLockReqRejected; diff --git a/src/version.h b/src/version.h index fb2ac5860..db712ded2 100644 --- a/src/version.h +++ b/src/version.h @@ -10,7 +10,7 @@ * network protocol versioning */ -static const int PROTOCOL_VERSION = 70082; +static const int PROTOCOL_VERSION = 70083; //! initial proto version, to be increased after version/verack negotiation static const int INIT_PROTO_VERSION = 209; @@ -22,13 +22,13 @@ static const int GETHEADERS_VERSION = 70077; static const int MIN_PEER_PROTO_VERSION = 70066; //! minimum peer version accepted by DarksendPool -static const int MIN_POOL_PEER_PROTO_VERSION = 70082; +static const int MIN_POOL_PEER_PROTO_VERSION = 70083; //! 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 = 70066; -static const int MIN_MASTERNODE_PAYMENT_PROTO_VERSION_2 = 70082; +static const int MIN_MASTERNODE_PAYMENT_PROTO_VERSION_2 = 70083; //! nTime field added to CAddress, starting with this version; //! if possible, avoid requesting addresses nodes older than this