nonce related changes

ethereumkit/src/main/java/io/horizontalsystems/ethereumkit/api/core/RpcBlockchain.kt

@@ -114,8 +114,8 @@ class RpcBlockchain(
                 .map { transaction }
     }
 
-    override fun getNonce(): Single<Long> {
-        return syncer.single(GetTransactionCountJsonRpc(address, DefaultBlockParameter.Pending))
+    override fun getNonce(defaultBlockParameter: DefaultBlockParameter): Single<Long> {
+        return syncer.single(GetTransactionCountJsonRpc(address, defaultBlockParameter))
     }
 
     override fun estimateGas(to: Address?, amount: BigInteger?, gasLimit: Long?, gasPrice: GasPrice, data: ByteArray?): Single<Long> {

ethereumkit/src/main/java/io/horizontalsystems/ethereumkit/core/EthereumKit.kt

@@ -130,6 +130,9 @@ class EthereumKit(
         transactionSyncManager.sync()
     }
 
+    fun getNonce(defaultBlockParameter: DefaultBlockParameter): Single<Long> {
+        return blockchain.getNonce(defaultBlockParameter)
+    }
     fun getFullTransactionsFlowable(tags: List<List<String>>): Flowable<List<FullTransaction>> {
         return transactionManager.getFullTransactionsFlowable(tags)
     }
@@ -194,7 +197,7 @@ class EthereumKit(
         gasLimit: Long,
         nonce: Long? = null
     ): Single<RawTransaction> {
-        val nonceSingle = nonce?.let { Single.just(it) } ?: blockchain.getNonce()
+        val nonceSingle = nonce?.let { Single.just(it) } ?: blockchain.getNonce(DefaultBlockParameter.Pending)
 
         return nonceSingle.flatMap { nonce ->
             Single.just(RawTransaction(gasPrice, gasLimit, address, value, nonce, transactionInput))

ethereumkit/src/main/java/io/horizontalsystems/ethereumkit/core/Interfaces.kt

@@ -46,7 +46,7 @@ interface IBlockchain {
     val accountState: AccountState?
 
     fun send(rawTransaction: RawTransaction, signature: Signature): Single<Transaction>
-    fun getNonce(): Single<Long>
+    fun getNonce(defaultBlockParameter: DefaultBlockParameter): 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>

ethereumkit/src/main/java/io/horizontalsystems/ethereumkit/core/rollup/L1FeeProvider.kt

@@ -20,12 +20,12 @@ class L1FeeProvider(
         override fun getArguments() = listOf(transaction)
     }
 
-    fun getL1Fee(gasPrice: GasPrice, gasLimit: Long, to: Address, value: BigInteger, data: ByteArray, nonce: Long?): Single<BigInteger> {
-        val rawTransaction = RawTransaction(gasPrice, gasLimit, to, value, nonce ?: 1, data)
+    fun getL1Fee(gasPrice: GasPrice, gasLimit: Long, to: Address, value: BigInteger, data: ByteArray): Single<BigInteger> {
+        val rawTransaction = RawTransaction(gasPrice, gasLimit, to, value, 1, data)
         val encoded = TransactionBuilder.encode(rawTransaction, null, evmKit.chain.id)
-        val data = L1FeeMethod(encoded).encodedABI()
+        val feeMethodABI = L1FeeMethod(encoded).encodedABI()
 
-        return evmKit.call(contractAddress, data)
+        return evmKit.call(contractAddress, feeMethodABI)
                 .map { it.sliceArray(IntRange(0, 31)).toBigInteger() }
     }
 

ethereumkit/src/main/java/io/horizontalsystems/ethereumkit/models/TransactionData.kt

@@ -7,13 +7,12 @@ import java.util.*
 data class TransactionData(
         val to: Address,
         val value: BigInteger,
-        val input: ByteArray,
-        val nonce: Long? = null
+        val input: ByteArray
 ) {
     override fun equals(other: Any?): Boolean {
         return when {
             this === other -> true
-            other is TransactionData -> to == other.to && value == other.value && input.contentEquals(other.input) && nonce == other.nonce
+            other is TransactionData -> to == other.to && value == other.value && input.contentEquals(other.input)
             else -> false
         }
     }

ethereumkit/src/main/java/io/horizontalsystems/ethereumkit/spv/core/SpvBlockchain.kt

@@ -90,7 +90,7 @@ class SpvBlockchain(
         }
     }
 
-    override fun getNonce(): Single<Long> {
+    override fun getNonce(defaultBlockParameter: DefaultBlockParameter): Single<Long> {
         TODO("not implemented")
     }