Merge pull request #632 from JeneaVranceanu/hot-fix/data-to-hex-string

Author: yaroslavyaroslav

Sources/Core/Contract/ContractProtocol.swift

@@ -225,7 +225,6 @@ extension DefaultContractProtocol {
            let parameters = parameters,
            !parameters.isEmpty {
             guard constructor.inputs.count == parameters.count,
-                  // FIXME: This should be zipped, because Arrays don't guarantee it's elements order
                   let encodedData = constructor.encodeParameters(parameters) else {
                 NSLog("Constructor encoding will fail as the number of input arguments doesn't match the number of given arguments.")
                 return nil

Sources/Core/EthereumABI/ABIEncoding.swift

@@ -137,7 +137,6 @@ extension ABIEncoder {
     ///   - values: Contract values of a given element to encode
     /// - Returns: Encoded data
     public static func encode(types: [ABI.Element.InOut], values: [AnyObject]) -> Data? {
-        // FIXME: This should be zipped, because Arrays don't guarantee it's elements order
         guard types.count == values.count else {return nil}
         let params = types.compactMap { (el) -> ABI.Element.ParameterType in
             return el.type
@@ -152,7 +151,6 @@ extension ABIEncoder {
     ///   - values: Contract values of a given element to encode
     /// - Returns: Encoded data
     public static func encode(types: [ABI.Element.ParameterType], values: [AnyObject]) -> Data? {
-        // FIXME: This should be zipped, because Arrays don't guarantee it's elements order
         guard types.count == values.count else {return nil}
         var tails = [Data]()
         var heads = [Data]()

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

@@ -9,7 +9,7 @@ import Core
 
 extension Web3.Eth {
     public func callTransaction(_ transaction: CodableTransaction) async throws -> Data {
-        let request: APIRequest = .call(transaction, transaction.callOnBlock ?? .latest)
-        return try await APIRequest.sendRequest(with: self.provider, for: request).result
+        let request = APIRequest.call(transaction, transaction.callOnBlock ?? .latest)
+        return try await APIRequest.sendRequest(with: provider, for: request).result
     }
 }

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

@@ -10,6 +10,7 @@ import Core
 
 extension Web3.Eth {
     public func estimateGas(for transaction: CodableTransaction, onBlock: BlockNumber = .latest) async throws -> BigUInt {
-        try await APIRequest.sendRequest(with: provider, for: .estimateGas(transaction, onBlock)).result
+        let request = APIRequest.estimateGas(transaction, onBlock)
+        return try await APIRequest.sendRequest(with: provider, for: request).result
     }
 }

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

@@ -9,7 +9,7 @@ import Core
 
 extension Web3.Eth {
     func feeHistory(blockCount: BigUInt, block: BlockNumber, percentiles:[Double]) async throws -> Oracle.FeeHistory {
-        let requestCall: APIRequest = .feeHistory(blockCount, block, percentiles)
-        return try await APIRequest.sendRequest(with: web3.provider, for: requestCall).result
+        let request = APIRequest.feeHistory(blockCount, block, percentiles)
+        return try await APIRequest.sendRequest(with: web3.provider, for: request).result
     }
 }

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

@@ -9,8 +9,8 @@ import Core
 
 extension Web3.Eth {
     public func ownedAccounts() async throws -> [EthereumAddress] {
-        guard self.web3.provider.attachedKeystoreManager == nil else {
-            return try self.web3.wallet.getAccounts()
+        guard web3.provider.attachedKeystoreManager == nil else {
+            return try web3.wallet.getAccounts()
         }
         return try await APIRequest.sendRequest(with: web3.provider, for: .getAccounts).result
     }

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

@@ -9,7 +9,7 @@ import BigInt
 
 extension Web3.Eth {
     public func getBalance(for address: EthereumAddress, onBlock: BlockNumber = .latest) async throws -> BigUInt {
-        let requestCall: APIRequest = .getBalance(address.address, onBlock)
-        return try await APIRequest.sendRequest(with: web3.provider, for: requestCall).result
+        let request = APIRequest.getBalance(address.address, onBlock)
+        return try await APIRequest.sendRequest(with: web3.provider, for: request).result
     }
 }

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

@@ -10,8 +10,7 @@ import Core
 
 extension Web3.Eth {
     public func block(by hash: Data, fullTransactions: Bool = false) async throws -> Block {
-        guard let hexString = String(data: hash, encoding: .utf8)?.addHexPrefix() else { throw Web3Error.dataError }
-        let requestCall: APIRequest = .getBlockByHash(hash.toHexString().addHexPrefix(), fullTransactions)
-        return try await APIRequest.sendRequest(with: self.provider, for: requestCall).result
+        let request = APIRequest.getBlockByHash(hash.toHexString().addHexPrefix(), fullTransactions)
+        return try await APIRequest.sendRequest(with: provider, for: request).result
     }
 }

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

@@ -10,12 +10,12 @@ import Core
 
 extension Web3.Eth {
     public func block(by hash: Hash, fullTransactions: Bool = false) async throws -> Block {
-        let requestCall: APIRequest = .getBlockByHash(hash, fullTransactions)
-        return try await APIRequest.sendRequest(with: self.provider, for: requestCall).result
+        let request = APIRequest.getBlockByHash(hash, fullTransactions)
+        return try await APIRequest.sendRequest(with: provider, for: request).result
     }
 
     public func block(by number: BlockNumber, fullTransactions: Bool = false) async throws -> Block {
-        let requestCall: APIRequest = .getBlockByNumber(number, fullTransactions)
-        return try await APIRequest.sendRequest(with: self.provider, for: requestCall).result
+        let request = APIRequest.getBlockByNumber(number, fullTransactions)
+        return try await APIRequest.sendRequest(with: provider, for: request).result
     }
 }

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

@@ -9,6 +9,7 @@ import BigInt
 
 extension Web3.Eth { 
     public func code(for address: EthereumAddress, onBlock: BlockNumber = .latest) async throws -> Hash {
-        try await APIRequest.sendRequest(with: self.provider, for: .getCode(address.address, onBlock)).result
+        let request = APIRequest.getCode(address.address, onBlock)
+        return try await APIRequest.sendRequest(with: provider, for: request).result
     }
 }