mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-18 13:17:55 +02:00
Merge 0ed2c130e7 into merged_master (Bitcoin PR bitcoin/bitcoin#27375)
This commit is contained in:
commit
e893b7e6f9
17 changed files with 401 additions and 142 deletions
|
|
@ -607,8 +607,8 @@ static UniValue GetNetworksInfo()
|
|||
obj.pushKV("name", GetNetworkName(network));
|
||||
obj.pushKV("limited", !g_reachable_nets.Contains(network));
|
||||
obj.pushKV("reachable", g_reachable_nets.Contains(network));
|
||||
obj.pushKV("proxy", proxy.IsValid() ? proxy.proxy.ToStringAddrPort() : std::string());
|
||||
obj.pushKV("proxy_randomize_credentials", proxy.randomize_credentials);
|
||||
obj.pushKV("proxy", proxy.IsValid() ? proxy.ToString() : std::string());
|
||||
obj.pushKV("proxy_randomize_credentials", proxy.m_randomize_credentials);
|
||||
networks.push_back(obj);
|
||||
}
|
||||
return networks;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue