From 3f7f6ecc39793bba9667e188758b23bfa73fa17f Mon Sep 17 00:00:00 2001 From: Prasanna Loganathar Date: Fri, 1 Apr 2022 19:42:52 +0530 Subject: [PATCH] Version 2.7.0 (#1184) --- master | 1 + src/chainparams.cpp | 2 +- src/version.h | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) create mode 160000 master diff --git a/master b/master new file mode 160000 index 0000000000..06b7e5e3d7 --- /dev/null +++ b/master @@ -0,0 +1 @@ +Subproject commit 06b7e5e3d74d1a45c3d59012e17b990e0b3137c0 diff --git a/src/chainparams.cpp b/src/chainparams.cpp index f81339d04a..f653376d16 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -129,7 +129,7 @@ class CMainParams : public CChainParams { consensus.FortCanningMuseumHeight = 1430640; consensus.FortCanningParkHeight = 1503143; consensus.FortCanningHillHeight = 1604999; // Feb 7, 2022. - consensus.FortCanningRoadHeight = std::numeric_limits::max(); + consensus.FortCanningRoadHeight = 1786000; // April 11, 2022. 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 e55429eacd..4e8fdcc93c 100644 --- a/src/version.h +++ b/src/version.h @@ -9,7 +9,7 @@ * network protocol versioning */ -static const int PROTOCOL_VERSION = 70027; +static const int PROTOCOL_VERSION = 70028; //! initial proto version, to be increased after version/verack negotiation static const int INIT_PROTO_VERSION = 209;