From 261ca8b4e30d998ca5cd1766d228ef359efe6e17 Mon Sep 17 00:00:00 2001 From: drhgencer Date: Thu, 5 Feb 2026 04:46:43 +0530 Subject: [PATCH] fix(rpc): use consistent sidecar check in fill_transaction for EIP-7594 support (#21763) --- crates/rpc/rpc-eth-api/src/helpers/transaction.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/crates/rpc/rpc-eth-api/src/helpers/transaction.rs b/crates/rpc/rpc-eth-api/src/helpers/transaction.rs index d8083d20c8..0a07751fa6 100644 --- a/crates/rpc/rpc-eth-api/src/helpers/transaction.rs +++ b/crates/rpc/rpc-eth-api/src/helpers/transaction.rs @@ -494,7 +494,9 @@ pub trait EthTransactions: LoadTransaction { request.as_mut().set_max_fee_per_blob_gas(blob_fee.to()); } - if request.as_ref().blob_sidecar().is_some() && + // Use `sidecar.is_some()` instead of `blob_sidecar().is_some()` to handle + // both EIP-4844 (v0) and EIP-7594 (v1) sidecar formats + if request.as_ref().sidecar.is_some() && request.as_ref().blob_versioned_hashes.is_none() { request.as_mut().populate_blob_hashes();