mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-16 13:01:19 +02:00
Merge c97270d722 into merged_master (Bitcoin PR bitcoin/bitcoin#27499)
This commit is contained in:
commit
aacc36f977
9 changed files with 87 additions and 37 deletions
13
src/init.cpp
13
src/init.cpp
|
|
@ -51,7 +51,7 @@
|
|||
#include <node/mempool_args.h>
|
||||
#include <node/mempool_persist_args.h>
|
||||
#include <node/miner.h>
|
||||
#include <node/txreconciliation.h>
|
||||
#include <node/peerman_args.h>
|
||||
#include <node/validation_cache_args.h>
|
||||
#include <policy/feerate.h>
|
||||
#include <policy/fees.h>
|
||||
|
|
@ -1681,9 +1681,16 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
|
|||
|
||||
ChainstateManager& chainman = *Assert(node.chainman);
|
||||
|
||||
|
||||
PeerManager::Options peerman_opts{
|
||||
.ignore_incoming_txs = ignores_incoming_txs,
|
||||
};
|
||||
ApplyArgsManOptions(args, peerman_opts);
|
||||
|
||||
assert(!node.peerman);
|
||||
node.peerman = PeerManager::make(*node.connman, *node.addrman, node.banman.get(),
|
||||
chainman, *node.mempool, ignores_incoming_txs);
|
||||
node.peerman = PeerManager::make(*node.connman, *node.addrman,
|
||||
node.banman.get(), chainman,
|
||||
*node.mempool, peerman_opts);
|
||||
RegisterValidationInterface(node.peerman.get());
|
||||
|
||||
// ********************************************************* Step 8: start indexers
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue