zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Auto merge of #4468 - ebfull:heartwood-testnet, r=ebfull 

Set Heartwood activation height for testnet to 903800.

Should activate on testnet approx 4PM MST on May 6th, 2020.
This commit is contained in:
Homu 2020-04-22 00:50:15 +00:00
parent ee00d28907 f7208c19c5
commit caea54013e
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/release-notes.md
View File

@ -13,7 +13,7 @@ included in this release. The following ZIPs are being deployed:
- [ZIP 213: Shielded Coinbase](https://zips.z.cash/zip-0213) - [ZIP 213: Shielded Coinbase](https://zips.z.cash/zip-0213)
- [ZIP 221: FlyClient - Consensus-Layer Changes](https://zips.z.cash/zip-0221) - [ZIP 221: FlyClient - Consensus-Layer Changes](https://zips.z.cash/zip-0221)
Heartwood will activate on testnet at height XXXXXX, and can also be activated Heartwood will activate on testnet at height 903800, and can also be activated
at a specific height in regtest mode by setting the config option at a specific height in regtest mode by setting the config option
`-nuparams=f5b9230b:HEIGHT`. `-nuparams=f5b9230b:HEIGHT`.

3
src/chainparams.cpp
View File

@ -321,8 +321,7 @@ public:
consensus.vUpgrades[Consensus::UPGRADE_BLOSSOM].hashActivationBlock = consensus.vUpgrades[Consensus::UPGRADE_BLOSSOM].hashActivationBlock =
uint256S("00367515ef2e781b8c9358b443b6329572599edd02c59e8af67db9785122f298"); uint256S("00367515ef2e781b8c9358b443b6329572599edd02c59e8af67db9785122f298");
consensus.vUpgrades[Consensus::UPGRADE_HEARTWOOD].nProtocolVersion = 170010; consensus.vUpgrades[Consensus::UPGRADE_HEARTWOOD].nProtocolVersion = 170010;
consensus.vUpgrades[Consensus::UPGRADE_HEARTWOOD].nActivationHeight = consensus.vUpgrades[Consensus::UPGRADE_HEARTWOOD].nActivationHeight = 903800;
Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT;
// On testnet we activate this rule 6 blocks after Blossom activation. From block 299188 and // On testnet we activate this rule 6 blocks after Blossom activation. From block 299188 and
// prior to Blossom activation, the testnet minimum-difficulty threshold was 15 minutes (i.e. // prior to Blossom activation, the testnet minimum-difficulty threshold was 15 minutes (i.e.

7
src/net.h
View File

@ -59,8 +59,11 @@ static const size_t MAPASKFOR_MAX_SZ = MAX_INV_SZ;
static const size_t SETASKFOR_MAX_SZ = 2 * MAX_INV_SZ; static const size_t SETASKFOR_MAX_SZ = 2 * MAX_INV_SZ;
/** The maximum number of peer connections to maintain. */ /** The maximum number of peer connections to maintain. */
static const unsigned int DEFAULT_MAX_PEER_CONNECTIONS = 125; static const unsigned int DEFAULT_MAX_PEER_CONNECTIONS = 125;
/** The period before a network upgrade activates, where connections to upgrading peers are preferred (in blocks). */ /**
static const int NETWORK_UPGRADE_PEER_PREFERENCE_BLOCK_PERIOD = 24 * 24 * 3; * The period before a network upgrade activates, where connections to upgrading peers are preferred (in blocks).
* This was three days for upgrades up to and including Blossom, and is 1.5 days from Heartwood onward.
*/
static const int NETWORK_UPGRADE_PEER_PREFERENCE_BLOCK_PERIOD = 1728;
static const bool DEFAULT_FORCEDNSSEED = false; static const bool DEFAULT_FORCEDNSSEED = false;
static const size_t DEFAULT_MAXRECEIVEBUFFER = 5 * 1000; static const size_t DEFAULT_MAXRECEIVEBUFFER = 5 * 1000;

2
src/version.h
View File

@ -9,7 +9,7 @@
* network protocol versioning * network protocol versioning
*/ */
static const int PROTOCOL_VERSION = 170009; static const int PROTOCOL_VERSION = 170010;
//! 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;