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 2025-10-20 19:47:53 +05:00
parent 305e86960f
commit db03d6d860
17 changed files with 80 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

4
common/test/src/main/java/com/tangem/common/test/domain/walletmanager/MockUpdateWalletManagerResultFactory.kt
View file

@ -67,10 +67,12 @@ class MockUpdateWalletManagerResultFactory {
value = BigDecimal.ONE,
currencyRawId = CryptoCurrency.RawID("token"),
contractAddress = "0xTokenAddress",
yieldSupplyStatus = YieldSupplyStatus(
yieldSupplyStatus =
YieldSupplyStatus(
isActive = true,
isInitialized = true,
isAllowedToSpend = false,
effectiveProtocolBalance = BigDecimal.ONE,
),
),
),

5
common/ui/src/main/java/com/tangem/common/ui/tokens/TokenItemStateConverter.kt
View file

@ -19,6 +19,7 @@ import com.tangem.domain.models.StatusSource
import com.tangem.domain.models.currency.CryptoCurrencyStatus
import com.tangem.domain.models.currency.CryptoCurrency
import com.tangem.domain.models.currency.yieldSupplyKey
import com.tangem.domain.models.currency.yieldSupplyNotAllAmountSupplied
import com.tangem.domain.models.staking.YieldBalance
import com.tangem.domain.staking.utils.getTotalWithRewardsStakingBalance
import com.tangem.utils.StringsSigns.DASH_SIGN
@ -246,7 +247,9 @@ class TokenItemStateConverter(
isFlickering = status.value.isFlickering(),
icons = buildList {
if (status.value.yieldSupplyStatus?.isActive == true &&
status.value.yieldSupplyStatus?.isAllowedToSpend == false) {
status.value.yieldSupplyStatus?.isAllowedToSpend == false ||
status.yieldSupplyNotAllAmountSupplied()
) {
TokenItemState.FiatAmountState.Content.IconUM(
iconRes = R.drawable.ic_alert_triangle_20,
tint = IconTint.Warning,

1
core/datasource/src/main/java/com/tangem/datasource/local/network/entity/NetworkStatusDM.kt
View file

@ -119,6 +119,7 @@ sealed interface NetworkStatusDM {
@Json(name = "is_active") val isActive: Boolean,
@Json(name = "is_initialized") val isInitialized: Boolean,
@Json(name = "is_allowed_to_spend") val isAllowedToSpend: Boolean,
@Json(name = "effective_protocol_balance") val effectiveProtocolBalance: BigDecimal? = null,
)
@JsonClass(generateAdapter = true)

2
data/networks/src/main/java/com/tangem/data/networks/converters/NetworkYieldSupplyStatusConverter.kt
View file

@ -23,6 +23,7 @@ internal class NetworkYieldSupplyStatusConverter(
isActive = it.isActive,
isInitialized = it.isInitialized,
isAllowedToSpend = it.isAllowedToSpend,
effectiveProtocolBalance = it.effectiveProtocolBalance,
)
id to status
@ -38,6 +39,7 @@ internal class NetworkYieldSupplyStatusConverter(
isActive = yieldSupplyStatus.isActive,
isInitialized = yieldSupplyStatus.isInitialized,
isAllowedToSpend = yieldSupplyStatus.isAllowedToSpend,
effectiveProtocolBalance = yieldSupplyStatus.effectiveProtocolBalance,
)
}
}

2
data/networks/src/test/java/com/tangem/data/networks/converters/NetworkStatusDataModelConverterTest.kt
View file

@ -62,6 +62,7 @@ internal class NetworkStatusDataModelConverterTest {
isActive = false,
isInitialized = false,
isAllowedToSpend = false,
effectiveProtocolBalance = BigDecimal.ONE,
),
ID(
prefix = Prefix.COIN_PREFIX,
@ -94,6 +95,7 @@ internal class NetworkStatusDataModelConverterTest {
isActive = false,
isInitialized = false,
isAllowedToSpend = false,
effectiveProtocolBalance = BigDecimal.ONE,
),
),
),

3
data/networks/src/test/java/com/tangem/data/networks/converters/NetworkYieldSupplyStatusConverterTest.kt
View file

@ -8,6 +8,7 @@ import com.tangem.domain.models.network.Network
import com.tangem.domain.models.yield.supply.YieldSupplyStatus
import org.junit.jupiter.api.Test
import org.junit.jupiter.api.TestInstance
import java.math.BigDecimal
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
internal class NetworkYieldSupplyStatusConverterTest {
@ -21,6 +22,7 @@ internal class NetworkYieldSupplyStatusConverterTest {
isActive = true,
isInitialized = true,
isAllowedToSpend = true,
effectiveProtocolBalance = BigDecimal.ONE,
)
@Test
@ -70,6 +72,7 @@ internal class NetworkYieldSupplyStatusConverterTest {
isActive = true,
isInitialized = true,
isAllowedToSpend = true,
effectiveProtocolBalance = BigDecimal.ONE,
)
}
}

