Updated on 2026-08-14

app/src/main/java/com/tangem/tap/di/TangemSdkManagerModule.kt

@@ -5,12 +5,10 @@ import com.tangem.core.analytics.api.AnalyticsErrorHandler
 import com.tangem.domain.card.BuildConfig
 import com.tangem.domain.card.repository.CardRepository
 import com.tangem.domain.card.repository.CardSdkConfigRepository
-import com.tangem.domain.dynamicaddresses.DynamicAddressesFeatureToggles
 import com.tangem.features.onboarding.v2.OnboardingV2FeatureToggles
 import com.tangem.sdk.api.TangemSdkManager
 import com.tangem.tap.domain.sdk.impl.DefaultTangemSdkManager
 import com.tangem.tap.domain.sdk.impl.MockTangemSdkManager
-import com.tangem.tap.domain.tasks.product.BlockchainToDeriveFinder
 import com.tangem.tap.domain.tasks.visa.TangemPayGenerateAddressAndSignChallengeTask
 import com.tangem.tap.domain.tasks.visa.VisaCardActivationTask
 import com.tangem.tap.domain.visa.VisaCardScanHandler
@@ -34,8 +32,6 @@ internal class TangemSdkManagerModule {
         visaCardActivationTaskFactory: VisaCardActivationTask.Factory,
         tangemPayChallengeTaskFactory: TangemPayGenerateAddressAndSignChallengeTask.Factory,
         onboardingV2FeatureToggles: OnboardingV2FeatureToggles,
-        dynamicAddressesFeatureToggles: DynamicAddressesFeatureToggles,
-        blockchainToDeriveFinder: BlockchainToDeriveFinder,
         analyticsErrorHandler: AnalyticsErrorHandler,
         cardRepository: CardRepository,
     ): TangemSdkManager {
@@ -49,8 +45,6 @@ internal class TangemSdkManagerModule {
                 visaCardActivationTaskFactory = visaCardActivationTaskFactory,
                 tangemPayChallengeTaskFactory = tangemPayChallengeTaskFactory,
                 onboardingV2FeatureToggles = onboardingV2FeatureToggles,
-                dynamicAddressesFeatureToggles = dynamicAddressesFeatureToggles,
-                blockchainToDeriveFinder = blockchainToDeriveFinder,
                 analyticsErrorHandler = analyticsErrorHandler,
                 cardRepository = cardRepository,
             )

app/src/main/java/com/tangem/tap/domain/sdk/impl/DefaultTangemSdkManager.kt

@@ -27,7 +27,6 @@ import com.tangem.crypto.hdWallet.bip32.ExtendedPublicKey
 import com.tangem.domain.card.common.util.cardTypesResolver
 import com.tangem.domain.card.repository.CardRepository
 import com.tangem.domain.card.repository.CardSdkConfigRepository
-import com.tangem.domain.dynamicaddresses.DynamicAddressesFeatureToggles
 import com.tangem.domain.models.scan.CardDTO
 import com.tangem.domain.models.scan.ScanResponse
 import com.tangem.domain.models.wallet.UserWalletId
@@ -58,6 +57,7 @@ import com.tangem.tap.domain.twins.CreateFirstTwinWalletTask
 import com.tangem.tap.domain.twins.CreateSecondTwinWalletTask
 import com.tangem.tap.domain.twins.FinalizeTwinTask
 import com.tangem.tap.domain.visa.VisaCardScanHandler
+import com.tangem.utils.logging.TangemLogger
 import com.tangem.wallet.R
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.coroutineScope
@@ -73,8 +73,6 @@ internal class DefaultTangemSdkManager(
     private val visaCardActivationTaskFactory: VisaCardActivationTask.Factory,
     private val tangemPayChallengeTaskFactory: TangemPayGenerateAddressAndSignChallengeTask.Factory,
     private val onboardingV2FeatureToggles: OnboardingV2FeatureToggles,
-    private val dynamicAddressesFeatureToggles: DynamicAddressesFeatureToggles,
-    private val blockchainToDeriveFinder: BlockchainToDeriveFinder,
     private val analyticsErrorHandler: AnalyticsErrorHandler,
     private val cardRepository: CardRepository,
 ) : TangemSdkManager {
@@ -145,12 +143,10 @@ internal class DefaultTangemSdkManager(
             runTaskAsyncReturnOnMain(
                 runnable = ScanProductTask(
                     card = null,
-                    blockchainToDeriveFinder = blockchainToDeriveFinder,
                     allowsRequestAccessCodeFromRepository = allowsRequestAccessCodeFromRepository,
                     visaCardScanHandler = visaCardScanHandler,
                     visaCoroutineScope = this,
                     shouldCheckIsAlreadyActivated = shouldCheckIsAlreadyActivated,
-                    isDynamicAddressesEnabled = dynamicAddressesFeatureToggles.isDynamicAddressesEnabled,
                     onboardingV2FeatureToggles = onboardingV2FeatureToggles,
                     cardRepository = cardRepository,
                 ),
@@ -242,6 +238,7 @@ internal class DefaultTangemSdkManager(
                 Analytics.send(event = analyticsEvent.withParams(params.toMap()))
             }
             .doOnFailure { tangemError ->
+                TangemLogger.e("scanProduct failed: code=${tangemError.code}, message=${tangemError.customMessage}")
                 (tangemError as? TangemSdkError)?.let { error ->
                     Analytics.sendErrorEvent(TangemSdkErrorEvent(error))
                 }
@@ -470,7 +467,6 @@ internal class DefaultTangemSdkManager(
             runnable = FinalizeTwinTask(
                 twinPublicKey = secondCardPublicKey,
                 issuerKeys = issuerKeyPair,
-                isDynamicAddressesEnabled = dynamicAddressesFeatureToggles.isDynamicAddressesEnabled,
                 cardRepository = cardRepository,
             ),
             cardId = cardId,

app/src/main/java/com/tangem/tap/domain/tasks/product/BlockchainToDeriveFinder.kt

@@ -1,74 +0,0 @@
-package com.tangem.tap.domain.tasks.product
-
-import com.tangem.blockchain.common.Blockchain
-import com.tangem.blockchain.common.derivation.DerivationStyle
-import com.tangem.blockchainsdk.utils.fromNetworkId
-import com.tangem.crypto.hdWallet.DerivationPath
-import com.tangem.data.common.account.WalletAccountsFetcher
-import com.tangem.data.wallets.derivations.BlockchainToDerive
-import com.tangem.domain.models.scan.CardDTO
-import com.tangem.domain.models.wallet.UserWalletId
-import com.tangem.domain.wallets.builder.UserWalletIdBuilder
-import com.tangem.domain.wallets.derivations.derivationStyleProvider
-import com.tangem.tap.features.demo.DemoHelper
-import javax.inject.Inject
-
-/**
- * Finder of blockchains to derive.
- * Returns only saved, default or demo blockchains without any additional logic
- * (no cardano/ethereum additions or unnecessary blockchain removals).
- */
-class BlockchainToDeriveFinder @Inject constructor(
-    private val walletAccountsFetcher: WalletAccountsFetcher,
-) {
-
-    suspend fun find(card: CardDTO): Set<BlockchainToDerive> {
-        if (!card.settings.isHDWalletAllowed || card.wallets.isEmpty()) return emptySet()
-        val userWalletId = UserWalletIdBuilder.card(card).build() ?: return emptySet()
-
-        val derivationStyle = card.derivationStyleProvider.getDerivationStyle()
-
-        val blockchains = getBlockchains(userWalletId).ifEmpty {
-            if (DemoHelper.isDemoCardId(card.cardId)) {
-                getDemoBlockchains(derivationStyle, card.cardId)
-            } else {
-                getDefaultBlockchains(derivationStyle)
-            }
-        }
-
-        return blockchains
-    }
-
-    private suspend fun getBlockchains(userWalletId: UserWalletId): Set<BlockchainToDerive> {
-        return walletAccountsFetcher.getSaved(userWalletId)?.accounts.orEmpty()
-            .flatMap { accountDTO ->
-                accountDTO.tokens.orEmpty()
-                    .filter { it.contractAddress == null }
-            }
-            .mapNotNull { coin ->
-                val blockchain = Blockchain.fromNetworkId(coin.networkId) ?: return@mapNotNull null
-                val derivationPath = coin.derivationPath?.let(::DerivationPath) ?: return@mapNotNull null
-
-                BlockchainToDerive(blockchain, derivationPath)
-            }
-            .toSet()
-    }
-
-    private fun getDemoBlockchains(derivationStyle: DerivationStyle?, cardId: String): Set<BlockchainToDerive> {
-        return DemoHelper.config.getDemoBlockchains(cardId).mapToBlockchainsWithDerivations(derivationStyle)
-    }
-
-    private fun getDefaultBlockchains(derivationStyle: DerivationStyle?): Set<BlockchainToDerive> {
-        val defaultBlockchains = setOf(Blockchain.Bitcoin, Blockchain.Ethereum)
-        return defaultBlockchains.mapToBlockchainsWithDerivations(derivationStyle)
-    }
-
-    private fun Set<Blockchain>.mapToBlockchainsWithDerivations(
-        derivationStyle: DerivationStyle?,
-    ): Set<BlockchainToDerive> {
-        return mapNotNullTo(hashSetOf()) { blockchain ->
-            val derivationPath = blockchain.derivationPath(derivationStyle) ?: return@mapNotNullTo null
-            BlockchainToDerive(blockchain, derivationPath)
-        }
-    }
-}

app/src/main/java/com/tangem/tap/domain/tasks/product/ScanProductTask.kt

@@ -12,8 +12,6 @@ import com.tangem.common.extensions.*
 import com.tangem.common.tlv.Tlv
 import com.tangem.common.tlv.TlvDecoder
 import com.tangem.crypto.CryptoUtils
-import com.tangem.crypto.hdWallet.DerivationPath
-import com.tangem.data.wallets.derivations.MissedDerivationsFinder
 import com.tangem.domain.card.common.TapWorkarounds.isExcluded
 import com.tangem.domain.card.common.TapWorkarounds.isNotSupportedInThatRelease
 import com.tangem.domain.card.common.TapWorkarounds.isStart2Coin
@@ -32,25 +30,21 @@ import com.tangem.operations.PreflightReadMode
 import com.tangem.operations.ScanTask
 import com.tangem.operations.backup.PrimaryCard
 import com.tangem.operations.backup.StartPrimaryCardLinkingTask
-import com.tangem.operations.derivation.DeriveMultipleWalletPublicKeysTask
 import com.tangem.operations.files.ReadFilesTask
 import com.tangem.operations.issuerAndUserData.ReadIssuerDataCommand
 import com.tangem.tap.domain.TapSdkError
 import com.tangem.tap.domain.visa.VisaCardScanHandler
 import com.tangem.tap.mainScope
-import com.tangem.tap.scope
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 
 @Suppress("LongParameterList")
 internal class ScanProductTask(
     private val card: Card?,
-    private val blockchainToDeriveFinder: BlockchainToDeriveFinder?,
     private val visaCardScanHandler: VisaCardScanHandler?,
     private val visaCoroutineScope: CoroutineScope?,
     private val onboardingV2FeatureToggles: OnboardingV2FeatureToggles?,
     private val shouldCheckIsAlreadyActivated: Boolean,
-    private val isDynamicAddressesEnabled: Boolean,
     private val cardRepository: CardRepository,
     override val allowsRequestAccessCodeFromRepository: Boolean = false,
 ) : CardSessionRunnable<ScanResponse> {
@@ -80,8 +74,6 @@ internal class ScanProductTask(
                 session = session,
                 cardDto = cardDto,
                 scanWalletProcessor = ScanWalletProcessor(
-                    blockchainToDeriveFinder = blockchainToDeriveFinder,
-                    isDynamicAddressesEnabled = isDynamicAddressesEnabled,
                     cardRepository = cardRepository,
                 ),
                 callback = callback,
@@ -92,8 +84,6 @@ internal class ScanProductTask(
         val commandProcessor = when {
             cardDto.isTangemTwins -> ScanTwinProcessor()
             else -> ScanWalletProcessor(
-                blockchainToDeriveFinder = blockchainToDeriveFinder,
-                isDynamicAddressesEnabled = isDynamicAddressesEnabled,
                 cardRepository = cardRepository,
             )
         }
@@ -102,8 +92,8 @@ internal class ScanProductTask(
                 is CompletionResult.Success -> ScanTask().run(session) { scanTaskResult ->
                     when (scanTaskResult) {
                         is CompletionResult.Success -> {
-                            // it needed because processorResult.data.card doesn't contains attestation result
-                            // and CardWallet.derivedKeys
+                            // It's needed because processorResult.data.card doesn't contain the attestation
+                            // result or the existing CardWallet.derivedKeys read from the card.
                             val processorScanResponseWithNewCard = processorResult.data.copy(
                                 card = CardDTO(scanTaskResult.data),
                             )
@@ -176,8 +166,6 @@ internal class ScanProductTask(
 }
 
 private class ScanWalletProcessor(
-    private val blockchainToDeriveFinder: BlockchainToDeriveFinder?,
-    private val isDynamicAddressesEnabled: Boolean,
     private val cardRepository: CardRepository,
 ) : ProductCommandProcessor<ScanResponse> {
 
@@ -281,48 +269,34 @@ private class ScanWalletProcessor(
                     when (linkingResult) {
                         is CompletionResult.Success -> {
                             primaryCard = linkingResult.data
-                            deriveKeysIfNeeded(card, session, callback)
+                            completeScan(card, session, callback)
                         }
                         is CompletionResult.Failure -> {
-                            deriveKeysIfNeeded(card, session, callback)
+                            completeScan(card, session, callback)
                         }
                     }
                 }
             } else {
-                deriveKeysIfNeeded(card, session, callback)
+                completeScan(card, session, callback)
             }
         }
     }
 
-    private fun deriveKeysIfNeeded(
+    // Keys are no longer derived during scan: default derivations are created up front in
+    // CreateProductWalletTask, and derivations for additional tokens are handled by
+    // DefaultColdMapDerivationsRepository when the user explicitly adds a token.
+    private fun completeScan(
         card: CardDTO,
         session: CardSession,
         callback: (result: CompletionResult<ScanResponse>) -> Unit,
     ) {
-        val productType = getWalletProductType(card)
-        scope.launch {
-            val scanResponse = ScanResponse(
-                card = card,
-                productType = productType,
-                walletData = session.environment.walletData,
-                primaryCard = primaryCard,
-            )
-            val derivations = collectDerivations(card, scanResponse)
-            if (derivations.isEmpty() || !card.settings.isHDWalletAllowed) {
-                callback(CompletionResult.Success(scanResponse))
-                return@launch
-            }
-
-            DeriveMultipleWalletPublicKeysTask(derivations).run(session) { result ->
-                when (result) {
-                    is CompletionResult.Success -> {
-                        val response = scanResponse.copy(derivedKeys = result.data.entries)
-                        callback(CompletionResult.Success(response))
-                    }
-                    is CompletionResult.Failure -> callback(CompletionResult.Failure(result.error))
-                }
-            }
-        }
+        val scanResponse = ScanResponse(
+            card = card,
+            productType = getWalletProductType(card),
+            walletData = session.environment.walletData,
+            primaryCard = primaryCard,
+        )
+        callback(CompletionResult.Success(scanResponse))
     }
 
     private fun getWalletProductType(card: CardDTO): ProductType {
@@ -334,17 +308,6 @@ private class ScanWalletProcessor(
             else -> ProductType.Wallet
         }
     }
-
-    private suspend fun collectDerivations(
-        card: CardDTO,
-        scanResponse: ScanResponse,
-    ): Map<ByteArrayKey, List<DerivationPath>> {
-        val blockchains = blockchainToDeriveFinder
-            ?.find(card)
-            ?: return emptyMap()
-
-        return MissedDerivationsFinder(scanResponse, isDynamicAddressesEnabled).findByBlockchainsToDerive(blockchains)
-    }
 }
 
 @Suppress("MagicNumber")

app/src/main/java/com/tangem/tap/domain/twins/FinalizeTwinTask.kt

@@ -13,7 +13,6 @@ import com.tangem.tap.domain.tasks.product.ScanProductTask
 class FinalizeTwinTask(
     private val twinPublicKey: ByteArray,
     private val issuerKeys: KeyPair,
-    private val isDynamicAddressesEnabled: Boolean,
     private val cardRepository: CardRepository,
 ) : CardSessionRunnable<ScanResponse> {
 
@@ -31,11 +30,9 @@ class FinalizeTwinTask(
                             is CompletionResult.Success ->
                                 ScanProductTask(
                                     card = readResult.data,
-                                    blockchainToDeriveFinder = null,
                                     visaCardScanHandler = null,
                                     visaCoroutineScope = null,
                                     shouldCheckIsAlreadyActivated = false,
-                                    isDynamicAddressesEnabled = isDynamicAddressesEnabled,
                                     onboardingV2FeatureToggles = null,
                                     cardRepository = cardRepository,
                                 ).run(session, callback)

app/src/main/java/com/tangem/tap/domain/userWalletList/repository/DefaultUserWalletsListRepository.kt

@@ -325,11 +325,7 @@ internal class DefaultUserWalletsListRepository(
                 sensitiveInformationRepository.getAll(listOf(encryptionKey))
                     .doOnSuccess { sensitiveInfo ->
                         updateWallets { wallets ->
-                            // It is necessary to update derivations because when scanning we obtain the missing keys
-                            wallets?.updateWith(
-                                walletIdToSensitiveInformation = sensitiveInfo,
-                                walletIdToDerivedKeys = mapOf(userWallet.walletId to scanResponse.derivedKeys),
-                            )
+                            wallets?.updateWith(walletIdToSensitiveInformation = sensitiveInfo)
                         }
                         trackSignInEvent(userWallet, AnalyticsParam.SignInType.Card)
                     }

app/src/main/java/com/tangem/tap/domain/userWalletList/utils/Mapper.kt

@@ -1,10 +1,8 @@
 package com.tangem.tap.domain.userWalletList.utils
 
-import com.tangem.domain.models.scan.KeyWalletPublicKey
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.domain.models.wallet.isMultiCurrency
-import com.tangem.operations.derivation.ExtendedPublicKeysMap
 import com.tangem.tap.domain.userWalletList.model.UserWalletPublicInformation
 import com.tangem.tap.domain.userWalletList.model.UserWalletSensitiveInformation
 
@@ -74,10 +72,7 @@ internal fun List<UserWalletPublicInformation>.toUserWallets(): List<UserWallet>
     return this.map { it.toUserWallet() }
 }
 
-internal fun UserWallet.updateWith(
-    sensitiveInformation: UserWalletSensitiveInformation,
-    derivedKeys: Map<KeyWalletPublicKey, ExtendedPublicKeysMap>?,
-): UserWallet {
+internal fun UserWallet.updateWith(sensitiveInformation: UserWalletSensitiveInformation): UserWallet {
     return when (this) {
         is UserWallet.Cold -> {
             copy(
@@ -85,7 +80,6 @@ internal fun UserWallet.updateWith(
                     card = scanResponse.card.copy(
                         wallets = requireNotNull(sensitiveInformation.wallets),
                     ),
-                    derivedKeys = derivedKeys ?: scanResponse.derivedKeys,
                     // visaCardActivationStatus = sensitiveInformation.visaCardActivationStatus,
                 ),
             )
@@ -98,17 +92,14 @@ internal fun UserWallet.updateWith(
 
 internal fun List<UserWallet>.updateWith(
     walletIdToSensitiveInformation: Map<UserWalletId, UserWalletSensitiveInformation>,
-    walletIdToDerivedKeys: Map<UserWalletId, Map<KeyWalletPublicKey, ExtendedPublicKeysMap>>? = null,
 ): List<UserWallet> {
     return if (walletIdToSensitiveInformation.isEmpty()) {
         this
     } else {
         this.map { wallet ->
             val sensitiveInformation = walletIdToSensitiveInformation[wallet.walletId]
-            val derivedKeys = walletIdToDerivedKeys?.get(wallet.walletId)
-
             if (sensitiveInformation != null) {
-                wallet.updateWith(sensitiveInformation, derivedKeys)
+                wallet.updateWith(sensitiveInformation)
             } else {
                 wallet
             }