From 3c14484840659ef29cc99786ace971035a448529 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Fri, 14 Apr 2023 12:09:22 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 .../com/tangem/tap/common/analytics/TangemSdkErrorMapper.kt | 6 ++++--
 app/src/main/java/com/tangem/tap/domain/TangemSdkManager.kt | 2 +-
 .../tangem/tap/domain/extensions/WalletManagerFactory.kt    | 2 +-
 .../java/com/tangem/tap/domain/model/WalletStoreModel.kt    | 2 +-
 .../tangem/tap/domain/model/builders/WalletStoreBuilder.kt  | 2 +-
 .../tap/domain/tasks/product/CreateProductWalletTask.kt     | 2 +-
 .../com/tangem/tap/domain/tasks/product/ScanProductTask.kt  | 2 +-
 .../utils/json/ExtendedPublicKeysMapAdapter.kt              | 4 ++--
 .../utils/json/WalletDerivedKeysMapAdapter.kt               | 4 ++--
 .../implementation/DefaultWalletManagersRepository.kt       | 2 +-
 .../details/redux/walletconnect/WalletConnectState.kt       | 2 +-
 .../tangem/tap/features/tokens/redux/TokensMiddleware.kt    | 2 +-
 .../main/java/com/tangem/tap/proxy/DerivationManagerImpl.kt | 2 +-
 domain/src/main/java/com/tangem/domain/common/CardDTO.kt    | 4 ++--
 .../src/main/java/com/tangem/domain/common/ScanResponse.kt  | 2 +-
 .../tangem/domain/features/addCustomToken/CustomCurrency.kt | 2 +-
 .../features/addCustomToken/redux/AddCustomTokenHub.kt      | 2 +-
 .../features/addCustomToken/redux/AddCustomTokenState.kt    | 2 +-
 gradle/dependencies.toml                                    | 4 ++--
 19 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/com/tangem/tap/common/analytics/TangemSdkErrorMapper.kt b/app/src/main/java/com/tangem/tap/common/analytics/TangemSdkErrorMapper.kt
