mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-15 12:51:00 +02:00
Merge a2a8e919ee into merged_master (Bitcoin PR bitcoin/bitcoin#24925)
This commit is contained in:
commit
7effbfd139
13 changed files with 37 additions and 34 deletions
|
|
@ -1418,8 +1418,8 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
|
|||
assert(!node.banman);
|
||||
node.banman = std::make_unique<BanMan>(gArgs.GetDataDirNet() / "banlist", &uiInterface, args.GetIntArg("-bantime", DEFAULT_MISBEHAVING_BANTIME));
|
||||
assert(!node.connman);
|
||||
node.connman = std::make_unique<CConnman>(GetRand(std::numeric_limits<uint64_t>::max()),
|
||||
GetRand(std::numeric_limits<uint64_t>::max()),
|
||||
node.connman = std::make_unique<CConnman>(GetRand<uint64_t>(),
|
||||
GetRand<uint64_t>(),
|
||||
*node.addrman, *node.netgroupman, args.GetBoolArg("-networkactive", true));
|
||||
|
||||
assert(!node.fee_estimator);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue