Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(deps): bump the prod group across 1 directory with 11 updates #8664

Merged
merged 4 commits into from
Jul 10, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
170 changes: 72 additions & 98 deletions Cargo.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tower-batch-control/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ tracing-futures = "0.2.5"
color-eyre = "0.6.3"
# This is a transitive dependency via color-eyre.
# Enable a feature that makes tinyvec compile much faster.
tinyvec = { version = "1.6.0", features = ["rustc_1_55"] }
tinyvec = { version = "1.7.0", features = ["rustc_1_55"] }

ed25519-zebra = "4.0.3"
rand = "0.8.5"
Expand Down
12 changes: 6 additions & 6 deletions zebra-chain/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,8 @@ tracing = "0.1.39"

# Serialization
hex = { version = "0.4.3", features = ["serde"] }
serde = { version = "1.0.203", features = ["serde_derive", "rc"] }
serde_with = "3.7.0"
serde = { version = "1.0.204", features = ["serde_derive", "rc"] }
serde_with = "3.8.3"
serde-big-array = "0.5.1"

# Processing
Expand All @@ -128,7 +128,7 @@ redjubjub = "0.7.0"
reddsa = "0.5.1"

# Production feature json-conversion
serde_json = { version = "1.0.117", optional = true }
serde_json = { version = "1.0.120", optional = true }

# Production feature async-error and testing feature proptest-impl
tokio = { version = "1.37.0", optional = true }
Expand All @@ -138,7 +138,7 @@ zcash_client_backend = { version = "0.12.1", optional = true }

# Optional testing dependencies
proptest = { version = "1.4.0", optional = true }
proptest-derive = { version = "0.4.0", optional = true }
proptest-derive = { version = "0.5.0", optional = true }

rand = { version = "0.8.5", optional = true }
rand_chacha = { version = "0.3.1", optional = true }
Expand All @@ -153,13 +153,13 @@ criterion = { version = "0.5.1", features = ["html_reports"] }
color-eyre = "0.6.3"
# This is a transitive dependency via color-eyre.
# Enable a feature that makes tinyvec compile much faster.
tinyvec = { version = "1.6.0", features = ["rustc_1_55"] }
tinyvec = { version = "1.7.0", features = ["rustc_1_55"] }
spandoc = "0.2.2"
tracing = "0.1.39"

# Make the optional testing dependencies required
proptest = "1.4.0"
proptest-derive = "0.4.0"
proptest-derive = "0.5.0"

rand = "0.8.5"
rand_chacha = "0.3.1"
Expand Down
10 changes: 5 additions & 5 deletions zebra-consensus/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ rayon = "1.10.0"
chrono = { version = "0.4.38", default-features = false, features = ["clock", "std"] }
lazy_static = "1.4.0"
once_cell = "1.18.0"
serde = { version = "1.0.203", features = ["serde_derive"] }
serde = { version = "1.0.204", features = ["serde_derive"] }

futures = "0.3.30"
futures-util = "0.3.28"
metrics = "0.22.3"
metrics = "0.23.0"
thiserror = "1.0.61"
tokio = { version = "1.37.0", features = ["time", "sync", "tracing", "rt-multi-thread"] }
tower = { version = "0.4.13", features = ["timeout", "util", "buffer"] }
Expand All @@ -76,18 +76,18 @@ howudoin = { version = "0.1.2", optional = true }

# Test-only dependencies
proptest = { version = "1.4.0", optional = true }
proptest-derive = { version = "0.4.0", optional = true }
proptest-derive = { version = "0.5.0", optional = true }

[dev-dependencies]
color-eyre = "0.6.3"
# This is a transitive dependency via color-eyre.
# Enable a feature that makes tinyvec compile much faster.
tinyvec = { version = "1.6.0", features = ["rustc_1_55"] }
tinyvec = { version = "1.7.0", features = ["rustc_1_55"] }

hex = "0.4.3"
num-integer = "0.1.46"
proptest = "1.4.0"
proptest-derive = "0.4.0"
proptest-derive = "0.5.0"
spandoc = "0.2.2"

