prevent opening of already opened xmr/wow/sal wallets

Author: julian-CStack

lib/wallets/wallet/intermediate/lib_monero_wallet.dart

@@ -35,7 +35,8 @@ import '../../../utilities/enums/fee_rate_type_enum.dart';
 import '../../../utilities/logger.dart';
 import '../../../utilities/stack_file_system.dart';
 import '../../../wl_gen/interfaces/cs_monero_interface.dart';
-import '../../../wl_gen/interfaces/cs_salvium_interface.dart';
+import '../../../wl_gen/interfaces/cs_salvium_interface.dart'
+    show WrappedWallet;
 import '../../crypto_currency/intermediate/cryptonote_currency.dart';
 import '../../isar/models/wallet_info.dart';
 import '../../models/tx_data.dart';
@@ -368,10 +369,14 @@ abstract class LibMoneroWallet<T extends CryptonoteCurrency>
           key: Wallet.mnemonicPassphraseKey(walletId: walletId),
           value: "",
         );
+
+        this.wallet = wallet;
+        await updateNode();
+        await csMonero.close(wallet, save: true);
+        this.wallet = null;
       } catch (e, s) {
         Logging.instance.f("", error: e, stackTrace: s);
       }
-      await updateNode();
     }
 
     return super.init();

lib/wallets/wallet/intermediate/lib_salvium_wallet.dart

@@ -32,7 +32,8 @@ import '../../../utilities/amount/amount.dart';
 import '../../../utilities/enums/fee_rate_type_enum.dart';
 import '../../../utilities/logger.dart';
 import '../../../utilities/stack_file_system.dart';
-import '../../../wl_gen/interfaces/cs_monero_interface.dart';
+import '../../../wl_gen/interfaces/cs_monero_interface.dart'
+    show CsWalletListener, CsOutput, CsRecipient, CsPendingTransaction;
 import '../../../wl_gen/interfaces/cs_salvium_interface.dart';
 import '../../crypto_currency/intermediate/cryptonote_currency.dart';
 import '../../isar/models/wallet_info.dart';
@@ -349,10 +350,14 @@ abstract class LibSalviumWallet<T extends CryptonoteCurrency>
           key: Wallet.mnemonicPassphraseKey(walletId: walletId),
           value: "",
         );
+
+        this.wallet = wallet;
+        await updateNode();
+        await csSalvium.close(wallet, save: true);
+        this.wallet = null;
       } catch (e, s) {
         Logging.instance.f("", error: e, stackTrace: s);
       }
-      await updateNode();
     }
 
     return super.init();

lib/wallets/wallet/intermediate/lib_wownero_wallet.dart

@@ -34,8 +34,10 @@ import '../../../utilities/amount/amount.dart';
 import '../../../utilities/enums/fee_rate_type_enum.dart';
 import '../../../utilities/logger.dart';
 import '../../../utilities/stack_file_system.dart';
-import '../../../wl_gen/interfaces/cs_monero_interface.dart';
-import '../../../wl_gen/interfaces/cs_salvium_interface.dart';
+import '../../../wl_gen/interfaces/cs_monero_interface.dart'
+    show CsWalletListener, CsOutput, CsRecipient, CsPendingTransaction;
+import '../../../wl_gen/interfaces/cs_salvium_interface.dart'
+    show WrappedWallet;
 import '../../../wl_gen/interfaces/cs_wownero_interface.dart';
 import '../../crypto_currency/intermediate/cryptonote_currency.dart';
 import '../../isar/models/wallet_info.dart';
@@ -372,10 +374,14 @@ abstract class LibWowneroWallet<T extends CryptonoteCurrency>
           key: Wallet.mnemonicPassphraseKey(walletId: walletId),
           value: "",
         );
+
+        this.wallet = wallet;
+        await updateNode();
+        await csWownero.close(wallet, save: true);
+        this.wallet = null;
       } catch (e, s) {
         Logging.instance.f("", error: e, stackTrace: s);
       }
-      await updateNode();
     }
 
     return super.init();

lib/wl_gen/interfaces/cs_monero_interface.dart

@@ -155,6 +155,8 @@ abstract class CsMoneroInterface {
   bool validateAddress(String address, int network);
 
   String getSeed(WrappedWallet wallet);
+
+  Future<void> close(WrappedWallet wallet, {bool save = false});
 }
 
 // forwarding class

lib/wl_gen/interfaces/cs_salvium_interface.dart

@@ -169,6 +169,8 @@ abstract class CsSalviumInterface {
   bool validateAddress(String address, int network);
 
   String getSeed(WrappedWallet wallet);
+
+  Future<void> close(WrappedWallet wallet, {bool save = false});
 }
 
 // lol...

lib/wl_gen/interfaces/cs_wownero_interface.dart

@@ -156,4 +156,6 @@ abstract class CsWowneroInterface {
   bool validateAddress(String address, int network);
 
   String getSeed(WrappedWallet wallet);
+
+  Future<void> close(WrappedWallet wallet, {bool save = false});
 }

tool/wl_templates/SAL_cs_salvium_interface_impl.template.dart

@@ -555,6 +555,10 @@ class _CsSalviumInterfaceImpl extends CsSalviumInterface {
 
   @override
   String getSeed(WrappedWallet wallet) => wallet.actual.getSeed();
+
+  @override
+  Future<void> close(WrappedWallet wallet, {bool save = false}) =>
+      wallet.actual.close(save: save);
 }
 
 //END_ON

tool/wl_templates/WOW_cs_wownero_interface_impl.template.dart

@@ -505,6 +505,10 @@ class _CsWowneroInterfaceImpl extends CsWowneroInterface {
   @override
   String getSeed(WrappedWallet wallet) =>
       wallet.get<lib_wownero.Wallet>().getSeed();
+
+  @override
+  Future<void> close(WrappedWallet wallet, {bool save = false}) =>
+      wallet.get<lib_wownero.Wallet>().close(save: save);
 }
 
 //END_ON

tool/wl_templates/XMR_cs_monero_interface_impl.template.dart

@@ -498,6 +498,10 @@ class _CsMoneroInterfaceImpl extends CsMoneroInterface {
   @override
   String getSeed(WrappedWallet wallet) =>
       wallet.get<lib_monero.Wallet>().getSeed();
+
+  @override
+  Future<void> close(WrappedWallet wallet, {bool save = false}) =>
+      wallet.get<lib_monero.Wallet>().close(save: save);
 }
 
 //END_ON