refactor after rebase

Signed-off-by: Danil <[email protected]>

Author: Deniallugo

core/Cargo.lock

@@ -32,7 +32,7 @@ rlp.workspace = true
 anyhow.workspace = true
 serde_json.workspace = true
 tokio.workspace = true
-c-kzg.workspace = true
+c-kzg = { workspace = true, features = ["ethereum_kzg_settings"] }
 
 [dev-dependencies]
 assert_matches.workspace = true

core/lib/eth_client/Cargo.toml

@@ -501,7 +501,6 @@ mod tests {
                     commitment,
                     proof,
                     versioned_hash,
-                    cell_proofs: None,
                 }],
             }),
         );
@@ -609,14 +608,12 @@ mod tests {
                         commitment: commitment_1,
                         proof: proof_1,
                         versioned_hash: versioned_hash_1.to_fixed_bytes().to_vec(),
-                        cell_proofs: None,
                     },
                     SidecarBlobV1 {
                         blob: blob_2,
                         commitment: commitment_2,
                         proof: proof_2,
                         versioned_hash: versioned_hash_2.to_fixed_bytes().to_vec(),
-                        cell_proofs: None,
                     },
                 ],
             }),

core/lib/eth_client/src/types.rs

@@ -37,8 +37,6 @@ pub struct SidecarBlobV1 {
     pub commitment: Vec<u8>,
     /// Blob proof
     pub proof: Vec<u8>,
-    /// Cell proofs
-    pub cell_proofs: Option<Vec<Vec<u8>>>,
     /// Blob commitment versioned hash
     pub versioned_hash: Vec<u8>,
 }
@@ -63,7 +61,7 @@ pub struct EthTxBlobSidecarV1 {
     pub blobs: Vec<SidecarBlobV1>,
 }
 
-/// A first version of sidecars for blob transactions as they are described in EIP4844.
+/// Second version of sidecars for blob transactions as they are described in EIP7594.
 #[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
 pub struct EthTxBlobSidecarV2 {
     /// A vector of blobs for this tx and their commitments and proofs.

core/lib/types/src/eth_sender.rs

@@ -34,7 +34,6 @@ async-trait.workspace = true
 chrono.workspace = true
 thiserror.workspace = true
 tracing.workspace = true
-c-kzg = { workspace = true, features = ["ethereum_kzg_settings"] }
 
 [dev-dependencies]
 test-casing.workspace = true

core/node/eth_sender/Cargo.toml

@@ -1087,7 +1087,6 @@ impl EthTxAggregator {
                             commitment: kzg_info.kzg_commitment.to_vec(),
                             proof: kzg_info.blob_proof.to_vec(),
                             versioned_hash: kzg_info.versioned_hash.to_vec(),
-                            cell_proofs: None,
                         }
                     })
                     .collect::<Vec<SidecarBlobV1>>();
@@ -1097,7 +1096,7 @@ impl EthTxAggregator {
                         blobs: sidecar
                             .into_iter()
                             .map(|sidecar_blob| {
-                                convert_eip4844_sidecar_to_eip7594_sidecar(sidecar_blob).into()
+                                convert_eip4844_sidecar_to_eip7594_sidecar(sidecar_blob)
                             })
                             .collect(),
                     }