From 1d774792351b676d58e87284227b0a1086cafd09 Mon Sep 17 00:00:00 2001
From: Matthias Seitz <matthias.seitz@outlook.de>
Date: Wed, 28 Feb 2024 22:35:17 +0100
Subject: [PATCH] fix: rm Signature optimism cfg

---
 crates/primitives/src/transaction/mod.rs      |  2 +-
 .../primitives/src/transaction/signature.rs   | 25 -------------------
 2 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/crates/primitives/src/transaction/mod.rs b/crates/primitives/src/transaction/mod.rs
index f54b9d25cef8..70db2792d4a7 100644
--- a/crates/primitives/src/transaction/mod.rs
+++ b/crates/primitives/src/transaction/mod.rs
@@ -1460,7 +1460,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
         };
diff --git a/crates/primitives/src/transaction/signature.rs b/crates/primitives/src/transaction/signature.rs
index 3cbfa1c746c8..4ab620a2996c 100644
--- a/crates/primitives/src/transaction/signature.rs
+++ b/crates/primitives/src/transaction/signature.rs
@@ -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).