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

Update quote from ZIP 200

Browse Source
This commit is contained in:
Jack Grigg
2018-02-06 23:18:56 +00:00
parent 5009136dc3
commit cad27eb77f
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/consensus/upgrades.cpp
View File

@@ -38,13 +38,15 @@ UpgradeState NetworkUpgradeState(
if (nActivationHeight == Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT) { if (nActivationHeight == Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT) {
return UPGRADE_DISABLED; return UPGRADE_DISABLED;
} else if (nHeight >= nActivationHeight) { } else if (nHeight >= nActivationHeight) {
// From ZIP ???: // From ZIP 200:
// //
// ACTIVATION_HEIGHT // ACTIVATION_HEIGHT
// The block height at which the network upgrade rules will come into effect. // The non-zero block height at which the network upgrade rules will come
// into effect, and be enforced as part of the blockchain consensus.
// //
// For removal of ambiguity, the block at height ACTIVATION_HEIGHT - 1 is // For removal of ambiguity, the block at height ACTIVATION_HEIGHT - 1 is
// subject to the pre-upgrade consensus rules. // subject to the pre-upgrade consensus rules, and would be the last common
// block in the event of a persistent pre-upgrade branch.
return UPGRADE_ACTIVE; return UPGRADE_ACTIVE;
} else { } else {
return UPGRADE_PENDING; return UPGRADE_PENDING;