diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-07-25 18:05:32 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-07-25 18:08:09 +0200 |
| commit | 517eee3e8f8b14b9a2d7deabefcc71e2c0bd4312 (patch) | |
| tree | 9702bec3bfd006ea01d7e8cb1609160f78f6e6a7 /src/miner.cpp | |
| parent | 99c0ac2fd9be40d5c88f1959e0c2c9ceff3024f7 (diff) | |
| parent | 682aa0f289c550c029733966a2ce3449e4a471df (diff) | |
| download | bitcoin-517eee3e8f8b14b9a2d7deabefcc71e2c0bd4312.tar.xz | |
Merge #8362: Scale legacy sigop count in CreateNewBlock
682aa0f Scale legacy sigop count in CreateNewBlock (Suhas Daftuar)
Diffstat (limited to 'src/miner.cpp')
| -rw-r--r-- | src/miner.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/miner.cpp b/src/miner.cpp index 25a5becf93..9575858840 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -187,7 +187,7 @@ CBlockTemplate* BlockAssembler::CreateNewBlock(const CScript& scriptPubKeyIn) UpdateTime(pblock, chainparams.GetConsensus(), pindexPrev); pblock->nBits = GetNextWorkRequired(pindexPrev, pblock, chainparams.GetConsensus()); pblock->nNonce = 0; - pblocktemplate->vTxSigOpsCost[0] = GetLegacySigOpCount(pblock->vtx[0]); + pblocktemplate->vTxSigOpsCost[0] = WITNESS_SCALE_FACTOR * GetLegacySigOpCount(pblock->vtx[0]); CValidationState state; if (!TestBlockValidity(state, chainparams, *pblock, pindexPrev, false, false)) { |