Merge #8362: Scale legacy sigop count in CreateNewBlock

682aa0f Scale legacy sigop count in CreateNewBlock (Suhas Daftuar)
This commit is contained in:
Wladimir J. van der Laan 2016-07-25 18:05:32 +02:00
commit 517eee3e8f
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6

View File

@ -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)) {