Merge branch 'staging' into deskcam

cypherstack · Aug 27, 2024 · 66f29ab · 66f29ab
2 parents ce74f95 + be324a6
commit 66f29ab
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 18 deletions.
diff --git a/crypto_plugins/flutter_libmonero b/crypto_plugins/flutter_libmonero
diff --git a/...settings_views/global_settings_view/stack_backup_views/helpers/restore_create_backup.dart b/...settings_views/global_settings_view/stack_backup_views/helpers/restore_create_backup.dart
@@ -52,6 +52,8 @@ import '../../../../../wallets/isar/models/frost_wallet_info.dart';
 import '../../../../../wallets/isar/models/wallet_info.dart';
 import '../../../../../wallets/wallet/impl/bitcoin_frost_wallet.dart';
 import '../../../../../wallets/wallet/impl/epiccash_wallet.dart';
+import '../../../../../wallets/wallet/impl/monero_wallet.dart';
+import '../../../../../wallets/wallet/impl/wownero_wallet.dart';
 import '../../../../../wallets/wallet/wallet.dart';
 import '../../../../../wallets/wallet/wallet_mixin_interfaces/cw_based_interface.dart';
 import '../../../../../wallets/wallet/wallet_mixin_interfaces/mnemonic_interface.dart';
@@ -486,7 +488,13 @@ abstract class SWB {
         privateKey: privateKey,
       );
 
-      await wallet.init();
+      if (wallet is MoneroWallet /*|| wallet is WowneroWallet doesn't work.*/) {
+        await wallet.init(isRestore: true);
+      } else if (wallet is WowneroWallet) {
+        await wallet.init(isRestore: true);
+      } else {
+        await wallet.init();
+      }
 
       int restoreHeight = walletbackup['restoreHeight'] as int? ?? 0;
       if (restoreHeight <= 0) {

diff --git a/lib/utilities/test_monero_node_connection.dart b/lib/utilities/test_monero_node_connection.dart
@@ -150,7 +150,7 @@ Future<MoneroNodeConnectionResponse> testMoneroNodeConnection(
 
       final response = await request.close();
       final result = await response.transform(utf8.decoder).join();
-      print("HTTP Response: $result");
+      // print("HTTP Response: $result");
 
       final success =
           result.contains('"result":') && !result.contains('"error"');

diff --git a/lib/utilities/test_node_connection.dart b/lib/utilities/test_node_connection.dart
@@ -114,7 +114,7 @@ Future<bool> testNodeConnection({
         final url = formData.host!;
         final uri = Uri.tryParse(url);
         if (uri != null) {
-          if (!uri.hasScheme) {
+          if (!uri.hasScheme && !uri.host.endsWith(".onion")) {
             // try https first
             testPassed = await _xmrHelper(
               formData
@@ -136,16 +136,6 @@ Future<bool> testNodeConnection({
                 proxyInfo,
               );
             }
-          } else if (!uri.hasScheme && uri.host.endsWith(".onion")) {
-            // We can just test http for onion addresses.
-            testPassed = await _xmrHelper(
-              formData
-                ..host = url
-                ..useSSL = false,
-              context,
-              onSuccess,
-              proxyInfo,
-            );
           } else {
             testPassed = await _xmrHelper(
               formData

diff --git a/scripts/app_config/templates/windows/CMakeLists.txt b/scripts/app_config/templates/windows/CMakeLists.txt
@@ -92,17 +92,17 @@ install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../crypto_plugins/flutter_libmonero/s
 install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../crypto_plugins/flutter_libmonero/scripts/monero_c/release/wownero/x86_64-w64-mingw32_libwallet2_api_c.dll" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" RENAME "wownero_libwallet2_api_c.dll"
   COMPONENT Runtime)
 
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../crypto_plugins/flutter_libmonero/scripts/monero_c/release/wownero/x86_64-w64-mingw32_libgcc_s_seh-1.dll" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" RENAME "libgcc_s_seh-1.dll"
-  COMPONENT Runtime)
+#install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../crypto_plugins/flutter_libmonero/scripts/monero_c/release/wownero/x86_64-w64-mingw32_libgcc_s_seh-1.dll" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" RENAME "libgcc_s_seh-1.dll"
+#  COMPONENT Runtime)
 
 install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../crypto_plugins/flutter_libmonero/scripts/monero_c/release/wownero/x86_64-w64-mingw32_libpolyseed.dll" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" RENAME "libpolyseed.dll"
   COMPONENT Runtime)
 
 install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../crypto_plugins/flutter_libmonero/scripts/monero_c/release/wownero/x86_64-w64-mingw32_libssp-0.dll" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" RENAME "libssp-0.dll"
   COMPONENT Runtime)
 
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../crypto_plugins/flutter_libmonero/scripts/monero_c/release/wownero/x86_64-w64-mingw32_libstdc++-6.dll" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" RENAME "libstdc++-6.dll"
-  COMPONENT Runtime)
+#install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../crypto_plugins/flutter_libmonero/scripts/monero_c/release/wownero/x86_64-w64-mingw32_libstdc++-6.dll" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" RENAME "libstdc++-6.dll"
+#  COMPONENT Runtime)
 
 install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../crypto_plugins/flutter_libmonero/scripts/monero_c/release/wownero/x86_64-w64-mingw32_libwinpthread-1.dll" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" RENAME "libwinpthread-1.dll"
   COMPONENT Runtime)