Skip to content

Commit

Permalink
Merge bitcoin/bitcoin#22618: [p2p] Small follow-ups to 21528
Browse files Browse the repository at this point in the history
9778b0f [net_processing] Provide debug error if code assumptions change. (Amiti Uttarwar)
aa79c91 [docs] Add release notes for #21528 (Amiti Uttarwar)

Pull request description:

  Adds a release note & addresses [this](bitcoin/bitcoin#21528 (comment)) review comment to make expectations more explicit.

ACKs for top commit:
  Zero-1729:
    re-ACK 9778b0f
  jonatack:
    ACK 9778b0f

Tree-SHA512: 9507df5f2746d05c6df8c86b7a19364610ebfafc81af7650be7e68d7536a0685cce9fd2e5f287ef92b6245c584f8875b24a958109ba5bd8acf3c8fc9fd19eef2
  • Loading branch information
MarcoFalke committed Aug 5, 2021
2 parents e9472e6 + 9778b0f commit dd981b5
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 3 deletions.
4 changes: 4 additions & 0 deletions doc/release-notes.md
Expand Up @@ -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
------------

Expand Down
4 changes: 3 additions & 1 deletion src/net_processing.cpp
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/wallet/test/spend_tests.cpp
Expand Up @@ -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));
}

Expand Down
2 changes: 1 addition & 1 deletion test/functional/p2p_addr_relay.py
Expand Up @@ -179,7 +179,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')
Expand Down

0 comments on commit dd981b5

Please sign in to comment.