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

build(deps): bump the prod group across 1 directory with 15 updates #8692

Merged
merged 17 commits into from
Jul 23, 2024
Merged

build(deps): bump the prod group across 1 directory with 15 updates #8692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
48580a8
build(deps): bump the prod group across 1 directory with 15 updates
dependabot[bot] Jul 16, 2024
162e5da
make changes for hyper 1.0
oxarbitrage Jul 19, 2024
4641d3a
unrelated clippy
oxarbitrage Jul 19, 2024
db8907e
fix panic
oxarbitrage Jul 19, 2024
be27589
update denies
oxarbitrage Jul 19, 2024
1417ef8
add missing deny.toml
oxarbitrage Jul 19, 2024
c791089
add more denies for all features
oxarbitrage Jul 19, 2024
137cf5d
add timeout feature to tower in zebra-grpc
oxarbitrage Jul 20, 2024
f622ac1
Merge remote-tracking branch 'origin/main' into dependabot/cargo/prod…
oxarbitrage Jul 20, 2024
195cdef
cargo vet
oxarbitrage Jul 21, 2024
76cb761
cargo vet prune
oxarbitrage Jul 21, 2024
9b90670
codespell
oxarbitrage Jul 21, 2024
1a201b0
change waiting message
oxarbitrage Jul 23, 2024
007b99e
remove hyper direct dependency from zebra-rpc
oxarbitrage Jul 23, 2024
058788f
fix doc typos
oxarbitrage Jul 23, 2024
62a8d71
simplify tracing endpoint
oxarbitrage Jul 23, 2024
d34b939
Merge branch 'main' into dependabot/cargo/prod-2ffb671b94
oxarbitrage Jul 23, 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
379 changes: 265 additions & 114 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

15 changes: 14 additions & 1 deletion deny.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,24 @@ skip-tree = [
{ name = "base64", version = "=0.13.1" },

# wait for console-subscriber to update tonic.
{ name = "tonic", version = "=0.10.2" },
{ name = "tonic", version = "=0.11.0" },
{ name = "tonic-build", version = "=0.10.2" },
{ name = "axum", version = "=0.6.20" },
{ name = "axum-core", version = "=0.3.4" },
{ name = "hyper-timeout", version = "=0.4.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" },

# wait for jsonrpc-http-server to update hyper or for Zebra to replace jsonrpc (#8682)
{ name = "h2", version = "=0.3.26" },
{ name = "http", version = "=0.2.12" },
{ name = "http-body", version = "=0.4.6" },
{ name = "hyper", version = "=0.14.30" },
]

# This section is considered when running `cargo deny check sources`.
Expand Down
105 changes: 105 additions & 0 deletions supply-chain/audits.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,21 @@

# cargo-vet audits file

[[audits.axum]]
who = "Alfredo Garcia <oxarbitrage@gmail.com>"
criteria = "safe-to-deploy"
delta = "0.6.20 -> 0.7.5"

[[audits.axum-core]]
who = "Alfredo Garcia <oxarbitrage@gmail.com>"
criteria = "safe-to-deploy"
delta = "0.3.4 -> 0.4.3"

[[audits.bytes]]
who = "Alfredo Garcia <oxarbitrage@gmail.com>"
criteria = "safe-to-deploy"
delta = "1.6.0 -> 1.6.1"

[[audits.clap_derive]]
who = "Alfredo Garcia <oxarbitrage@gmail.com>"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -36,6 +51,31 @@ who = "Alfredo Garcia <oxarbitrage@gmail.com>"
criteria = "safe-to-deploy"
delta = "0.2.0 -> 0.3.0"

[[audits.git2]]
who = "Alfredo Garcia <oxarbitrage@gmail.com>"
criteria = "safe-to-deploy"
delta = "0.18.3 -> 0.19.0"

[[audits.hyper]]
who = "Alfredo Garcia <oxarbitrage@gmail.com>"
criteria = "safe-to-deploy"
delta = "0.14.29 -> 0.14.30"

[[audits.hyper]]
who = "Alfredo Garcia <oxarbitrage@gmail.com>"
criteria = "safe-to-deploy"
delta = "1.3.1 -> 1.4.1"

[[audits.inferno]]
who = "Alfredo Garcia <oxarbitrage@gmail.com>"
criteria = "safe-to-deploy"
delta = "0.11.19 -> 0.11.20"

