xmr/wow wallet restore init fixes

lib/pages/add_wallet_views/restore_wallet_view/restore_wallet_view.dart

@@ -52,6 +52,8 @@ import 'package:stackwallet/utilities/text_styles.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/impl/monero_wallet.dart';
+import 'package:stackwallet/wallets/wallet/impl/wownero_wallet.dart';
 import 'package:stackwallet/wallets/wallet/supporting/epiccash_wallet_info_extension.dart';
 import 'package:stackwallet/wallets/wallet/wallet.dart';
 import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
@@ -314,10 +316,22 @@ class _RestoreWalletViewState extends ConsumerState<RestoreWalletView> {
             mnemonic: mnemonic,
           );
 
-          if (wallet is EpiccashWallet) {
+          // TODO: extract interface with isRestore param
-            await wallet.init(isRestore: true);
+          switch (wallet.runtimeType) {
-          } else {
+            case EpiccashWallet:
-            await wallet.init();
+              await (wallet as EpiccashWallet).init(isRestore: true);
+              break;
+
+            case MoneroWallet:
+              await (wallet as MoneroWallet).init(isRestore: true);
+              break;
+
+            case WowneroWallet:
+              await (wallet as WowneroWallet).init(isRestore: true);
+              break;
+
+            default:
+              await wallet.init();
           }
 
           await wallet.recover(isRescan: false);

lib/wallets/wallet/impl/monero_wallet.dart

@@ -247,26 +247,26 @@ class MoneroWallet extends CryptonoteWallet with CwBasedInterface {
   }
 
   @override
-  Future<void> init() async {
+  Future<void> init({bool? isRestore}) async {
     cwWalletService = xmr_dart.monero
         .createMoneroWalletService(DB.instance.moneroWalletInfoBox);
 
-    if (!(await cwWalletService!.isWalletExit(walletId))) {
+    if (!(await cwWalletService!.isWalletExit(walletId)) && isRestore != true) {
       WalletInfo walletInfo;
       WalletCredentials credentials;
       try {
-        String name = walletId;
         final dirPath =
-            await pathForWalletDir(name: name, type: WalletType.monero);
+            await pathForWalletDir(name: walletId, type: WalletType.monero);
-        final path = await pathForWallet(name: name, type: WalletType.monero);
+        final path =
+            await pathForWallet(name: walletId, type: WalletType.monero);
         credentials = xmr_dart.monero.createMoneroNewWalletCredentials(
-          name: name,
+          name: walletId,
           language: "English",
         );
 
         walletInfo = WalletInfo.external(
-          id: WalletBase.idFor(name, WalletType.monero),
+          id: WalletBase.idFor(walletId, WalletType.monero),
-          name: name,
+          name: walletId,
           type: WalletType.monero,
           isRecovery: false,
           restoreHeight: credentials.height ?? 0,
@@ -332,7 +332,7 @@ class MoneroWallet extends CryptonoteWallet with CwBasedInterface {
 
         var restoreHeight = cwWalletBase?.walletInfo.restoreHeight;
         highestPercentCached = 0;
-        await cwWalletBase?.rescan(height: restoreHeight);
+        await cwWalletBase?.rescan(height: restoreHeight ?? 0);
       });
       unawaited(refresh());
       return;

lib/wallets/wallet/impl/wownero_wallet.dart

@@ -246,27 +246,27 @@ class WowneroWallet extends CryptonoteWallet with CwBasedInterface {
   }
 
   @override
-  Future<void> init() async {
+  Future<void> init({bool? isRestore}) async {
     cwWalletService = wow_dart.wownero
         .createWowneroWalletService(DB.instance.moneroWalletInfoBox);
 
-    if (!(await cwWalletService!.isWalletExit(walletId))) {
+    if (!(await cwWalletService!.isWalletExit(walletId)) && isRestore != true) {
       WalletInfo walletInfo;
       WalletCredentials credentials;
       try {
-        String name = walletId;
         final dirPath =
-            await pathForWalletDir(name: name, type: WalletType.wownero);
+            await pathForWalletDir(name: walletId, type: WalletType.wownero);
-        final path = await pathForWallet(name: name, type: WalletType.wownero);
+        final path =
+            await pathForWallet(name: walletId, type: WalletType.wownero);
         credentials = wow_dart.wownero.createWowneroNewWalletCredentials(
-          name: name,
+          name: walletId,
           language: "English",
           seedWordsLength: 14,
         );
 
         walletInfo = WalletInfo.external(
-          id: WalletBase.idFor(name, WalletType.wownero),
+          id: WalletBase.idFor(walletId, WalletType.wownero),
-          name: name,
+          name: walletId,
           type: WalletType.wownero,
           isRecovery: false,
           restoreHeight: credentials.height ?? 0,
@@ -373,7 +373,7 @@ class WowneroWallet extends CryptonoteWallet with CwBasedInterface {
 
         var restoreHeight = cwWalletBase?.walletInfo.restoreHeight;
         highestPercentCached = 0;
-        await cwWalletBase?.rescan(height: restoreHeight);
+        await cwWalletBase?.rescan(height: restoreHeight ?? 0);
       });
       unawaited(refresh());
       return;

lib/wallets/wallet/wallet.dart

@@ -148,7 +148,31 @@ abstract class Wallet<T extends CryptoCurrency> {
     if (wallet is MnemonicInterface) {
       if (wallet is CryptonoteWallet) {
         // currently a special case due to the xmr/wow libraries handling their
-        // own mnemonic generation
+        // own mnemonic generation on new wallet creation
+        // if its a restore we must set them
+        if (mnemonic != null) {
+          if ((await secureStorageInterface.read(
+                key: mnemonicKey(walletId: walletInfo.walletId),
+              )) ==
+              null) {
+            await secureStorageInterface.write(
+              key: mnemonicKey(walletId: walletInfo.walletId),
+              value: mnemonic,
+            );
+          }
+
+          if (mnemonicPassphrase != null) {
+            if ((await secureStorageInterface.read(
+                  key: mnemonicPassphraseKey(walletId: walletInfo.walletId),
+                )) ==
+                null) {
+              await secureStorageInterface.write(
+                key: mnemonicPassphraseKey(walletId: walletInfo.walletId),
+                value: mnemonicPassphrase,
+              );
+            }
+          }
+        }
       } else {
         await secureStorageInterface.write(
           key: mnemonicKey(walletId: walletInfo.walletId),