GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-18 13:17:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 03b1db6114 into merged_master (Bitcoin PR #18766)

Browse source
This commit is contained in:
Andrew Poelstra 2021-06-11 16:59:19 +00:00
commit 7a7791e879
15 changed files with 75 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/validation.cpp
View file

@ -24,7 +24,6 @@
#include <node/ui_interface.h>
#include <optional.h>
#include <pegins.h>
#include <policy/fees.h>
#include <policy/policy.h>
#include <policy/settings.h>
#include <primitives/block.h>
@ -154,8 +153,6 @@ arith_uint256 nMinimumChainWork;
CFeeRate minRelayTxFee = CFeeRate(DEFAULT_MIN_RELAY_TX_FEE);
CBlockPolicyEstimator feeEstimator;
// Internal stuff
namespace {
CBlockIndex* pindexBestInvalid = nullptr;