WIP: Epicwallet clean up, get fees and address from abstract class

lib/services/coins/epiccash/epiccash_wallet.dart

@@ -108,20 +108,6 @@ Future<void> executeNative(Map<String, dynamic> arguments) async {
         sendPort.send(result);
         return;
       }
-    } else if (function == "getWalletInfo") {
-      final wallet = arguments['wallet'] as String?;
-      final refreshFromNode = arguments['refreshFromNode'] as int?;
-      final minimumConfirmations = arguments['minimumConfirmations'] as int?;
-      Map<String, dynamic> result = {};
-      if (!(wallet == null ||
-          refreshFromNode == null ||
-          minimumConfirmations == null)) {
-        var res =
-            await getWalletInfo(wallet, refreshFromNode, minimumConfirmations);
-        result['result'] = res;
-        sendPort.send(result);
-        return;
-      }
     } else if (function == "getTransactions") {
       final wallet = arguments['wallet'] as String?;
       final refreshFromNode = arguments['refreshFromNode'] as int?;
@@ -142,18 +128,6 @@ Future<void> executeNative(Map<String, dynamic> arguments) async {
         sendPort.send(result);
         return;
       }
-    } else if (function == "getTransactionFees") {
-      final wallet = arguments['wallet'] as String?;
-      final amount = arguments['amount'] as int?;
-      final minimumConfirmations = arguments['minimumConfirmations'] as int?;
-      Map<String, dynamic> result = {};
-      if (!(wallet == null || amount == null || minimumConfirmations == null)) {
-        var res =
-            await getTransactionFees(wallet, amount, minimumConfirmations);
-        result['result'] = res;
-        sendPort.send(result);
-        return;
-      }
     } else if (function == "createTransaction") {
       final wallet = arguments['wallet'] as String?;
       final amount = arguments['amount'] as int?;
@@ -274,12 +248,6 @@ Future<String> _initWalletWrapper(
   return initWalletStr;
 }
 
-Future<String> _initGetAddressInfoWrapper(
-    Tuple3<String, int, String> data) async {
-  String walletAddress = getAddressInfo(data.item1, data.item2, data.item3);
-  return walletAddress;
-}
-
 Future<String> _walletMnemonicWrapper(int throwaway) async {
   final String mnemonic = walletMnemonic();
   return mnemonic;
@@ -553,13 +521,10 @@ class EpicCashWallet extends CoinServiceAPI
       final wallet = await _secureStore.read(key: '${_walletId}_wallet');
       EpicBoxConfigModel epicboxConfig = await getEpicBoxConfig();
 
-      String? walletAddress;
-      await m.protect(() async {
-        walletAddress = await compute(
-          _initGetAddressInfoWrapper,
-          Tuple3(wallet!, index, epicboxConfig.toString()),
-        );
-      });
+      ({String wallet, int index, String epicboxConfig}) data = (wallet: wallet!, index: index, epicboxConfig: epicboxConfig.toString());
+
+      String? walletAddress = await epiccash.getAddressInfo(data);
+
       Logging.instance
           .log("WALLET_ADDRESS_IS $walletAddress", level: LogLevel.Info);
 
@@ -705,20 +670,14 @@ class EpicCashWallet extends CoinServiceAPI
     Logging.instance.log("This index is $index", level: LogLevel.Info);
     EpicBoxConfigModel epicboxConfig = await getEpicBoxConfig();
 
-    String? walletAddress;
-    await m.protect(() async {
-      walletAddress = await compute(
-        _initGetAddressInfoWrapper,
-        Tuple3(wallet!, index, epicboxConfig.toString()),
-      );
-    });
+
+    ({String wallet, int index, String epicboxConfig}) data = (wallet: wallet!, index: index, epicboxConfig: epicboxConfig.toString());
+    String? walletAddress = await epiccash.getAddressInfo(data);
+
     Logging.instance
         .log("WALLET_ADDRESS_IS $walletAddress", level: LogLevel.Info);
-    Logging.instance
-        .log("Wallet address is $walletAddress", level: LogLevel.Info);
-    String addressInfo = walletAddress!;
     await _secureStore.write(
-        key: '${_walletId}_address_info', value: addressInfo);
+        key: '${_walletId}_address_info', value: walletAddress);
   }
 
   // TODO: make more robust estimate of date maybe using https://explorer.epic.tech/api-index
