Merge 1f14130cb0 into merged_master (Bitcoin PR #21575)

This commit is contained in:
Andrew Poelstra 2021-06-30 03:43:01 +00:00
commit a9ef79acbc
19 changed files with 330 additions and 260 deletions

View file

@ -4,7 +4,6 @@
#include <addrdb.h>
#include <banman.h>
#include <boost/signals2/signal.hpp>
#include <chain.h>
#include <chainparams.h>
#include <init.h>
@ -17,6 +16,7 @@
#include <net_processing.h>
#include <netaddress.h>
#include <netbase.h>
#include <node/blockstorage.h>
#include <node/coin.h>
#include <node/context.h>
#include <node/transaction.h>
@ -53,6 +53,8 @@
#include <optional>
#include <utility>
#include <boost/signals2/signal.hpp>
using interfaces::BlockTip;
using interfaces::Chain;
using interfaces::FoundBlock;