restore gas oracle

Author: pharms-eth

Sources/web3swift/Web3/Web3+GasOracle.swift

@@ -131,11 +131,26 @@ extension Web3 {
             guard latestBlockNumber != 0 else { return [] }
 
             // TODO: Make me work with cache
-            let lastNthBlockGasPrice = try (latestBlockNumber - blockCount ... latestBlockNumber)
-                .map {
-                    try eth.getBlockByNumber($0, fullTransactions: true)
+            let blocks = try await withThrowingTaskGroup(of: Block.self, returning: [Block].self) { group in
+
+                (latestBlockNumber - blockCount ... latestBlockNumber)
+                    .forEach { transaction in
+                        group.addTask {
+                            try await self.eth.getBlockByNumber(transaction, fullTransactions: true)
+                        }
+                    }
+
+
+                var collected = [Block]()
+
+                for try await value in group {
+                    collected.append(value)
                 }
-                .flatMap { b -> [EthereumTransaction] in
+
+                return collected
+            }
+
+            let lastNthBlockGasPrice = blocks.flatMap { b -> [EthereumTransaction] in
                     b.transactions.compactMap { t -> EthereumTransaction? in
                         guard case let .transaction(transaction) = t else { return nil }
                         return transaction
@@ -154,8 +169,8 @@ public extension Web3.Oracle {
     ///
     /// - Returns: `[percentile_1, percentile_2, percentile_3, ...].count == self.percentile.count`
     /// empty array if failed to predict. By default there's 3 percentile.
-    var baseFeePercentiles: [BigUInt] {
-        guard let value = try? suggestBaseFee() else { return [] }
+    func baseFeePercentiles() async -> [BigUInt] {
+        guard let value = try? await suggestBaseFee() else { return [] }
         return value
     }
 
@@ -164,8 +179,8 @@ public extension Web3.Oracle {
     ///
     /// - Returns: `[percentile_1, percentile_2, percentile_3, ...].count == self.percentile.count`
     /// empty array if failed to predict. By default there's 3 percentile.
-    var tipFeePercentiles: [BigUInt] {
-        guard let value = try? suggestTipValue() else { return [] }
+    func tipFeePercentiles() async -> [BigUInt] {
+        guard let value = try? await suggestTipValue() else { return [] }
         return value
     }
 
@@ -174,13 +189,13 @@ public extension Web3.Oracle {
     ///
     /// - Returns: `[percentile_1, percentile_2, percentile_3, ...].count == self.percentile.count`
     /// nil if failed to predict. By default there's 3 percentile.
-    var bothFeesPercentiles: (baseFee: [BigUInt], tip: [BigUInt])? {
+    func bothFeesPercentiles() async -> (baseFee: [BigUInt], tip: [BigUInt])? {
         var baseFeeArr: [BigUInt] = []
         var tipArr: [BigUInt] = []
-        if let baseFee = try? suggestBaseFee() {
+        if let baseFee = try? await suggestBaseFee() {
             baseFeeArr = baseFee
         }
-        if let tip = try? suggestTipValue() {
+        if let tip = try? await suggestTipValue() {
             tipArr = tip
         }
         return (baseFee: baseFeeArr, tip: tipArr)
@@ -191,8 +206,8 @@ public extension Web3.Oracle {
     ///
     /// - Returns: `[percentile_1, percentile_2, percentile_3, ...].count == self.percentile.count`
     /// empty array if failed to predict. By default there's 3 percentile.
-    var gasPriceLegacyPercentiles: [BigUInt] {
-        guard let value = try? suggestGasFeeLegacy() else { return [] }
+    func gasPriceLegacyPercentiles() async -> [BigUInt] {
+        guard let value = try? await suggestGasFeeLegacy() else { return [] }
         return value
     }
 }