2
data/networks/src/test/java/com/tangem/data/networks/converters/SimpleNetworkStatusConverterTest.kt
View file

@ -68,6 +68,7 @@ internal class SimpleNetworkStatusConverterTest {
isActive = false,
isInitialized = false,
isAllowedToSpend = false,
effectiveProtocolBalance = BigDecimal.ONE,
),
),
),
@ -103,6 +104,7 @@ internal class SimpleNetworkStatusConverterTest {
isActive = false,
isInitialized = false,
isAllowedToSpend = false,
effectiveProtocolBalance = BigDecimal.ONE,
),
),
source = StatusSource.CACHE,

1
data/networks/src/test/java/com/tangem/data/networks/utils/NetworkStatusFactoryTest.kt
View file

@ -272,6 +272,7 @@ internal class NetworkStatusFactoryTest(private val model: Model) {
isActive = false,
isInitialized = false,
isAllowedToSpend = false,
effectiveProtocolBalance = BigDecimal.ONE,
),
),
),

2
data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultCurrencyChecksRepository.kt
View file

@ -181,7 +181,7 @@ internal class DefaultCurrencyChecksRepository(
blockchain = token.network.toBlockchain(),
derivationPath = token.network.derivationPath.value,
) ?: error("Wallet manager not found")
walletManager.getProtocolBalance(
walletManager.getEffectiveProtocolBalance(
token = Token(
symbol = token.symbol,
contractAddress = token.contractAddress,

1
data/wallet-manager/src/main/java/com/tangem/data/walletmanager/UpdateWalletManagerResultFactory.kt
View file

@ -128,6 +128,7 @@ internal class UpdateWalletManagerResultFactory {
isActive = type.isActive,
isInitialized = type.isInitialized,
isAllowedToSpend = type.isAllowedToSpend,
effectiveProtocolBalance = type.effectiveProtocolBalance,
),
)
}

20
data/yield-supply/src/main/java/com/tangem/data/yield/supply/DefaultYieldSupplyTransactionRepository.kt
View file

@ -91,8 +91,10 @@ internal class DefaultYieldSupplyTransactionRepository(
)
}
override suspend fun getProtocolBalance(userWalletId: UserWalletId, cryptoCurrency: CryptoCurrency): BigDecimal? =
withContext(dispatchers.io) {
override suspend fun getEffectiveProtocolBalance(
userWalletId: UserWalletId,
cryptoCurrency: CryptoCurrency,
): BigDecimal? = withContext(dispatchers.io) {
require(cryptoCurrency is CryptoCurrency.Token)
runCatching {
val walletManager = walletManagersFacade.getOrCreateWalletManager(
@ -100,7 +102,7 @@ internal class DefaultYieldSupplyTransactionRepository(
blockchain = cryptoCurrency.network.toBlockchain(),
derivationPath = cryptoCurrency.network.derivationPath.value,
) ?: error("Wallet manager not found")
walletManager.getProtocolBalance(
walletManager.getEffectiveProtocolBalance(
token = Token(
symbol = cryptoCurrency.symbol,
contractAddress = cryptoCurrency.contractAddress,
@ -222,6 +224,17 @@ internal class DefaultYieldSupplyTransactionRepository(
): YieldSupplyStatus? = withContext(dispatchers.io) {
runCatching {
val sdkSupplyStatus = walletManager.getYieldSupplyStatus(cryptoCurrency.contractAddress)
val protocolBalance = if (sdkSupplyStatus?.isActive == true) {
walletManager.getEffectiveProtocolBalance(
token = Token(
symbol = cryptoCurrency.symbol,
contractAddress = cryptoCurrency.contractAddress,
decimals = cryptoCurrency.decimals,
),
)
} else {
null
}
val isAllowedToSpend = walletManager.isAllowedToSpend(
Token(
symbol = cryptoCurrency.symbol,
@ -234,6 +247,7 @@ internal class DefaultYieldSupplyTransactionRepository(
isActive = sdkSupplyStatus?.isActive == true,
isInitialized = sdkSupplyStatus?.isInitialized == true,
isAllowedToSpend = isAllowedToSpend,
effectiveProtocolBalance = protocolBalance,
)
}.onFailure(Timber::e).getOrNull()
}

16
domain/models/src/main/kotlin/com/tangem/domain/models/currency/CryptoCurrencyExtensions.kt
View file

@ -3,3 +3,19 @@ package com.tangem.domain.models.currency
fun CryptoCurrency.Token.yieldSupplyKey(): String {
return "${network.backendId}_$contractAddress"
}
fun CryptoCurrencyStatus.yieldSupplyNotAllAmountSupplied(): Boolean {
if (this.currency !is CryptoCurrency.Token) return false
val supplyStatus = this.value.yieldSupplyStatus
if (supplyStatus?.isActive != true) return false
val protocolBalance = supplyStatus.effectiveProtocolBalance
val amount = this.value.amount
return if (protocolBalance != null && amount != null) {
amount > protocolBalance
} else {
false
}
}

5
domain/models/src/main/kotlin/com/tangem/domain/models/yield/supply/YieldSupplyStatus.kt
View file

@ -1,5 +1,6 @@
package com.tangem.domain.models.yield.supply
import com.tangem.domain.models.serialization.SerializedBigDecimal
import kotlinx.serialization.Serializable
/**
@ -11,10 +12,12 @@ import kotlinx.serialization.Serializable
* @property isActive Indicates if the yield token is currently active.
* @property isInitialized Indicates if the yield token has been initialized.
* @property isAllowedToSpend Indicates if spending from the yield module is permitted.
*/
* @property effectiveProtocolBalance Indicates the balance (excluding service fee)
* */
@Serializable
data class YieldSupplyStatus(
val isActive: Boolean,
val isInitialized: Boolean,
val isAllowedToSpend: Boolean,
val effectiveProtocolBalance: SerializedBigDecimal?,
)

2
domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/YieldSupplyTransactionRepository.kt
View file

@ -23,5 +23,5 @@ interface YieldSupplyTransactionRepository {
suspend fun getYieldContractAddress(userWalletId: UserWalletId, cryptoCurrency: CryptoCurrency): String?
suspend fun getProtocolBalance(userWalletId: UserWalletId, cryptoCurrency: CryptoCurrency): BigDecimal?
suspend fun getEffectiveProtocolBalance(userWalletId: UserWalletId, cryptoCurrency: CryptoCurrency): BigDecimal?
}

2
domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/usecase/YieldSupplyGetProtocolBalanceUseCase.kt
View file

@ -19,7 +19,7 @@ class YieldSupplyGetProtocolBalanceUseCase(
): Either<YieldSupplyError, BigDecimal?> = Either.catch {
requireNotNull(cryptoCurrency as CryptoCurrency.Token)
yieldSupplyTransactionRepository.getProtocolBalance(
yieldSupplyTransactionRepository.getEffectiveProtocolBalance(
userWalletId = userWalletId,
cryptoCurrency = cryptoCurrency,
)

3
features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/active/model/YieldSupplyActiveModel.kt
View file

@ -102,7 +102,8 @@ internal class YieldSupplyActiveModel @Inject constructor(
private fun subscribeOnCurrencyUpdates() {
cryptoCurrencyStatusFlow.onEach { cryptoCurrencyStatus ->
val protocolBalance = yieldSupplyGetProtocolBalanceUseCase(
val protocolBalance = cryptoCurrencyStatus.value.yieldSupplyStatus?.effectiveProtocolBalance
?: yieldSupplyGetProtocolBalanceUseCase(
userWalletId = params.userWallet.walletId,
cryptoCurrency = cryptoCurrency,
).getOrNull()

2
gradle/tangem_dependencies.toml
View file

@ -5,7 +5,7 @@
# https://github.com/tangem/tangem-sdk-android/
# https://github.com/tangem/vico
tangemBlockchainSdk = "releases-5.30-1283"
tangemBlockchainSdk = "releases-5.30-1285"
#tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds
tangemCardSdk = "releases-5.30-567"
#tangemCardSdk = "0.0.1" # Keep it! - used for local builds ^