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 efcd3de591..a220b53c66 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,5 +164,6 @@ internal val Blockchain.moonPaySupportedCurrency: MoonPaySupportedCurrency? ArbitrumNova -> null Plasma, PlasmaTestnet -> null Adi, AdiTestnet -> null + SeiEvm, SeiEvmTestnet -> null Monad, MonadTestnet -> 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 e8a69ca167..00016c2d27 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 @@ -228,6 +228,8 @@ private fun iconSetOf(blockchain: Blockchain): IconSet? = when (blockchain) { -> IconSet(active = R.drawable.img_scroll_22, greyedOut = R.drawable.ic_scroll_22) Blockchain.Sei, Blockchain.SeiTestnet, + Blockchain.SeiEvm, + Blockchain.SeiEvmTestnet, -> IconSet(active = R.drawable.img_sei_22, greyedOut = R.drawable.ic_sei_22) Blockchain.Shibarium, Blockchain.ShibariumTestnet, 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 00fb4b7b95..2b3ffdcdb4 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 @@ -107,7 +107,9 @@ internal class BlockchainIconsTest { Blockchain.Radiant -> R.drawable.img_radiant_22 Blockchain.Ravencoin, Blockchain.RavencoinTestnet -> R.drawable.img_ravencoin_22 Blockchain.Scroll, Blockchain.ScrollTestnet -> R.drawable.img_scroll_22 - Blockchain.Sei, Blockchain.SeiTestnet -> R.drawable.img_sei_22 + Blockchain.Sei, Blockchain.SeiTestnet, + Blockchain.SeiEvm, Blockchain.SeiEvmTestnet, + -> R.drawable.img_sei_22 Blockchain.Shibarium, Blockchain.ShibariumTestnet -> R.drawable.img_shibarium_22 Blockchain.Solana, Blockchain.SolanaTestnet -> R.drawable.img_solana_22 Blockchain.Sonic, Blockchain.SonicTestnet -> R.drawable.img_sonic_22 @@ -228,7 +230,9 @@ internal class BlockchainIconsTest { Blockchain.Radiant -> R.drawable.ic_radiant_22 Blockchain.Ravencoin, Blockchain.RavencoinTestnet -> R.drawable.ic_ravencoin_22 Blockchain.Scroll, Blockchain.ScrollTestnet -> R.drawable.ic_scroll_22 - Blockchain.Sei, Blockchain.SeiTestnet -> R.drawable.ic_sei_22 + Blockchain.Sei, Blockchain.SeiTestnet, + Blockchain.SeiEvm, Blockchain.SeiEvmTestnet, + -> R.drawable.ic_sei_22 Blockchain.Shibarium, Blockchain.ShibariumTestnet -> R.drawable.ic_shibarium_22 Blockchain.Solana, Blockchain.SolanaTestnet -> R.drawable.ic_solana_16 Blockchain.Sonic, Blockchain.SonicTestnet -> R.drawable.ic_sonic_22 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 bc17d1c41b..5adabfe981 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 @@ -376,6 +376,7 @@ class NetworkFactory @Inject constructor( Blockchain.ArbitrumNova, Blockchain.Plasma, Blockchain.PlasmaTestnet, Blockchain.Adi, Blockchain.AdiTestnet, + Blockchain.SeiEvm, Blockchain.SeiEvmTestnet, Blockchain.Monad, Blockchain.MonadTestnet, -> Network.TransactionExtrasType.NONE // endregion 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 debbb9773e..2325a048fd 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,7 @@ public val Blockchain.mercuryoNetwork: String? Blockchain.ArbitrumNova -> null Blockchain.Plasma, Blockchain.PlasmaTestnet -> null Blockchain.Adi, Blockchain.AdiTestnet -> null + Blockchain.SeiEvm, Blockchain.SeiEvmTestnet -> null Blockchain.Monad, Blockchain.MonadTestnet -> null } } \ No newline at end of file diff --git a/domain/card/src/main/kotlin/com/tangem/domain/card/common/extensions/CardSdk.kt b/domain/card/src/main/kotlin/com/tangem/domain/card/common/extensions/CardSdk.kt index a3c026c28c..977fc37d27 100644 --- a/domain/card/src/main/kotlin/com/tangem/domain/card/common/extensions/CardSdk.kt +++ b/domain/card/src/main/kotlin/com/tangem/domain/card/common/extensions/CardSdk.kt @@ -67,6 +67,7 @@ private fun CardDTO.isBlockchainUnsupported(blockchain: Blockchain): Boolean { return when (blockchain) { Blockchain.Quai, Blockchain.QuaiTestnet, Blockchain.Adi, Blockchain.AdiTestnet, + Blockchain.SeiEvm, Blockchain.SeiEvmTestnet, -> { firmwareVersion <= FirmwareVersion.HDWalletAvailable } 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 eb936143a1..a731904778 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,6 +219,8 @@ data object Wallet2CardConfig : CardConfig { Blockchain.PlasmaTestnet -> EllipticCurve.Secp256k1 Blockchain.Adi -> EllipticCurve.Secp256k1 Blockchain.AdiTestnet -> EllipticCurve.Secp256k1 + Blockchain.SeiEvm -> EllipticCurve.Secp256k1 + Blockchain.SeiEvmTestnet -> EllipticCurve.Secp256k1 Blockchain.Monad -> EllipticCurve.Secp256k1 Blockchain.MonadTestnet -> 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 63c29de5b6..6708dad19b 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,6 +175,8 @@ class Wallet2CardConfigTest { Blockchain.PlasmaTestnet to EllipticCurve.Secp256k1, Blockchain.Adi to EllipticCurve.Secp256k1, Blockchain.AdiTestnet to EllipticCurve.Secp256k1, + Blockchain.SeiEvm to EllipticCurve.Secp256k1, + Blockchain.SeiEvmTestnet to EllipticCurve.Secp256k1, Blockchain.Monad to EllipticCurve.Secp256k1, Blockchain.MonadTestnet to EllipticCurve.Secp256k1, ) diff --git a/gradle/tangem_dependencies.toml b/gradle/tangem_dependencies.toml index 9323268e46..3a35bff319 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-1535" +tangemBlockchainSdk = "develop-1544" #tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds tangemCardSdk = "develop-620" #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 dedf4fb81b..8f4e925169 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,6 +176,8 @@ fun Blockchain.Companion.fromNetworkId(networkId: String): Blockchain? { "plasma/test" -> Blockchain.PlasmaTestnet "adi-token" -> Blockchain.Adi "adi-token/test" -> Blockchain.AdiTestnet + "sei-v2" -> Blockchain.SeiEvm + "sei-v2/test" -> Blockchain.SeiEvmTestnet "monad" -> Blockchain.Monad "monad/test" -> Blockchain.MonadTestnet else -> null @@ -351,6 +353,8 @@ fun Blockchain.toNetworkId(): String { Blockchain.PlasmaTestnet -> "plasma/test" Blockchain.Adi -> "adi-token" Blockchain.AdiTestnet -> "adi-token/test" + Blockchain.SeiEvm -> "sei-v2" + Blockchain.SeiEvmTestnet -> "sei-v2/test" Blockchain.Monad -> "monad" Blockchain.MonadTestnet -> "monad/test" } @@ -462,6 +466,7 @@ fun Blockchain.toCoinId(): String { Blockchain.ArbitrumNova -> "arbitrum-nova-ethereum" Blockchain.Plasma, Blockchain.PlasmaTestnet -> "plasma" Blockchain.Adi, Blockchain.AdiTestnet -> "adi-token" + Blockchain.SeiEvm, Blockchain.SeiEvmTestnet -> "sei-v2" Blockchain.Monad, Blockchain.MonadTestnet -> "monad" } } 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 cb4d5d0d2f..6acca83f43 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,6 +178,7 @@ class AccountNodeRecognizer(private val blockchain: Blockchain) { Blockchain.Quai, Blockchain.Plasma, Blockchain.Adi, + Blockchain.SeiEvm, Blockchain.Monad, -> true Blockchain.Nexa, // unsupported network @@ -255,6 +256,7 @@ class AccountNodeRecognizer(private val blockchain: Blockchain) { Blockchain.LineaTestnet, Blockchain.PlasmaTestnet, Blockchain.AdiTestnet, + Blockchain.SeiEvmTestnet, Blockchain.MonadTestnet, -> false // endregion