Cargo update without rust_eth_kzg (#6848)

Update cargo dependencies while keeping `rust_eth_kzg` pinned to `0.5.1` due to the regression described in:

- https://github.com/sigp/lighthouse/pull/6608

The changes from that PR were not sufficient to actually pin the dependencies of `rust_eth_kzg`, because the dependencies from the workspace Cargo.toml file were not being used anywhere. To fix this, I've added them as explicit dependencies in `crypto/kzg/Cargo.toml`. With this change, `cargo update` no longer tries to update them.
This commit is contained in:
Michael Sproul
2025-01-30 19:02:04 +11:00
committed by GitHub
parent 70194dfc6a
commit d47b3e3e43
5 changed files with 377 additions and 365 deletions

730
Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@@ -1,4 +1,4 @@
FROM rust:1.80.0-bullseye AS builder
FROM rust:1.84.0-bullseye AS builder
RUN apt-get update && apt-get -y upgrade && apt-get install -y cmake libclang-dev
COPY . lighthouse
ARG FEATURES

View File

@@ -8,6 +8,12 @@ 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 }

View File

@@ -1,7 +1,7 @@
# `lcli` requires the full project to be in scope, so this should be built either:
# - from the `lighthouse` dir with the command: `docker build -f ./lcli/Dockerflie .`
# - from the current directory with the command: `docker build -f ./Dockerfile ../`
FROM rust:1.80.0-bullseye AS builder
FROM rust:1.84.0-bullseye AS builder
RUN apt-get update && apt-get -y upgrade && apt-get install -y cmake libclang-dev
COPY . lighthouse
ARG FEATURES

View File

@@ -4,7 +4,7 @@ version = "6.0.1"
authors = ["Sigma Prime <contact@sigmaprime.io>"]
edition = { workspace = true }
autotests = false
rust-version = "1.80.0"
rust-version = "1.82.0"
[features]
default = ["slasher-lmdb", "beacon-node-leveldb"]