index 0cfa1388be..0a06bf876e 100644
--- a/app/src/main/java/com/tangem/tap/common/analytics/TangemSdkErrorMapper.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/TangemSdkErrorMapper.kt
@@ -94,8 +94,6 @@ object TangemSdkErrorMapper {
             is TangemSdkError.BackupFailedEmptyWallets -> TangemSdkError.BackupFailedEmptyWallets()
             is TangemSdkError.BackupFailedNotEmptyWallets -> TangemSdkError.BackupFailedNotEmptyWallets()
             is TangemSdkError.NoActiveBackup -> TangemSdkError.NoActiveBackup()
-            is TangemSdkError.ResetBackupFailedHasBackupedWallets ->
-                TangemSdkError.ResetBackupFailedHasBackupedWallets()
             is TangemSdkError.BackupServiceInvalidState -> TangemSdkError.BackupServiceInvalidState()
             is TangemSdkError.NoBackupCardForIndex -> TangemSdkError.NoBackupCardForIndex()
             is TangemSdkError.EmptyBackupCards -> TangemSdkError.EmptyBackupCards()
@@ -121,6 +119,10 @@ object TangemSdkErrorMapper {
             is TangemSdkError.InvalidEncryptionKey -> error
             is TangemSdkError.KeyGenerationException -> error
             is TangemSdkError.MnemonicException -> error
+            is TangemSdkError.WalletAlreadyCreated -> error
+            is TangemSdkError.ResetBackupFailedHasBackedUpWallets -> error
+            is TangemSdkError.KeysImportDisabled -> error
+            is TangemSdkError.Underlying -> error
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/TangemSdkManager.kt b/app/src/main/java/com/tangem/tap/domain/TangemSdkManager.kt
index 36e5dcebdf..11faf6ba4a 100644
--- a/app/src/main/java/com/tangem/tap/domain/TangemSdkManager.kt
+++ b/app/src/main/java/com/tangem/tap/domain/TangemSdkManager.kt
@@ -18,7 +18,7 @@ import com.tangem.common.core.Config
 import com.tangem.common.core.TangemSdkError
 import com.tangem.common.core.UserCodeRequestPolicy
 import com.tangem.common.extensions.ByteArrayKey
-import com.tangem.common.hdWallet.DerivationPath
+import com.tangem.crypto.hdWallet.DerivationPath
 import com.tangem.common.map
 import com.tangem.common.usersCode.UserCodeRepository
 import com.tangem.core.analytics.Analytics
diff --git a/app/src/main/java/com/tangem/tap/domain/extensions/WalletManagerFactory.kt b/app/src/main/java/com/tangem/tap/domain/extensions/WalletManagerFactory.kt
index 5298777226..b2dbd64995 100644
--- a/app/src/main/java/com/tangem/tap/domain/extensions/WalletManagerFactory.kt
+++ b/app/src/main/java/com/tangem/tap/domain/extensions/WalletManagerFactory.kt
@@ -8,7 +8,7 @@ import com.tangem.blockchain.common.WalletManagerFactory
 import com.tangem.common.card.EllipticCurve
 import com.tangem.common.extensions.hexToBytes
 import com.tangem.common.extensions.toMapKey
-import com.tangem.common.hdWallet.DerivationPath
+import com.tangem.crypto.hdWallet.DerivationPath
 import com.tangem.domain.common.CardDTO
 import com.tangem.domain.common.ScanResponse
 import com.tangem.domain.common.TapWorkarounds.isTestCard
diff --git a/app/src/main/java/com/tangem/tap/domain/model/WalletStoreModel.kt b/app/src/main/java/com/tangem/tap/domain/model/WalletStoreModel.kt
index 01da397e3c..2dad9e1303 100644
--- a/app/src/main/java/com/tangem/tap/domain/model/WalletStoreModel.kt
+++ b/app/src/main/java/com/tangem/tap/domain/model/WalletStoreModel.kt
@@ -2,7 +2,7 @@ package com.tangem.tap.domain.model
 
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchain.common.WalletManager
-import com.tangem.common.hdWallet.DerivationPath
+import com.tangem.crypto.hdWallet.DerivationPath
 import com.tangem.domain.common.util.UserWalletId
 import com.tangem.tap.domain.model.WalletStoreModel.WalletRent
 import com.tangem.tap.domain.tokens.models.BlockchainNetwork
diff --git a/app/src/main/java/com/tangem/tap/domain/model/builders/WalletStoreBuilder.kt b/app/src/main/java/com/tangem/tap/domain/model/builders/WalletStoreBuilder.kt
index 65405fa242..d9805be40f 100644
--- a/app/src/main/java/com/tangem/tap/domain/model/builders/WalletStoreBuilder.kt
+++ b/app/src/main/java/com/tangem/tap/domain/model/builders/WalletStoreBuilder.kt
@@ -6,7 +6,7 @@ import com.tangem.blockchain.common.DerivationStyle
 import com.tangem.blockchain.common.Token
 import com.tangem.blockchain.common.Wallet
 import com.tangem.blockchain.common.WalletManager
-import com.tangem.common.hdWallet.DerivationPath
+import com.tangem.crypto.hdWallet.DerivationPath
 import com.tangem.domain.common.TapWorkarounds.derivationStyle
 import com.tangem.tap.common.extensions.getBlockchainTxHistory
 import com.tangem.tap.common.extensions.getTokenTxHistory
diff --git a/app/src/main/java/com/tangem/tap/domain/tasks/product/CreateProductWalletTask.kt b/app/src/main/java/com/tangem/tap/domain/tasks/product/CreateProductWalletTask.kt
index eeed6d4ad6..e57a629edc 100644
--- a/app/src/main/java/com/tangem/tap/domain/tasks/product/CreateProductWalletTask.kt
+++ b/app/src/main/java/com/tangem/tap/domain/tasks/product/CreateProductWalletTask.kt
@@ -10,7 +10,7 @@ import com.tangem.common.core.TangemSdkError
 import com.tangem.common.extensions.ByteArrayKey
 import com.tangem.common.extensions.guard
 import com.tangem.common.extensions.toMapKey
-import com.tangem.common.hdWallet.DerivationPath
+import com.tangem.crypto.hdWallet.DerivationPath
 import com.tangem.common.map
 import com.tangem.domain.common.CardDTO
 import com.tangem.domain.common.CardTypesResolver
diff --git a/app/src/main/java/com/tangem/tap/domain/tasks/product/ScanProductTask.kt b/app/src/main/java/com/tangem/tap/domain/tasks/product/ScanProductTask.kt
index 00ca32c553..78866f673b 100644
--- a/app/src/main/java/com/tangem/tap/domain/tasks/product/ScanProductTask.kt
+++ b/app/src/main/java/com/tangem/tap/domain/tasks/product/ScanProductTask.kt
@@ -15,7 +15,7 @@ import com.tangem.common.extensions.hexToBytes
 import com.tangem.common.extensions.toByteArray
 import com.tangem.common.extensions.toHexString
 import com.tangem.common.extensions.toMapKey
-import com.tangem.common.hdWallet.DerivationPath
+import com.tangem.crypto.hdWallet.DerivationPath
 import com.tangem.common.tlv.Tlv
 import com.tangem.common.tlv.TlvDecoder
 import com.tangem.crypto.CryptoUtils
diff --git a/app/src/main/java/com/tangem/tap/domain/userWalletList/utils/json/ExtendedPublicKeysMapAdapter.kt b/app/src/main/java/com/tangem/tap/domain/userWalletList/utils/json/ExtendedPublicKeysMapAdapter.kt
index 9399f55b79..4fa0999074 100644
--- a/app/src/main/java/com/tangem/tap/domain/userWalletList/utils/json/ExtendedPublicKeysMapAdapter.kt
+++ b/app/src/main/java/com/tangem/tap/domain/userWalletList/utils/json/ExtendedPublicKeysMapAdapter.kt
@@ -7,8 +7,8 @@ import com.squareup.moshi.JsonWriter
 import com.squareup.moshi.ToJson
 import com.tangem.common.extensions.hexToBytes
 import com.tangem.common.extensions.toHexString
-import com.tangem.common.hdWallet.DerivationPath
-import com.tangem.common.hdWallet.ExtendedPublicKey
+import com.tangem.crypto.hdWallet.DerivationPath
+import com.tangem.crypto.hdWallet.bip32.ExtendedPublicKey
 import com.tangem.operations.derivation.ExtendedPublicKeysMap
 
 internal class ExtendedPublicKeysMapAdapter {
diff --git a/app/src/main/java/com/tangem/tap/domain/userWalletList/utils/json/WalletDerivedKeysMapAdapter.kt b/app/src/main/java/com/tangem/tap/domain/userWalletList/utils/json/WalletDerivedKeysMapAdapter.kt
index e4ba0dd0db..d374f5013d 100644
--- a/app/src/main/java/com/tangem/tap/domain/userWalletList/utils/json/WalletDerivedKeysMapAdapter.kt
+++ b/app/src/main/java/com/tangem/tap/domain/userWalletList/utils/json/WalletDerivedKeysMapAdapter.kt
@@ -7,8 +7,8 @@ import com.squareup.moshi.JsonWriter
 import com.squareup.moshi.ToJson
 import com.tangem.common.extensions.hexToBytes
 import com.tangem.common.extensions.toHexString
-import com.tangem.common.hdWallet.DerivationPath
-import com.tangem.common.hdWallet.ExtendedPublicKey
+import com.tangem.crypto.hdWallet.DerivationPath
+import com.tangem.crypto.hdWallet.bip32.ExtendedPublicKey
 
 internal class WalletDerivedKeysMapAdapter {
     @ToJson
diff --git a/app/src/main/java/com/tangem/tap/domain/walletStores/repository/implementation/DefaultWalletManagersRepository.kt b/app/src/main/java/com/tangem/tap/domain/walletStores/repository/implementation/DefaultWalletManagersRepository.kt
index a09ea7abd2..6c5eba1809 100644
--- a/app/src/main/java/com/tangem/tap/domain/walletStores/repository/implementation/DefaultWalletManagersRepository.kt
+++ b/app/src/main/java/com/tangem/tap/domain/walletStores/repository/implementation/DefaultWalletManagersRepository.kt
@@ -9,7 +9,7 @@ import com.tangem.blockchain.common.WalletManagerFactory
 import com.tangem.common.CompletionResult
 import com.tangem.common.catching
 import com.tangem.common.doOnSuccess
-import com.tangem.common.hdWallet.DerivationPath
+import com.tangem.crypto.hdWallet.DerivationPath
 import com.tangem.common.mapFailure
 import com.tangem.domain.common.CardDTO
 import com.tangem.domain.common.ScanResponse
diff --git a/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectState.kt b/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectState.kt
index 5c32fdb2cd..61fa67dd44 100644
--- a/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectState.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectState.kt
@@ -5,7 +5,7 @@ import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchain.common.DerivationStyle
 import com.tangem.blockchain.common.TransactionData
 import com.tangem.blockchain.common.WalletManager
-import com.tangem.common.hdWallet.DerivationPath
+import com.tangem.crypto.hdWallet.DerivationPath
 import com.tangem.domain.common.ScanResponse
 import com.tangem.tap.common.redux.StateDialog
 import com.tangem.tap.features.details.ui.walletconnect.dialogs.PersonalSignDialogData
diff --git a/app/src/main/java/com/tangem/tap/features/tokens/redux/TokensMiddleware.kt b/app/src/main/java/com/tangem/tap/features/tokens/redux/TokensMiddleware.kt
index eee906b7d1..7a3c9a9d17 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/redux/TokensMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/redux/TokensMiddleware.kt
@@ -8,7 +8,7 @@ import com.tangem.common.extensions.ByteArrayKey
 import com.tangem.common.extensions.guard
 import com.tangem.common.extensions.toMapKey
 import com.tangem.common.flatMap
-import com.tangem.common.hdWallet.DerivationPath
+import com.tangem.crypto.hdWallet.DerivationPath
 import com.tangem.common.services.Result
 import com.tangem.core.analytics.Analytics
 import com.tangem.domain.DomainWrapped
diff --git a/app/src/main/java/com/tangem/tap/proxy/DerivationManagerImpl.kt b/app/src/main/java/com/tangem/tap/proxy/DerivationManagerImpl.kt
index 0ef9bf082d..f52ac33f8a 100644
--- a/app/src/main/java/com/tangem/tap/proxy/DerivationManagerImpl.kt
+++ b/app/src/main/java/com/tangem/tap/proxy/DerivationManagerImpl.kt
@@ -8,7 +8,7 @@ import com.tangem.common.core.TangemError
 import com.tangem.common.core.TangemSdkError
 import com.tangem.common.extensions.ByteArrayKey
 import com.tangem.common.extensions.toMapKey
-import com.tangem.common.hdWallet.DerivationPath
+import com.tangem.crypto.hdWallet.DerivationPath
 import com.tangem.domain.common.ScanResponse
 import com.tangem.domain.common.TapWorkarounds.derivationStyle
 import com.tangem.domain.common.extensions.fromNetworkId
diff --git a/domain/src/main/java/com/tangem/domain/common/CardDTO.kt b/domain/src/main/java/com/tangem/domain/common/CardDTO.kt
index 630a017700..fa4cbe9f42 100644
--- a/domain/src/main/java/com/tangem/domain/common/CardDTO.kt
+++ b/domain/src/main/java/com/tangem/domain/common/CardDTO.kt
@@ -5,8 +5,8 @@ import com.tangem.common.card.Card
 import com.tangem.common.card.CardWallet
 import com.tangem.common.card.EllipticCurve
 import com.tangem.common.card.EncryptionMode
-import com.tangem.common.hdWallet.DerivationPath
-import com.tangem.common.hdWallet.ExtendedPublicKey
+import com.tangem.crypto.hdWallet.DerivationPath
+import com.tangem.crypto.hdWallet.bip32.ExtendedPublicKey
 import com.tangem.operations.attestation.Attestation
 import java.util.*
 import com.tangem.common.card.FirmwareVersion as SdkFirmwareVersion
diff --git a/domain/src/main/java/com/tangem/domain/common/ScanResponse.kt b/domain/src/main/java/com/tangem/domain/common/ScanResponse.kt
index 17f4e1c64a..a93b21fba7 100644
--- a/domain/src/main/java/com/tangem/domain/common/ScanResponse.kt
+++ b/domain/src/main/java/com/tangem/domain/common/ScanResponse.kt
@@ -5,7 +5,7 @@ import com.tangem.common.card.EllipticCurve
 import com.tangem.common.card.WalletData
 import com.tangem.common.extensions.ByteArrayKey
 import com.tangem.common.extensions.toMapKey
-import com.tangem.common.hdWallet.DerivationPath
+import com.tangem.crypto.hdWallet.DerivationPath
 import com.tangem.domain.common.TapWorkarounds.isTangemTwins
 import com.tangem.domain.common.TapWorkarounds.isTestCard
 import com.tangem.operations.CommandResponse
diff --git a/domain/src/main/java/com/tangem/domain/features/addCustomToken/CustomCurrency.kt b/domain/src/main/java/com/tangem/domain/features/addCustomToken/CustomCurrency.kt
index fd1a47b728..6757215dda 100644
--- a/domain/src/main/java/com/tangem/domain/features/addCustomToken/CustomCurrency.kt
+++ b/domain/src/main/java/com/tangem/domain/features/addCustomToken/CustomCurrency.kt
@@ -3,7 +3,7 @@ package com.tangem.domain.features.addCustomToken
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchain.common.DerivationStyle
 import com.tangem.blockchain.common.Token
-import com.tangem.common.hdWallet.DerivationPath
+import com.tangem.crypto.hdWallet.DerivationPath
 import com.tangem.domain.common.form.BaseFieldDataConverter
 import com.tangem.domain.common.form.FieldId
 import com.tangem.domain.features.addCustomToken.redux.AddCustomTokenState
diff --git a/domain/src/main/java/com/tangem/domain/features/addCustomToken/redux/AddCustomTokenHub.kt b/domain/src/main/java/com/tangem/domain/features/addCustomToken/redux/AddCustomTokenHub.kt
index 1a533426fc..08315dc850 100644
--- a/domain/src/main/java/com/tangem/domain/features/addCustomToken/redux/AddCustomTokenHub.kt
+++ b/domain/src/main/java/com/tangem/domain/features/addCustomToken/redux/AddCustomTokenHub.kt
@@ -420,7 +420,7 @@ internal class AddCustomTokenHub : BaseStoreHub<AddCustomTokenState>("AddCustomT
 
     private fun getDerivationPathFromSelectedBlockchain(
         selectedDerivationBlockchain: Blockchain,
-    ): com.tangem.common.hdWallet.DerivationPath? = AddCustomTokenState.getDerivationPath(
+    ): com.tangem.crypto.hdWallet.DerivationPath? = AddCustomTokenState.getDerivationPath(
         mainNetwork = Network.getFieldValue(),
         derivationNetwork = selectedDerivationBlockchain,
         derivationStyle = hubState.cardDerivationStyle,
diff --git a/domain/src/main/java/com/tangem/domain/features/addCustomToken/redux/AddCustomTokenState.kt b/domain/src/main/java/com/tangem/domain/features/addCustomToken/redux/AddCustomTokenState.kt
index 829077bc70..7076b19233 100644
--- a/domain/src/main/java/com/tangem/domain/features/addCustomToken/redux/AddCustomTokenState.kt
+++ b/domain/src/main/java/com/tangem/domain/features/addCustomToken/redux/AddCustomTokenState.kt
@@ -173,7 +173,7 @@ data class AddCustomTokenState(
             mainNetwork: Blockchain,
             derivationNetwork: Blockchain,
             derivationStyle: DerivationStyle?,
-        ): com.tangem.common.hdWallet.DerivationPath? {
+        ): com.tangem.crypto.hdWallet.DerivationPath? {
             // If we allow user to select derivations, we need to provide different derivations
             // (Legacy style derivations).
             // But the mainNetwork derivation depends on whether a user has a card
diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml
index 6759d13722..d134968349 100644
--- a/gradle/dependencies.toml
+++ b/gradle/dependencies.toml
@@ -71,9 +71,9 @@ kotlinSerialization = "1.4.1"
 # endregion Other libraries
 
 # region Tangem
-tangemBlockchainSdk = "develop-193"
+tangemBlockchainSdk = "develop-197"
 #tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds
-tangemCardSdk = "develop-209"
+tangemCardSdk = "develop-213"
 # tangemCardSdk = "0.0.1" # Keep it! - used for local builds
 # endregion Tangem