Add function to init signed Tx from raw tx hash and tests

Boilertalk · Mar 6, 2024 · f0c608d · f0c608d
1 parent 1aaf220
commit f0c608d
Show file tree

Hide file tree

Showing 2 changed files with 74 additions and 0 deletions.
diff --git a/Sources/Core/Transaction/EthereumTransaction.swift b/Sources/Core/Transaction/EthereumTransaction.swift
@@ -423,6 +423,26 @@ public struct EthereumSignedTransaction {
         case signatureMalformed
         case gasPriceMismatch(msg: String)
         case chainIdNotSet(msg: String)
+        case rawTransactionInvalid
+    }
+}
+
+extension EthereumSignedTransaction {
+
+    public init(
+        rawTx: EthereumData
+    ) throws {
+        var rawTxBytes = rawTx.makeBytes()
+        if (rawTxBytes.starts(with: [0x02])) {
+            rawTxBytes.removeFirst()
+        }
+        do {
+            var rlp = try RLPDecoder().decode(rawTxBytes)
+
+            try self.init(rlp: rlp)
+        } catch {
+            throw Error.rawTransactionInvalid
+        }
     }
 }
 

diff --git a/Tests/Web3Tests/TransactionTests/TransactionTests.swift b/Tests/Web3Tests/TransactionTests/TransactionTests.swift
@@ -201,6 +201,60 @@ class TransactionTests: QuickSpec {
                     expect(try EthereumSignedTransaction(rlp: nonTxRlpItem)).to(throwError())
                 }
             }
+            context("Init from raw Tx") {
+
+                let p = try? EthereumPrivateKey(
+                    hexPrivateKey: "0x94eca03b4541a0eb0d173e321b6f960d08cfe4c5a75fa00ebe0a3d283c609c3a"
+                )
+                let t = p?.address
+
+                guard let to = t, let privateKey = p else {
+                    return
+                }
+
+                // Legacy tx
+
+                let tx = EthereumTransaction(nonce: 0, gasPrice: EthereumQuantity(quantity: 21.gwei), gasLimit: 21000, to: to, value: EthereumQuantity(quantity: 1.eth))
+                let signedExpectedTx = try? tx.sign(with: privateKey, chainId: 3)
+
+                let rawTx = try? EthereumData(ethereumValue: "0xf86c808504e3b2920082520894867aeeeed428ed9ba7f97fc7e16f16dfcf02f375880de0b6b3a76400008029a099060c9146c68716da3a79533866dc941a03b171911d675f518c97a73882f7a6a0019167adb26b602501c954e7793e798407836f524b9778f5be6ebece5fc998c6")
+
+                let signedTx = try? EthereumSignedTransaction(rawTx: rawTx!)
+
+                it("should be equal for legacy tx") {
+                    expect(signedTx == signedExpectedTx) == true
+                }
+
+                // Modern tx
+
+                let extendedTx = try! EthereumTransaction(
+                    nonce: 0,
+                    gasPrice: EthereumQuantity(quantity: 21.gwei),
+                    maxFeePerGas: EthereumQuantity(quantity: 21.gwei),
+                    maxPriorityFeePerGas: EthereumQuantity(quantity: 1.gwei),
+                    gasLimit: 21000,
+                    to: to,
+                    value: EthereumQuantity(quantity: 1.eth),
+                    data: EthereumData("0x02f8730180843b9aca008504e3b2920082".hexBytes()),
+                    accessList: [
+                        try! EthereumAddress(hex: "0xde0b295669a9fd93d5f28d9ec85e40f4cb697bae", eip55: false): [
+                            EthereumData(ethereumValue: "0x0000000000000000000000000000000000000000000000000000000000000003"),
+                            EthereumData(ethereumValue: "0x0000000000000000000000000000000000000000000000000000000000000007")
+                        ],
+                        try! EthereumAddress(hex: "0xbb9bc244d798123fde783fcc1c72d3bb8c189413", eip55: false): [],
+                    ],
+                    transactionType: .eip1559
+                )
+                let extendedSignature = try? extendedTx.sign(with: privateKey, chainId: 3)
+
+                let rawExtTx = try? EthereumData(ethereumValue:  "0x02f8f70380843b9aca008504e3b2920082520894867aeeeed428ed9ba7f97fc7e16f16dfcf02f375880de0b6b3a76400009102f8730180843b9aca008504e3b2920082f872f85994de0b295669a9fd93d5f28d9ec85e40f4cb697baef842a00000000000000000000000000000000000000000000000000000000000000003a00000000000000000000000000000000000000000000000000000000000000007d694bb9bc244d798123fde783fcc1c72d3bb8c189413c080a0e0cd5f5e03d10e3d792fb652f6d1ea470cb6cdf745462980dff1652904cc4ed5a06f8b372427d15b68158597cd547c0f77165563da6a0b954d575920888edaf36c")
+
+                let signedExtTx = try? EthereumSignedTransaction(rawTx: rawExtTx!)
+
+                it("should equal the extendedTx") {
+                    expect(extendedSignature == signedExtTx) == true
+                }
+            }
         }
     }
 }