From cad27eb77fe9e0ba8caa617c96f184423628d90c Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Tue, 6 Feb 2018 23:18:56 +0000 Subject: [PATCH] Update quote from ZIP 200 --- src/consensus/upgrades.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/consensus/upgrades.cpp b/src/consensus/upgrades.cpp index 42089bbb1..17606bc63 100644 --- a/src/consensus/upgrades.cpp +++ b/src/consensus/upgrades.cpp @@ -38,13 +38,15 @@ UpgradeState NetworkUpgradeState( if (nActivationHeight == Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT) { return UPGRADE_DISABLED; } else if (nHeight >= nActivationHeight) { - // From ZIP ???: + // From ZIP 200: // // 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 - // 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; } else { return UPGRADE_PENDING;