DragonX/hush3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Overwinter mainnet activation height

Browse Source
This commit is contained in:
Jack Grigg
2018-04-11 20:21:45 -06:00
parent 2141de16e8
commit 4d234cd2f8
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
doc/release-notes/release-notes-1.1.0.md
View File

@@ -1,6 +1,14 @@
Notable changes 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 `-mempooltxinputlimit` deprecation
---------------------------------- ----------------------------------

3
src/chainparams.cpp
View File

@@ -102,8 +102,7 @@ public:
consensus.vUpgrades[Consensus::UPGRADE_TESTDUMMY].nActivationHeight = consensus.vUpgrades[Consensus::UPGRADE_TESTDUMMY].nActivationHeight =
Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT; Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT;
consensus.vUpgrades[Consensus::UPGRADE_OVERWINTER].nProtocolVersion = 170005; consensus.vUpgrades[Consensus::UPGRADE_OVERWINTER].nProtocolVersion = 170005;
consensus.vUpgrades[Consensus::UPGRADE_OVERWINTER].nActivationHeight = consensus.vUpgrades[Consensus::UPGRADE_OVERWINTER].nActivationHeight = 347500;
Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT;
/** /**
* The message start string should be awesome! ⓩ❤ * The message start string should be awesome! ⓩ❤

2
src/version.h
View File

@@ -9,7 +9,7 @@
* network protocol versioning * 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 //! initial proto version, to be increased after version/verack negotiation
static const int INIT_PROTO_VERSION = 209; static const int INIT_PROTO_VERSION = 209;