Fixes Web3Swift API methods worked with data.

Author: yaroslavyaroslav

Sources/Core/Transaction/CodableTransaction.swift

@@ -8,10 +8,6 @@ import Foundation
 import BigInt
 
 
-public protocol CodableTransactionInheritable {
-    var transactionOptions: CodableTransaction { get }
-}
-
 ///  Structure capable of carying the parameters for any transaction type.
 ///  while all fields in this struct are optional, they are not necessarily
 ///  optional for the type of transaction they apply to.

Sources/web3swift/EthereumAPICalls/Ethereum/Eth+GetBlockByHash.swift

@@ -10,6 +10,7 @@ import Core
 
 extension web3.Eth {
     public func block(by hash: Data, fullTransactions: Bool = false) async throws -> Block {
+        guard let hexString = String(data: hash, encoding: .utf8)?.addHexPrefix() else { throw Web3Error.dataError }
         let requestCall: APIRequest = .getBlockByHash(hash.toHexString().addHexPrefix(), fullTransactions)
         let response: APIResponse<Block> = try await APIRequest.sendRequest(with: self.provider, for: requestCall)
         return response.result

Sources/web3swift/EthereumAPICalls/Ethereum/Eth+GetTransactionDetails.swift

@@ -9,7 +9,8 @@ import Core
 
 extension web3.Eth {
     public func transactionDetails(_ txhash: Data) async throws -> TransactionDetails {
-        let requestCall: APIRequest = .getTransactionByHash(txhash.toHexString().addHexPrefix())
+        guard let hexString = String(data: txhash, encoding: .utf8)?.addHexPrefix() else { throw Web3Error.dataError }
+        let requestCall: APIRequest = .getTransactionByHash(hexString)
         let response: APIResponse<TransactionDetails> = try await APIRequest.sendRequest(with: self.provider, for: requestCall)
         return response.result
     }

Sources/web3swift/EthereumAPICalls/Ethereum/Eth+GetTransactionReceipt.swift

@@ -9,7 +9,8 @@ import Core
 
 extension web3.Eth {
     public func transactionReceipt(_ txhash: Data) async throws -> TransactionReceipt {
-        let requestCall: APIRequest = .getTransactionReceipt(txhash.toHexString().addHexPrefix())
+        guard let hexString = String(data: txhash, encoding: .utf8)?.addHexPrefix() else { throw Web3Error.dataError }
+        let requestCall: APIRequest = .getTransactionReceipt(hexString)
         let response: APIResponse<TransactionReceipt> = try await APIRequest.sendRequest(with: self.provider, for: requestCall)
         return response.result
     }

Sources/web3swift/EthereumAPICalls/Ethereum/Eth+SendRawTransaction.swift

@@ -9,7 +9,7 @@ import Core
 
 extension web3.Eth {
     public func send(raw data: Data) async throws -> TransactionSendingResult {
-        let hexString = data.toHexString().addHexPrefix()
+        guard let hexString = String(data: data, encoding: .utf8)?.addHexPrefix() else { throw Web3Error.dataError }
         let request: APIRequest = .sendRawTransaction(hexString)
         let response: APIResponse<Hash> = try await APIRequest.sendRequest(with: self.provider, for: request)
 

Sources/web3swift/EthereumAPICalls/Ethereum/Eth+SendTransaction.swift

@@ -0,0 +1,35 @@
+//  web3swift
+//
+//  Created by Alex Vlasov.
+//  Copyright © 2018 Alex Vlasov. All rights reserved.
+//
+
+import Foundation
+import BigInt
+import Core
+
+
+extension web3.Eth {
+
+    public func send(_ transaction: CodableTransaction, password: String) async throws -> TransactionSendingResult {
+        if let attachedKeystoreManager = self.web3.provider.attachedKeystoreManager {
+            var tmpTransaction = transaction
+            do {
+                try Web3Signer.signTX(transaction: &tmpTransaction,
+                                      keystore: attachedKeystoreManager,
+                                      account: tmpTransaction.from ?? tmpTransaction.sender ?? EthereumAddress.contractDeploymentAddress(),
+                                      password: password)
+            } catch {
+                throw Web3Error.inputError(desc: "Failed to locally sign a transaction")
+            }
+            return try await self.web3.eth.send(raw: tmpTransaction.encode(for: .transaction)!)
+        }
+
+        // MARK: Sending Data flow
+        let request: APIRequest = .sendTransaction(transaction)
+        let response: APIResponse<Hash> = try await APIRequest.sendRequest(with: self.provider, for: request)
+
+        let result = TransactionSendingResult(transaction: transaction, hash: response.result)
+        return result
+    }
+}

Sources/web3swift/Operations/WriteOperation.swift

@@ -26,8 +26,7 @@ public class WriteOperation: ReadOperation {
             return try await web3.eth.send(raw: transactionData)
         }
         // MARK: Sending Data flow
-        guard let transactionData = transaction.encode(for: .transaction) else { throw Web3Error.dataError }
-        return try await web3.eth.send(raw: transactionData)
+        return try await web3.eth.send(transaction, password: password)
     }
 
     // FIXME: Rewrite this to CodableTransaction

Tests/web3swiftTests/localTests/BasicLocalNodeTests.swift

@@ -33,7 +33,7 @@ class BasicLocalNodeTests: LocalTestCase {
 
         Thread.sleep(forTimeInterval: 1.0)
 
-        let receipt = try await web3.eth.transactionReceipt(txHash.data(using: .utf8)!)
+        let receipt = try await web3.eth.transactionReceipt(txHash.stripHexPrefix().data(using: .utf8)!)
         print(receipt)
 
         switch receipt.status {
@@ -43,7 +43,7 @@ class BasicLocalNodeTests: LocalTestCase {
             break
         }
 
-        let details = try await web3.eth.transactionDetails(txHash.data(using: .utf8)!)
+        let details = try await web3.eth.transactionDetails(txHash.stripHexPrefix().data(using: .utf8)!)
         print(details)
     }