add async

Author: pharms-eth

Sources/web3swift/Utils/Hooks/NonceMiddleware.swift

@@ -21,30 +21,27 @@ extension Web3.Utils {
         public var synchronizationPeriod: TimeInterval = 300.0 // 5 minutes
         var lastSyncTime: Date = Date()
 
-        public func functionToRun() {
+        public func functionToRun() async {
             guard let w3 = self.web3 else {return}
-            var allPromises = [Promise<BigUInt>]()
-            allPromises.reserveCapacity(self.nonceLookups.keys.count)
-            let knownKeys = Array(self.nonceLookups.keys)
-            for k in knownKeys {
-                let promise = w3.eth.getTransactionCountPromise(address: k, onBlock: "latest")
-                allPromises.append(promise)
-            }
-            when(resolved: allPromises).done(on: w3.requestDispatcher.queue) {results in
-                self.queue.async {
-                    var i = 0
-                    for res in results {
-                        switch res {
-                        case .fulfilled(let newNonce):
-                            let key = knownKeys[i]
-                            self.nonceLookups[key] = newNonce
-                            i = i + 1
-                        default:
-                            i = i + 1
-                        }
+
+            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.getTransactionCountPromise(address: key, onBlock: "latest")
                     }
                 }
 
+                var i = 0
+
+                for await value in group {
+                    let key = knownKeys[i]
+                    self.nonceLookups[key] = value
+                    i = i + 1
+                }
+
             }
         }
 
@@ -98,9 +95,9 @@ extension Web3.Utils {
         public func attach(_ web3: web3) {
             self.web3 = web3
             web3.eventLoop.monitoredUserFunctions.append(self)
-            let preHook = AssemblyHook(queue: web3.requestDispatcher.queue, function: self.preAssemblyFunction)
+            let preHook = AssemblyHook(function: self.preAssemblyFunction)
             web3.preAssemblyHooks.append(preHook)
-            let postHook = SubmissionResultHook(queue: web3.requestDispatcher.queue, function: self.postSubmissionFunction)
+            let postHook = SubmissionResultHook(function: self.postSubmissionFunction)
             web3.postSubmissionHooks.append(postHook)
         }
 

Sources/web3swift/Web3/Web3+Eventloop.swift

@@ -39,7 +39,7 @@ extension web3.Eventloop {
 
         for prop in self.monitoredUserFunctions {
             Task {
-                prop.functionToRun()
+                await prop.functionToRun()
             }
         }
     }

Sources/web3swift/Web3/Web3+Protocols.swift

@@ -83,5 +83,5 @@ extension Networks: Equatable {
 
 public protocol EventLoopRunnableProtocol {
     var name: String {get}
-    func functionToRun()
+    func functionToRun() async
 }