Skip to content

Commit 435a93c

Browse files
authored
Merge branch 'unstable' into eager-send-attestation
2 parents 7b7ab09 + f584521 commit 435a93c

File tree

58 files changed

+1154
-1623
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+1154
-1623
lines changed

Cargo.lock

Lines changed: 106 additions & 322 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ serde = { version = "1", features = ["derive"] }
225225
serde_json = "1"
226226
serde_repr = "0.1"
227227
serde_yaml = "0.9"
228-
sha2 = "0.9"
228+
sha2 = "0.10"
229229
signing_method = { path = "validator_client/signing_method" }
230230
slasher = { path = "slasher", default-features = false }
231231
slashing_protection = { path = "validator_client/slashing_protection" }
@@ -276,7 +276,7 @@ warp_utils = { path = "common/warp_utils" }
276276
workspace_members = { path = "common/workspace_members" }
277277
xdelta3 = { git = "https://github.com/sigp/xdelta3-rs", rev = "4db64086bb02e9febb584ba93b9d16bb2ae3825a" }
278278
zeroize = { version = "1", features = ["zeroize_derive", "serde"] }
279-
zip = "0.6"
279+
zip = { version = "6.0", default-features = false, features = ["deflate"] }
280280
zstd = "0.13"
281281

282282
[profile.maxperf]

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ install-deny:
333333
cargo install --force cargo-deny --version 0.18.2
334334

335335
deny-CI:
336-
cargo deny check bans sources --hide-inclusion-graph
336+
cargo deny check bans sources
337337

338338
# Runs `cargo vendor` to make sure dependencies can be vendored for packaging, reproducibility and archival purpose.
339339
vendor:

0 commit comments

Comments
 (0)