[[audits.libgit2-sys]]
who = "Alfredo Garcia <oxarbitrage@gmail.com>"
criteria = "safe-to-deploy"
delta = "0.16.2+1.7.2 -> 0.17.0+1.8.1"

[[audits.log]]
who = "Alfredo Garcia <oxarbitrage@gmail.com>"
criteria = "safe-to-deploy"
Expand All @@ -51,6 +91,11 @@ who = "Alfredo Garcia <oxarbitrage@gmail.com>"
criteria = "safe-to-deploy"
delta = "0.14.0 -> 0.15.1"

[[audits.metrics-exporter-prometheus]]
who = "Alfredo Garcia <oxarbitrage@gmail.com>"
criteria = "safe-to-deploy"
delta = "0.15.1 -> 0.15.3"

[[audits.metrics-util]]
who = "Alfredo Garcia <oxarbitrage@gmail.com>"
criteria = "safe-to-deploy"
Expand All @@ -61,16 +106,76 @@ who = "Alfredo Garcia <oxarbitrage@gmail.com>"
criteria = "safe-to-deploy"
delta = "0.4.0 -> 0.5.0"

[[audits.prost]]
who = "Alfredo Garcia <oxarbitrage@gmail.com>"
criteria = "safe-to-deploy"
delta = "0.12.6 -> 0.13.1"

[[audits.prost-build]]
who = "Alfredo Garcia <oxarbitrage@gmail.com>"
criteria = "safe-to-deploy"
delta = "0.12.6 -> 0.13.1"

[[audits.prost-derive]]
who = "Alfredo Garcia <oxarbitrage@gmail.com>"
criteria = "safe-to-deploy"
delta = "0.12.6 -> 0.13.1"

[[audits.prost-types]]
who = "Alfredo Garcia <oxarbitrage@gmail.com>"
criteria = "safe-to-deploy"
delta = "0.12.6 -> 0.13.1"

[[audits.serde_with]]
who = "Alfredo Garcia <oxarbitrage@gmail.com>"
criteria = "safe-to-deploy"
delta = "3.8.1 -> 3.8.3"

[[audits.serde_with]]
who = "Alfredo Garcia <oxarbitrage@gmail.com>"
criteria = "safe-to-deploy"
delta = "3.8.3 -> 3.9.0"

[[audits.serde_with_macros]]
who = "Alfredo Garcia <oxarbitrage@gmail.com>"
criteria = "safe-to-deploy"
delta = "3.8.1 -> 3.8.3"

[[audits.serde_with_macros]]
who = "Alfredo Garcia <oxarbitrage@gmail.com>"
criteria = "safe-to-deploy"
delta = "3.8.3 -> 3.9.0"

[[audits.thiserror]]
who = "Alfredo Garcia <oxarbitrage@gmail.com>"
criteria = "safe-to-deploy"
delta = "1.0.61 -> 1.0.62"

[[audits.thiserror-impl]]
who = "Alfredo Garcia <oxarbitrage@gmail.com>"
criteria = "safe-to-deploy"
delta = "1.0.63 -> 1.0.62"

[[audits.tokio]]
who = "Alfredo Garcia <oxarbitrage@gmail.com>"
criteria = "safe-to-deploy"
delta = "1.38.0 -> 1.38.1"

[[audits.tonic]]
who = "Alfredo Garcia <oxarbitrage@gmail.com>"
criteria = "safe-to-deploy"
delta = "0.11.0 -> 0.12.0"

[[audits.tonic-reflection]]
who = "Alfredo Garcia <oxarbitrage@gmail.com>"
criteria = "safe-to-deploy"
delta = "0.11.0 -> 0.12.0"

[[audits.vergen]]
who = "Alfredo Garcia <oxarbitrage@gmail.com>"
criteria = "safe-to-deploy"
delta = "8.3.1 -> 8.3.2"

[[trusted.clap]]
criteria = "safe-to-deploy"
user-id = 6743 # Ed Page (epage)
Expand Down
8 changes: 0 additions & 8 deletions supply-chain/config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,10 +534,6 @@ criteria = "safe-to-deploy"
version = "2.0.0"
criteria = "safe-to-deploy"

