Auto merge of #3935 - str4d:blossom-activation-logic, r=str4d
Add Blossom to upgrade list
This commit is contained in:
commit
8752c7aef5
|
@ -106,6 +106,9 @@ public:
|
||||||
consensus.vUpgrades[Consensus::UPGRADE_OVERWINTER].nActivationHeight = 347500;
|
consensus.vUpgrades[Consensus::UPGRADE_OVERWINTER].nActivationHeight = 347500;
|
||||||
consensus.vUpgrades[Consensus::UPGRADE_SAPLING].nProtocolVersion = 170007;
|
consensus.vUpgrades[Consensus::UPGRADE_SAPLING].nProtocolVersion = 170007;
|
||||||
consensus.vUpgrades[Consensus::UPGRADE_SAPLING].nActivationHeight = 419200;
|
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.
|
// The best chain should have at least this much work.
|
||||||
consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000000000c12875ded911cf");
|
consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000000000c12875ded911cf");
|
||||||
|
@ -285,6 +288,9 @@ public:
|
||||||
consensus.vUpgrades[Consensus::UPGRADE_OVERWINTER].nActivationHeight = 207500;
|
consensus.vUpgrades[Consensus::UPGRADE_OVERWINTER].nActivationHeight = 207500;
|
||||||
consensus.vUpgrades[Consensus::UPGRADE_SAPLING].nProtocolVersion = 170007;
|
consensus.vUpgrades[Consensus::UPGRADE_SAPLING].nProtocolVersion = 170007;
|
||||||
consensus.vUpgrades[Consensus::UPGRADE_SAPLING].nActivationHeight = 280000;
|
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.
|
// The best chain should have at least this much work.
|
||||||
consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000000000000001d0c4d9cd");
|
consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000000000000001d0c4d9cd");
|
||||||
|
@ -416,6 +422,9 @@ public:
|
||||||
consensus.vUpgrades[Consensus::UPGRADE_SAPLING].nProtocolVersion = 170006;
|
consensus.vUpgrades[Consensus::UPGRADE_SAPLING].nProtocolVersion = 170006;
|
||||||
consensus.vUpgrades[Consensus::UPGRADE_SAPLING].nActivationHeight =
|
consensus.vUpgrades[Consensus::UPGRADE_SAPLING].nActivationHeight =
|
||||||
Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT;
|
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.
|
// The best chain should have at least this much work.
|
||||||
consensus.nMinimumChainWork = uint256S("0x00");
|
consensus.nMinimumChainWork = uint256S("0x00");
|
||||||
|
|
|
@ -26,6 +26,7 @@ enum UpgradeIndex {
|
||||||
UPGRADE_TESTDUMMY,
|
UPGRADE_TESTDUMMY,
|
||||||
UPGRADE_OVERWINTER,
|
UPGRADE_OVERWINTER,
|
||||||
UPGRADE_SAPLING,
|
UPGRADE_SAPLING,
|
||||||
|
UPGRADE_BLOSSOM,
|
||||||
// NOTE: Also add new upgrades to NetworkUpgradeInfo in upgrades.cpp
|
// NOTE: Also add new upgrades to NetworkUpgradeInfo in upgrades.cpp
|
||||||
MAX_NETWORK_UPGRADES
|
MAX_NETWORK_UPGRADES
|
||||||
};
|
};
|
||||||
|
|
|
@ -28,6 +28,11 @@ const struct NUInfo NetworkUpgradeInfo[Consensus::MAX_NETWORK_UPGRADES] = {
|
||||||
/*.nBranchId =*/ 0x76b809bb,
|
/*.nBranchId =*/ 0x76b809bb,
|
||||||
/*.strName =*/ "Sapling",
|
/*.strName =*/ "Sapling",
|
||||||
/*.strInfo =*/ "See https://z.cash/upgrade/sapling.html for details.",
|
/*.strInfo =*/ "See https://z.cash/upgrade/sapling.html for details.",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
/*.nBranchId =*/ 0x2bb40e60,
|
||||||
|
/*.strName =*/ "Blossom",
|
||||||
|
/*.strInfo =*/ "See https://z.cash/upgrade/blossom.html for details.",
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue