Updated on 2026-08-14

2025-02-19 18:03:27 +07:00 · 2025-02-19 18:03:27 +07:00 · 1e5e55009c
commit 1e5e55009c
parent 111dea42be
15 changed files with 111 additions and 2 deletions
--- a/app/src/main/assets/tangem-app-config
+++ b/app/src/main/assets/tangem-app-config
@ -1 +1 @@
-Subproject commit a3549d3e156d3e1929649605798bf0239b4a29a0
+Subproject commit af8b453fd25b29d949c05302ec282511dc2614b8
--- 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
@ -153,6 +153,8 @@ internal val Blockchain.mercuryoNetwork: String?
            Blockchain.Bitrock, Blockchain.BitrockTestnet -> null
            Blockchain.Sonic, Blockchain.SonicTestnet -> null
            Blockchain.ApeChain, Blockchain.ApeChainTestnet -> null
+            Blockchain.Scroll, Blockchain.ScrollTestnet -> null
+            Blockchain.ZkLinkNova, Blockchain.ZkLinkNovaTestnet -> null
            Blockchain.KaspaTestnet -> null
        }
    }
--- 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
@ -154,5 +154,7 @@ internal val Blockchain.moonPaySupportedCurrency: MoonPaySupportedCurrency?
        Bitrock, BitrockTestnet -> null
        Sonic, SonicTestnet -> null
        ApeChain, ApeChainTestnet -> null
+        Scroll, ScrollTestnet -> null
+        ZkLinkNova, ZkLinkNovaTestnet -> null
        KaspaTestnet -> null
    }
--- 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,13 @@
    {
        "name": "alephium",
        "version": "5.21.0"
+    },
+    {
+        "name": "scroll",
+        "version": "undefined"
+    },
+    {
+        "name": "zklink",
+        "version": "undefined"
    }
 ]
--- 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
@ -90,6 +90,9 @@ fun getActiveIconRes(blockchainId: String): Int {
        "bitrock", "bitrock/test" -> R.drawable.img_bitrock_22
        "sonic", "sonic/test" -> R.drawable.img_sonic_22
        "apechain", "apechain/test" -> R.drawable.img_apecoin_22
+        "scroll", "scroll/test" -> R.drawable.ic_alert_24 // FIXME: add icon during full integration
+        "zklink", "zklink/test" -> R.drawable.img_zklink_22
+        "vanar-chain", "vanar-chain/test" -> R.drawable.img_vanar_22
        else -> R.drawable.ic_alert_24
    }
 }
@ -178,6 +181,9 @@ fun getActiveIconResByCoinId(coinId: String): Int {
        "bitrock", "bitrock/test" -> R.drawable.img_bitrock_22
        "sonic", "sonic/test" -> R.drawable.img_sonic_22
        "apechain", "apechain/test" -> R.drawable.img_apecoin_22
+        "scroll", "scroll/test" -> R.drawable.ic_alert_24 // FIXME: add icon during full integration
+        "zklink", "zklink/test" -> R.drawable.img_zklink_22
+        "vanar-chain", "vanar-chain/test" -> R.drawable.img_vanar_22
        else -> R.drawable.ic_alert_24
    }
 }
@ -269,6 +275,9 @@ fun getGreyedOutIconRes(blockchainId: String): Int {
        "bitrock", "bitrock/test" -> R.drawable.ic_bitrock_22
        "sonic", "sonic/test" -> R.drawable.ic_sonic_22
        "apechain", "apechain/test" -> R.drawable.ic_apecoin_22
+        "scroll", "scroll/test" -> R.drawable.ic_alert_24 // FIXME: add icon during full integration
+        "zklink", "zklink/test" -> R.drawable.ic_zklink_22
+        "vanar-chain", "vanar-chain/test" -> R.drawable.ic_vanar_22
        else -> R.drawable.ic_alert_24
    }
 }
