From 461267ec95fc2abcd4b682cc5c93e46791a65698 Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Thu, 20 Jul 2023 11:34:31 -0600
Subject: [PATCH] eth api error handling clean up and token flag

---
 .../coins/ethereum/ethereum_wallet.dart       |  5 ++-
 lib/services/ethereum/ethereum_api.dart       | 33 +++++++++++--------
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/lib/services/coins/ethereum/ethereum_wallet.dart b/lib/services/coins/ethereum/ethereum_wallet.dart
index 9990406d9..62f3020e0 100644
--- a/lib/services/coins/ethereum/ethereum_wallet.dart
+++ b/lib/services/coins/ethereum/ethereum_wallet.dart
@@ -1023,6 +1023,7 @@ class EthereumWallet extends CoinServiceAPI with WalletCache, WalletDB {
     final response = await EthereumAPI.getEthTransactions(
       address: thisAddress,
       firstBlock: isRescan ? 0 : firstBlock,
+      includeTokens: true,
     );
 
     if (response.value == null) {
@@ -1057,8 +1058,10 @@ class EthereumWallet extends CoinServiceAPI with WalletCache, WalletDB {
             txFailed = true;
           }
           isIncoming = false;
-        } else {
+        } else if (checksumEthereumAddress(element.to) == thisAddress) {
           isIncoming = true;
+        } else {
+          continue;
         }
 
         //Calculate fees (GasLimit * gasPrice)
diff --git a/lib/services/ethereum/ethereum_api.dart b/lib/services/ethereum/ethereum_api.dart
index d30b9ea27..663513bea 100644
--- a/lib/services/ethereum/ethereum_api.dart
+++ b/lib/services/ethereum/ethereum_api.dart
@@ -50,6 +50,7 @@ abstract class EthereumAPI {
   static Future<EthereumResponse<List<EthTxDTO>>> getEthTransactions({
     required String address,
     int firstBlock = 0,
+    bool includeTokens = false,
   }) async {
     try {
       final response = await get(
@@ -67,7 +68,7 @@ abstract class EthereumAPI {
           for (final map in list!) {
             final txn = EthTxDTO.fromMap(Map<String, dynamic>.from(map as Map));
 
-            if (txn.hasToken == 0) {
+            if (txn.hasToken == 0 || includeTokens) {
               txns.add(txn);
             }
           }
@@ -76,9 +77,11 @@ abstract class EthereumAPI {
             null,
           );
         } else {
-          throw EthApiException(
-            "getEthTransactions($address) response is empty but status code is "
-            "${response.statusCode}",
+          // nice that the api returns an empty body instead of being
+          // consistent and returning a json object with no transactions
+          return EthereumResponse(
+            [],
+            null,
           );
         }
       } else {
@@ -196,9 +199,11 @@ abstract class EthereumAPI {
             null,
           );
         } else {
-          throw EthApiException(
-            "getEthTransactionNonces($txns) response is empty but status code is "
-            "${response.statusCode}",
+          // nice that the api returns an empty body instead of being
+          // consistent and returning a json object with no transactions
+          return EthereumResponse(
+            [],
+            null,
           );
         }
       } else {
@@ -252,13 +257,13 @@ abstract class EthereumAPI {
           );
         } else {
           throw EthApiException(
-            "getEthTransaction($txids) response is empty but status code is "
+            "getEthTokenTransactionsByTxids($txids) response is empty but status code is "
             "${response.statusCode}",
           );
         }
       } else {
         throw EthApiException(
-          "getEthTransaction($txids) failed with status code: "
+          "getEthTokenTransactionsByTxids($txids) failed with status code: "
           "${response.statusCode}",
         );
       }
@@ -269,7 +274,7 @@ abstract class EthereumAPI {
       );
     } catch (e, s) {
       Logging.instance.log(
-        "getEthTransaction($txids): $e\n$s",
+        "getEthTokenTransactionsByTxids($txids): $e\n$s",
         level: LogLevel.Error,
       );
       return EthereumResponse(
@@ -307,9 +312,11 @@ abstract class EthereumAPI {
             null,
           );
         } else {
-          throw EthApiException(
-            "getTokenTransactions($address, $tokenContractAddress) response is empty but status code is "
-            "${response.statusCode}",
+          // nice that the api returns an empty body instead of being
+          // consistent and returning a json object with no transactions
+          return EthereumResponse(
+            [],
+            null,
           );
         }
       } else {