From 955b328ad17bf4f3a19713b3a13a3e7a1d966d3b Mon Sep 17 00:00:00 2001 From: Sean Bowe Date: Wed, 15 Aug 2018 08:21:45 -0600 Subject: [PATCH] Sapling mainnet activation height --- doc/release-notes.md | 11 +++++++++++ src/chainparams.cpp | 7 +++---- src/version.h | 2 +- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/doc/release-notes.md b/doc/release-notes.md index a29094b51..3905cc907 100644 --- a/doc/release-notes.md +++ b/doc/release-notes.md @@ -4,3 +4,14 @@ release-notes at release time) Notable changes =============== +Sapling network upgrade +----------------------- + +The activation height for the Sapling network upgrade on mainnet is included +in this release. Sapling will activate on mainnet at height 419200, which is +expected to be mined on the 28th of October 2018. Please upgrade to this release, +or any subsequent release, in order to follow the Sapling network upgrade. + +The testnet is being rolled back in this release to Overwinter. Sapling will +activate on testnet at height 280000. Please update your testnet nodes before +then. diff --git a/src/chainparams.cpp b/src/chainparams.cpp index b42c75b12..9813a9ce5 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -104,8 +104,7 @@ public: consensus.vUpgrades[Consensus::UPGRADE_OVERWINTER].nProtocolVersion = 170005; consensus.vUpgrades[Consensus::UPGRADE_OVERWINTER].nActivationHeight = 347500; consensus.vUpgrades[Consensus::UPGRADE_SAPLING].nProtocolVersion = 170007; - consensus.vUpgrades[Consensus::UPGRADE_SAPLING].nActivationHeight = - Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT; + consensus.vUpgrades[Consensus::UPGRADE_SAPLING].nActivationHeight = 419200; // The best chain should have at least this much work. consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000000000281b32ff3198a1"); @@ -280,8 +279,8 @@ public: Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT; consensus.vUpgrades[Consensus::UPGRADE_OVERWINTER].nProtocolVersion = 170003; consensus.vUpgrades[Consensus::UPGRADE_OVERWINTER].nActivationHeight = 207500; - consensus.vUpgrades[Consensus::UPGRADE_SAPLING].nProtocolVersion = 170006; - consensus.vUpgrades[Consensus::UPGRADE_SAPLING].nActivationHeight = 252500; + consensus.vUpgrades[Consensus::UPGRADE_SAPLING].nProtocolVersion = 170007; + consensus.vUpgrades[Consensus::UPGRADE_SAPLING].nActivationHeight = 280000; // The best chain should have at least this much work. consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000000000000001d0c4d9cd"); diff --git a/src/version.h b/src/version.h index cf3e1ea4a..72ddac446 100644 --- a/src/version.h +++ b/src/version.h @@ -9,7 +9,7 @@ * network protocol versioning */ -static const int PROTOCOL_VERSION = 170006; +static const int PROTOCOL_VERSION = 170007; //! initial proto version, to be increased after version/verack negotiation static const int INIT_PROTO_VERSION = 209;