diff options
| -rw-r--r-- | doc/release-notes.md | 4 | ||||
| -rw-r--r-- | src/net_processing.cpp | 4 | ||||
| -rw-r--r-- | src/wallet/test/spend_tests.cpp | 2 | ||||
| -rwxr-xr-x | test/functional/p2p_addr_relay.py | 2 |
4 files changed, 9 insertions, 3 deletions
diff --git a/doc/release-notes.md b/doc/release-notes.md index f46e9e52c7..61c65d5a3e 100644 --- a/doc/release-notes.md +++ b/doc/release-notes.md @@ -57,6 +57,10 @@ Notable changes P2P and network changes ----------------------- +- A bitcoind 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. (#21528) + Updated RPCs ------------ diff --git a/src/net_processing.cpp b/src/net_processing.cpp index 9da2fe5d6f..8243ef0f55 100644 --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -3749,7 +3749,9 @@ void PeerManagerImpl::ProcessMessage(CNode& pfrom, const std::string& msg_type, 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/src/wallet/test/spend_tests.cpp b/src/wallet/test/spend_tests.cpp index 66e7de4273..8821f680b3 100644 --- a/src/wallet/test/spend_tests.cpp +++ b/src/wallet/test/spend_tests.cpp @@ -54,7 +54,7 @@ BOOST_FIXTURE_TEST_CASE(SubtractFee, TestChain100Setup) // Send full input minus more than the fee amount to recipient, check // leftover input amount is paid to recipient not the miner (to_reduce == // -123). This overpays the recipient instead of overpaying the miner more - // than double the neccesary fee. + // than double the necessary fee. BOOST_CHECK_EQUAL(fee, check_tx(fee + 123)); } diff --git a/test/functional/p2p_addr_relay.py b/test/functional/p2p_addr_relay.py index 95743a1bf5..113e1f9492 100755 --- a/test/functional/p2p_addr_relay.py +++ b/test/functional/p2p_addr_relay.py @@ -179,7 +179,7 @@ class AddrTest(BitcoinTestFramework): # 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') |