Merge branch 'main' of https://github.com/cake-tech/cake_wallet into …

…linux_monero_dart
cake-tech · Aug 6, 2024 · 6fcafde · 6fcafde
2 parents d754773 + 5e944a8
commit 6fcafde
Show file tree

Hide file tree

Showing 12 changed files with 181 additions and 16 deletions.
diff --git a/.github/workflows/pr_test_build_android.yml b/.github/workflows/pr_test_build_android.yml
@@ -41,7 +41,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v1
         with:
-          java-version: "11.x"
+          java-version: "17.x"
       - name: Configure placeholder git details
         run: |
           git config --global user.email "[email protected]"

diff --git a/assets/litecoin_electrum_server_list.yml b/assets/litecoin_electrum_server_list.yml
@@ -1,4 +1,19 @@
 -
   uri: ltc-electrum.cakewallet.com:50002
   useSSL: true
-  isDefault: true
+  isDefault: true
+-
+  uri: litecoin.stackwallet.com:20063
+  useSSL: true
+-
+  uri: electrum-ltc.bysh.me:50002
+  useSSL: true
+-
+  uri: lightweight.fiatfaucet.com:50002
+  useSSL: true
+-
+  uri: electrum.ltc.xurious.com:50002
+  useSSL: true
+-
+  uri: backup.electrum-ltc.org:443
+  useSSL: true
diff --git a/cw_core/lib/wallet_service.dart b/cw_core/lib/wallet_service.dart
@@ -1,6 +1,8 @@
+import 'dart:convert';
 import 'dart:io';
 
 import 'package:cw_core/pathForWallet.dart';
+import 'package:cw_core/utils/file.dart';
 import 'package:cw_core/wallet_base.dart';
 import 'package:cw_core/wallet_credentials.dart';
 import 'package:cw_core/wallet_type.dart';
@@ -42,4 +44,21 @@ abstract class WalletService<N extends WalletCredentials, RFS extends WalletCred
       await File(walletDirPath).copy(backupWalletDirPath);
     }
   }
+
+  Future<String> getSeeds(String name, String password, WalletType type) async {
+    try {
+      final path = await pathForWallet(name: name, type: type);
+      final jsonSource = await read(path: path, password: password);
+      try {
+        final data = json.decode(jsonSource) as Map;
+        return data['mnemonic'] as String? ?? '';
+      } catch (_) {
+        // if not a valid json
+        return jsonSource.substring(0, 200);
+      }
+    } catch (_) {
+      // if the file couldn't be opened or read
+      return '';
+    }
+  }
 }
diff --git a/cw_monero/lib/api/transaction_history.dart b/cw_monero/lib/api/transaction_history.dart
@@ -110,7 +110,10 @@ Future<PendingTransactionDescription> createTransactionSync(
   })();
 
   if (error != null) {
-    final message = error;
+    String message = error;
+    if (message.contains("RPC error")) {
+      message = "Invalid node response, please try again or switch node\n\ntrace: $message";
+    }
     throw CreationTransactionException(message: message);
   }
 

diff --git a/cw_monero/lib/monero_wallet.dart b/cw_monero/lib/monero_wallet.dart
@@ -21,7 +21,6 @@ import 'package:cw_core/transaction_priority.dart';
 import 'package:cw_core/unspent_coins_info.dart';
 import 'package:cw_core/wallet_base.dart';
 import 'package:cw_core/wallet_info.dart';
-import 'package:cw_monero/api/account_list.dart';
 import 'package:cw_monero/api/coins_info.dart';
 import 'package:cw_monero/api/monero_output.dart';
 import 'package:cw_monero/api/structs/pending_transaction.dart';

diff --git a/cw_monero/lib/monero_wallet_service.dart b/cw_monero/lib/monero_wallet_service.dart
@@ -58,8 +58,11 @@ class MoneroRestoreWalletFromKeysCredentials extends WalletCredentials {
   final String spendKey;
 }
 
-class MoneroWalletService extends WalletService<MoneroNewWalletCredentials,
-    MoneroRestoreWalletFromSeedCredentials, MoneroRestoreWalletFromKeysCredentials, MoneroNewWalletCredentials> {
+class MoneroWalletService extends WalletService<
+    MoneroNewWalletCredentials,
+    MoneroRestoreWalletFromSeedCredentials,
+    MoneroRestoreWalletFromKeysCredentials,
+    MoneroNewWalletCredentials> {
   MoneroWalletService(this.walletInfoSource, this.unspentCoinsInfoSource);
 
   final Box<WalletInfo> walletInfoSource;
@@ -190,11 +193,8 @@ class MoneroWalletService extends WalletService<MoneroNewWalletCredentials,
       final wmaddr = wmPtr.address;
       final waddr = openedWalletsByPath["$path/$wallet"]!.address;
       // await Isolate.run(() {
-        monero.WalletManager_closeWallet(
-            Pointer.fromAddress(wmaddr),
-            Pointer.fromAddress(waddr),
-            false
-        );
+      monero.WalletManager_closeWallet(
+          Pointer.fromAddress(wmaddr), Pointer.fromAddress(waddr), false);
       // });
       openedWalletsByPath.remove("$path/$wallet");
       print("wallet closed");
@@ -261,7 +261,8 @@ class MoneroWalletService extends WalletService<MoneroNewWalletCredentials,
 
   @override
   Future<MoneroWallet> restoreFromHardwareWallet(MoneroNewWalletCredentials credentials) {
-    throw UnimplementedError("Restoring a Monero wallet from a hardware wallet is not yet supported!");
+    throw UnimplementedError(
+        "Restoring a Monero wallet from a hardware wallet is not yet supported!");
   }
 
   @override
@@ -369,4 +370,24 @@ class MoneroWalletService extends WalletService<MoneroNewWalletCredentials,
       print(e.toString());
     }
   }
