Merge pull request #5915 from str4d/5899-testnet-nu5-checkpoint
Update minimum chain work and set NU5 activation block hash for testnet
This commit is contained in:
commit
716091e30d
|
@ -419,6 +419,8 @@ public:
|
||||||
uint256S("01a4d7c6aada30c87762c1bf33fff5df7266b1fd7616bfdb5227fa59bd79e7a2");
|
uint256S("01a4d7c6aada30c87762c1bf33fff5df7266b1fd7616bfdb5227fa59bd79e7a2");
|
||||||
consensus.vUpgrades[Consensus::UPGRADE_NU5].nProtocolVersion = 170050;
|
consensus.vUpgrades[Consensus::UPGRADE_NU5].nProtocolVersion = 170050;
|
||||||
consensus.vUpgrades[Consensus::UPGRADE_NU5].nActivationHeight = 1842420;
|
consensus.vUpgrades[Consensus::UPGRADE_NU5].nActivationHeight = 1842420;
|
||||||
|
consensus.vUpgrades[Consensus::UPGRADE_NU5].hashActivationBlock =
|
||||||
|
uint256S("0006d75c60b3093d1b671ff7da11c99ea535df9927c02e6ed9eb898605eb7381");
|
||||||
consensus.vUpgrades[Consensus::UPGRADE_ZFUTURE].nProtocolVersion = 0x7FFFFFFF;
|
consensus.vUpgrades[Consensus::UPGRADE_ZFUTURE].nProtocolVersion = 0x7FFFFFFF;
|
||||||
consensus.vUpgrades[Consensus::UPGRADE_ZFUTURE].nActivationHeight =
|
consensus.vUpgrades[Consensus::UPGRADE_ZFUTURE].nActivationHeight =
|
||||||
Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT;
|
Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT;
|
||||||
|
@ -542,7 +544,7 @@ public:
|
||||||
consensus.nFutureTimestampSoftForkHeight = consensus.vUpgrades[Consensus::UPGRADE_BLOSSOM].nActivationHeight + 6;
|
consensus.nFutureTimestampSoftForkHeight = consensus.vUpgrades[Consensus::UPGRADE_BLOSSOM].nActivationHeight + 6;
|
||||||
|
|
||||||
// The best chain should have at least this much work.
|
// The best chain should have at least this much work.
|
||||||
consensus.nMinimumChainWork = uint256S("00000000000000000000000000000000000000000000000000000025eb805e9c");
|
consensus.nMinimumChainWork = uint256S("000000000000000000000000000000000000000000000000000000263c0984a2");
|
||||||
|
|
||||||
pchMessageStart[0] = 0xfa;
|
pchMessageStart[0] = 0xfa;
|
||||||
pchMessageStart[1] = 0x1a;
|
pchMessageStart[1] = 0x1a;
|
||||||
|
|
Loading…
Reference in New Issue