Skip to content

Conversation

@fanquake
Copy link
Member

@fanquake fanquake commented May 11, 2023

Final backports for rc1. Currently:

@DrahtBot
Copy link
Contributor

DrahtBot commented May 11, 2023

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Reviews

See the guideline for information on the review process.

Type Reviewers
ACK achow101, dergoegge, ajtowns
Stale ACK Sjors

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.

@dergoegge
Copy link
Member

ACK ce8f812

Are you going to add #27610 to this?

@Sjors
Copy link
Member

Sjors commented May 11, 2023

utACK ce8f812

ajtowns and others added 6 commits May 11, 2023 17:12
We use CompareDepthAndScore to choose an order of txs to inv. Rather
than sorting txs that have been evicted from the mempool at the end
of the list, sort them at the beginning so they are removed from
the queue immediately.

Github-Pull: bitcoin#27610
Rebased-From: 228e920
If transactions are being added to the mempool at a rate faster than 7tx/s
(INVENTORY_BROADCAST_PER_SECOND) then peers' inventory_to_send queue can
become relatively large. If this happens, increase the number of txids
we include in an INV message (normally capped at 35) by 5 for each 1000
txids in the queue.

This will tend to clear a temporary excess out reasonably quickly; an
excess of 4000 invs to send will be cleared down to 1000 in about 30
minutes, while an excess of 20000 invs would be cleared down to 1000 in
about 60 minutes.

Github-Pull: bitcoin#27610
Rebased-From: 5b34060
Move historical 23.1 to doc/release-notes.
@fanquake
Copy link
Member Author

Added #27610, as well as all other changes required to cut an rc1.

Are you going to add #27610 to this?

Yes. Note that the second commit from that PR is not a clean cherry-pick.

@achow101
Copy link
Member

ACK a26ff20

Diffs match as expected

@DrahtBot DrahtBot requested review from Sjors and dergoegge May 11, 2023 17:27
@dergoegge
Copy link
Member

ACK a26ff20

@DrahtBot DrahtBot removed the request for review from dergoegge May 11, 2023 18:18
@ajtowns
Copy link
Contributor

ajtowns commented May 12, 2023

utACK a26ff20

@Sjors
Copy link
Member

Sjors commented May 12, 2023

I didn't check the #27608 backport (nor the original). I did check #27608, the other commits in this PR and the release notes, which look good to me.

@fanquake fanquake merged commit 2e9fc2e into bitcoin:23.x May 12, 2023
@fanquake fanquake deleted the backports_23_2_rc1 branch May 12, 2023 09:09
jamesdorfman added a commit to jamesdorfman/elements that referenced this pull request Sep 25, 2023
@bitcoin bitcoin locked and limited conversation to collaborators May 11, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants