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

Merge c536dfbcb0 into merged_master (Bitcoin PR #15639)

Browse source 
asp: the point of this PR was to completely decouple libbitcoin_server from
bitcoin_tool; it removes $(LIBBITCOIN_SERVER) from the `elements_wallet_LDADD`.
I put this back in because our additional code related to pegin claiming makes
heavy use of methods from libbitcoin_server.

If we want to morally accept this PR then we need to do a nontrivial refactoring.
This commit is contained in:
Andrew Poelstra 2020-10-28 15:00:23 +00:00
commit f3b06ff713
18 changed files with 92 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/rpc/mining.cpp
View file

@ -14,6 +14,7 @@
#include <miner.h>
#include <net.h>
#include <policy/fees.h>
#include <policy/settings.h>
#include <pow.h>
#include <rpc/blockchain.h>
#include <rpc/mining.h>