chore: move PeerDASContext struct to eip7594 crate and create an opaque context struct for csbindgen

Author: kevaundray

bindings/c/src/lib.rs

@@ -21,36 +21,28 @@ pub use eip7594::constants::{
     BYTES_PER_BLOB, BYTES_PER_CELL, BYTES_PER_COMMITMENT, BYTES_PER_FIELD_ELEMENT,
     CELLS_PER_EXT_BLOB, FIELD_ELEMENTS_PER_BLOB,
 };
-use eip7594::prover::ProverContext as eip7594_ProverContext;
-use eip7594::verifier::{VerifierContext as eip7594_VerifierContext, VerifierError};
+use eip7594::verifier::VerifierError;
 
-// TODO: Add this into eip7594 spec tests
-
-/// The context that will be used to create and verify proofs.
+// This is a wrapper around the PeerDASContext from the eip7594 library.
+// We need to wrap it as some bindgen tools cannot pick up items
+// not defined in this file.
+#[derive(Default)]
 pub struct PeerDASContext {
-    prover_ctx: eip7594_ProverContext,
-    verifier_ctx: eip7594_VerifierContext,
-}
-
-impl Default for PeerDASContext {
-    fn default() -> Self {
-        PeerDASContext {
-            prover_ctx: eip7594_ProverContext::new(),
-            verifier_ctx: eip7594_VerifierContext::new(),
-        }
-    }
+    inner: eip7594::PeerDASContext,
 }
 
 impl PeerDASContext {
-    pub fn prover_ctx(&self) -> &eip7594_ProverContext {
-        &self.prover_ctx
+    pub fn prover_ctx(&self) -> &eip7594::prover::ProverContext {
+        self.inner.prover_ctx()
     }
 
-    pub fn verifier_ctx(&self) -> &eip7594_VerifierContext {
-        &self.verifier_ctx
+    pub fn verifier_ctx(&self) -> &eip7594::verifier::VerifierContext {
+        &self.inner.verifier_ctx
     }
 }
 
+// TODO: Add this into eip7594 spec tests
+
 /// Create a new PeerDASContext and return a pointer to it.
 ///
 /// # Memory faults

bindings/nim/nim_code/src/header.nim

@@ -7,7 +7,6 @@ type CResultStatus* = enum
   Ok
   Err
 
-## The context that will be used to create and verify proofs.
 type PeerDASContext* {.incompleteStruct.} = object
 
 ## A C-style struct to represent the success result of a function call.

eip7594/src/lib.rs

@@ -1,4 +1,6 @@
 use constants::BYTES_PER_COMMITMENT;
+use prover::ProverContext;
+use verifier::VerifierContext;
 
 // TODO: We can remove this once we hook up the consensus-specs fixed test vectors.
 pub mod consensus_specs_fixed_test_vector;
@@ -26,6 +28,31 @@ pub type RowIndex = u64;
 pub type ColumnIndex = u64;
 pub type Bytes48 = [u8; 48];
 
+/// The context that will be used to create and verify proofs.
+pub struct PeerDASContext {
+    pub prover_ctx: ProverContext,
+    pub verifier_ctx: VerifierContext,
+}
+
+impl Default for PeerDASContext {
+    fn default() -> Self {
+        PeerDASContext {
+            prover_ctx: ProverContext::new(),
+            verifier_ctx: VerifierContext::new(),
+        }
+    }
+}
+
+impl PeerDASContext {
+    pub fn prover_ctx(&self) -> &ProverContext {
+        &self.prover_ctx
+    }
+
+    pub fn verifier_ctx(&self) -> &VerifierContext {
+        &self.verifier_ctx
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use kzg_multi_open::polynomial::domain::Domain;