Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[24.1] Backports for rc3 #27614

Merged
merged 6 commits into from
May 11, 2023
Merged

[24.1] Backports for rc3 #27614

merged 6 commits into from
May 11, 2023

Conversation

fanquake
Copy link
Member

@fanquake fanquake commented May 10, 2023

@fanquake fanquake added this to the 24.1 milestone May 10, 2023
@DrahtBot
Copy link
Contributor

DrahtBot commented May 10, 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 josibake, glozow, dergoegge, brunoerg, hebasto, achow101

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

@fanquake fanquake changed the title [24.x] Backports for rc3 [24.1] Backports for rc3 May 11, 2023
sdaftuar and others added 6 commits May 11, 2023 14:23
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
@josibake
Copy link
Member

ACK 97f5e28

Verified that the commits added are the correct ones from the PRs linked, compiled and ran the tests. Document changes look good. Looks like the CI failures are just github being crappy

Copy link
Member

@glozow glozow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 97f5e28

@dergoegge
Copy link
Member

ACK 97f5e28

Copy link
Contributor

@brunoerg brunoerg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 97f5e28

Just ran the tests locally, no problem. Release notes ok.

Copy link
Member

@hebasto hebasto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 97f5e28, commits were backported locally, got zero diff.

@achow101
Copy link
Member

ACK 97f5e28

@achow101 achow101 merged commit ac5b9f3 into bitcoin:24.x May 11, 2023
@fanquake fanquake deleted the backports_24_1_rc3 branch May 11, 2023 14:58
@bitcoin bitcoin locked and limited conversation to collaborators May 10, 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.

10 participants