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

Revert "feat(op): import bodies (#7659)" (#7724)

Browse Source
This commit is contained in:
Matthias Seitz
2024-04-18 18:10:22 +02:00
committed by GitHub
parent 4ca86fb4d2
commit f57bef7181
4 changed files with 14 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/primitives/src/lib.rs
View File

@ -100,7 +100,7 @@ pub use transaction::{
Transaction, TransactionKind, TransactionMeta, TransactionSigned, TransactionSignedEcRecovered,
TransactionSignedNoHash, TryFromRecoveredTransaction, TxEip1559, TxEip2930, TxEip4844,
TxHashOrNumber, TxLegacy, TxType, EIP1559_TX_TYPE_ID, EIP2930_TX_TYPE_ID, EIP4844_TX_TYPE_ID,
LEGACY_TX_TYPE_ID, OP_RETH_MAINNET_BELOW_BEDROCK,
LEGACY_TX_TYPE_ID,
};
pub use withdrawal::{Withdrawal, Withdrawals};

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

@ -32,7 +32,7 @@ pub use sidecar::generate_blob_sidecar;
#[cfg(feature = "c-kzg")]
pub use sidecar::{BlobTransaction, BlobTransactionSidecar, BlobTransactionValidationError};
pub use signature::{Signature, OP_RETH_MAINNET_BELOW_BEDROCK};
pub use signature::Signature;
pub use tx_type::{
TxType, EIP1559_TX_TYPE_ID, EIP2930_TX_TYPE_ID, EIP4844_TX_TYPE_ID, LEGACY_TX_TYPE_ID,
};
@ -963,8 +963,8 @@ impl TransactionSignedNoHash {
// Optimism's Deposit transaction does not have a signature. Directly return the
// `from` address.
#[cfg(feature = "optimism")]
if let Some(address) = get_deposit_or_null_address(&self.transaction, &self.signature) {
return Some(address)
if let Transaction::Deposit(TxDeposit { from, .. }) = self.transaction {
return Some(from)
}
let signature_hash = self.signature_hash();
@ -983,9 +983,11 @@ impl TransactionSignedNoHash {
buffer.clear();
self.transaction.encode_without_signature(buffer);
// Optimism's Deposit transaction does not have a signature. Directly return the
// `from` address.
#[cfg(feature = "optimism")]
if let Some(address) = get_deposit_or_null_address(&self.transaction, &self.signature) {
return Some(address)
if let Transaction::Deposit(TxDeposit { from, .. }) = self.transaction {
return Some(from)
}
self.signature.recover_signer_unchecked(keccak256(buffer))
@ -1194,8 +1196,8 @@ impl TransactionSigned {
// Optimism's Deposit transaction does not have a signature. Directly return the
// `from` address.
#[cfg(feature = "optimism")]
if let Some(address) = get_deposit_or_null_address(&self.transaction, &self.signature) {
return Some(address)
if let Transaction::Deposit(TxDeposit { from, .. }) = self.transaction {
return Some(from)
}
let signature_hash = self.signature_hash();
self.signature.recover_signer(signature_hash)
@ -1210,8 +1212,8 @@ impl TransactionSigned {
// Optimism's Deposit transaction does not have a signature. Directly return the
// `from` address.
#[cfg(feature = "optimism")]
if let Some(address) = get_deposit_or_null_address(&self.transaction, &self.signature) {
return Some(address)
if let Transaction::Deposit(TxDeposit { from, .. }) = self.transaction {
return Some(from)
}
let signature_hash = self.signature_hash();
self.signature.recover_signer_unchecked(signature_hash)
@ -1800,26 +1802,6 @@ impl IntoRecoveredTransaction for TransactionSignedEcRecovered {
}
}
#[cfg(feature = "optimism")]
fn get_deposit_or_null_address(
transaction: &Transaction,
signature: &Signature,
) -> Option<Address> {
// Optimism's Deposit transaction does not have a signature. Directly return the
// `from` address.
if let Transaction::Deposit(TxDeposit { from, .. }) = transaction {
return Some(*from)
}
// OP blocks below bedrock include transactions sent from the null address
if std::env::var_os(OP_RETH_MAINNET_BELOW_BEDROCK).as_deref() == Some("true".as_ref()) &&
*signature == Signature::optimism_deposit_tx_signature()
{
return Some(Address::default())
}
None
}
#[cfg(test)]
mod tests {
use crate::{

13
crates/primitives/src/transaction/signature.rs
View File

@ -14,9 +14,6 @@ const SECP256K1N_HALF: U256 = U256::from_be_bytes([
0x5D, 0x57, 0x6E, 0x73, 0x57, 0xA4, 0x50, 0x1D, 0xDF, 0xE9, 0x2F, 0x46, 0x68, 0x1B, 0x20, 0xA0,
]);
/// Running OP Mainnet migration for chain below bedrock.]
pub const OP_RETH_MAINNET_BELOW_BEDROCK: &str = "OP_RETH_MAINNET_BELOW_BEDROCK";
/// r, s: Values corresponding to the signature of the
/// transaction and used to determine the sender of
/// the transaction; formally Tr and Ts. This is expanded in Appendix F of yellow paper.
@ -85,12 +82,6 @@ impl Signature {
// EIP-155: v = {0, 1} + CHAIN_ID * 2 + 35
self.odd_y_parity as u64 + chain_id * 2 + 35
} else {
#[cfg(feature = "optimism")]
if std::env::var_os(OP_RETH_MAINNET_BELOW_BEDROCK).as_deref() == Some("true".as_ref()) &&
*self == Self::optimism_deposit_tx_signature()
{
return 0
}
self.odd_y_parity as u64 + 27
}
}
@ -107,10 +98,6 @@ impl Signature {
if v < 35 {
// non-EIP-155 legacy scheme, v = 27 for even y-parity, v = 28 for odd y-parity
if v != 27 && v != 28 {
#[cfg(feature = "optimism")]
if std::env::var(OP_RETH_MAINNET_BELOW_BEDROCK) == Ok(true.to_string()) && v == 0 {
return Ok((Signature { r, s, odd_y_parity: false }, None))
}
return Err(RlpError::Custom("invalid Ethereum signature (V is not 27 or 28)"))
}
let odd_y_parity = v == 28;