Refactor sidecars

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

Author: Deniallugo

core/Cargo.lock

@@ -33,7 +33,6 @@ anyhow.workspace = true
 serde_json.workspace = true
 tokio.workspace = true
 c-kzg.workspace = true
-once_cell = "1.21.3"
 
 [dev-dependencies]
 assert_matches.workspace = true

core/lib/eth_client/Cargo.toml

@@ -264,12 +264,8 @@ impl<S: EthereumSigner, Net: Network> SigningClient<S, Net> {
         };
 
         let mut signed_tx = self.inner.eth_signer.sign_transaction(tx).await?;
-        if let Some(sidecar) = options.blob_tx_sidecar {
-            signed_tx = encode_blob_tx_with_sidecar(
-                &signed_tx,
-                sidecar,
-                options.support_eip7594.unwrap_or_default(),
-            );
+        if let Some(sidecar) = &options.blob_tx_sidecar {
+            signed_tx = encode_blob_tx_with_sidecar(&signed_tx, sidecar);
         }
         let hash = web3::keccak256(&signed_tx).into();
         Ok((signed_tx, hash))

core/lib/eth_client/src/clients/http/signing.rs

@@ -18,8 +18,9 @@ pub use zksync_web3_decl::{
 };
 
 pub use crate::types::{
-    encode_blob_tx_with_sidecar, CallFunctionArgs, ContractCall, ContractCallError,
-    ExecutedTxStatus, FailureInfo, RawTransactionBytes, SignedCallResult, SigningError,
+    convert_eip4844_sidecar_to_eip7594_sidecar, encode_blob_tx_with_sidecar, CallFunctionArgs,
+    ContractCall, ContractCallError, ExecutedTxStatus, FailureInfo, RawTransactionBytes,
+    SignedCallResult, SigningError,
 };
 
 pub mod clients;
@@ -62,8 +63,6 @@ pub struct Options {
     pub factory_deps: Option<Vec<Vec<u8>>>,
     // Paymaster params
     pub paymaster_params: Option<PaymasterParams>,
-    // support eip7594 upgrade
-    pub support_eip7594: Option<bool>,
 }
 
 impl Options {

core/lib/eth_client/src/lib.rs

@@ -1,6 +1,6 @@
 use rlp::RlpStream;
 use zksync_types::{
-    eth_sender::{EthTxBlobSidecar, EthTxBlobSidecarV2, SidecarBlobV1, SidecarBlobV2},
+    eth_sender::{EthTxBlobSidecar, SidecarBlobV1, SidecarBlobV2},
     ethabi, web3,
     web3::{
         contract::{Detokenize, Tokenize},
@@ -283,30 +283,8 @@ impl SignedCallResult {
 
 // Encodes the blob transaction and the blob sidecar into the networking
 // format as defined in <https://eips.ethereum.org/EIPS/eip-4844#networking>
-pub fn encode_blob_tx_with_sidecar(
-    raw_tx: &[u8],
-    sidecar: EthTxBlobSidecar,
-    eip7594_upgrade_support: bool,
-) -> Vec<u8> {
-    let sidecar = match (&sidecar, eip7594_upgrade_support) {
-        (EthTxBlobSidecar::EthTxBlobSidecarV2(_), true) => sidecar,
-        (EthTxBlobSidecar::EthTxBlobSidecarV1(_), false) => sidecar,
-        (EthTxBlobSidecar::EthTxBlobSidecarV1(data), true) => {
-            let eip7594_blobs: Vec<SidecarBlobV2> = data
-                .blobs
-                .iter()
-                .map(|blob| convert_eip4844_blobs_to_eip7594_blobs(blob.clone()))
-                .collect();
-            EthTxBlobSidecar::EthTxBlobSidecarV2(EthTxBlobSidecarV2 {
-                blobs: eip7594_blobs,
-            })
-        }
-        (EthTxBlobSidecar::EthTxBlobSidecarV2(_), false) => {
-            panic!("EIP-7594 sidecars are not supported when eip7594 upgrade support is disabled");
-        }
-    };
-
-        let mut stream_outer = RlpStream::new();
+pub fn encode_blob_tx_with_sidecar(raw_tx: &[u8], sidecar: &EthTxBlobSidecar) -> Vec<u8> {
+    let mut stream_outer = RlpStream::new();
 
     match sidecar {
         EthTxBlobSidecar::EthTxBlobSidecarV1(sidecar) => {
@@ -381,37 +359,6 @@ pub fn encode_blob_tx_with_sidecar(
         }
     }
 
-        stream_outer
-    } else {
-        // rlp([tx_payload_body, wrapper_version, blobs, commitments, cell_proofs])
-        let blobs_count = sidecar.blobs.len();
-
-        let mut stream_outer = RlpStream::new();
-        stream_outer.begin_list(5);
-
-        stream_outer.append_raw(&raw_tx[1..], 1);
-        let wrapper_version = 1u8;
-        stream_outer.append_raw(&[wrapper_version], 1);
-
-        let mut blob_stream = RlpStream::new_list(blobs_count);
-        let mut commitment_stream = RlpStream::new_list(blobs_count);
-        let mut cell_proof_stream = RlpStream::new_list(128 * blobs_count);
-
-        for i in 0..blobs_count {
-            blob_stream.append(&sidecar.blobs[i].blob);
-            commitment_stream.append(&sidecar.blobs[i].commitment);
-            for cell_proof in sidecar.blobs[i].cell_proofs.as_ref().unwrap() {
-                cell_proof_stream.append(cell_proof);
-            }
-        }
-
-        stream_outer.append_raw(&blob_stream.out(), 1);
-        stream_outer.append_raw(&commitment_stream.out(), 1);
-        stream_outer.append_raw(&cell_proof_stream.out(), 1);
-
-        stream_outer
-    };
-
     let tx = [&[EIP_4844_TX_TYPE], stream_outer.as_raw()].concat();
 
     tx
@@ -448,11 +395,13 @@ pub struct FailureInfo {
     pub gas_limit: U256,
 }
 
-fn convert_eip4844_blobs_to_eip7594_blobs(sidecar: SidecarBlobV1) -> SidecarBlobV2 {
+/// Convert eip4844 proofs to cell proofs as required by eip7594
+pub fn convert_eip4844_sidecar_to_eip7594_sidecar(sidecar: SidecarBlobV1) -> SidecarBlobV2 {
     let mut cell_proofs = Vec::new();
 
     let blob_kzg = c_kzg::Blob::from_bytes(&sidecar.blob).unwrap();
 
+    // KZG settings are cached, it's cheap to get them multiple times.
     let kzg_settings = c_kzg::ethereum_kzg_settings_arc(0);
     // Compute cells and their KZG proofs for this blob
     let (_cells, kzg_proofs) = kzg_settings
@@ -462,10 +411,10 @@ fn convert_eip4844_blobs_to_eip7594_blobs(sidecar: SidecarBlobV1) -> SidecarBlob
     for kzg_proof in kzg_proofs.iter() {
         cell_proofs.push(kzg_proof.to_bytes().into_inner().to_vec());
     }
+
     SidecarBlobV2 {
         blob: sidecar.blob,
         commitment: sidecar.commitment,
-        proof: sidecar.proof,
         versioned_hash: sidecar.versioned_hash,
         cell_proofs,
     }
@@ -546,7 +495,7 @@ mod tests {
         let expected_str = expected_str.trim();
         let raw_tx = encode_blob_tx_with_sidecar(
             &raw_tx,
-            EthTxBlobSidecar::EthTxBlobSidecarV1(EthTxBlobSidecarV1 {
+            &EthTxBlobSidecar::EthTxBlobSidecarV1(EthTxBlobSidecarV1 {
                 blobs: vec![SidecarBlobV1 {
                     blob,
                     commitment,
@@ -555,7 +504,6 @@ mod tests {
                     cell_proofs: None,
                 }],
             }),
-            true,
         );
 
         let signed_call_result = SignedCallResult::new(
@@ -654,7 +602,7 @@ mod tests {
         let expected_str = expected_str.trim();
         let raw_tx = encode_blob_tx_with_sidecar(
             &raw_tx,
-            EthTxBlobSidecar::EthTxBlobSidecarV1(EthTxBlobSidecarV1 {
+            &EthTxBlobSidecar::EthTxBlobSidecarV1(EthTxBlobSidecarV1 {
                 blobs: vec![
                     SidecarBlobV1 {
                         blob: blob_1,
@@ -672,7 +620,6 @@ mod tests {
                     },
                 ],
             }),
-            true,
         );
 
         let signed_call_result = SignedCallResult::new(

core/lib/eth_client/src/types.rs

@@ -22,6 +22,12 @@ impl From<EthTxBlobSidecarV1> for EthTxBlobSidecar {
     }
 }
 
+impl From<EthTxBlobSidecarV2> for EthTxBlobSidecar {
+    fn from(value: EthTxBlobSidecarV2) -> Self {
+        Self::EthTxBlobSidecarV2(value)
+    }
+}
+
 /// All sidecar data for a single blob for the EIP4844 transaction.
 #[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
 pub struct SidecarBlobV1 {
@@ -37,15 +43,13 @@ pub struct SidecarBlobV1 {
     pub versioned_hash: Vec<u8>,
 }
 
-/// All sidecar data for a single blob for the EIP4844 transaction.
+/// All sidecar data for a single blob for the EIP7594 transaction.
 #[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
 pub struct SidecarBlobV2 {
     /// Blob itself
     pub blob: Vec<u8>,
     /// Blob commitment
     pub commitment: Vec<u8>,
-    /// Blob proof
-    pub proof: Vec<u8>,
     /// Blob commitment versioned hash
     pub versioned_hash: Vec<u8>,
     /// The KZG proofs for each of the cells in the blob.

core/lib/types/src/eth_sender.rs

@@ -4,7 +4,10 @@ use tokio::sync::watch;
 use zksync_config::configs::eth_sender::{PrecommitParams, SenderConfig};
 use zksync_contracts::BaseSystemContractsHashes;
 use zksync_dal::{Connection, ConnectionPool, Core, CoreDal};
-use zksync_eth_client::{BoundEthInterface, CallFunctionArgs, ContractCallError, EthInterface};
+use zksync_eth_client::{
+    convert_eip4844_sidecar_to_eip7594_sidecar, BoundEthInterface, CallFunctionArgs,
+    ContractCallError, EthInterface,
+};
 use zksync_health_check::{Health, HealthStatus, HealthUpdater, ReactiveHealthCheck};
 use zksync_l1_contract_interface::{
     i_executor::{
@@ -20,7 +23,10 @@ use zksync_types::{
         AggregatedActionType, L1BatchAggregatedActionType, L2BlockAggregatedActionType,
     },
     commitment::{L1BatchWithMetadata, SerializeCommitment},
-    eth_sender::{EthTx, EthTxBlobSidecar, EthTxBlobSidecarV1, EthTxFinalityStatus, SidecarBlobV1},
+    eth_sender::{
+        EthTx, EthTxBlobSidecar, EthTxBlobSidecarV1, EthTxBlobSidecarV2, EthTxFinalityStatus,
+        SidecarBlobV1,
+    },
     ethabi::{Function, Token},
     l2_to_l1_log::UserL2ToL1Log,
     protocol_version::{L1VerifierConfig, PACKED_SEMVER_MINOR_MASK},
@@ -983,7 +989,12 @@ impl EthTxAggregator {
                             None
                         };
 
-                        Self::encode_commit_data(encoding_fn, &commit_data, l1_batch_for_sidecar)
+                        Self::encode_commit_data(
+                            encoding_fn,
+                            &commit_data,
+                            l1_batch_for_sidecar,
+                            self.config.use_fusaka_blob_format,
+                        )
                     }
                     L1BatchAggregatedOperation::PublishProofOnchain(op) => {
                         args.extend(op.conditional_into_tokens(self.config.is_verifier_pre_fflonk));
@@ -1054,6 +1065,7 @@ impl EthTxAggregator {
         commit_fn: &Function,
         commit_payload: &[Token],
         l1_batch: Option<L1BatchWithMetadata>,
+        use_eip7594_blobs: bool,
     ) -> (Vec<u8>, Option<EthTxBlobSidecar>) {
         let calldata = commit_fn
             .encode_input(commit_payload)
@@ -1080,8 +1092,20 @@ impl EthTxAggregator {
                     })
                     .collect::<Vec<SidecarBlobV1>>();
 
-                let eth_tx_blob_sidecar = EthTxBlobSidecarV1 { blobs: sidecar };
-                Some(eth_tx_blob_sidecar.into())
+                let eth_tx_blob_sidecar = if use_eip7594_blobs {
+                    EthTxBlobSidecarV2 {
+                        blobs: sidecar
+                            .into_iter()
+                            .map(|sidecar_blob| {
+                                convert_eip4844_sidecar_to_eip7594_sidecar(sidecar_blob).into()
+                            })
+                            .collect(),
+                    }
+                    .into()
+                } else {
+                    EthTxBlobSidecarV1 { blobs: sidecar }.into()
+                };
+                Some(eth_tx_blob_sidecar)
             }
         };
 

core/node/eth_sender/src/eth_tx_aggregator.rs

@@ -14,7 +14,7 @@ use zksync_node_fee_model::l1_gas_price::TxParamsProvider;
 use zksync_shared_metrics::L1Stage;
 use zksync_types::{
     aggregated_operations::{AggregatedActionType, L1BatchAggregatedActionType},
-    eth_sender::{EthTx, EthTxBlobSidecar, EthTxFinalityStatus, L1BlockNumbers},
+    eth_sender::{EthTx, EthTxFinalityStatus, L1BlockNumbers},
     Address, L1BlockNumber, GATEWAY_CALLDATA_PROCESSING_ROLLUP_OVERHEAD_GAS, H256,
     L1_CALLDATA_PROCESSING_ROLLUP_OVERHEAD_GAS, L1_GAS_PER_PUBDATA_BYTE, U256,
 };
@@ -225,11 +225,10 @@ impl EthTxManager {
             )
             .await;
 
-        if let Some(blob_sidecar) = tx.blob_sidecar.clone() {
+        if let Some(blob_sidecar) = &tx.blob_sidecar {
             signed_tx.raw_tx = RawTransactionBytes::new_unchecked(encode_blob_tx_with_sidecar(
                 signed_tx.raw_tx.as_ref(),
                 blob_sidecar,
-                self.config.use_fusaka_blob_format,
             ));
         }