From 5ba7c63987707d1b259aa40e02f31bfa23d1e108 Mon Sep 17 00:00:00 2001 From: Tangem Date: Mon, 6 Jul 2026 11:08:18 +0400 Subject: [PATCH] Updated on 2026-08-14 --- app/src/main/assets/tangem-app-config | 2 +- .../moonpay/MoonpayBlockchainMapping.kt | 1 + .../common/ui/extensions/BlockchainIcons.kt | 2 ++ .../ui/extensions/BlockchainIconsTest.kt | 2 ++ core/ui/src/main/res/drawable/ic_gonka_22.xml | 21 +++++++++++++++++++ .../ui/src/main/res/drawable/img_gonka_22.xml | 13 ++++++++++++ .../data/common/network/NetworkFactory.kt | 1 + .../legacy/MercuryoBlockchainMapping.kt | 1 + .../DefaultTransactionRepository.kt | 1 + .../domain/card/configs/Wallet2CardConfig.kt | 1 + .../card/configs/Wallet2CardConfigTest.kt | 1 + gradle/tangem_dependencies.toml | 2 +- .../tangem/blockchainsdk/utils/Blockchain.kt | 3 +++ .../derivation/AccountNodeRecognizer.kt | 1 + 14 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 core/ui/src/main/res/drawable/ic_gonka_22.xml create mode 100644 core/ui/src/main/res/drawable/img_gonka_22.xml diff --git a/app/src/main/assets/tangem-app-config b/app/src/main/assets/tangem-app-config index a7b32c7668..f983c6defd 160000 --- a/app/src/main/assets/tangem-app-config +++ b/app/src/main/assets/tangem-app-config @@ -1 +1 @@ -Subproject commit a7b32c766817076c6346156390c135a3dae1b6ce +Subproject commit f983c6defd0b2240eb6f134aefe30f7e93696795 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 a220b53c66..4e3c6b8051 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 @@ -166,4 +166,5 @@ internal val Blockchain.moonPaySupportedCurrency: MoonPaySupportedCurrency? Adi, AdiTestnet -> null SeiEvm, SeiEvmTestnet -> null Monad, MonadTestnet -> null + Gonka -> null } \ No newline at end of file diff --git a/common/ui/src/main/java/com/tangem/common/ui/extensions/BlockchainIcons.kt b/common/ui/src/main/java/com/tangem/common/ui/extensions/BlockchainIcons.kt index 00016c2d27..97b5ab5ec5 100644 --- a/common/ui/src/main/java/com/tangem/common/ui/extensions/BlockchainIcons.kt +++ b/common/ui/src/main/java/com/tangem/common/ui/extensions/BlockchainIcons.kt @@ -137,6 +137,8 @@ private fun iconSetOf(blockchain: Blockchain): IconSet? = when (blockchain) { -> IconSet(active = R.drawable.img_flare_22, greyedOut = R.drawable.ic_flare_22) Blockchain.Gnosis, -> IconSet(active = R.drawable.img_gnosis_22, greyedOut = R.drawable.ic_gnosis_22) + Blockchain.Gonka, + -> IconSet(active = R.drawable.img_gonka_22, greyedOut = R.drawable.ic_gonka_22) Blockchain.Hedera, Blockchain.HederaTestnet, -> IconSet(active = R.drawable.img_hedera_22, greyedOut = R.drawable.ic_hedera_22) diff --git a/common/ui/src/test/kotlin/com/tangem/common/ui/extensions/BlockchainIconsTest.kt b/common/ui/src/test/kotlin/com/tangem/common/ui/extensions/BlockchainIconsTest.kt index 2b3ffdcdb4..b2d6770626 100644 --- a/common/ui/src/test/kotlin/com/tangem/common/ui/extensions/BlockchainIconsTest.kt +++ b/common/ui/src/test/kotlin/com/tangem/common/ui/extensions/BlockchainIconsTest.kt @@ -75,6 +75,7 @@ internal class BlockchainIconsTest { Blockchain.Filecoin -> R.drawable.img_filecoin_22 Blockchain.Flare, Blockchain.FlareTestnet -> R.drawable.img_flare_22 Blockchain.Gnosis -> R.drawable.img_gnosis_22 + Blockchain.Gonka -> R.drawable.img_gonka_22 Blockchain.Hedera, Blockchain.HederaTestnet -> R.drawable.img_hedera_22 Blockchain.Hyperliquid, Blockchain.HyperliquidTestnet -> R.drawable.img_hyperliquid_22 Blockchain.InternetComputer -> R.drawable.img_icp_22 @@ -198,6 +199,7 @@ internal class BlockchainIconsTest { Blockchain.Filecoin -> R.drawable.ic_filecoin_22 Blockchain.Flare, Blockchain.FlareTestnet -> R.drawable.ic_flare_22 Blockchain.Gnosis -> R.drawable.ic_gnosis_22 + Blockchain.Gonka -> R.drawable.ic_gonka_22 Blockchain.Hedera, Blockchain.HederaTestnet -> R.drawable.ic_hedera_22 Blockchain.Hyperliquid, Blockchain.HyperliquidTestnet -> R.drawable.ic_hyperliquid_22 Blockchain.InternetComputer -> R.drawable.ic_icp_22 diff --git a/core/ui/src/main/res/drawable/ic_gonka_22.xml b/core/ui/src/main/res/drawable/ic_gonka_22.xml new file mode 100644 index 0000000000..bc3abe4626 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_gonka_22.xml @@ -0,0 +1,21 @@ + + + + + + + diff --git a/core/ui/src/main/res/drawable/img_gonka_22.xml b/core/ui/src/main/res/drawable/img_gonka_22.xml new file mode 100644 index 0000000000..efcda8344c --- /dev/null +++ b/core/ui/src/main/res/drawable/img_gonka_22.xml @@ -0,0 +1,13 @@ + + + + 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 5adabfe981..0cb498bb14 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 @@ -224,6 +224,7 @@ class NetworkFactory @Inject constructor( Blockchain.Binance, Blockchain.TON, Blockchain.Cosmos, + Blockchain.Gonka, Blockchain.TerraV1, Blockchain.TerraV2, Blockchain.Stellar, 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 2325a048fd..b248f1701e 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 @@ -166,5 +166,6 @@ public val Blockchain.mercuryoNetwork: String? Blockchain.Adi, Blockchain.AdiTestnet -> null Blockchain.SeiEvm, Blockchain.SeiEvmTestnet -> null Blockchain.Monad, Blockchain.MonadTestnet -> null + Blockchain.Gonka -> null } } \ No newline at end of file diff --git a/data/transaction/src/main/java/com/tangem/data/transaction/DefaultTransactionRepository.kt b/data/transaction/src/main/java/com/tangem/data/transaction/DefaultTransactionRepository.kt index ae96776efa..e1ce1e8b24 100644 --- a/data/transaction/src/main/java/com/tangem/data/transaction/DefaultTransactionRepository.kt +++ b/data/transaction/src/main/java/com/tangem/data/transaction/DefaultTransactionRepository.kt @@ -346,6 +346,7 @@ internal class DefaultTransactionRepository( Blockchain.Binance -> BinanceTransactionExtras(memo) Blockchain.XRP -> memo.toLongOrNull()?.let { XrpTransactionBuilder.XrpTransactionExtras(it) } Blockchain.Cosmos, + Blockchain.Gonka, Blockchain.Sei, Blockchain.TerraV1, Blockchain.TerraV2, 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 a731904778..4c57b37752 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 @@ -68,6 +68,7 @@ data object Wallet2CardConfig : CardConfig { Blockchain.BitcoinCashTestnet -> EllipticCurve.Secp256k1 Blockchain.Cardano -> EllipticCurve.Ed25519 Blockchain.Cosmos -> EllipticCurve.Secp256k1 + Blockchain.Gonka -> EllipticCurve.Secp256k1 Blockchain.CosmosTestnet -> EllipticCurve.Secp256k1 Blockchain.Dogecoin -> EllipticCurve.Secp256k1 Blockchain.Ducatus -> EllipticCurve.Secp256k1 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 a0f2f57615..72e61ad2b3 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 @@ -24,6 +24,7 @@ class Wallet2CardConfigTest { Blockchain.BitcoinCashTestnet to EllipticCurve.Secp256k1, Blockchain.Cardano to EllipticCurve.Ed25519, Blockchain.Cosmos to EllipticCurve.Secp256k1, + Blockchain.Gonka to EllipticCurve.Secp256k1, Blockchain.CosmosTestnet to EllipticCurve.Secp256k1, Blockchain.Dogecoin to EllipticCurve.Secp256k1, Blockchain.Ducatus to EllipticCurve.Secp256k1, diff --git a/gradle/tangem_dependencies.toml b/gradle/tangem_dependencies.toml index 395415d178..bafb894a94 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 = "releases-6.0-1594" +tangemBlockchainSdk = "releases-6.0-1599" #tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds tangemCardSdk = "releases-6.0-626" #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 8f4e925169..145196cb5e 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 @@ -62,6 +62,7 @@ fun Blockchain.Companion.fromNetworkId(networkId: String): Blockchain? { "ravencoin" -> Blockchain.Ravencoin "ravencoin/test" -> Blockchain.RavencoinTestnet "cosmos" -> Blockchain.Cosmos + "gonka" -> Blockchain.Gonka "cosmos/test" -> Blockchain.CosmosTestnet "terra" -> Blockchain.TerraV1 "terra-2" -> Blockchain.TerraV2 @@ -242,6 +243,7 @@ fun Blockchain.toNetworkId(): String { Blockchain.Ravencoin -> "ravencoin" Blockchain.RavencoinTestnet -> "ravencoin/test" Blockchain.Cosmos -> "cosmos" + Blockchain.Gonka -> "gonka" Blockchain.CosmosTestnet -> "cosmos/test" Blockchain.TerraV1 -> "terra" Blockchain.TerraV2 -> "terra-2" @@ -398,6 +400,7 @@ fun Blockchain.toCoinId(): String { Blockchain.Kava, Blockchain.KavaTestnet -> "kava" Blockchain.Ravencoin, Blockchain.RavencoinTestnet -> "ravencoin" Blockchain.Cosmos, Blockchain.CosmosTestnet -> "cosmos" + Blockchain.Gonka -> "gonka" Blockchain.TerraV1 -> "terra-luna" Blockchain.TerraV2 -> "terra-luna-2" Blockchain.Cronos -> "crypto-com-chain" 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 6acca83f43..cc801b47f8 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 @@ -180,6 +180,7 @@ class AccountNodeRecognizer(private val blockchain: Blockchain) { Blockchain.Adi, Blockchain.SeiEvm, Blockchain.Monad, + Blockchain.Gonka, -> true Blockchain.Nexa, // unsupported network Blockchain.Chia,