Fix findings from Dmitry's review (#508)

ethereum · Sep 25, 2024 · cee63f6 · cee63f6
1 parent 445387f
commit cee63f6
Show file tree

Hide file tree

Showing 15 changed files with 303 additions and 142 deletions.
diff --git a/bindings/java/build.gradle b/bindings/java/build.gradle
@@ -2,7 +2,7 @@ plugins {
     id "application"
     id "java-test-fixtures"
     id "me.champeau.jmh" version "0.7.0"
-    id "com.diffplug.spotless" version "6.17.0"
+    id "com.diffplug.spotless" version "6.25.0"
 }
 
 repositories {
@@ -45,4 +45,4 @@ spotless {
 
 test {
     useJUnitPlatform()
-}
+}
diff --git a/bindings/java/src/main/java/ethereum/ckzg4844/CKZG4844JNI.java b/bindings/java/src/main/java/ethereum/ckzg4844/CKZG4844JNI.java
@@ -47,28 +47,40 @@ public static void loadNativeLibrary() {
   public static final BigInteger BLS_MODULUS =
       new BigInteger(
           "52435875175126190479447740508185965837690552500527637822603658699938581184513");
+
   /** The number of bytes in a g1 point. */
   protected static final int BYTES_PER_G1 = 48;
+
   /** The number of bytes in a g2 point. */
   protected static final int BYTES_PER_G2 = 96;
+
   /** The number of bytes in a BLS scalar field element. */
   public static final int BYTES_PER_FIELD_ELEMENT = 32;
+
   /** The number of bits in a BLS scalar field element. */
   protected static final int BITS_PER_FIELD_ELEMENT = 255;
+
   /** The number of field elements in a blob. */
   public static final int FIELD_ELEMENTS_PER_BLOB = 4096;
+
   /** The number of field elements in an extended blob. */
   protected static final int FIELD_ELEMENTS_PER_EXT_BLOB = FIELD_ELEMENTS_PER_BLOB * 2;
+
   /** The number of field elements in a cell. */
   public static final int FIELD_ELEMENTS_PER_CELL = 64;
+
   /** The number of bytes in a KZG commitment. */
   public static final int BYTES_PER_COMMITMENT = 48;
+
   /** The number of bytes in a KZG proof. */
   public static final int BYTES_PER_PROOF = 48;
+
   /** The number of bytes in a blob. */
   public static final int BYTES_PER_BLOB = FIELD_ELEMENTS_PER_BLOB * BYTES_PER_FIELD_ELEMENT;
+
   /** The number of bytes in a single cell. */
   public static final int BYTES_PER_CELL = BYTES_PER_FIELD_ELEMENT * FIELD_ELEMENTS_PER_CELL;
+
   /** The number of cells in an extended blob. */
   public static final int CELLS_PER_EXT_BLOB =
       FIELD_ELEMENTS_PER_EXT_BLOB / FIELD_ELEMENTS_PER_CELL;

diff --git a/bindings/python/README.md b/bindings/python/README.md
@@ -7,7 +7,7 @@ This directory contains Python bindings for the C-KZG-4844 library.
 These bindings require `python3`, `PyYAML` and `make`.
 ```
 sudo apt install python3 python3-pip
-python3 -m pip install PyYAML
+python3 -m pip install build PyYAML
 ```
 
 ## Build & test

diff --git a/bindings/rust/src/bindings/generated.rs b/bindings/rust/src/bindings/generated.rs
diff --git a/src/eip4844/blob.h b/src/eip4844/blob.h
@@ -28,9 +28,6 @@
 /** The number of field elements in a blob. */
 #define FIELD_ELEMENTS_PER_BLOB 4096
 
-/** The number of field elements in an extended blob */
-#define FIELD_ELEMENTS_PER_EXT_BLOB (FIELD_ELEMENTS_PER_BLOB * 2)
-
 /** The number of bytes in a blob. */
 #define BYTES_PER_BLOB (FIELD_ELEMENTS_PER_BLOB * BYTES_PER_FIELD_ELEMENT)
 

diff --git a/src/eip4844/eip4844.c b/src/eip4844/eip4844.c
@@ -25,7 +25,7 @@
 
 #include <assert.h> /* For assert */
 #include <stdlib.h> /* For NULL */
-#include <string.h> /* For memcpy */
+#include <string.h> /* For memcpy & strlen */
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // Macros
@@ -612,6 +612,9 @@ static C_KZG_RET compute_r_powers_for_verify_kzg_proof_batch(
     /* Pointer tracking `bytes` for writing on top of it */
     uint8_t *offset = bytes;
 
+    /* Ensure that the domain string is the correct length */
+    assert(strlen(RANDOM_CHALLENGE_DOMAIN_VERIFY_BLOB_KZG_PROOF_BATCH) == DOMAIN_STR_LENGTH);
+
     /* Copy domain separator */
     memcpy(offset, RANDOM_CHALLENGE_DOMAIN_VERIFY_BLOB_KZG_PROOF_BATCH, DOMAIN_STR_LENGTH);
     offset += DOMAIN_STR_LENGTH;

diff --git a/src/eip7594/cell.c b/src/eip7594/cell.c
@@ -26,7 +26,7 @@
  */
 void print_cell(const Cell *cell) {
     for (size_t i = 0; i < FIELD_ELEMENTS_PER_CELL; i++) {
-        const Bytes32 *field = (const Bytes32 *)&cell->bytes[i * BYTES_PER_FIELD_ELEMENT];
-        print_bytes32(field);
+        const Bytes32 *element_bytes = (const Bytes32 *)&cell->bytes[i * BYTES_PER_FIELD_ELEMENT];
+        print_bytes32(element_bytes);
     }
 }
diff --git a/src/eip7594/cell.h b/src/eip7594/cell.h
@@ -30,6 +30,12 @@
 /** The number of bytes in a single cell. */
 #define BYTES_PER_CELL (FIELD_ELEMENTS_PER_CELL * BYTES_PER_FIELD_ELEMENT)
 
+/** The number of field elements in an extended blob. */
+#define FIELD_ELEMENTS_PER_EXT_BLOB (FIELD_ELEMENTS_PER_BLOB * 2)
+
+/** The number of cells in a blob. */
+#define CELLS_PER_BLOB (FIELD_ELEMENTS_PER_BLOB / FIELD_ELEMENTS_PER_CELL)
+
 /** The number of cells in an extended blob. */
 #define CELLS_PER_EXT_BLOB (FIELD_ELEMENTS_PER_EXT_BLOB / FIELD_ELEMENTS_PER_CELL)