From b6777bbb7a25c741d49a88a34bba8e21e5f0e903 Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 5 Mar 2026 20:34:10 +0400 Subject: [PATCH] Updated on 2026-08-14 --- .../moonpay/MoonpayBlockchainMapping.kt | 2 -- .../converter/BlockchainSDKConfigConverter.kt | 9 -------- .../GeneratedEnvironmentConfigConverter.kt | 17 -------------- .../models/EnvironmentConfigModel.kt | 5 ---- .../core/ui/extensions/BlockchainIcons.kt | 3 --- .../src/main/res/drawable/ic_berachain_22.xml | 15 ------------ .../main/res/drawable/img_berachain_22.xml | 22 ------------------ .../data/common/network/NetworkFactory.kt | 1 - .../data/common/network/NetworkFactoryTest.kt | 7 ------ .../legacy/MercuryoBlockchainMapping.kt | 1 - .../domain/card/configs/Wallet2CardConfig.kt | 2 -- .../card/configs/Wallet2CardConfigTest.kt | 2 -- gradle/tangem_dependencies.toml | 2 +- .../tangem/blockchainsdk/utils/Blockchain.kt | 5 ---- .../derivation/AccountNodeRecognizer.kt | 2 -- .../derivation/AccountNodeRecognizerTest.kt | 23 ------------------- 16 files changed, 1 insertion(+), 117 deletions(-) delete mode 100644 core/ui/src/main/res/drawable/ic_berachain_22.xml delete mode 100644 core/ui/src/main/res/drawable/img_berachain_22.xml diff --git a/app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonpayBlockchainMapping.kt b/app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonpayBlockchainMapping.kt index 74d8432e61..1ff346fa44 100644 --- a/app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonpayBlockchainMapping.kt +++ b/app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonpayBlockchainMapping.kt @@ -164,6 +164,4 @@ internal val Blockchain.moonPaySupportedCurrency: MoonPaySupportedCurrency? ArbitrumNova -> null Plasma, PlasmaTestnet -> null Monad, MonadTestnet -> null - Berachain -> MoonPaySupportedCurrency(networkCode = "berachain", currencyCode = "bera_bera") - BerachainTestnet -> null } \ No newline at end of file diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/config/environment/converter/BlockchainSDKConfigConverter.kt b/core/datasource/src/main/java/com/tangem/datasource/local/config/environment/converter/BlockchainSDKConfigConverter.kt index 57c2a3abe7..fab336d555 100644 --- a/core/datasource/src/main/java/com/tangem/datasource/local/config/environment/converter/BlockchainSDKConfigConverter.kt +++ b/core/datasource/src/main/java/com/tangem/datasource/local/config/environment/converter/BlockchainSDKConfigConverter.kt @@ -34,14 +34,6 @@ internal object BlockchainSDKConfigConverter : Converter R.drawable.img_arbitrum_nova_22 "plasma", "plasma/test" -> R.drawable.img_plasma_22 "monad", "monad/test" -> R.drawable.img_monad_22 - "berachain", "berachain/test" -> R.drawable.img_berachain_22 else -> R.drawable.ic_alert_24 } } @@ -199,7 +198,6 @@ fun getActiveIconResByCoinId(coinId: String): Int { "arbitrum-nova" -> R.drawable.img_arbitrum_nova_22 "plasma", "plasma/test" -> R.drawable.img_plasma_22 "monad", "monad/test" -> R.drawable.img_monad_22 - "berachain-bera" -> R.drawable.img_berachain_22 else -> R.drawable.ic_alert_24 } } @@ -301,7 +299,6 @@ fun getGreyedOutIconRes(blockchainId: String): Int { "arbitrum-nova" -> R.drawable.ic_arbitrum_nova_22 "plasma", "plasma/test" -> R.drawable.ic_plasma_22 "monad", "monad/test" -> R.drawable.ic_monad_22 - "berachain", "berachain/test" -> R.drawable.ic_berachain_22 else -> R.drawable.ic_alert_24 } } \ No newline at end of file diff --git a/core/ui/src/main/res/drawable/ic_berachain_22.xml b/core/ui/src/main/res/drawable/ic_berachain_22.xml deleted file mode 100644 index 18aee83244..0000000000 --- a/core/ui/src/main/res/drawable/ic_berachain_22.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/core/ui/src/main/res/drawable/img_berachain_22.xml b/core/ui/src/main/res/drawable/img_berachain_22.xml deleted file mode 100644 index c17d595496..0000000000 --- a/core/ui/src/main/res/drawable/img_berachain_22.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - diff --git a/data/common/src/main/kotlin/com/tangem/data/common/network/NetworkFactory.kt b/data/common/src/main/kotlin/com/tangem/data/common/network/NetworkFactory.kt index 096282c5e9..bf9014a844 100644 --- a/data/common/src/main/kotlin/com/tangem/data/common/network/NetworkFactory.kt +++ b/data/common/src/main/kotlin/com/tangem/data/common/network/NetworkFactory.kt @@ -377,7 +377,6 @@ class NetworkFactory @Inject constructor( Blockchain.ArbitrumNova, Blockchain.Plasma, Blockchain.PlasmaTestnet, Blockchain.Monad, Blockchain.MonadTestnet, - Blockchain.Berachain, Blockchain.BerachainTestnet, -> Network.TransactionExtrasType.NONE // endregion } diff --git a/data/common/src/test/kotlin/com/tangem/data/common/network/NetworkFactoryTest.kt b/data/common/src/test/kotlin/com/tangem/data/common/network/NetworkFactoryTest.kt index 6d3a6467d5..e0fc158abe 100644 --- a/data/common/src/test/kotlin/com/tangem/data/common/network/NetworkFactoryTest.kt +++ b/data/common/src/test/kotlin/com/tangem/data/common/network/NetworkFactoryTest.kt @@ -461,13 +461,6 @@ class NetworkFactoryTest { Blockchain.Scroll, Blockchain.ScrollTestnet, Blockchain.ZkLinkNova, Blockchain.ZkLinkNovaTestnet, Blockchain.Pepecoin, Blockchain.PepecoinTestnet, - Blockchain.Hyperliquid, Blockchain.HyperliquidTestnet, - Blockchain.Quai, Blockchain.QuaiTestnet, - Blockchain.Linea, Blockchain.LineaTestnet, - Blockchain.ArbitrumNova, - Blockchain.Plasma, Blockchain.PlasmaTestnet, - Blockchain.Monad, Blockchain.MonadTestnet, - Blockchain.Berachain, Blockchain.BerachainTestnet, ), expected = Network.TransactionExtrasType.NONE, ), diff --git a/data/onramp/src/main/java/com/tangem/data/onramp/legacy/MercuryoBlockchainMapping.kt b/data/onramp/src/main/java/com/tangem/data/onramp/legacy/MercuryoBlockchainMapping.kt index 6aeecb1989..c1bf85879a 100644 --- a/data/onramp/src/main/java/com/tangem/data/onramp/legacy/MercuryoBlockchainMapping.kt +++ b/data/onramp/src/main/java/com/tangem/data/onramp/legacy/MercuryoBlockchainMapping.kt @@ -164,6 +164,5 @@ public val Blockchain.mercuryoNetwork: String? Blockchain.ArbitrumNova -> null Blockchain.Plasma, Blockchain.PlasmaTestnet -> null Blockchain.Monad, Blockchain.MonadTestnet -> null - Blockchain.Berachain, Blockchain.BerachainTestnet -> null } } \ No newline at end of file diff --git a/domain/card/src/main/kotlin/com/tangem/domain/card/configs/Wallet2CardConfig.kt b/domain/card/src/main/kotlin/com/tangem/domain/card/configs/Wallet2CardConfig.kt index 77f35df7fd..0c4ba1c0b0 100644 --- a/domain/card/src/main/kotlin/com/tangem/domain/card/configs/Wallet2CardConfig.kt +++ b/domain/card/src/main/kotlin/com/tangem/domain/card/configs/Wallet2CardConfig.kt @@ -219,8 +219,6 @@ data object Wallet2CardConfig : CardConfig { Blockchain.PlasmaTestnet -> EllipticCurve.Secp256k1 Blockchain.Monad -> EllipticCurve.Secp256k1 Blockchain.MonadTestnet -> EllipticCurve.Secp256k1 - Blockchain.Berachain -> EllipticCurve.Secp256k1 - Blockchain.BerachainTestnet -> EllipticCurve.Secp256k1 } } } \ No newline at end of file diff --git a/domain/card/src/test/java/com/tangem/domain/card/configs/Wallet2CardConfigTest.kt b/domain/card/src/test/java/com/tangem/domain/card/configs/Wallet2CardConfigTest.kt index 7ae6b64eec..9ef3985637 100644 --- a/domain/card/src/test/java/com/tangem/domain/card/configs/Wallet2CardConfigTest.kt +++ b/domain/card/src/test/java/com/tangem/domain/card/configs/Wallet2CardConfigTest.kt @@ -175,8 +175,6 @@ class Wallet2CardConfigTest { Blockchain.PlasmaTestnet to EllipticCurve.Secp256k1, Blockchain.Monad to EllipticCurve.Secp256k1, Blockchain.MonadTestnet to EllipticCurve.Secp256k1, - Blockchain.Berachain to EllipticCurve.Secp256k1, - Blockchain.BerachainTestnet to EllipticCurve.Secp256k1, ) @Test diff --git a/gradle/tangem_dependencies.toml b/gradle/tangem_dependencies.toml index 6934faad61..5f2038f91c 100644 --- a/gradle/tangem_dependencies.toml +++ b/gradle/tangem_dependencies.toml @@ -5,7 +5,7 @@ # https://github.com/tangem/tangem-sdk-android/ # https://github.com/tangem/vico -tangemBlockchainSdk = "develop-1437" +tangemBlockchainSdk = "releases-5.34-1430" #tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds tangemCardSdk = "develop-582" #tangemCardSdk = "0.0.1" # Keep it! - used for local builds ^ diff --git a/libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/utils/Blockchain.kt b/libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/utils/Blockchain.kt index 2d2f7abe65..216070afad 100644 --- a/libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/utils/Blockchain.kt +++ b/libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/utils/Blockchain.kt @@ -176,8 +176,6 @@ fun Blockchain.Companion.fromNetworkId(networkId: String): Blockchain? { "plasma/test" -> Blockchain.PlasmaTestnet "monad" -> Blockchain.Monad "monad/test" -> Blockchain.MonadTestnet - "berachain" -> Blockchain.Berachain - "berachain/test" -> Blockchain.BerachainTestnet else -> null } } @@ -351,8 +349,6 @@ fun Blockchain.toNetworkId(): String { Blockchain.PlasmaTestnet -> "plasma/test" Blockchain.Monad -> "monad" Blockchain.MonadTestnet -> "monad/test" - Blockchain.Berachain -> "berachain" - Blockchain.BerachainTestnet -> "berachain/test" } } @@ -462,7 +458,6 @@ fun Blockchain.toCoinId(): String { Blockchain.ArbitrumNova -> "arbitrum-nova-ethereum" Blockchain.Plasma, Blockchain.PlasmaTestnet -> "plasma" Blockchain.Monad, Blockchain.MonadTestnet -> "monad" - Blockchain.Berachain, Blockchain.BerachainTestnet -> "berachain-bera" } } diff --git a/libs/crypto/src/main/java/com/tangem/lib/crypto/derivation/AccountNodeRecognizer.kt b/libs/crypto/src/main/java/com/tangem/lib/crypto/derivation/AccountNodeRecognizer.kt index ee1b92dc52..32e90c0d4b 100644 --- a/libs/crypto/src/main/java/com/tangem/lib/crypto/derivation/AccountNodeRecognizer.kt +++ b/libs/crypto/src/main/java/com/tangem/lib/crypto/derivation/AccountNodeRecognizer.kt @@ -178,7 +178,6 @@ class AccountNodeRecognizer(private val blockchain: Blockchain) { Blockchain.Quai, Blockchain.Plasma, Blockchain.Monad, - Blockchain.Berachain, -> true Blockchain.Nexa, // unsupported network Blockchain.Chia, @@ -255,7 +254,6 @@ class AccountNodeRecognizer(private val blockchain: Blockchain) { Blockchain.LineaTestnet, Blockchain.PlasmaTestnet, Blockchain.MonadTestnet, - Blockchain.BerachainTestnet, -> false // endregion } diff --git a/libs/crypto/src/test/kotlin/com/tangem/lib/crypto/derivation/AccountNodeRecognizerTest.kt b/libs/crypto/src/test/kotlin/com/tangem/lib/crypto/derivation/AccountNodeRecognizerTest.kt index 756ae1c644..4d004e0616 100644 --- a/libs/crypto/src/test/kotlin/com/tangem/lib/crypto/derivation/AccountNodeRecognizerTest.kt +++ b/libs/crypto/src/test/kotlin/com/tangem/lib/crypto/derivation/AccountNodeRecognizerTest.kt @@ -103,29 +103,6 @@ internal class AccountNodeRecognizerTest { expected = null, ), // endregion - - // region Berachain blockchain (EVM-like) - TestModel( - blockchain = Blockchain.Berachain, - derivationPath = "m/44'/60'/0'/0/1", - expected = 1, - ), - TestModel( - blockchain = Blockchain.Berachain, - derivationPath = "m/44'/60'/0'/0/0", - expected = 0, - ), - TestModel( - blockchain = Blockchain.Berachain, - derivationPath = "m/44'/60'/0'/0", - expected = null, - ), - TestModel( - blockchain = Blockchain.Berachain, - derivationPath = "m/44'/60'", - expected = null, - ), - // endregion ) private fun provideUTXOTestModels() = listOf(