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 with 5 updates #8726

Merged
merged 2 commits into from
Jul 30, 2024
Merged
Show file tree
Hide file tree
Changes from all 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
182 changes: 45 additions & 137 deletions Cargo.lock

Large diffs are not rendered by default.

36 changes: 36 additions & 0 deletions supply-chain/audits.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,21 @@ who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.6.0 -> 0.7.0"

[[audits.console-api]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.7.0 -> 0.8.0"

[[audits.console-subscriber]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.2.0 -> 0.3.0"

[[audits.console-subscriber]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.3.0 -> 0.4.0"

[[audits.git2]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -131,6 +141,11 @@ who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.12.6 -> 0.13.1"

[[audits.serde_spanned]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.6.6 -> 0.6.7"

[[audits.serde_with]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -181,11 +196,26 @@ who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.8.14 -> 0.8.15"

[[audits.toml]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.8.15 -> 0.8.16"

[[audits.toml_datetime]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.6.6 -> 0.6.7"

[[audits.toml_edit]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.22.14 -> 0.22.16"

[[audits.toml_edit]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.22.16 -> 0.22.17"

[[audits.tonic]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -235,3 +265,9 @@ criteria = "safe-to-deploy"
user-id = 3618 # David Tolnay (dtolnay)
start = "2019-03-01"
end = "2025-07-09"

[[trusted.tokio]]
criteria = "safe-to-deploy"
user-id = 6741 # Alice Ryhl (Darksonn)
start = "2020-12-25"
end = "2025-07-29"
8 changes: 0 additions & 8 deletions supply-chain/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -1550,14 +1550,6 @@ criteria = "safe-to-deploy"
version = "0.3.36"
criteria = "safe-to-deploy"

[[exemptions.tokio]]
version = "1.38.0"
criteria = "safe-to-deploy"

[[exemptions.tokio-io-timeout]]
version = "1.2.0"
criteria = "safe-to-deploy"

[[exemptions.tokio-macros]]
version = "2.3.0"
criteria = "safe-to-deploy"
Expand Down
23 changes: 15 additions & 8 deletions supply-chain/imports.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,22 @@ user-login = "emilio"
user-name = "Emilio Cobos Álvarez"

[[publisher.clap]]
version = "4.5.10"
when = "2024-07-23"
version = "4.5.11"
when = "2024-07-25"
user-id = 6743
user-login = "epage"
user-name = "Ed Page"

[[publisher.clap_builder]]
version = "4.5.10"
when = "2024-07-23"
version = "4.5.11"
when = "2024-07-25"
user-id = 6743
user-login = "epage"
user-name = "Ed Page"

[[publisher.clap_derive]]
version = "4.5.8"
when = "2024-06-28"
version = "4.5.11"
when = "2024-07-25"
user-id = 6743
user-login = "epage"
user-name = "Ed Page"
Expand All @@ -44,8 +44,8 @@ user-login = "hsivonen"
user-name = "Henri Sivonen"

[[publisher.serde_json]]
version = "1.0.120"
when = "2024-07-01"
version = "1.0.121"
when = "2024-07-28"
user-id = 3618
user-login = "dtolnay"
user-name = "David Tolnay"
Expand All @@ -64,6 +64,13 @@ user-id = 3618
user-login = "dtolnay"
user-name = "David Tolnay"

[[publisher.tokio]]
version = "1.39.2"
when = "2024-07-27"
user-id = 6741
user-login = "Darksonn"
user-name = "Alice Ryhl"

[[publisher.unicode-normalization]]
version = "0.1.23"
when = "2024-02-20"
Expand Down
4 changes: 2 additions & 2 deletions tower-batch-control/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ futures = "0.3.30"
futures-core = "0.3.28"
pin-project = "1.1.5"
rayon = "1.10.0"
tokio = { version = "1.39.0", features = ["time", "sync", "tracing", "macros"] }
tokio = { version = "1.39.2", features = ["time", "sync", "tracing", "macros"] }
tokio-util = "0.7.11"
tower = { version = "0.4.13", features = ["util", "buffer"] }
tracing = "0.1.39"
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.39.0", features = ["full", "tracing", "test-util"] }
tokio = { version = "1.39.2", features = ["full", "tracing", "test-util"] }
tokio-test = "0.4.4"
tower-fallback = { path = "../tower-fallback/", version = "0.2.41-beta.14" }
tower-test = "0.4.0"
Expand Down
2 changes: 1 addition & 1 deletion tower-fallback/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ futures-core = "0.3.28"
tracing = "0.1.39"

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

zebra-test = { path = "../zebra-test/", version = "1.0.0-beta.38" }
6 changes: 3 additions & 3 deletions zebra-chain/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,10 @@ redjubjub = "0.7.0"
reddsa = "0.5.1"

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

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

# Experimental feature shielded-scan
zcash_client_backend = { version = "0.12.1", optional = true }
Expand Down Expand Up @@ -164,7 +164,7 @@ proptest-derive = "0.5.0"
rand = "0.8.5"
rand_chacha = "0.3.1"

tokio = { version = "1.39.0", features = ["full", "tracing", "test-util"] }
tokio = { version = "1.39.2", features = ["full", "tracing", "test-util"] }

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

Expand Down
4 changes: 2 additions & 2 deletions zebra-consensus/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ futures = "0.3.30"
futures-util = "0.3.28"
metrics = "0.23.0"
thiserror = "1.0.63"
tokio = { version = "1.39.0", features = ["time", "sync", "tracing", "rt-multi-thread"] }
tokio = { version = "1.39.2", features = ["time", "sync", "tracing", "rt-multi-thread"] }
tower = { version = "0.4.13", features = ["timeout", "util", "buffer"] }
tracing = "0.1.39"
tracing-futures = "0.2.5"
Expand Down Expand Up @@ -90,7 +90,7 @@ proptest = "1.4.0"
proptest-derive = "0.5.0"
spandoc = "0.2.2"

tokio = { version = "1.39.0", features = ["full", "tracing", "test-util"] }
tokio = { version = "1.39.2", features = ["full", "tracing", "test-util"] }
tracing-error = "0.2.0"
tracing-subscriber = "0.3.18"

Expand Down
2 changes: 1 addition & 1 deletion zebra-grpc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ tonic = "0.12.1"
tonic-reflection = "0.12.1"
prost = "0.13.1"
serde = { version = "1.0.204", features = ["serde_derive"] }
tokio = { version = "1.39.0", features = ["macros", "rt-multi-thread"] }
tokio = { version = "1.39.2", features = ["macros", "rt-multi-thread"] }
tokio-stream = "0.1.15"
tower = { version = "0.4.13", features = ["util", "buffer", "timeout"] }
color-eyre = "0.6.3"
Expand Down
6 changes: 3 additions & 3 deletions zebra-network/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ tempfile = "3.10.1"
thiserror = "1.0.63"

futures = "0.3.30"
tokio = { version = "1.39.0", features = ["fs", "io-util", "net", "time", "tracing", "macros", "rt-multi-thread"] }
tokio = { version = "1.39.2", features = ["fs", "io-util", "net", "time", "tracing", "macros", "rt-multi-thread"] }
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"] }
Expand Down Expand Up @@ -90,8 +90,8 @@ proptest = "1.4.0"
proptest-derive = "0.5.0"

static_assertions = "1.1.0"
tokio = { version = "1.39.0", features = ["full", "tracing", "test-util"] }
toml = "0.8.15"
tokio = { version = "1.39.2", features = ["full", "tracing", "test-util"] }
toml = "0.8.16"

zebra-chain = { path = "../zebra-chain", features = ["proptest-impl"] }
zebra-test = { path = "../zebra-test/" }
6 changes: 3 additions & 3 deletions zebra-node-services/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@ 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.204", optional = true }
serde_json = { version = "1.0.120", optional = true }
tokio = { version = "1.39.0", features = ["time"], optional = true }
serde_json = { version = "1.0.121", optional = true }
tokio = { version = "1.39.2", 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.204"
serde_json = "1.0.120"
serde_json = "1.0.121"
6 changes: 3 additions & 3 deletions zebra-rpc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,10 @@ 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.120", features = ["preserve_order"] }
serde_json = { version = "1.0.121", features = ["preserve_order"] }
indexmap = { version = "2.2.6", features = ["serde"] }

tokio = { version = "1.39.0", features = [
tokio = { version = "1.39.2", features = [
"time",
"rt-multi-thread",
"macros",
Expand Down Expand Up @@ -118,7 +118,7 @@ insta = { version = "1.39.0", features = ["redactions", "json", "ron"] }
proptest = "1.4.0"

thiserror = "1.0.63"
tokio = { version = "1.39.0", features = ["full", "tracing", "test-util"] }
tokio = { version = "1.39.2", features = ["full", "tracing", "test-util"] }

zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.38", features = [
"proptest-impl",
Expand Down
8 changes: 4 additions & 4 deletions zebra-scan/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ indexmap = { version = "2.2.6", features = ["serde"] }
itertools = "0.13.0"
semver = "1.0.23"
serde = { version = "1.0.204", features = ["serde_derive"] }
tokio = { version = "1.39.0", features = ["time"] }
tokio = { version = "1.39.2", features = ["time"] }
tower = "0.4.13"
tracing = "0.1.39"
futures = "0.3.30"
Expand Down Expand Up @@ -101,7 +101,7 @@ zebra-test = { path = "../zebra-test", version = "1.0.0-beta.38", optional = tru
tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
structopt = "0.3.26"
lazy_static = "1.4.0"
serde_json = "1.0.117"
serde_json = "1.0.121"

jsonrpc = { version = "0.18.0", optional = true }
hex = { version = "0.4.3", optional = true }
Expand All @@ -110,7 +110,7 @@ zebrad = { path = "../zebrad", version = "1.8.0" }

[dev-dependencies]
insta = { version = "1.39.0", features = ["ron", "redactions"] }
tokio = { version = "1.39.0", features = ["test-util"] }
tokio = { version = "1.39.2", features = ["test-util"] }

proptest = "1.4.0"
proptest-derive = "0.5.0"
Expand All @@ -121,7 +121,7 @@ jubjub = "0.10.0"
rand = "0.8.5"
tempfile = "3.10.1"
zcash_note_encryption = "0.4.0"
toml = "0.8.15"
toml = "0.8.16"
tonic = "0.12.1"

zebra-state = { path = "../zebra-state", version = "1.0.0-beta.38", features = ["proptest-impl"] }
Expand Down
6 changes: 3 additions & 3 deletions zebra-state/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,14 @@ tempfile = "3.10.1"
thiserror = "1.0.63"

rayon = "1.10.0"
tokio = { version = "1.39.0", features = ["rt-multi-thread", "sync", "tracing"] }
tokio = { version = "1.39.2", features = ["rt-multi-thread", "sync", "tracing"] }
tower = { version = "0.4.13", features = ["buffer", "util"] }
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.120", package = "serde_json", optional = true }
serde_json = { version = "1.0.121", package = "serde_json", optional = true }

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

Expand Down Expand Up @@ -106,7 +106,7 @@ rand = "0.8.5"
halo2 = { package = "halo2_proofs", version = "0.3.0" }
jubjub = "0.10.0"

tokio = { version = "1.39.0", features = ["full", "tracing", "test-util"] }
tokio = { version = "1.39.2", features = ["full", "tracing", "test-util"] }

zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.38", features = ["proptest-impl"] }
zebra-test = { path = "../zebra-test/", version = "1.0.0-beta.38" }
2 changes: 1 addition & 1 deletion zebra-test/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ once_cell = "1.18.0"
rand = "0.8.5"
regex = "1.10.4"

tokio = { version = "1.39.0", features = ["full", "tracing", "test-util"] }
tokio = { version = "1.39.2", features = ["full", "tracing", "test-util"] }
tower = { version = "0.4.13", features = ["util"] }
futures = "0.3.30"

Expand Down
4 changes: 2 additions & 2 deletions zebra-utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ tinyvec = { version = "1.8.0", features = ["rustc_1_55"] }

structopt = "0.3.26"
hex = "0.4.3"
serde_json = "1.0.120"
serde_json = "1.0.121"
tracing-error = "0.2.0"
tracing-subscriber = "0.3.18"
thiserror = "1.0.63"
Expand All @@ -109,7 +109,7 @@ regex = { version = "1.10.4", optional = true }
reqwest = { version = "0.11.26", default-features = false, features = ["rustls-tls"], optional = true }

# These crates are needed for the zebra-checkpoints and search-issue-refs binaries
tokio = { version = "1.39.0", features = ["full"], optional = true }
tokio = { version = "1.39.2", features = ["full"], optional = true }

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

Expand Down
Loading
Loading