Unify the Epic Cash and MWC wallets and slatepack UI

integration_test/wallet_creation/drivers/desktop_driver.dart

@@ -8,7 +8,7 @@ import 'package:stackwallet/pages_desktop_specific/my_stack_view/wallet_view/sub
 import 'package:stackwallet/pages_desktop_specific/password/create_password_view.dart';
 import 'package:stackwallet/pages_desktop_specific/password/desktop_login_view.dart';
 import 'package:stackwallet/wallets/wallet/wallet.dart';
-import 'package:stackwallet/widgets/mwc_txs_method_toggle.dart';
+import 'package:stackwallet/widgets/slatepack_method_toggle.dart';
 import 'package:stackwallet/widgets/toggle.dart';
 import 'package:stackwallet/widgets/wallet_card.dart';
 
@@ -92,16 +92,17 @@ class DesktopDriver extends PlatformDriver {
     );
     final receive = find.byType(DesktopReceive);
     await ui.waitFor(receive);
-    final mwcMode = find.descendant(
+    final slatepackMode = find.descendant(
       of: receive,
-      matching: find.byType(MwcTxsMethodToggle),
+      matching: find.byType(SlatepackMethodToggle),
     );
-    if (mwcMode.evaluate().isNotEmpty) {
+    if (slatepackMode.evaluate().isNotEmpty) {
       final toggle = ui.tester.widget<Toggle>(
-        find.descendant(of: mwcMode, matching: find.byType(Toggle)),
+        find.descendant(of: slatepackMode, matching: find.byType(Toggle)),
       );
       // MWC defaults to Slatepack, which does not display the MQS address.
-      if (!toggle.isOn) await ui.tap(mwcMode);
+      // Epic Cash defaults to epicbox, so this is a no-op there.
+      if (!toggle.isOn) await ui.tap(slatepackMode);
     }
     await selectPrimaryAddress(wallet, receive);
     final displayed = find.descendant(

integration_test/wallet_creation/seed_validators.dart

@@ -29,7 +29,7 @@ Future<void> verifyOpenNativeWallet(Wallet wallet, String expected) async {
   } else if (wallet is MimblewimblecoinWallet) {
     actual = (await wallet.thisWalletAddress(
       0,
-      await wallet.getMwcMqsConfig(),
+      await wallet.getRelayConfig(),
     )).value;
   } else if (wallet is LibXelisWallet) {
     wallet.checkInitialized();

lib/db/migrate_wallets_to_isar.dart

@@ -10,7 +10,7 @@ import '../wallets/crypto_currency/crypto_currency.dart';
 import '../wallets/isar/models/token_wallet_info.dart';
 import '../wallets/isar/models/wallet_info.dart';
 import '../wallets/isar/models/wallet_info_meta.dart';
-import '../wallets/wallet/supporting/epiccash_wallet_info_extension.dart';
+import '../wallets/wallet/supporting/mimblewimble_wallet_info_extension.dart';
 import 'hive/db.dart';
 import 'isar/main_db.dart';
 
@@ -53,10 +53,9 @@ Future<void> migrateWalletsToIsar({
   //
   // Get current ordered list of favourite wallet Ids
   //
-  final List<String> favourites =
-      (await DB.instance.hive.openBox<String>(
-        DB.boxNameFavoriteWallets,
-      )).values.toList();
+  final List<String> favourites = (await DB.instance.hive.openBox<String>(
+    DB.boxNameFavoriteWallets,
+  )).values.toList();
 
   final List<(WalletInfo, WalletInfoMeta)> newInfo = [];
   final List<TokenWalletInfo> tokenInfo = [];
@@ -71,11 +70,10 @@ Future<void> migrateWalletsToIsar({
     //
     // First handle transaction notes
     //
-    final newNoteCount =
-        await MainDB.instance.isar.transactionNotes
-            .where()
-            .walletIdEqualTo(old.walletId)
-            .count();
+    final newNoteCount = await MainDB.instance.isar.transactionNotes
+        .where()
+        .walletIdEqualTo(old.walletId)
+        .count();
     if (newNoteCount == 0) {
       final map = walletBox.get('notes') as Map?;
 
@@ -115,11 +113,10 @@ Future<void> migrateWalletsToIsar({
       otherData[WalletInfoKeys.tokenContractAddresses] = tokenContractAddresses;
 
       for (final address in tokenContractAddresses!) {
-        final contract =
-            await MainDB.instance.isar.ethContracts
-                .where()
-                .addressEqualTo(address)
-                .findFirst();
+        final contract = await MainDB.instance.isar.ethContracts
+            .where()
+            .addressEqualTo(address)
+            .findFirst();
         if (contract != null) {
           tokenInfo.add(
             TokenWalletInfo(
@@ -134,7 +131,7 @@ Future<void> migrateWalletsToIsar({
 
     // epiccash specifics
     if (old.coinIdentifier == Epiccash(CryptoCurrencyNetwork.main).identifier) {
-      final epicWalletInfo = ExtraEpiccashWalletInfo.fromMap({
+      final epicWalletInfo = ExtraMimblewimbleWalletInfo.fromMap({
         "receivingIndex": walletBox.get("receivingIndex") as int? ?? 0,
         "changeIndex": walletBox.get("changeIndex") as int? ?? 0,
         "slatesToAddresses": walletBox.get("slate_to_address") as Map? ?? {},
@@ -165,10 +162,9 @@ Future<void> migrateWalletsToIsar({
       coinName: old.coinIdentifier,
       walletId: old.walletId,
       name: old.name,
-      mainAddressType:
-          AppConfig.getCryptoCurrencyFor(
-            old.coinIdentifier,
-          )!.defaultAddressType,
+      mainAddressType: AppConfig.getCryptoCurrencyFor(
+        old.coinIdentifier,
+      )!.defaultAddressType,
       favouriteOrderIndex: favourites.indexOf(old.walletId),
       cachedChainHeight: walletBox.get(DBKeys.storedChainHeight) as int? ?? 0,
       cachedBalanceString: walletBox.get(DBKeys.cachedBalance) as String?,

lib/models/epicbox_config_model.dart

@@ -13,15 +13,12 @@ import 'dart:convert';
 import 'package:hive_ce/hive.dart';
 
 import 'epicbox_server_model.dart';
+import 'relay_config_model.dart';
 
 part 'type_adaptors/epicbox_config_model.g.dart';
 
 // @HiveType(typeId: 72)
-class EpicBoxConfigModel {
-  // @HiveField(1)
-  final String host;
-  // @HiveField(2)
-  final int? port;
+class EpicBoxConfigModel extends RelayConfigModel {
   // @HiveField(3)
   final bool? protocolInsecure;
   // @HiveField(4)
@@ -31,9 +28,9 @@ class EpicBoxConfigModel {
   // // @HiveField(6)
   // final String? name;
 
-  EpicBoxConfigModel({
-    required this.host,
-    this.port,
+  const EpicBoxConfigModel({
+    required super.host,
+    super.port,
     this.protocolInsecure,
     this.addressIndex,
     // this.id,
@@ -49,41 +46,27 @@ class EpicBoxConfigModel {
   }) {
     return EpicBoxConfigModel(
       host: host,
-      port: this.port ?? 443,
-      protocolInsecure: this.protocolInsecure ?? false,
-      addressIndex: this.addressIndex ?? 0,
+      port: port ?? this.port ?? 443,
+      protocolInsecure: protocolInsecure ?? this.protocolInsecure ?? false,
+      addressIndex: addressIndex ?? this.addressIndex ?? 0,
       // id: id ?? this.id,
       // name: name ?? this.name,
     );
   }
 
-  Map<String, dynamic> toMap() {
-    final Map<String, dynamic> map = {};
-    map['epicbox_domain'] = host;
-    map['epicbox_port'] = port;
-    map['epicbox_protocol_insecure'] = protocolInsecure;
-    map['epicbox_address_index'] = addressIndex;
-    // map['id'] = id;
-    // map['name'] = name;
-    return map;
-  }
-
+  @override
   Map<String, dynamic> toJson() {
-    return {
+    return <String, dynamic>{
       'epicbox_domain': host,
       'epicbox_port': port,
-      'epicbox_protocol_insecure': protocolInsecure,
+      // The plugin's EpicboxConfig field is spelled "unsecure".
+      'epicbox_protocol_unsecure': protocolInsecure,
       'epicbox_address_index': addressIndex,
       // 'id': id,
       // 'name': name,
     };
   }
 
-  @override
-  String toString() {
-    return json.encode(toJson());
-  }
-
   static EpicBoxConfigModel fromString(String epicBoxConfigString) {
     final dynamic _epicBox = json.decode(epicBoxConfigString);
 
@@ -96,22 +79,22 @@ class EpicBoxConfigModel {
     if (oldPort != "empty") {
       _epicBox['epicbox_port'] = _epicBox['port'];
     }
-    final oldProtocolInsecure = _epicBox["protocol_insecure"] ?? "empty";
-    if (oldProtocolInsecure != "empty") {
-      _epicBox['epicbox_protocol_insecure'] = _epicBox['protocol_insecure'];
-    }
+    // Configs saved before the key matched the plugin's use
+    // "epicbox_protocol_insecure", and older ones "protocol_insecure".
+    _epicBox['epicbox_protocol_unsecure'] ??=
+        _epicBox['epicbox_protocol_insecure'] ?? _epicBox['protocol_insecure'];
     final oldAddressIndex = _epicBox["address_index"] ?? "empty";
     if (oldAddressIndex != "empty") {
       _epicBox['epicbox_address_index'] = _epicBox['address_index'];
     }
 
-    _epicBox['epicbox_protocol_insecure'] ??= false;
+    _epicBox['epicbox_protocol_unsecure'] ??= false;
     _epicBox['epicbox_address_index'] ??= 0;
 
     return EpicBoxConfigModel(
       host: _epicBox['epicbox_domain'] as String,
       port: _epicBox['epicbox_port'] as int,
-      protocolInsecure: _epicBox['epicbox_protocol_insecure'] as bool,
+      protocolInsecure: _epicBox['epicbox_protocol_unsecure'] as bool,
       addressIndex: _epicBox['epicbox_address_index'] as int,
       // name: fields[5] as String,
       // id: fields[6] as String,