Remove redundant in EvmBlockchainHelper

horizontalsystems · Apr 1, 2024 · d7c7d02 · d7c7d02
1 parent e7e9650
commit d7c7d02
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/multiswap/EvmBlockchainHelper.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/multiswap/EvmBlockchainHelper.kt
@@ -5,14 +5,6 @@ import io.horizontalsystems.ethereumkit.models.RpcSource
 import io.horizontalsystems.marketkit.models.BlockchainType
 
 class EvmBlockchainHelper(private val blockchainType: BlockchainType) {
-    val evmKitWrapper = App.evmBlockchainManager
-        .getEvmKitManager(blockchainType)
-        .evmKitWrapper
-
-    private val evmKit = evmKitWrapper?.evmKit
-
-    val baseToken by lazy { App.evmBlockchainManager.getBaseToken(blockchainType) }
-    val receiveAddress by lazy { evmKit?.receiveAddress }
     val chain by lazy { App.evmBlockchainManager.getChain(blockchainType) }
 
     fun getRpcSourceHttp(): RpcSource.Http {

diff --git a/.../main/java/io/horizontalsystems/bankwallet/modules/multiswap/providers/OneInchProvider.kt b/.../main/java/io/horizontalsystems/bankwallet/modules/multiswap/providers/OneInchProvider.kt
@@ -120,15 +120,13 @@ object OneInchProvider : EvmSwapProvider() {
 
         val gasPrice = sendTransactionSettings.gasPriceInfo.gasPrice
 
-        val evmKitWrapper = evmBlockchainHelper.evmKitWrapper ?: throw NullPointerException()
-
         val settingRecipient = SwapSettingRecipient(swapSettings, blockchainType)
         val settingSlippage = SwapSettingSlippage(swapSettings, BigDecimal("1"))
         val slippage = settingSlippage.valueOrDefault()
 
         val swap = oneInchKit.getSwapAsync(
             chain = evmBlockchainHelper.chain,
-            receiveAddress = evmKitWrapper.evmKit.receiveAddress,
+            receiveAddress = sendTransactionSettings.receiveAddress,
             fromToken = getTokenAddress(tokenIn),
             toToken = getTokenAddress(tokenOut),
             amount = amountIn.scaleUp(tokenIn.decimals),