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: rm Signature optimism cfg (#6858)

Browse Source
This commit is contained in:
Matthias Seitz
2024-02-28 22:59:24 +01:00
committed by GitHub
parent 2aa5f5ddcd
commit ecfe4b6bc6
2 changed files with 1 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1459,7 +1459,7 @@ impl<'a> arbitrary::Arbitrary<'a> for TransactionSigned {
#[cfg(feature = "optimism")]
let signature = if transaction.is_deposit() {
Signature { r: crate::U256::ZERO, s: crate::U256::ZERO, odd_y_parity: false }
Signature::optimism_deposit_tx_signature()
} else {
signature
};

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

@ -78,11 +78,6 @@ impl Signature {
/// Output the `v` of the signature depends on chain_id
#[inline]
pub fn v(&self, chain_id: Option<u64>) -> u64 {
#[cfg(feature = "optimism")]
if self.r.is_zero() && self.s.is_zero() {
return 0
}
if let Some(chain_id) = chain_id {
// EIP-155: v = {0, 1} + CHAIN_ID * 2 + 35
self.odd_y_parity as u64 + chain_id * 2 + 35
@ -206,16 +201,6 @@ mod tests {
assert_eq!(4, signature.payload_len_with_eip155_chain_id(Some(47)));
}
#[cfg(feature = "optimism")]
#[test]
fn test_zero_signature_payload_len_with_eip155_chain_id() {
let zero_signature = Signature { r: U256::ZERO, s: U256::ZERO, odd_y_parity: false };
assert_eq!(3, zero_signature.payload_len_with_eip155_chain_id(None));
assert_eq!(3, zero_signature.payload_len_with_eip155_chain_id(Some(1)));
assert_eq!(3, zero_signature.payload_len_with_eip155_chain_id(Some(47)));
}
#[test]
fn test_v() {
// Select 1 as an arbitrary nonzero value for R and S, as v() always returns 0 for (0, 0).
@ -228,16 +213,6 @@ mod tests {
assert_eq!(38, signature.v(Some(1)));
}
#[cfg(feature = "optimism")]
#[test]
fn test_zero_signature_v() {
let signature = Signature { r: U256::ZERO, s: U256::ZERO, odd_y_parity: false };
assert_eq!(0, signature.v(None));
assert_eq!(0, signature.v(Some(1)));
assert_eq!(0, signature.v(Some(47)));
}
#[test]
fn test_encode_and_decode_with_eip155_chain_id() {
// Select 1 as an arbitrary nonzero value for R and S, as v() always returns 0 for (0, 0).