Merge 1e9d367d0d into merged_master (Bitcoin PR bitcoin/bitcoin#28423)

This commit is contained in:
Byron Hambly 2025-07-21 14:33:58 +02:00
commit 61847fc900
34 changed files with 96 additions and 57 deletions

View file

@ -1363,7 +1363,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
assert(!node.connman);
node.connman = std::make_unique<CConnman>(GetRand<uint64_t>(),
GetRand<uint64_t>(),
*node.addrman, *node.netgroupman, args.GetBoolArg("-networkactive", true));
*node.addrman, *node.netgroupman, chainparams, args.GetBoolArg("-networkactive", true));
assert(!node.fee_estimator);
// Don't initialize fee estimation with old data if we don't relay transactions,