+
+  @override
+  Future<String> getSeeds(String name, String password, WalletType type) async {
+    try {
+      final path = await pathForWallet(name: name, type: getType());
+
+      if (walletFilesExist(path)) {
+        await repairOldAndroidWallet(name);
+      }
+
+      await monero_wallet_manager.openWalletAsync({'path': path, 'password': password});
+      final walletInfo = walletInfoSource.values
+          .firstWhere((info) => info.id == WalletBase.idFor(name, getType()));
+      final wallet = MoneroWallet(walletInfo: walletInfo, unspentCoinsInfo: unspentCoinsInfoSource);
+      return wallet.seed;
+    } catch (_) {
+      // if the file couldn't be opened or read
+      return '';
+    }
+  }
 }
diff --git a/lib/core/wallet_loading_service.dart b/lib/core/wallet_loading_service.dart
@@ -1,6 +1,9 @@
+import 'dart:async';
+
 import 'package:cake_wallet/core/generate_wallet_password.dart';
 import 'package:cake_wallet/core/key_service.dart';
 import 'package:cake_wallet/entities/preferences_key.dart';
+import 'package:cake_wallet/reactions/on_authentication_state_change.dart';
 import 'package:cake_wallet/utils/exception_handler.dart';
 import 'package:cw_core/cake_hive.dart';
 import 'package:cw_core/wallet_base.dart';
@@ -53,6 +56,12 @@ class WalletLoadingService {
     } catch (error, stack) {
       ExceptionHandler.onError(FlutterErrorDetails(exception: error, stack: stack));
 
+      // try fetching the seeds of the corrupted wallet to show it to the user
+      String corruptedWalletsSeeds = "Corrupted wallets seeds (if retrievable, empty otherwise):";
+      try {
+        corruptedWalletsSeeds += await _getCorruptedWalletSeeds(name, type);
+      } catch (_) {}
+
       // try opening another wallet that is not corrupted to give user access to the app
       final walletInfoSource = await CakeHive.openBox<WalletInfo>(WalletInfo.boxName);
 
@@ -70,12 +79,23 @@ class WalletLoadingService {
           await sharedPreferences.setInt(
               PreferencesKey.currentWalletType, serializeToInt(wallet.type));
 
+          // if found a wallet that is not corrupted, then still display the seeds of the corrupted ones
+          authenticatedErrorStreamController.add(corruptedWalletsSeeds);
+
           return wallet;
-        } catch (_) {}
+        } catch (_) {
+          // save seeds and show corrupted wallets' seeds to the user
+          try {
+            final seeds = await _getCorruptedWalletSeeds(walletInfo.name, walletInfo.type);
+            if (!corruptedWalletsSeeds.contains(seeds)) {
+              corruptedWalletsSeeds += seeds;
+            }
+          } catch (_) {}
+        }
       }
 
       // if all user's wallets are corrupted throw exception
-      throw error;
+      throw error.toString() + "\n\n" + corruptedWalletsSeeds;
     }
   }
 
@@ -97,4 +117,11 @@ class WalletLoadingService {
     isPasswordUpdated = true;
     await sharedPreferences.setBool(key, isPasswordUpdated);
   }
+
+  Future<String> _getCorruptedWalletSeeds(String name, WalletType type) async {
+    final walletService = walletServiceFactory.call(type);
+    final password = await keyService.getWalletPassword(walletName: name);
+
+    return "\n\n$type ($name): ${await walletService.getSeeds(name, password, type)}";
+  }
 }
diff --git a/lib/di.dart b/lib/di.dart
@@ -1,3 +1,5 @@
+import 'dart:async' show Timer;
+
 import 'package:cake_wallet/.secrets.g.dart' as secrets;
 import 'package:cake_wallet/anonpay/anonpay_api.dart';
 import 'package:cake_wallet/anonpay/anonpay_info_base.dart';