tokio = { version = "1.37.0", features = ["full", "tracing", "test-util"] }
Expand Down
2 changes: 1 addition & 1 deletion zebra-grpc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ futures-util = "0.3.28"
tonic = "0.11.0"
tonic-reflection = "0.11.0"
prost = "0.12.6"
serde = { version = "1.0.203", features = ["serde_derive"] }
serde = { version = "1.0.204", features = ["serde_derive"] }
tokio = { version = "1.37.0", features = ["macros", "rt-multi-thread"] }
tokio-stream = "0.1.15"
tower = { version = "0.4.13", features = ["util", "buffer"] }
Expand Down
8 changes: 4 additions & 4 deletions zebra-network/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ pin-project = "1.1.5"
rand = "0.8.5"
rayon = "1.10.0"
regex = "1.10.4"
serde = { version = "1.0.203", features = ["serde_derive"] }
serde = { version = "1.0.204", features = ["serde_derive"] }
tempfile = "3.10.1"
thiserror = "1.0.61"

Expand All @@ -66,7 +66,7 @@ tokio-stream = { version = "0.1.15", features = ["sync", "time"] }
tokio-util = { version = "0.7.11", features = ["codec"] }
tower = { version = "0.4.13", features = ["retry", "discover", "load", "load-shed", "timeout", "util", "buffer"] }

metrics = "0.22.3"
metrics = "0.23.0"
tracing-futures = "0.2.5"
tracing-error = { version = "0.2.0", features = ["traced-error"] }
tracing = "0.1.39"
Expand All @@ -81,13 +81,13 @@ howudoin = { version = "0.1.2", optional = true }

# proptest dependencies
proptest = { version = "1.4.0", optional = true }
proptest-derive = { version = "0.4.0", optional = true }
proptest-derive = { version = "0.5.0", optional = true }

zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.38", features = ["async-error"] }

[dev-dependencies]
proptest = "1.4.0"
proptest-derive = "0.4.0"
proptest-derive = "0.5.0"

static_assertions = "1.1.0"
tokio = { version = "1.37.0", features = ["full", "tracing", "test-util"] }
Expand Down
8 changes: 4 additions & 4 deletions zebra-node-services/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,14 @@ color-eyre = { version = "0.6.3", optional = true }
jsonrpc-core = { version = "18.0.0", optional = true }
# Security: avoid default dependency on openssl
reqwest = { version = "0.11.26", default-features = false, features = ["rustls-tls"], optional = true }
serde = { version = "1.0.203", optional = true }
serde_json = { version = "1.0.117", optional = true }
serde = { version = "1.0.204", optional = true }
serde_json = { version = "1.0.120", optional = true }
tokio = { version = "1.37.0", features = ["time"], optional = true }

[dev-dependencies]

color-eyre = "0.6.3"
jsonrpc-core = "18.0.0"
reqwest = { version = "0.11.26", default-features = false, features = ["rustls-tls"] }
serde = "1.0.203"
serde_json = "1.0.117"
serde = "1.0.204"
serde_json = "1.0.120"
4 changes: 2 additions & 2 deletions zebra-rpc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jsonrpc-derive = "18.0.0"
jsonrpc-http-server = "18.0.0"

# zebra-rpc needs the preserve_order feature in serde_json, which is a dependency of jsonrpc-core
serde_json = { version = "1.0.117", features = ["preserve_order"] }
serde_json = { version = "1.0.120", features = ["preserve_order"] }
indexmap = { version = "2.2.6", features = ["serde"] }

tokio = { version = "1.37.0", features = ["time", "rt-multi-thread", "macros", "tracing"] }
Expand All @@ -62,7 +62,7 @@ tower = "0.4.13"
tracing = "0.1.39"

hex = { version = "0.4.3", features = ["serde"] }
serde = { version = "1.0.203", features = ["serde_derive"] }
serde = { version = "1.0.204", features = ["serde_derive"] }

zcash_primitives = { version = "0.15.0" }

