Further Resolver enhancement

This one is #645 evolution based (mostly) on @JeneaVranceanu comments.

Author: yaroslavyaroslav

Sources/Core/Transaction/Policies.swift

@@ -54,7 +54,7 @@ public struct Policies {
         }
 
     public static var auto: Policies {
-        return Policies(
+        Policies(
             noncePolicy: .latest,
             gasLimitPolicy: .automatic,
             gasPricePolicy: .automatic,

Sources/web3swift/Operations/ReadTransaction.swift renamed to Sources/web3swift/Operations/ReadOperation.swift

@@ -16,9 +16,11 @@ public class ReadOperation {
     public var method: String
     public var data: Data? { transaction.data }
 
-    var resolver: PolicyResolver
+    var policyResolver: PolicyResolver
     var web3: Web3
 
+    public var provider: Web3Provider { web3.provider }
+
     // FIXME: Rewrite this to CodableTransaction
     public init(transaction: CodableTransaction = CodableTransaction.emptyTransaction,
                 web3 web3Instance: Web3,
@@ -31,12 +33,12 @@ public class ReadOperation {
         if let network = self.web3.provider.network {
             self.transaction.chainID = network.chainID
         }
-        self.resolver = PolicyResolver(provider: web3.provider)
+        self.policyResolver = PolicyResolver(provider: web3.provider)
     }
 
     // TODO: Remove type erasing here, some broad wide protocol should be added instead
     public func callContractMethod() async throws -> [String: Any] {
-        try await resolver.resolveAll(for: &transaction)
+        try await policyResolver.resolveAll(for: &transaction)
         // MARK: Read data from ABI flow
         // FIXME: This should be dropped, and after `execute()` call, just to decode raw data.
         let data: Data = try await self.web3.eth.callTransaction(transaction)

Sources/web3swift/Operations/WriteOperation.swift

@@ -11,12 +11,12 @@ import Core
 public class WriteOperation: ReadOperation {
 
     // FIXME: Rewrite this to CodableTransaction
-    /// Sends (raw) transaction for write operation.
+    /// Sends raw transaction for write operation.
     /// - Parameters:
     ///   - password: Password for private key.
     ///   - policies: Custom policies for how to resolve (optional). Default is auto.
     public func writeToChain(password: String, policies: Policies = .auto) async throws -> TransactionSendingResult {
-        try await resolver.resolveAll(for: &transaction, with: policies)
+        try await policyResolver.resolveAll(for: &transaction, with: policies)
         if let attachedKeystoreManager = self.web3.provider.attachedKeystoreManager {
             do {
                 try Web3Signer.signTX(transaction: &transaction,

Sources/web3swift/Utils/Hooks/NonceMiddleware.swift

@@ -8,10 +8,6 @@ import BigInt
 import Core
 
 extension Web3.Utils {
-
-//    fileprivate typealias AssemblyHook = web3.AssemblyHook
-//    fileprivate typealias SubmissionResultHook = web3.SubmissionResultHook
-
     public class NonceMiddleware: EventLoopRunnableProtocol {
         var web3: Web3?
         var nonceLookups: [EthereumAddress: BigUInt] = [EthereumAddress: BigUInt]()
@@ -21,16 +17,12 @@ extension Web3.Utils {
         var lastSyncTime: Date = Date()
 
         public func functionToRun() async {
-            guard let w3 = self.web3 else {return}
-
+            guard let w3 = self.web3 else { return }
             let knownKeys = Array(nonceLookups.keys)
 
             await withTaskGroup(of: BigUInt?.self, returning: Void.self) { group -> Void in
-
                 knownKeys.forEach { key in
-                    group.addTask {
-                        try? await w3.eth.getTransactionCount(for: key, onBlock: .latest)
-                    }
+                    group.addTask { try? await w3.eth.getTransactionCount(for: key, onBlock: .latest) }
                 }
 
                 var i = 0
@@ -40,65 +32,9 @@ extension Web3.Utils {
                     self.nonceLookups[key] = value
                     i = i + 1
                 }
-
             }
         }
 
-        public init() {
-
-        }
-
-        // FIXME: Rewrite this to CodableTransaction
-//        func preAssemblyFunction(tx: inout CodableTransaction, contract: EthereumContract) -> (CodableTransaction, EthereumContract, Bool) {
-//            guard let from = tx.from else {
-//                // do nothing
-//                return (tx, contract, true)
-//            }
-//            guard let knownNonce = self.nonceLookups[from] else {
-//                return (tx, contract, true)
-//            }
-//
-//            let newNonce = knownNonce + 1
-//
-//            self.queue.async {
-//                self.nonceLookups[from] = newNonce
-//            }
-//
-//            // FIXME:
-//            tx.noncePolicy = .exact(newNonce)
-//            return (tx, contract, true)
-//        }
-
-//        func postSubmissionFunction(result: TransactionSendingResult) {
-//            guard let from = result.transaction.sender else {
-//                // do nothing
-//                return
-//            }
-//
-//            let newNonce = result.transaction.nonceRe
-//
-//            if let knownNonce = self.nonceLookups[from] {
-//                if knownNonce != newNonce {
-//                    self.queue.async {
-//                        self.nonceLookups[from] = newNonce
-//                    }
-//                }
-//                return
-//            }
-//            self.queue.async {
-//                self.nonceLookups[from] = newNonce
-//            }
-//            return
-//        }
-
-//        public func attach(_ web3: web3) {
-//            self.web3 = web3
-//            web3.eventLoop.monitoredUserFunctions.append(self)
-//            let preHook = AssemblyHook(function: self.preAssemblyFunction)
-//            web3.preAssemblyHooks.append(preHook)
-//            let postHook = SubmissionResultHook(function: self.postSubmissionFunction)
-//            web3.postSubmissionHooks.append(postHook)
-//        }
-
+        public init() { }
     }
 }

Sources/web3swift/Web3/Web3+Resolver.swift

@@ -17,6 +17,7 @@ public class PolicyResolver {
     }
 
     public func resolveAll(for tx: inout CodableTransaction, with policies: Policies = .auto) async throws {
+        // FIXME: This should throw an appropriate error, since this condition is critical to whole function tast
         if tx.from != nil || tx.sender != nil {
             // Nonce should be resolved first - as this might be needed for some
             // tx's gas estimation