diff --git a/app/src/main/assets/tangem-app-config b/app/src/main/assets/tangem-app-config index a4d66fbf83..562562fb18 160000 --- a/app/src/main/assets/tangem-app-config +++ b/app/src/main/assets/tangem-app-config @@ -1 +1 @@ -Subproject commit a4d66fbf83c88593cc398cff239cf168860ced7f +Subproject commit 562562fb1815c63195aa3e1c49c33c5de36cb9fc diff --git a/app/src/main/assets/testnet_tokens.json b/app/src/main/assets/testnet_tokens.json index 816f6e1849..ad10260b6b 100644 --- a/app/src/main/assets/testnet_tokens.json +++ b/app/src/main/assets/testnet_tokens.json @@ -788,6 +788,16 @@ "networkId": "casper-network/test" } ] + }, + { + "id": "alephium", + "name": "Alephium", + "symbol": "ALPH", + "networks": [ + { + "networkId": "alephium/test" + } + ] } ] } 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 36253c766a..8a647aeee9 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 @@ -95,6 +95,8 @@ internal val Blockchain.mercuryoNetwork: String? Blockchain.HederaTestnet -> null Blockchain.Aurora -> null Blockchain.AuroraTestnet -> null + Blockchain.Alephium -> null + Blockchain.AlephiumTestnet -> null Blockchain.Areon -> null Blockchain.AreonTestnet -> null Blockchain.PulseChain -> null 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 cba4b03533..aa3442e13d 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 @@ -45,6 +45,8 @@ internal val Blockchain.moonPaySupportedCurrency: MoonPaySupportedCurrency? Core -> MoonPaySupportedCurrency(networkCode = "core", currencyCode = "core") Chiliz -> MoonPaySupportedCurrency(networkCode = "ethereum", currencyCode = "chz") ArbitrumTestnet -> null + Alephium -> null + AlephiumTestnet -> null AvalancheTestnet -> null BinanceTestnet -> null BSCTestnet -> null 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 64770f0109..e8089b25b3 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 @@ -22,5 +22,9 @@ { "name": "apechain", "version": "undefined" + }, + { + "name": "alephium", + "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 b9eaf3f95f..f3a42975bc 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 @@ -83,6 +83,7 @@ fun getActiveIconRes(blockchainId: String): Int { "xodex" -> R.drawable.img_xodex_22 "canxium" -> R.drawable.img_canxium_22 "chiliz", "chiliz/test" -> R.drawable.img_chiliz_22 + "alephium", "alephium/test" -> R.drawable.img_alephium_22 "clore-ai" -> R.drawable.img_clore_22 "fact0rn" -> R.drawable.img_fact0rn_22 "odyssey", "odyssey/test" -> R.drawable.img_odyssey_chain_22 @@ -170,6 +171,7 @@ fun getActiveIconResByCoinId(coinId: String): Int { "xodex" -> R.drawable.img_xodex_22 "canxium" -> R.drawable.img_canxium_22 "chiliz", "chiliz/test" -> R.drawable.img_chiliz_22 + "alephium", "alephium/test" -> R.drawable.img_alephium_22 "clore-ai" -> R.drawable.img_clore_22 "fact0rn" -> R.drawable.img_fact0rn_22 "odyssey", "odyssey/test" -> R.drawable.img_odyssey_chain_22 @@ -260,6 +262,7 @@ fun getGreyedOutIconRes(blockchainId: String): Int { "xodex" -> R.drawable.ic_xodex_22 "canxium" -> R.drawable.ic_canxium_22 "chiliz", "chiliz/test" -> R.drawable.ic_chiliz_22 + "alephium", "alephium/test" -> R.drawable.ic_alephium_22 "clore-ai" -> R.drawable.ic_clore_22 "fact0rn" -> R.drawable.ic_fact0rn_22 "odyssey", "odyssey/test" -> R.drawable.ic_odyssey_chain_22 diff --git a/core/ui/src/main/res/drawable/ic_alephium_22.xml b/core/ui/src/main/res/drawable/ic_alephium_22.xml new file mode 100644 index 0000000000..a79edb648c --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_alephium_22.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/core/ui/src/main/res/drawable/img_alephium_22.xml b/core/ui/src/main/res/drawable/img_alephium_22.xml new file mode 100644 index 0000000000..4c424a1e15 --- /dev/null +++ b/core/ui/src/main/res/drawable/img_alephium_22.xml @@ -0,0 +1,25 @@ + + + + + + + + + + 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 650c2cd0bd..31d90fac3f 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 @@ -167,6 +167,8 @@ private fun Blockchain.getSupportedTransactionExtras(): Network.TransactionExtra -> Network.TransactionExtrasType.MEMO // region Other blockchains Blockchain.Unknown, + Blockchain.Alephium, + Blockchain.AlephiumTestnet, Blockchain.Arbitrum, Blockchain.ArbitrumTestnet, Blockchain.Avalanche, 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 590450cffe..79355cd5c6 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 @@ -199,6 +199,8 @@ data object Wallet2CardConfig : CardConfig { Blockchain.ApeChain -> EllipticCurve.Secp256k1 Blockchain.ApeChainTestnet -> EllipticCurve.Secp256k1 Blockchain.KaspaTestnet -> EllipticCurve.Secp256k1 + Blockchain.Alephium -> EllipticCurve.Secp256k1 + Blockchain.AlephiumTestnet -> 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 7a18c5dcdc..3faea63878 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 @@ -156,6 +156,8 @@ class Wallet2CardConfigTest { Blockchain.ApeChain to EllipticCurve.Secp256k1, Blockchain.ApeChainTestnet to EllipticCurve.Secp256k1, Blockchain.KaspaTestnet to EllipticCurve.Secp256k1, + Blockchain.Alephium to EllipticCurve.Secp256k1, + Blockchain.AlephiumTestnet 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 fd725db999..7cc9ebc2f2 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,8 @@ internal class SwapInteractorImpl @AssistedInject constructor( Canxium, Chiliz, ChilizTestnet, + Alephium, + AlephiumTestnet, Clore, VanarChain, VanarChainTestnet, @@ -1902,6 +1904,7 @@ internal class SwapInteractorImpl @AssistedInject constructor( is Fee.Kaspa, is Fee.Tron, is Fee.VeChain, + is Fee.Alephium, -> null } diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml index 94a1dc8b50..25cba236e9 100644 --- a/gradle/dependencies.toml +++ b/gradle/dependencies.toml @@ -89,7 +89,7 @@ markdownComposeView = "0.5.4" # endregion Other libraries # region Tangem -tangemBlockchainSdk = "develop-944" +tangemBlockchainSdk = "develop-948" #tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds tangemCardSdk = "develop-434" #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 71d4e4cd4c..866170f4c5 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 @@ -9,6 +9,8 @@ import java.math.BigDecimal @Suppress("ComplexMethod", "LongMethod") fun Blockchain.Companion.fromNetworkId(networkId: String): Blockchain? { return when (networkId) { + "alephium" -> Blockchain.Alephium + "alephium/test" -> Blockchain.AlephiumTestnet "arbitrum-one" -> Blockchain.Arbitrum "arbitrum-one/test" -> Blockchain.ArbitrumTestnet "avalanche", "avalanche-2" -> Blockchain.Avalanche @@ -165,6 +167,8 @@ fun Blockchain.Companion.fromNetworkId(networkId: String): Blockchain? { fun Blockchain.toNetworkId(): String { return when (this) { Blockchain.Unknown -> "unknown" + Blockchain.Alephium -> "alephium" + Blockchain.AlephiumTestnet -> "alephium/test" Blockchain.Arbitrum -> "arbitrum-one" Blockchain.ArbitrumTestnet -> "arbitrum-one/test" Blockchain.Avalanche -> "avalanche" @@ -328,6 +332,7 @@ fun Blockchain.toCoinId(): String { Blockchain.Stellar, Blockchain.StellarTestnet -> "stellar" Blockchain.Cardano -> "cardano" Blockchain.Polygon, Blockchain.PolygonTestnet -> NEW_POLYGON_NAME + Blockchain.Alephium, Blockchain.AlephiumTestnet -> "alephium" Blockchain.Arbitrum, Blockchain.ArbitrumTestnet -> "arbitrum-one" Blockchain.Avalanche, Blockchain.AvalancheTestnet -> "avalanche-2" Blockchain.Solana, Blockchain.SolanaTestnet -> "solana"