Wallets refactor

lib/db/isar/main_db.dart

@@ -592,7 +592,8 @@ class MainDB {
       });
       return ids;
     } catch (e) {
-      throw MainDBException("failed updateOrPutAddresses: $transactions", e);
+      throw MainDBException(
+          "failed updateOrPutTransactionV2s: $transactions", e);
     }
   }
 

lib/main.dart

@@ -317,13 +317,6 @@ class _MaterialAppWithThemeState extends ConsumerState<MaterialAppWithTheme>
       _desktopHasPassword =
           await ref.read(storageCryptoHandlerProvider).hasPassword();
     }
-
-    ref
-        .read(priceAnd24hChangeNotifierProvider)
-        .tokenContractAddressesToCheck
-        .addAll(
-          await MainDB.instance.getEthContracts().addressProperty().findAll(),
-        );
   }
 
   Future<void> load() async {

lib/pages/add_wallet_views/add_token_view/edit_wallet_tokens_view.dart

@@ -23,6 +23,7 @@ import 'package:stackwallet/pages/add_wallet_views/add_token_view/sub_widgets/ad
 import 'package:stackwallet/pages/add_wallet_views/add_token_view/sub_widgets/add_token_text.dart';
 import 'package:stackwallet/pages/home_view/home_view.dart';
 import 'package:stackwallet/pages_desktop_specific/desktop_home_view.dart';
+import 'package:stackwallet/providers/global/price_provider.dart';
 import 'package:stackwallet/providers/global/wallets_provider.dart';
 import 'package:stackwallet/themes/stack_colors.dart';
 import 'package:stackwallet/utilities/assets.dart';
@@ -151,6 +152,7 @@ class _EditWalletTokensViewState extends ConsumerState<EditWalletTokensView> {
 
     if (contract != null) {
       await MainDB.instance.putEthContract(contract);
+      unawaited(ref.read(priceAnd24hChangeNotifierProvider).updatePrice());
       if (mounted) {
         setState(() {
           if (tokenEntities
@@ -175,7 +177,8 @@ class _EditWalletTokensViewState extends ConsumerState<EditWalletTokensView> {
 
     if (contracts.isEmpty) {
       contracts.addAll(DefaultTokens.list);
-      MainDB.instance.putEthContracts(contracts);
+      MainDB.instance.putEthContracts(contracts).then(
+          (_) => ref.read(priceAnd24hChangeNotifierProvider).updatePrice());
     }
 
     tokenEntities.addAll(contracts.map((e) => AddTokenListElementData(e)));

lib/pages/add_wallet_views/add_wallet_view/add_wallet_view.dart

@@ -8,6 +8,7 @@
  *
  */
 
+import 'dart:async';
 import 'dart:io';
 
 import 'package:flutter/material.dart';
@@ -107,6 +108,7 @@ class _AddWalletViewState extends ConsumerState<AddWalletView> {
 
     if (contract != null) {
       await MainDB.instance.putEthContract(contract);
+      unawaited(ref.read(priceAnd24hChangeNotifierProvider).updatePrice());
       if (mounted) {
         setState(() {
           if (tokenEntities
@@ -143,7 +145,8 @@ class _AddWalletViewState extends ConsumerState<AddWalletView> {
 
     if (contracts.isEmpty) {
       contracts.addAll(DefaultTokens.list);
-      MainDB.instance.putEthContracts(contracts);
+      MainDB.instance.putEthContracts(contracts).then(
+          (value) => ref.read(priceAnd24hChangeNotifierProvider).updatePrice());
     }
 
     tokenEntities.addAll(contracts.map((e) => EthTokenEntity(e)));

lib/pages/pinpad_views/lock_screen_view.dart

@@ -27,6 +27,7 @@ import 'package:stackwallet/utilities/enums/coin_enum.dart';
 import 'package:stackwallet/utilities/flutter_secure_storage_interface.dart';
 import 'package:stackwallet/utilities/show_loading.dart';
 import 'package:stackwallet/utilities/text_styles.dart';
+import 'package:stackwallet/wallets/wallet/wallet_mixin_interfaces/cw_based_interface.dart';
 import 'package:stackwallet/widgets/background.dart';
 import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
 import 'package:stackwallet/widgets/custom_buttons/blue_text_button.dart';
@@ -98,14 +99,20 @@ class _LockscreenViewState extends ConsumerState<LockscreenView> {
         final walletId = widget.routeOnSuccessArguments as String;
 
         final wallet = ref.read(pWallets).getWallet(walletId);
-        if (wallet.info.coin == Coin.monero) {
-          await showLoading(
-            opaqueBG: true,
-            whileFuture: wallet.init(),
-            context: context,
-            message: "Loading ${wallet.info.coin.prettyName} wallet...",
-          );
+        final Future<void> loadFuture;
+        if (wallet is CwBasedInterface) {
+          loadFuture =
+              wallet.init().then((value) async => await (wallet).open());
+        } else {
+          loadFuture = wallet.init();
         }
+
+        await showLoading(
+          opaqueBG: true,
+          whileFuture: loadFuture,
+          context: context,
+          message: "Loading ${wallet.info.coin.prettyName} wallet...",
+        );
       }
 
       if (mounted) {

lib/pages/settings_views/global_settings_view/stack_backup_views/helpers/restore_create_backup.dart

@@ -42,7 +42,9 @@ import 'package:stackwallet/utilities/logger.dart';
 import 'package:stackwallet/utilities/prefs.dart';
 import 'package:stackwallet/utilities/util.dart';
 import 'package:stackwallet/wallets/isar/models/wallet_info.dart';
+import 'package:stackwallet/wallets/wallet/impl/epiccash_wallet.dart';
 import 'package:stackwallet/wallets/wallet/wallet.dart';
+import 'package:stackwallet/wallets/wallet/wallet_mixin_interfaces/cw_based_interface.dart';
 import 'package:stackwallet/wallets/wallet/wallet_mixin_interfaces/mnemonic_interface.dart';
 import 'package:stackwallet/wallets/wallet/wallet_mixin_interfaces/private_key_interface.dart';
 import 'package:tuple/tuple.dart';
@@ -368,7 +370,7 @@ abstract class SWB {
     return backupJson;
   }
 
-  static Future<bool> asyncRestore(
+  static Future<bool> _asyncRestore(
     Tuple2<dynamic, WalletInfo> tuple,
     Prefs prefs,
     NodeService nodeService,
@@ -422,6 +424,12 @@ abstract class SWB {
         restoreHeight = walletbackup['storedChainHeight'] as int? ?? 0;
       }
 
+      Future<void>? restoringFuture;
+
+      if (!(wallet is CwBasedInterface || wallet is EpiccashWallet)) {
+        restoringFuture = wallet.recover(isRescan: false);
+      }
+
       uiState?.update(
         walletId: info.walletId,
         restoringStatus: StackRestoringStatus.restoring,
@@ -466,6 +474,8 @@ abstract class SWB {
         return false;
       }
 
+      await restoringFuture;
+
       Logging.instance.log(
           "SWB restored: ${info.walletId} ${info.name} ${info.coin.prettyName}",
           level: LogLevel.Info);
@@ -690,13 +700,34 @@ abstract class SWB {
       // TODO: use these for monero and possibly other coins later on?
       // final List<String> txidList = List<String>.from(walletbackup['txidList'] as List? ?? []);
 
+      Map<String, dynamic>? otherData;
+      try {
+        if (walletbackup["otherDataJsonString"] is String) {
+          final data =
+              jsonDecode(walletbackup["otherDataJsonString"] as String);
+          otherData = Map<String, dynamic>.from(data as Map);
+        }
+      } catch (e, s) {
+        Logging.instance.log(
+          "SWB restore walletinfo otherdata error: $e\n$s",
+          level: LogLevel.Error,
+        );
+      }
+
+      if (coin == Coin.firo) {
+        otherData ??= {};
+        // swb will do a restore so this flag should be set to false so another
+        // rescan/restore isn't done when opening the wallet
+        otherData[WalletInfoKeys.lelantusCoinIsarRescanRequired] = false;
+      }
+
       final info = WalletInfo(
         coinName: coin.name,
         walletId: walletId,
         name: walletName,
         mainAddressType: coin.primaryAddressType,
         restoreHeight: walletbackup['restoreHeight'] as int? ?? 0,
-        otherDataJsonString: walletbackup["otherDataJsonString"] as String?,
+        otherDataJsonString: otherData == null ? null : jsonEncode(otherData),
         cachedChainHeight: walletbackup['storedChainHeight'] as int? ?? 0,
       );
 
@@ -757,7 +788,7 @@ abstract class SWB {
       )) {
         return false;
       }
-      final bools = await asyncRestore(
+      final bools = await _asyncRestore(
         tuple,
         _prefs,
         nodeService,
@@ -796,10 +827,10 @@ abstract class SWB {
     }
 
     Logging.instance.log("done with SWB restore", level: LogLevel.Warning);
-    if (Util.isDesktop) {
-      await Wallets.sharedInstance
-          .loadAfterStackRestore(_prefs, uiState?.wallets ?? []);
-    }
+
+    await Wallets.sharedInstance
+        .loadAfterStackRestore(_prefs, uiState?.wallets ?? [], Util.isDesktop);
+
     return true;
   }
 

lib/pages/settings_views/global_settings_view/stack_backup_views/sub_views/stack_restore_progress_view.dart

@@ -216,9 +216,9 @@ class _StackRestoreProgressViewState
 
   void _addWalletsToHomeView() {
     ref.read(pWallets).loadAfterStackRestore(
-          ref.read(prefsChangeNotifierProvider),
-          ref.read(stackRestoringUIStateProvider).wallets,
-        );
+        ref.read(prefsChangeNotifierProvider),
+        ref.read(stackRestoringUIStateProvider).wallets,
+        Util.isDesktop);
   }
 
   @override

lib/pages/wallet_view/transaction_views/tx_v2/transaction_v2_card.dart

@@ -104,7 +104,7 @@ class _TransactionCardStateV2 extends ConsumerState<TransactionCardV2> {
 
     final price = ref
         .watch(priceAnd24hChangeNotifierProvider.select((value) => isTokenTx
-            ? value.getTokenPrice(_transaction.otherData!)
+            ? value.getTokenPrice(tokenContract!.address)
             : value.getPrice(coin)))
         .item1;
 

lib/pages/wallets_view/sub_widgets/favorite_card.dart

@@ -115,17 +115,21 @@ class _FavoriteCardState extends ConsumerState<FavoriteCard> {
       child: GestureDetector(
         onTap: () async {
           final wallet = ref.read(pWallets).getWallet(walletId);
-          await wallet.init();
+
+          final Future<void> loadFuture;
           if (wallet is CwBasedInterface) {
-            if (mounted) {
-              await showLoading(
-                whileFuture: wallet.open(),
-                context: context,
-                message: 'Opening ${wallet.info.name}',
-                isDesktop: Util.isDesktop,
-              );
-            }
+            loadFuture =
+                wallet.init().then((value) async => await (wallet).open());
+          } else {
+            loadFuture = wallet.init();
           }
+          await showLoading(
+            whileFuture: loadFuture,
+            context: context,
+            message: 'Opening ${wallet.info.name}',
+            isDesktop: Util.isDesktop,
+          );
+
           if (mounted) {
             if (Util.isDesktop) {
               await Navigator.of(context).pushNamed(

lib/pages/wallets_view/sub_widgets/wallet_list_item.dart

@@ -40,7 +40,7 @@ class WalletListItem extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    debugPrint("BUILD: $runtimeType");
+    // debugPrint("BUILD: $runtimeType");
     final walletCountString =
         walletCount == 1 ? "$walletCount wallet" : "$walletCount wallets";
     final currency = ref
@@ -63,17 +63,19 @@ class WalletListItem extends ConsumerWidget {
                 .read(pWallets)
                 .wallets
                 .firstWhere((e) => e.info.coin == coin);
-            await wallet.init();
+            final Future<void> loadFuture;
             if (wallet is CwBasedInterface) {
-              if (context.mounted) {
-                await showLoading(
-                  whileFuture: wallet.open(),
-                  context: context,
-                  message: 'Opening ${wallet.info.name}',
-                  isDesktop: Util.isDesktop,
-                );
-              }
+              loadFuture =
+                  wallet.init().then((value) async => await (wallet).open());
+            } else {
+              loadFuture = wallet.init();
             }
+            await showLoading(
+              whileFuture: loadFuture,
+              context: context,
+              message: 'Opening ${wallet.info.name}',
+              isDesktop: Util.isDesktop,
+            );
             if (context.mounted) {
               unawaited(
                 Navigator.of(context).pushNamed(

lib/pages_desktop_specific/my_stack_view/coin_wallets_table.dart

@@ -80,17 +80,20 @@ class CoinWalletsTable extends ConsumerWidget {
 
                             final wallet =
                                 ref.read(pWallets).getWallet(walletIds[i]);
-                            await wallet.init();
+                            final Future<void> loadFuture;
                             if (wallet is CwBasedInterface) {
-                              if (context.mounted) {
-                                await showLoading(
-                                  whileFuture: wallet.open(),
-                                  context: context,
-                                  message: 'Opening ${wallet.info.name}',
-                                  isDesktop: Util.isDesktop,
-                                );
-                              }
+                              loadFuture = wallet
+                                  .init()
+                                  .then((value) async => await (wallet).open());
+                            } else {
+                              loadFuture = wallet.init();
                             }
+                            await showLoading(
+                              whileFuture: loadFuture,
+                              context: context,
+                              message: 'Opening ${wallet.info.name}',
+                              isDesktop: Util.isDesktop,
+                            );
 
                             if (context.mounted) {
                               await Navigator.of(context).pushNamed(

lib/services/price_service.dart

@@ -12,15 +12,19 @@ import 'dart:async';
 
 import 'package:decimal/decimal.dart';
 import 'package:flutter/foundation.dart';
-import 'package:http/http.dart';
+import 'package:isar/isar.dart';
+import 'package:stackwallet/db/isar/main_db.dart';
+import 'package:stackwallet/models/isar/models/isar_models.dart';
 import 'package:stackwallet/networking/http.dart';
 import 'package:stackwallet/services/price.dart';
 import 'package:stackwallet/utilities/enums/coin_enum.dart';
 import 'package:tuple/tuple.dart';
 
 class PriceService extends ChangeNotifier {
   late final String baseTicker;
-  final Set<String> tokenContractAddressesToCheck = {};
+  Future<Set<String>> get tokenContractAddressesToCheck async =>
+      (await MainDB.instance.getEthContracts().addressProperty().findAll())
+          .toSet();
   final Duration updateInterval = const Duration(seconds: 60);
 
   Timer? _timer;
@@ -52,9 +56,11 @@ class PriceService extends ChangeNotifier {
       }
     }
 
-    if (tokenContractAddressesToCheck.isNotEmpty) {
+    final _tokenContractAddressesToCheck = await tokenContractAddressesToCheck;
+
+    if (_tokenContractAddressesToCheck.isNotEmpty) {
       final tokenPriceMap = await _priceAPI.getPricesAnd24hChangeForEthTokens(
-        contractAddresses: tokenContractAddressesToCheck,
+        contractAddresses: _tokenContractAddressesToCheck,
         baseCurrency: baseTicker,
       );