Skip to content

Commit

Permalink
Merge of #8958
Browse files Browse the repository at this point in the history
  • Loading branch information
@mergify
mergify[bot] authored Oct 25, 2024
2 parents 8f887f2 + 0381032 commit 21ca122
Show file tree
Hide file tree
Showing 17 changed files with 393 additions and 198 deletions.
238 changes: 126 additions & 112 deletions Cargo.lock
View file

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions deny.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,9 @@ skip-tree = [
# wait for dirs-sys to update windows-sys
{ name = "windows-sys", version = "=0.48.0" },

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

# 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" },
Expand Down
130 changes: 130 additions & 0 deletions supply-chain/audits.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,11 @@ who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "1.6.1 -> 1.7.1"

[[audits.bytes]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "1.7.2 -> 1.8.0"

[[audits.cfg_aliases]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -108,11 +113,66 @@ criteria = "safe-to-deploy"
delta = "0.1.0 -> 0.1.0@git:1410f1449100a417bfbc4f6c7167aa9808e38792"
importable = false

[[audits.foldhash]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
version = "0.1.3"

[[audits.futures]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.3.30 -> 0.3.31"

[[audits.futures-channel]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.3.30 -> 0.3.31"

[[audits.futures-core]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.3.30 -> 0.3.31"

[[audits.futures-executor]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.3.30 -> 0.3.31"

[[audits.futures-io]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.3.30 -> 0.3.31"

[[audits.futures-macro]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.3.30 -> 0.3.31"

[[audits.futures-sink]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.3.30 -> 0.3.31"

[[audits.futures-task]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.3.30 -> 0.3.31"

[[audits.futures-util]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.3.30 -> 0.3.31"

[[audits.git2]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.18.3 -> 0.19.0"

[[audits.hashbrown]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.14.5 -> 0.15.0"

[[audits.hyper]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
Expand All @@ -123,6 +183,11 @@ who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "1.3.1 -> 1.4.1"

[[audits.hyper]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "1.4.1 -> 1.5.0"

[[audits.hyper-util]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -154,6 +219,11 @@ who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "2.3.0 -> 2.5.0"

[[audits.indexmap]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "2.5.0 -> 2.6.0"

[[audits.inferno]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -194,6 +264,11 @@ who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.22.3 -> 0.23.0"

[[audits.metrics]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.23.0 -> 0.24.0"

[[audits.metrics-exporter-prometheus]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
Expand All @@ -204,11 +279,21 @@ who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.15.1 -> 0.15.3"

[[audits.metrics-exporter-prometheus]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.15.3 -> 0.16.0"

[[audits.metrics-util]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.16.3 -> 0.17.0"

[[audits.metrics-util]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.17.0 -> 0.18.0"

[[audits.mio]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
Expand All @@ -219,6 +304,11 @@ who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
version = "0.15.0"

[[audits.once_cell]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "1.19.0 -> 1.20.2"

[[audits.orchard]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
Expand All @@ -240,6 +330,16 @@ who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "4.0.0 -> 4.1.0"

[[audits.pin-project]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "1.1.5 -> 1.1.6"

[[audits.pin-project-internal]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "1.1.5 -> 1.1.6"

[[audits.proptest-derive]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -321,6 +421,16 @@ criteria = "safe-to-deploy"
delta = "0.3.0 -> 0.2.0@git:b1ad3694ee13a2fc5d291ad04721a6252da0993c"
importable = false

[[audits.serde]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "1.0.210 -> 1.0.211"

[[audits.serde_derive]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "1.0.210 -> 1.0.211"

[[audits.serde_spanned]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
Expand All @@ -336,6 +446,11 @@ who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "3.8.3 -> 3.9.0"

[[audits.serde_with]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "3.9.0 -> 3.11.0"

[[audits.serde_with_macros]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
Expand All @@ -346,6 +461,11 @@ who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "3.8.3 -> 3.9.0"

[[audits.serde_with_macros]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "3.9.0 -> 3.11.0"

[[audits.serde_yml]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
Expand All @@ -367,6 +487,11 @@ criteria = "safe-to-deploy"
delta = "0.5.0 -> 0.4.0@git:ffe4234788fd22662b937ba7c6ea01535fcc1293"
importable = false

[[audits.sketches-ddsketch]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.2.2 -> 0.3.0"

[[audits.tempfile]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -735,6 +860,11 @@ who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "1.0.0-beta.38 -> 1.0.0-beta.39"

[[audits.zebra-test]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "1.0.0-beta.39 -> 1.0.0-beta.40"

[[audits.zebra-utils]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
Expand Down
70 changes: 59 additions & 11 deletions supply-chain/imports.lock
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,58 @@

# cargo-vet imports lock

[[unpublished.tower-batch-control]]
version = "0.2.41-beta.16"
audited_as = "0.2.41-beta.15"

[[unpublished.tower-fallback]]
version = "0.2.41-beta.16"
audited_as = "0.2.41-beta.15"

[[unpublished.zebra-chain]]
version = "1.0.0-beta.40"
audited_as = "1.0.0-beta.39"

[[unpublished.zebra-consensus]]
version = "1.0.0-beta.40"
audited_as = "1.0.0-beta.39"

[[unpublished.zebra-grpc]]
version = "0.1.0-alpha.7"
audited_as = "0.1.0-alpha.6"

[[unpublished.zebra-network]]
version = "1.0.0-beta.40"
audited_as = "1.0.0-beta.39"

[[unpublished.zebra-node-services]]
version = "1.0.0-beta.40"
audited_as = "1.0.0-beta.39"

[[unpublished.zebra-rpc]]
version = "1.0.0-beta.40"
audited_as = "1.0.0-beta.39"

[[unpublished.zebra-scan]]
version = "0.1.0-alpha.8"
version = "0.1.0-alpha.9"
audited_as = "0.1.0-alpha.7"

[[unpublished.zebra-script]]
version = "1.0.0-beta.40"
audited_as = "1.0.0-beta.39"

[[unpublished.zebra-state]]
version = "1.0.0-beta.40"
audited_as = "1.0.0-beta.39"

[[unpublished.zebra-utils]]
version = "1.0.0-beta.40"
audited_as = "1.0.0-beta.39"

[[unpublished.zebrad]]
version = "2.0.0-rc.0"
audited_as = "1.9.0"

[[publisher.cexpr]]
version = "0.6.0"
when = "2021-10-11"
Expand All @@ -13,15 +61,15 @@ user-login = "emilio"
user-name = "Emilio Cobos Álvarez"

[[publisher.clap]]
version = "4.5.18"
when = "2024-09-20"
version = "4.5.20"
when = "2024-10-08"
user-id = 6743
user-login = "epage"
user-name = "Ed Page"

[[publisher.clap_builder]]
version = "4.5.18"
when = "2024-09-20"
version = "4.5.20"
when = "2024-10-08"
user-id = 6743
user-login = "epage"
user-name = "Ed Page"
Expand All @@ -48,8 +96,8 @@ user-login = "hsivonen"
user-name = "Henri Sivonen"

[[publisher.serde_json]]
version = "1.0.128"
when = "2024-09-04"
version = "1.0.132"
when = "2024-10-19"
user-id = 3618
user-login = "dtolnay"
user-name = "David Tolnay"
Expand All @@ -62,15 +110,15 @@ user-login = "dtolnay"
user-name = "David Tolnay"

[[publisher.syn]]
version = "2.0.79"
when = "2024-09-27"
version = "2.0.82"
when = "2024-10-20"
user-id = 3618
user-login = "dtolnay"
user-name = "David Tolnay"

[[publisher.tokio]]
version = "1.40.0"
when = "2024-08-30"
version = "1.41.0"
when = "2024-10-22"
user-id = 6741
user-login = "Darksonn"
user-name = "Alice Ryhl"
Expand Down
8 changes: 4 additions & 4 deletions tower-batch-control/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ keywords = ["tower", "batch"]
categories = ["algorithms", "asynchronous"]

[dependencies]
futures = "0.3.30"
futures = "0.3.31"
futures-core = "0.3.28"
pin-project = "1.1.5"
pin-project = "1.1.6"
rayon = "1.10.0"
tokio = { version = "1.40.0", features = ["time", "sync", "tracing", "macros"] }
tokio = { version = "1.41.0", features = ["time", "sync", "tracing", "macros"] }
tokio-util = "0.7.12"
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.40.0", features = ["full", "tracing", "test-util"] }
tokio = { version = "1.41.0", features = ["full", "tracing", "test-util"] }
tokio-test = "0.4.4"
tower-fallback = { path = "../tower-fallback/", version = "0.2.41-beta.16" }
tower-test = "0.4.0"
Expand Down
4 changes: 2 additions & 2 deletions tower-fallback/Cargo.toml
View file
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.5"
pin-project = "1.1.6"
tower = "0.4.13"
futures-core = "0.3.28"
tracing = "0.1.39"

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

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

0 comments on commit 21ca122

Please sign in to comment.