mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-15 12:51:00 +02:00
Merge 5c0cd205a1 into merged_master (Bitcoin PR bitcoin/bitcoin#29625)
This commit is contained in:
parent
e35c518374
commit
8d69f4b94d
44 changed files with 742 additions and 567 deletions
|
|
@ -1419,11 +1419,12 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
|
|||
node.addrman = std::move(*addrman);
|
||||
}
|
||||
|
||||
FastRandomContext rng;
|
||||
assert(!node.banman);
|
||||
node.banman = std::make_unique<BanMan>(args.GetDataDirNet() / "banlist", &uiInterface, args.GetIntArg("-bantime", DEFAULT_MISBEHAVING_BANTIME));
|
||||
assert(!node.connman);
|
||||
node.connman = std::make_unique<CConnman>(GetRand<uint64_t>(),
|
||||
GetRand<uint64_t>(),
|
||||
node.connman = std::make_unique<CConnman>(rng.rand64(),
|
||||
rng.rand64(),
|
||||
*node.addrman, *node.netgroupman, chainparams, args.GetBoolArg("-networkactive", true));
|
||||
|
||||
assert(!node.fee_estimator);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue