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

feat(op): signature encoding (#7769)

Browse Source 
Co-authored-by: Roman Krasiuk <rokrassyuk@gmail.com>
This commit is contained in:
Emilia Hane
2024-04-22 12:04:25 +02:00
committed by GitHub
parent ce2f1602a1
commit fa9f23db98
2 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -997,8 +997,9 @@ impl TransactionSignedNoHash {
} }
// pre bedrock system transactions were sent from the zero address as legacy // pre bedrock system transactions were sent from the zero address as legacy
// transactions with an empty signature Note: this is very hacky and only // transactions with an empty signature
// relevant for op-mainnet pre bedrock //
// NOTE: this is very hacky and only relevant for op-mainnet pre bedrock
if self.is_legacy() && self.signature == Signature::optimism_deposit_tx_signature() { if self.is_legacy() && self.signature == Signature::optimism_deposit_tx_signature() {
return Some(Address::ZERO) return Some(Address::ZERO)
} }
@ -2213,7 +2214,14 @@ mod tests {
); );
let encoded = &alloy_rlp::encode(signed_tx); let encoded = &alloy_rlp::encode(signed_tx);
assert_eq!(hex!("c98080808080801b8080"), encoded[..]); assert_eq!(
if cfg!(feature = "optimism") {
hex!("c9808080808080808080")
} else {
hex!("c98080808080801b8080")
},
&encoded[..]
);
assert_eq!(MIN_LENGTH_LEGACY_TX_ENCODED, encoded.len()); assert_eq!(MIN_LENGTH_LEGACY_TX_ENCODED, encoded.len());
TransactionSigned::decode(&mut &encoded[..]).unwrap(); TransactionSigned::decode(&mut &encoded[..]).unwrap();

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

@ -82,6 +82,14 @@ impl Signature {
// EIP-155: v = {0, 1} + CHAIN_ID * 2 + 35 // EIP-155: v = {0, 1} + CHAIN_ID * 2 + 35
self.odd_y_parity as u64 + chain_id * 2 + 35 self.odd_y_parity as u64 + chain_id * 2 + 35
} else { } else {
#[cfg(feature = "optimism")]
// pre bedrock system transactions were sent from the zero address as legacy
// transactions with an empty signature
//
// NOTE: this is very hacky and only relevant for op-mainnet pre bedrock
if *self == Self::optimism_deposit_tx_signature() {
return 0
}
self.odd_y_parity as u64 + 27 self.odd_y_parity as u64 + 27
} }
} }
@ -92,12 +100,20 @@ impl Signature {
buf: &mut &[u8], buf: &mut &[u8],
) -> alloy_rlp::Result<(Self, Option<u64>)> { ) -> alloy_rlp::Result<(Self, Option<u64>)> {
let v = u64::decode(buf)?; let v = u64::decode(buf)?;
let r = Decodable::decode(buf)?; let r: U256 = Decodable::decode(buf)?;
let s = Decodable::decode(buf)?; let s: U256 = Decodable::decode(buf)?;
if v < 35 { if v < 35 {
// non-EIP-155 legacy scheme, v = 27 for even y-parity, v = 28 for odd y-parity // non-EIP-155 legacy scheme, v = 27 for even y-parity, v = 28 for odd y-parity
if v != 27 && v != 28 { if v != 27 && v != 28 {
#[cfg(feature = "optimism")]
// pre bedrock system transactions were sent from the zero address as legacy
// transactions with an empty signature
//
// NOTE: this is very hacky and only relevant for op-mainnet pre bedrock
if v == 0 && r.is_zero() && s.is_zero() {
return Ok((Signature { r, s, odd_y_parity: false }, None))
}
return Err(RlpError::Custom("invalid Ethereum signature (V is not 27 or 28)")) return Err(RlpError::Custom("invalid Ethereum signature (V is not 27 or 28)"))
} }
let odd_y_parity = v == 28; let odd_y_parity = v == 28;