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

Merge 3356799ee3 into merged_master (Bitcoin PR #15778)

Browse source
This commit is contained in:
Andrew Poelstra 2020-10-28 23:03:35 +00:00
commit ad0dc00fc2
18 changed files with 46 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/interfaces/node.cpp
View file

@ -207,7 +207,6 @@ public:
}
}
bool getNetworkActive() override { return g_connman && g_connman->GetNetworkActive(); }
CAmount getMaxTxFee() override { return ::maxTxFee; }
CFeeRate estimateSmartFee(int num_blocks, bool conservative, int* returned_target = nullptr) override
{
FeeCalculation fee_calc;