EIP-7594 implementation

.devcontainer/Dockerfile

@@ -0,0 +1,9 @@
+FROM mcr.microsoft.com/devcontainers/rust:1-1-bullseye
+
+RUN apt-get update && \
+  apt-get install -y curl xz-utils gcc openssl ca-certificates git && \
+  curl https://nim-lang.org/choosenim/init.sh -sSf | bash -s -- -y && \
+  apt -y autoremove && \
+  apt -y clean && \
+  rm -r /tmp/*
+ENV PATH=/root/.nimble/bin:$PATH

.devcontainer/devcontainer.json

@@ -0,0 +1,39 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/rust
+{
+	"name": "Rust",
+	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+    "build": {
+        "dockerfile": "Dockerfile"
+    },
+
+	// Use 'mounts' to make the cargo cache persistent in a Docker Volume.
+	// "mounts": [
+	// 	{
+	// 		"source": "devcontainer-cargo-cache-${devcontainerId}",
+	// 		"target": "/usr/local/cargo",
+	// 		"type": "volume"
+	// 	}
+	// ]
+
+	// Features to add to the dev container. More info: https://containers.dev/features.
+	// "features": {},
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	// "postCreateCommand": "rustc --version",
+
+	// Configure tool-specific properties.
+	// "customizations": {
+	// 	"vscode": {
+	// 		"extensions": [
+
+	// 		]
+	// 	}
+	// },
+
+	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+	"remoteUser": "root"
+}

.github/workflows/backend-benchmarks.yml

@@ -1,7 +1,7 @@
 name: benchmarks
 on: [push, pull_request, workflow_dispatch]
 env:
-  C_KZG_4844_GIT_HASH: '1bccee0878ffc80efe8741afdb5793ef9105aa35'
+  C_KZG_4844_GIT_HASH: '0ff9f37000445b28b2f4b17df4efe6140ac121ac'
 
 jobs:
   benchmarks:

.github/workflows/backend-tests.yml

@@ -1,7 +1,7 @@
 name: tests
 on: [push, pull_request, workflow_dispatch]
 env:
-  C_KZG_4844_GIT_HASH: '1bccee0878ffc80efe8741afdb5793ef9105aa35'
+  C_KZG_4844_GIT_HASH: '0ff9f37000445b28b2f4b17df4efe6140ac121ac'
 
 jobs:
   kzg_ci:
@@ -110,6 +110,7 @@ jobs:
           python -m pip install --upgrade pip
           pip install py_ecc
           pip install PyYAML
+          pip install build
       - uses: actions/setup-go@v2
         with:
           go-version: ^1.19

.github/workflows/release.yml

@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
 
 env:
-  C_KZG_4844_GIT_HASH: '1bccee0878ffc80efe8741afdb5793ef9105aa35'
+  C_KZG_4844_GIT_HASH: '0ff9f37000445b28b2f4b17df4efe6140ac121ac'
 
 jobs:
   release-build:

arkworks/benches/eip_4844.rs

@@ -1,8 +1,8 @@
 use criterion::{criterion_group, criterion_main, Criterion};
 use kzg::eip_4844::{
     blob_to_kzg_commitment_rust, bytes_to_blob, compute_blob_kzg_proof_rust,
-    compute_kzg_proof_rust, verify_blob_kzg_proof_batch_rust, verify_blob_kzg_proof_rust,
-    verify_kzg_proof_rust,
+    compute_cells_and_kzg_proofs_rust, compute_kzg_proof_rust, verify_blob_kzg_proof_batch_rust,
+    verify_blob_kzg_proof_rust, verify_kzg_proof_rust,
 };
 use kzg_bench::benches::eip_4844::bench_eip_4844;
 use rust_kzg_arkworks::eip_4844::load_trusted_setup_filename_rust;
@@ -21,6 +21,7 @@ fn bench_eip_4844_(c: &mut Criterion) {
         &compute_blob_kzg_proof_rust,
         &verify_blob_kzg_proof_rust,
         &verify_blob_kzg_proof_batch_rust,
+        &compute_cells_and_kzg_proofs_rust,
     );
 }
 

arkworks/src/eip_4844.rs

@@ -8,9 +8,9 @@
     blob_to_kzg_commitment_rust, compute_blob_kzg_proof_rust, compute_kzg_proof_rust,
     load_trusted_setup_rust, verify_blob_kzg_proof_batch_rust, verify_blob_kzg_proof_rust,
     verify_kzg_proof_rust, Blob, Bytes32, Bytes48, CKZGSettings, KZGCommitment, KZGProof,
-    PrecomputationTableManager, BYTES_PER_FIELD_ELEMENT, BYTES_PER_G1, BYTES_PER_G2, C_KZG_RET,
-    C_KZG_RET_BADARGS, C_KZG_RET_OK, FIELD_ELEMENTS_PER_BLOB, TRUSTED_SETUP_NUM_G1_POINTS,
-    TRUSTED_SETUP_NUM_G2_POINTS,
+    PrecomputationTableManager, BYTES_PER_BLOB, BYTES_PER_FIELD_ELEMENT, BYTES_PER_G1,
+    BYTES_PER_G2, C_KZG_RET, C_KZG_RET_BADARGS, C_KZG_RET_OK, FIELD_ELEMENTS_PER_BLOB,
+    TRUSTED_SETUP_NUM_G1_POINTS, TRUSTED_SETUP_NUM_G2_POINTS,
 };
 use kzg::{cfg_into_iter, Fr, G1};
 use std::ptr::null_mut;
@@ -38,14 +38,14 @@
     file.read_to_string(&mut contents)
         .map_err(|_| "Unable to read file".to_string())?;
 
     let (g1_bytes, g2_bytes) = load_trusted_setup_string(&contents)?;
     load_trusted_setup_rust(g1_bytes.as_slice(), g2_bytes.as_slice())
 }
 
 fn fft_settings_to_rust(c_settings: *const CKZGSettings) -> Result<FFTSettings, String> {
     let settings = unsafe { &*c_settings };
     let roots_of_unity = unsafe {
         core::slice::from_raw_parts(settings.roots_of_unity, settings.max_width as usize)
             .iter()
             .map(|r| ArkFr::from_blst_fr(*r))
             .collect::<Vec<ArkFr>>()
@@ -61,7 +61,7 @@
     first_root = first_root_arr[0];
 
     Ok(FFTSettings {
         max_width: settings.max_width as usize,
         root_of_unity: first_root,
         expanded_roots_of_unity,
         reverse_roots_of_unity,
@@ -423,3 +423,17 @@
     (*y_out).bytes = fry_tmp.to_bytes();
     C_KZG_RET_OK
 }
+
+/// # Safety
+#[no_mangle]
+pub unsafe extern "C" fn compute_cells_and_kzg_proofs(
+    cells: *mut Cell,
+    proofs: *mut KZGProof,
+    blob: *const Blob,
+    s: &CKZGSettings,
+) -> CKZGSettings {
+    // Check for null pointers
+    if cells.is_null() || proofs.is_null() || blob.is_null() || s.is_null() {
+        return C_KZG_RET_BADARGS;
+    }
+}

blst/csharp.patch

@@ -1,25 +1,25 @@
-From 86aa67b0e3775514cc484ddd2adf6b5dc6e26803 Mon Sep 17 00:00:00 2001
+From f9014c924b5dc0083f0aabaf91fcd38be6518b8e Mon Sep 17 00:00:00 2001
 From: sirse <[email protected]>
-Date: Thu, 26 Oct 2023 13:40:30 +0300
-Subject: [PATCH] Patch csharp binding
+Date: Wed, 2 Oct 2024 07:33:45 +0000
+Subject: [PATCH] Patch C# binding
 
 ---
  bindings/csharp/Makefile | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/bindings/csharp/Makefile b/bindings/csharp/Makefile
-index 5158aad..af3b2a8 100644
+index df1730c..6b5bc2f 100644
 --- a/bindings/csharp/Makefile
 +++ b/bindings/csharp/Makefile
 @@ -39,7 +39,7 @@ else
  endif
 
  INCLUDE_DIRS = ../../src ../../blst/bindings
--TARGETS = ckzg.c ../../src/c_kzg_4844.c ../../blst/$(BLST_OBJ)
-+TARGETS = ckzg.c ../../../../target/release/rust_kzg_blst.a
+-TARGETS = ckzg_wrap.c ../../src/ckzg.c ../../blst/$(BLST_OBJ)
++TARGETS = ckzg_wrap.c ../../../../target/release/rust_kzg_blst.a
 
  CFLAGS += -O2 -Wall -Wextra -shared
  CFLAGS += ${addprefix -I,${INCLUDE_DIRS}}
 -- 
-2.34.1
+2.46.1
 

blst/go.patch

@@ -1,21 +1,21 @@
-From d0e5b619807c0b9e936ce178b2a8e019da020a14 Mon Sep 17 00:00:00 2001
+From 6de1858704912a5f3d7da23b7f630c821c9cf506 Mon Sep 17 00:00:00 2001
 From: sirse <[email protected]>
-Date: Thu, 16 May 2024 13:26:25 +0300
-Subject: [PATCH] Patch go bindings
+Date: Wed, 2 Oct 2024 07:45:45 +0000
+Subject: [PATCH] Patch Go binding
 
 ---
  bindings/go/main.go | 13 +++++++++----
  1 file changed, 9 insertions(+), 4 deletions(-)
 
 diff --git a/bindings/go/main.go b/bindings/go/main.go
-index bf344a1..4f1c0f4 100644
+index c912d09..edcc96f 100644
 --- a/bindings/go/main.go
 +++ b/bindings/go/main.go
 @@ -2,7 +2,15 @@ package ckzg4844
 
  // #cgo CFLAGS: -I${SRCDIR}/../../src
  // #cgo CFLAGS: -I${SRCDIR}/blst_headers
--// #include "c_kzg_4844.c"
+-// #include "ckzg.c"
 +// #ifndef BYTES_PER_G1
 +// #define BYTES_PER_G1 48
 +// #endif
@@ -39,5 +39,5 @@ index bf344a1..4f1c0f4 100644
 
  const (
 -- 
-2.36.2.windows.1
+2.46.1
 

blst/java.patch

@@ -1,24 +1,24 @@
-From b1f8f612f8c1bda0b4ea58e01e9a60235a88cc83 Mon Sep 17 00:00:00 2001
-From: povilassl <slivinskas.povilas@gmail.com>
-Date: Sun, 24 Sep 2023 18:01:51 +0300
-Subject: [PATCH] java patch
+From fb604e554db3670493b1c1863022bbcd6634a9d2 Mon Sep 17 00:00:00 2001
+From: sirse <artiom.tretjakovas2@gmail.com>
+Date: Wed, 2 Oct 2024 07:39:28 +0000
+Subject: [PATCH] Patch Java bindings
 
 ---
  bindings/java/Makefile | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/bindings/java/Makefile b/bindings/java/Makefile
-index 9be2fd6..1e59378 100644
+index 3f646ef..4be49ba 100644
 --- a/bindings/java/Makefile
 +++ b/bindings/java/Makefile
 @@ -1,6 +1,6 @@
  INCLUDE_DIRS = ../../src ../../blst/bindings
 
--TARGETS=c_kzg_4844_jni.c ../../src/c_kzg_4844.c ../../lib/libblst.a
-+TARGETS=c_kzg_4844_jni.c ../../../../target/release/rust_kzg_blst.a
+-TARGETS=ckzg_jni.c ../../src/ckzg.c ../../lib/libblst.a
++TARGETS=ckzg_jni.c ../../../../target/release/rust_kzg_blst.a
 
  CC_FLAGS=
  OPTIMIZATION_LEVEL=-O2
 -- 
-2.37.0.windows.1
+2.46.1
 

blst/nim.patch

@@ -1,14 +1,14 @@
-From 118b0f6c3f9bd5e7335129eea28c713b8b2856dd Mon Sep 17 00:00:00 2001
+From ae2200466c384f478ac25a26b8612c25eab484b9 Mon Sep 17 00:00:00 2001
 From: sirse <[email protected]>
-Date: Thu, 16 May 2024 13:29:29 +0300
-Subject: [PATCH] Patch nim bindings
+Date: Wed, 2 Oct 2024 07:47:54 +0000
+Subject: [PATCH] Patch Nim binding
 
 ---
  bindings/nim/kzg_abi.nim | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/bindings/nim/kzg_abi.nim b/bindings/nim/kzg_abi.nim
-index 9162588..529e09a 100644
+index 0570efd..59e678e 100644
 --- a/bindings/nim/kzg_abi.nim
 +++ b/bindings/nim/kzg_abi.nim
 @@ -10,6 +10,7 @@ from os import DirSep, AltSep
@@ -23,13 +23,13 @@ index 9162588..529e09a 100644
    {.compile: blstPath & "src/server.c"}
    {.passc: "-D__BLST_PORTABLE__"}
 
--{.compile: srcPath & "c_kzg_4844.c"}
-+{.passl: "-L" & rustKzgPath & "target/release" .}
-+{.passl: "-l:rust_kzg_blst.a" .}
-+{.passl: "-lm" .}
+-{.compile: srcPath & "ckzg.c"}
+++{.passl: "-L" & rustKzgPath & "target/release" .}
+++{.passl: "-l:rust_kzg_blst.a" .}
+++{.passl: "-lm" .}
 
  {.passc: "-I" & escape(bindingsPath) .}
  {.passc: "-I" & escape(srcPath) .}
 -- 
-2.36.2.windows.1
+2.46.1
 

blst/nodejs.patch

@@ -1,34 +1,37 @@
-From cb0c44c9df8a7a6a92ed5b4f1acb771532812257 Mon Sep 17 00:00:00 2001
+From 43ef934fbf7d904b3014d9a37a37dc2d853f27b0 Mon Sep 17 00:00:00 2001
 From: sirse <[email protected]>
-Date: Thu, 16 May 2024 14:19:08 +0300
-Subject: [PATCH] Patch nodejs bindings
+Date: Wed, 2 Oct 2024 07:43:11 +0000
+Subject: [PATCH] Patch node.js bindings
 
 ---
  bindings/node.js/binding.gyp | 9 ++++-----
  1 file changed, 4 insertions(+), 5 deletions(-)
 
 diff --git a/bindings/node.js/binding.gyp b/bindings/node.js/binding.gyp
-index c42bb8f..e781e61 100644
+index d01e38b..1591b8e 100644
 --- a/bindings/node.js/binding.gyp
 +++ b/bindings/node.js/binding.gyp
-@@ -3,9 +3,7 @@
+@@ -3,22 +3,22 @@
      {
        "target_name": "kzg",
        "sources": [
 -        "src/kzg.cxx",
 -        "deps/blst/src/server.c",
--        "deps/c-kzg/c_kzg_4844.c"
+-        "deps/c-kzg/ckzg.c"
 +        "src/kzg.cxx"
        ],
        "include_dirs": [
          "<(module_root_dir)/deps/blst/bindings",
-@@ -16,9 +14,11 @@
-         "__BLST_PORTABLE__",
-         "NAPI_CPP_EXCEPTIONS"
+         "<(module_root_dir)/deps/c-kzg",
+         "<!@(node -p \"require('node-addon-api').include\")"
        ],
 +      "libraries": [
 +        "<(module_root_dir)/../../../../target/release/rust_kzg_blst.a"
 +      ],
+       "defines": [
+         "__BLST_PORTABLE__",
+         "NAPI_CPP_EXCEPTIONS"
+       ],
        "conditions": [
          ["OS!='win'", {
 -          "sources": ["deps/blst/build/assembly.S"],
@@ -44,5 +47,5 @@ index c42bb8f..e781e61 100644
              "_CRT_SECURE_NO_WARNINGS",
              "_HAS_EXCEPTIONS=1"
 -- 
-2.36.2.windows.1
+2.46.1
 

blst/python.patch

@@ -1,22 +1,22 @@
-From 57a93a8db7319a368a25d470aa074e3af5ecb4b6 Mon Sep 17 00:00:00 2001
+From 8bc31450ffa85ef911550cf35115e89e6ca7b630 Mon Sep 17 00:00:00 2001
 From: sirse <[email protected]>
-Date: Thu, 16 May 2024 12:56:53 +0300
+Date: Wed, 2 Oct 2024 06:58:36 +0000
 Subject: [PATCH] Patch python bindings
 
 ---
  setup.py | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index 42d4c36..f982863 100644
+index d16c833..e504d12 100644
 --- a/setup.py
 +++ b/setup.py
 @@ -35,10 +35,10 @@ def main():
          ext_modules=[
              Extension(
                  "ckzg",
--                sources=["bindings/python/ckzg.c", "src/c_kzg_4844.c"],
-+                sources=["bindings/python/ckzg.c"],
+-                sources=["bindings/python/ckzg_wrap.c", "src/ckzg.c"],
++                sources=["bindings/python/ckzg_wrap.c"],
                  include_dirs=["inc", "src"],
 -                library_dirs=["lib"],
 -                libraries=["blst"]
@@ -26,5 +26,5 @@ index 42d4c36..f982863 100644
          ],
          cmdclass={
 -- 
-2.36.2.windows.1
+2.46.1