diff --git a/Cargo.lock b/Cargo.lock index 84877c805be45e..2b28de84ddb845 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -80,6 +80,21 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" +[[package]] +name = "alloc-no-stdlib" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35ef4730490ad1c4eae5c4325b2a95f521d023e5c885853ff7aca0a6a1631db3" + +[[package]] +name = "alloc-stdlib" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "697ed7edc0f1711de49ce108c541623a0af97c6c60b2f6e2b65229847ac843c2" +dependencies = [ + "alloc-no-stdlib", +] + [[package]] name = "ansi_term" version = "0.11.0" @@ -139,6 +154,20 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" +[[package]] +name = "async-compression" +version = "0.3.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "345fd392ab01f746c717b1357165b76f0b67a60192007b234058c9045fdcf695" +dependencies = [ + "brotli", + "flate2", + "futures-core", + "memchr", + "pin-project-lite", + "tokio", +] + [[package]] name = "async-mutex" version = "1.4.0" @@ -453,6 +482,27 @@ dependencies = [ "syn 1.0.91", ] +[[package]] +name = "brotli" +version = "3.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor", +] + +[[package]] +name = "brotli-decompressor" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59ad2d4653bf5ca36ae797b1f4bb4dbddb60ce49ca4aed8a2ce4829f60425b80" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] + [[package]] name = "bs58" version = "0.4.0" @@ -3783,6 +3833,7 @@ version = "0.11.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46a1f7aa4f35e5e8b4160449f51afc758f0ce6454315a9fa7d0d113e958c41eb" dependencies = [ + "async-compression", "base64 0.13.0", "bytes", "encoding_rs", @@ -3809,7 +3860,12 @@ dependencies = [ "serde_urlencoded", "tokio", "tokio-native-tls", +<<<<<<< HEAD "tokio-rustls 0.23.2", +======= + "tokio-rustls 0.23.3", + "tokio-util 0.6.9", +>>>>>>> 9765034e0 (Enable wire compression in Solana CLI and Rust client (#26236)) "url 2.2.2", "wasm-bindgen", "wasm-bindgen-futures", @@ -4923,8 +4979,11 @@ dependencies = [ "rand_chacha 0.2.2", "raptorq", "rayon", +<<<<<<< HEAD "reqwest", "retain_mut", +======= +>>>>>>> 9765034e0 (Enable wire compression in Solana CLI and Rust client (#26236)) "rustc_version 0.4.0", "serde", "serde_derive", diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 7d66e273e1087c..92899afd4e6fa3 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -21,10 +21,17 @@ ctrlc = { version = "3.2.1", features = ["termination"] } humantime = "2.0.1" log = "0.4.14" num-traits = "0.2" +<<<<<<< HEAD pretty-hex = "0.2.1" reqwest = { version = "0.11.10", default-features = false, features = ["blocking", "rustls-tls", "json"] } semver = "1.0.6" serde = "1.0.136" +======= +pretty-hex = "0.3.0" +reqwest = { version = "0.11.10", default-features = false, features = ["blocking", "brotli", "deflate", "gzip", "rustls-tls", "json"] } +semver = "1.0.10" +serde = "1.0.137" +>>>>>>> 9765034e0 (Enable wire compression in Solana CLI and Rust client (#26236)) serde_derive = "1.0.103" serde_json = "1.0.79" solana-account-decoder = { path = "../account-decoder", version = "=1.10.28" } diff --git a/client/Cargo.toml b/client/Cargo.toml index 5282ebf5d75707..875611fb3ce399 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -32,11 +32,19 @@ quinn = "0.8.0" quinn-proto = "0.8.0" rand = "0.7.0" rand_chacha = "0.2.2" +<<<<<<< HEAD rayon = "1.5.1" reqwest = { version = "0.11.10", default-features = false, features = ["blocking", "rustls-tls", "json"] } rustls = { version = "0.20.2", features = ["dangerous_configuration"] } semver = "1.0.6" serde = "1.0.136" +======= +rayon = "1.5.3" +reqwest = { version = "0.11.10", default-features = false, features = ["blocking", "brotli", "deflate", "gzip", "rustls-tls", "json"] } +rustls = { version = "0.20.6", features = ["dangerous_configuration"] } +semver = "1.0.10" +serde = "1.0.137" +>>>>>>> 9765034e0 (Enable wire compression in Solana CLI and Rust client (#26236)) serde_derive = "1.0.103" serde_json = "1.0.79" solana-account-decoder = { path = "../account-decoder", version = "=1.10.28" } diff --git a/core/Cargo.toml b/core/Cargo.toml index 3702eb42b0f07c..cdd90f8bb2503b 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -67,9 +67,14 @@ trees = "0.4.2" [dev-dependencies] matches = "0.1.9" +<<<<<<< HEAD raptorq = "1.6.5" reqwest = { version = "0.11.10", default-features = false, features = ["blocking", "rustls-tls", "json"] } serde_json = "1.0.79" +======= +raptorq = "1.7.0" +serde_json = "1.0.81" +>>>>>>> 9765034e0 (Enable wire compression in Solana CLI and Rust client (#26236)) serial_test = "0.6.0" solana-logger = { path = "../logger", version = "=1.10.28" } solana-program-runtime = { path = "../program-runtime", version = "=1.10.28" } diff --git a/download-utils/Cargo.toml b/download-utils/Cargo.toml index 7505bceb909346..fbbbc7107f677d 100644 --- a/download-utils/Cargo.toml +++ b/download-utils/Cargo.toml @@ -12,10 +12,17 @@ edition = "2021" [dependencies] console = "0.15.0" indicatif = "0.16.2" +<<<<<<< HEAD log = "0.4.14" reqwest = { version = "0.11.10", default-features = false, features = ["blocking", "rustls-tls", "json"] } solana-runtime = { path = "../runtime", version = "=1.10.28" } solana-sdk = { path = "../sdk", version = "=1.10.28" } +======= +log = "0.4.17" +reqwest = { version = "0.11.10", default-features = false, features = ["blocking", "brotli", "deflate", "gzip", "rustls-tls", "json"] } +solana-runtime = { path = "../runtime", version = "=1.11.2" } +solana-sdk = { path = "../sdk", version = "=1.11.2" } +>>>>>>> 9765034e0 (Enable wire compression in Solana CLI and Rust client (#26236)) [lib] crate-type = ["lib"] diff --git a/install/Cargo.toml b/install/Cargo.toml index 4326650128755b..f5f9e81ecdbaa8 100644 --- a/install/Cargo.toml +++ b/install/Cargo.toml @@ -21,6 +21,7 @@ ctrlc = { version = "3.2.1", features = ["termination"] } dirs-next = "2.0.0" indicatif = "0.16.2" lazy_static = "1.4.0" +<<<<<<< HEAD nix = "0.23.1" reqwest = { version = "0.11.10", default-features = false, features = ["blocking", "rustls-tls", "json"] } semver = "1.0.6" @@ -32,6 +33,19 @@ solana-config-program = { path = "../programs/config", version = "=1.10.28" } solana-logger = { path = "../logger", version = "=1.10.28" } solana-sdk = { path = "../sdk", version = "=1.10.28" } solana-version = { path = "../version", version = "=1.10.28" } +======= +nix = "0.24.0" +reqwest = { version = "0.11.10", default-features = false, features = ["blocking", "brotli", "deflate", "gzip", "rustls-tls", "json"] } +semver = "1.0.10" +serde = { version = "1.0.137", features = ["derive"] } +serde_yaml = "0.8.24" +solana-clap-utils = { path = "../clap-utils", version = "=1.11.2" } +solana-client = { path = "../client", version = "=1.11.2" } +solana-config-program = { path = "../programs/config", version = "=1.11.2" } +solana-logger = { path = "../logger", version = "=1.11.2" } +solana-sdk = { path = "../sdk", version = "=1.11.2" } +solana-version = { path = "../version", version = "=1.11.2" } +>>>>>>> 9765034e0 (Enable wire compression in Solana CLI and Rust client (#26236)) tar = "0.4.38" tempfile = "3.3.0" url = "2.2.2" diff --git a/metrics/Cargo.toml b/metrics/Cargo.toml index 2f90cc57800cbe..638df93a0a3f25 100644 --- a/metrics/Cargo.toml +++ b/metrics/Cargo.toml @@ -13,9 +13,15 @@ edition = "2021" crossbeam-channel = "0.5" gethostname = "0.2.3" lazy_static = "1.4.0" +<<<<<<< HEAD log = "0.4.14" reqwest = { version = "0.11.10", default-features = false, features = ["blocking", "rustls-tls", "json"] } solana-sdk = { path = "../sdk", version = "=1.10.28" } +======= +log = "0.4.17" +reqwest = { version = "0.11.10", default-features = false, features = ["blocking", "brotli", "deflate", "gzip", "rustls-tls", "json"] } +solana-sdk = { path = "../sdk", version = "=1.11.2" } +>>>>>>> 9765034e0 (Enable wire compression in Solana CLI and Rust client (#26236)) [dev-dependencies] env_logger = "0.9.0" diff --git a/notifier/Cargo.toml b/notifier/Cargo.toml index 8cea0bd8c63d85..7bae91ac1a50a7 100644 --- a/notifier/Cargo.toml +++ b/notifier/Cargo.toml @@ -10,8 +10,13 @@ documentation = "https://docs.rs/solana-notifier" edition = "2021" [dependencies] +<<<<<<< HEAD log = "0.4.14" reqwest = { version = "0.11.10", default-features = false, features = ["blocking", "rustls-tls", "json"] } +======= +log = "0.4.17" +reqwest = { version = "0.11.10", default-features = false, features = ["blocking", "brotli", "deflate", "gzip", "rustls-tls", "json"] } +>>>>>>> 9765034e0 (Enable wire compression in Solana CLI and Rust client (#26236)) serde_json = "1.0" [lib] diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock index 521f8482d6c068..10d501f2f16f80 100644 --- a/programs/bpf/Cargo.lock +++ b/programs/bpf/Cargo.lock @@ -80,6 +80,21 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" +[[package]] +name = "alloc-no-stdlib" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35ef4730490ad1c4eae5c4325b2a95f521d023e5c885853ff7aca0a6a1631db3" + +[[package]] +name = "alloc-stdlib" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "697ed7edc0f1711de49ce108c541623a0af97c6c60b2f6e2b65229847ac843c2" +dependencies = [ + "alloc-no-stdlib", +] + [[package]] name = "ansi_term" version = "0.11.0" @@ -125,6 +140,20 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" +[[package]] +name = "async-compression" +version = "0.3.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "345fd392ab01f746c717b1357165b76f0b67a60192007b234058c9045fdcf695" +dependencies = [ + "brotli", + "flate2", + "futures-core", + "memchr", + "pin-project-lite", + "tokio", +] + [[package]] name = "async-mutex" version = "1.4.0" @@ -412,6 +441,27 @@ dependencies = [ "syn 1.0.91", ] +[[package]] +name = "brotli" +version = "3.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor", +] + +[[package]] +name = "brotli-decompressor" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59ad2d4653bf5ca36ae797b1f4bb4dbddb60ce49ca4aed8a2ce4829f60425b80" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] + [[package]] name = "bs58" version = "0.4.0" @@ -3332,6 +3382,7 @@ version = "0.11.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46a1f7aa4f35e5e8b4160449f51afc758f0ce6454315a9fa7d0d113e958c41eb" dependencies = [ + "async-compression", "base64 0.13.0", "bytes", "encoding_rs", @@ -3359,6 +3410,7 @@ dependencies = [ "tokio", "tokio-native-tls", "tokio-rustls 0.23.2", + "tokio-util 0.6.9", "url 2.2.2", "wasm-bindgen", "wasm-bindgen-futures", diff --git a/rpc-test/Cargo.toml b/rpc-test/Cargo.toml index 8fcc75ac339498..b9a3ab406422a0 100644 --- a/rpc-test/Cargo.toml +++ b/rpc-test/Cargo.toml @@ -15,6 +15,7 @@ bincode = "1.3.3" bs58 = "0.4.0" crossbeam-channel = "0.5" futures-util = "0.3.21" +<<<<<<< HEAD log = "0.4.11" reqwest = { version = "0.11.10", default-features = false, features = ["blocking", "rustls-tls", "json"] } serde = "1.0.136" @@ -26,6 +27,19 @@ solana-sdk = { path = "../sdk", version = "=1.10.28" } solana-streamer = { path = "../streamer", version = "=1.10.28" } solana-test-validator = { path = "../test-validator", version = "=1.10.28" } solana-transaction-status = { path = "../transaction-status", version = "=1.10.28" } +======= +log = "0.4.17" +reqwest = { version = "0.11.10", default-features = false, features = ["blocking", "brotli", "deflate", "gzip", "rustls-tls", "json"] } +serde = "1.0.137" +serde_json = "1.0.81" +solana-account-decoder = { path = "../account-decoder", version = "=1.11.2" } +solana-client = { path = "../client", version = "=1.11.2" } +solana-rpc = { path = "../rpc", version = "=1.11.2" } +solana-sdk = { path = "../sdk", version = "=1.11.2" } +solana-streamer = { path = "../streamer", version = "=1.11.2" } +solana-test-validator = { path = "../test-validator", version = "=1.11.2" } +solana-transaction-status = { path = "../transaction-status", version = "=1.11.2" } +>>>>>>> 9765034e0 (Enable wire compression in Solana CLI and Rust client (#26236)) tokio = { version = "~1.14.1", features = ["full"] } [dev-dependencies]