From f0de3e9bf0f4cd437e2217c17a85806d59deb1cf Mon Sep 17 00:00:00 2001 From: Tyera Eulberg Date: Thu, 28 Oct 2021 00:59:36 -0600 Subject: [PATCH] chore: bump tonic from 0.5.2 to 0.6.1 (#21035) * Bump tonic and prost crates * connect_lazy no longer infallible --- Cargo.lock | 181 +++++++++++++++++++----- ledger/Cargo.toml | 2 +- replica-lib/Cargo.toml | 6 +- replica-node/Cargo.toml | 2 +- storage-bigtable/Cargo.toml | 6 +- storage-bigtable/build-proto/Cargo.lock | 68 +++++++-- storage-bigtable/build-proto/Cargo.toml | 2 +- storage-bigtable/src/bigtable.rs | 4 +- storage-proto/Cargo.toml | 4 +- 9 files changed, 214 insertions(+), 61 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 29629eb1c3..25baf554a2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1310,11 +1310,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76b9f5b0b4f53cf836bef05b22cd5239479700bc8d44a04c3c77f1ba6c2c73e9" dependencies = [ "http", - "prost", + "prost 0.8.0", "tokio", "tokio-stream", - "tonic", - "tonic-build", + "tonic 0.5.2", + "tonic-build 0.5.2", "tower-service", ] @@ -1407,6 +1407,12 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d" +[[package]] +name = "fixedbitset" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "398ea4fabe40b9b0d885340a2a991a44c8a645624075ad966d21f88688e2b69e" + [[package]] name = "flate2" version = "1.0.22" @@ -1861,9 +1867,9 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.2" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60daa14be0e0786db0f03a9e57cb404c9d756eed2b6c62b9ea98ec5743ec75a9" +checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6" dependencies = [ "bytes 1.0.1", "http", @@ -1872,9 +1878,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.4.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3a87b616e37e93c22fb19bcd386f02f3af5ea98a25670ad0fce773de23c5e68" +checksum = "acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503" [[package]] name = "httpdate" @@ -1909,9 +1915,9 @@ dependencies = [ [[package]] name = "hyper" -version = "0.14.11" +version = "0.14.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b61cf2d1aebcf6e6352c97b81dc2244ca29194be1b276f5d8ad5c6330fffb11" +checksum = "2b91bb1f221b6ea1f1e4371216b70f40748774c2fb5971b450c07773fb92d26b" dependencies = [ "bytes 1.0.1", "futures-channel", @@ -1938,7 +1944,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64" dependencies = [ "futures-util", - "hyper 0.14.11", + "hyper 0.14.14", "log 0.4.14", "rustls", "tokio", @@ -1952,7 +1958,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" dependencies = [ - "hyper 0.14.11", + "hyper 0.14.14", "pin-project-lite", "tokio", "tokio-io-timeout", @@ -1965,7 +1971,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes 1.0.1", - "hyper 0.14.11", + "hyper 0.14.14", "native-tls", "tokio", "tokio-native-tls", @@ -2152,7 +2158,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1dea6e07251d9ce6a552abfb5d7ad6bc290a4596c8dcc3d795fae2bbdc1f3ff" dependencies = [ "futures 0.3.17", - "hyper 0.14.11", + "hyper 0.14.14", "jsonrpc-core", "jsonrpc-server-utils", "log 0.4.14", @@ -2946,7 +2952,17 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "467d164a6de56270bd7c4d070df81d07beace25012d5103ced4e9ff08d6afdb7" dependencies = [ - "fixedbitset", + "fixedbitset 0.2.0", + "indexmap", +] + +[[package]] +name = "petgraph" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a13a2fa9d0b63e5f22328828741e523766fff0ee9e779316902290dff3f824f" +dependencies = [ + "fixedbitset 0.4.0", "indexmap", ] @@ -3218,7 +3234,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de5e2533f59d08fcf364fd374ebda0692a70bd6d7e66ef97f306f45c6c5d8020" dependencies = [ "bytes 1.0.1", - "prost-derive", + "prost-derive 0.8.0", +] + +[[package]] +name = "prost" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" +dependencies = [ + "bytes 1.0.1", + "prost-derive 0.9.0", ] [[package]] @@ -3232,9 +3258,29 @@ dependencies = [ "itertools 0.10.1", "log 0.4.14", "multimap", - "petgraph", - "prost", - "prost-types", + "petgraph 0.5.1", + "prost 0.8.0", + "prost-types 0.8.0", + "tempfile", + "which", +] + +[[package]] +name = "prost-build" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5" +dependencies = [ + "bytes 1.0.1", + "heck", + "itertools 0.10.1", + "lazy_static", + "log 0.4.14", + "multimap", + "petgraph 0.6.0", + "prost 0.9.0", + "prost-types 0.9.0", + "regex", "tempfile", "which", ] @@ -3252,6 +3298,19 @@ dependencies = [ "syn 1.0.67", ] +[[package]] +name = "prost-derive" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe" +dependencies = [ + "anyhow", + "itertools 0.10.1", + "proc-macro2 1.0.24", + "quote 1.0.9", + "syn 1.0.67", +] + [[package]] name = "prost-types" version = "0.8.0" @@ -3259,7 +3318,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "603bbd6394701d13f3f25aada59c7de9d35a6a5887cfc156181234a44002771b" dependencies = [ "bytes 1.0.1", - "prost", + "prost 0.8.0", +] + +[[package]] +name = "prost-types" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a" +dependencies = [ + "bytes 1.0.1", + "prost 0.9.0", ] [[package]] @@ -3665,7 +3734,7 @@ dependencies = [ "futures-util", "http", "http-body", - "hyper 0.14.11", + "hyper 0.14.14", "hyper-rustls", "hyper-tls", "ipnet", @@ -4964,7 +5033,7 @@ dependencies = [ "log 0.4.14", "matches", "num_cpus", - "prost", + "prost 0.9.0", "rand 0.7.3", "rand_chacha 0.2.2", "rayon", @@ -5385,13 +5454,13 @@ dependencies = [ "crossbeam-channel", "futures-util", "log 0.4.14", - "prost", + "prost 0.9.0", "solana-rpc", "solana-runtime", "solana-sdk", "tokio", - "tonic", - "tonic-build", + "tonic 0.6.1", + "tonic-build 0.6.0", ] [[package]] @@ -5421,7 +5490,7 @@ dependencies = [ "solana-validator", "solana-version", "tempfile", - "tonic-build", + "tonic-build 0.6.0", ] [[package]] @@ -5658,8 +5727,8 @@ dependencies = [ "flate2", "goauth", "log 0.4.14", - "prost", - "prost-types", + "prost 0.9.0", + "prost-types 0.9.0", "serde", "serde_derive", "smpl_jwt", @@ -5667,7 +5736,7 @@ dependencies = [ "solana-storage-proto", "solana-transaction-status", "thiserror", - "tonic", + "tonic 0.6.1", "zstd", ] @@ -5677,12 +5746,12 @@ version = "1.9.0" dependencies = [ "bincode", "bs58 0.4.0", - "prost", + "prost 0.9.0", "serde", "solana-account-decoder", "solana-sdk", "solana-transaction-status", - "tonic-build", + "tonic-build 0.6.0", ] [[package]] @@ -6609,12 +6678,44 @@ dependencies = [ "h2", "http", "http-body", - "hyper 0.14.11", + "hyper 0.14.14", "hyper-timeout", "percent-encoding 2.1.0", "pin-project 1.0.7", - "prost", - "prost-derive", + "prost 0.8.0", + "prost-derive 0.8.0", + "tokio", + "tokio-rustls", + "tokio-stream", + "tokio-util", + "tower", + "tower-layer", + "tower-service", + "tracing", + "tracing-futures", +] + +[[package]] +name = "tonic" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24203b79cf2d68909da91178db3026e77054effba0c5d93deb870d3ca7b35afa" +dependencies = [ + "async-stream", + "async-trait", + "base64 0.13.0", + "bytes 1.0.1", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper 0.14.14", + "hyper-timeout", + "percent-encoding 2.1.0", + "pin-project 1.0.7", + "prost 0.9.0", + "prost-derive 0.9.0", "tokio", "tokio-rustls", "tokio-stream", @@ -6633,7 +6734,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12b52d07035516c2b74337d2ac7746075e7dcae7643816c1b12c5ff8a7484c08" dependencies = [ "proc-macro2 1.0.24", - "prost-build", + "prost-build 0.8.0", + "quote 1.0.9", + "syn 1.0.67", +] + +[[package]] +name = "tonic-build" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88358bb1dcfeb62dcce85c63006cafb964b7be481d522b7e09589d4d1e718d2a" +dependencies = [ + "proc-macro2 1.0.24", + "prost-build 0.9.0", "quote 1.0.9", "syn 1.0.67", ] diff --git a/ledger/Cargo.toml b/ledger/Cargo.toml index 8c36d577e8..17573bffd1 100644 --- a/ledger/Cargo.toml +++ b/ledger/Cargo.toml @@ -22,7 +22,7 @@ lazy_static = "1.4.0" libc = "0.2.105" log = { version = "0.4.14" } num_cpus = "1.13.0" -prost = "0.8.0" +prost = "0.9.0" rand = "0.7.0" rand_chacha = "0.2.2" rayon = "1.5.1" diff --git a/replica-lib/Cargo.toml b/replica-lib/Cargo.toml index c975d41f92..ac89f37e8e 100644 --- a/replica-lib/Cargo.toml +++ b/replica-lib/Cargo.toml @@ -13,15 +13,15 @@ documentation = "https://docs.rs/solana-validator" crossbeam-channel = "0.5" futures-util = "0.3" log = "0.4.11" -prost = "0.8.0" +prost = "0.9.0" solana-rpc = { path = "../rpc", version = "=1.9.0" } solana-runtime = { path = "../runtime", version = "=1.9.0" } solana-sdk = { path = "../sdk", version = "=1.9.0" } tokio = { version = "1", features = ["full"] } -tonic = { version = "0.5.0", features = ["tls", "transport"] } +tonic = { version = "0.6.1", features = ["tls", "transport"] } [package.metadata.docs.rs] targets = ["x86_64-unknown-linux-gnu"] [build-dependencies] -tonic-build = "0.5.1" +tonic-build = "0.6.0" diff --git a/replica-node/Cargo.toml b/replica-node/Cargo.toml index 787fe497aa..d96dc72dfe 100644 --- a/replica-node/Cargo.toml +++ b/replica-node/Cargo.toml @@ -41,4 +41,4 @@ tempfile = "3.2.0" targets = ["x86_64-unknown-linux-gnu"] [build-dependencies] -tonic-build = "0.5.1" +tonic-build = "0.6.0" diff --git a/storage-bigtable/Cargo.toml b/storage-bigtable/Cargo.toml index a0bb80930b..29b33430e7 100644 --- a/storage-bigtable/Cargo.toml +++ b/storage-bigtable/Cargo.toml @@ -17,8 +17,8 @@ enum-iterator = "0.7.0" flate2 = "1.0.22" goauth = "0.10.0" log = "0.4.14" -prost = "0.8.0" -prost-types = "0.8.0" +prost = "0.9.0" +prost-types = "0.9.0" serde = "1.0.130" serde_derive = "1.0.103" smpl_jwt = "0.6.0" @@ -26,7 +26,7 @@ solana-sdk = { path = "../sdk", version = "=1.9.0" } solana-storage-proto = { path = "../storage-proto", version = "=1.9.0" } solana-transaction-status = { path = "../transaction-status", version = "=1.9.0" } thiserror = "1.0" -tonic = { version = "0.5.2", features = ["tls", "transport"] } +tonic = { version = "0.6.1", features = ["tls", "transport"] } zstd = "0.9.0" [lib] diff --git a/storage-bigtable/build-proto/Cargo.lock b/storage-bigtable/build-proto/Cargo.lock index 3b1dca2df6..c043327087 100644 --- a/storage-bigtable/build-proto/Cargo.lock +++ b/storage-bigtable/build-proto/Cargo.lock @@ -2,6 +2,15 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "aho-corasick" +version = "0.7.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +dependencies = [ + "memchr", +] + [[package]] name = "anyhow" version = "1.0.31" @@ -46,9 +55,9 @@ checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" [[package]] name = "fixedbitset" -version = "0.2.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d" +checksum = "398ea4fabe40b9b0d885340a2a991a44c8a645624075ad966d21f88688e2b69e" [[package]] name = "getrandom" @@ -95,6 +104,12 @@ dependencies = [ "either", ] +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + [[package]] name = "libc" version = "0.2.105" @@ -110,6 +125,12 @@ dependencies = [ "cfg-if 0.1.10", ] +[[package]] +name = "memchr" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" + [[package]] name = "multimap" version = "0.8.1" @@ -118,9 +139,9 @@ checksum = "d8883adfde9756c1d30b0f519c9b8c502a94b41ac62f696453c37c7fc0a958ce" [[package]] name = "petgraph" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "467d164a6de56270bd7c4d070df81d07beace25012d5103ced4e9ff08d6afdb7" +checksum = "4a13a2fa9d0b63e5f22328828741e523766fff0ee9e779316902290dff3f824f" dependencies = [ "fixedbitset", "indexmap", @@ -143,9 +164,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de5e2533f59d08fcf364fd374ebda0692a70bd6d7e66ef97f306f45c6c5d8020" +checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" dependencies = [ "bytes", "prost-derive", @@ -153,27 +174,29 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "355f634b43cdd80724ee7848f95770e7e70eefa6dcf14fea676216573b8fd603" +checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5" dependencies = [ "bytes", "heck", "itertools", + "lazy_static", "log", "multimap", "petgraph", "prost", "prost-types", + "regex", "tempfile", "which", ] [[package]] name = "prost-derive" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "600d2f334aa05acb02a755e217ef1ab6dea4d51b58b7846588b747edec04efba" +checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe" dependencies = [ "anyhow", "itertools", @@ -184,9 +207,9 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "603bbd6394701d13f3f25aada59c7de9d35a6a5887cfc156181234a44002771b" +checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a" dependencies = [ "bytes", "prost", @@ -257,6 +280,23 @@ dependencies = [ "bitflags", ] +[[package]] +name = "regex" +version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.6.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" + [[package]] name = "remove_dir_all" version = "0.5.3" @@ -313,9 +353,9 @@ dependencies = [ [[package]] name = "tonic-build" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12b52d07035516c2b74337d2ac7746075e7dcae7643816c1b12c5ff8a7484c08" +checksum = "88358bb1dcfeb62dcce85c63006cafb964b7be481d522b7e09589d4d1e718d2a" dependencies = [ "proc-macro2", "prost-build", diff --git a/storage-bigtable/build-proto/Cargo.toml b/storage-bigtable/build-proto/Cargo.toml index aba47351a0..1ed6f45456 100644 --- a/storage-bigtable/build-proto/Cargo.toml +++ b/storage-bigtable/build-proto/Cargo.toml @@ -12,4 +12,4 @@ version = "1.9.0" [workspace] [dependencies] -tonic-build = "0.5.2" +tonic-build = "0.6.0" diff --git a/storage-bigtable/src/bigtable.rs b/storage-bigtable/src/bigtable.rs index 66f2c9759c..640c9f97a9 100644 --- a/storage-bigtable/src/bigtable.rs +++ b/storage-bigtable/src/bigtable.rs @@ -134,7 +134,7 @@ impl BigTableConnection { access_token: None, channel: tonic::transport::Channel::from_shared(format!("http://{}", endpoint)) .map_err(|err| Error::InvalidUri(endpoint, err.to_string()))? - .connect_lazy()?, + .connect_lazy(), table_prefix: format!("projects/emulator/instances/{}/tables/", instance_name), timeout, }) @@ -175,7 +175,7 @@ impl BigTableConnection { Ok(Self { access_token: Some(access_token), - channel: endpoint.connect_lazy()?, + channel: endpoint.connect_lazy(), table_prefix, timeout, }) diff --git a/storage-proto/Cargo.toml b/storage-proto/Cargo.toml index 88d0965651..a4ba207bff 100644 --- a/storage-proto/Cargo.toml +++ b/storage-proto/Cargo.toml @@ -12,7 +12,7 @@ edition = "2018" [dependencies] bincode = "1.3.3" bs58 = "0.4.0" -prost = "0.8.0" +prost = "0.9.0" serde = "1.0.130" solana-account-decoder = { path = "../account-decoder", version = "=1.9.0" } solana-sdk = { path = "../sdk", version = "=1.9.0" } @@ -26,4 +26,4 @@ name = "solana_storage_proto" targets = ["x86_64-unknown-linux-gnu"] [build-dependencies] -tonic-build = "0.5.2" +tonic-build = "0.6.0"