diff options
| author | Jorge Timón <[email protected]> | 2015-04-20 00:17:11 +0200 |
|---|---|---|
| committer | Jorge Timón <[email protected]> | 2015-11-11 13:21:17 +0100 |
| commit | 598e4945872349ead03ff0cddc87c14b925157ec (patch) | |
| tree | 24895389627372eadbb9a47e559f596d88cc09c4 /src/miner.cpp | |
| parent | Merge pull request #6978 (diff) | |
| download | discoin-598e4945872349ead03ff0cddc87c14b925157ec.tar.xz discoin-598e4945872349ead03ff0cddc87c14b925157ec.zip | |
Chainparams: Explicit CChainParams arg for main (pre miner):
-ProcessNewBlock
-TestBlockValidity
Diffstat (limited to 'src/miner.cpp')
| -rw-r--r-- | src/miner.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/miner.cpp b/src/miner.cpp index 053d9cdbc..cf5a19de3 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -351,7 +351,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn) pblocktemplate->vTxSigOps[0] = GetLegacySigOpCount(pblock->vtx[0]); CValidationState state; - if (!TestBlockValidity(state, *pblock, pindexPrev, false, false)) + if (!TestBlockValidity(state, chainparams, *pblock, pindexPrev, false, false)) throw std::runtime_error("CreateNewBlock(): TestBlockValidity failed"); } @@ -432,7 +432,7 @@ static bool ProcessBlockFound(const CBlock* pblock, const CChainParams& chainpar // Process this block the same as if we had received it from another node CValidationState state; - if (!ProcessNewBlock(state, NULL, pblock, true, NULL)) + if (!ProcessNewBlock(state, chainparams, NULL, pblock, true, NULL)) return error("BitcoinMiner: ProcessNewBlock, block not accepted"); return true; |