Expand Down
6 changes: 3 additions & 3 deletions zebra-scan/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ color-eyre = "0.6.3"
indexmap = { version = "2.2.6", features = ["serde"] }
itertools = "0.13.0"
semver = "1.0.23"
serde = { version = "1.0.203", features = ["serde_derive"] }
serde = { version = "1.0.204", features = ["serde_derive"] }
tokio = { version = "1.37.0", features = ["time"] }
tower = "0.4.13"
tracing = "0.1.39"
Expand All @@ -66,7 +66,7 @@ chrono = { version = "0.4.38", default-features = false, features = ["clock", "s

# test feature proptest-impl
proptest = { version = "1.4.0", optional = true }
proptest-derive = { version = "0.4.0", optional = true }
proptest-derive = { version = "0.5.0", optional = true }

bls12_381 = { version = "0.8.0", optional = true }
ff = { version = "0.13.0", optional = true }
Expand All @@ -82,7 +82,7 @@ insta = { version = "1.39.0", features = ["ron", "redactions"] }
tokio = { version = "1.37.0", features = ["test-util"] }

proptest = "1.4.0"
proptest-derive = "0.4.0"
proptest-derive = "0.5.0"
bls12_381 = "0.8.0"
ff = "0.13.0"
group = "0.13.0"
Expand Down
12 changes: 6 additions & 6 deletions zebra-state/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,13 @@ human_bytes = { version = "0.4.3", default-features = false }
indexmap = "2.2.6"
itertools = "0.13.0"
lazy_static = "1.4.0"
metrics = "0.22.3"
metrics = "0.23.0"
mset = "0.1.1"
regex = "1.10.4"
rlimit = "0.10.1"
rocksdb = { version = "0.22.0", default-features = false, features = ["lz4"] }
semver = "1.0.23"
serde = { version = "1.0.203", features = ["serde_derive"] }
serde = { version = "1.0.204", features = ["serde_derive"] }
tempfile = "3.10.1"
thiserror = "1.0.61"

Expand All @@ -75,7 +75,7 @@ tracing = "0.1.39"
# elasticsearch specific dependencies.
# Security: avoid default dependency on openssl
elasticsearch = { version = "8.5.0-alpha.1", default-features = false, features = ["rustls-tls"], optional = true }
serde_json = { version = "1.0.117", package = "serde_json", optional = true }
serde_json = { version = "1.0.120", package = "serde_json", optional = true }

zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.38", features = ["async-error"] }

Expand All @@ -85,13 +85,13 @@ howudoin = { version = "0.1.2", optional = true }
# test feature proptest-impl
zebra-test = { path = "../zebra-test/", version = "1.0.0-beta.38", optional = true }
proptest = { version = "1.4.0", optional = true }
proptest-derive = { version = "0.4.0", optional = true }
proptest-derive = { version = "0.5.0", optional = true }

[dev-dependencies]
color-eyre = "0.6.3"
# This is a transitive dependency via color-eyre.
# Enable a feature that makes tinyvec compile much faster.
tinyvec = { version = "1.6.0", features = ["rustc_1_55"] }
tinyvec = { version = "1.7.0", features = ["rustc_1_55"] }

once_cell = "1.18.0"
spandoc = "0.2.2"
Expand All @@ -100,7 +100,7 @@ hex = { version = "0.4.3", features = ["serde"] }
insta = { version = "1.39.0", features = ["ron", "redactions"] }

proptest = "1.4.0"
proptest-derive = "0.4.0"
proptest-derive = "0.5.0"
rand = "0.8.5"

halo2 = { package = "halo2_proofs", version = "0.3.0" }
Expand Down
2 changes: 1 addition & 1 deletion zebra-test/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ futures = "0.3.30"
color-eyre = "0.6.3"
# This is a transitive dependency via color-eyre.
# Enable a feature that makes tinyvec compile much faster.
tinyvec = { version = "1.6.0", features = ["rustc_1_55"] }
tinyvec = { version = "1.7.0", features = ["rustc_1_55"] }

humantime = "2.1.0"
owo-colors = "4.0.0"
Expand Down
8 changes: 4 additions & 4 deletions zebra-utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,11 @@ openapi-generator = [
color-eyre = "0.6.3"
# This is a transitive dependency via color-eyre.
# Enable a feature that makes tinyvec compile much faster.
tinyvec = { version = "1.6.0", features = ["rustc_1_55"] }
tinyvec = { version = "1.7.0", features = ["rustc_1_55"] }

structopt = "0.3.26"
hex = "0.4.3"
serde_json = "1.0.117"
serde_json = "1.0.120"
tracing-error = "0.2.0"
tracing-subscriber = "0.3.18"
thiserror = "1.0.61"
Expand Down Expand Up @@ -126,7 +126,7 @@ zcash_protocol = { version = "0.1.1" }

# For the openapi generator
rand = "0.8.5"
syn = { version = "2.0.66", features = ["full"], optional = true }
syn = { version = "2.0.69", features = ["full"], optional = true }
quote = { version = "1.0.36", optional = true }
serde_yaml = { version = "0.9.34+deprecated", optional = true }
serde = { version = "1.0.203", features = ["serde_derive"], optional = true }
serde = { version = "1.0.204", features = ["serde_derive"], optional = true }
24 changes: 10 additions & 14 deletions zebrad/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -109,12 +109,8 @@ error-debug = ["color-eyre/track-caller", "color-eyre/capture-spantrace"]
#
# Release builds are defined as "cfg(not(debug_assertions))".
# https://docs.rs/tracing/latest/tracing/level_filters/index.html#compile-time-filters
release_max_level_warn = ["tracing/release_max_level_warn", "log/release_max_level_warn"]
release_max_level_info = ["tracing/release_max_level_info", "log/release_max_level_info"]
release_max_level_debug = ["tracing/release_max_level_debug", "log/release_max_level_debug"]

max_level_warn = ["tracing/max_level_warn", "log/max_level_warn"]
max_level_info = ["tracing/max_level_info", "log/max_level_info"]
oxarbitrage marked this conversation as resolved.
Show resolved Hide resolved
max_level_debug = ["tracing/max_level_debug", "log/max_level_debug"]

# Testing features that activate extra dependencies
Expand Down Expand Up @@ -172,13 +168,13 @@ zebra-scan = { path = "../zebra-scan", version = "0.1.0-alpha.7", optional = tru
zebra-utils = { path = "../zebra-utils", version = "1.0.0-beta.38", optional = true }

abscissa_core = "0.7.0"
clap = { version = "4.5.4", features = ["cargo"] }
clap = { version = "4.5.8", features = ["cargo"] }
chrono = { version = "0.4.38", default-features = false, features = ["clock", "std"] }
humantime-serde = "1.1.1"
indexmap = "2.2.6"
lazy_static = "1.4.0"
semver = "1.0.23"
serde = { version = "1.0.203", features = ["serde_derive"] }
serde = { version = "1.0.204", features = ["serde_derive"] }
toml = "0.8.13"

futures = "0.3.30"
Expand All @@ -191,7 +187,7 @@ pin-project = "1.1.5"
color-eyre = { version = "0.6.3", default-features = false, features = ["issue-url"] }
# This is a transitive dependency via color-eyre.
# Enable a feature that makes tinyvec compile much faster.
tinyvec = { version = "1.6.0", features = ["rustc_1_55"] }
tinyvec = { version = "1.7.0", features = ["rustc_1_55"] }

thiserror = "1.0.61"

Expand All @@ -201,7 +197,7 @@ tracing-error = "0.2.0"
tracing-futures = "0.2.5"
tracing = "0.1.39"

metrics = "0.22.3"
metrics = "0.23.0"

dirs = "5.0.1"
atty = "0.2.14"
Expand All @@ -226,24 +222,24 @@ tracing-journald = { version = "0.3.0", optional = true }
hyper = { version = "0.14.28", features = ["http1", "http2", "server"], optional = true }

# prod feature prometheus
metrics-exporter-prometheus = { version = "0.14.0", default-features = false, features = ["http-listener"], optional = true }
metrics-exporter-prometheus = { version = "0.15.1", default-features = false, features = ["http-listener"], optional = true }

# prod feature release_max_level_info
#
# zebrad uses tracing for logging,
# we only use `log` to set and print the static log levels in transitive dependencies
log = "0.4.21"
log = "0.4.22"

# prod feature progress-bar
howudoin = { version = "0.1.2", features = ["term-line"], optional = true }
indicatif = { version = "0.17.8", optional = true }

# test feature proptest-impl
proptest = { version = "1.4.0", optional = true }
proptest-derive = { version = "0.4.0", optional = true }
proptest-derive = { version = "0.5.0", optional = true }

# test feature tokio-console
console-subscriber = { version = "0.2.0", optional = true }
console-subscriber = { version = "0.3.0", optional = true }

[build-dependencies]
vergen = { version = "8.3.1", default-features = false, features = ["cargo", "git", "git2", "rustc"] }
Expand All @@ -261,7 +257,7 @@ regex = "1.10.4"
insta = { version = "1.39.0", features = ["json"] }

# zebra-rpc needs the preserve_order feature, it also makes test results more stable
serde_json = { version = "1.0.117", features = ["preserve_order"] }
serde_json = { version = "1.0.120", features = ["preserve_order"] }
tempfile = "3.10.1"

hyper = { version = "0.14.28", features = ["http1", "http2", "server"]}
Expand All @@ -275,7 +271,7 @@ prost = "0.12.6"
tonic = "0.11.0"

proptest = "1.4.0"
proptest-derive = "0.4.0"
proptest-derive = "0.5.0"

# enable span traces and track caller in tests
color-eyre = { version = "0.6.3" }
Expand Down
Loading