From 87909d4c4392429057a2ab6cf6ef53b75937f5d5 Mon Sep 17 00:00:00 2001 From: clabby Date: Sun, 27 Aug 2023 21:30:19 -0700 Subject: [PATCH] Remove `c-kzg` patch from diff --- Cargo.lock | 24 +++++++++++++++++++++++- Cargo.toml | 3 --- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ae2695c24f3..ad90d96edb3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -709,6 +709,18 @@ dependencies = [ "generic-array", ] +[[package]] +name = "blst" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c94087b935a822949d3291a9989ad2b2051ea141eda0fd4e478a75f6aa3e604b" +dependencies = [ + "cc", + "glob", + "threadpool", + "zeroize", +] + [[package]] name = "boa_ast" version = "0.17.0" @@ -922,9 +934,10 @@ dependencies = [ [[package]] name = "c-kzg" version = "0.1.0" -source = "git+https://github.com/rjected/c-kzg-4844?branch=dan/add-serde-feature#d45a4cf712c1883f42f0ca3bb94aea3b3e7e4880" +source = "git+https://github.com/ethereum/c-kzg-4844#666a9de002035eb7e929bceee3a70dee1b23aa93" dependencies = [ "bindgen 0.64.0 (git+https://github.com/rust-lang/rust-bindgen?rev=0de11f0a521611ac8738b7b01d19dddaf3899e66)", + "blst", "cc", "glob", "hex", @@ -7390,6 +7403,15 @@ dependencies = [ "once_cell", ] +[[package]] +name = "threadpool" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" +dependencies = [ + "num_cpus", +] + [[package]] name = "time" version = "0.3.27" diff --git a/Cargo.toml b/Cargo.toml index 3396bb62e49..f9da92926d0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -155,6 +155,3 @@ c-kzg = { git = "https://github.com/ethereum/c-kzg-4844" } ### misc-testing proptest = "1.0" arbitrary = "1.1" - -[patch."https://github.com/ethereum/c-kzg-4844"] -c-kzg = { git = "https://github.com/rjected/c-kzg-4844", branch = "dan/add-serde-feature" }