GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-14 12:43:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix miner block header proof accounting

Browse source
This commit is contained in:
Gregory Sanders 2018-04-27 10:04:40 -04:00
parent f87a264075
commit eb893ed127
1 changed files with 26 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/miner.cpp
View file

@ -24,6 +24,7 @@
#include "util.h" #include "util.h"
#include "utilmoneystr.h" #include "utilmoneystr.h"
#include "validationinterface.h" #include "validationinterface.h"
#include "pubkey.h"
#include <algorithm> #include <algorithm>
#include <boost/thread.hpp> #include <boost/thread.hpp>
@ -139,13 +140,36 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc
return nullptr; return nullptr;
pblock = &pblocktemplate->block; // pointer for convenience pblock = &pblocktemplate->block; // pointer for convenience
LOCK2(cs_main, mempool.cs);
CBlockIndex* pindexPrev = chainActive.Tip();
// Reset proof here, for weight calculations since header
// is not fixed size.
ResetProof(*pblock);
ResetChallenge(*pblock, *pindexPrev, chainparams.GetConsensus());
// Pad weight for challenge
// We won't bother with serialization byte(s), we have room
nBlockWeight += pblock->proof.challenge.size()*WITNESS_SCALE_FACTOR;
// Pad weight for proof
// Note: Assumes "naked" script template with pubkeys
txnouttype dummy_type;
std::vector<CTxDestination> dummy_addresses;
int required_sigs = -1;
if (!ExtractDestinations(pblock->proof.challenge, dummy_type, dummy_addresses, required_sigs)) {
// No idea how to sign this... log error but return block.
LogPrintf("CreateNewBlock: Can not extract destinations from signblockscript");
} else {
assert(required_sigs > 0);
nBlockWeight += required_sigs*74*WITNESS_SCALE_FACTOR;
}
// Add dummy coinbase tx as first transaction // Add dummy coinbase tx as first transaction
pblock->vtx.emplace_back(); pblock->vtx.emplace_back();
pblocktemplate->vTxFees.push_back(-1); // updated at end pblocktemplate->vTxFees.push_back(-1); // updated at end
pblocktemplate->vTxSigOpsCost.push_back(-1); // updated at end pblocktemplate->vTxSigOpsCost.push_back(-1); // updated at end
LOCK2(cs_main, mempool.cs);
CBlockIndex* pindexPrev = chainActive.Tip();
nHeight = pindexPrev->nHeight + 1; nHeight = pindexPrev->nHeight + 1;
pblock->nVersion = ComputeBlockVersion(pindexPrev, chainparams.GetConsensus()); pblock->nVersion = ComputeBlockVersion(pindexPrev, chainparams.GetConsensus());
@ -199,8 +223,6 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc
// Fill in header // Fill in header
pblock->hashPrevBlock = pindexPrev->GetBlockHash(); pblock->hashPrevBlock = pindexPrev->GetBlockHash();
UpdateTime(pblock, chainparams.GetConsensus(), pindexPrev); UpdateTime(pblock, chainparams.GetConsensus(), pindexPrev);
ResetChallenge(*pblock, *pindexPrev, chainparams.GetConsensus());
ResetProof(*pblock);
pblock->nHeight = nHeight; pblock->nHeight = nHeight;
pblocktemplate->vTxSigOpsCost[0] = WITNESS_SCALE_FACTOR * GetLegacySigOpCount(*pblock->vtx[0]); pblocktemplate->vTxSigOpsCost[0] = WITNESS_SCALE_FACTOR * GetLegacySigOpCount(*pblock->vtx[0]);