Rollback tokio to LTS release v1.14 (#25028)

This commit is contained in:
Tyera Eulberg 2022-05-06 00:34:49 -06:00 committed by GitHub
parent c895ad6b41
commit c4aa082efc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 420 additions and 150 deletions

271
Cargo.lock generated
View File

@ -721,7 +721,7 @@ version = "3.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a3aab4734e083b809aaf5794e14e756d1c798d2c69c7f7de7a09a2f5214993c1"
dependencies = [
"heck",
"heck 0.4.0",
"proc-macro-error",
"proc-macro2 1.0.37",
"quote 1.0.18",
@ -1299,17 +1299,16 @@ dependencies = [
[[package]]
name = "etcd-client"
version = "0.9.1"
version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c434d2800b273a506b82397aad2f20971636f65e47b27c027f77d498530c5954"
checksum = "c3bfae4cb9cd8c3c2a552d45e155cafd079f385a3b9421b9a010878f44531f1e"
dependencies = [
"http",
"prost",
"prost 0.9.0",
"tokio",
"tokio-stream",
"tonic",
"tonic-build",
"tower",
"tonic 0.6.2",
"tonic-build 0.6.2",
"tower-service",
]
@ -1738,6 +1737,15 @@ dependencies = [
"ahash",
]
[[package]]
name = "heck"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
dependencies = [
"unicode-segmentation",
]
[[package]]
name = "heck"
version = "0.4.0"
@ -1884,9 +1892,9 @@ checksum = "d87c48c02e0dc5e3b849a2041db3029fd066650f8f717c07bf8ed78ccb895cac"
dependencies = [
"http",
"hyper",
"rustls",
"rustls 0.20.4",
"tokio",
"tokio-rustls",
"tokio-rustls 0.23.3",
]
[[package]]
@ -2444,20 +2452,6 @@ dependencies = [
"winapi 0.3.9",
]
[[package]]
name = "mio"
version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "52da4364ffb0e4fe33a9841a98a3f3014fb964045ce4f7a45a398243c8d6b0c9"
dependencies = [
"libc",
"log",
"miow",
"ntapi",
"wasi 0.11.0+wasi-snapshot-preview1",
"winapi 0.3.9",
]
[[package]]
name = "miow"
version = "0.3.7"
@ -3142,6 +3136,16 @@ dependencies = [
"tempfile",
]
[[package]]
name = "prost"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001"
dependencies = [
"bytes",
"prost-derive 0.9.0",
]
[[package]]
name = "prost"
version = "0.10.1"
@ -3149,7 +3153,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a07b0857a71a8cb765763950499cae2413c3f9cede1133478c43600d9e146890"
dependencies = [
"bytes",
"prost-derive",
"prost-derive 0.10.1",
]
[[package]]
name = "prost-build"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5"
dependencies = [
"bytes",
"heck 0.3.3",
"itertools",
"lazy_static",
"log",
"multimap",
"petgraph",
"prost 0.9.0",
"prost-types 0.9.0",
"regex",
"tempfile",
"which",
]
[[package]]
@ -3161,19 +3185,32 @@ dependencies = [
"bytes",
"cfg-if 1.0.0",
"cmake",
"heck",
"heck 0.4.0",
"itertools",
"lazy_static",
"log",
"multimap",
"petgraph",
"prost",
"prost-types",
"prost 0.10.1",
"prost-types 0.10.1",
"regex",
"tempfile",
"which",
]
[[package]]
name = "prost-derive"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe"
dependencies = [
"anyhow",
"itertools",
"proc-macro2 1.0.37",
"quote 1.0.18",
"syn 1.0.91",
]
[[package]]
name = "prost-derive"
version = "0.10.1"
@ -3187,6 +3224,16 @@ dependencies = [
"syn 1.0.91",
]
[[package]]
name = "prost-types"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a"
dependencies = [
"bytes",
"prost 0.9.0",
]
[[package]]
name = "prost-types"
version = "0.10.1"
@ -3194,7 +3241,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2d0a014229361011dc8e69c8a1ec6c2e8d0f2af7c91e3ea3f5b2170298461e68"
dependencies = [
"bytes",
"prost",
"prost 0.10.1",
]
[[package]]
@ -3230,11 +3277,11 @@ dependencies = [
"fxhash",
"quinn-proto",
"quinn-udp",
"rustls",
"rustls 0.20.4",
"thiserror",
"tokio",
"tracing",
"webpki",
"webpki 0.22.0",
]
[[package]]
@ -3247,14 +3294,14 @@ dependencies = [
"fxhash",
"rand 0.8.5",
"ring",
"rustls",
"rustls 0.20.4",
"rustls-native-certs",
"rustls-pemfile 0.2.1",
"slab",
"thiserror",
"tinyvec",
"tracing",
"webpki",
"webpki 0.22.0",
]
[[package]]
@ -3265,7 +3312,7 @@ checksum = "df185e5e5f7611fa6e628ed8f9633df10114b03bbaecab186ec55822c44ac727"
dependencies = [
"futures-util",
"libc",
"mio 0.7.14",
"mio",
"quinn-proto",
"socket2",
"tokio",
@ -3568,14 +3615,14 @@ dependencies = [
"native-tls",
"percent-encoding 2.1.0",
"pin-project-lite",
"rustls",
"rustls 0.20.4",
"rustls-pemfile 0.3.0",
"serde",
"serde_json",
"serde_urlencoded",
"tokio",
"tokio-native-tls",
"tokio-rustls",
"tokio-rustls 0.23.3",
"url 2.2.2",
"wasm-bindgen",
"wasm-bindgen-futures",
@ -3662,6 +3709,19 @@ dependencies = [
"winapi 0.3.9",
]
[[package]]
name = "rustls"
version = "0.19.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7"
dependencies = [
"base64 0.13.0",
"log",
"ring",
"sct 0.6.1",
"webpki 0.21.4",
]
[[package]]
name = "rustls"
version = "0.20.4"
@ -3670,8 +3730,8 @@ checksum = "4fbfeb8d0ddb84706bc597a5574ab8912817c52a397f819e5b614e2265206921"
dependencies = [
"log",
"ring",
"sct",
"webpki",
"sct 0.7.0",
"webpki 0.22.0",
]
[[package]]
@ -3782,6 +3842,16 @@ dependencies = [
"syn 1.0.91",
]
[[package]]
name = "sct"
version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce"
dependencies = [
"ring",
"untrusted",
]
[[package]]
name = "sct"
version = "0.7.0"
@ -4538,7 +4608,7 @@ dependencies = [
"rand_chacha 0.2.2",
"rayon",
"reqwest",
"rustls",
"rustls 0.20.4",
"semver",
"serde",
"serde_derive",
@ -5009,7 +5079,7 @@ dependencies = [
"matches",
"num_cpus",
"num_enum",
"prost",
"prost 0.10.1",
"rand 0.7.3",
"rand_chacha 0.2.2",
"rayon",
@ -5780,8 +5850,8 @@ dependencies = [
"goauth",
"log",
"openssl",
"prost",
"prost-types",
"prost 0.10.1",
"prost-types 0.10.1",
"serde",
"serde_derive",
"smpl_jwt",
@ -5790,7 +5860,7 @@ dependencies = [
"solana-storage-proto",
"solana-transaction-status",
"thiserror",
"tonic",
"tonic 0.7.1",
"zstd",
]
@ -5801,12 +5871,12 @@ dependencies = [
"bincode",
"bs58",
"enum-iterator",
"prost",
"prost 0.10.1",
"serde",
"solana-account-decoder",
"solana-sdk 1.11.0",
"solana-transaction-status",
"tonic-build",
"tonic-build 0.7.1",
]
[[package]]
@ -5836,7 +5906,7 @@ dependencies = [
"quinn",
"rand 0.7.3",
"rcgen",
"rustls",
"rustls 0.20.4",
"solana-logger 1.11.0",
"solana-metrics",
"solana-perf",
@ -6577,20 +6647,20 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
[[package]]
name = "tokio"
version = "1.18.1"
version = "1.14.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dce653fb475565de9f6fb0614b28bca8df2c430c0cf84bcd9c843f15de5414cc"
checksum = "b9d0183f6f6001549ab68f8c7585093bb732beefbcf6d23a10b9b95c73a1dd49"
dependencies = [
"autocfg",
"bytes",
"libc",
"memchr",
"mio 0.8.2",
"mio",
"num_cpus",
"once_cell",
"parking_lot 0.12.0",
"parking_lot 0.11.2",
"pin-project-lite",
"signal-hook-registry",
"socket2",
"tokio-macros",
"winapi 0.3.9",
]
@ -6626,15 +6696,26 @@ dependencies = [
"tokio",
]
[[package]]
name = "tokio-rustls"
version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6"
dependencies = [
"rustls 0.19.1",
"tokio",
"webpki 0.21.4",
]
[[package]]
name = "tokio-rustls"
version = "0.23.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4151fda0cf2798550ad0b34bcfc9b9dcc2a9d2471c895c68f3a8818e54f2389e"
dependencies = [
"rustls",
"rustls 0.20.4",
"tokio",
"webpki",
"webpki 0.22.0",
]
[[package]]
@ -6672,11 +6753,11 @@ checksum = "06cda1232a49558c46f8a504d5b93101d42c0bf7f911f12a105ba48168f821ae"
dependencies = [
"futures-util",
"log",
"rustls",
"rustls 0.20.4",
"tokio",
"tokio-rustls",
"tokio-rustls 0.23.3",
"tungstenite",
"webpki",
"webpki 0.22.0",
"webpki-roots",
]
@ -6719,6 +6800,38 @@ dependencies = [
"serde",
]
[[package]]
name = "tonic"
version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ff08f4649d10a70ffa3522ca559031285d8e421d727ac85c60825761818f5d0a"
dependencies = [
"async-stream",
"async-trait",
"base64 0.13.0",
"bytes",
"futures-core",
"futures-util",
"h2",
"http",
"http-body",
"hyper",
"hyper-timeout",
"percent-encoding 2.1.0",
"pin-project",
"prost 0.9.0",
"prost-derive 0.9.0",
"tokio",
"tokio-rustls 0.22.0",
"tokio-stream",
"tokio-util 0.6.9",
"tower",
"tower-layer",
"tower-service",
"tracing",
"tracing-futures",
]
[[package]]
name = "tonic"
version = "0.7.1"
@ -6739,11 +6852,11 @@ dependencies = [
"hyper-timeout",
"percent-encoding 2.1.0",
"pin-project",
"prost",
"prost-derive",
"prost 0.10.1",
"prost-derive 0.10.1",
"rustls-pemfile 0.3.0",
"tokio",
"tokio-rustls",
"tokio-rustls 0.23.3",
"tokio-stream",
"tokio-util 0.7.1",
"tower",
@ -6753,6 +6866,18 @@ dependencies = [
"tracing-futures",
]
[[package]]
name = "tonic-build"
version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9403f1bafde247186684b230dc6f38b5cd514584e8bec1dd32514be4745fa757"
dependencies = [
"proc-macro2 1.0.37",
"prost-build 0.9.0",
"quote 1.0.18",
"syn 1.0.91",
]
[[package]]
name = "tonic-build"
version = "0.7.1"
@ -6761,7 +6886,7 @@ checksum = "c03447cdc9eaf8feffb6412dcb27baf2db11669a6c4789f29da799aabfb99547"
dependencies = [
"prettyplease",
"proc-macro2 1.0.37",
"prost-build",
"prost-build 0.10.1",
"quote 1.0.18",
"syn 1.0.91",
]
@ -6909,12 +7034,12 @@ dependencies = [
"httparse",
"log",
"rand 0.8.5",
"rustls",
"rustls 0.20.4",
"sha-1 0.10.0",
"thiserror",
"url 2.2.2",
"utf-8",
"webpki",
"webpki 0.22.0",
"webpki-roots",
]
@ -6954,6 +7079,12 @@ dependencies = [
"tinyvec",
]
[[package]]
name = "unicode-segmentation"
version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99"
[[package]]
name = "unicode-width"
version = "0.1.9"
@ -7133,12 +7264,6 @@ version = "0.10.2+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
[[package]]
name = "wasi"
version = "0.11.0+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "wasm-bindgen"
version = "0.2.80"
@ -7215,6 +7340,16 @@ dependencies = [
"wasm-bindgen",
]
[[package]]
name = "webpki"
version = "0.21.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea"
dependencies = [
"ring",
"untrusted",
]
[[package]]
name = "webpki"
version = "0.22.0"
@ -7231,7 +7366,7 @@ version = "0.22.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "44d8de8415c823c8abd270ad483c6feeac771fad964890779f9a8cb24fbbc1bf"
dependencies = [
"webpki",
"webpki 0.22.0",
]
[[package]]

View File

@ -17,7 +17,7 @@ solana-program = { path = "../sdk/program", version = "=1.11.0" }
solana-sdk = { path = "../sdk", version = "=1.11.0" }
tarpc = { version = "0.28.0", features = ["full"] }
thiserror = "1.0"
tokio = { version = "1", features = ["full"] }
tokio = { version = "~1.14.1", features = ["full"] }
tokio-serde = { version = "0.8", features = ["bincode"] }
[dev-dependencies]

View File

@ -18,7 +18,7 @@ solana-runtime = { path = "../runtime", version = "=1.11.0" }
solana-sdk = { path = "../sdk", version = "=1.11.0" }
solana-send-transaction-service = { path = "../send-transaction-service", version = "=1.11.0" }
tarpc = { version = "0.28.0", features = ["full"] }
tokio = { version = "1", features = ["full"] }
tokio = { version = "~1.14.1", features = ["full"] }
tokio-serde = { version = "0.8", features = ["bincode"] }
tokio-stream = "0.1"

View File

@ -29,7 +29,7 @@ solana-test-validator = { path = "../test-validator", version = "=1.11.0" }
solana-transaction-status = { path = "../transaction-status", version = "=1.11.0" }
solana-version = { path = "../version", version = "=1.11.0" }
systemstat = "0.1.10"
tokio = { version = "1", features = ["full"] }
tokio = { version = "~1.14.1", features = ["full"] }
[dev-dependencies]
solana-logger = { path = "../logger", version = "=1.11.0" }

View File

@ -51,7 +51,7 @@ solana-version = { path = "../version", version = "=1.11.0" }
solana-vote-program = { path = "../programs/vote", version = "=1.11.0" }
spl-token-2022 = { version = "=0.3.0", features = ["no-entrypoint"] }
thiserror = "1.0"
tokio = { version = "1", features = ["full"] }
tokio = { version = "~1.14.1", features = ["full"] }
tokio-stream = "0.1.8"
tokio-tungstenite = { version = "0.17.1", features = ["rustls-tls-webpki-roots"] }
tungstenite = { version = "0.17.2", features = ["rustls-tls-webpki-roots"] }

View File

@ -21,7 +21,7 @@ bs58 = "0.4.0"
chrono = { version = "0.4.11", features = ["serde"] }
crossbeam-channel = "0.5"
dashmap = { version = "4.0.2", features = ["rayon", "raw-api"] }
etcd-client = { version = "0.9.1", features = ["tls"] }
etcd-client = { version = "0.8.1", features = ["tls"] }
fs_extra = "1.2.0"
histogram = "0.6.9"
itertools = "0.10.3"
@ -61,7 +61,7 @@ solana-vote-program = { path = "../programs/vote", version = "=1.11.0" }
sys-info = "0.9.1"
tempfile = "3.3.0"
thiserror = "1.0"
tokio = { version = "1", features = ["full"] }
tokio = { version = "~1.14.1", features = ["full"] }
trees = "0.4.2"
[dev-dependencies]

View File

@ -25,7 +25,7 @@ solana-sdk = { path = "../sdk", version = "=1.11.0" }
solana-version = { path = "../version", version = "=1.11.0" }
spl-memo = { version = "=3.0.1", features = ["no-entrypoint"] }
thiserror = "1.0"
tokio = { version = "1", features = ["full"] }
tokio = { version = "~1.14.1", features = ["full"] }
[lib]
crate-type = ["lib"]

View File

@ -35,7 +35,7 @@ solana-storage-bigtable = { path = "../storage-bigtable", version = "=1.11.0" }
solana-transaction-status = { path = "../transaction-status", version = "=1.11.0" }
solana-version = { path = "../version", version = "=1.11.0" }
solana-vote-program = { path = "../programs/vote", version = "=1.11.0" }
tokio = { version = "1", features = ["full"] }
tokio = { version = "~1.14.1", features = ["full"] }
[target.'cfg(not(target_env = "msvc"))'.dependencies]
jemallocator = { package = "tikv-jemallocator", version = "0.4.1", features = ["unprefixed_malloc_on_supported_platforms"] }

View File

@ -51,7 +51,7 @@ solana-transaction-status = { path = "../transaction-status", version = "=1.11.0
solana-vote-program = { path = "../programs/vote", version = "=1.11.0" }
tempfile = "3.3.0"
thiserror = "1.0"
tokio = { version = "1", features = ["full"] }
tokio = { version = "~1.14.1", features = ["full"] }
tokio-stream = "0.1"
trees = "0.4.2"

View File

@ -22,7 +22,7 @@ socket2 = "0.4.4"
solana-logger = { path = "../logger", version = "=1.11.0" }
solana-sdk = { path = "../sdk", version = "=1.11.0" }
solana-version = { path = "../version", version = "=1.11.0" }
tokio = { version = "1", features = ["full"] }
tokio = { version = "~1.14.1", features = ["full"] }
url = "2.2.2"
[lib]

View File

@ -24,4 +24,4 @@ solana-runtime = { path = "../runtime", version = "=1.11.0" }
solana-sdk = { path = "../sdk", version = "=1.11.0" }
solana-vote-program = { path = "../programs/vote", version = "=1.11.0" }
thiserror = "1.0"
tokio = { version = "1", features = ["full"] }
tokio = { version = "~1.14.1", features = ["full"] }

269
programs/bpf/Cargo.lock generated
View File

@ -1119,17 +1119,16 @@ dependencies = [
[[package]]
name = "etcd-client"
version = "0.9.1"
version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c434d2800b273a506b82397aad2f20971636f65e47b27c027f77d498530c5954"
checksum = "c3bfae4cb9cd8c3c2a552d45e155cafd079f385a3b9421b9a010878f44531f1e"
dependencies = [
"http",
"prost",
"prost 0.9.0",
"tokio",
"tokio-stream",
"tonic",
"tonic-build",
"tower",
"tonic 0.6.2",
"tonic-build 0.6.2",
"tower-service",
]
@ -1492,6 +1491,15 @@ dependencies = [
"ahash",
]
[[package]]
name = "heck"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
dependencies = [
"unicode-segmentation",
]
[[package]]
name = "heck"
version = "0.4.0"
@ -1621,9 +1629,9 @@ checksum = "d87c48c02e0dc5e3b849a2041db3029fd066650f8f717c07bf8ed78ccb895cac"
dependencies = [
"http",
"hyper",
"rustls",
"rustls 0.20.4",
"tokio",
"tokio-rustls",
"tokio-rustls 0.23.2",
]
[[package]]
@ -2174,20 +2182,6 @@ dependencies = [
"winapi 0.3.9",
]
[[package]]
name = "mio"
version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "52da4364ffb0e4fe33a9841a98a3f3014fb964045ce4f7a45a398243c8d6b0c9"
dependencies = [
"libc",
"log",
"miow",
"ntapi",
"wasi 0.11.0+wasi-snapshot-preview1",
"winapi 0.3.9",
]
[[package]]
name = "miow"
version = "0.3.7"
@ -2815,6 +2809,16 @@ dependencies = [
"unicode-xid 0.2.0",
]
[[package]]
name = "prost"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001"
dependencies = [
"bytes",
"prost-derive 0.9.0",
]
[[package]]
name = "prost"
version = "0.10.1"
@ -2822,7 +2826,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a07b0857a71a8cb765763950499cae2413c3f9cede1133478c43600d9e146890"
dependencies = [
"bytes",
"prost-derive",
"prost-derive 0.10.1",
]
[[package]]
name = "prost-build"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5"
dependencies = [
"bytes",
"heck 0.3.3",
"itertools",
"lazy_static",
"log",
"multimap",
"petgraph",
"prost 0.9.0",
"prost-types 0.9.0",
"regex",
"tempfile",
"which",
]
[[package]]
@ -2834,19 +2858,32 @@ dependencies = [
"bytes",
"cfg-if 1.0.0",
"cmake",
"heck",
"heck 0.4.0",
"itertools",
"lazy_static",
"log",
"multimap",
"petgraph",
"prost",
"prost-types",
"prost 0.10.1",
"prost-types 0.10.1",
"regex",
"tempfile",
"which",
]
[[package]]
name = "prost-derive"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe"
dependencies = [
"anyhow",
"itertools",
"proc-macro2 1.0.36",
"quote 1.0.6",
"syn 1.0.91",
]
[[package]]
name = "prost-derive"
version = "0.10.1"
@ -2860,6 +2897,16 @@ dependencies = [
"syn 1.0.91",
]
[[package]]
name = "prost-types"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a"
dependencies = [
"bytes",
"prost 0.9.0",
]
[[package]]
name = "prost-types"
version = "0.10.1"
@ -2867,7 +2914,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2d0a014229361011dc8e69c8a1ec6c2e8d0f2af7c91e3ea3f5b2170298461e68"
dependencies = [
"bytes",
"prost",
"prost 0.10.1",
]
[[package]]
@ -2891,11 +2938,11 @@ dependencies = [
"fxhash",
"quinn-proto",
"quinn-udp",
"rustls",
"rustls 0.20.4",
"thiserror",
"tokio",
"tracing",
"webpki",
"webpki 0.22.0",
]
[[package]]
@ -2908,14 +2955,14 @@ dependencies = [
"fxhash",
"rand 0.8.5",
"ring",
"rustls",
"rustls 0.20.4",
"rustls-native-certs",
"rustls-pemfile 0.2.1",
"slab",
"thiserror",
"tinyvec",
"tracing",
"webpki",
"webpki 0.22.0",
]
[[package]]
@ -2926,7 +2973,7 @@ checksum = "df185e5e5f7611fa6e628ed8f9633df10114b03bbaecab186ec55822c44ac727"
dependencies = [
"futures-util",
"libc",
"mio 0.7.14",
"mio",
"quinn-proto",
"socket2",
"tokio",
@ -3157,14 +3204,14 @@ dependencies = [
"native-tls",
"percent-encoding 2.1.0",
"pin-project-lite",
"rustls",
"rustls 0.20.4",
"rustls-pemfile 0.3.0",
"serde",
"serde_json",
"serde_urlencoded",
"tokio",
"tokio-native-tls",
"tokio-rustls",
"tokio-rustls 0.23.2",
"url 2.2.2",
"wasm-bindgen",
"wasm-bindgen-futures",
@ -3251,6 +3298,19 @@ dependencies = [
"winapi 0.3.9",
]
[[package]]
name = "rustls"
version = "0.19.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7"
dependencies = [
"base64 0.13.0",
"log",
"ring",
"sct 0.6.1",
"webpki 0.21.4",
]
[[package]]
name = "rustls"
version = "0.20.4"
@ -3259,8 +3319,8 @@ checksum = "4fbfeb8d0ddb84706bc597a5574ab8912817c52a397f819e5b614e2265206921"
dependencies = [
"log",
"ring",
"sct",
"webpki",
"sct 0.7.0",
"webpki 0.22.0",
]
[[package]]
@ -3350,6 +3410,16 @@ dependencies = [
"syn 1.0.91",
]
[[package]]
name = "sct"
version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce"
dependencies = [
"ring",
"untrusted",
]
[[package]]
name = "sct"
version = "0.7.0"
@ -4232,7 +4302,7 @@ dependencies = [
"rand_chacha 0.2.2",
"rayon",
"reqwest",
"rustls",
"rustls 0.20.4",
"semver",
"serde",
"serde_derive",
@ -4554,7 +4624,7 @@ dependencies = [
"lru",
"num_cpus",
"num_enum",
"prost",
"prost 0.10.1",
"rand 0.7.3",
"rand_chacha 0.2.2",
"rayon",
@ -5125,8 +5195,8 @@ dependencies = [
"goauth",
"log",
"openssl",
"prost",
"prost-types",
"prost 0.10.1",
"prost-types 0.10.1",
"serde",
"serde_derive",
"smpl_jwt",
@ -5135,7 +5205,7 @@ dependencies = [
"solana-storage-proto",
"solana-transaction-status",
"thiserror",
"tonic",
"tonic 0.7.1",
"zstd",
]
@ -5145,12 +5215,12 @@ version = "1.11.0"
dependencies = [
"bincode",
"bs58",
"prost",
"prost 0.10.1",
"serde",
"solana-account-decoder",
"solana-sdk 1.11.0",
"solana-transaction-status",
"tonic-build",
"tonic-build 0.7.1",
]
[[package]]
@ -5169,7 +5239,7 @@ dependencies = [
"quinn",
"rand 0.7.3",
"rcgen",
"rustls",
"rustls 0.20.4",
"solana-metrics",
"solana-perf",
"solana-sdk 1.11.0",
@ -5799,20 +5869,20 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
[[package]]
name = "tokio"
version = "1.18.1"
version = "1.14.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dce653fb475565de9f6fb0614b28bca8df2c430c0cf84bcd9c843f15de5414cc"
checksum = "b9d0183f6f6001549ab68f8c7585093bb732beefbcf6d23a10b9b95c73a1dd49"
dependencies = [
"autocfg",
"bytes",
"libc",
"memchr",
"mio 0.8.2",
"mio",
"num_cpus",
"once_cell",
"parking_lot 0.12.0",
"parking_lot 0.11.2",
"pin-project-lite",
"signal-hook-registry",
"socket2",
"tokio-macros",
"winapi 0.3.9",
]
@ -5848,15 +5918,26 @@ dependencies = [
"tokio",
]
[[package]]
name = "tokio-rustls"
version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6"
dependencies = [
"rustls 0.19.1",
"tokio",
"webpki 0.21.4",
]
[[package]]
name = "tokio-rustls"
version = "0.23.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a27d5f2b839802bd8267fa19b0530f5a08b9c08cd417976be2a65d130fe1c11b"
dependencies = [
"rustls",
"rustls 0.20.4",
"tokio",
"webpki",
"webpki 0.22.0",
]
[[package]]
@ -5894,11 +5975,11 @@ checksum = "06cda1232a49558c46f8a504d5b93101d42c0bf7f911f12a105ba48168f821ae"
dependencies = [
"futures-util",
"log",
"rustls",
"rustls 0.20.4",
"tokio",
"tokio-rustls",
"tokio-rustls 0.23.2",
"tungstenite",
"webpki",
"webpki 0.22.0",
"webpki-roots",
]
@ -5941,6 +6022,38 @@ dependencies = [
"serde",
]
[[package]]
name = "tonic"
version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ff08f4649d10a70ffa3522ca559031285d8e421d727ac85c60825761818f5d0a"
dependencies = [
"async-stream",
"async-trait",
"base64 0.13.0",
"bytes",
"futures-core",
"futures-util",
"h2",
"http",
"http-body",
"hyper",
"hyper-timeout",
"percent-encoding 2.1.0",
"pin-project",
"prost 0.9.0",
"prost-derive 0.9.0",
"tokio",
"tokio-rustls 0.22.0",
"tokio-stream",
"tokio-util 0.6.9",
"tower",
"tower-layer",
"tower-service",
"tracing",
"tracing-futures",
]
[[package]]
name = "tonic"
version = "0.7.1"
@ -5961,11 +6074,11 @@ dependencies = [
"hyper-timeout",
"percent-encoding 2.1.0",
"pin-project",
"prost",
"prost-derive",
"prost 0.10.1",
"prost-derive 0.10.1",
"rustls-pemfile 0.3.0",
"tokio",
"tokio-rustls",
"tokio-rustls 0.23.2",
"tokio-stream",
"tokio-util 0.7.1",
"tower",
@ -5975,6 +6088,18 @@ dependencies = [
"tracing-futures",
]
[[package]]
name = "tonic-build"
version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9403f1bafde247186684b230dc6f38b5cd514584e8bec1dd32514be4745fa757"
dependencies = [
"proc-macro2 1.0.36",
"prost-build 0.9.0",
"quote 1.0.6",
"syn 1.0.91",
]
[[package]]
name = "tonic-build"
version = "0.7.1"
@ -5983,7 +6108,7 @@ checksum = "c03447cdc9eaf8feffb6412dcb27baf2db11669a6c4789f29da799aabfb99547"
dependencies = [
"prettyplease",
"proc-macro2 1.0.36",
"prost-build",
"prost-build 0.10.1",
"quote 1.0.6",
"syn 1.0.91",
]
@ -6131,12 +6256,12 @@ dependencies = [
"httparse",
"log",
"rand 0.8.5",
"rustls",
"rustls 0.20.4",
"sha-1 0.10.0",
"thiserror",
"url 2.2.2",
"utf-8",
"webpki",
"webpki 0.22.0",
"webpki-roots",
]
@ -6179,6 +6304,12 @@ dependencies = [
"tinyvec",
]
[[package]]
name = "unicode-segmentation"
version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99"
[[package]]
name = "unicode-width"
version = "0.1.8"
@ -6343,12 +6474,6 @@ version = "0.10.1+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "93c6c3420963c5c64bca373b25e77acb562081b9bb4dd5bb864187742186cea9"
[[package]]
name = "wasi"
version = "0.11.0+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "wasm-bindgen"
version = "0.2.80"
@ -6425,6 +6550,16 @@ dependencies = [
"wasm-bindgen",
]
[[package]]
name = "webpki"
version = "0.21.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea"
dependencies = [
"ring",
"untrusted",
]
[[package]]
name = "webpki"
version = "0.22.0"
@ -6441,7 +6576,7 @@ version = "0.22.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c475786c6f47219345717a043a37ec04cb4bc185e28853adcc4fa0a947eba630"
dependencies = [
"webpki",
"webpki 0.22.0",
]
[[package]]

View File

@ -26,7 +26,7 @@ solana-sdk = { path = "../sdk", version = "=1.11.0" }
solana-streamer = { path = "../streamer", version = "=1.11.0" }
solana-test-validator = { path = "../test-validator", version = "=1.11.0" }
solana-transaction-status = { path = "../transaction-status", version = "=1.11.0" }
tokio = { version = "1", features = ["full"] }
tokio = { version = "~1.14.1", features = ["full"] }
[dev-dependencies]
solana-logger = { path = "../logger", version = "=1.11.0" }

View File

@ -52,7 +52,7 @@ spl-token = { version = "=3.3.0", features = ["no-entrypoint"] }
spl-token-2022 = { version = "=0.3.0", features = ["no-entrypoint"] }
stream-cancel = "0.8.1"
thiserror = "1.0"
tokio = { version = "1", features = ["full"] }
tokio = { version = "~1.14.1", features = ["full"] }
tokio-util = { version = "0.6", features = ["codec", "compat"] }
[dev-dependencies]

View File

@ -27,7 +27,7 @@ solana-metrics = { path = "../metrics", version = "=1.11.0" }
solana-perf = { path = "../perf", version = "=1.11.0" }
solana-sdk = { path = "../sdk", version = "=1.11.0" }
thiserror = "1.0"
tokio = { version = "1", features = ["full"] }
tokio = { version = "~1.14.1", features = ["full"] }
[dev-dependencies]
solana-logger = { path = "../logger", version = "=1.11.0" }

View File

@ -28,7 +28,7 @@ solana-rpc = { path = "../rpc", version = "=1.11.0" }
solana-runtime = { path = "../runtime", version = "=1.11.0" }
solana-sdk = { path = "../sdk", version = "=1.11.0" }
solana-streamer = { path = "../streamer", version = "=1.11.0" }
tokio = { version = "1", features = ["full"] }
tokio = { version = "~1.14.1", features = ["full"] }
[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]