diff --git a/crates/optimism/rpc/src/eth/call.rs b/crates/optimism/rpc/src/eth/call.rs index 7f0fc807b7..5a8c406e6c 100644 --- a/crates/optimism/rpc/src/eth/call.rs +++ b/crates/optimism/rpc/src/eth/call.rs @@ -69,12 +69,9 @@ where let tx_type = if request.authorization_list.is_some() { TxType::Eip7702 - } else if request.sidecar.is_some() || - request.blob_versioned_hashes.is_some() || - request.max_fee_per_blob_gas.is_some() - { + } else if request.has_eip4844_fields() { TxType::Eip4844 - } else if request.max_fee_per_gas.is_some() || request.max_priority_fee_per_gas.is_some() { + } else if request.has_eip1559_fields() { TxType::Eip1559 } else if request.access_list.is_some() { TxType::Eip2930 diff --git a/crates/rpc/rpc/src/eth/helpers/call.rs b/crates/rpc/rpc/src/eth/helpers/call.rs index 68d82f16b2..3bb6123042 100644 --- a/crates/rpc/rpc/src/eth/helpers/call.rs +++ b/crates/rpc/rpc/src/eth/helpers/call.rs @@ -60,12 +60,9 @@ where let tx_type = if request.authorization_list.is_some() { TxType::Eip7702 - } else if request.sidecar.is_some() || - request.blob_versioned_hashes.is_some() || - request.max_fee_per_blob_gas.is_some() - { + } else if request.has_eip4844_fields() { TxType::Eip4844 - } else if request.max_fee_per_gas.is_some() || request.max_priority_fee_per_gas.is_some() { + } else if request.has_eip1559_fields() { TxType::Eip1559 } else if request.access_list.is_some() { TxType::Eip2930