Merge 1824644a36 into merged_master (Bitcoin PR bitcoin/bitcoin#24099)

This commit is contained in:
Byron Hambly 2023-06-20 12:25:48 +00:00
commit f5600eb0be
4 changed files with 15 additions and 15 deletions

View file

@ -648,7 +648,7 @@ static RPCHelpMan getnetworkinfo()
obj.pushKV("incrementalfee", ValueFromAmount(::incrementalRelayFee.GetFeePerK()));
UniValue localAddresses(UniValue::VARR);
{
LOCK(cs_mapLocalHost);
LOCK(g_maplocalhost_mutex);
for (const std::pair<const CNetAddr, LocalServiceInfo> &item : mapLocalHost)
{
UniValue rec(UniValue::VOBJ);