Skip to content

merge queue: embarking unstable (7e4b27c) and #6906 together #6908

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

Closed
wants to merge 3 commits into from
Closed

merge queue: embarking unstable (7e4b27c) and #6906 together #6908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7d4d850
update cargo.toml
kevaundray Feb 3, 2025
2b1cda4
update cargo.lock
kevaundray Feb 3, 2025
b3644ab
Merge of #6906
mergify[bot] Feb 4, 2025
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
29 changes: 12 additions & 17 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 1 addition & 8 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,14 +132,7 @@ delay_map = "0.4"
derivative = "2"
dirs = "3"
either = "1.9"
# TODO: rust_eth_kzg is pinned for now while a perf regression is investigated
# The crate_crypto_* dependencies can be removed from this file completely once we update
rust_eth_kzg = "=0.5.1"
crate_crypto_internal_eth_kzg_bls12_381 = "=0.5.1"
crate_crypto_internal_eth_kzg_erasure_codes = "=0.5.1"
crate_crypto_internal_eth_kzg_maybe_rayon = "=0.5.1"
crate_crypto_internal_eth_kzg_polynomial = "=0.5.1"
crate_crypto_kzg_multi_open_fk20 = "=0.5.1"
rust_eth_kzg = "0.5.3"
discv5 = { version = "0.9", features = ["libp2p"] }
env_logger = "0.9"
ethereum_hashing = "0.7.0"
Expand Down
6 changes: 0 additions & 6 deletions crypto/kzg/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,6 @@ edition = "2021"
[dependencies]
arbitrary = { workspace = true }
c-kzg = { workspace = true }
# Required to maintain the pin from https://github.com/sigp/lighthouse/pull/6608
crate_crypto_internal_eth_kzg_bls12_381 = { workspace = true }
crate_crypto_internal_eth_kzg_erasure_codes = { workspace = true }
crate_crypto_internal_eth_kzg_maybe_rayon = { workspace = true }
crate_crypto_internal_eth_kzg_polynomial = { workspace = true }
crate_crypto_kzg_multi_open_fk20 = { workspace = true }
derivative = { workspace = true }
ethereum_hashing = { workspace = true }
ethereum_serde_utils = { workspace = true }
Expand Down