From 885fce070a6aaf1c98e635551667a0dfa691d2a7 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Tue, 2 Apr 2019 07:39:36 +0100 Subject: [PATCH] Add Blossom to upgrade list --- src/chainparams.cpp | 9 +++++++++ src/consensus/params.h | 1 + src/consensus/upgrades.cpp | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 511e6a402..45b77a09e 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -106,6 +106,9 @@ public: consensus.vUpgrades[Consensus::UPGRADE_OVERWINTER].nActivationHeight = 347500; consensus.vUpgrades[Consensus::UPGRADE_SAPLING].nProtocolVersion = 170007; consensus.vUpgrades[Consensus::UPGRADE_SAPLING].nActivationHeight = 419200; + consensus.vUpgrades[Consensus::UPGRADE_BLOSSOM].nProtocolVersion = 170009; + consensus.vUpgrades[Consensus::UPGRADE_BLOSSOM].nActivationHeight = + Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT; // The best chain should have at least this much work. consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000000000c12875ded911cf"); @@ -285,6 +288,9 @@ public: consensus.vUpgrades[Consensus::UPGRADE_OVERWINTER].nActivationHeight = 207500; consensus.vUpgrades[Consensus::UPGRADE_SAPLING].nProtocolVersion = 170007; consensus.vUpgrades[Consensus::UPGRADE_SAPLING].nActivationHeight = 280000; + consensus.vUpgrades[Consensus::UPGRADE_BLOSSOM].nProtocolVersion = 170008; + consensus.vUpgrades[Consensus::UPGRADE_BLOSSOM].nActivationHeight = + Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT; // The best chain should have at least this much work. consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000000000000001d0c4d9cd"); @@ -416,6 +422,9 @@ public: consensus.vUpgrades[Consensus::UPGRADE_SAPLING].nProtocolVersion = 170006; consensus.vUpgrades[Consensus::UPGRADE_SAPLING].nActivationHeight = Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT; + consensus.vUpgrades[Consensus::UPGRADE_BLOSSOM].nProtocolVersion = 170008; + consensus.vUpgrades[Consensus::UPGRADE_BLOSSOM].nActivationHeight = + Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT; // The best chain should have at least this much work. consensus.nMinimumChainWork = uint256S("0x00"); diff --git a/src/consensus/params.h b/src/consensus/params.h index 26288f243..77f30bf4e 100644 --- a/src/consensus/params.h +++ b/src/consensus/params.h @@ -26,6 +26,7 @@ enum UpgradeIndex { UPGRADE_TESTDUMMY, UPGRADE_OVERWINTER, UPGRADE_SAPLING, + UPGRADE_BLOSSOM, // NOTE: Also add new upgrades to NetworkUpgradeInfo in upgrades.cpp MAX_NETWORK_UPGRADES }; diff --git a/src/consensus/upgrades.cpp b/src/consensus/upgrades.cpp index 04be05cdf..e11aaa260 100644 --- a/src/consensus/upgrades.cpp +++ b/src/consensus/upgrades.cpp @@ -28,6 +28,11 @@ const struct NUInfo NetworkUpgradeInfo[Consensus::MAX_NETWORK_UPGRADES] = { /*.nBranchId =*/ 0x76b809bb, /*.strName =*/ "Sapling", /*.strInfo =*/ "See https://z.cash/upgrade/sapling.html for details.", + }, + { + /*.nBranchId =*/ 0x2bb40e60, + /*.strName =*/ "Blossom", + /*.strInfo =*/ "See https://z.cash/upgrade/blossom.html for details.", } };