Merge branch 'develop' into staging

Author: PankraSerg

build.gradle

@@ -84,7 +84,7 @@ buildscript {
         minifyRelease = true
         beaconVersion = "3.2.4"
 
-        sharedFeaturesVersion = "0.0.24"
+        sharedFeaturesVersion = "0.0.26_snapshot1"
 
         coilDep = "io.coil-kt:coil:$coilVersion"
         coilSvg = "io.coil-kt:coil-svg:$coilVersion"

common/src/main/java/jp/co/soramitsu/common/di/modules/CommonModule.kt

@@ -40,7 +40,7 @@ import jp.co.soramitsu.common.validation.ValidationExecutor
 import jp.co.soramitsu.common.vibration.DeviceVibrator
 import jp.co.soramitsu.core.extrinsic.ExtrinsicBuilderFactory
 import jp.co.soramitsu.core.extrinsic.ExtrinsicService
-import jp.co.soramitsu.core.extrinsic.KeyPairProvider
+import jp.co.soramitsu.core.extrinsic.keypair_provider.KeypairProvider
 import jp.co.soramitsu.core.rpc.RpcCalls
 import jp.co.soramitsu.shared_utils.encrypt.Signer
 import jp.co.soramitsu.shared_utils.icon.IconGenerator
@@ -74,12 +74,12 @@ class CommonModule {
     @Provides
     fun provideExtrinsicService(
         rpcCalls: RpcCalls,
-        keyPairProvider: KeyPairProvider,
+        keypairProvider: KeypairProvider,
         extrinsicBuilderFactory: ExtrinsicBuilderFactory
     ): ExtrinsicService {
         return ExtrinsicService(
             rpcCalls = rpcCalls,
-            keyPairProvider = keyPairProvider,
+            keypairProvider = keypairProvider,
             extrinsicBuilderFactory = extrinsicBuilderFactory
         )
     }

feature-account-impl/src/main/java/jp/co/soramitsu/account/impl/data/repository/KeyPairRepository.kt

@@ -6,7 +6,7 @@ import jp.co.soramitsu.account.api.domain.model.cryptoType
 import jp.co.soramitsu.common.data.secrets.v2.SecretStoreV2
 import jp.co.soramitsu.common.data.secrets.v2.getChainAccountKeypair
 import jp.co.soramitsu.common.data.secrets.v2.getMetaAccountKeypair
-import jp.co.soramitsu.core.extrinsic.KeyPairProvider
+import jp.co.soramitsu.core.extrinsic.keypair_provider.KeypairProvider
 import jp.co.soramitsu.core.models.CryptoType
 import jp.co.soramitsu.core.models.IChain
 import jp.co.soramitsu.shared_utils.encrypt.keypair.Keypair
@@ -15,7 +15,7 @@ import jp.co.soramitsu.shared_utils.extensions.toHexString
 class KeyPairRepository(
     private val secretStoreV2: SecretStoreV2,
     private val accountRepository: AccountRepository
-) : KeyPairProvider {
+) : KeypairProvider {
 
     override suspend fun getCryptoTypeFor(chain: IChain, accountId: ByteArray): CryptoType {
         val metaAccount = accountRepository.findMetaAccount(accountId)

feature-account-impl/src/main/java/jp/co/soramitsu/account/impl/di/AccountFeatureModule.kt

@@ -41,7 +41,7 @@ import jp.co.soramitsu.common.interfaces.FileProvider
 import jp.co.soramitsu.common.resources.ClipboardManager
 import jp.co.soramitsu.common.resources.LanguagesHolder
 import jp.co.soramitsu.common.resources.ResourceManager
-import jp.co.soramitsu.core.extrinsic.KeyPairProvider
+import jp.co.soramitsu.core.extrinsic.keypair_provider.KeypairProvider
 import jp.co.soramitsu.coredb.dao.AccountDao
 import jp.co.soramitsu.coredb.dao.AssetDao
 import jp.co.soramitsu.coredb.dao.MetaAccountDao
@@ -96,7 +96,7 @@ class AccountFeatureModule {
     fun provideKeyPairRepository(
         secretStoreV2: SecretStoreV2,
         accountRepository: AccountRepository
-    ): KeyPairProvider {
+    ): KeypairProvider {
         return KeyPairRepository(secretStoreV2, accountRepository)
     }
 

feature-wallet-api/src/main/java/jp/co/soramitsu/wallet/impl/domain/interfaces/WalletInteractor.kt

@@ -32,8 +32,6 @@ interface WalletInteractor {
 
     fun assetsFlow(): Flow<List<AssetWithStatus>>
 
-    fun xcmAssetsFlow(originChainId: ChainId?): Flow<List<AssetWithStatus>>
-
     suspend fun syncAssetsRates(): Result<Unit>
 
     fun assetFlow(chainId: ChainId, chainAssetId: String): Flow<Asset>

feature-wallet-impl/src/main/java/jp/co/soramitsu/wallet/impl/di/WalletFeatureModule.kt

@@ -84,6 +84,7 @@ import jp.co.soramitsu.wallet.impl.presentation.balance.assetActions.buy.BuyMixi
 import jp.co.soramitsu.wallet.impl.presentation.balance.assetActions.buy.BuyMixinProvider
 import jp.co.soramitsu.wallet.impl.presentation.send.SendSharedState
 import jp.co.soramitsu.wallet.impl.presentation.transaction.filter.HistoryFiltersProvider
+import jp.co.soramitsu.xcm_impl.XcmService
 import jp.co.soramitsu.xcm_impl.domain.XcmEntitiesFetcher
 import jp.co.soramitsu.xnetworking.networkclient.SoramitsuNetworkClient
 import jp.co.soramitsu.xnetworking.sorawallet.mainconfig.SoraRemoteConfigBuilder
@@ -233,22 +234,31 @@ class WalletFeatureModule {
     )
 
     @Provides
-    @Singleton
     fun provideXcmInteractor(
         walletInteractor: WalletInteractor,
         chainRegistry: ChainRegistry,
         currentAccountAddress: CurrentAccountAddressUseCase,
         xcmEntitiesFetcher: XcmEntitiesFetcher,
         accountInteractor: AccountInteractor,
-        runtimeFilesCache: RuntimeFilesCache
-    ) = XcmInteractor(
-        walletInteractor,
-        chainRegistry,
-        currentAccountAddress,
-        xcmEntitiesFetcher,
-        accountInteractor,
-        runtimeFilesCache
-    )
+        runtimeFilesCache: RuntimeFilesCache,
+        xcmService: XcmService
+    ): XcmInteractor {
+        return XcmInteractor(
+            walletInteractor,
+            chainRegistry,
+            currentAccountAddress,
+            xcmEntitiesFetcher,
+            accountInteractor,
+            runtimeFilesCache,
+            xcmService
+        )
+    }
+
+    @Provides
+    @Singleton
+    fun provideXcmService(): XcmService {
+        return XcmService()
+    }
 
     @Provides
     fun provideExistentialDepositUseCase(

feature-wallet-impl/src/main/java/jp/co/soramitsu/wallet/impl/domain/WalletInteractorImpl.kt

@@ -1,7 +1,5 @@
 package jp.co.soramitsu.wallet.impl.domain
 
-import java.math.BigDecimal
-import java.math.BigInteger
 import jp.co.soramitsu.account.api.domain.interfaces.AccountRepository
 import jp.co.soramitsu.account.api.domain.model.MetaAccount
 import jp.co.soramitsu.account.api.domain.model.accountId
@@ -14,7 +12,6 @@ import jp.co.soramitsu.common.domain.SelectedFiat
 import jp.co.soramitsu.common.interfaces.FileProvider
 import jp.co.soramitsu.common.mixin.api.UpdatesMixin
 import jp.co.soramitsu.common.mixin.api.UpdatesProviderUi
-import jp.co.soramitsu.common.utils.combineToPair
 import jp.co.soramitsu.common.utils.orZero
 import jp.co.soramitsu.core.models.ChainId
 import jp.co.soramitsu.core.models.isValidAddress
@@ -48,10 +45,11 @@ import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flatMapMerge
-import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.withIndex
 import kotlinx.coroutines.withContext
+import java.math.BigDecimal
+import java.math.BigInteger
 import jp.co.soramitsu.core.models.Asset as CoreAsset
 
 private const val QR_PREFIX_SUBSTRATE = "substrate"
@@ -115,26 +113,6 @@ class WalletInteractorImpl(
             }
     }
 
-    override fun xcmAssetsFlow(originChainId: ChainId?): Flow<List<AssetWithStatus>> {
-        return combineToPair(assetsFlow(), getAvailableXcmAssetSymbolsFlow(originChainId))
-            .map { (assets, availableXcmAssetSymbols) ->
-                assets.filter {
-                    val assetSymbol = it.asset.token.configuration.symbol.uppercase()
-                    assetSymbol in availableXcmAssetSymbols
-                }
-            }
-    }
-
-    private fun getAvailableXcmAssetSymbolsFlow(originChainId: ChainId?): Flow<List<String>> {
-        return flow {
-            val availableXcmAssetSymbols = xcmEntitiesFetcher.getAvailableAssets(
-                originalChainId = originChainId,
-                destinationChainId = null
-            ).map { it.uppercase() }
-            emit(availableXcmAssetSymbols)
-        }
-    }
-
     override fun observeAssets(): Flow<List<AssetWithStatus>> {
         return accountRepository.selectedMetaAccountFlow()
             .flatMapLatest {

feature-wallet-impl/src/main/java/jp/co/soramitsu/wallet/impl/domain/XcmInteractor.kt

@@ -1,27 +1,25 @@
 package jp.co.soramitsu.wallet.impl.domain
 
 import jp.co.soramitsu.account.api.domain.interfaces.AccountInteractor
+import jp.co.soramitsu.common.data.secrets.v1.Keypair
 import jp.co.soramitsu.common.data.secrets.v2.KeyPairSchema
 import jp.co.soramitsu.common.data.secrets.v2.MetaAccountSecrets
 import jp.co.soramitsu.common.utils.combineToPair
+import jp.co.soramitsu.core.extrinsic.keypair_provider.SingleKeypairProvider
 import jp.co.soramitsu.core.models.Asset
 import jp.co.soramitsu.core.models.ChainId
+import jp.co.soramitsu.core.models.ChainIdWithMetadata
 import jp.co.soramitsu.runtime.ext.accountIdOf
 import jp.co.soramitsu.runtime.ext.fakeAddress
 import jp.co.soramitsu.runtime.multiNetwork.ChainRegistry
 import jp.co.soramitsu.runtime.multiNetwork.runtime.RuntimeFilesCache
-import jp.co.soramitsu.shared_utils.encrypt.keypair.BaseKeypair
 import jp.co.soramitsu.wallet.impl.domain.interfaces.WalletInteractor
 import jp.co.soramitsu.wallet.impl.domain.model.AssetWithStatus
 import jp.co.soramitsu.wallet.impl.domain.model.CrossChainTransfer
 import jp.co.soramitsu.wallet.impl.domain.model.planksFromAmount
-import jp.co.soramitsu.xcm_impl.FromChainData
 import jp.co.soramitsu.xcm_impl.XcmService
 import jp.co.soramitsu.xcm_impl.domain.XcmEntitiesFetcher
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.filterNotNull
-import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.map
 import java.math.BigDecimal
@@ -34,36 +32,39 @@ class XcmInteractor(
     private val currentAccountAddress: CurrentAccountAddressUseCase,
     private val xcmEntitiesFetcher: XcmEntitiesFetcher,
     private val accountInteractor: AccountInteractor,
-    private val runtimeFilesCache: RuntimeFilesCache
+    private val runtimeFilesCache: RuntimeFilesCache,
+    private val xcmService: XcmService
 ) {
 
-    private val xcmService: MutableStateFlow<XcmService?> = MutableStateFlow(null)
-    private val nonNullXcmService = xcmService.filterNotNull()
-
-    suspend fun initXcmService(originChainId: ChainId, destinationChainId: ChainId) {
-        xcmService.value = null
-        val fromChainData = buildFromChainData(originChainId)
-        val destinationChainMetadata = runtimeFilesCache.getChainMetadata(destinationChainId)
-        this.xcmService.value = XcmService.create(fromChainData, destinationChainId, destinationChainMetadata)
-    }
-
-    private suspend fun buildFromChainData(originChainId: ChainId): FromChainData {
+    suspend fun prepareDataForChains(originChainId: ChainId, destinationChainId: ChainId) {
         val metaAccount = accountInteractor.selectedMetaAccount()
         val secrets = accountInteractor.getMetaAccountSecrets(metaAccount.id)?.get(MetaAccountSecrets.SubstrateKeypair)
         requireNotNull(secrets)
         val private = secrets[KeyPairSchema.PrivateKey]
         val public = secrets[KeyPairSchema.PublicKey]
+        val nonce = secrets[KeyPairSchema.Nonce]
 
-        return FromChainData(
-            chain = originChainId,
-            cryptoType = metaAccount.substrateCryptoType,
-            chainMetadata = runtimeFilesCache.getChainMetadata(originChainId),
-            keypair = BaseKeypair(private, public)
+        xcmService.updateKeypairProvider(
+            chainId = originChainId,
+            keypairProvider = SingleKeypairProvider(
+                keypair = Keypair(public, private, nonce),
+                cryptoType = metaAccount.substrateCryptoType
+            )
+        )
+        xcmService.addPreloadedMetadata(
+            fromChainMetadata = ChainIdWithMetadata(
+                chainId = originChainId,
+                metadata = runtimeFilesCache.getChainMetadata(originChainId)
+            ),
+            toChainMetadata = ChainIdWithMetadata(
+                chainId = destinationChainId,
+                metadata = runtimeFilesCache.getChainMetadata(destinationChainId)
+            )
         )
     }
 
-    fun xcmAssetsFlow(originChainId: ChainId?): Flow<List<AssetWithStatus>> {
-        return combineToPair(walletInteractor.assetsFlow(), getAvailableXcmAssetSymbolsFlow(originChainId))
+    fun getAvailableAssetsFlow(originChainId: ChainId?): Flow<List<AssetWithStatus>> {
+        return combineToPair(walletInteractor.assetsFlow(), getAvailableAssetSymbolsFlow(originChainId))
             .map { (assets, availableXcmAssetSymbols) ->
                 assets.filter {
                     val assetSymbol = it.asset.token.configuration.symbol.uppercase()
@@ -72,7 +73,7 @@ class XcmInteractor(
             }
     }
 
-    private fun getAvailableXcmAssetSymbolsFlow(originChainId: ChainId?): Flow<List<String>> {
+    private fun getAvailableAssetSymbolsFlow(originChainId: ChainId?): Flow<List<String>> {
         return flow {
             val availableXcmAssetSymbols = xcmEntitiesFetcher.getAvailableAssets(
                 originalChainId = originChainId,
@@ -82,17 +83,12 @@ class XcmInteractor(
         }
     }
 
-    suspend fun performCrossChainTransfer(
-        transfer: CrossChainTransfer,
-        fee: BigDecimal,
-        tipInPlanks: BigInteger?
-    ): Result<String> {
+    suspend fun performCrossChainTransfer(transfer: CrossChainTransfer): Result<String> {
         return runCatching {
             val originChain = chainRegistry.getChain(transfer.originChainId)
             val destinationChain = chainRegistry.getChain(transfer.destinationChainId)
             val selfAddress = currentAccountAddress(originChain.id) ?: throw IllegalStateException("No self address")
-            val service = nonNullXcmService.first()
-            service.transfer(
+            xcmService.transfer(
                 fromChain = originChain,
                 toChain = destinationChain,
                 asset = transfer.chainAsset,
@@ -103,41 +99,37 @@ class XcmInteractor(
         }
     }
 
-    suspend fun getXcmDestFee(
+    suspend fun getDestinationFee(
         destinationChainId: ChainId,
         tokenSymbol: String
     ): BigDecimal? {
-        val r = runCatching {
-            val service = nonNullXcmService.first()
-            service.getXcmDestFee(
+        return runCatching {
+            xcmService.getXcmDestFee(
                 toChainId = destinationChainId,
                 tokenSymbol = tokenSymbol
             )
-        }
-        return r.getOrNull()
+        }.getOrNull()
     }
 
-    suspend fun getXcmOrigFee(
+    suspend fun getOriginFee(
         originNetworkId: ChainId,
         destinationNetworkId: ChainId,
         asset: CoreAsset,
         amount: BigDecimal
     ): BigDecimal? {
-        val r = runCatching {
+        return runCatching {
             val chain = chainRegistry.getChain(originNetworkId)
-            val service = nonNullXcmService.first()
-            service.getXcmOrigFee(
+            xcmService.getXcmOrigFee(
                 fromChainId = originNetworkId,
                 toChainId = destinationNetworkId,
                 asset = asset,
                 address = chain.fakeAddress(),
-                amount = asset.getPlanksFromAmountForXcmOrigFee(amount)
+                amount = asset.getPlanksFromAmountForOriginFee(amount)
             )
-        }
-        return r.getOrNull()
+        }.getOrNull()
     }
 
-    private fun Asset.getPlanksFromAmountForXcmOrigFee(amount: BigDecimal): BigInteger {
+    private fun Asset.getPlanksFromAmountForOriginFee(amount: BigDecimal): BigInteger {
         val rawAmountInPlanks = planksFromAmount(amount)
         if (rawAmountInPlanks == BigInteger.ZERO) {
             return BigInteger.ONE

feature-wallet-impl/src/main/java/jp/co/soramitsu/wallet/impl/presentation/balance/assetselector/AssetSelectViewModel.kt

@@ -8,6 +8,7 @@ import jp.co.soramitsu.common.utils.formatCrypto
 import jp.co.soramitsu.common.utils.mapList
 import jp.co.soramitsu.common.utils.orZero
 import jp.co.soramitsu.wallet.impl.data.mappers.mapAssetToAssetModel
+import jp.co.soramitsu.wallet.impl.domain.XcmInteractor
 import jp.co.soramitsu.wallet.impl.domain.interfaces.WalletInteractor
 import jp.co.soramitsu.wallet.impl.presentation.WalletRouter
 import jp.co.soramitsu.wallet.impl.presentation.model.AssetModel
@@ -25,6 +26,7 @@ import jp.co.soramitsu.wallet.api.presentation.WalletRouter as WalletRouterApi
 class AssetSelectViewModel @Inject constructor(
     private val walletRouter: WalletRouter,
     walletInteractor: WalletInteractor,
+    xcmInteractor: XcmInteractor,
     savedStateHandle: SavedStateHandle,
     private val sharedSendState: SendSharedState
 ) : BaseViewModel(), AssetSelectContentInterface {
@@ -40,9 +42,7 @@ class AssetSelectViewModel @Inject constructor(
 
     private val assetModelsFlow: Flow<List<AssetModel>> =
         if (isFilterXcmAssets) {
-            walletInteractor.xcmAssetsFlow(
-                originChainId = filterChainId
-            )
+            xcmInteractor.getAvailableAssetsFlow(originChainId = filterChainId)
         } else {
             walletInteractor.assetsFlow()
         }