From a7191087a4b6485bc5a5723ac4d860879d69152b Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 21 Jan 2025 19:25:56 +0500 Subject: [PATCH] Updated on 2026-08-14 --- .../exchangeServices/mercuryo/MercuryoBlockchainMapping.kt | 1 + .../exchangeServices/moonpay/MoonpayBlockchainMapping.kt | 1 + .../src/main/assets/configs/excluded_blockchains_config.json | 4 ++++ .../java/com/tangem/core/ui/extensions/BlockchainIcons.kt | 3 +++ .../com/tangem/data/common/currency/NetworkOperations.kt | 1 + .../com/tangem/domain/common/configs/Wallet2CardConfig.kt | 2 ++ .../tangem/domain/common/configs/Wallet2CardConfigTest.kt | 2 ++ .../com/tangem/feature/swap/domain/SwapInteractorImpl.kt | 1 + gradle/dependencies.toml | 2 +- .../main/java/com/tangem/blockchainsdk/utils/Blockchain.kt | 5 +++++ 10 files changed, 21 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoBlockchainMapping.kt b/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoBlockchainMapping.kt index 0d72c8158a..4b83df8a90 100644 --- a/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoBlockchainMapping.kt +++ b/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoBlockchainMapping.kt @@ -149,5 +149,6 @@ internal val Blockchain.mercuryoNetwork: String? Blockchain.Clore -> null Blockchain.OdysseyChain, Blockchain.OdysseyChainTestnet -> null Blockchain.Bitrock, Blockchain.BitrockTestnet -> null + Blockchain.Sonic, Blockchain.SonicTestnet -> null } } \ No newline at end of file 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 729a87b31f..61e8b77c1d 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 @@ -150,4 +150,5 @@ internal val Blockchain.moonPaySupportedCurrency: MoonPaySupportedCurrency? VanarChainTestnet -> null OdysseyChain, OdysseyChainTestnet -> null Bitrock, BitrockTestnet -> null + Sonic, SonicTestnet -> null } \ No newline at end of file diff --git a/core/config-toggles/src/main/assets/configs/excluded_blockchains_config.json b/core/config-toggles/src/main/assets/configs/excluded_blockchains_config.json index 75cedce0e4..59ed64b374 100644 --- a/core/config-toggles/src/main/assets/configs/excluded_blockchains_config.json +++ b/core/config-toggles/src/main/assets/configs/excluded_blockchains_config.json @@ -26,5 +26,9 @@ { "name": "odyssey", "version": "undefined" + }, + { + "name": "sonic", + "version": "undefined" } ] \ No newline at end of file diff --git a/core/ui/src/main/java/com/tangem/core/ui/extensions/BlockchainIcons.kt b/core/ui/src/main/java/com/tangem/core/ui/extensions/BlockchainIcons.kt index e89fd74ee3..4baa930718 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/extensions/BlockchainIcons.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/extensions/BlockchainIcons.kt @@ -87,6 +87,7 @@ fun getActiveIconRes(blockchainId: String): Int { "fact0rn" -> R.drawable.img_fact0rn_22 "odyssey", "odyssey/test" -> R.drawable.img_odyssey_chain_22 "bitrock", "bitrock/test" -> R.drawable.img_bitrock_22 + "sonic", "sonic/test" -> R.drawable.ic_alert_24 // todo Sonic [REDACTED_TASK_KEY] else -> R.drawable.ic_alert_24 } } @@ -172,6 +173,7 @@ fun getActiveIconResByCoinId(coinId: String): Int { "fact0rn" -> R.drawable.img_fact0rn_22 "odyssey", "odyssey/test" -> R.drawable.img_odyssey_chain_22 "bitrock", "bitrock/test" -> R.drawable.img_bitrock_22 + "sonic", "sonic/test" -> R.drawable.ic_alert_24 // todo Sonic [REDACTED_TASK_KEY] else -> R.drawable.ic_alert_24 } } @@ -260,6 +262,7 @@ fun getGreyedOutIconRes(blockchainId: String): Int { "fact0rn" -> R.drawable.ic_fact0rn_22 "odyssey", "odyssey/test" -> R.drawable.ic_odyssey_chain_22 "bitrock", "bitrock/test" -> R.drawable.ic_bitrock_22 + "sonic", "sonic/test" -> R.drawable.ic_alert_24 // todo Sonic [REDACTED_TASK_KEY] else -> R.drawable.ic_alert_24 } } \ No newline at end of file diff --git a/data/common/src/main/kotlin/com/tangem/data/common/currency/NetworkOperations.kt b/data/common/src/main/kotlin/com/tangem/data/common/currency/NetworkOperations.kt index 594efd38f4..5d8050b524 100644 --- a/data/common/src/main/kotlin/com/tangem/data/common/currency/NetworkOperations.kt +++ b/data/common/src/main/kotlin/com/tangem/data/common/currency/NetworkOperations.kt @@ -294,6 +294,7 @@ private fun Blockchain.getSupportedTransactionExtras(): Network.TransactionExtra Blockchain.VanarChainTestnet, Blockchain.OdysseyChain, Blockchain.OdysseyChainTestnet, Blockchain.Bitrock, Blockchain.BitrockTestnet, + Blockchain.Sonic, Blockchain.SonicTestnet, -> Network.TransactionExtrasType.NONE // endregion } diff --git a/domain/legacy/src/main/java/com/tangem/domain/common/configs/Wallet2CardConfig.kt b/domain/legacy/src/main/java/com/tangem/domain/common/configs/Wallet2CardConfig.kt index baeb91fbed..5522fcda36 100644 --- a/domain/legacy/src/main/java/com/tangem/domain/common/configs/Wallet2CardConfig.kt +++ b/domain/legacy/src/main/java/com/tangem/domain/common/configs/Wallet2CardConfig.kt @@ -194,6 +194,8 @@ data object Wallet2CardConfig : CardConfig { Blockchain.OdysseyChainTestnet -> EllipticCurve.Secp256k1 Blockchain.Bitrock -> EllipticCurve.Secp256k1 Blockchain.BitrockTestnet -> EllipticCurve.Secp256k1 + Blockchain.Sonic -> EllipticCurve.Secp256k1 + Blockchain.SonicTestnet -> EllipticCurve.Secp256k1 } } } \ No newline at end of file diff --git a/domain/legacy/src/test/java/com/tangem/domain/common/configs/Wallet2CardConfigTest.kt b/domain/legacy/src/test/java/com/tangem/domain/common/configs/Wallet2CardConfigTest.kt index 5ab98a3e72..f558fb0f9b 100644 --- a/domain/legacy/src/test/java/com/tangem/domain/common/configs/Wallet2CardConfigTest.kt +++ b/domain/legacy/src/test/java/com/tangem/domain/common/configs/Wallet2CardConfigTest.kt @@ -151,6 +151,8 @@ class Wallet2CardConfigTest { Blockchain.OdysseyChainTestnet to EllipticCurve.Secp256k1, Blockchain.Bitrock to EllipticCurve.Secp256k1, Blockchain.BitrockTestnet to EllipticCurve.Secp256k1, + Blockchain.Sonic to EllipticCurve.Secp256k1, + Blockchain.SonicTestnet to EllipticCurve.Secp256k1, ) @Test diff --git a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractorImpl.kt b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractorImpl.kt index ad0e992a73..2b2b01a125 100644 --- a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractorImpl.kt +++ b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractorImpl.kt @@ -980,6 +980,7 @@ internal class SwapInteractorImpl @AssistedInject constructor( VanarChainTestnet, OdysseyChain, OdysseyChainTestnet, Bitrock, BitrockTestnet, + Sonic, SonicTestnet, -> Fee.Common(feeAmount) // endregion } diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml index 1df84f02d2..476dbba56a 100644 --- a/gradle/dependencies.toml +++ b/gradle/dependencies.toml @@ -88,7 +88,7 @@ markdownComposeView = "0.5.4" # endregion Other libraries # region Tangem -tangemBlockchainSdk = "develop-910" +tangemBlockchainSdk = "develop-911" #tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds tangemCardSdk = "develop-421" #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 a0d9c16d6f..fcadee5fda 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 @@ -152,6 +152,8 @@ fun Blockchain.Companion.fromNetworkId(networkId: String): Blockchain? { "dione/test" -> Blockchain.OdysseyChainTestnet "bitrock" -> Blockchain.Bitrock "bitrock/test" -> Blockchain.BitrockTestnet + "sonic" -> Blockchain.Sonic + "sonic/test" -> Blockchain.SonicTestnet else -> null } } @@ -301,6 +303,8 @@ fun Blockchain.toNetworkId(): String { Blockchain.OdysseyChainTestnet -> "dione/test" Blockchain.Bitrock -> "bitrock" Blockchain.BitrockTestnet -> "bitrock/test" + Blockchain.Sonic -> "sonic" + Blockchain.SonicTestnet -> "sonic/test" } } @@ -398,6 +402,7 @@ fun Blockchain.toCoinId(): String { Blockchain.Clore -> "clore-ai" Blockchain.OdysseyChain, Blockchain.OdysseyChainTestnet -> "dione" Blockchain.Bitrock, Blockchain.BitrockTestnet -> "bitrock" + Blockchain.Sonic, Blockchain.SonicTestnet -> "sonic-3" } }