feat(cheatcodes): support both 4844/7594 formats in attachBlob (#13054)

Co-authored-by: Matthias Seitz <[email protected]>

Author: mablr

crates/cheatcodes/src/inspector.rs

@@ -20,9 +20,9 @@ use crate::{
     },
     utils::IgnoredTraces,
 };
-use alloy_consensus::BlobTransactionSidecar;
+use alloy_consensus::BlobTransactionSidecarVariant;
 use alloy_evm::eth::EthEvmContext;
-use alloy_network::TransactionBuilder4844;
+use alloy_network::{TransactionBuilder4844, TransactionBuilder7594};
 use alloy_primitives::{
     Address, B256, Bytes, Log, TxKind, U256, hex,
     map::{AddressHashMap, HashMap, HashSet},
@@ -392,7 +392,7 @@ pub struct Cheatcodes {
     pub active_delegations: Vec<SignedAuthorization>,
 
     /// The active EIP-4844 blob that will be attached to the next call.
-    pub active_blob_sidecar: Option<BlobTransactionSidecar>,
+    pub active_blob_sidecar: Option<BlobTransactionSidecarVariant>,
 
     /// The gas price.
     ///
@@ -938,7 +938,11 @@ impl Cheatcodes {
                                 precompile_call_logs: vec![],
                             });
                         }
-                        tx_req.set_blob_sidecar(blob_sidecar);
+                        if blob_sidecar.is_eip4844() {
+                            tx_req.set_blob_sidecar(blob_sidecar.into_eip4844().unwrap());
+                        } else if blob_sidecar.is_eip7594() {
+                            tx_req.set_blob_sidecar_7594(blob_sidecar.into_eip7594().unwrap());
+                        }
                     }
 
                     // Apply active EIP-7702 delegations, if any.

crates/cheatcodes/src/script.rs

@@ -228,8 +228,12 @@ impl Cheatcode for attachBlobCall {
              see EIP-4844: https://eips.ethereum.org/EIPS/eip-4844"
         );
         let sidecar: SidecarBuilder<SimpleCoder> = SidecarBuilder::from_slice(blob);
-        let sidecar = sidecar.build().map_err(|e| format!("{e}"))?;
-        ccx.state.active_blob_sidecar = Some(sidecar);
+        let sidecar_variant = if ccx.ecx.cfg.spec < SpecId::OSAKA {
+            sidecar.build_4844().map_err(|e| format!("{e}"))?.into()
+        } else {
+            sidecar.build_7594().map_err(|e| format!("{e}"))?.into()
+        };
+        ccx.state.active_blob_sidecar = Some(sidecar_variant);
         Ok(Default::default())
     }
 }