GiftedHacker/tangem-app-android-audited
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Updated on 2026-08-14

Browse source
This commit is contained in:
Tangem 2024-07-31 13:24:33 +05:00
parent f25889d1a0
commit dcc3bb6c97
10 changed files with 52 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/assets/tangem-app-config

@ -1 +1 @@
Subproject commit 35af912b96ce0f871906061bd483d9cf3af7451d
Subproject commit faab90517cc23bc700a0028146d84bec056f6d49

10
app/src/main/assets/testnet_tokens.json
View file

@ -688,6 +688,16 @@
"networkId": "base/test"
}
]
},
{
"id": "blast-ethereum",
"name": "Blast",
"symbol": "ETH",
"networks": [
{
"networkId": "blast/test"
}
]
}
]
}

1
core/datasource/src/main/java/com/tangem/datasource/config/ConfigManagerImpl.kt
View file

@ -154,6 +154,7 @@ internal class ConfigManagerImpl @Inject constructor() : ConfigManager {
zkSyncEra = GetBlockAccessToken(rest = accessTokens.zksync?.jsonRPC),
polygonZkEvm = GetBlockAccessToken(rest = accessTokens.polygonZkevm?.jsonRPC),
base = GetBlockAccessToken(rest = accessTokens.base?.jsonRPC),
blast = GetBlockAccessToken(jsonRpc = accessTokens.blast?.jsonRPC),
)
}
}

1
core/datasource/src/main/java/com/tangem/datasource/config/models/JsonModels.kt
View file

@ -76,6 +76,7 @@ data class GetBlockAccessTokens(
@Json(name = "polygon-zkevm") val polygonZkevm: GetBlockToken?,
@Json(name = "zksync") val zksync: GetBlockToken?,
@Json(name = "base") val base: GetBlockToken?,
@Json(name = "blast") val blast: GetBlockToken?,
)
@JsonClass(generateAdapter = true)

5
core/ui/src/main/java/com/tangem/core/ui/extensions/BlockchainIcons.kt
View file

@ -70,6 +70,7 @@ fun getActiveIconRes(blockchainId: String): Int {
"joystream" -> R.drawable.img_joystream_22
"koinos", "koinos/test" -> R.drawable.img_koinos_22
"bittensor" -> R.drawable.img_bittensor_22
"blast", "blast/test" -> R.drawable.img_blast_22
else -> R.drawable.ic_alert_24
}
}
@ -141,6 +142,7 @@ fun getActiveIconResByNetworkId(networkId: String): Int {
"joystream" -> R.drawable.img_joystream_22
"koinos", "koinos/test" -> R.drawable.img_koinos_22
"bittensor" -> R.drawable.img_bittensor_22
"blast", "blast/test" -> R.drawable.img_blast_22
else -> R.drawable.ic_alert_24
}
}
@ -209,6 +211,7 @@ fun getActiveIconResByCoinId(coinId: String): Int {
"joystream" -> R.drawable.img_joystream_22
"koinos", "koinos/test" -> R.drawable.img_koinos_22
"bittensor" -> R.drawable.img_bittensor_22
"blast", "blast/test" -> R.drawable.img_blast_22
else -> R.drawable.ic_alert_24
}
}
@ -280,6 +283,7 @@ fun getGreyedOutIconRes(blockchainId: String): Int {
"joystream" -> R.drawable.ic_joystream_22
"koinos", "koinos/test" -> R.drawable.ic_koinos_22
"bittensor" -> R.drawable.ic_bittensor_22
"blast", "blast/test" -> R.drawable.ic_blast_22
else -> R.drawable.ic_alert_24
}
}
@ -351,6 +355,7 @@ fun getGreyedOutIconResByNetworkId(networkId: String): Int {
"joystream" -> R.drawable.ic_joystream_22
"koinos", "koinos/test" -> R.drawable.ic_koinos_22
"bittensor" -> R.drawable.ic_bittensor_22
"blast", "blast/test" -> R.drawable.ic_blast_22
else -> R.drawable.ic_alert_24
}
}

12
core/ui/src/main/res/drawable/ic_blast_22.xml Normal file
View file

@ -0,0 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="22dp"
android:height="22dp"
android:viewportWidth="22"
android:viewportHeight="22">
<path
android:fillColor="#000000"
android:pathData="M15.257,11.048L17.71,9.826L18.555,7.231L16.864,6H5.604L3,7.934H16.236L15.533,10.111H10.225L9.714,11.701H15.022L13.532,16.281L16.019,15.05L16.906,12.304L15.24,11.082L15.257,11.048Z" />
<path
android:fillColor="#000000"
android:pathData="M6.742,14.313L8.275,9.541L6.575,8.269L4.021,16.281H13.532L14.168,14.313H6.742Z" />
</vector>

15
core/ui/src/main/res/drawable/img_blast_22.xml Normal file
View file

@ -0,0 +1,15 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="22dp"
android:height="22dp"
android:viewportWidth="22"
android:viewportHeight="22">
<path
android:fillColor="#000000"
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:fillColor="#FCFC03"
android:pathData="M15.257,11.048L17.71,9.826L18.555,7.231L16.864,6H5.604L3,7.934H16.236L15.533,10.111H10.225L9.714,11.701H15.022L13.532,16.281L16.019,15.05L16.906,12.304L15.24,11.082L15.257,11.048Z" />
<path
android:fillColor="#FCFC03"
android:pathData="M6.742,14.313L8.275,9.541L6.575,8.269L4.021,16.281H13.532L14.168,14.313H6.742Z" />
</vector>

2
gradle/dependencies.toml
View file

@ -88,7 +88,7 @@ markdown = "0.7.2"
# endregion Other libraries
# region Tangem
tangemBlockchainSdk = "develop-710"
tangemBlockchainSdk = "develop-711"
#tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds
tangemCardSdk = "develop-375"
#tangemCardSdk = "0.0.1" # Keep it! - used for local builds ^

1
libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/converters/BlockchainSDKConfigConverter.kt
View file

@ -85,6 +85,7 @@ internal object BlockchainSDKConfigConverter : Converter<ConfigValueModel, Block
zkSyncEra = GetBlockAccessToken(jsonRpc = accessTokens.zksync?.jsonRPC),
polygonZkEvm = GetBlockAccessToken(jsonRpc = accessTokens.polygonZkevm?.jsonRPC),
base = GetBlockAccessToken(jsonRpc = accessTokens.base?.jsonRPC),
blast = GetBlockAccessToken(jsonRpc = accessTokens.blast?.jsonRPC),
)
}
}

5
libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/utils/Blockchain.kt
View file

@ -119,6 +119,8 @@ fun Blockchain.Companion.fromNetworkId(networkId: String): Blockchain? {
"joystream" -> Blockchain.Joystream
"bittensor" -> Blockchain.Bittensor
"filecoin" -> Blockchain.Filecoin
"blast" -> Blockchain.Blast
"blast/test" -> Blockchain.BlastTestnet
else -> null
}
}
@ -239,6 +241,8 @@ fun Blockchain.toNetworkId(): String {
Blockchain.Joystream -> "joystream"
Blockchain.Bittensor -> "bittensor"
Blockchain.Filecoin -> "filecoin"
Blockchain.Blast -> "blast"
Blockchain.BlastTestnet -> "blast/test"
}
}
@ -316,6 +320,7 @@ fun Blockchain.toCoinId(): String {
Blockchain.Joystream -> "joystream"
Blockchain.Bittensor -> "bittensor"
Blockchain.Filecoin -> "filecoin"
Blockchain.Blast, Blockchain.BlastTestnet -> "blast"
}
}