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

Merge 950af7c876 into merged_master (Bitcoin PR bitcoin/bitcoin#28878)

Browse source
This commit is contained in:
Byron Hambly 2025-11-10 14:27:35 +02:00
commit d46449ab86
No known key found for this signature in database
GPG key ID: DE8F6EA20A661697
36 changed files with 74 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/node/miner.cpp
View file

@ -156,7 +156,7 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc
const DynaFedParamEntry current_params = ComputeNextBlockCurrentParameters(m_chainstate.m_chain.Tip(), chainparams.GetConsensus());
const DynaFedParams block_params(current_params, proposed_entry ? *proposed_entry : DynaFedParamEntry());
pblock->m_dynafed_params = block_params;
nBlockWeight += ::GetSerializeSize(block_params, PROTOCOL_VERSION)*WITNESS_SCALE_FACTOR;
nBlockWeight += ::GetSerializeSize(block_params) * WITNESS_SCALE_FACTOR;
nBlockWeight += current_params.m_signblock_witness_limit; // Note witness discount
assert(pblock->proof.IsNull());