@@ -550,6 +552,7 @@ Future<void> setup({
 
         if (loginError != null) {
           authPageState.changeProcessText('ERROR: ${loginError.toString()}');
+          loginError = null;
         }
 
         ReactionDisposer? _reaction;
@@ -561,6 +564,17 @@ Future<void> setup({
             linkViewModel.handleLink();
           }
         });
+
+        Timer.periodic(Duration(seconds: 1), (timer) {
+          if (timer.tick > 30) {
+            timer.cancel();
+          }
+
+          if (loginError != null) {
+            authPageState.changeProcessText('ERROR: ${loginError.toString()}');
+            timer.cancel();
+          }
+        });
       }
     });
   });

diff --git a/lib/reactions/on_authentication_state_change.dart b/lib/reactions/on_authentication_state_change.dart
@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/utils/exception_handler.dart';
 import 'package:cake_wallet/store/settings_store.dart';
@@ -9,9 +11,16 @@ import 'package:cake_wallet/store/authentication_store.dart';
 ReactionDisposer? _onAuthenticationStateChange;
 
 dynamic loginError;
+StreamController<dynamic> authenticatedErrorStreamController = StreamController<dynamic>();
 
 void startAuthenticationStateChange(
     AuthenticationStore authenticationStore, GlobalKey<NavigatorState> navigatorKey) {
+  authenticatedErrorStreamController.stream.listen((event) {
+    if (authenticationStore.state == AuthenticationState.allowed) {
+      ExceptionHandler.showError(event.toString(), delayInSeconds: 3);
+    }
+  });
+
   _onAuthenticationStateChange ??= autorun((_) async {
     final state = authenticationStore.state;
 
@@ -27,6 +36,11 @@ void startAuthenticationStateChange(
 
     if (state == AuthenticationState.allowed) {
       await navigatorKey.currentState!.pushNamedAndRemoveUntil(Routes.dashboard, (route) => false);
+      if (!(await authenticatedErrorStreamController.stream.isEmpty)) {
+        ExceptionHandler.showError(
+            (await authenticatedErrorStreamController.stream.first).toString());
+        authenticatedErrorStreamController.stream.drain();
+      }
       return;
     }
   });

diff --git a/lib/src/screens/monero_accounts/monero_account_edit_or_create_page.dart b/lib/src/screens/monero_accounts/monero_account_edit_or_create_page.dart
@@ -51,7 +51,9 @@ class MoneroAccountEditOrCreatePage extends BasePage {
 
                           await moneroAccountCreationViewModel.save();
 
-                          Navigator.of(context).pop(_textController.text);
+                          if (context.mounted) {
+                            Navigator.of(context).pop(_textController.text);
+                          }
                         },
                         text: moneroAccountCreationViewModel.isEdit
                             ? S.of(context).rename

diff --git a/lib/utils/exception_handler.dart b/lib/utils/exception_handler.dart
@@ -4,11 +4,13 @@ import 'package:cake_wallet/entities/preferences_key.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/main.dart';
 import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
+import 'package:cake_wallet/utils/show_bar.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:cw_core/root_dir.dart';
 import 'package:device_info_plus/device_info_plus.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_mailer/flutter_mailer.dart';
 import 'package:cake_wallet/utils/package_info.dart';
 import 'package:shared_preferences/shared_preferences.dart';
@@ -254,4 +256,53 @@ class ExceptionHandler {
       'productName': data.productName,
     };
   }
+
+  static void showError(String error, {int? delayInSeconds}) async {
+    if (_hasError) {
+      return;
+    }
+    _hasError = true;
+
+    if (delayInSeconds != null) {
+      Future.delayed(Duration(seconds: delayInSeconds), () => _showCopyPopup(error));
+      return;
+    }
+
+    WidgetsBinding.instance.addPostFrameCallback(
+      (_) async => _showCopyPopup(error),
+    );
+  }
+
+  static Future<void> _showCopyPopup(String content) async {
+    if (navigatorKey.currentContext != null) {
+      final shouldCopy = await showPopUp<bool?>(
+        context: navigatorKey.currentContext!,
+        builder: (context) {
+          return AlertWithTwoActions(
+            isDividerExist: true,
+            alertTitle: S.of(context).error,
+            alertContent: content,
+            rightButtonText: S.of(context).copy,
+            leftButtonText: S.of(context).close,
+            actionRightButton: () {
+              Navigator.of(context).pop(true);
+            },
+            actionLeftButton: () {
+              Navigator.of(context).pop();
+            },
+          );
+        },
+      );
+
+      if (shouldCopy == true) {
+        await Clipboard.setData(ClipboardData(text: content));
+        await showBar<void>(
+          navigatorKey.currentContext!,
+          S.of(navigatorKey.currentContext!).copied_to_clipboard,
+        );
+      }
+    }
+
+    _hasError = false;
+  }
 }
diff --git a/pubspec_base.yaml b/pubspec_base.yaml
@@ -65,7 +65,7 @@ dependencies:
       url: https://github.com/cake-tech/device_display_brightness.git
       ref: master
   workmanager: ^0.5.1
-  wakelock_plus: ^1.1.3
+  wakelock_plus: ^1.2.5
   flutter_mailer: ^2.0.2
   device_info_plus: ^9.1.0
   base32: 2.1.3