From 709789705dd16a10a7fdf62a5596d84692c4e49a Mon Sep 17 00:00:00 2001 From: Brennan Date: Wed, 1 Oct 2025 04:38:46 -0700 Subject: [PATCH] vendor quinn (#8281) (cherry picked from commit c0f5445b902d98cb637c1bf80a75b295e149e2b7) --- Cargo.lock | 6 ++---- Cargo.toml | 3 +++ programs/sbf/Cargo.lock | 12 +++++------- programs/sbf/Cargo.toml | 4 ++++ 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 73df7be5ab2e5a..c2f63a4beef38a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5340,8 +5340,7 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quinn" version = "0.11.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626214629cda6781b6dc1d316ba307189c85ba657213ce642d9c77670f8202c8" +source = "git+https://github.com/anza-xyz/quinn?rev=fc4decb0cf79b1b210603294e96849d67e9c22e2#fc4decb0cf79b1b210603294e96849d67e9c22e2" dependencies = [ "bytes", "cfg_aliases", @@ -5360,8 +5359,7 @@ dependencies = [ [[package]] name = "quinn-proto" version = "0.11.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49df843a9161c85bb8aae55f101bc0bac8bcafd637a620d9122fd7e0b2f7422e" +source = "git+https://github.com/anza-xyz/quinn?rev=fc4decb0cf79b1b210603294e96849d67e9c22e2#fc4decb0cf79b1b210603294e96849d67e9c22e2" dependencies = [ "bytes", "fastbloom", diff --git a/Cargo.toml b/Cargo.toml index 8352c092710807..46d5c9b137cbeb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -640,6 +640,9 @@ opt-level = 3 [patch.crates-io] # for details, see https://github.com/anza-xyz/crossbeam/commit/fd279d707025f0e60951e429bf778b4813d1b6bf crossbeam-epoch = { git = "https://github.com/anza-xyz/crossbeam", rev = "fd279d707025f0e60951e429bf778b4813d1b6bf" } +# for details, see https://github.com/anza-xyz/agave/issues/8262 +quinn = { git = "https://github.com/anza-xyz/quinn", rev = "fc4decb0cf79b1b210603294e96849d67e9c22e2" } +quinn-proto = { git = "https://github.com/anza-xyz/quinn", rev = "fc4decb0cf79b1b210603294e96849d67e9c22e2" } # We include the following crates as our dependencies above from crates.io: # diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock index da220abb84a21a..b7c13156b3ba6c 100644 --- a/programs/sbf/Cargo.lock +++ b/programs/sbf/Cargo.lock @@ -4338,8 +4338,7 @@ dependencies = [ [[package]] name = "quinn" version = "0.11.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626214629cda6781b6dc1d316ba307189c85ba657213ce642d9c77670f8202c8" +source = "git+https://github.com/anza-xyz/quinn?rev=fc4decb0cf79b1b210603294e96849d67e9c22e2#fc4decb0cf79b1b210603294e96849d67e9c22e2" dependencies = [ "bytes", "cfg_aliases", @@ -4358,8 +4357,7 @@ dependencies = [ [[package]] name = "quinn-proto" version = "0.11.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49df843a9161c85bb8aae55f101bc0bac8bcafd637a620d9122fd7e0b2f7422e" +source = "git+https://github.com/anza-xyz/quinn?rev=fc4decb0cf79b1b210603294e96849d67e9c22e2#fc4decb0cf79b1b210603294e96849d67e9c22e2" dependencies = [ "bytes", "fastbloom", @@ -4380,15 +4378,15 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285" +checksum = "4fe68c2e9e1a1234e218683dbdf9f9dfcb094113c5ac2b938dfcb9bab4c4140b" dependencies = [ "libc", "once_cell", "socket2", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] diff --git a/programs/sbf/Cargo.toml b/programs/sbf/Cargo.toml index 4217b27bac8620..b6d4435b2951c8 100644 --- a/programs/sbf/Cargo.toml +++ b/programs/sbf/Cargo.toml @@ -259,6 +259,10 @@ strip = true name = "bpf_loader" [patch.crates-io] +# for details, see https://github.com/anza-xyz/agave/issues/8262 +quinn = { git = "https://github.com/anza-xyz/quinn", rev = "fc4decb0cf79b1b210603294e96849d67e9c22e2" } +quinn-proto = { git = "https://github.com/anza-xyz/quinn", rev = "fc4decb0cf79b1b210603294e96849d67e9c22e2" } + # We include the following crates as our dependencies from crates.io: # # * spl-associated-token-account