Simplify unsignedMessage function

Boilertalk · Apr 30, 2024 · 76f8bd6 · 76f8bd6
1 parent 8d771f1
commit 76f8bd6
Showing 1 changed file with 18 additions and 17 deletions.
diff --git a/Sources/Core/Transaction/EthereumTransaction.swift b/Sources/Core/Transaction/EthereumTransaction.swift
@@ -736,25 +736,25 @@ extension EthereumSignedTransaction {
 
     private func unsignedMessage() throws -> Bytes {
         let rlpEncoder = RLPEncoder()
-        let rlp = self.rlp()
 
-        if let arr = rlp.array{
+        if self.transactionType == .legacy {
+            let legacyrlp = RLPItem(
+                nonce: self.nonce,
+                gasPrice: self.gasPrice,
+                gasLimit: self.gasLimit,
+                to: self.to,
+                value: self.value,
+                data: self.data,
+                v: self.chainId,
+                r: 0,
+                s: 0
+            )
+            let rawRlp = try RLPEncoder().encode(legacyrlp)
+            return rawRlp
+        } else if self.transactionType == .eip1559 {
+            let rlp = self.rlp()
 
-            if self.transactionType == .legacy {
-                let legacyrlp = RLPItem(
-                    nonce: self.nonce,
-                    gasPrice: self.gasPrice,
-                    gasLimit: self.gasLimit,
-                    to: self.to,
-                    value: self.value,
-                    data: self.data,
-                    v: self.chainId,
-                    r: 0,
-                    s: 0
-                )
-                let rawRlp = try RLPEncoder().encode(legacyrlp)
-                return rawRlp
-            } else if self.transactionType == .eip1559 {
+            if let arr = rlp.array{
                 let unsignedRlp = Array(arr[0..<(arr.count - 3)])
                 var messageToSign = Bytes()
                 let unsignedRlpBytes = try rlpEncoder.encode(RLPItem.array(unsignedRlp))
@@ -764,6 +764,7 @@ extension EthereumSignedTransaction {
             } else {
                 throw Error.transactionInvalid
             }
+
         } else {
             throw Error.rlpItemInvalid
         }