Add gasPrice to request

horizontalsystems · Nov 19, 2019 · ac01c20 · ac01c20
1 parent b7ab480
commit ac01c20
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 15 deletions.
diff --git a/Erc20Kit/Erc20Kit/Core/Erc20Kit.swift b/Erc20Kit/Erc20Kit/Core/Erc20Kit.swift
@@ -13,7 +13,7 @@ public class Erc20Kit {
 
     private let state: KitState
 
-    init(ethereumKit: EthereumKit, transactionManager: ITransactionManager, balanceManager: IBalanceManager, gasLimit: Int = 1_000_000, state: KitState = KitState()) {
+    init(ethereumKit: EthereumKit, transactionManager: ITransactionManager, balanceManager: IBalanceManager, gasLimit: Int, state: KitState = KitState()) {
         self.ethereumKit = ethereumKit
         self.transactionManager = transactionManager
         self.balanceManager = balanceManager
@@ -100,7 +100,7 @@ extension Erc20Kit {
         state.transactionsSubject.asObservable()
     }
 
-    public func estimateGas(to: String, contractAddress: String, value: String) -> Single<Int> {
+    public func estimateGas(to: String, contractAddress: String, value: String, gasPrice: Int?) -> Single<Int> {
         guard let amountValue = BigUInt(value) else {
             return Single.error(ValidationError.invalidValue)
         }
@@ -109,7 +109,7 @@ extension Erc20Kit {
             let toAddress = try convert(address: to)
             let data = transactionManager.transactionContractData(to: toAddress, value: amountValue)
 
-            return ethereumKit.estimateGas(contractAddress: contractAddress, amount: nil, gasLimit: gasLimit, data: data)
+            return ethereumKit.estimateGas(contractAddress: contractAddress, amount: nil, gasLimit: gasLimit, gasPrice: gasPrice, data: data)
         } catch {
             return Single.error(ValidationError.invalidAddress)
         }
@@ -151,7 +151,7 @@ extension Erc20Kit: IBalanceManagerDelegate {
 
 extension Erc20Kit {
 
-    public static func instance(ethereumKit: EthereumKit, contractAddress: String) throws -> Erc20Kit {
+    public static func instance(ethereumKit: EthereumKit, contractAddress: String, gasLimit: Int = 1_000_000) throws -> Erc20Kit {
         let databaseFileName = "\(ethereumKit.uniqueId)-\(contractAddress)"
 
         guard let contractAddress = Data(hex: contractAddress) else {
@@ -167,7 +167,7 @@ extension Erc20Kit {
         var transactionManager: ITransactionManager = TransactionManager(contractAddress: contractAddress, address: address, storage: storage, dataProvider: dataProvider, transactionBuilder: transactionBuilder)
         var balanceManager: IBalanceManager = BalanceManager(contractAddress: contractAddress, address: address, storage: storage, dataProvider: dataProvider)
 
-        let erc20Kit = Erc20Kit(ethereumKit: ethereumKit, transactionManager: transactionManager, balanceManager: balanceManager)
+        let erc20Kit = Erc20Kit(ethereumKit: ethereumKit, transactionManager: transactionManager, balanceManager: balanceManager, gasLimit: gasLimit)
 
         transactionManager.delegate = erc20Kit
         balanceManager.delegate = erc20Kit

diff --git a/EthereumKit/EthereumKit/Api/Core/ApiBlockchain.swift b/EthereumKit/EthereumKit/Api/Core/ApiBlockchain.swift
@@ -194,8 +194,8 @@ extension ApiBlockchain: IBlockchain {
                 }
     }
 
-    func estimateGas(from: String?, contractAddress: String, amount: BigUInt?, gasLimit: Int?, data: Data?) -> Single<Int> {
-        rpcApiProvider.getEstimateGas(from: from, contractAddress: contractAddress, amount: amount, gasLimit: gasLimit, data: data?.toHexString())
+    func estimateGas(from: String?, contractAddress: String, amount: BigUInt?, gasLimit: Int?, gasPrice: Int?, data: Data?) -> Single<Int> {
+        rpcApiProvider.getEstimateGas(from: from, contractAddress: contractAddress, amount: amount, gasLimit: gasLimit, gasPrice: gasPrice, data: data?.toHexString())
                 .flatMap { (value: String) -> Single<Int> in
                     guard let data = Int(value.stripHexPrefix(), radix: 16) else {
                         return Single.error(EthereumKit.ApiError.invalidData)

diff --git a/EthereumKit/EthereumKit/Api/Core/ApiProtocols.swift b/EthereumKit/EthereumKit/Api/Core/ApiProtocols.swift
@@ -11,7 +11,7 @@ protocol IRpcApiProvider {
     func getLogs(address: Data?, fromBlock: Int?, toBlock: Int?, topics: [Any?]) -> Single<[EthereumLog]>
     func getStorageAt(contractAddress: String, position: String, blockNumber: Int?) -> Single<String>
     func call(contractAddress: String, data: String, blockNumber: Int?) -> Single<String>
-    func getEstimateGas(from: String?, contractAddress: String, amount: BigUInt?, gasLimit: Int?, data: String?) -> Single<String>
+    func getEstimateGas(from: String?, contractAddress: String, amount: BigUInt?, gasLimit: Int?, gasPrice: Int?, data: String?) -> Single<String>
     func getBlock(byNumber: Int) -> Single<Block>
 }
 

diff --git a/EthereumKit/EthereumKit/Api/Core/InfuraApiProvider.swift b/EthereumKit/EthereumKit/Api/Core/InfuraApiProvider.swift
@@ -150,7 +150,7 @@ extension InfuraApiProvider: IRpcApiProvider {
         infuraStringSingle(method: "eth_call", params: [["to": contractAddress, "data": data], "latest"])
     }
 
-    func getEstimateGas(from: String?, contractAddress: String, amount: BigUInt?, gasLimit: Int?, data: String?) -> Single<String> {
+    func getEstimateGas(from: String?, contractAddress: String, amount: BigUInt?, gasLimit: Int?, gasPrice: Int?, data: String?) -> Single<String> {
         var params = [String: Any]()
         if let from = from {
             params["from"] = from.lowercased()
@@ -161,6 +161,9 @@ extension InfuraApiProvider: IRpcApiProvider {
         if let gasLimit = gasLimit {
             params["gas"] = "0x" + String(gasLimit, radix: 16).removeLeadingZeros()
         }
+        if let gasPrice = gasPrice {
+            params["gas"] = "0x" + String(gasPrice, radix: 16).removeLeadingZeros()
+        }
         params["to"] = contractAddress.lowercased()
         params["data"] = data
         return infuraStringSingle(method: "eth_estimateGas", params: [params])

diff --git a/EthereumKit/EthereumKit/Core/EthereumKit.swift b/EthereumKit/EthereumKit/Core/EthereumKit.swift
@@ -143,8 +143,8 @@ extension EthereumKit {
         blockchain.call(contractAddress: contractAddress, data: data, blockHeight: blockHeight)
     }
 
-    public func estimateGas(contractAddress: String, amount: BigUInt?, gasLimit: Int?, data: Data?) -> Single<Int> {
-        blockchain.estimateGas(from: receiveAddress, contractAddress: contractAddress, amount: amount, gasLimit: gasLimit, data: data)
+    public func estimateGas(contractAddress: String, amount: BigUInt?, gasLimit: Int?, gasPrice: Int?, data: Data?) -> Single<Int> {
+        blockchain.estimateGas(from: receiveAddress, contractAddress: contractAddress, amount: amount, gasLimit: gasLimit, gasPrice: gasPrice, data: data)
     }
 
     public func statusInfo() -> [(String, Any)] {

diff --git a/EthereumKit/EthereumKit/Core/Protocols.swift b/EthereumKit/EthereumKit/Core/Protocols.swift
@@ -18,7 +18,7 @@ protocol IBlockchain {
     func getLogsSingle(address: Data?, topics: [Any?], fromBlock: Int, toBlock: Int, pullTimestamps: Bool) -> Single<[EthereumLog]>
     func getStorageAt(contractAddress: Data, positionData: Data, blockHeight: Int) -> Single<Data>
     func call(contractAddress: Data, data: Data, blockHeight: Int?) -> Single<Data>
-    func estimateGas(from: String?, contractAddress: String, amount: BigUInt?, gasLimit: Int?, data: Data?) -> Single<Int>
+    func estimateGas(from: String?, contractAddress: String, amount: BigUInt?, gasLimit: Int?, gasPrice: Int?, data: Data?) -> Single<Int>
 }
 
 protocol IBlockchainDelegate: class {

diff --git a/EthereumKit/EthereumKit/Spv/Core/SpvBlockchain.swift b/EthereumKit/EthereumKit/Spv/Core/SpvBlockchain.swift
@@ -97,8 +97,8 @@ extension SpvBlockchain: IBlockchain {
                 }
     }
 
-    func estimateGas(from: String?, contractAddress: String, amount: BigUInt?, gasLimit: Int?, data: Data?) -> Single<Int> {
-        rpcApiProvider.getEstimateGas(from: from, contractAddress: contractAddress, amount: amount, gasLimit: gasLimit, data: data?.toHexString())
+    func estimateGas(from: String?, contractAddress: String, amount: BigUInt?, gasLimit: Int?, gasPrice: Int?, data: Data?) -> Single<Int> {
+        rpcApiProvider.getEstimateGas(from: from, contractAddress: contractAddress, amount: amount, gasLimit: gasLimit, gasPrice: gasPrice, data: data?.toHexString())
                 .flatMap { (value: String) -> Single<Int> in
                     guard let data = Int(value.stripHexPrefix(), radix: 16) else {
                         return Single.error(EthereumKit.ApiError.invalidData)

diff --git a/EthereumKitDemo/EthereumKitDemo/Adapters/Erc20Adapter.swift b/EthereumKitDemo/EthereumKitDemo/Adapters/Erc20Adapter.swift
@@ -122,7 +122,7 @@ extension Erc20Adapter: IAdapter {
     }
 
     func estimatedGasLimit(to address: String, value: Decimal) -> Single<Int> {
-        erc20Kit.estimateGas(to: address, contractAddress: contractAddress, value: value.roundedString(decimal: decimal))
+        erc20Kit.estimateGas(to: address, contractAddress: contractAddress, value: value.roundedString(decimal: decimal), gasPrice: 5_000_000_000)
     }
 
 }