fix(primitives): track both 4844/7594 sidecars presence in FoundryTransactionRequest::build_typed_tx (#13218)

* fix(primitives): track both 4844/7594 sidecars presence in `FoundryTransactionRequest::build_typed_tx`

* fix: after `TransactionBuilder4844` impl

Author: mablr

crates/anvil/tests/it/eip4844.rs

@@ -103,6 +103,29 @@ async fn can_send_eip4844_transaction_eth_send_transaction() {
     let _blobs = api.anvil_get_blob_by_tx_hash(tx_hash).unwrap().unwrap();
 }
 
+// <https://github.com/foundry-rs/foundry/issues/13217>
+#[tokio::test(flavor = "multi_thread")]
+async fn can_send_eip4844_transaction_with_eip7594_sidecar_format() {
+    let node_config = NodeConfig::test().with_hardfork(Some(EthereumHardfork::Osaka.into()));
+    let (api, handle) = spawn(node_config).await;
+    let provider = ProviderBuilder::new().connect(handle.http_endpoint().as_str()).await.unwrap();
+    let accounts = provider.get_accounts().await.unwrap();
+    let alice = accounts[0];
+    let bob = accounts[1];
+
+    let sidecar: SidecarBuilder<SimpleCoder> = SidecarBuilder::from_slice(b"Blobs are fun!");
+    let sidecar = sidecar.build_7594().unwrap();
+
+    let mut tx = TransactionRequest::default().with_from(alice).with_to(bob);
+    alloy_network::TransactionBuilder7594::set_blob_sidecar_7594(&mut tx, sidecar);
+
+    let pending_tx = provider.send_transaction(tx).await.unwrap();
+    let receipt = pending_tx.get_receipt().await.unwrap();
+    let tx_hash = receipt.transaction_hash;
+
+    let _blobs = api.anvil_get_blob_by_tx_hash(tx_hash).unwrap().unwrap();
+}
+
 #[tokio::test(flavor = "multi_thread")]
 async fn can_send_multiple_blobs_in_one_tx() {
     let node_config = NodeConfig::test().with_hardfork(Some(EthereumHardfork::Cancun.into()));

crates/primitives/src/transaction/request.rs

@@ -216,9 +216,12 @@ impl FoundryTransactionRequest {
                 access_list: self.access_list().cloned().unwrap_or_default(),
                 ..Default::default()
             }))
-        } else if self.as_ref().has_eip4844_fields() && self.as_ref().blob_sidecar().is_none() {
-            // if request has eip4844 fields but no blob sidecar, try to build to eip4844 without
-            // sidecar
+        } else if self.as_ref().has_eip4844_fields()
+            && self.blob_sidecar().is_none()
+            && alloy_network::TransactionBuilder7594::blob_sidecar_7594(self.as_ref()).is_none()
+        {
+            // if request has eip4844 fields but no blob sidecar (neither eip4844 nor eip7594
+            // format), try to build to eip4844 without sidecar
             self.0
                 .into_inner()
                 .build_4844_without_sidecar()