Updated on 2026-08-14

data/wallets/detekt-baseline-debug.xml

@@ -3,8 +3,6 @@
   <ManuallySuppressedIssues/>
   <CurrentIssues>
     <ID>MultilineLambdaItParameter:DefaultColdMapDerivationsRepository.kt$DefaultColdMapDerivationsRepository${ networkFactory.create( blockchain = Blockchain.fromNetworkId(it.value) ?: return@mapNotNull null, extraDerivationPath = null, userWallet = userWallet, ) }</ID>
-    <ID>MultilineLambdaItParameter:DefaultDerivationsRepository.kt$DefaultDerivationsRepository${ userWallet.update(it.first) it.second }</ID>
-    <ID>MultilineLambdaItParameter:DefaultHotMapDerivationsRepository.kt$DefaultHotMapDerivationsRepository${ networkFactory.create( blockchain = Blockchain.fromNetworkId(it.value) ?: return@mapNotNull null, extraDerivationPath = null, userWallet = userWallet, ) }</ID>
     <ID>MultilineLambdaItParameter:DefaultHotWalletAccessCodeAttemptsRepository.kt$DefaultHotWalletAccessCodeAttemptsRepository${ AttemptsPersistentData( attempts = it[PreferencesKeys.getHotWalletUnlockAttemptsKey(id.attemptIdKey())] ?: 0, bootCount = it[PreferencesKeys.getHotWalletUnlockBootKey(id.attemptIdKey())] ?: 0, deadline = it[PreferencesKeys.getHotWalletUnlockDeadlineKey(id.attemptIdKey())] ?: 0L, ) }</ID>
     <ID>MultilineLambdaItParameter:DefaultHotWalletAccessCodeAttemptsRepository.kt$DefaultHotWalletAccessCodeAttemptsRepository${ it.remove(PreferencesKeys.getHotWalletUnlockAttemptsKey(authAttemptId.attemptIdKey())) it.remove(PreferencesKeys.getHotWalletUnlockAttemptsKey(noAuthAttemptId.attemptIdKey())) it.remove(PreferencesKeys.getHotWalletUnlockBootKey(authAttemptId.attemptIdKey())) it.remove(PreferencesKeys.getHotWalletUnlockBootKey(noAuthAttemptId.attemptIdKey())) it.remove(PreferencesKeys.getHotWalletUnlockDeadlineKey(authAttemptId.attemptIdKey())) it.remove(PreferencesKeys.getHotWalletUnlockDeadlineKey(noAuthAttemptId.attemptIdKey())) }</ID>
     <ID>MultilineLambdaItParameter:DefaultHotWalletAccessCodeAttemptsRepository.kt$DefaultHotWalletAccessCodeAttemptsRepository${ while (true) { emit(toState(id, it.attempts, it.deadline, it.bootCount)) val remaining = remainingSeconds(it.deadline, it.bootCount) if (remaining &lt;= 0) break delay(timeMillis = 1000) } }</ID>
@@ -16,9 +14,7 @@
     <ID>SuspendFunSwallowedCancellation:DefaultHotWalletAccessor.kt$DefaultHotWalletAccessor$runCatching</ID>
     <ID>SuspendFunSwallowedCancellation:TangemHotWalletSigner.kt$TangemHotWalletSigner$runCatching</ID>
     <ID>UnnecessaryLet:MissedDerivationsFinder.kt$MissedDerivationsFinder$let(::findByNetworks)</ID>
-    <ID>UnusedImports:DefaultDerivationsRepository.kt$import com.tangem.common.map</ID>
     <ID>UseOrEmpty:DefaultColdMapDerivationsRepository.kt$DefaultColdMapDerivationsRepository$oldKeys[walletKey] ?: emptyMap()</ID>
-    <ID>UseOrEmpty:DefaultHotMapDerivationsRepository.kt$DefaultHotMapDerivationsRepository$oldKeys[walletKey] ?: emptyMap()</ID>
     <ID>VarCouldBeVal:DefaultHotWalletAccessor.kt$DefaultHotWalletAccessor$private var contextualUnlockHotWallet: ConcurrentHashMap&lt;HotWalletId, UnlockHotWallet?&gt; = ConcurrentHashMap()</ID>
   </CurrentIssues>
 </SmellBaseline>

data/wallets/src/main/java/com/tangem/data/wallets/derivations/DefaultDerivationsRepository.kt

@@ -2,16 +2,16 @@ package com.tangem.data.wallets.derivations
 
 import com.tangem.common.CompletionResult
 import com.tangem.common.extensions.ByteArrayKey
-import com.tangem.common.map
 import com.tangem.crypto.hdWallet.DerivationPath
 import com.tangem.datasource.local.userwallet.UserWalletsStore
