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

Merge a739d207a3 into merged_master (Bitcoin PR #17519)

Browse source
This commit is contained in:
Andrew Poelstra 2020-11-09 23:10:14 +00:00
commit 8746cbf50b
4 changed files with 2 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/validation.cpp
View file

@ -134,9 +134,6 @@ CFeeRate minRelayTxFee = CFeeRate(DEFAULT_MIN_RELAY_TX_FEE);
CBlockPolicyEstimator feeEstimator;
CTxMemPool mempool(&feeEstimator);
/** Constant stuff for coinbase transactions we create: */
CScript COINBASE_FLAGS;
// Internal stuff
namespace {
CBlockIndex* pindexBestInvalid = nullptr;