Merge branch 'staging' into flutter3.3.4

ios/Runner.xcodeproj/project.pbxproj

@@ -454,7 +454,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 78;
+				CURRENT_PROJECT_VERSION = 79;
 				DEVELOPMENT_TEAM = 4DQKUWSG6C;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -508,7 +508,7 @@
 					"$(PROJECT_DIR)/../crypto_plugins/flutter_libmonero/cw_shared_external/ios/External/ios/**",
 					"$(PROJECT_DIR)/../crypto_plugins/flutter_libepiccash/ios/libs",
 				);
-				MARKETING_VERSION = 1.5.8;
+				MARKETING_VERSION = 1.5.9;
 				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = com.cypherstack.stackwallet;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -641,7 +641,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 78;
+				CURRENT_PROJECT_VERSION = 79;
 				DEVELOPMENT_TEAM = 4DQKUWSG6C;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -695,7 +695,7 @@
 					"$(PROJECT_DIR)/../crypto_plugins/flutter_libmonero/cw_shared_external/ios/External/ios/**",
 					"$(PROJECT_DIR)/../crypto_plugins/flutter_libepiccash/ios/libs",
 				);
-				MARKETING_VERSION = 1.5.8;
+				MARKETING_VERSION = 1.5.9;
 				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = com.cypherstack.stackwallet;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -720,7 +720,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 78;
+				CURRENT_PROJECT_VERSION = 79;
 				DEVELOPMENT_TEAM = 4DQKUWSG6C;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -774,7 +774,7 @@
 					"$(PROJECT_DIR)/../crypto_plugins/flutter_libmonero/cw_shared_external/ios/External/ios/**",
 					"$(PROJECT_DIR)/../crypto_plugins/flutter_libepiccash/ios/libs",
 				);
-				MARKETING_VERSION = 1.5.8;
+				MARKETING_VERSION = 1.5.9;
 				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = com.cypherstack.stackwallet;
 				PRODUCT_NAME = "$(TARGET_NAME)";

lib/main.dart

@@ -143,7 +143,12 @@ void main() async {
           boxName: DB.boxNameDBInfo, key: "hive_data_version") as int? ??
       0;
   if (dbVersion < Constants.currentHiveDbVersion) {
+    try {
       await DbVersionMigrator().migrate(dbVersion);
+    } catch (e, s) {
+      Logging.instance.log("Cannot migrate database\n$e $s",
+          level: LogLevel.Error, printFullLength: true);
+    }
   }
 
   monero.onStartup();
@@ -231,7 +236,9 @@ class _MaterialAppWithThemeState extends ConsumerState<MaterialAppWithTheme>
     //  unawaited(_nodeService.updateCommunityNodes());
 
     // run without awaiting
