merge bitcoin#22618: Small follow-ups to 21528

kwvg · kwvg · commit 8b8fbc522689 · 2024-04-12T16:55:05.000Z
diff --git a/doc/release-notes-5978.md b/doc/release-notes-5978.md
@@ -6,3 +6,10 @@ RPC changes
 
 - `getnodeaddresses` now also accepts a "network" argument (ipv4, ipv6, onion,
   or i2p) to return only addresses of the specified network.
+
+P2P and network changes
+-----------------------
+
+- A dashd node will no longer rumour addresses to inbound peers by default.
+  They will become eligible for address gossip after sending an ADDR, ADDRV2,
+  or GETADDR message.
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
@@ -4397,7 +4397,9 @@ void PeerManagerImpl::ProcessMessage(
             return;
         }
 
-        SetupAddressRelay(pfrom, *peer);
+        // Since this must be an inbound connection, SetupAddressRelay will
+        // never fail.
+        Assume(SetupAddressRelay(pfrom, *peer));
 
         // Only send one GetAddr response per connection to reduce resource waste
         // and discourage addr stamping of INV announcements.
diff --git a/test/functional/p2p_addr_relay.py b/test/functional/p2p_addr_relay.py
@@ -175,7 +175,7 @@ def relay_tests(self):
         # of the outbound peer which is often sent before the GETADDR response.
         assert_equal(inbound_peer.num_ipv4_received, 0)
 
-        # Send an empty ADDR message to intialize address relay on this connection.
+        # Send an empty ADDR message to initialize address relay on this connection.
         inbound_peer.send_and_ping(msg_addr())
 
         self.log.info('Check that subsequent addr messages sent from an outbound peer are relayed')

Original file line number	Diff line number	Diff line change
`@@ -4397,7 +4397,9 @@ void PeerManagerImpl::ProcessMessage(`
`4397`	`4397`	`return;`
`4398`	`4398`	`}`
`4399`	`4399`
`4400`		`- SetupAddressRelay(pfrom, *peer);`
	`4400`	`+ // Since this must be an inbound connection, SetupAddressRelay will`
	`4401`	`+ // never fail.`
	`4402`	`+ Assume(SetupAddressRelay(pfrom, *peer));`
`4401`	`4403`
`4402`	`4404`	`// Only send one GetAddr response per connection to reduce resource waste`
`4403`	`4405`	`// and discourage addr stamping of INV announcements.`