Merge 323b0acfcb into merged_master (Bitcoin PR bitcoin/bitcoin#30200)

This commit is contained in:
ikripaka 2026-03-02 15:10:06 +00:00
commit 7f7a7c4e0c
No known key found for this signature in database
21 changed files with 231 additions and 53 deletions

View file

@ -398,7 +398,8 @@ CBlock TestChain100Setup::CreateBlock(
const CScript& scriptPubKey,
Chainstate& chainstate)
{
CBlock block = BlockAssembler{chainstate, nullptr}.CreateNewBlock(scriptPubKey)->block;
BlockAssembler::Options options;
CBlock block = BlockAssembler{chainstate, nullptr, options}.CreateNewBlock(scriptPubKey)->block;
Assert(block.vtx.size() == 1);
for (const CMutableTransaction& tx : txns) {