Skip to content

vendor quinn#8281

Merged
bw-solana merged 4 commits intoanza-xyz:masterfrom
bw-solana:vendor_quinn
Oct 1, 2025
Merged

vendor quinn#8281
bw-solana merged 4 commits intoanza-xyz:masterfrom
bw-solana:vendor_quinn

Conversation

@bw-solana
Copy link
Copy Markdown

@bw-solana bw-solana commented Oct 1, 2025

Problem

See #8262

Summary of Changes

  • Vendor quinn. Point it at anza-xyz/quinn@d8944f6 (v0.11.8 quinn / v0.11.12 quinn-proto versions + some fixes)
  • Note that as a side effect, programs/sbf advances quinn-udp from v0.5.4 to v0.5.5

alexpyattaev
alexpyattaev previously approved these changes Oct 1, 2025
Copy link
Copy Markdown

@alexpyattaev alexpyattaev left a comment

Choose a reason for hiding this comment

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

Thank you

@gregcusack gregcusack self-requested a review October 1, 2025 09:55
gregcusack
gregcusack previously approved these changes Oct 1, 2025
Copy link
Copy Markdown

@gregcusack gregcusack left a comment

Choose a reason for hiding this comment

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

lgtm

@codecov-commenter
Copy link
Copy Markdown

codecov-commenter commented Oct 1, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 83.2%. Comparing base (cc53039) to head (bacbec7).

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #8281   +/-   ##
=======================================
  Coverage    83.2%    83.2%           
=======================================
  Files         836      836           
  Lines      366679   366679           
=======================================
+ Hits       305266   305279   +13     
+ Misses      61413    61400   -13     
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Comment thread Cargo.lock Outdated
Comment on lines +5673 to +5674
version = "0.5.12"
source = "git+https://github.com/anza-xyz/quinn?rev=d8944f6085193cc29e750b40d86d0b5cb4a21831#d8944f6085193cc29e750b40d86d0b5cb4a21831"
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

the patch updates quinn-udp as well. I added a new commit to agave-2.3 so the lockfile looks cleaner.
anza-xyz/quinn@fc4decb

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

the patch in quinn repo points to 0.5.5, this points to 0.5.12 - is it ok?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

updated to point at this commit

Comment thread Cargo.toml Outdated
Comment on lines +647 to +648
quinn = { git = "https://github.com/anza-xyz/quinn", rev = "d8944f6085193cc29e750b40d86d0b5cb4a21831" }
quinn-proto = { git = "https://github.com/anza-xyz/quinn", rev = "d8944f6085193cc29e750b40d86d0b5cb4a21831" }
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Suggested change
quinn = { git = "https://github.com/anza-xyz/quinn", rev = "d8944f6085193cc29e750b40d86d0b5cb4a21831" }
quinn-proto = { git = "https://github.com/anza-xyz/quinn", rev = "d8944f6085193cc29e750b40d86d0b5cb4a21831" }
quinn = { git = "https://github.com/anza-xyz/quinn", rev = "fc4decb0cf79b1b210603294e96849d67e9c22e2" }
quinn-proto = { git = "https://github.com/anza-xyz/quinn", rev = "fc4decb0cf79b1b210603294e96849d67e9c22e2" }

@yihau
Copy link
Copy Markdown
Member

yihau commented Oct 1, 2025

not sure why your tree touched sbf's cargo.lock. just created a ci test (#8284) and it's still running ci.

@bw-solana
Copy link
Copy Markdown
Author

not sure why your tree touched sbf's cargo.lock. just created a ci test (#8284) and it's still running ci.

we want to update the quinn version that programs/sbf uses as well, right?

#8276 rolled back version for this lock file

@yihau
Copy link
Copy Markdown
Member

yihau commented Oct 1, 2025

sorry, I’m not sure if we actually use any quinn features in programs/sbf. my guess is that it’s being pulled in indirectly by some solana/agave deps 🤔

@alexpyattaev
Copy link
Copy Markdown

sorry, I’m not sure if we actually use any quinn features in programs/sbf. my guess is that it’s being pulled in indirectly by some solana/agave deps 🤔

it is pulled in by streamer via tests

@alexpyattaev alexpyattaev marked this pull request as ready for review October 1, 2025 10:52
@yihau
Copy link
Copy Markdown
Member

yihau commented Oct 1, 2025

I thought we were only bumping the root cargo.toml. if we want to include programs/sbf, maybe we can just relax the pin restrictions so that we don't touch the quinn-udp

@alexpyattaev
Copy link
Copy Markdown

I thought we were only bumping the root cargo.toml. if we want to include programs/sbf, maybe we can just relax the pin restrictions so that we don't touch the quinn-udp

Can this be done in a follow-up PR?

@yihau
Copy link
Copy Markdown
Member

yihau commented Oct 1, 2025

I think we will just bp this PR. it's better to do it here.

@alexpyattaev
Copy link
Copy Markdown

alexpyattaev commented Oct 1, 2025

I think we will just bp this PR. it's better to do it here.

Changeset for 0.5.5 is very small and unrelated to agave (mostly android support and CI)
https://github.com/quinn-rs/quinn/releases/tag/quinn-udp-0.5.5

@mergify
Copy link
Copy Markdown

mergify Bot commented Oct 1, 2025

Backports to the stable branch are to be avoided unless absolutely necessary for fixing bugs, security issues, and perf regressions. Changes intended for backport should be structured such that a minimum effective diff can be committed separately from any refactoring, plumbing, cleanup, etc that are not strictly necessary to achieve the goal. Any of the latter should go only into master and ride the normal stabilization schedule.

@mergify
Copy link
Copy Markdown

mergify Bot commented Oct 1, 2025

Backports to the beta branch are to be avoided unless absolutely necessary for fixing bugs, security issues, and perf regressions. Changes intended for backport should be structured such that a minimum effective diff can be committed separately from any refactoring, plumbing, cleanup, etc that are not strictly necessary to achieve the goal. Any of the latter should go only into master and ride the normal stabilization schedule. Exceptions include CI/metrics changes, CLI improvements and documentation updates on a case by case basis.

@bw-solana bw-solana merged commit c0f5445 into anza-xyz:master Oct 1, 2025
55 of 56 checks passed
mergify Bot pushed a commit that referenced this pull request Oct 1, 2025
(cherry picked from commit c0f5445)
mergify Bot pushed a commit that referenced this pull request Oct 1, 2025
(cherry picked from commit c0f5445)
bw-solana added a commit that referenced this pull request Oct 1, 2025
vendor quinn (#8281)

(cherry picked from commit c0f5445)

Co-authored-by: Brennan <brennan.watt@anza.xyz>
bw-solana added a commit that referenced this pull request Oct 1, 2025
vendor quinn (#8281)

(cherry picked from commit c0f5445)

Co-authored-by: Brennan <brennan.watt@anza.xyz>
@yihau yihau mentioned this pull request Oct 2, 2025
yihau added a commit that referenced this pull request Oct 2, 2025
* Revert "vendor quinn (#8281)"

This reverts commit c0f5445.

* Revert "Revert "bump quinn to 0.11.9 and quinn-proto to 0.11.13 (#7799)" (#8276)"

This reverts commit cc53039.
gregcusack pushed a commit that referenced this pull request Oct 8, 2025
vendor quinn (#8281)

(cherry picked from commit c0f5445)

Co-authored-by: Brennan <brennan.watt@anza.xyz>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants