diff options
| author | Ross Nicoll <[email protected]> | 2017-11-19 22:09:03 +0000 |
|---|---|---|
| committer | Ross Nicoll <[email protected]> | 2018-09-19 19:23:29 +0100 |
| commit | fcde8643344a3a7baadf31d97dd3e1b47aa8cff9 (patch) | |
| tree | e3f8540c7060b29b848a9964c6b6f08fe3b64b5b /src/miner.cpp | |
| parent | Merge AuxPoW support from Namecore (diff) | |
| download | discoin-fcde8643344a3a7baadf31d97dd3e1b47aa8cff9.tar.xz discoin-fcde8643344a3a7baadf31d97dd3e1b47aa8cff9.zip | |
Sync mining code from Namecore to resolve unit test failures (#1385)
Diffstat (limited to 'src/miner.cpp')
| -rw-r--r-- | src/miner.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/miner.cpp b/src/miner.cpp index bac62821b..736d5f878 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -150,7 +150,10 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc nHeight = pindexPrev->nHeight + 1; const int32_t nChainId = chainparams.GetConsensus ().nAuxpowChainId; - pblock->SetBaseVersion(ComputeBlockVersion(pindexPrev, chainparams.GetConsensus()), nChainId); + // FIXME: Active version bits after the always-auxpow fork! + // const int32_t nVersion = ComputeBlockVersion(pindexPrev, chainparams.GetConsensus()), nChainId); + const int32_t nVersion = 4; + pblock->SetBaseVersion(nVersion, nChainId); // -regtest only: allow overriding block.nVersion with // -blockversion=N to test forking scenarios if (chainparams.MineBlocksOnDemand()) |