From c2a722d3c43c49d703002e0915bc84d6c37c8a63 Mon Sep 17 00:00:00 2001 From: Daira Hopwood Date: Wed, 7 Jun 2017 15:29:58 +0100 Subject: [PATCH] Fix a comment that was made stale before launch by #1016 (commit 542da61). Signed-off-by: Daira Hopwood --- src/main.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 81901ade5..209aeee47 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3093,11 +3093,10 @@ bool ContextualCheckBlock(const CBlock& block, CValidationState& state, CBlockIn } } - // Enforce block.nVersion=2 rule that the coinbase starts with serialized block height - // if 750 of the last 1,000 blocks are version 2 or greater (51/100 if testnet): - // Since MIN_BLOCK_VERSION = 4 all blocks with nHeight > 0 should satisfy this. - // This rule is not applied to the genesis block, which didn't include the height - // in the coinbase. + // Enforce BIP 34 rule that the coinbase starts with serialized block height. + // In Zcash this has been enforced since launch, except that the genesis + // block didn't include the height in the coinbase (see Zcash protocol spec + // section '6.8 Bitcoin Improvement Proposals'). if (nHeight > 0) { CScript expect = CScript() << nHeight;