fix for compressed jetton

tonkeeper · Sep 17, 2024 · 86e4b78 · 86e4b78
1 parent 9f40413
commit 86e4b78
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 20 deletions.
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/extensions/RawMessageEntity.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/extensions/RawMessageEntity.kt
@@ -80,30 +80,13 @@ private fun RawMessageEntity.rebuildJettonTransferWithCustomPayload(
     )
 }
 
-fun RawMessageEntity.getJettonAddress(): AddrStd? {
-    val slice = payload.beginParse()
-    val opCode = slice.loadOpCode()
-    if (opCode != TONOpCode.JETTON_TRANSFER) {
-        return null
-    }
-    slice.loadUInt(64)
-    slice.loadTlb(Coins.tlbCodec())
-    slice.loadTlb(AddrStd.tlbCodec())
-    val excessesAddress = slice.loadTlb(AddrStd.tlbCodec())
-    val customPayload = slice.loadMaybeRef()
-    if (customPayload != null) {
-        return null
-    }
-    return excessesAddress
-}
-
 fun RawMessageEntity.getWalletTransfer(
     excessesAddress: AddrStd? = null,
     newStateInit: StateInit? = null,
     newCustomPayload: Cell? = null,
 ): WalletTransfer {
     val builder = WalletTransferBuilder()
-    builder.stateInit = newStateInit ?: stateInit
+    builder.stateInit = stateInit ?: newStateInit
     builder.destination = address
     builder.body = if (excessesAddress != null) {
         rebuildBodyWithCustomExcessesAccount(excessesAddress)

diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/extensions/SignRequestEntity.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/extensions/SignRequestEntity.kt
@@ -1,5 +1,6 @@
 package com.tonapps.tonkeeper.extensions
 
+import com.tonapps.blockchain.ton.extensions.equalsAddress
 import com.tonapps.blockchain.ton.extensions.toAccountId
 import com.tonapps.wallet.api.API
 import com.tonapps.wallet.data.account.entities.WalletEntity
@@ -18,8 +19,12 @@ suspend fun SignRequestEntity.getTransfers(
 ): List<WalletTransfer> = withContext(Dispatchers.IO) {
     val transfers = mutableListOf<WalletTransfer>()
     for (message in messages) {
-        val jettonCustomPayload = message.getJettonAddress()?.toAccountId()?.let {
-            api.getJettonCustomPayload(wallet.accountId, wallet.testnet, it)
+        val jetton = compressedTokens.firstOrNull {
+            it.address.equalsAddress(message.addressValue) ||
+            it.balance.walletAddress.equalsAddress(message.addressValue)
+        }
+        val jettonCustomPayload = jetton?.let {
+            api.getJettonCustomPayload(wallet.accountId, wallet.testnet, it.address)
         }
 
         val transfer = message.getWalletTransfer(