Skip to content

Commit

Permalink
Merge of #9179
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] authored Jan 31, 2025
2 parents 8bec4f3 + 1b78133 commit 6f86e8c
Show file tree
Hide file tree
Showing 18 changed files with 382 additions and 424 deletions.
503 changes: 240 additions & 263 deletions Cargo.lock

Large diffs are not rendered by default.

17 changes: 0 additions & 17 deletions deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,6 @@ skip-tree = [
# wait for ordered-map to release a dependency fix
{ name = "ordered-map", version = "=0.4.2" },

# wait for primitive-types to upgrade
{ name = "proc-macro-crate", version = "=0.1.5" },

# wait for `color-eyre` to upgrade
{ name = "owo-colors", version = "=3.5.0" },

Expand All @@ -64,16 +61,10 @@ skip-tree = [
# wait for abscissa_core to upgrade
{name = "tracing-log", version = "=0.1.4" },

# wait for tokio-test -> tokio-stream to upgrade
{ name = "tokio-util", version = "=0.6.10" },

# wait for console-subscriber and tower to update hdrhistogram.
# also wait for ron to update insta, and wait for tonic update.
{ name = "base64", version = "=0.13.1" },

# wait for elasticsearch to update base64, darling, rustc_version, serde_with
{ name = "elasticsearch", version = "=8.5.0-alpha.1" },

# wait for reqwest to update base64
{ name = "base64", version = "=0.21.7" },
{ name = "sync_wrapper", version = "0.1.2" },
Expand All @@ -91,9 +82,6 @@ skip-tree = [
# wait for halo2_gadgets and primitive-types to update uint
{ name = "uint", version = "=0.9.5" },

# wait for dirs-sys to update windows-sys
{ name = "windows-sys", version = "=0.48.0" },

# wait for zebra to update tower
{ name = "tower", version = "=0.4.13" },
{ name = "hashbrown", version = "=0.14.5" },
Expand All @@ -105,11 +93,6 @@ skip-tree = [
# Remove after release candicate period is over and the ECC crates are not patched anymore
{ name = "equihash", version = "=0.2.0" },
{ name = "f4jumble", version = "=0.1.0" },
{ name = "incrementalmerkletree", version = "=0.6.0" },
{ name = "zcash_address", version = "=0.4.0" },
{ name = "zcash_keys", version = "=0.3.0" },
{ name = "zcash_primitives", version = "=0.16.0" },
{ name = "zcash_protocol", version = "=0.2.0" }
]

# This section is considered when running `cargo deny check sources`.
Expand Down
8 changes: 4 additions & 4 deletions tower-batch-control/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ categories = ["algorithms", "asynchronous"]
[dependencies]
futures = "0.3.31"
futures-core = "0.3.28"
pin-project = "1.1.6"
pin-project = "1.1.8"
rayon = "1.10.0"
tokio = { version = "1.42.0", features = ["time", "sync", "tracing", "macros"] }
tokio = { version = "1.43.0", features = ["time", "sync", "tracing", "macros"] }
tokio-util = "0.7.13"
tower = { version = "0.4.13", features = ["util", "buffer"] }
tracing = "0.1.41"
Expand All @@ -36,12 +36,12 @@ 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.8.0", features = ["rustc_1_55"] }
tinyvec = { version = "1.8.1", features = ["rustc_1_55"] }

ed25519-zebra = "4.0.3"
rand = "0.8.5"

tokio = { version = "1.42.0", features = ["full", "tracing", "test-util"] }
tokio = { version = "1.43.0", features = ["full", "tracing", "test-util"] }
tokio-test = "0.4.4"
tower-fallback = { path = "../tower-fallback/", version = "0.2.41-beta.20" }
tower-test = "0.4.0"
Expand Down
4 changes: 2 additions & 2 deletions tower-fallback/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ keywords = ["tower", "batch"]
categories = ["algorithms", "asynchronous"]

[dependencies]
pin-project = "1.1.6"
pin-project = "1.1.8"
tower = "0.4.13"
futures-core = "0.3.28"
tracing = "0.1.41"

[dev-dependencies]
tokio = { version = "1.42.0", features = ["full", "tracing", "test-util"] }
tokio = { version = "1.43.0", features = ["full", "tracing", "test-util"] }

zebra-test = { path = "../zebra-test/", version = "1.0.0-beta.44" }
30 changes: 15 additions & 15 deletions zebra-chain/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ bench = ["zebra-test"]

# Cryptography
bitvec = "1.0.1"
bitflags = "2.5.0"
bitflags = "2.8.0"
bitflags-serde-legacy = "0.1.1"
blake2b_simd = "1.0.2"
blake2s_simd = "1.0.2"
Expand All @@ -81,8 +81,8 @@ group = "0.13.0"
incrementalmerkletree.workspace = true
jubjub = "0.10.0"
lazy_static = "1.4.0"
tempfile = "3.14.0"
dirs = "5.0.1"
tempfile = "3.16.0"
dirs = "6.0.0"
num-integer = "0.1.46"
primitive-types = "0.12.2"
rand_core = "0.6.4"
Expand Down Expand Up @@ -110,18 +110,18 @@ humantime = "2.1.0"

# Error Handling & Formatting
static_assertions = "1.1.0"
thiserror = "2.0.6"
thiserror = "2.0.11"
tracing = "0.1.41"

# Serialization
hex = { version = "0.4.3", features = ["serde"] }
serde = { version = "1.0.215", features = ["serde_derive", "rc"] }
serde_with = "3.11.0"
serde = { version = "1.0.217", features = ["serde_derive", "rc"] }
serde_with = "3.12.0"
serde-big-array = "0.5.1"

# Processing
futures = "0.3.31"
itertools = "0.13.0"
itertools = "0.14.0"
rayon = "1.10.0"

# ZF deps
Expand All @@ -130,17 +130,17 @@ redjubjub = "0.7.0"
reddsa = "0.5.1"

# Production feature json-conversion
serde_json = { version = "1.0.133", optional = true }
serde_json = { version = "1.0.138", optional = true }

# Production feature async-error and testing feature proptest-impl
tokio = { version = "1.42.0", optional = true }
tokio = { version = "1.43.0", optional = true }

# Experimental feature shielded-scan
zcash_client_backend = { workspace = true, optional = true }

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

rand = { version = "0.8.5", optional = true }
rand_chacha = { version = "0.3.1", optional = true }
Expand All @@ -155,18 +155,18 @@ 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.8.0", features = ["rustc_1_55"] }
tinyvec = { version = "1.8.1", features = ["rustc_1_55"] }
spandoc = "0.2.2"
tracing = "0.1.41"

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

rand = "0.8.5"
rand_chacha = "0.3.1"

tokio = { version = "1.42.0", features = ["full", "tracing", "test-util"] }
tokio = { version = "1.43.0", features = ["full", "tracing", "test-util"] }

zebra-test = { path = "../zebra-test/", version = "1.0.0-beta.44" }

Expand Down
2 changes: 1 addition & 1 deletion zebra-chain/src/parameters/network/magic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ impl Network {
}

#[cfg(test)]
mod proptest {
mod magic_proptest {

use proptest::prelude::*;

Expand Down
18 changes: 9 additions & 9 deletions zebra-consensus/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@ rayon = "1.10.0"
chrono = { version = "0.4.39", default-features = false, features = ["clock", "std"] }
lazy_static = "1.4.0"
once_cell = "1.20.2"
serde = { version = "1.0.215", features = ["serde_derive"] }
serde = { version = "1.0.217", features = ["serde_derive"] }

futures = "0.3.31"
futures-util = "0.3.28"
metrics = "0.24.1"
thiserror = "2.0.6"
tokio = { version = "1.42.0", features = ["time", "sync", "tracing", "rt-multi-thread"] }
thiserror = "2.0.11"
tokio = { version = "1.43.0", features = ["time", "sync", "tracing", "rt-multi-thread"] }
tower = { version = "0.4.13", features = ["timeout", "util", "buffer"] }
tracing = "0.1.41"
tracing-futures = "0.2.5"
Expand All @@ -75,22 +75,22 @@ zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.44" }
howudoin = { version = "0.1.2", optional = true }

# Test-only dependencies
proptest = { version = "1.4.0", optional = true }
proptest-derive = { version = "0.5.0", optional = true }
proptest = { version = "1.6.0", optional = true }
proptest-derive = { version = "0.5.1", 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.8.0", features = ["rustc_1_55"] }
tinyvec = { version = "1.8.1", features = ["rustc_1_55"] }

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

tokio = { version = "1.42.0", features = ["full", "tracing", "test-util"] }
tokio = { version = "1.43.0", features = ["full", "tracing", "test-util"] }
tracing-error = "0.2.1"
tracing-subscriber = "0.3.19"

Expand Down
6 changes: 3 additions & 3 deletions zebra-grpc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ futures-util = "0.3.28"
tonic = "0.12.3"
tonic-reflection = "0.12.3"
prost = "0.13.4"
serde = { version = "1.0.215", features = ["serde_derive"] }
tokio = { version = "1.42.0", features = ["macros", "rt-multi-thread"] }
serde = { version = "1.0.217", features = ["serde_derive"] }
tokio = { version = "1.43.0", features = ["macros", "rt-multi-thread"] }
tokio-stream = "0.1.17"
tower = { version = "0.4.13", features = ["util", "buffer", "timeout"] }
color-eyre = "0.6.3"
Expand All @@ -35,7 +35,7 @@ zebra-chain = { path = "../zebra-chain" , version = "1.0.0-beta.44" }
tonic-build = "0.12.3"

[dev-dependencies]
insta = { version = "1.41.1", features = ["redactions", "json", "ron"] }
insta = { version = "1.42.1", features = ["redactions", "json", "ron"] }

zebra-chain = { path = "../zebra-chain", features = ["proptest-impl"] }
zebra-state = { path = "../zebra-state" }
Expand Down
28 changes: 14 additions & 14 deletions zebra-network/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,28 +40,28 @@ progress-bar = [
proptest-impl = ["proptest", "proptest-derive", "zebra-chain/proptest-impl"]

[dependencies]
bitflags = "2.5.0"
bitflags = "2.8.0"
byteorder = "1.5.0"
bytes = "1.9.0"
chrono = { version = "0.4.39", default-features = false, features = ["clock", "std"] }
dirs = "5.0.1"
dirs = "6.0.0"
hex = "0.4.3"
humantime-serde = "1.1.1"
indexmap = { version = "2.7.0", features = ["serde"] }
itertools = "0.13.0"
indexmap = { version = "2.7.1", features = ["serde"] }
itertools = "0.14.0"
lazy_static = "1.4.0"
num-integer = "0.1.46"
ordered-map = "0.4.2"
pin-project = "1.1.6"
pin-project = "1.1.8"
rand = "0.8.5"
rayon = "1.10.0"
regex = "1.11.0"
serde = { version = "1.0.215", features = ["serde_derive"] }
tempfile = "3.14.0"
thiserror = "2.0.6"
serde = { version = "1.0.217", features = ["serde_derive"] }
tempfile = "3.16.0"
thiserror = "2.0.11"

futures = "0.3.31"
tokio = { version = "1.42.0", features = ["fs", "io-util", "net", "time", "tracing", "macros", "rt-multi-thread"] }
tokio = { version = "1.43.0", features = ["fs", "io-util", "net", "time", "tracing", "macros", "rt-multi-thread"] }
tokio-stream = { version = "0.1.17", features = ["sync", "time"] }
tokio-util = { version = "0.7.13", features = ["codec"] }
tower = { version = "0.4.13", features = ["retry", "discover", "load", "load-shed", "timeout", "util", "buffer"] }
Expand All @@ -80,17 +80,17 @@ howudoin = { version = "0.1.2", optional = true }
# tor-rtcompat = { version = "0.0.2", optional = true }

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

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

[dev-dependencies]
proptest = "1.4.0"
proptest-derive = "0.5.0"
proptest = "1.6.0"
proptest-derive = "0.5.1"

static_assertions = "1.1.0"
tokio = { version = "1.42.0", features = ["full", "tracing", "test-util"] }
tokio = { version = "1.43.0", features = ["full", "tracing", "test-util"] }
toml = "0.8.19"

zebra-chain = { path = "../zebra-chain", features = ["proptest-impl"] }
Expand Down
14 changes: 7 additions & 7 deletions zebra-node-services/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,17 +43,17 @@ zebra-chain = { path = "../zebra-chain" , version = "1.0.0-beta.44" }

# Tool and test feature rpc-client
color-eyre = { version = "0.6.3", optional = true }
jsonrpsee-types = { version = "0.24.7", optional = true }
jsonrpsee-types = { version = "0.24.8", optional = true }
# Security: avoid default dependency on openssl
reqwest = { version = "0.12.9", default-features = false, features = ["rustls-tls"], optional = true }
serde = { version = "1.0.215", optional = true }
serde_json = { version = "1.0.133", optional = true }
tokio = { version = "1.42.0", features = ["time", "sync"] }
serde = { version = "1.0.217", optional = true }
serde_json = { version = "1.0.138", optional = true }
tokio = { version = "1.43.0", features = ["time", "sync"] }

[dev-dependencies]

color-eyre = "0.6.3"
reqwest = { version = "0.12.9", default-features = false, features = ["rustls-tls"] }
serde = "1.0.215"
serde_json = "1.0.133"
jsonrpsee-types = "0.24.7"
serde = "1.0.217"
serde_json = "1.0.138"
jsonrpsee-types = "0.24.8"
Loading

0 comments on commit 6f86e8c

Please sign in to comment.