diff options
| author | Wladimir J. van der Laan <[email protected]> | 2016-11-17 14:14:41 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2016-11-17 14:14:51 +0100 |
| commit | f6db48ad1c8ffe5230488a2a6cab5b62ab0a1207 (patch) | |
| tree | 84618cb3589a49eff482d945209603712371cfda /src/miner.cpp | |
| parent | Merge #9155: [trivial] update comments for tx weight (diff) | |
| parent | log block size and weight correctly. (diff) | |
| download | discoin-f6db48ad1c8ffe5230488a2a6cab5b62ab0a1207.tar.xz discoin-f6db48ad1c8ffe5230488a2a6cab5b62ab0a1207.zip | |
Merge #8838: Calculate size and weight of block correctly in CreateNewBlock()
5f274a1 log block size and weight correctly. (jnewbery)
Diffstat (limited to 'src/miner.cpp')
| -rw-r--r-- | src/miner.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/miner.cpp b/src/miner.cpp index ebf2f21ff..6ad63207c 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -169,7 +169,6 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc nLastBlockTx = nBlockTx; nLastBlockSize = nBlockSize; nLastBlockWeight = nBlockWeight; - LogPrintf("CreateNewBlock(): total size %u txs: %u fees: %ld sigops %d\n", nBlockSize, nBlockTx, nFees, nBlockSigOpsCost); // Create coinbase transaction. CMutableTransaction coinbaseTx; @@ -183,6 +182,9 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc pblocktemplate->vchCoinbaseCommitment = GenerateCoinbaseCommitment(*pblock, pindexPrev, chainparams.GetConsensus()); pblocktemplate->vTxFees[0] = -nFees; + uint64_t nSerializeSize = GetSerializeSize(*pblock, SER_NETWORK, PROTOCOL_VERSION); + LogPrintf("CreateNewBlock(): total size: %u block weight: %u txs: %u fees: %ld sigops %d\n", nSerializeSize, GetBlockWeight(*pblock), nBlockTx, nFees, nBlockSigOpsCost); + // Fill in header pblock->hashPrevBlock = pindexPrev->GetBlockHash(); UpdateTime(pblock, chainparams.GetConsensus(), pindexPrev); |