--- a/core/ui/src/main/res/drawable/ic_vanar_22.xml
+++ b/core/ui/src/main/res/drawable/ic_vanar_22.xml
@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="22dp"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
+  <path
+      android:pathData="M12.748,18L14.498,14.999L9.25,6H5.749L4,9H7.502L12.748,18ZM16.249,11.999L18,9L16.249,6H12.75L11.001,9H14.5L16.249,11.999Z"
+      android:fillColor="#000000"/>
+</vector>
--- a/core/ui/src/main/res/drawable/ic_zklink_22.xml
+++ b/core/ui/src/main/res/drawable/ic_zklink_22.xml
@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="22dp"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
+  <path
+      android:pathData="M11.217,3.624L11.002,3.5L10.788,3.624L7.502,5.526L7.288,5.65V5.897V9.455L4.214,11.235L4,11.358V11.605V15.41V15.657L4.214,15.78L7.5,17.683L7.714,17.807L7.929,17.683L11,15.905L14.071,17.683L14.286,17.807L14.5,17.683L17.786,15.78L18,15.657V15.41V11.605V11.358L17.786,11.235L14.716,9.457V5.897V5.65L14.503,5.526L11.217,3.624ZM8.145,6.144L11.002,4.49L13.86,6.144V9.454L11.621,10.75C11.456,10.61 11.243,10.525 11.009,10.525C10.773,10.525 10.557,10.612 10.391,10.755L8.145,9.454V6.144ZM10.068,11.561L7.714,10.198L4.857,11.852V15.163L7.714,16.817L10.571,15.163V12.308C10.295,12.164 10.099,11.886 10.068,11.561ZM11.428,12.318V15.163L14.286,16.817L17.143,15.163V11.852L14.288,10.199L11.951,11.552C11.922,11.888 11.717,12.175 11.428,12.318Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M11.002,7.31L14.716,9.46V13.758L11.002,15.908L7.288,13.758V9.46L11.002,7.31ZM8.145,9.954V13.264L11.002,14.918L13.86,13.264V9.954L11.002,8.299L8.145,9.954Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
+</vector>
--- a/core/ui/src/main/res/drawable/img_vanar_22.xml
+++ b/core/ui/src/main/res/drawable/img_vanar_22.xml
@ -0,0 +1,19 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="22dp"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
+  <group>
+    <clip-path
+        android:pathData="M11,0L11,0A11,11 0,0 1,22 11L22,11A11,11 0,0 1,11 22L11,22A11,11 0,0 1,0 11L0,11A11,11 0,0 1,11 0z"/>
+    <path
+        android:pathData="M11,0L11,0A11,11 0,0 1,22 11L22,11A11,11 0,0 1,11 22L11,22A11,11 0,0 1,0 11L0,11A11,11 0,0 1,11 0z"
+        android:fillColor="#ffffff"/>
+    <path
+        android:pathData="M0,0h22v22h-22z"
+        android:fillColor="#080A0B"/>
+    <path
+        android:pathData="M12.748,18L14.498,14.999L9.25,6H5.749L4,9H7.502L12.748,18ZM16.249,11.999L18,9L16.249,6H12.75L11.001,9H14.5L16.249,11.999Z"
+        android:fillColor="#03D9AF"/>
+  </group>
+</vector>
--- a/core/ui/src/main/res/drawable/img_zklink_22.xml
+++ b/core/ui/src/main/res/drawable/img_zklink_22.xml
@ -0,0 +1,24 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="22dp"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
+  <group>
+    <clip-path
+        android:pathData="M11,0L11,0A11,11 0,0 1,22 11L22,11A11,11 0,0 1,11 22L11,22A11,11 0,0 1,0 11L0,11A11,11 0,0 1,11 0z"/>
+    <path
+        android:pathData="M11,0L11,0A11,11 0,0 1,22 11L22,11A11,11 0,0 1,11 22L11,22A11,11 0,0 1,0 11L0,11A11,11 0,0 1,11 0z"
+        android:fillColor="#ffffff"/>
+    <path
+        android:pathData="M0,0h22v22h-22z"
+        android:fillColor="#080A0B"/>
+    <path
+        android:pathData="M11.217,3.624L11.002,3.5L10.788,3.624L7.502,5.526L7.288,5.65V5.897V9.455L4.214,11.235L4,11.358V11.605V15.41V15.657L4.214,15.78L7.5,17.683L7.714,17.807L7.929,17.683L11,15.905L14.071,17.683L14.286,17.807L14.5,17.683L17.786,15.78L18,15.657V15.41V11.605V11.358L17.786,11.235L14.716,9.457V5.897V5.65L14.503,5.526L11.217,3.624ZM8.145,6.144L11.002,4.49L13.86,6.144V9.454L11.621,10.75C11.456,10.61 11.243,10.525 11.009,10.525C10.773,10.525 10.557,10.612 10.391,10.755L8.145,9.454V6.144ZM10.068,11.561L7.714,10.198L4.857,11.852V15.163L7.714,16.817L10.571,15.163V12.308C10.295,12.164 10.099,11.886 10.068,11.561ZM11.428,12.318V15.163L14.286,16.817L17.143,15.163V11.852L14.288,10.199L11.951,11.552C11.922,11.888 11.717,12.175 11.428,12.318Z"
+        android:fillColor="#03D498"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M11.002,7.31L14.716,9.46V13.758L11.002,15.908L7.288,13.758V9.46L11.002,7.31ZM8.145,9.954V13.264L11.002,14.918L13.86,13.264V9.954L11.002,8.299L8.145,9.954Z"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"/>
+  </group>
+</vector>
--- 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
@ -299,6 +299,8 @@ private fun Blockchain.getSupportedTransactionExtras(): Network.TransactionExtra
        Blockchain.Bitrock, Blockchain.BitrockTestnet,
        Blockchain.Sonic, Blockchain.SonicTestnet,
        Blockchain.ApeChain, Blockchain.ApeChainTestnet,
