Merge 1cc123f405 into merged_master (Bitcoin PR bitcoin/bitcoin#22169)

This commit is contained in:
Andrew Poelstra 2021-07-22 17:53:23 +00:00
commit af93aa29dc
3 changed files with 5 additions and 5 deletions

View file

@ -939,7 +939,7 @@ static RPCHelpMan addpeeraddress()
bool success{false};
if (LookupHost(addr_string, net_addr, false)) {
CAddress address{CAddress({net_addr, port}, ServiceFlags(NODE_NETWORK | NODE_WITNESS))};
CAddress address{{net_addr, port}, ServiceFlags{NODE_NETWORK | NODE_WITNESS}};
address.nTime = GetAdjustedTime();
// The source address is set equal to the address. This is equivalent to the peer
// announcing itself.