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.

Sign up for GitHub

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

merge queue: embarking main (179aaa4) and #9065 together #9075

Closed
wants to merge 3 commits into from
Closed

merge queue: embarking main (179aaa4) and #9065 together #9075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9c05bb0
build(deps): bump the prod group across 1 directory with 22 updates
dependabot[bot] Dec 2, 2024
0d1c94a
downgrade tower, add denies
oxarbitrage Dec 5, 2024
8d88e59
Merge of #9065
mergify[bot] Dec 7, 2024
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
681 changes: 221 additions & 460 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion deny.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,11 @@ skip-tree = [

# wait for zebra to update tower
{ name = "tower", version = "=0.4.13" },
{ name = "hashbrown", version = "=0.12.3" },
{ name = "hashbrown", version = "=0.14.5" },

# wait for zebra to update vergen
{ name = "thiserror", version = "=1.0.69" },
{ name = "thiserror-impl", version = "=1.0.69" },

# Remove after release candicate period is over and the ECC crates are not patched anymore
{ name = "equihash", version = "=0.2.0" },
Expand Down
6 changes: 3 additions & 3 deletions tower-batch-control/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ futures = "0.3.31"
futures-core = "0.3.28"
pin-project = "1.1.6"
rayon = "1.10.0"
tokio = { version = "1.41.0", features = ["time", "sync", "tracing", "macros"] }
tokio = { version = "1.41.1", features = ["time", "sync", "tracing", "macros"] }
tokio-util = "0.7.12"
tower = { version = "0.4.13", features = ["util", "buffer"] }
tracing = "0.1.39"
tracing = "0.1.41"
tracing-futures = "0.2.5"

[dev-dependencies]
Expand All @@ -41,7 +41,7 @@ tinyvec = { version = "1.8.0", features = ["rustc_1_55"] }
ed25519-zebra = "4.0.3"
rand = "0.8.5"

tokio = { version = "1.41.0", features = ["full", "tracing", "test-util"] }
tokio = { version = "1.41.1", features = ["full", "tracing", "test-util"] }
tokio-test = "0.4.4"
tower-fallback = { path = "../tower-fallback/", version = "0.2.41-beta.19" }
tower-test = "0.4.0"
Expand Down
4 changes: 2 additions & 2 deletions tower-fallback/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ categories = ["algorithms", "asynchronous"]
pin-project = "1.1.6"
tower = "0.4.13"
futures-core = "0.3.28"
tracing = "0.1.39"
tracing = "0.1.41"

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

zebra-test = { path = "../zebra-test/", version = "1.0.0-beta.43" }
16 changes: 8 additions & 8 deletions zebra-chain/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ group = "0.13.0"
incrementalmerkletree.workspace = true
jubjub = "0.10.0"
lazy_static = "1.4.0"
tempfile = "3.13.0"
tempfile = "3.14.0"
dirs = "5.0.1"
num-integer = "0.1.46"
primitive-types = "0.12.2"
Expand Down Expand Up @@ -110,12 +110,12 @@ humantime = "2.1.0"

# Error Handling & Formatting
static_assertions = "1.1.0"
thiserror = "1.0.64"
tracing = "0.1.39"
thiserror = "2.0.3"
tracing = "0.1.41"

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

Expand All @@ -130,10 +130,10 @@ redjubjub = "0.7.0"
reddsa = "0.5.1"

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

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

# Experimental feature shielded-scan
zcash_client_backend = { workspace = true, optional = true }
Expand All @@ -157,7 +157,7 @@ color-eyre = "0.6.3"
# Enable a feature that makes tinyvec compile much faster.
tinyvec = { version = "1.8.0", features = ["rustc_1_55"] }
spandoc = "0.2.2"
tracing = "0.1.39"
tracing = "0.1.41"

# Make the optional testing dependencies required
proptest = "1.4.0"
Expand All @@ -166,7 +166,7 @@ proptest-derive = "0.5.0"
rand = "0.8.5"
rand_chacha = "0.3.1"

tokio = { version = "1.41.0", features = ["full", "tracing", "test-util"] }
tokio = { version = "1.41.1", features = ["full", "tracing", "test-util"] }

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

Expand Down
14 changes: 7 additions & 7 deletions zebra-consensus/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,15 @@ rayon = "1.10.0"
chrono = { version = "0.4.38", default-features = false, features = ["clock", "std"] }
lazy_static = "1.4.0"
once_cell = "1.20.2"
serde = { version = "1.0.211", features = ["serde_derive"] }
serde = { version = "1.0.215", features = ["serde_derive"] }

futures = "0.3.31"
futures-util = "0.3.28"
metrics = "0.24.0"
thiserror = "1.0.64"
tokio = { version = "1.41.0", features = ["time", "sync", "tracing", "rt-multi-thread"] }
metrics = "0.24.1"
thiserror = "2.0.3"
tokio = { version = "1.41.1", features = ["time", "sync", "tracing", "rt-multi-thread"] }
tower = { version = "0.4.13", features = ["timeout", "util", "buffer"] }
tracing = "0.1.39"
tracing = "0.1.41"
tracing-futures = "0.2.5"

sapling-crypto.workspace = true
Expand Down Expand Up @@ -90,8 +90,8 @@ proptest = "1.4.0"
proptest-derive = "0.5.0"
spandoc = "0.2.2"

tokio = { version = "1.41.0", features = ["full", "tracing", "test-util"] }
tracing-error = "0.2.0"
tokio = { version = "1.41.1", features = ["full", "tracing", "test-util"] }
tracing-error = "0.2.1"
tracing-subscriber = "0.3.18"

zebra-state = { path = "../zebra-state", version = "1.0.0-beta.43", features = ["proptest-impl"] }
Expand Down
6 changes: 3 additions & 3 deletions zebra-grpc/Cargo.toml
View file
Open in desktop
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.3"
serde = { version = "1.0.211", features = ["serde_derive"] }
tokio = { version = "1.41.0", features = ["macros", "rt-multi-thread"] }
serde = { version = "1.0.215", features = ["serde_derive"] }
tokio = { version = "1.41.1", features = ["macros", "rt-multi-thread"] }
tokio-stream = "0.1.16"
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.43" }
tonic-build = "0.12.3"

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

zebra-chain = { path = "../zebra-chain", features = ["proptest-impl"] }
zebra-state = { path = "../zebra-state" }
Expand Down
20 changes: 10 additions & 10 deletions zebra-network/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@ proptest-impl = ["proptest", "proptest-derive", "zebra-chain/proptest-impl"]
[dependencies]
bitflags = "2.5.0"
byteorder = "1.5.0"
bytes = "1.8.0"
bytes = "1.9.0"
chrono = { version = "0.4.38", default-features = false, features = ["clock", "std"] }
dirs = "5.0.1"
hex = "0.4.3"
humantime-serde = "1.1.1"
indexmap = { version = "2.6.0", features = ["serde"] }
indexmap = { version = "2.7.0", features = ["serde"] }
itertools = "0.13.0"
lazy_static = "1.4.0"
num-integer = "0.1.46"
Expand All @@ -56,20 +56,20 @@ pin-project = "1.1.6"
rand = "0.8.5"
rayon = "1.10.0"
regex = "1.11.0"
serde = { version = "1.0.211", features = ["serde_derive"] }
tempfile = "3.13.0"
thiserror = "1.0.64"
serde = { version = "1.0.215", features = ["serde_derive"] }
tempfile = "3.14.0"
thiserror = "2.0.3"

futures = "0.3.31"
tokio = { version = "1.41.0", features = ["fs", "io-util", "net", "time", "tracing", "macros", "rt-multi-thread"] }
tokio = { version = "1.41.1", features = ["fs", "io-util", "net", "time", "tracing", "macros", "rt-multi-thread"] }
tokio-stream = { version = "0.1.16", features = ["sync", "time"] }
tokio-util = { version = "0.7.12", features = ["codec"] }
tower = { version = "0.4.13", features = ["retry", "discover", "load", "load-shed", "timeout", "util", "buffer"] }

metrics = "0.24.0"
metrics = "0.24.1"
tracing-futures = "0.2.5"
tracing-error = { version = "0.2.0", features = ["traced-error"] }
tracing = "0.1.39"
tracing-error = { version = "0.2.1", features = ["traced-error"] }
tracing = "0.1.41"

# prod feature progress-bar
howudoin = { version = "0.1.2", optional = true }
Expand All @@ -90,7 +90,7 @@ proptest = "1.4.0"
proptest-derive = "0.5.0"

static_assertions = "1.1.0"
tokio = { version = "1.41.0", features = ["full", "tracing", "test-util"] }
tokio = { version = "1.41.1", 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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,15 @@ zebra-chain = { path = "../zebra-chain" , version = "1.0.0-beta.43" }
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.211", optional = true }
serde_json = { version = "1.0.132", optional = true }
tokio = { version = "1.41.0", features = ["time", "sync"] }
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.41.1", features = ["time", "sync"] }

[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.211"
serde_json = "1.0.132"
reqwest = { version = "0.12.9", default-features = false, features = ["rustls-tls"] }
serde = "1.0.215"
serde_json = "1.0.133"
16 changes: 8 additions & 8 deletions zebra-rpc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ 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.132", features = ["preserve_order"] }
indexmap = { version = "2.6.0", features = ["serde"] }
serde_json = { version = "1.0.133", features = ["preserve_order"] }
indexmap = { version = "2.7.0", features = ["serde"] }

# RPC endpoint basic auth
base64 = "0.22.1"
Expand All @@ -74,7 +74,7 @@ rand = "0.8.5"
# Error handling
color-eyre = "0.6.3"

tokio = { version = "1.41.0", features = [
tokio = { version = "1.41.1", features = [
"time",
"rt-multi-thread",
"macros",
Expand All @@ -88,10 +88,10 @@ tonic-reflection = { version = "0.12.3", optional = true }
prost = { version = "0.13.3", optional = true }
tokio-stream = { version = "0.1.16", optional = true }

tracing = "0.1.39"
tracing = "0.1.41"

hex = { version = "0.4.3", features = ["serde"] }
serde = { version = "1.0.211", features = ["serde_derive"] }
serde = { version = "1.0.215", features = ["serde_derive"] }

# For the `stop` RPC method.
nix = { version = "0.29.0", features = ["signal"] }
Expand Down Expand Up @@ -119,12 +119,12 @@ zebra-state = { path = "../zebra-state", version = "1.0.0-beta.43" }
tonic-build = { version = "0.12.3", optional = true }

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

proptest = "1.4.0"

thiserror = "1.0.64"
tokio = { version = "1.41.0", features = ["full", "tracing", "test-util"] }
thiserror = "2.0.3"
tokio = { version = "1.41.1", features = ["full", "tracing", "test-util"] }

zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.43", features = [
"proptest-impl",
Expand Down
16 changes: 8 additions & 8 deletions zebra-scan/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,13 @@ results-reader = [
[dependencies]

color-eyre = "0.6.3"
indexmap = { version = "2.6.0", features = ["serde"] }
indexmap = { version = "2.7.0", features = ["serde"] }
itertools = "0.13.0"
semver = "1.0.23"
serde = { version = "1.0.211", features = ["serde_derive"] }
tokio = { version = "1.41.0", features = ["time"] }
serde = { version = "1.0.215", features = ["serde_derive"] }
tokio = { version = "1.41.1", features = ["time"] }
tower = "0.4.13"
tracing = "0.1.39"
tracing = "0.1.41"
futures = "0.3.31"

# ECC dependencies.
Expand Down Expand Up @@ -102,16 +102,16 @@ zebra-test = { path = "../zebra-test", version = "1.0.0-beta.43", optional = tru
tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
structopt = "0.3.26"
lazy_static = "1.4.0"
serde_json = "1.0.132"
serde_json = "1.0.133"

jsonrpc = { version = "0.18.0", optional = true }
hex = { version = "0.4.3", optional = true }

zebrad = { path = "../zebrad", version = "2.1.0" }

[dev-dependencies]
insta = { version = "1.40.0", features = ["ron", "redactions"] }
tokio = { version = "1.41.0", features = ["test-util"] }
insta = { version = "1.41.1", features = ["ron", "redactions"] }
tokio = { version = "1.41.1", features = ["test-util"] }

proptest = "1.4.0"
proptest-derive = "0.5.0"
Expand All @@ -120,7 +120,7 @@ ff = "0.13.0"
group = "0.13.0"
jubjub = "0.10.0"
rand = "0.8.5"
tempfile = "3.13.0"
tempfile = "3.14.0"
zcash_note_encryption = "0.4.0"
toml = "0.8.19"
tonic = "0.12.3"
Expand Down
2 changes: 1 addition & 1 deletion zebra-script/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ categories = ["api-bindings", "cryptography::cryptocurrencies"]
zcash_script = "0.2.0"
zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.43" }

thiserror = "1.0.64"
thiserror = "2.0.3"

[dev-dependencies]
hex = "0.4.3"
Expand Down
22 changes: 11 additions & 11 deletions zebra-state/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,28 +54,28 @@ hex = "0.4.3"
hex-literal = "0.4.1"
humantime-serde = "1.1.1"
human_bytes = { version = "0.4.3", default-features = false }
indexmap = "2.6.0"
indexmap = "2.7.0"
itertools = "0.13.0"
lazy_static = "1.4.0"
metrics = "0.24.0"
metrics = "0.24.1"
mset = "0.1.1"
regex = "1.11.0"
rlimit = "0.10.2"
rocksdb = { version = "0.22.0", default-features = false, features = ["lz4"] }
semver = "1.0.23"
serde = { version = "1.0.211", features = ["serde_derive"] }
tempfile = "3.13.0"
thiserror = "1.0.64"
serde = { version = "1.0.215", features = ["serde_derive"] }
tempfile = "3.14.0"
thiserror = "2.0.3"

rayon = "1.10.0"
tokio = { version = "1.41.0", features = ["rt-multi-thread", "sync", "tracing"] }
tokio = { version = "1.41.1", features = ["rt-multi-thread", "sync", "tracing"] }
tower = { version = "0.4.13", features = ["buffer", "util"] }
tracing = "0.1.39"
tracing = "0.1.41"

# 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.132", package = "serde_json", optional = true }
elasticsearch = { version = "8.16.0-alpha.1", default-features = false, features = ["rustls-tls"], optional = true }
serde_json = { version = "1.0.133", package = "serde_json", optional = true }

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

Expand All @@ -97,7 +97,7 @@ once_cell = "1.20.2"
spandoc = "0.2.2"

hex = { version = "0.4.3", features = ["serde"] }
insta = { version = "1.40.0", features = ["ron", "redactions"] }
insta = { version = "1.41.1", features = ["ron", "redactions"] }

proptest = "1.4.0"
proptest-derive = "0.5.0"
Expand All @@ -106,7 +106,7 @@ rand = "0.8.5"
halo2 = { package = "halo2_proofs", version = "0.3.0" }
jubjub = "0.10.0"

tokio = { version = "1.41.0", features = ["full", "tracing", "test-util"] }
tokio = { version = "1.41.1", features = ["full", "tracing", "test-util"] }

zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.43", features = ["proptest-impl"] }
zebra-test = { path = "../zebra-test/", version = "1.0.0-beta.43" }
Loading
Loading