+        Blockchain.Scroll, Blockchain.ScrollTestnet,
+        Blockchain.ZkLinkNova, Blockchain.ZkLinkNovaTestnet,
        -> Network.TransactionExtrasType.NONE
        // endregion
    }
--- 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
@ -201,6 +201,10 @@ data object Wallet2CardConfig : CardConfig {
            Blockchain.KaspaTestnet -> EllipticCurve.Secp256k1
            Blockchain.Alephium -> EllipticCurve.Secp256k1
            Blockchain.AlephiumTestnet -> EllipticCurve.Secp256k1
+            Blockchain.Scroll -> EllipticCurve.Secp256k1
+            Blockchain.ScrollTestnet -> EllipticCurve.Secp256k1
+            Blockchain.ZkLinkNova -> EllipticCurve.Secp256k1
+            Blockchain.ZkLinkNovaTestnet -> EllipticCurve.Secp256k1
        }
    }
 }
--- 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
@ -158,6 +158,10 @@ class Wallet2CardConfigTest {
        Blockchain.KaspaTestnet to EllipticCurve.Secp256k1,
        Blockchain.Alephium to EllipticCurve.Secp256k1,
        Blockchain.AlephiumTestnet to EllipticCurve.Secp256k1,
+        Blockchain.Scroll to EllipticCurve.Secp256k1,
+        Blockchain.ScrollTestnet to EllipticCurve.Secp256k1,
+        Blockchain.ZkLinkNova to EllipticCurve.Secp256k1,
+        Blockchain.ZkLinkNovaTestnet to EllipticCurve.Secp256k1,
    )

    @Test
--- 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
@ -989,6 +989,8 @@ internal class SwapInteractorImpl @AssistedInject constructor(
                Bitrock, BitrockTestnet,
                Sonic, SonicTestnet,
                ApeChain, ApeChainTestnet,
+                Scroll, ScrollTestnet,
+                ZkLinkNova, ZkLinkNovaTestnet,
                -> Fee.Common(feeAmount)
                // endregion
            }
--- a/gradle/tangem_dependencies.toml
+++ b/gradle/tangem_dependencies.toml
@ -1,5 +1,5 @@
 [versions]
-tangemBlockchainSdk = "develop-957"
+tangemBlockchainSdk = "develop-959"
 #tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds
 tangemCardSdk = "develop-434"
 #tangemCardSdk = "0.0.1" # Keep it! - used for local builds ^
--- 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
@ -159,6 +159,10 @@ fun Blockchain.Companion.fromNetworkId(networkId: String): Blockchain? {
        "apechain" -> Blockchain.ApeChain
        "apechain/test" -> Blockchain.ApeChainTestnet
        "kaspa/test" -> Blockchain.KaspaTestnet
+        "scroll" -> Blockchain.Scroll
+        "scroll/test" -> Blockchain.ScrollTestnet
+        "zklink" -> Blockchain.ZkLinkNova
+        "zklink/test" -> Blockchain.ZkLinkNovaTestnet
        else -> null
    }
 }
@ -315,6 +319,10 @@ fun Blockchain.toNetworkId(): String {
        Blockchain.SonicTestnet -> "sonic/test"
        Blockchain.ApeChain -> "apechain"
        Blockchain.ApeChainTestnet -> "apechain/test"
+        Blockchain.Scroll -> "scroll"
+        Blockchain.ScrollTestnet -> "scroll/test"
+        Blockchain.ZkLinkNova -> "zklink"
+        Blockchain.ZkLinkNovaTestnet -> "zklink/test"
    }
 }

@ -415,6 +423,8 @@ fun Blockchain.toCoinId(): String {
        Blockchain.Bitrock, Blockchain.BitrockTestnet -> "bitrock"
        Blockchain.Sonic, Blockchain.SonicTestnet -> "sonic-3"
        Blockchain.ApeChain, Blockchain.ApeChainTestnet -> "apecoin"
+        Blockchain.Scroll, Blockchain.ScrollTestnet -> "scroll"
+        Blockchain.ZkLinkNova, Blockchain.ZkLinkNovaTestnet -> "zklink"
    }
 }