From 4d234cd2f836f7adc9e92bba343ad9bd7dd6da11 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Wed, 11 Apr 2018 20:21:45 -0600 Subject: [PATCH] Overwinter mainnet activation height --- doc/release-notes/release-notes-1.1.0.md | 8 ++++++++ src/chainparams.cpp | 3 +-- src/version.h | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/doc/release-notes/release-notes-1.1.0.md b/doc/release-notes/release-notes-1.1.0.md index ba8a39c48..37f803e6f 100644 --- a/doc/release-notes/release-notes-1.1.0.md +++ b/doc/release-notes/release-notes-1.1.0.md @@ -1,6 +1,14 @@ Notable changes =============== +Overwinter network upgrade +-------------------------- + +The activation height for the Overwinter network upgrade on mainnet is included +in this release. Overwinter will activate on mainnet at height 347500, which is +expected to be mined on the 25th of June 2018. Please upgrade to this release, +or any subsequent release, in order to follow the Overwinter network upgrade. + `-mempooltxinputlimit` deprecation ---------------------------------- diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 4806dcfc5..ae9d82d52 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -102,8 +102,7 @@ public: consensus.vUpgrades[Consensus::UPGRADE_TESTDUMMY].nActivationHeight = Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT; consensus.vUpgrades[Consensus::UPGRADE_OVERWINTER].nProtocolVersion = 170005; - consensus.vUpgrades[Consensus::UPGRADE_OVERWINTER].nActivationHeight = - Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT; + consensus.vUpgrades[Consensus::UPGRADE_OVERWINTER].nActivationHeight = 347500; /** * The message start string should be awesome! ⓩ❤ diff --git a/src/version.h b/src/version.h index 258534aa6..bf8c518d8 100644 --- a/src/version.h +++ b/src/version.h @@ -9,7 +9,7 @@ * network protocol versioning */ -static const int PROTOCOL_VERSION = 170004; +static const int PROTOCOL_VERSION = 170005; //! initial proto version, to be increased after version/verack negotiation static const int INIT_PROTO_VERSION = 209;