diff --git a/configure.ac b/configure.ac index 6b57796156..9e218cf6e4 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, 6) -define(_CLIENT_VERSION_REVISION, 2) +define(_CLIENT_VERSION_MINOR, 7) +define(_CLIENT_VERSION_REVISION, 0) define(_CLIENT_VERSION_BUILD, 0) define(_CLIENT_VERSION_RC, 0) define(_CLIENT_VERSION_IS_RELEASE, true) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index eecba05df5..64e08d0003 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -356,7 +356,7 @@ class CTestNetParams : public CChainParams { consensus.FortCanningMuseumHeight = 724000; consensus.FortCanningParkHeight = 828800; consensus.FortCanningHillHeight = 828900; - consensus.FortCanningRoadHeight = std::numeric_limits::max(); + consensus.FortCanningRoadHeight = 937300; consensus.pos.diffLimit = uint256S("00000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"); // consensus.pos.nTargetTimespan = 14 * 24 * 60 * 60; // two weeks diff --git a/src/version.h b/src/version.h index 3c39cd83f8..9730e65322 100644 --- a/src/version.h +++ b/src/version.h @@ -9,7 +9,7 @@ * network protocol versioning */ -static const int PROTOCOL_VERSION = 70025; +static const int PROTOCOL_VERSION = 70026; //! initial proto version, to be increased after version/verack negotiation static const int INIT_PROTO_VERSION = 209;