From 7efdbf4924319ff3dc3148f6dd44e5269e338c9f Mon Sep 17 00:00:00 2001
From: Thomas Coratger <60488569+tcoratger@users.noreply.github.com>
Date: Thu, 25 Apr 2024 23:12:43 +0200
Subject: [PATCH] fix: account for legacy tx in `try_from` tx to
 `TransactionSignedEcRecovered` (#7882)

---
 crates/primitives/src/transaction/mod.rs | 28 ++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/crates/primitives/src/transaction/mod.rs b/crates/primitives/src/transaction/mod.rs
index a4ec978a3f..76d9b01978 100644
--- a/crates/primitives/src/transaction/mod.rs
+++ b/crates/primitives/src/transaction/mod.rs
@@ -1726,12 +1726,36 @@ impl TryFrom<reth_rpc_types::Transaction> for TransactionSignedEcRecovered {
     fn try_from(tx: reth_rpc_types::Transaction) -> Result<Self, Self::Error> {
         let signature = tx.signature.ok_or(ConversionError::MissingSignature)?;
 
+        let transaction: Transaction = tx.try_into()?;
+
         TransactionSigned::from_transaction_and_signature(
-            tx.try_into()?,
+            transaction.clone(),
             Signature {
                 r: signature.r,
                 s: signature.s,
-                odd_y_parity: signature.y_parity.ok_or(ConversionError::MissingYParity)?.0,
+                odd_y_parity: if let Some(y_parity) = signature.y_parity {
+                    y_parity.0
+                } else {
+                    match transaction.tx_type() {
+                        // If the transaction type is Legacy, adjust the v component of the
+                        // signature according to the Ethereum specification
+                        TxType::Legacy => {
+                            // Calculate the new v value based on the EIP-155 formula:
+                            // v = {0,1} + CHAIN_ID * 2 + 35
+                            !(signature.v -
+                                U256::from(if let Some(chain_id) = transaction.chain_id() {
+                                    // If CHAIN_ID is available, calculate the new v value
+                                    // accordingly
+                                    chain_id.saturating_mul(2).saturating_add(35)
+                                } else {
+                                    // If CHAIN_ID is not available, set v = {0,1} + 27
+                                    27
+                                }))
+                            .is_zero()
+                        }
+                        _ => !signature.v.is_zero(),
+                    }
+                },
             },
         )
         .try_into_ecrecovered()