mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-20 13:37:28 +02:00
Merge 323b0acfcb into merged_master (Bitcoin PR bitcoin/bitcoin#30200)
This commit is contained in:
commit
7f7a7c4e0c
21 changed files with 231 additions and 53 deletions
|
|
@ -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) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue