refactor: move IpaProof into verkle-core

portal-bridge/src/types/beacon.rs

@@ -3,24 +3,24 @@ use serde::{Deserialize, Serialize};
 
 use crate::types::witness::ExecutionWitness;
 
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct SignedBeaconBlock {
     pub message: BeaconBlock,
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct BeaconBlock {
     pub parent_root: B256,
     pub state_root: B256,
     pub body: BeaconBlockBody,
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct BeaconBlockBody {
     pub execution_payload: ExecutionPayload,
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct ExecutionPayload {
     pub block_number: U64,
     pub block_hash: B256,

portal-bridge/src/types/mod.rs

@@ -6,7 +6,7 @@ pub mod beacon;
 pub mod genesis;
 pub mod witness;
 
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct JsonResponseMessage {
     pub data: SignedBeaconBlock,
 }

portal-bridge/src/types/witness.rs

@@ -1,9 +1,9 @@
 use alloy_primitives::{Bytes, U8};
 use serde::{Deserialize, Serialize};
 use serde_nested_with::serde_nested;
-use verkle_core::{constants::VERKLE_NODE_WIDTH_BITS, Point, ScalarField, Stem, TrieValue};
+use verkle_core::{proof::IpaProof, Point, Stem, TrieValue};
 
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(deny_unknown_fields)]
 pub struct ExecutionWitness {
     #[serde(alias = "stateDiff")]
@@ -12,15 +12,15 @@ pub struct ExecutionWitness {
     pub verkle_proof: VerkleProof,
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(deny_unknown_fields)]
 pub struct StemStateDiff {
     pub stem: Stem,
     #[serde(alias = "suffixDiffs")]
     pub suffix_diffs: Vec<SuffixStateDiff>,
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(deny_unknown_fields)]
 pub struct SuffixStateDiff {
     pub suffix: U8,
@@ -31,7 +31,7 @@ pub struct SuffixStateDiff {
 }
 
 #[serde_nested]
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(deny_unknown_fields)]
 pub struct VerkleProof {
     #[serde(alias = "otherStems")]
@@ -44,13 +44,3 @@ pub struct VerkleProof {
     #[serde(alias = "ipaProof")]
     pub ipa_proof: IpaProof,
 }
-
-#[serde_nested]
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct IpaProof {
-    pub cl: [Point; VERKLE_NODE_WIDTH_BITS],
-    pub cr: [Point; VERKLE_NODE_WIDTH_BITS],
-    #[serde(alias = "finalEvaluation")]
-    pub final_evaluation: ScalarField,
-}

verkle-core/src/lib.rs

@@ -6,6 +6,7 @@ pub mod constants;
 
 mod ec;
 pub mod msm;
+pub mod proof;
 mod stem;
 pub mod storage;
 mod trie_key;

verkle-core/src/proof/mod.rs

@@ -0,0 +1,25 @@
+use serde::{Deserialize, Serialize};
+use ssz_derive::{Decode, Encode};
+use ssz_types::{typenum, FixedVector};
+
+use crate::{Point, ScalarField};
+
+/// The multi-point proof based on IPA.
+#[derive(Debug, Clone, Serialize, Deserialize, Encode, Decode)]
+#[serde(deny_unknown_fields)]
+pub struct MultiPointProof {
+    #[serde(alias = "ipaProof")]
+    pub ipa_proof: IpaProof,
+    #[serde(alias = "gX")]
+    pub g_x: Point,
+}
+
+/// The inner product argument proof.
+#[derive(Debug, Clone, Serialize, Deserialize, Encode, Decode)]
+#[serde(deny_unknown_fields)]
+pub struct IpaProof {
+    pub cl: FixedVector<Point, typenum::U8>,
+    pub cr: FixedVector<Point, typenum::U8>,
+    #[serde(alias = "finalEvaluation")]
+    pub final_evaluation: ScalarField,
+}