Update clients code for changes made

Author: yaroslavyaroslav

Sources/web3swift/Web3/Web3+EventParser.swift

@@ -118,7 +118,7 @@ extension web3.web3contract.EventParser {
             throw Web3Error.inputError(desc: "Can not mix parsing specific block and using block range filter")
         }
 
-        let res = try await self.web3.eth.blockBy(number: blockNumber)
+        let res = try await self.web3.eth.block(by: blockNumber)
 
         return try await self.parseBlockPromise(res)
     }

Sources/web3swift/Web3/Web3+GasOracle.swift

@@ -138,15 +138,13 @@ extension Web3 {
 
             // TODO: Make me work with cache
             let blocks = try await withThrowingTaskGroup(of: Block.self, returning: [Block].self) { group in
-
                 (latestBlockNumber - blockCount ... latestBlockNumber)
-                    .forEach { transaction in
+                    .forEach { block in
                         group.addTask {
-                            try await self.eth.getBlockByNumber(transaction, fullTransactions: true)
+                            try await self.eth.block(by: .exact(block), fullTransactions: true)
                         }
                     }
 
-
                 var collected = [Block]()
 
                 for try await value in group {

Sources/web3swift/Web3/Web3+Structures.swift

@@ -291,6 +291,8 @@ extension Block {
     }
 }
 
+extension Block: APIResultType { }
+
 public struct EventParserResult: EventParserResultProtocol {
     public var eventName: String
     public var transactionReceipt: TransactionReceipt?

Tests/web3swiftTests/localTests/web3swiftBasicLocalNodeTests.swift

@@ -61,8 +61,8 @@ class web3swiftBasicLocalNodeTests: XCTestCase {
         sendTx.transactionOptions.value = valueToSend
         sendTx.transactionOptions.from = allAddresses[0]
 
-        let balanceBeforeTo = try await web3.eth.getBalance(address: sendToAddress)
-        let balanceBeforeFrom = try await web3.eth.getBalance(address: allAddresses[0])
+        let balanceBeforeTo = try await web3.eth.getBalance(for: sendToAddress)
+        let balanceBeforeFrom = try await web3.eth.getBalance(for: allAddresses[0])
         print("Balance before to: " + balanceBeforeTo.description)
         print("Balance before from: " + balanceBeforeFrom.description)
 
@@ -86,8 +86,8 @@ class web3swiftBasicLocalNodeTests: XCTestCase {
         print(details)
 
 
-        let balanceAfterTo = try await web3.eth.getBalance(address: sendToAddress)
-        let balanceAfterFrom = try await web3.eth.getBalance(address: allAddresses[0])
+        let balanceAfterTo = try await web3.eth.getBalance(for: sendToAddress)
+        let balanceAfterFrom = try await web3.eth.getBalance(for: allAddresses[0])
         print("Balance after to: " + balanceAfterTo.description)
         print("Balance after from: " + balanceAfterFrom.description)
 

Tests/web3swiftTests/localTests/web3swiftPromisesTests.swift

@@ -18,7 +18,7 @@ class web3swiftPromisesTests: XCTestCase {
 
     func testGetBalancePromise() async throws {
         let web3 = try await Web3.new(URL.init(string: "http://127.0.0.1:8545")!)
-        let balance = try await web3.eth.getBalance(address: "0xe22b8979739D724343bd002F9f432F5990879901")
+        let balance = try await web3.eth.getBalance(for: "0xe22b8979739D724343bd002F9f432F5990879901")
         print(balance)
     }
 

Tests/web3swiftTests/localTests/web3swiftUserCases.swift

@@ -106,7 +106,7 @@ class web3swiftUserCases: XCTestCase {
     func testNonBatchedRequest() async throws {
         let web3 = try await Web3.new(URL.init(string: "http://127.0.0.1:8545")!)
         let address = EthereumAddress("0xe22b8979739D724343bd002F9f432F5990879901")!
-        let balanceResult = try await web3.eth.getBalance(address: address)
+        let balanceResult = try await web3.eth.getBalance(for: address)
         print(balanceResult)
     }
 }

Tests/web3swiftTests/remoteTests/InfuraTests.swift

@@ -15,7 +15,7 @@ class InfuraTests: XCTestCase {
         do {
             let web3 = await Web3.InfuraMainnetWeb3(accessToken: Constants.infuraToken)
             let address = EthereumAddress("0xd61b5ca425F8C8775882d4defefC68A6979DBbce")!
-            let balance = try await web3.eth.getBalance(address: address)
+            let balance = try await web3.eth.getBalance(for: address)
             let balString = Web3.Utils.formatToEthereumUnits(balance, toUnits: .eth, decimals: 3)
             print(balString!)
         } catch {
@@ -32,13 +32,13 @@ class InfuraTests: XCTestCase {
 
     func testGetBlockByNumber1() async throws {
         let web3 = await Web3.InfuraMainnetWeb3(accessToken: Constants.infuraToken)
-        let result = try await web3.eth.getBlockByNumber("latest", fullTransactions: false)
+        let result = try await web3.eth.getBlockByNumber(.latest, fullTransactions: false)
         print(result)
     }
 
     func testGetBlockByNumber2() async throws {
         let web3 = await Web3.InfuraMainnetWeb3(accessToken: Constants.infuraToken)
-        let result = try await web3.eth.getBlockByNumber(UInt(5184323), fullTransactions: true)
+        let result = try await web3.eth.getBlockByNumber(.exact(5184323), fullTransactions: true)
         print(result)
         let transactions = result.transactions
         for transaction in transactions {
@@ -54,7 +54,7 @@ class InfuraTests: XCTestCase {
     func testGetBlockByNumber3() async throws {
         do {
             let web3 = await Web3.InfuraMainnetWeb3(accessToken: Constants.infuraToken)
-            let _ = try await web3.eth.getBlockByNumber(UInt(1000000000), fullTransactions: true)
+            let _ = try await web3.eth.getBlockByNumber(.exact(1000000000), fullTransactions: true)
             XCTFail()
         } catch {