Skip to content
This repository has been archived by the owner on Jan 22, 2025. It is now read-only.

Commit

Permalink
Enable wire compression in Solana CLI and Rust client (#26236)
Browse files Browse the repository at this point in the history 
(cherry picked from commit 9765034)

# Conflicts:
#	Cargo.lock
#	cli/Cargo.toml
#	client/Cargo.toml
#	core/Cargo.toml
#	download-utils/Cargo.toml
#	install/Cargo.toml
#	metrics/Cargo.toml
#	notifier/Cargo.toml
#	rpc-test/Cargo.toml
  • Loading branch information
@steveluscher @mergify
steveluscher authored and mergify[bot] committed Jun 27, 2022
1 parent d02a1f0 commit 5e801d3
Show file tree
Hide file tree
Showing 10 changed files with 177 additions and 0 deletions.
59 changes: 59 additions & 0 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions cli/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
8 changes: 8 additions & 0 deletions client/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
5 changes: 5 additions & 0 deletions core/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
7 changes: 7 additions & 0 deletions download-utils/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
14 changes: 14 additions & 0 deletions install/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
6 changes: 6 additions & 0 deletions metrics/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 5 additions & 0 deletions notifier/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
52 changes: 52 additions & 0 deletions programs/bpf/Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions rpc-test/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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]
Expand Down

0 comments on commit 5e801d3

Please sign in to comment.