From ec40df46b50f1e1a21682208a9b3a1802db9002a Mon Sep 17 00:00:00 2001 From: Ross Nicoll Date: Mon, 8 Jan 2018 19:32:01 +0000 Subject: Check only the base block version (#1411) Check only the base block version when looking for unexpected version numbers --- src/miner.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/miner.cpp') diff --git a/src/miner.cpp b/src/miner.cpp index da0001a5b..55a90b86f 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -152,8 +152,8 @@ std::unique_ptr BlockAssembler::CreateNewBlock(const CScript& sc const Consensus::Params& consensus = chainparams.GetConsensus(nHeight); const int32_t nChainId = consensus.nAuxpowChainId; // FIXME: Active version bits after the always-auxpow fork! - // const int32_t nVersion = ComputeBlockVersion(pindexPrev, consensus), nChainId); - const int32_t nVersion = 4; + // const int32_t nVersion = ComputeBlockVersion(pindexPrev, consensus); + const int32_t nVersion = VERSIONBITS_LAST_OLD_BLOCK_VERSION; pblock->SetBaseVersion(nVersion, nChainId); // -regtest only: allow overriding block.nVersion with // -blockversion=N to test forking scenarios -- cgit v1.2.3