Fix jettons

Author: furenster

blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/ton/TonBalanceClient.kt

@@ -5,11 +5,6 @@ import com.gemwallet.android.ext.asset
 import com.gemwallet.android.model.AssetBalance
 import com.wallet.core.primitives.Asset
 import com.wallet.core.primitives.Chain
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.asFlow
-import kotlinx.coroutines.flow.flowOn
-import kotlinx.coroutines.flow.mapNotNull
-import kotlinx.coroutines.flow.toList
 import java.math.BigInteger
 
 class TonBalanceClient(
@@ -23,20 +18,12 @@ class TonBalanceClient(
  }
 
  override suspend fun getTokenBalances(chain: Chain, address: String, tokens: List<Asset>): List<AssetBalance> {
- return tokens.asFlow()
- .mapNotNull {
- val tokenId = it.id.tokenId ?: return@mapNotNull null
- val jettonAddress = jettonAddress(rpcClient, tokenId, address) ?: return@mapNotNull null
- val isActive = rpcClient.addressState(jettonAddress).getOrNull()?.result == "active"
-
- if (isActive) {
- AssetBalance.create(it, available = tokenBalance(jettonAddress).toString())
- } else {
- AssetBalance.create(it)
- }
- }
- .flowOn(Dispatchers.IO)
- .toList()
+ val jettonWallets = rpcClient.getJettonWallets(address)
+ return jettonWallets.jetton_wallets.mapNotNull { wallet ->
+ val jettonTokenId = uniffi.gemstone.tonHexToBase64Address(wallet.jetton)
+ val tokenAsset = tokens.firstOrNull { it.id.tokenId == jettonTokenId } ?: return@mapNotNull null
+ AssetBalance.create(tokenAsset, available = wallet.balance)
+ }
  }
 
  override fun supported(chain: Chain): Boolean = this.chain == chain

blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/ton/TonCalls.kt

@@ -19,9 +19,11 @@ class TonFeeCalculator(
 
  suspend fun calculateToken(assetId: AssetId, destinationAddress: String, memo: String?): Fee = withContext(Dispatchers.IO) {
  val tokenId = assetId.tokenId!!
- val jetonAddress = jettonAddress(rpcClient, tokenId, destinationAddress)
- ?: throw Exception("can't get jetton address")
- val state = rpcClient.addressState(jetonAddress).getOrNull()?.result == "active"
+ val hexTokenId = uniffi.gemstone.tonBase64ToHexAddress(tokenId)
+ val jetonAddress = rpcClient.getJettonWallets(destinationAddress)
+ .jetton_wallets.firstOrNull { it.jetton == hexTokenId }?.address
+
+ val state = jetonAddress?.let { true } ?: false
  val tokenAccountFee = if (state) {
  if (memo.isNullOrEmpty()) {
  BigInteger.valueOf(100_000_000)

blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/ton/TonFeeCalculator.kt

@@ -1,6 +1,5 @@
 package com.gemwallet.android.blockchain.clients.ton
 
-import com.gemwallet.android.blockchain.rpc.model.JSONRpcRequest
 import com.google.gson.JsonDeserializationContext
 import com.google.gson.JsonDeserializer
 import com.google.gson.JsonElement
@@ -11,6 +10,7 @@ import com.wallet.core.blockchain.ton.TonMasterchainInfo
 import com.wallet.core.blockchain.ton.TonMessageTransactions
 import com.wallet.core.blockchain.ton.TonResult
 import com.wallet.core.blockchain.ton.TonWalletInfo
+import kotlinx.serialization.SerialName
 import retrofit2.Response
 import retrofit2.http.Body
 import retrofit2.http.GET
@@ -30,17 +30,14 @@ interface TonRpcClient {
  @POST("/api/v2/sendBocReturnHash")
  suspend fun broadcast(@Body boc: Boc): Result<TonResult<TonBroadcastTransaction>>
 
-// @GET("/api/index/v1/getTransactionsByInMessageHash")
-// suspend fun transaction(@Query("msg_hash") hash: String): Result<List<TonTransactionMessage>>
-
  @GET("/api/v3/transactionsByMessage")
  suspend fun transaction(@Query("msg_hash") hash: String): Result<TonMessageTransactions>
 
  @GET("/api/v2/getTokenData")
  suspend fun tokenData(@Query("address") address: String): Result<TonResult<TonJettonToken>>
 
- @POST("/api/v2/jsonRPC")
- suspend fun getJetonAddress(@Body request: JSONRpcRequest<Any>): Result<JetonAddress?>
+ @GET("/api/v3/jetton/wallets?limit=100&offset=0")
+ suspend fun getJettonWallets(@Query("owner_address") ownerAddress: String): JettonWalletsResponse
 
  @GET("/api/v2/getTokenData")
  suspend fun tokenBalance(@Query("address") address: String): Result<TonResult<TonJettonBalance>>
@@ -60,6 +57,16 @@ interface TonRpcClient {
  val len: Long,
  )
 
+ data class JettonWalletsResponse(
+ val jetton_wallets: List<JettonWallet>
+ )
+
+ data class JettonWallet(
+ val address: String,
+ @SerialName("deserialize_biguint_from_str") val balance: String,
+ val jetton: String,
+ )
+
  class JetonAddressSerializer : JsonDeserializer<JetonAddress?> {
 
  override fun deserialize(

blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/ton/TonRpcClient.kt

@@ -32,12 +32,20 @@ class TonSignerPreloader(
  }
 
  override suspend fun preloadTokenTransfer(params: ConfirmParams.TransferParams.Token): SignerParams = withContext(Dispatchers.IO) {
+ val hexTokenId = uniffi.gemstone.tonBase64ToHexAddress(params.assetId.tokenId ?: throw IllegalArgumentException("No token id"))
+ val getJettonAddress = async { rpcClient.getJettonWallets(params.from.address) }
+
+
+ //uniffi.gemstone.tonBase64ToHexAddress(params.assetId.tokenId!!)
+// async { jettonAddress(rpcClient, params.assetId.tokenId!!, params.from.address) }
  val getWalletInfo = async { rpcClient.walletInfo(params.from.address).getOrNull() }
- val getJettonAddress = async { jettonAddress(rpcClient, params.assetId.tokenId!!, params.from.address) }
  val getFee = async { feeCalculator.calculateToken(params.assetId, params.destination().address, params.memo()) }
 
  val seqno = getWalletInfo.await()?.result?.seqno ?: 0
- val jettonAddress = getJettonAddress.await() ?: throw Exception("can't get jetton address. check internet.")
+ val jettonWallets = getJettonAddress.await()
+ val jettonAddress = jettonWallets.jetton_wallets.firstOrNull { it.jetton.lowercase() == hexTokenId }?.address
+ ?: throw IllegalArgumentException("Not load jetton wallet")
+
  val fee = getFee.await()
 
  SignerParams(