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

Jump to bottom

build(deps): bump the prod group across 1 directory with 13 updates #8640

Closed
wants to merge 7 commits into from
+360 −265
Closed

build(deps): bump the prod group across 1 directory with 13 updates #8640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a518704
Initializes cargo vet in Zebra
arya2 Jun 24, 2024
a93b025
adds audits from zcash/zcashd, google, and mozilla as trusted audits
arya2 Jun 24, 2024
4dee4fe
build(deps): bump the prod group across 1 directory with 13 updates
dependabot[bot] Jun 24, 2024
38437f1
adds some crates/authors as trusted publishers in cargo vet
arya2 Jun 24, 2024
7cbd15c
removes direct dependency on hyper in `zebra-rpc` and uses re-export …
arya2 Jun 24, 2024
22d015f
Updates deny.toml and runs rustfmt
arya2 Jun 24, 2024
6e34fa9
Merge branch 'main' into dependabot/cargo/prod-0f58da088e
arya2 Jun 25, 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
203 changes: 87 additions & 116 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 0 additions & 4 deletions deny.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,6 @@ skip-tree = [
# wait for indexmap, toml_edit, serde_json, tower to upgrade
{ name = "hashbrown", version = "=0.12.3" },

# wait for zcash_script to upgrade
{ name = "metrics", version = "=0.21.1" },

# ECC crates

# wait for hdwallet to upgrade
Expand Down Expand Up @@ -113,7 +110,6 @@ skip-tree = [
{ name = "quick-error", version = "=1.2.3" },

# wait for console-subscriber to update tonic.
{ name = "tonic", version = "=0.10.2" },
{ name = "tonic-build", version = "=0.10.2" },

# Optional dependencies
Expand Down
78 changes: 78 additions & 0 deletions supply-chain/audits.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,81 @@
# cargo-vet audits file

[audits]

[[trusted.clap]]
criteria = "safe-to-deploy"
user-id = 6743 # Ed Page (epage)
start = "2021-12-08"
end = "2025-06-24"

[[trusted.clap_builder]]
criteria = "safe-to-deploy"
user-id = 6743 # Ed Page (epage)
start = "2023-03-28"
end = "2025-06-24"

[[trusted.clap_derive]]
criteria = "safe-to-deploy"
user-id = 6743 # Ed Page (epage)
start = "2021-12-08"
end = "2025-06-24"

[[trusted.console-api]]
criteria = "safe-to-deploy"
user-id = 1249 # Eliza Weisman (hawkw)
start = "2021-12-16"
end = "2025-06-24"

[[trusted.console-subscriber]]
criteria = "safe-to-deploy"
user-id = 1249 # Eliza Weisman (hawkw)
start = "2021-12-16"
end = "2025-06-24"

[[trusted.hyper]]
criteria = "safe-to-deploy"
user-id = 359 # Sean McArthur (seanmonstar)
start = "2019-03-01"
end = "2025-06-24"

[[trusted.lazy_static]]
criteria = "safe-to-deploy"
user-id = 539 # Josh Stone (cuviper)
start = "2024-06-21"
end = "2025-06-24"

[[trusted.regex]]
criteria = "safe-to-deploy"
user-id = 189 # Andrew Gallant (BurntSushi)
start = "2019-02-27"
end = "2025-06-24"

[[trusted.syn]]
criteria = "safe-to-deploy"
user-id = 3618 # David Tolnay (dtolnay)
start = "2019-03-01"
end = "2025-06-24"

[[trusted.tokio]]
criteria = "safe-to-deploy"
user-id = 10 # Carl Lerche (carllerche)
start = "2019-03-02"
end = "2025-06-24"

[[trusted.tokio-macros]]
criteria = "safe-to-deploy"
user-id = 10 # Carl Lerche (carllerche)
start = "2019-04-24"
end = "2025-06-24"

[[trusted.toml]]
criteria = "safe-to-deploy"
user-id = 6743 # Ed Page (epage)
start = "2022-12-14"
end = "2025-06-24"

[[trusted.toml_edit]]
criteria = "safe-to-deploy"
user-id = 6743 # Ed Page (epage)
start = "2021-09-13"
end = "2025-06-24"
Comment on lines +6 to +82
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Except for console-api and console-subscriber (which are for experimental features and rely on setting the tokio_unstable flag), these are trusted in the mozilla audits.toml file.

64 changes: 0 additions & 64 deletions supply-chain/config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,18 +322,6 @@ criteria = "safe-to-deploy"
version = "2.34.0"
criteria = "safe-to-deploy"

[[exemptions.clap]]
version = "4.5.4"
criteria = "safe-to-deploy"

[[exemptions.clap_builder]]
version = "4.5.2"
criteria = "safe-to-deploy"

[[exemptions.clap_derive]]
version = "4.5.4"
criteria = "safe-to-deploy"

[[exemptions.clap_lex]]
version = "0.7.0"
criteria = "safe-to-deploy"
Expand All @@ -354,14 +342,6 @@ criteria = "safe-to-deploy"
version = "0.15.8"
criteria = "safe-to-deploy"

[[exemptions.console-api]]
version = "0.6.0"
criteria = "safe-to-deploy"

[[exemptions.console-subscriber]]
version = "0.2.0"
criteria = "safe-to-deploy"

[[exemptions.const-oid]]
version = "0.9.6"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -710,14 +690,6 @@ criteria = "safe-to-deploy"
version = "1.1.1"
criteria = "safe-to-deploy"

[[exemptions.hyper]]
version = "0.14.28"
criteria = "safe-to-deploy"

[[exemptions.hyper]]
version = "1.3.1"
criteria = "safe-to-deploy"

[[exemptions.hyper-rustls]]
version = "0.24.2"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -1250,10 +1222,6 @@ criteria = "safe-to-deploy"
version = "0.4.5"
criteria = "safe-to-deploy"

[[exemptions.regex]]
version = "1.10.4"
criteria = "safe-to-deploy"

[[exemptions.regex-automata]]
version = "0.1.10"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -1518,14 +1486,6 @@ criteria = "safe-to-deploy"
version = "2.4.1"
criteria = "safe-to-deploy"

[[exemptions.syn]]
version = "1.0.109"
criteria = "safe-to-deploy"

[[exemptions.syn]]
version = "2.0.66"
criteria = "safe-to-deploy"

[[exemptions.sync_wrapper]]
version = "0.1.2"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -1574,18 +1534,10 @@ criteria = "safe-to-deploy"
version = "0.3.36"
criteria = "safe-to-deploy"

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

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

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

[[exemptions.tokio-rustls]]
version = "0.24.1"
criteria = "safe-to-deploy"
Expand All @@ -1602,26 +1554,10 @@ criteria = "safe-to-deploy"
version = "0.7.11"
criteria = "safe-to-deploy"

[[exemptions.toml]]
version = "0.5.11"
criteria = "safe-to-deploy"

[[exemptions.toml]]
version = "0.8.13"
criteria = "safe-to-deploy"

[[exemptions.toml_datetime]]
version = "0.6.6"
criteria = "safe-to-deploy"

[[exemptions.toml_edit]]
version = "0.20.7"
criteria = "safe-to-deploy"

[[exemptions.toml_edit]]
version = "0.22.13"
criteria = "safe-to-deploy"

[[exemptions.tonic]]
version = "0.10.2"
criteria = "safe-to-deploy"
Expand Down
119 changes: 119 additions & 0 deletions supply-chain/imports.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,41 @@ user-id = 3788
user-login = "emilio"
user-name = "Emilio Cobos Álvarez"

[[publisher.clap]]
version = "4.5.7"
when = "2024-06-10"
user-id = 6743
user-login = "epage"
user-name = "Ed Page"

[[publisher.clap_builder]]
version = "4.5.7"
when = "2024-06-10"
user-id = 6743
user-login = "epage"
user-name = "Ed Page"

[[publisher.clap_derive]]
version = "4.5.5"
when = "2024-06-06"
user-id = 6743
user-login = "epage"
user-name = "Ed Page"

[[publisher.console-api]]
version = "0.7.0"
when = "2024-06-10"
user-id = 1249
user-login = "hawkw"
user-name = "Eliza Weisman"

[[publisher.console-subscriber]]
version = "0.3.0"
when = "2024-06-10"
user-id = 1249
user-login = "hawkw"
user-name = "Eliza Weisman"

[[publisher.core-foundation]]
version = "0.9.3"
when = "2022-02-07"
Expand All @@ -22,6 +57,90 @@ user-id = 4484
user-login = "hsivonen"
user-name = "Henri Sivonen"

[[publisher.hyper]]
version = "0.14.29"
when = "2024-06-03"
user-id = 359
user-login = "seanmonstar"
user-name = "Sean McArthur"

[[publisher.hyper]]
version = "1.3.1"
when = "2024-04-16"
user-id = 359
user-login = "seanmonstar"
user-name = "Sean McArthur"

[[publisher.lazy_static]]
version = "1.5.0"
when = "2024-06-21"
user-id = 539
user-login = "cuviper"
user-name = "Josh Stone"

[[publisher.regex]]
version = "1.10.5"
when = "2024-06-09"
user-id = 189
user-login = "BurntSushi"
user-name = "Andrew Gallant"

[[publisher.syn]]
version = "1.0.109"
when = "2023-02-24"
user-id = 3618
user-login = "dtolnay"
user-name = "David Tolnay"

[[publisher.syn]]
version = "2.0.68"
when = "2024-06-23"
user-id = 3618
user-login = "dtolnay"
user-name = "David Tolnay"

[[publisher.tokio]]
version = "1.38.0"
when = "2024-05-30"
user-id = 10
user-login = "carllerche"
user-name = "Carl Lerche"

[[publisher.tokio-macros]]
version = "2.3.0"
when = "2024-05-30"
user-id = 10
user-login = "carllerche"
user-name = "Carl Lerche"

[[publisher.toml]]
version = "0.5.11"
when = "2023-01-20"
user-id = 6743
user-login = "epage"
user-name = "Ed Page"

[[publisher.toml]]
version = "0.8.14"
when = "2024-06-03"
user-id = 6743
user-login = "epage"
user-name = "Ed Page"

[[publisher.toml_edit]]
version = "0.20.7"
when = "2023-10-27"
user-id = 6743
user-login = "epage"
user-name = "Ed Page"

[[publisher.toml_edit]]
version = "0.22.14"
when = "2024-06-03"
user-id = 6743
user-login = "epage"
user-name = "Ed Page"

[[publisher.unicode-normalization]]
version = "0.1.23"
when = "2024-02-20"
Expand Down
4 changes: 2 additions & 2 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.0", 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.6.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.0", features = ["full", "tracing", "test-util"] }
tokio-test = "0.4.4"
tower-fallback = { path = "../tower-fallback/", version = "0.2.41-beta.13" }
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.0", features = ["full", "tracing", "test-util"] }

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