Merge pull request #372 from tangem/bugfix/AND_5328_ethpow_tx_parsing

AND-5238 Fixed ETHPow transaction parsing
tangem · Nov 13, 2023 · 0e6b0cc · 0e6b0cc
2 parents c286e2a + d4f3cb5
commit 0e6b0cc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/...ain/java/com/tangem/blockchain/blockchains/ethereum/EthereumTransactionHistoryProvider.kt b/...ain/java/com/tangem/blockchain/blockchains/ethereum/EthereumTransactionHistoryProvider.kt
@@ -142,7 +142,7 @@ internal class EthereumTransactionHistoryProvider(
                 .equals(walletAddress, ignoreCase = true)
 
             is TransactionHistoryRequest.FilterType.Contract -> transaction.tokenTransfers
-                .firstOrNull { filterType.address.equals(it.contract, true) }
+                .firstOrNull { filterType.address.equals(it.contract, true) || filterType.address.equals(it.token, ignoreCase = true) }
                 ?.from.equals(walletAddress, ignoreCase = true)
         }
     }
@@ -171,7 +171,7 @@ internal class EthereumTransactionHistoryProvider(
 
             is TransactionHistoryRequest.FilterType.Contract -> {
                 val transfer = tx.tokenTransfers
-                    .firstOrNull { filterType.address.equals(it.contract, ignoreCase = true) }
+                    .firstOrNull { filterType.address.equals(it.contract, ignoreCase = true) || filterType.address.equals(it.token, ignoreCase = true) }
                     .guard { return null }
                 val isOutgoing = transfer.from == walletAddress
                 TransactionHistoryItem.DestinationType.Single(
@@ -207,13 +207,13 @@ internal class EthereumTransactionHistoryProvider(
 
             is TransactionHistoryRequest.FilterType.Contract -> {
                 val transfer = tx.tokenTransfers
-                    .firstOrNull { filterType.address.equals(it.contract, ignoreCase = true) }
+                    .firstOrNull { filterType.address.equals(it.contract, ignoreCase = true) || filterType.address.equals(it.token, ignoreCase = true) }
                     .guard { return null }
                 val transferValue = transfer.value ?: "0"
                 val token = Token(
                     name = transfer.name.orEmpty(),
                     symbol = transfer.symbol.orEmpty(),
-                    contractAddress = transfer.contract,
+                    contractAddress = transfer.contract ?: transfer.token ?: "",
                     decimals = transfer.decimals,
                 )
                 Amount(value = BigDecimal(transferValue).movePointLeft(transfer.decimals), token = token)

diff --git a/...main/java/com/tangem/blockchain/network/blockbook/network/responses/GetAddressResponse.kt b/...main/java/com/tangem/blockchain/network/blockbook/network/responses/GetAddressResponse.kt
@@ -45,7 +45,8 @@ data class GetAddressResponse(
             @Json(name = "type") val type: String?,
             @Json(name = "from") val from: String,
             @Json(name = "to") val to: String,
-            @Json(name = "contract") val contract: String,
+            @Json(name = "contract") val contract: String?,
+            @Json(name = "token") val token: String?,
             @Json(name = "name") val name: String?,
             @Json(name = "symbol") val symbol: String?,
             @Json(name = "decimals") val decimals: Int,