[[exemptions.futures]]
version = "0.3.30"
criteria = "safe-to-deploy"

[[exemptions.futures-channel]]
version = "0.3.30"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -602,10 +598,6 @@ criteria = "safe-to-deploy"
version = "0.3.26"
criteria = "safe-to-deploy"

[[exemptions.h2]]
version = "0.4.5"
criteria = "safe-to-deploy"

[[exemptions.half]]
version = "2.4.1"
criteria = "safe-to-run"
Expand Down
72 changes: 66 additions & 6 deletions supply-chain/imports.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ user-login = "emilio"
user-name = "Emilio Cobos Álvarez"

[[publisher.clap]]
version = "4.5.8"
when = "2024-06-28"
version = "4.5.9"
when = "2024-07-09"
user-id = 6743
user-login = "epage"
user-name = "Ed Page"

[[publisher.clap_builder]]
version = "4.5.8"
when = "2024-06-28"
version = "4.5.9"
when = "2024-07-09"
user-id = 6743
user-login = "epage"
user-name = "Ed Page"
Expand Down Expand Up @@ -58,8 +58,8 @@ user-login = "dtolnay"
user-name = "David Tolnay"

[[publisher.syn]]
version = "2.0.69"
when = "2024-07-06"
version = "2.0.71"
when = "2024-07-12"
user-id = 3618
user-login = "dtolnay"
user-name = "David Tolnay"
Expand Down Expand Up @@ -226,6 +226,16 @@ that the RNG here is not cryptographically secure.
"""
aggregated-from = "https://chromium.googlesource.com/chromiumos/third_party/rust_crates/+/refs/heads/main/cargo-vet/audits.toml?format=TEXT"

[[audits.google.audits.futures]]
who = "George Burgess IV <gbiv@google.com>"
criteria = "safe-to-deploy"
version = "0.3.28"
notes = """
`futures` has no logic other than tests - it simply `pub use`s things from
other crates.
"""
aggregated-from = "https://chromium.googlesource.com/chromiumos/third_party/rust_crates/+/refs/heads/main/cargo-vet/audits.toml?format=TEXT"

[[audits.google.audits.glob]]
who = "George Burgess IV <gbiv@google.com>"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -623,6 +633,12 @@ criteria = "safe-to-deploy"
delta = "1.6.1 -> 1.7.0"
aggregated-from = "https://chromium.googlesource.com/chromium/src/+/main/third_party/rust/chromium_crates_io/supply-chain/audits.toml?format=TEXT"

[[audits.google.audits.tinyvec]]
who = "Dustin J. Mitchell <djmitche@chromium.org>"
criteria = "safe-to-deploy"
delta = "1.7.0 -> 1.8.0"
aggregated-from = "https://chromium.googlesource.com/chromium/src/+/main/third_party/rust/chromium_crates_io/supply-chain/audits.toml?format=TEXT"

[[audits.google.audits.tinyvec_macros]]
who = "George Burgess IV <gbiv@google.com>"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -1047,6 +1063,32 @@ I have no way to check whether these constants are an improvement or not.
"""
aggregated-from = "https://raw.githubusercontent.com/zcash/librustzcash/main/supply-chain/audits.toml"

[[audits.zcash.audits.futures]]
who = "Jack Grigg <jack@electriccoin.co>"
criteria = "safe-to-deploy"
delta = "0.3.28 -> 0.3.30"
notes = "Only sub-crate updates and corresponding changes to tests."
aggregated-from = "https://raw.githubusercontent.com/zcash/librustzcash/main/supply-chain/audits.toml"

[[audits.zcash.audits.h2]]
who = "Jack Grigg <jack@electriccoin.co>"
criteria = "safe-to-deploy"
delta = "0.3.26 -> 0.4.5"
aggregated-from = "https://raw.githubusercontent.com/zcash/librustzcash/main/supply-chain/audits.toml"

[[audits.zcash.audits.hyper-timeout]]
who = "Jack Grigg <jack@electriccoin.co>"
criteria = "safe-to-deploy"
delta = "0.4.1 -> 0.5.1"
notes = "New uses of pin_project! look fine."
aggregated-from = "https://raw.githubusercontent.com/zcash/librustzcash/main/supply-chain/audits.toml"

