diff options
| author | Patrick Lodder <[email protected]> | 2015-07-11 14:41:33 +0200 |
|---|---|---|
| committer | Patrick Lodder <[email protected]> | 2015-07-11 14:41:33 +0200 |
| commit | b66e509800025bbcd90f518b90f3b7cb582b99db (patch) | |
| tree | 0422e17d73ffc244e48ba41c4ea63cd39c8b09dd /src/miner.cpp | |
| parent | Merge pull request #1199 from patricklodder/1.10-partition-alert (diff) | |
| parent | Adapt AuxPoW to Dogecoin (diff) | |
| download | discoin-b66e509800025bbcd90f518b90f3b7cb582b99db.tar.xz discoin-b66e509800025bbcd90f518b90f3b7cb582b99db.zip | |
Merge pull request #1200 from rnicoll/1.10-auxpow-clean
Add AuxPoW support
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 3e06e877c..f83f43ceb 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -101,6 +101,9 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn) return NULL; CBlock *pblock = &pblocktemplate->block; // pointer for convenience + /* Initialise the block version. */ + pblock->nVersion = CBlockHeader::CURRENT_VERSION; + // -regtest only: allow overriding block.nVersion with // -blockversion=N to test forking scenarios if (Params().MineBlocksOnDemand()) @@ -345,7 +348,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn) return pblocktemplate.release(); } -void IncrementExtraNonce(CBlock* pblock, CBlockIndex* pindexPrev, unsigned int& nExtraNonce) +void IncrementExtraNonce(CBlock* pblock, const CBlockIndex* pindexPrev, unsigned int& nExtraNonce) { // Update nExtraNonce static uint256 hashPrevBlock; |