aboutsummaryrefslogtreecommitdiff
path: root/src/miner.cpp
diff options
context:
space:
mode:
authorRoss Nicoll <[email protected]>2018-01-08 19:32:01 +0000
committerRoss Nicoll <[email protected]>2018-09-19 21:09:16 +0100
commitec40df46b50f1e1a21682208a9b3a1802db9002a (patch)
tree057a6b6fd23de69986999c1786406378230b3209 /src/miner.cpp
parentAdd Dogecoin current fee calculation logic (#1413) (diff)
downloaddiscoin-ec40df46b50f1e1a21682208a9b3a1802db9002a.tar.xz
discoin-ec40df46b50f1e1a21682208a9b3a1802db9002a.zip
Check only the base block version (#1411)
Check only the base block version when looking for unexpected version numbers
Diffstat (limited to 'src/miner.cpp')
-rw-r--r--src/miner.cpp4
1 files changed, 2 insertions, 2 deletions
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<CBlockTemplate> 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