diff options
| author | Suhas Daftuar <sdaftuar@gmail.com> | 2017-03-08 15:56:59 -0500 |
|---|---|---|
| committer | Suhas Daftuar <sdaftuar@gmail.com> | 2017-03-16 10:43:54 -0400 |
| commit | 569596cc5148ef868350a9720013d38faf3e34ce (patch) | |
| tree | 907377b3adb5cb56ae99a44c0ac425167a970bc4 /src/miner.h | |
| parent | 43a987c1cbcd04b9c59052606c3c31c56abc826e (diff) | |
| download | bitcoin-569596cc5148ef868350a9720013d38faf3e34ce.tar.xz | |
Don't require segwit in getblocktemplate for segwit signalling or mining
Segwit's version bit will be signalled for all invocations of CreateNewBlock,
and not specifying segwit only will cause CreateNewBlock to skip transactions
with witness from being selected.
Github-Pull: #9955
Rebased-From: abe7b3d3abe10e3554b770f40824174b3b217490
Diffstat (limited to 'src/miner.h')
| -rw-r--r-- | src/miner.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/miner.h b/src/miner.h index 3ba92b16b8..29013c3bcc 100644 --- a/src/miner.h +++ b/src/miner.h @@ -165,7 +165,7 @@ private: public: BlockAssembler(const CChainParams& chainparams); /** Construct a new block template with coinbase to scriptPubKeyIn */ - std::unique_ptr<CBlockTemplate> CreateNewBlock(const CScript& scriptPubKeyIn); + std::unique_ptr<CBlockTemplate> CreateNewBlock(const CScript& scriptPubKeyIn, bool fMineWitnessTx=true); private: // utility functions |