[[audits.zcash.audits.hyper-util]]
who = "Jack Grigg <jack@electriccoin.co>"
criteria = "safe-to-deploy"
delta = "0.1.5 -> 0.1.6"
aggregated-from = "https://raw.githubusercontent.com/zcash/librustzcash/main/supply-chain/audits.toml"

[[audits.zcash.audits.inout]]
who = "Daira Hopwood <daira@jacaranda.org>"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -1157,6 +1199,18 @@ criteria = "safe-to-deploy"
delta = "2.1.0 -> 2.2.0"
aggregated-from = "https://raw.githubusercontent.com/zcash/zcash/master/qa/supply-chain/audits.toml"

[[audits.zcash.audits.sync_wrapper]]
who = "Jack Grigg <jack@electriccoin.co>"
criteria = "safe-to-deploy"
delta = "0.1.2 -> 1.0.1"
aggregated-from = "https://raw.githubusercontent.com/zcash/librustzcash/main/supply-chain/audits.toml"

[[audits.zcash.audits.thiserror-impl]]
who = "Jack Grigg <jack@electriccoin.co>"
criteria = "safe-to-deploy"
delta = "1.0.61 -> 1.0.63"
aggregated-from = "https://raw.githubusercontent.com/zcash/librustzcash/main/supply-chain/audits.toml"

[[audits.zcash.audits.tinyvec_macros]]
who = "Jack Grigg <jack@z.cash>"
criteria = "safe-to-deploy"
Expand All @@ -1182,6 +1236,12 @@ criteria = "safe-to-deploy"
delta = "0.10.2 -> 0.11.0"
aggregated-from = "https://raw.githubusercontent.com/zcash/librustzcash/main/supply-chain/audits.toml"

[[audits.zcash.audits.tonic-build]]
who = "Jack Grigg <jack@electriccoin.co>"
criteria = "safe-to-deploy"
delta = "0.11.0 -> 0.12.0"
aggregated-from = "https://raw.githubusercontent.com/zcash/librustzcash/main/supply-chain/audits.toml"

[[audits.zcash.audits.wagyu-zcash-parameters]]
who = "Sean Bowe <ewillbefull@gmail.com>"
criteria = "safe-to-deploy"
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,7 +26,7 @@ futures = "0.3.30"
futures-core = "0.3.28"
pin-project = "1.1.5"
rayon = "1.10.0"
tokio = { version = "1.37.0", features = ["time", "sync", "tracing", "macros"] }
tokio = { version = "1.38.1", features = ["time", "sync", "tracing", "macros"] }
tokio-util = "0.7.11"
tower = { version = "0.4.13", features = ["util", "buffer"] }
tracing = "0.1.39"
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.7.0", features = ["rustc_1_55"] }
tinyvec = { version = "1.8.0", features = ["rustc_1_55"] }

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

tokio = { version = "1.37.0", features = ["full", "tracing", "test-util"] }
tokio = { version = "1.38.1", 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
View file
Open in desktop
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.37.0", features = ["full", "tracing", "test-util"] }
tokio = { version = "1.38.1", features = ["full", "tracing", "test-util"] }

zebra-test = { path = "../zebra-test/", version = "1.0.0-beta.38" }
10 changes: 5 additions & 5 deletions zebra-chain/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,13 +108,13 @@ humantime = "2.1.0"

# Error Handling & Formatting
static_assertions = "1.1.0"
thiserror = "1.0.61"
thiserror = "1.0.62"
tracing = "0.1.39"

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

# Processing
Expand All @@ -131,7 +131,7 @@ reddsa = "0.5.1"
serde_json = { version = "1.0.120", optional = true }

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

# Experimental feature shielded-scan
zcash_client_backend = { version = "0.12.1", optional = true }
Expand All @@ -153,7 +153,7 @@ 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.7.0", features = ["rustc_1_55"] }
tinyvec = { version = "1.8.0", features = ["rustc_1_55"] }
spandoc = "0.2.2"
tracing = "0.1.39"

Expand All @@ -164,7 +164,7 @@ proptest-derive = "0.5.0"
rand = "0.8.5"
rand_chacha = "0.3.1"

tokio = { version = "1.37.0", features = ["full", "tracing", "test-util"] }
tokio = { version = "1.38.1", features = ["full", "tracing", "test-util"] }

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

Expand Down
Loading
Loading