aboutsummaryrefslogtreecommitdiff
path: root/src/bench
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2018-12-21 13:45:55 +0100
committerMarcoFalke <falke.marco@gmail.com>2018-12-21 13:46:06 +0100
commitfeda41e0a7c4440d398516850f9cbd4c4f3192dd (patch)
treeac75b0e19dea6398f1a6065bafcea354e05f043d /src/bench
parent45fe39022a65b615fcb6baa1933ed52f5d0caa58 (diff)
parentd2ce315fbfd8d8ed52bde9f714ded8c76521cce2 (diff)
downloadbitcoin-feda41e0a7c4440d398516850f9cbd4c4f3192dd.tar.xz
Merge #14811: Mining: Enforce that segwit option must be set in GBT
d2ce315fbf [docs] add release note for change to GBT (John Newbery) 0025c9eae4 [mining] segwit option must be set in GBT (John Newbery) Pull request description: Calling getblocktemplate without the segwit rule specified is most likely a client error, since it results in lower fees for the miner. Prevent this client error by failing getblocktemplate if called without the segwit rule specified. Of the previous 1000 blocks (measured at block [551591 (hash 0x...173c811)](https://blockstream.info/block/000000000000000000173c811e79858808abc3216af607035973f002bef60a7a)), 991 included segwit transactions. Tree-SHA512: 7933b073d72683c9ab9318db46a085ec19a56a14937945c73f783ac7656887619a86b74db0bdfcb8121df44f63a1d6a6fb19e98505b2a26a6a8a6e768e442fee
Diffstat (limited to 'src/bench')
-rw-r--r--src/bench/block_assemble.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bench/block_assemble.cpp b/src/bench/block_assemble.cpp
index 2def0b23e2..7cf27f9f5b 100644
--- a/src/bench/block_assemble.cpp
+++ b/src/bench/block_assemble.cpp
@@ -27,7 +27,7 @@ static std::shared_ptr<CBlock> PrepareBlock(const CScript& coinbase_scriptPubKey
{
auto block = std::make_shared<CBlock>(
BlockAssembler{Params()}
- .CreateNewBlock(coinbase_scriptPubKey, /* fMineWitnessTx */ true)
+ .CreateNewBlock(coinbase_scriptPubKey)
->block);
block->nTime = ::chainActive.Tip()->GetMedianTimePast() + 1;