-    if (Constants.enableExchange && _prefs.externalCalls) {
+    if (Constants.enableExchange &&
+        _prefs.externalCalls &&
+        await _prefs.isExternalCallsSet()) {
       unawaited(ExchangeDataLoadingService().loadAll(ref));
     }
 

lib/models/exchange/exchange_form_state.dart

@@ -276,6 +276,12 @@ class ExchangeFormState extends ChangeNotifier {
 
   void _onExchangeRateTypeChanged() {
     print("_onExchangeRateTypeChanged");
+    updateRanges(shouldNotifyListeners: true).then(
+      (_) => updateEstimate(
+        shouldNotifyListeners: true,
+        reversed: reversed,
+      ),
+    );
   }
 
   void _onExchangeTypeChanged() {

lib/pages/add_wallet_views/restore_wallet_view/restore_options_view/restore_options_view.dart

@@ -144,6 +144,8 @@ class _RestoreOptionsViewState extends ConsumerState<RestoreOptionsView> {
 
   Future<void> chooseDate() async {
     final height = MediaQuery.of(context).size.height;
+    final fetchedColor =
+        Theme.of(context).extension<StackColors>()!.accentColorDark;
     // check and hide keyboard
     if (FocusScope.of(context).hasFocus) {
       FocusScope.of(context).unfocus();
@@ -155,8 +157,7 @@ class _RestoreOptionsViewState extends ConsumerState<RestoreOptionsView> {
       initialDate: DateTime.now(),
       height: height * 0.5,
       theme: ThemeData(
-        primarySwatch: Util.createMaterialColor(
+        primarySwatch: Util.createMaterialColor(fetchedColor),
-            Theme.of(context).extension<StackColors>()!.accentColorDark),
       ),
       //TODO pick a better initial date
       // 2007 chosen as that is just before bitcoin launched
@@ -272,6 +273,7 @@ class _RestoreOptionsViewState extends ConsumerState<RestoreOptionsView> {
                 // if (!isDesktop)
                 RestoreFromDatePicker(
                   onTap: chooseDate,
+                  controller: _dateController,
                 ),
 
               // if (isDesktop)

lib/pages/add_wallet_views/restore_wallet_view/restore_options_view/sub_widgets/restore_from_date_picker.dart

@@ -5,10 +5,14 @@ import 'package:stackwallet/utilities/text_styles.dart';
 import 'package:stackwallet/utilities/theme/stack_colors.dart';
 
 class RestoreFromDatePicker extends StatefulWidget {
-  const RestoreFromDatePicker({Key? key, required this.onTap})
+  const RestoreFromDatePicker({
-      : super(key: key);
+    Key? key,
+    required this.onTap,
+    required this.controller,
+  }) : super(key: key);
 
   final VoidCallback onTap;
+  final TextEditingController controller;
 
   @override
   State<RestoreFromDatePicker> createState() => _RestoreFromDatePickerState();
@@ -21,17 +25,11 @@ class _RestoreFromDatePickerState extends State<RestoreFromDatePicker> {
   @override
   void initState() {
     onTap = widget.onTap;
-    _dateController = TextEditingController();
+    _dateController = widget.controller;
 
     super.initState();
   }
 
-  @override
-  void dispose() {
-    _dateController.dispose();
-    super.dispose();
-  }
-
   @override
   Widget build(BuildContext context) {
     return Container(

lib/services/coins/bitcoincash/bitcoincash_wallet.dart

@@ -43,7 +43,7 @@ import 'package:stackwallet/utilities/prefs.dart';
 import 'package:tuple/tuple.dart';
 import 'package:uuid/uuid.dart';
 
-const int MINIMUM_CONFIRMATIONS = 3;
+const int MINIMUM_CONFIRMATIONS = 1;
 const int DUST_LIMIT = 546;
 
 const String GENESIS_HASH_MAINNET =
@@ -265,6 +265,11 @@ class BitcoinCashWallet extends CoinServiceAPI {
   DerivePathType addressType({required String address}) {
     Uint8List? decodeBase58;
     Segwit? decodeBech32;
+    try {
+      if (Bitbox.Address.detectFormat(address) == 0) {
+        address = Bitbox.Address.toLegacyAddress(address);
+      }
+    } catch (e, s) {}
     try {
       decodeBase58 = bs58check.decode(address);
     } catch (err) {
@@ -825,9 +830,6 @@ class BitcoinCashWallet extends CoinServiceAPI {
   /// Refreshes display data for the wallet
   @override
   Future<void> refresh() async {
-    final bchaddr = Bitbox.Address.toCashAddress(await currentReceivingAddress);
-    print("bchaddr: $bchaddr ${await currentReceivingAddress}");
-
     if (refreshMutex) {
       Logging.instance.log("$walletId $walletName refreshMutex denied",
           level: LogLevel.Info);
@@ -1384,7 +1386,9 @@ class BitcoinCashWallet extends CoinServiceAPI {
         initialChangeAddressP2SH, 1, DerivePathType.bip49);
 
     // this._currentReceivingAddress = Future(() => initialReceivingAddress);
-    _currentReceivingAddressP2PKH = Future(() => initialReceivingAddressP2PKH);
+
+    var newaddr = await _getCurrentAddressForChain(0, DerivePathType.bip44);
+    _currentReceivingAddressP2PKH = Future(() => newaddr);
     _currentReceivingAddressP2SH = Future(() => initialReceivingAddressP2SH);
 
     Logging.instance.log("_generateNewWalletFinished", level: LogLevel.Info);
@@ -1521,6 +1525,11 @@ class BitcoinCashWallet extends CoinServiceAPI {
     print("Array key is ${jsonEncode(arrayKey)}");
     final internalChainArray =
         DB.instance.get<dynamic>(boxName: walletId, key: arrayKey);
+    if (derivePathType == DerivePathType.bip44) {
+      if (Bitbox.Address.detectFormat(internalChainArray.last as String) == 1) {
+        return Bitbox.Address.toCashAddress(internalChainArray.last as String);
+      }
+    }
     return internalChainArray.last as String;
   }
 
@@ -1986,6 +1995,9 @@ class BitcoinCashWallet extends CoinServiceAPI {
   /// Returns the scripthash or throws an exception on invalid bch address
   String _convertToScriptHash(String bchAddress, NetworkType network) {
     try {
+      if (Bitbox.Address.detectFormat(bchAddress) == 0) {
+        bchAddress = Bitbox.Address.toLegacyAddress(bchAddress);
+      }
       final output = Address.addressToOutputScript(bchAddress, network);
       final hash = sha256.convert(output.toList(growable: false)).toString();
 
@@ -2058,11 +2070,27 @@ class BitcoinCashWallet extends CoinServiceAPI {
   }
 
   Future<TransactionData> _fetchTransactionData() async {
-    final List<String> allAddresses = await _fetchAllOwnAddresses();
+    List<String> allAddressesOld = await _fetchAllOwnAddresses();
+    List<String> allAddresses = [];
+    for (String address in allAddressesOld) {
+      if (Bitbox.Address.detectFormat(address) == 1) {
+        allAddresses.add(Bitbox.Address.toCashAddress(address));
+      } else {
+        allAddresses.add(address);
+      }
+    }
 
-    final changeAddressesP2PKH =
+    var changeAddressesP2PKHOld =
         DB.instance.get<dynamic>(boxName: walletId, key: 'changeAddressesP2PKH')
             as List<dynamic>;
+    List<dynamic> changeAddressesP2PKH = [];
+    for (var address in changeAddressesP2PKHOld) {
+      if (Bitbox.Address.detectFormat(address as String) == 1) {
+        changeAddressesP2PKH.add(Bitbox.Address.toCashAddress(address));
+      } else {
+        changeAddressesP2PKH.add(address);
+      }
+    }
 
     final List<Map<String, dynamic>> allTxHashes =
         await _fetchHistory(allAddresses);
@@ -2087,16 +2115,24 @@ class BitcoinCashWallet extends CoinServiceAPI {
         if (txHeight > 0 &&
             txHeight < latestTxnBlockHeight - MINIMUM_CONFIRMATIONS) {
           if (unconfirmedCachedTransactions[tx["tx_hash"] as String] == null) {
+            print(cachedTransactions.findTransaction(tx["tx_hash"] as String));
+            print(unconfirmedCachedTransactions[tx["tx_hash"] as String]);
+            final cachedTx =
+                cachedTransactions.findTransaction(tx["tx_hash"] as String);
+            if (!(cachedTx != null &&
+                addressType(address: cachedTx.address) ==
+                    DerivePathType.bip44 &&
+                Bitbox.Address.detectFormat(cachedTx.address) == 1)) {
               allTxHashes.remove(tx);
             }
           }
         }
       }
+    }
 
     List<Map<String, dynamic>> allTransactions = [];
 
     for (final txHash in allTxHashes) {
-      Logging.instance.log("bch: $txHash", level: LogLevel.Info);
       final tx = await cachedElectrumXClient.getTransaction(
         txHash: txHash["tx_hash"] as String,
         verbose: true,
@@ -2166,7 +2202,8 @@ class BitcoinCashWallet extends CoinServiceAPI {
           .log("recipientsArray: $recipientsArray", level: LogLevel.Info);
 
       final foundInSenders =
-          allAddresses.any((element) => sendersArray.contains(element));
+          allAddresses.any((element) => sendersArray.contains(element)) ||
+              allAddressesOld.any((element) => sendersArray.contains(element));
       Logging.instance
           .log("foundInSenders: $foundInSenders", level: LogLevel.Info);
 
@@ -2228,7 +2265,8 @@ class BitcoinCashWallet extends CoinServiceAPI {
                 .toBigInt()
                 .toInt();
             totalOut += value;
-            if (allAddresses.contains(address)) {
+            if (allAddresses.contains(address) ||
+                allAddressesOld.contains(address)) {
               outputAmtAddressedToWallet += value;
             }
           }
@@ -2743,7 +2781,10 @@ class BitcoinCashWallet extends CoinServiceAPI {
         for (final output in tx["vout"] as List) {
           final n = output["n"];
           if (n != null && n == utxosToUse[i].vout) {
-            final address = output["scriptPubKey"]["addresses"][0] as String;
+            String address = output["scriptPubKey"]["addresses"][0] as String;
+            if (Bitbox.Address.detectFormat(address) == 0) {
+              address = Bitbox.Address.toLegacyAddress(address);
+            }
             if (!addressTxid.containsKey(address)) {
               addressTxid[address] = <String>[];
             }
@@ -2772,8 +2813,13 @@ class BitcoinCashWallet extends CoinServiceAPI {
           derivePathType: DerivePathType.bip44,
         );
         for (int i = 0; i < p2pkhLength; i++) {
+          String address = addressesP2PKH[i];
+          if (Bitbox.Address.detectFormat(address) == 0) {
+            address = Bitbox.Address.toLegacyAddress(address);
+          }
+
           // receives
-          final receiveDerivation = receiveDerivations[addressesP2PKH[i]];
+          final receiveDerivation = receiveDerivations[address];
           // if a match exists it will not be null
           if (receiveDerivation != null) {
             final data = P2PKH(
@@ -2783,7 +2829,7 @@ class BitcoinCashWallet extends CoinServiceAPI {
               network: _network,
             ).data;
 
-            for (String tx in addressTxid[addressesP2PKH[i]]!) {
+            for (String tx in addressTxid[address]!) {
               results[tx] = {
                 "output": data.output,
                 "keyPair": ECPair.fromWIF(
@@ -2794,7 +2840,7 @@ class BitcoinCashWallet extends CoinServiceAPI {
             }
           } else {
             // if its not a receive, check change
-            final changeDerivation = changeDerivations[addressesP2PKH[i]];
+            final changeDerivation = changeDerivations[address];
             // if a match exists it will not be null
             if (changeDerivation != null) {
               final data = P2PKH(
@@ -2804,7 +2850,7 @@ class BitcoinCashWallet extends CoinServiceAPI {
                 network: _network,
               ).data;
 
-              for (String tx in addressTxid[addressesP2PKH[i]]!) {
+              for (String tx in addressTxid[address]!) {
                 results[tx] = {
                   "output": data.output,
                   "keyPair": ECPair.fromWIF(
@@ -3377,8 +3423,9 @@ class BitcoinCashWallet extends CoinServiceAPI {
           0,
           DerivePathType
               .bip44); // Add that new receiving address to the array of receiving addresses
-      _currentReceivingAddressP2PKH = Future(() =>
+      var newaddr = await _getCurrentAddressForChain(0, DerivePathType.bip44);
-          newReceivingAddress); // Set the new receiving address that the service
+      _currentReceivingAddressP2PKH = Future(
+          () => newaddr); // Set the new receiving address that the service
 
       return true;
     } catch (e, s) {

lib/services/coins/epiccash/epiccash_wallet.dart

@@ -1990,7 +1990,6 @@ class EpicCashWallet extends CoinServiceAPI {
 
   Future<bool> refreshIfThereIsNewData() async {
     if (_hasCalledExit) return false;
-    Logging.instance.log("Can we do this here?", level: LogLevel.Fatal);
     // TODO returning true here signals this class to call refresh() after which it will fire an event that notifies the UI that new data has been fetched/found for this wallet
     return true;
     // TODO: do a quick check to see if there is any new data that would require a refresh

lib/services/node_service.dart

@@ -39,6 +39,19 @@ class NodeService extends ChangeNotifier {
             key: savedNode.id,
             value: defaultNode.copyWith(enabled: savedNode.enabled));
       }
+
+      // check if a default node is the primary node for the crypto currency
+      // and update it if needed
+      final coin = coinFromPrettyName(defaultNode.coinName);
+      final primaryNode = getPrimaryNodeFor(coin: coin);
+      if (primaryNode != null && primaryNode.id == defaultNode.id) {
+        await setPrimaryNodeFor(
+          coin: coin,
+          node: defaultNode.copyWith(
+            enabled: primaryNode.enabled,
+          ),
+        );
+      }
     }
   }
 

lib/services/price.dart

@@ -78,12 +78,12 @@ class PriceAPI {
     }
 
     final externalCalls = Prefs.instance.externalCalls;
-    if (!Logger.isTestEnv && !externalCalls) {
+    if ((!Logger.isTestEnv && !externalCalls) ||
+        !(await Prefs.instance.isExternalCallsSet())) {
       Logging.instance.log("User does not want to use external calls",
           level: LogLevel.Info);
       return _cachedPrices;
     }
-
     Map<Coin, Tuple2<Decimal, double>> result = {};
     try {
       final uri = Uri.parse(
@@ -123,7 +123,8 @@ class PriceAPI {
 
   static Future<List<String>?> availableBaseCurrencies() async {
     final externalCalls = Prefs.instance.externalCalls;
-    if (!Logger.isTestEnv && !externalCalls) {
+    if ((!Logger.isTestEnv && !externalCalls) ||
+        !(await Prefs.instance.isExternalCallsSet())) {
       Logging.instance.log("User does not want to use external calls",
           level: LogLevel.Info);
       return null;

lib/utilities/constants.dart

@@ -36,7 +36,7 @@ abstract class Constants {
   // Enable Logger.print statements
   static const bool disableLogger = false;
 
-  static const int currentHiveDbVersion = 2;
+  static const int currentHiveDbVersion = 3;
 
   static List<int> possibleLengthsForCoin(Coin coin) {
     final List<int> values = [];

lib/utilities/db_version_migration.dart

@@ -143,6 +143,18 @@ class DbVersionMigrator {
 
         // try to continue migrating
         return await migrate(2);
+      case 2:
+        await Hive.openBox<dynamic>(DB.boxNamePrefs);
+        final prefs = Prefs.instance;
+        await prefs.init();
+        if (!(await prefs.isExternalCallsSet())) {
+          prefs.externalCalls = true;
+        }
+
+        // update version
+        await DB.instance.put<dynamic>(
+            boxName: DB.boxNameDBInfo, key: "hive_data_version", value: 3);
+        return await migrate(3);
 
       default:
         // finally return

lib/utilities/default_nodes.dart

@@ -70,28 +70,24 @@ abstract class DefaultNodes {
         isDown: false,
       );
 
-  // TODO: eventually enable ssl and set scheme to https
-  // currently get certificate failure
   static NodeModel get monero => NodeModel(
-        host: "http://monero.stackwallet.com",
+        host: "https://monero.stackwallet.com",
         port: 18081,
         name: defaultName,
         id: _nodeId(Coin.monero),
-        useSSL: false,
+        useSSL: true,
         enabled: true,
         coinName: Coin.monero.name,
         isFailover: true,
         isDown: false,
       );
 
-  // TODO: eventually enable ssl and set scheme to https
-  // currently get certificate failure
   static NodeModel get wownero => NodeModel(
-        host: "http://eu-west-2.wow.xmr.pm",
+        host: "https://wownero.stackwallet.com",
         port: 34568,
         name: defaultName,
         id: _nodeId(Coin.wownero),
-        useSSL: false,
+        useSSL: true,
         enabled: true,
         coinName: Coin.wownero.name,
         isFailover: true,

lib/utilities/enums/coin_enum.dart

@@ -181,25 +181,32 @@ Coin coinFromPrettyName(String name) {
     case "Bitcoin":
     case "bitcoin":
       return Coin.bitcoin;
+
     case "Bitcoincash":
     case "bitcoincash":
     case "Bitcoin Cash":
       return Coin.bitcoincash;
+
     case "Dogecoin":
     case "dogecoin":
       return Coin.dogecoin;
+
     case "Epic Cash":
     case "epicCash":
       return Coin.epicCash;
+
     case "Firo":
     case "firo":
       return Coin.firo;
+
     case "Monero":
     case "monero":
       return Coin.monero;
+
     case "Namecoin":
     case "namecoin":
       return Coin.namecoin;
+
     case "Bitcoin Testnet":
     case "tBitcoin":
     case "bitcoinTestNet":
@@ -208,19 +215,24 @@ Coin coinFromPrettyName(String name) {
     case "Bitcoincash Testnet":
     case "tBitcoin Cash":
     case "Bitcoin Cash Testnet":
+    case "bitcoincashTestnet":
       return Coin.bitcoincashTestnet;
+
     case "Firo Testnet":
     case "tFiro":
     case "firoTestNet":
       return Coin.firoTestNet;
+
     case "Dogecoin Testnet":
     case "tDogecoin":
     case "dogecoinTestNet":
       return Coin.dogecoinTestNet;
+
     case "Wownero":
     case "tWownero":
     case "wownero":
       return Coin.wownero;
+
     default:
       throw ArgumentError.value(
           name, "name", "No Coin enum value with that prettyName");

lib/utilities/prefs.dart

@@ -571,4 +571,13 @@ class Prefs extends ChangeNotifier {
             boxName: DB.boxNamePrefs, key: "externalCalls") as bool? ??
         true;
   }
+
+  Future<bool> isExternalCallsSet() async {
+    if (await DB.instance
+            .get<dynamic>(boxName: DB.boxNamePrefs, key: "externalCalls") ==
+        null) {
+      return false;
+    }
+    return true;
+  }
 }

lib/widgets/node_options_sheet.dart

@@ -306,10 +306,10 @@ class NodeOptionsSheet extends ConsumerWidget {
                         style: status == "Connected"
                             ? Theme.of(context)
                                 .extension<StackColors>()!
-                                .getPrimaryEnabledButtonColor(context)
+                                .getPrimaryDisabledButtonColor(context)
                             : Theme.of(context)
                                 .extension<StackColors>()!
-                                .getPrimaryDisabledButtonColor(context),
+                                .getPrimaryEnabledButtonColor(context),
                         onPressed: status == "Connected"
                             ? null
                             : () async {

pubspec.yaml

@@ -11,7 +11,7 @@ description: Stack Wallet
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 1.5.8+78
+version: 1.5.9+79
 
 environment:
   sdk: ">=2.17.0 <3.0.0"

test/price_test.dart

@@ -16,6 +16,9 @@ void main() {
   setUp(() async {
     await setUpTestHive();
     await Hive.openBox<dynamic>(DB.boxNamePriceCache);
+    await Hive.openBox<dynamic>(DB.boxNamePrefs);
+    await DB.instance.put<dynamic>(
+        boxName: DB.boxNamePrefs, key: "externalCalls", value: true);
   });
 
   test("getPricesAnd24hChange fetch", () async {

test/services/coins/bitcoincash/bitcoincash_wallet_test.dart

@@ -26,7 +26,7 @@ import 'bitcoincash_wallet_test_parameters.dart';
 void main() {
   group("bitcoincash constants", () {
     test("bitcoincash minimum confirmations", () async {
-      expect(MINIMUM_CONFIRMATIONS, 3);
+      expect(MINIMUM_CONFIRMATIONS, 1);
     });
     test("bitcoincash dust limit", () async {
       expect(DUST_LIMIT, 546);
@@ -831,18 +831,9 @@ void main() {
 
       await bch?.initializeNew();
       await bch?.initializeExisting();
-      expect(
+      expect(bch?.validateAddress(await bch!.currentReceivingAddress), true);
-          Address.validateAddress(
+      expect(bch?.validateAddress(await bch!.currentReceivingAddress), true);
-              await bch!.currentReceivingAddress, bitcoincashtestnet),
+      expect(bch?.validateAddress(await bch!.currentReceivingAddress), true);
-          true);
-      expect(
-          Address.validateAddress(
-              await bch!.currentReceivingAddress, bitcoincashtestnet),
-          true);
-      expect(
-          Address.validateAddress(
-              await bch!.currentReceivingAddress, bitcoincashtestnet),
-          true);
 
       verifyNever(client?.ping()).called(0);
       verify(client?.getServerFeatures()).called(1);
@@ -884,8 +875,7 @@ void main() {
       expect(addresses?.length, 2);
 
       for (int i = 0; i < 2; i++) {
-        expect(
+        expect(bch?.validateAddress(addresses![i]), true);
-            Address.validateAddress(addresses![i], bitcoincashtestnet), true);
       }
 
       verifyNever(client?.ping()).called(0);