Make GasPrice optional for estimateGas request

horizontalsystems · Nov 19, 2024 · a0ac622 · a0ac622
1 parent a5eff38
commit a0ac622
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 7 deletions.
diff --git a/ethereumkit/src/main/java/io/horizontalsystems/ethereumkit/api/core/RpcBlockchain.kt b/ethereumkit/src/main/java/io/horizontalsystems/ethereumkit/api/core/RpcBlockchain.kt
@@ -144,7 +144,7 @@ class RpcBlockchain(
         return syncer.single(GetTransactionCountJsonRpc(address, defaultBlockParameter))
     }
 
-    override fun estimateGas(to: Address?, amount: BigInteger?, gasLimit: Long?, gasPrice: GasPrice, data: ByteArray?): Single<Long> {
+    override fun estimateGas(to: Address?, amount: BigInteger?, gasLimit: Long?, gasPrice: GasPrice?, data: ByteArray?): Single<Long> {
         return syncer.single(EstimateGasJsonRpc(address, to, amount, gasLimit, gasPrice, data))
     }
 

diff --git a/ethereumkit/src/main/java/io/horizontalsystems/ethereumkit/api/jsonrpc/EstimateGasJsonRpc.kt b/ethereumkit/src/main/java/io/horizontalsystems/ethereumkit/api/jsonrpc/EstimateGasJsonRpc.kt
@@ -10,22 +10,25 @@ class EstimateGasJsonRpc(
         @Transient val to: Address?,
         @Transient val amount: BigInteger?,
         @Transient val gasLimit: Long?,
-        @Transient val gasPrice: GasPrice,
+        @Transient val gasPrice: GasPrice?,
         @Transient val data: ByteArray?
 ) : LongJsonRpc(
         method = "eth_estimateGas",
         params = listOf(estimateGasParams(from, to, amount, gasLimit, gasPrice, data))
 ) {
 
     companion object {
-        private fun estimateGasParams(from: Address, to: Address?, amount: BigInteger?, gasLimit: Long?, gasPrice: GasPrice, data: ByteArray?): EstimateGasParams {
+        private fun estimateGasParams(from: Address, to: Address?, amount: BigInteger?, gasLimit: Long?, gasPrice: GasPrice?, data: ByteArray?): EstimateGasParams {
             return when (gasPrice) {
                 is GasPrice.Eip1559 -> {
                     EstimateGasParams.Eip1559(from, to, amount, gasLimit, gasPrice.maxFeePerGas, gasPrice.maxPriorityFeePerGas, data)
                 }
                 is GasPrice.Legacy -> {
                     EstimateGasParams.Legacy(from, to, amount, gasLimit, gasPrice.legacyGasPrice, data)
                 }
+                null -> {
+                    EstimateGasParams.NoGasPrice(from, to, amount, gasLimit, data)
+                }
             }
         }
     }
@@ -53,5 +56,15 @@ class EstimateGasJsonRpc(
                 val maxPriorityFeePerGas: Long,
                 val data: ByteArray?
         ) : EstimateGasParams()
+
+        data class NoGasPrice(
+                val from: Address,
+                val to: Address?,
+                @SerializedName("value")
+                val amount: BigInteger?,
+                @SerializedName("gas")
+                val gasLimit: Long?,
+                val data: ByteArray?
+        ) : EstimateGasParams()
     }
 }
diff --git a/ethereumkit/src/main/java/io/horizontalsystems/ethereumkit/core/EthereumKit.kt b/ethereumkit/src/main/java/io/horizontalsystems/ethereumkit/core/EthereumKit.kt
@@ -188,11 +188,11 @@ class EthereumKit(
         return blockchain.estimateGas(to, resolvedAmount, chain.gasLimit, gasPrice, null)
     }
 
-    fun estimateGas(to: Address?, value: BigInteger?, gasPrice: GasPrice, data: ByteArray?): Single<Long> {
+    fun estimateGas(to: Address?, value: BigInteger?, gasPrice: GasPrice?, data: ByteArray?): Single<Long> {
         return blockchain.estimateGas(to, value, chain.gasLimit, gasPrice, data)
     }
 
-    fun estimateGas(transactionData: TransactionData, gasPrice: GasPrice): Single<Long> {
+    fun estimateGas(transactionData: TransactionData, gasPrice: GasPrice? = null): Single<Long> {
         return estimateGas(transactionData.to, transactionData.value, gasPrice, transactionData.input)
     }
 

diff --git a/ethereumkit/src/main/java/io/horizontalsystems/ethereumkit/core/Interfaces.kt b/ethereumkit/src/main/java/io/horizontalsystems/ethereumkit/core/Interfaces.kt
@@ -47,7 +47,7 @@ interface IBlockchain {
 
     fun send(rawTransaction: RawTransaction, signature: Signature): Single<Transaction>
     fun getNonce(defaultBlockParameter: DefaultBlockParameter): Single<Long>
-    fun estimateGas(to: Address?, amount: BigInteger?, gasLimit: Long?, gasPrice: GasPrice, data: ByteArray?): Single<Long>
+    fun estimateGas(to: Address?, amount: BigInteger?, gasLimit: Long?, gasPrice: GasPrice?, data: ByteArray?): Single<Long>
     fun getTransactionReceipt(transactionHash: ByteArray): Single<RpcTransactionReceipt>
     fun getTransaction(transactionHash: ByteArray): Single<RpcTransaction>
     fun getBlock(blockNumber: Long): Single<RpcBlock>

diff --git a/ethereumkit/src/main/java/io/horizontalsystems/ethereumkit/spv/core/SpvBlockchain.kt b/ethereumkit/src/main/java/io/horizontalsystems/ethereumkit/spv/core/SpvBlockchain.kt
@@ -94,7 +94,7 @@ class SpvBlockchain(
         TODO("not implemented")
     }
 
-    override fun estimateGas(to: Address?, amount: BigInteger?, gasLimit: Long?, gasPrice: GasPrice, data: ByteArray?): Single<Long> {
+    override fun estimateGas(to: Address?, amount: BigInteger?, gasLimit: Long?, gasPrice: GasPrice?, data: ByteArray?): Single<Long> {
         TODO("not implemented")
     }