@@ -861,120 +820,20 @@ class EpicCashWallet extends CoinServiceAPI
   Future<int> nativeFee(int satoshiAmount,
       {bool ifErrorEstimateFee = false}) async {
     final wallet = await _secureStore.read(key: '${_walletId}_wallet');
-
     try {
-      String? transactionFees;
-      await m.protect(() async {
-        ReceivePort receivePort = await getIsolate({
-          "function": "getTransactionFees",
-          "wallet": wallet!,
-          "amount": satoshiAmount,
-          "minimumConfirmations": MINIMUM_CONFIRMATIONS,
-        }, name: walletName);
-
-        var message = await receivePort.first;
-        if (message is String) {
-          Logging.instance
-              .log("this is a string $message", level: LogLevel.Error);
-          stop(receivePort);
-          throw Exception("getTransactionFees isolate failed");
-        }
-        stop(receivePort);
-        Logging.instance.log('Closing getTransactionFees!\n  $message',
-            level: LogLevel.Info);
-        // return message;
-        transactionFees = message['result'] as String;
-      });
-      debugPrint(transactionFees);
-      dynamic decodeData;
 
       final available = balance.spendable.raw.toInt();
+      ({String wallet, int amount, int availableAmount}) data = (wallet: wallet!, amount: satoshiAmount, availableAmount: available);
+      var transactionFees = await epiccash.transactionFees(data);
 
-      if (available == satoshiAmount) {
-        if (transactionFees!.contains("Required")) {
-          var splits = transactionFees!.split(" ");
-          Decimal required = Decimal.zero;
-          Decimal available = Decimal.zero;
-          for (int i = 0; i < splits.length; i++) {
-            var word = splits[i];
-            if (word == "Required:") {
-              required = Decimal.parse(splits[i + 1].replaceAll(",", ""));
-            } else if (word == "Available:") {
-              available = Decimal.parse(splits[i + 1].replaceAll(",", ""));
-            }
-          }
-          int largestSatoshiFee =
-              ((required - available) * Decimal.fromInt(100000000))
-                  .toBigInt()
-                  .toInt();
-          var amountSending = satoshiAmount - largestSatoshiFee;
-
-          //Get fees for this new amount
-          await m.protect(() async {
-            ReceivePort receivePort = await getIsolate({
-              "function": "getTransactionFees",
-              "wallet": wallet!,
-              "amount": amountSending,
-              "minimumConfirmations": MINIMUM_CONFIRMATIONS,
-            }, name: walletName);
-
-            var message = await receivePort.first;
-            if (message is String) {
-              Logging.instance
-                  .log("this is a string $message", level: LogLevel.Error);
-              stop(receivePort);
-              throw Exception("getTransactionFees isolate failed");
-            }
-            stop(receivePort);
-            Logging.instance.log('Closing getTransactionFees!\n  $message',
-                level: LogLevel.Info);
-            // return message;
-            transactionFees = message['result'] as String;
-          });
-        }
-        decodeData = json.decode(transactionFees!);
-      } else {
-        try {
-          decodeData = json.decode(transactionFees!);
-        } catch (e) {
-          if (ifErrorEstimateFee) {
-            //Error Not enough funds. Required: 0.56500000, Available: 0.56200000
-            if (transactionFees!.contains("Required")) {
-              var splits = transactionFees!.split(" ");
-              Decimal required = Decimal.zero;
-              Decimal available = Decimal.zero;
-              for (int i = 0; i < splits.length; i++) {
-                var word = splits[i];
-                if (word == "Required:") {
-                  required = Decimal.parse(splits[i + 1].replaceAll(",", ""));
-                } else if (word == "Available:") {
-                  available = Decimal.parse(splits[i + 1].replaceAll(",", ""));
-                }
-              }
-              int largestSatoshiFee =
-                  ((required - available) * Decimal.fromInt(100000000))
-                      .toBigInt()
-                      .toInt();
-              Logging.instance.log("largestSatoshiFee $largestSatoshiFee",
-                  level: LogLevel.Info);
-              return largestSatoshiFee;
-            }
-          }
-          rethrow;
-        }
-      }
-
-      //TODO: first problem
       int realfee = 0;
       try {
-        var txObject = decodeData[0];
         realfee =
-            (Decimal.parse(txObject["fee"].toString())).toBigInt().toInt();
+            (Decimal.parse(transactionFees.fee.toString())).toBigInt().toInt();
       } catch (e, s) {
         //todo: come back to this
         debugPrint("$e $s");
       }
-
       return realfee;
     } catch (e, s) {
       Logging.instance.log("Error getting fees $e - $s", level: LogLevel.Error);

lib/wallets/crypto_currency/coins/epiccash.dart

@@ -158,25 +158,23 @@ class Epiccash extends Bip39Currency {
     return null;
   }
 
-  static Future<String?> transactionFees(
+  Future<({int fee, bool strategyUseAll, int total})> transactionFees(
     ({
       String wallet,
       int amount,
-      int minimumConfirmations,
+      int availableAmount,
     })? data,
   ) async {
     var result = await LibEpiccash.getTransactionFees(
       wallet: data!.wallet,
       amount: data.amount,
-      minimumConfirmations: data.minimumConfirmations,
+      minimumConfirmations: minConfirms,
+      available: data.availableAmount,
     );
-    if (result.isNotEmpty) {
     return result;
   }
-    return null;
-  }
 
-  static Future<String?> deleteWallet(
+  Future<String?> deleteWallet(
     ({
       String wallet,
       String config,
@@ -192,7 +190,7 @@ class Epiccash extends Bip39Currency {
     return null;
   }
 
-  static Future<String?> openWallet(
+  Future<String?> openWallet(
     ({
       String config,
       String password,
@@ -208,7 +206,7 @@ class Epiccash extends Bip39Currency {
     return null;
   }
 
-  static Future<String?> txHttpSend(
+  Future<String?> txHttpSend(
     ({
       String wallet,
       int selectionStrategyIsAll,

lib/wallets/example/libepiccash.dart

@@ -1,5 +1,6 @@
 import 'dart:convert';
 
+import 'package:decimal/decimal.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_libepiccash/epic_cash.dart' as lib_epiccash;
 import 'package:mutex/mutex.dart';
@@ -347,19 +348,68 @@ abstract class LibEpiccash {
   ///
   /// get transaction fees for Epic
   ///
-  static Future<String> getTransactionFees({
+  static Future<({int fee, bool strategyUseAll, int total})> getTransactionFees({
     required String wallet,
     required int amount,
     required int minimumConfirmations,
+    required int available,
   }) async {
     try {
-      return await compute(_transactionFeesWrapper, (
+
+      String fees = await compute(_transactionFeesWrapper, (
       wallet: wallet,
       amount: amount,
       minimumConfirmations: minimumConfirmations,
       ));
+
+      if (available == amount) {
+        if (fees.contains("Required")) {
+          var splits = fees.split(" ");
+          Decimal required = Decimal.zero;
+          Decimal available = Decimal.zero;
+          for (int i = 0; i < splits.length; i++) {
+            var word = splits[i];
+            if (word == "Required:") {
+              required = Decimal.parse(splits[i + 1].replaceAll(",", ""));
+            } else if (word == "Available:") {
+              available = Decimal.parse(splits[i + 1].replaceAll(",", ""));
+            }
+          }
+          int largestSatoshiFee =
+          ((required - available) * Decimal.fromInt(100000000))
+              .toBigInt()
+              .toInt();
+          var amountSending = amount - largestSatoshiFee;
+          //Get fees for this new amount
+          ({String wallet, int amount, }) data = (wallet: wallet, amount: amountSending);
+          fees = await compute(_transactionFeesWrapper, (
+          wallet: wallet,
+          amount: amountSending,
+          minimumConfirmations: minimumConfirmations,
+          ));
+        }
+      }
+
+
+      if (fees.toUpperCase().contains("ERROR")) {
+        //Check if the error is an
+        //Throw the returned error
+        throw Exception(fees);
+      }
+      var decodedFees = json.decode(fees);
+      var feeItem = decodedFees[0];
+      ({
+      bool strategyUseAll,
+      int total,
+      int fee,
+      }) feeRecord = (
+      strategyUseAll: feeItem['selection_strategy_is_use_all'],
+      total: feeItem['total'],
+      fee: feeItem['fee'],
+      );
+      return feeRecord;
     } catch (e) {
-      throw ("Error getting transaction fees : ${e.toString()}");
+      throw (e.toString());
     }
   }