Clean send(: CodableTransaction) code.

Add `ReadTransaction.send` attachedKeystoreManager logic for code signing.

Author: yaroslavyaroslav

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

@@ -11,57 +11,13 @@ import Core
 extension web3.Eth {
 
     // FIXME: Rewrite this to CodableTransaction
-    public func send(_ transaction: CodableTransaction, transactionOptions: CodableTransaction? = nil, password: String = "web3swift") async throws -> TransactionSendingResult {
-        //  print(transaction)
-        var assembledTransaction: CodableTransaction = transaction
-
-        var mergedOptions = self.web3.transactionOptions.merge(transactionOptions)
-
-        var forAssemblyPipeline: (CodableTransaction, CodableTransaction) = (assembledTransaction, mergedOptions)
-
-        // usually not calling
-        // Can't find where this hooks are implemented.
-        for hook in self.web3.preSubmissionHooks {
-            let hookResult = hook.function(forAssemblyPipeline)
-            if hookResult.2 {
-                forAssemblyPipeline = (hookResult.0, hookResult.1)
-            }
-
-            let shouldContinue = hookResult.2
-            if !shouldContinue {
-                throw Web3Error.processingError(desc: "Transaction is canceled by middleware")
-            }
-        }
-
-        assembledTransaction = forAssemblyPipeline.0
-        mergedOptions = forAssemblyPipeline.1
-
-
-        if let attachedKeystoreManager = self.web3.provider.attachedKeystoreManager {
-            guard let from = mergedOptions.from else {
-                throw Web3Error.inputError(desc: "No 'from' field provided")
-            }
-            do {
-                try Web3Signer.signTX(transaction: &assembledTransaction, keystore: attachedKeystoreManager, account: from, password: password)
-            } catch {
-                throw Web3Error.inputError(desc: "Failed to locally sign a transaction")
-            }
-            return try await self.web3.eth.send(raw: assembledTransaction)
-        }
-        // MARK: Writing Data flow
-        // From CodableTransaction.data to TransactionParameters.data
-        assembledTransaction.applyOptions(mergedOptions)
-        // guard let transactionParameters = transaction.encodeAsDictionary(from: transactionOptions?.from) else { throw Web3Error.dataError }
-
+    public func send(_ transaction: CodableTransaction) async throws -> TransactionSendingResult {
         // MARK: Sending Data flow
         // FIXME: This gives empty object, fix me, there were TransactionParameters applied.
-        let request: APIRequest = .sendTransaction(assembledTransaction)
+        let request: APIRequest = .sendTransaction(transaction)
         let response: APIResponse<Hash> = try await APIRequest.sendRequest(with: self.provider, for: request)
 
-        let result = TransactionSendingResult(transaction: assembledTransaction, hash: response.result)
-        for hook in self.web3.postSubmissionHooks {
-            hook.function(result)
-        }
+        let result = TransactionSendingResult(transaction: transaction, hash: response.result)
         return result
     }
 }

Sources/web3swift/Web3/Web3+MutatingTransaction.swift

@@ -180,13 +180,25 @@ public class WriteTransaction: ReadTransaction {
 
     // FIXME: Rewrite this to CodableTransaction
     public func send(password: String = "web3swift", transactionOptions: CodableTransaction? = nil) async throws -> TransactionSendingResult {
-        let transaction = try await assembleTransaction(transactionOptions: transactionOptions)
+        var assembledTransaction = try await assembleTransaction(transactionOptions: transactionOptions)
         let mergedOptions = self.transactionOptions.merge(transactionOptions)
         var cleanedOptions = CodableTransaction.emptyTransaction
         cleanedOptions.from = mergedOptions.from
         cleanedOptions.to = mergedOptions.to
+
+        if let attachedKeystoreManager = self.web3.provider.attachedKeystoreManager {
+            guard let from = mergedOptions.from else {
+                throw Web3Error.inputError(desc: "No 'from' field provided")
+            }
+            do {
+                try Web3Signer.signTX(transaction: &assembledTransaction, keystore: attachedKeystoreManager, account: from, password: password)
+            } catch {
+                throw Web3Error.inputError(desc: "Failed to locally sign a transaction")
+            }
+            return try await self.web3.eth.send(raw: assembledTransaction)
+        }
         // MARK: Sending Data flow
-        return try await web3.eth.send(transaction, transactionOptions: cleanedOptions, password: password)
+        return try await web3.eth.send(assembledTransaction)
     }
 
     // FIXME: Rewrite this to CodableTransaction