fix: use tor, display showLoading and use primary node

Author: detherminal

lib/pages/add_wallet_views/add_wallet_view/add_wallet_view.dart

@@ -32,9 +32,11 @@ import '../../../utilities/barcode_scanner_interface.dart';
 import '../../../utilities/constants.dart';
 import '../../../utilities/default_eth_tokens.dart';
 import '../../../utilities/logger.dart';
+import '../../../utilities/show_loading.dart';
 import '../../../utilities/text_styles.dart';
 import '../../../utilities/util.dart';
 import '../../../wallets/crypto_currency/crypto_currency.dart';
+import '../../../wallets/wallet/wallet.dart';
 import '../../../widgets/background.dart';
 import '../../../widgets/custom_buttons/app_bar_icon_button.dart';
 import '../../../widgets/desktop/desktop_app_bar.dart';
@@ -139,50 +141,21 @@ class _AddWalletViewState extends ConsumerState<AddWalletView> {
 
       if (results != null) {
         if (mounted) {
-          unawaited(showModalBottomSheet<dynamic>(
-            backgroundColor: Colors.transparent,
+          final Wallet<CryptoCurrency>? wallet = await showLoading(
+            whileFuture: results.coin.importPaperWallet(results, ref),
             context: context,
-            shape: const RoundedRectangleBorder(
-              borderRadius: BorderRadius.vertical(top: Radius.circular(20)),
-            ),
-            builder: (_) {
-              return Container(
-                  decoration: BoxDecoration(
-                    color: Theme.of(context).extension<StackColors>()!.popupBG,
-                    borderRadius: const BorderRadius.vertical(
-                      top: Radius.circular(20),
-                    ),
-                  ),
-                  child: Padding(
-                      padding: const EdgeInsets.all(20),
-                      child: Column(
-                        mainAxisSize: MainAxisSize.min,
-                        crossAxisAlignment: CrossAxisAlignment.center,
-                        children: [
-                          const CircularProgressIndicator(),
-                          const SizedBox(
-                            height: 16,
-                          ),
-                          Text(
-                            "Importing ${results.coin.prettyName} Paper Wallet",
-                            style: STextStyles.field(context).copyWith(
-                              fontSize: 16,
-                              height: 1.5,
-                            ),
-                            textAlign: TextAlign.center,
-                          ),
-                        ],
-                      )
-                  ),
-              );
-            },
-          ));
-          final wallet = await results.coin.importPaperWallet(results, ref);
+            message: "Importing paper wallet...",
+          );
+          if (wallet == null) {
+            throw Exception(
+              "Failed to import paper wallet because wallet from importPaperWallet is null: ${results.coin.prettyName}",
+            );
+          }
           if (mounted) {
             Navigator.pop(context);
             await Navigator.of(context).pushNamed(
               WalletView.routeName,
-              arguments: wallet.walletId,
+              arguments: wallet!.walletId,
             );
           }
         }

lib/wallets/crypto_currency/coins/monero.dart

@@ -1,30 +1,30 @@
 import 'dart:io';
 
-import 'package:compat/old_cw_core/wallet_type.dart';
-import 'package:cs_monero/cs_monero.dart' as cs_monero;
 import 'package:cs_monero/src/ffi_bindings/monero_wallet_bindings.dart'
     as xmr_wallet_ffi;
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:http/io_client.dart';
 import 'package:monero_rpc/monero_rpc.dart';
+import 'package:socks5_proxy/socks.dart';
 
-import '../../../models/isar/models/isar_models.dart';
 import '../../../models/node_model.dart';
 import '../../../providers/db/main_db_provider.dart';
 import '../../../providers/global/node_service_provider.dart';
 import '../../../providers/global/prefs_provider.dart';
 import '../../../providers/global/secure_store_provider.dart';
 import '../../../providers/global/wallets_provider.dart';
+import '../../../services/event_bus/events/global/tor_connection_status_changed_event.dart';
 import '../../../services/node_service.dart';
+import '../../../services/tor_service.dart';
 import '../../../utilities/address_utils.dart';
 import '../../../utilities/default_nodes.dart';
 import '../../../utilities/enums/derive_path_type_enum.dart';
 import '../../../utilities/enums/fee_rate_type_enum.dart';
+import '../../../utilities/logger.dart';
+import '../../../utilities/prefs.dart';
 import '../../isar/models/wallet_info.dart';
-import '../../isar/providers/wallet_info_provider.dart';
 import '../../models/tx_data.dart';
 import '../../wallet/impl/monero_wallet.dart';
-import '../../wallet/intermediate/lib_monero_wallet.dart';
 import '../../wallet/wallet.dart';
 import '../crypto_currency.dart';
 import '../intermediate/cryptonote_currency.dart';
@@ -147,6 +147,7 @@ class Monero extends CryptonoteCurrency {
   @override
   Future<Wallet<CryptoCurrency>> importPaperWallet(WalletUriData walletData, WidgetRef ref) async {
     if (walletData.txids != null) {
+      // If the walletData contains txids, we need to create a temporary wallet to sweep the gift wallet
       final wallet = await Wallet.create(
         walletInfo: WalletInfo.createNew(
           coin: walletData.coin,
@@ -164,10 +165,31 @@ class Monero extends CryptonoteCurrency {
       await (wallet as MoneroWallet).init(isRestore: true);
       await wallet.recover(isRescan: false);
 
-      // Scan the blocks with given txids
-      final primaryNode = defaultNode;
+      final primaryNode = NodeService(secureStorageInterface: ref.read(secureStoreProvider))
+          .getPrimaryNodeFor(currency: walletData.coin) ?? defaultNode;
+
+      // Create an HTTP client with Tor support if enabled
+      final torService = TorService.sharedInstance;
+      final prefs = Prefs.instance;
+      final httpClient = HttpClient();
+      if (prefs.useTor) {
+        if (torService.status != TorConnectionStatus.connected) {
+          if (prefs.torKillSwitch) {
+            throw Exception("Tor is not connected, and the kill switch is enabled. Can't sweep gift wallet");
+          } else {
+            // If Tor is not connected, we can still proceed with the request
+            Logging.instance.w("Tor is not connected, proceeding without Tor.");
+          }
+        } else {
+          SocksTCPClient.assignToHttpClient(httpClient, [ProxySettings(torService.getProxyInfo().host, torService.getProxyInfo().port)]);
+        }
+      }
+
+      // Create a DaemonRpc instance to interact with the Monero node
       final daemonRpc = DaemonRpc(
-          IOClient(HttpClient()), "${primaryNode.host}:${primaryNode.port}");
+          IOClient(httpClient), "${primaryNode.host}:${primaryNode.port}");
+
+      // Scan the blocks with given txids
       final txs = await daemonRpc.postToEndpoint("/get_transactions", {
         "txs_hashes": walletData.txids,
         "decode_as_json": true,