jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: account for legacy tx in try_from tx to TransactionSignedEcRecovered (#7882)

Browse Source
This commit is contained in:
Thomas Coratger
2024-04-25 23:12:43 +02:00
committed by GitHub
parent adf1d25a89
commit 7efdbf4924
1 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
crates/primitives/src/transaction/mod.rs
View File

@ -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()