Wc initial nonce and gas price

app/src/main/java/io/horizontalsystems/bankwallet/modules/multiswap/sendtransaction/SendTransactionServiceEvm.kt

@@ -50,28 +50,41 @@ import io.horizontalsystems.bankwallet.ui.compose.components.MenuItem
 import io.horizontalsystems.ethereumkit.core.LegacyGasPriceProvider
 import io.horizontalsystems.ethereumkit.core.eip1559.Eip1559GasPriceProvider
 import io.horizontalsystems.ethereumkit.decorations.TransactionDecoration
+import io.horizontalsystems.ethereumkit.models.GasPrice
 import io.horizontalsystems.ethereumkit.models.TransactionData
 import io.horizontalsystems.marketkit.models.BlockchainType
 import io.reactivex.Flowable
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.rx2.await
 import java.math.BigDecimal
 
-class SendTransactionServiceEvm(blockchainType: BlockchainType) : ISendTransactionService() {
+class SendTransactionServiceEvm(
+    blockchainType: BlockchainType,
+    initialGasPrice: GasPrice? = null,
+    initialNonce: Long? = null
+) : ISendTransactionService() {
     private val token by lazy { App.evmBlockchainManager.getBaseToken(blockchainType)!! }
     private val evmKitWrapper by lazy { App.evmBlockchainManager.getEvmKitManager(blockchainType).evmKitWrapper!! }
     private val gasPriceService: IEvmGasPriceService by lazy {
         val evmKit = evmKitWrapper.evmKit
         if (evmKit.chain.isEIP1559Supported) {
             val gasPriceProvider = Eip1559GasPriceProvider(evmKit)
-            Eip1559GasPriceService(gasPriceProvider, Flowable.empty())
+            Eip1559GasPriceService(
+                gasProvider = gasPriceProvider,
+                refreshSignalFlowable = Flowable.empty(),
+                initialGasPrice = initialGasPrice as? GasPrice.Eip1559
+            )
         } else {
             val gasPriceProvider = LegacyGasPriceProvider(evmKit)
-            LegacyGasPriceService(gasPriceProvider)
+            LegacyGasPriceService(
+                gasPriceProvider = gasPriceProvider,
+                initialGasPrice = (initialGasPrice as? GasPrice.Legacy)?.legacyGasPrice
+            )
         }
     }
     private val feeService by lazy {
@@ -89,7 +102,9 @@ class SendTransactionServiceEvm(blockchainType: BlockchainType) : ISendTransacti
             App.coinManager
         )
     }
-    private val nonceService by lazy { SendEvmNonceService(evmKitWrapper.evmKit) }
+    private val nonceService by lazy {
+        SendEvmNonceService(evmKitWrapper.evmKit, initialNonce)
+    }
     private val settingsService by lazy { SendEvmSettingsService(feeService, nonceService) }
 
     private val baseCoinService = coinServiceFactory.baseCoinService
@@ -129,7 +144,7 @@ class SendTransactionServiceEvm(blockchainType: BlockchainType) : ISendTransacti
         coroutineScope.launch {
             settingsService.start()
         }
-        coroutineScope.launch {
+        coroutineScope.launch(Dispatchers.Default) {
             nonceService.start()
         }
         coroutineScope.launch {

app/src/main/java/io/horizontalsystems/bankwallet/modules/send/evm/settings/SendEvmNonceService.kt

@@ -14,8 +14,9 @@ import kotlinx.coroutines.withContext
 
 class SendEvmNonceService(
     private val evmKit: EthereumKit,
-    private var fixedNonce: Long? = null
+    private val initialNonce: Long? = null,
 ) {
+    private var fixedNonce: Long? = null
     private var latestNonce: Long? = null
 
     var state: DataState<State> = DataState.Loading
@@ -28,11 +29,14 @@ class SendEvmNonceService(
     val stateFlow: Flow<DataState<State>> = _stateFlow
 
     suspend fun start() {
+        latestNonce = evmKit.getNonce(DefaultBlockParameter.Latest).await()
+
         val fixedNonce = fixedNonce
-        if (fixedNonce != null) {
-            sync(fixedNonce)
-        } else {
-            setRecommended()
+
+        when {
+            fixedNonce != null -> sync(fixedNonce)
+            initialNonce != null -> sync(initialNonce)
+            else -> setRecommended()
         }
     }
 
@@ -85,8 +89,6 @@ class SendEvmNonceService(
         try {
             val nonce = evmKit.getNonce(DefaultBlockParameter.Pending).await()
             sync(nonce, default = true)
-
-            latestNonce = evmKit.getNonce(DefaultBlockParameter.Latest).await()
         } catch (e: Throwable) {
             state = DataState.Error(e)
         }

app/src/main/java/io/horizontalsystems/bankwallet/modules/walletconnect/request/sendtransaction/WCSendEthereumTransactionRequestViewModel.kt

@@ -11,6 +11,7 @@ import io.horizontalsystems.bankwallet.core.ethereum.EvmCoinServiceFactory
 import io.horizontalsystems.bankwallet.core.providers.Translator
 import io.horizontalsystems.bankwallet.modules.multiswap.sendtransaction.SendTransactionData
 import io.horizontalsystems.bankwallet.modules.multiswap.sendtransaction.SendTransactionServiceEvm
+import io.horizontalsystems.bankwallet.modules.multiswap.sendtransaction.SendTransactionServiceState
 import io.horizontalsystems.bankwallet.modules.multiswap.ui.DataField
 import io.horizontalsystems.bankwallet.modules.send.SendModule
 import io.horizontalsystems.bankwallet.modules.sendevmtransaction.SectionViewItem
@@ -28,19 +29,28 @@ import kotlinx.coroutines.withContext
 
 class WCSendEthereumTransactionRequestViewModel(
     private val sendEvmTransactionViewItemFactory: SendEvmTransactionViewItemFactory,
-    val sendTransactionService: SendTransactionServiceEvm,
     private val dAppName: String,
-    transaction: WalletConnectTransaction
+    transaction: WalletConnectTransaction,
+    blockchainType: BlockchainType
 ) : ViewModelUiState<WCSendEthereumTransactionRequestUiState>() {
+    val sendTransactionService: SendTransactionServiceEvm
+
     private val transactionData = TransactionData(
         transaction.to,
         transaction.value,
         transaction.data
     )
 
-    private var sendTransactionState = sendTransactionService.stateFlow.value
+    private var sendTransactionState: SendTransactionServiceState
 
     init {
+        sendTransactionService = SendTransactionServiceEvm(
+            blockchainType = blockchainType,
+            initialGasPrice = transaction.getGasPriceObj(),
+            initialNonce = transaction.nonce
+        )
+        sendTransactionState = sendTransactionService.stateFlow.value
+
         viewModelScope.launch {
             sendTransactionService.stateFlow.collect { transactionState ->
                 sendTransactionState = transactionState
@@ -114,7 +124,6 @@ class WCSendEthereumTransactionRequestViewModel(
     ) : ViewModelProvider.Factory {
         @Suppress("UNCHECKED_CAST")
         override fun <T : ViewModel> create(modelClass: Class<T>): T {
-            val sendTransactionService = SendTransactionServiceEvm(blockchainType)
             val feeToken = App.evmBlockchainManager.getBaseToken(blockchainType)!!
             val coinServiceFactory = EvmCoinServiceFactory(
                 feeToken,
@@ -132,9 +141,9 @@ class WCSendEthereumTransactionRequestViewModel(
 
             return WCSendEthereumTransactionRequestViewModel(
                 sendEvmTransactionViewItemFactory,
-                sendTransactionService,
                 peerName,
-                transaction
+                transaction,
+                blockchainType
             ) as T
         }
     }

app/src/main/java/io/horizontalsystems/bankwallet/modules/walletconnect/request/sendtransaction/WalletConnectTransaction.kt

@@ -1,6 +1,7 @@
 package io.horizontalsystems.bankwallet.modules.walletconnect.request.sendtransaction
 
 import io.horizontalsystems.ethereumkit.models.Address
+import io.horizontalsystems.ethereumkit.models.GasPrice
 import java.math.BigInteger
 
 data class WalletConnectTransaction(
@@ -13,4 +14,14 @@ data class WalletConnectTransaction(
     val maxFeePerGas: Long?,
     val value: BigInteger,
     val data: ByteArray
-)
+) {
+    fun getGasPriceObj() = when {
+        maxFeePerGas != null && maxPriorityFeePerGas != null -> {
+            GasPrice.Eip1559(maxFeePerGas, maxPriorityFeePerGas)
+        }
+        this.gasPrice != null -> {
+            GasPrice.Legacy(this.gasPrice)
+        }
+        else -> null
+    }
+}

app/src/main/java/io/horizontalsystems/bankwallet/modules/walletconnect/request/signtransaction/WCSignEthereumTransactionRequestViewModel.kt

@@ -22,7 +22,6 @@ import io.horizontalsystems.bankwallet.modules.sendevmtransaction.ViewItem
 import io.horizontalsystems.bankwallet.modules.walletconnect.WCDelegate
 import io.horizontalsystems.bankwallet.modules.walletconnect.WCSessionManager
 import io.horizontalsystems.bankwallet.modules.walletconnect.request.sendtransaction.WalletConnectTransaction
-import io.horizontalsystems.ethereumkit.models.GasPrice
 import io.horizontalsystems.ethereumkit.models.TransactionData
 import io.horizontalsystems.marketkit.models.BlockchainType
 import kotlinx.coroutines.Dispatchers
@@ -48,13 +47,7 @@ class WCSignEthereumTransactionRequestViewModel(
     private var fields: List<DataField>
 
     init {
-        val gasPrice = if (transaction.maxFeePerGas != null && transaction.maxPriorityFeePerGas != null) {
-            GasPrice.Eip1559(transaction.maxFeePerGas, transaction.maxPriorityFeePerGas)
-        } else if (transaction.gasPrice != null) {
-            GasPrice.Legacy(transaction.gasPrice)
-        } else {
-            null
-        }
+        val gasPrice = transaction.getGasPriceObj()
 
         feeAmountData = if (gasPrice != null && transaction.gasLimit != null) {
             GasData(gasLimit = transaction.gasLimit, gasPrice = gasPrice).let {