From c0177687e1630332c736e952aab656fd01776310 Mon Sep 17 00:00:00 2001 From: Pawan Dhananjay Date: Wed, 10 Apr 2024 16:25:14 -0700 Subject: [PATCH] Bump ckzg to use the crates.io version (#5542) * Bump ckzg to use the crates.io version * Update crypto/kzg/Cargo.toml --- Cargo.lock | 64 ++++--------------------------------------- Cargo.toml | 1 + crypto/kzg/Cargo.toml | 2 +- 3 files changed, 7 insertions(+), 60 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e37e3903dbd..0452fa0e8c7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -877,29 +877,6 @@ dependencies = [ "shlex", ] -[[package]] -name = "bindgen" -version = "0.66.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2b84e06fc203107bfbad243f4aba2af864eb7db3b1cf46ea0a023b0b433d2a7" -dependencies = [ - "bitflags 2.4.2", - "cexpr", - "clang-sys", - "lazy_static", - "lazycell", - "log", - "peeking_take_while", - "prettyplease", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "syn 2.0.52", - "which", -] - [[package]] name = "bit-set" version = "0.5.3" @@ -1126,10 +1103,10 @@ dependencies = [ [[package]] name = "c-kzg" -version = "0.1.0" -source = "git+https://github.com/ethereum/c-kzg-4844?rev=748283cced543c486145d5f3f38684becdfe3e1b#748283cced543c486145d5f3f38684becdfe3e1b" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3130f3d8717cc02e668a896af24984d5d5d4e8bf12e278e982e0f1bd88a0f9af" dependencies = [ - "bindgen 0.66.1", "blst", "cc", "glob", @@ -3614,15 +3591,6 @@ dependencies = [ "hmac 0.8.1", ] -[[package]] -name = "home" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" -dependencies = [ - "windows-sys 0.52.0", -] - [[package]] name = "hostname" version = "0.3.1" @@ -3793,7 +3761,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.10", + "socket2 0.5.6", "tokio", "tower-service", "tracing", @@ -5166,7 +5134,7 @@ name = "mdbx-sys" version = "0.11.6-4" source = "git+https://github.com/sigp/libmdbx-rs?tag=v0.1.4#096da80a83d14343f8df833006483f48075cd135" dependencies = [ - "bindgen 0.59.2", + "bindgen", "cc", "cmake", "libc", @@ -6250,16 +6218,6 @@ dependencies = [ "sensitive_url", ] -[[package]] -name = "prettyplease" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a41cf62165e97c7f814d2221421dbb9afcbcdb0a88068e5ea206e19951c2cbb5" -dependencies = [ - "proc-macro2", - "syn 2.0.52", -] - [[package]] name = "primeorder" version = "0.13.6" @@ -9267,18 +9225,6 @@ version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" -[[package]] -name = "which" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" -dependencies = [ - "either", - "home", - "once_cell", - "rustix 0.38.31", -] - [[package]] name = "whoami" version = "1.5.0" diff --git a/Cargo.toml b/Cargo.toml index 38018c712d5..24775b728de 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -102,6 +102,7 @@ bincode = "1" bitvec = "1" byteorder = "1" bytes = "1" +c-kzg = "1" clap = "2" compare_fields_derive = { path = "common/compare_fields_derive" } criterion = "0.3" diff --git a/crypto/kzg/Cargo.toml b/crypto/kzg/Cargo.toml index 7b70166f921..d26dfe4992a 100644 --- a/crypto/kzg/Cargo.toml +++ b/crypto/kzg/Cargo.toml @@ -16,4 +16,4 @@ serde = { workspace = true } ethereum_serde_utils = { workspace = true } hex = { workspace = true } ethereum_hashing = { workspace = true } -c-kzg = { git = "https://github.com/ethereum/c-kzg-4844", rev = "748283cced543c486145d5f3f38684becdfe3e1b"} \ No newline at end of file +c-kzg = { workspace = true }