-import com.tangem.domain.wallets.derivations.ColdMapDerivationsRepository
-import com.tangem.domain.wallets.derivations.DerivationsRepository
-import com.tangem.domain.wallets.derivations.HotMapDerivationsRepository
+import com.tangem.domain.models.account.DerivationIndex
 import com.tangem.domain.models.currency.CryptoCurrency
 import com.tangem.domain.models.network.Network
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.models.wallet.UserWalletId
+import com.tangem.domain.wallets.derivations.ColdMapDerivationsRepository
+import com.tangem.domain.wallets.derivations.DerivationsRepository
+import com.tangem.domain.wallets.derivations.HotMapDerivationsRepository
 import com.tangem.domain.wallets.usecase.BackendId
 import com.tangem.operations.derivation.ExtendedPublicKeysMap
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
@@ -29,11 +29,17 @@ internal class DefaultDerivationsRepository @Inject constructor(
         derivePublicKeysByNetworks(userWalletId = userWalletId, networks = currencies.map(CryptoCurrency::network))
     }
 
-    override suspend fun derivePublicKeysByNetworkIds(userWalletId: UserWalletId, networkIds: List<Network.RawID>) {
+    override suspend fun derivePublicKeysByNetworkIds(
+        userWalletId: UserWalletId,
+        networkIds: List<Network.RawID>,
+        accountIndex: DerivationIndex,
+    ) {
         val userWallet = userWalletsStore.getSyncStrict(userWalletId)
         when (userWallet) {
             is UserWallet.Cold -> coldDerivationsRepository.derivePublicKeysByNetworkIds(userWallet, networkIds)
-            is UserWallet.Hot -> hotDerivationsRepository.derivePublicKeysByNetworkIds(userWallet, networkIds)
+            is UserWallet.Hot -> {
+                hotDerivationsRepository.derivePublicKeysByNetworkIds(userWallet, networkIds, accountIndex)
+            }
         }.also {
             userWallet.update(it)
         }
@@ -57,9 +63,9 @@ internal class DefaultDerivationsRepository @Inject constructor(
         return when (userWallet) {
             is UserWallet.Cold -> coldDerivationsRepository.derivePublicKeys(userWallet, derivations)
             is UserWallet.Hot -> hotDerivationsRepository.derivePublicKeys(userWallet, derivations)
-        }.let {
-            userWallet.update(it.first)
-            it.second
+        }.let { publicKeysMapByUserWallet ->
+            userWallet.update(publicKeysMapByUserWallet.first)
+            publicKeysMapByUserWallet.second
         }
     }
 

data/wallets/src/main/java/com/tangem/data/wallets/hot/DefaultHotMapDerivationsRepository.kt

@@ -8,6 +8,7 @@ import com.tangem.crypto.hdWallet.DerivationPath
 import com.tangem.data.common.network.NetworkFactory
 import com.tangem.data.wallets.derivations.MissedDerivationsFinder
 import com.tangem.datasource.local.userwallet.UserWalletsStore
+import com.tangem.domain.models.account.DerivationIndex
 import com.tangem.domain.models.currency.CryptoCurrency
 import com.tangem.domain.models.network.Network
 import com.tangem.domain.models.wallet.UserWallet
@@ -38,14 +39,16 @@ internal class DefaultHotMapDerivationsRepository @Inject constructor(
     override suspend fun derivePublicKeysByNetworkIds(
         userWallet: UserWallet.Hot,
         networkIds: List<Network.RawID>,
+        accountIndex: DerivationIndex,
     ): UserWallet.Hot {
         return derivePublicKeysByNetworks(
             userWallet = userWallet,
-            networks = networkIds.mapNotNull {
+            networks = networkIds.mapNotNull { networkRawId ->
                 networkFactory.create(
-                    blockchain = Blockchain.fromNetworkId(it.value) ?: return@mapNotNull null,
+                    blockchain = Blockchain.fromNetworkId(networkRawId.value) ?: return@mapNotNull null,
                     extraDerivationPath = null,
                     userWallet = userWallet,
+                    accountIndex = accountIndex,
                 )
             },
         )
@@ -138,7 +141,7 @@ internal class DefaultHotMapDerivationsRepository @Inject constructor(
     ): Map<ByteArrayKey, ExtendedPublicKeysMap> {
         return (oldKeys.keys + newKeys.keys).toSet()
             .associateWith { walletKey ->
-                val oldDerivations = ExtendedPublicKeysMap(oldKeys[walletKey] ?: emptyMap())
+                val oldDerivations = ExtendedPublicKeysMap(oldKeys[walletKey].orEmpty())
                 val newDerivations = newKeys[walletKey] ?: ExtendedPublicKeysMap(emptyMap())
 
                 ExtendedPublicKeysMap(oldDerivations + newDerivations)