fix(api): ServicesResponse is now being cached and doesn't fetch data everytime DashboardViewModel is being rebuilt

fix(tor): do not fallback to clearnet when tor failed.
fix(tor): do not leak connections during app startup
chore: refactor bootstrap() function to be separated into bootstrapOffline and bootstrapOnline

Author: MrCyjaneK

cw_core/lib/utils/proxy_wrapper.dart

@@ -1,6 +1,7 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
+import 'package:cw_core/utils/print_verbose.dart';
 import 'package:cw_core/utils/proxy_socket/abstract.dart';
 import 'package:socks5_proxy/socks_client.dart';
 import 'package:tor/tor.dart';
@@ -29,6 +30,8 @@ class ProxyWrapper {
             password: null,
           ),
       ]);
+    } else {
+      printV("+++++++ TOR NOT STARTED");
     }
 
     return client;
@@ -124,16 +127,20 @@ class ProxyWrapper {
     if (torEnabled) {
       try {
         torClient = await getProxyHttpClient(portOverride: portOverride);
-      } catch (_) {}
+      } catch (_) {
+        rethrow;
+      }
 
       if (onionUri != null) {
         try {
           return await makeGet(
-            client: torClient!,
+            client: torClient,
             uri: onionUri,
             headers: headers,
           );
-        } catch (_) {}
+        } catch (_) {
+          rethrow;
+        }
       }
 
       if (clearnetUri != null) {
@@ -143,7 +150,9 @@ class ProxyWrapper {
             uri: clearnetUri,
             headers: headers,
           );
-        } catch (_) {}
+        } catch (_) {
+          rethrow;
+        }
       }
     }
 
@@ -157,7 +166,7 @@ class ProxyWrapper {
               headers: headers,
             );
           },
-          createHttpClient: NullOverrides().createHttpClient,
+          // createHttpClient: NullOverrides().createHttpClient,
         );
       } catch (_) {
         // we weren't able to get a response:
@@ -190,31 +199,37 @@ class ProxyWrapper {
     if (torEnabled) {
       try {
         torClient = await getProxyHttpClient(portOverride: portOverride);
-      } catch (_) {}
+      } catch (_) {
+        rethrow;
+      }
       if (allowMitmMoneroBypassSSLCheck) {
-        torClient!.badCertificateCallback =
+        torClient.badCertificateCallback =
             ((X509Certificate cert, String host, int port) => true);
       }
       if (onionUri != null) {
         try {
           return await makePost(
-            client: torClient!,
+            client: torClient,
             uri: onionUri,
             headers: headers,
             body: body,
           );
-        } catch (_) {}
+        } catch (_) {
+          rethrow;
+        }
       }
 
       if (clearnetUri != null) {
         try {
           return await makePost(
-            client: torClient!,
+            client: torClient,
             uri: clearnetUri,
             headers: headers,
             body: body,
           );
-        } catch (_) {}
+        } catch (_) {
+          rethrow;
+        }
       }
     }
 
@@ -229,10 +244,9 @@ class ProxyWrapper {
               body: body,
             );
           },
-          createHttpClient: NullOverrides().createHttpClient,
+          // createHttpClient: NullOverrides().createHttpClient,
         );
       } catch (_) {
-        // we weren't able to get a response:
         rethrow;
       }
     }
@@ -263,7 +277,9 @@ class ProxyWrapper {
             headers: headers,
             body: body,
           );
-        } catch (_) {}
+        } catch (_) {
+          rethrow;
+        }
       }
 
       if (clearnetUri != null) {
@@ -274,7 +290,9 @@ class ProxyWrapper {
             headers: headers,
             body: body,
           );
-        } catch (_) {}
+        } catch (_) {
+          rethrow;
+        }
       }
     }
 
@@ -289,7 +307,7 @@ class ProxyWrapper {
               body: body,
             );
           },
-          createHttpClient: NullOverrides().createHttpClient,
+          // createHttpClient: NullOverrides().createHttpClient,
         );
       } catch (_) {
         // we weren't able to get a response:

lib/core/fiat_conversion_service.dart

@@ -2,17 +2,13 @@ import 'package:cw_core/utils/proxy_wrapper.dart';
 import 'package:cw_core/crypto_currency.dart';
 import 'package:cake_wallet/entities/fiat_currency.dart';
 import 'dart:convert';
-import 'package:flutter/foundation.dart';
 import 'package:cake_wallet/.secrets.g.dart' as secrets;
 
 const _fiatApiClearNetAuthority = 'fiat-api.cakewallet.com';
 const _fiatApiOnionAuthority = 'n4z7bdcmwk2oyddxvzaap3x2peqcplh3pzdy7tpkk5ejz5n4mhfvoxqd.onion';
 const _fiatApiPath = '/v2/rates';
 
-Future<double> _fetchPrice(Map<String, dynamic> args) async {
-  final crypto = args['crypto'] as String;
-  final fiat = args['fiat'] as String;
-  final torOnly = args['torOnly'] as bool;
+Future<double> _fetchPrice(String crypto, String fiat, bool torOnly) async {
 
   final Map<String, String> queryParams = {
     'interval_count': '1',
@@ -24,15 +20,12 @@ Future<double> _fetchPrice(Map<String, dynamic> args) async {
   num price = 0.0;
 
   try {
-    late final Uri uri;
-    if (torOnly) {
-      uri = Uri.http(_fiatApiOnionAuthority, _fiatApiPath, queryParams);
-    } else {
-      uri = Uri.https(_fiatApiClearNetAuthority, _fiatApiPath, queryParams);
-    }
+    final onionUri = Uri.http(_fiatApiOnionAuthority, _fiatApiPath, queryParams);
+    final clearnetUri = Uri.https(_fiatApiClearNetAuthority, _fiatApiPath, queryParams);
 
     final response = await ProxyWrapper().get(
-      clearnetUri: uri,
+      onionUri: onionUri,
+      clearnetUri: torOnly ? onionUri : clearnetUri,
     );
     final responseString = await response.transform(utf8.decoder).join();
 
@@ -53,18 +46,11 @@ Future<double> _fetchPrice(Map<String, dynamic> args) async {
   }
 }
 
-Future<double> _fetchPriceAsync(CryptoCurrency crypto, FiatCurrency fiat, bool torOnly) async =>
-    compute(_fetchPrice, {
-      'fiat': fiat.toString(),
-      'crypto': crypto.toString(),
-      'torOnly': torOnly,
-    });
-
 class FiatConversionService {
   static Future<double> fetchPrice({
     required CryptoCurrency crypto,
     required FiatCurrency fiat,
     required bool torOnly,
   }) async =>
-      await _fetchPriceAsync(crypto, fiat, torOnly);
+      await _fetchPrice(crypto.toString(), fiat.toString(), torOnly);
 }

lib/main.dart

@@ -25,6 +25,7 @@ import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/src/screens/root/root.dart';
 import 'package:cake_wallet/store/app_store.dart';
 import 'package:cake_wallet/store/authentication_store.dart';
+import 'package:cake_wallet/store/settings_store.dart';
 import 'package:cake_wallet/themes/theme_base.dart';
 import 'package:cake_wallet/utils/device_info.dart';
 import 'package:cake_wallet/utils/exception_handler.dart';
@@ -278,7 +279,11 @@ Future<void> initialSetup(
     navigatorKey: navigatorKey,
     secureStorage: secureStorage,
   );
-  await bootstrap(navigatorKey, loadWallet: loadWallet);
+  await bootstrapOffline();
+  final settingsStore = getIt<SettingsStore>();
+  if (!settingsStore.currentBuiltinTor) {
+    bootstrapOnline(navigatorKey, loadWallet: loadWallet);
+  }
 }
 
 class App extends StatefulWidget {

lib/reactions/bootstrap.dart

@@ -15,24 +15,29 @@ import 'package:cake_wallet/store/settings_store.dart';
 import 'package:cake_wallet/store/authentication_store.dart';
 import 'package:cake_wallet/store/dashboard/fiat_conversion_store.dart';
 
-Future<void> bootstrap(GlobalKey<NavigatorState> navigatorKey, {required bool loadWallet}) async {
-  final appStore = getIt.get<AppStore>();
+Future<void> bootstrapOffline() async {
   final authenticationStore = getIt.get<AuthenticationStore>();
-  final settingsStore = getIt.get<SettingsStore>();
-  final fiatConversionStore = getIt.get<FiatConversionStore>();
 
   final currentWalletName =
       getIt.get<SharedPreferences>().getString(PreferencesKey.currentWalletName);
   if (currentWalletName != null) {
     authenticationStore.installed();
   }
+}
+
+void bootstrapOnline(GlobalKey<NavigatorState> navigatorKey, {required bool loadWallet}) {
+  final appStore = getIt.get<AppStore>();
+  final authenticationStore = getIt.get<AuthenticationStore>();
+  final settingsStore = getIt.get<SettingsStore>();
+  final fiatConversionStore = getIt.get<FiatConversionStore>();
 
   if (loadWallet) {
     startAuthenticationStateChange(authenticationStore, navigatorKey);
   }
+
   startCurrentWalletChangeReaction(appStore, settingsStore, fiatConversionStore);
   startCurrentFiatChangeReaction(appStore, settingsStore, fiatConversionStore);
   startCurrentFiatApiModeChangeReaction(appStore, settingsStore, fiatConversionStore);
   startOnCurrentNodeChangeReaction(appStore);
   startFiatRateUpdate(appStore, settingsStore, fiatConversionStore);
-}
+}

lib/utils/tor.dart

@@ -41,8 +41,12 @@ Future<void> ensureTorStarted({required BuildContext? context}) async {
   // second start is fast but populates the values on current thread
   await CakeTor.instance.start();
   printV("Tor started");
+  while (!CakeTor.instance.started) {
+    printV("Waiting for tor to start (part 1)");
+    await Future.delayed(const Duration(seconds: 1));
+  }
   while (CakeTor.instance.port == -1) {
-    printV("Waiting for tor to start");
+    printV("Waiting for tor to start (listening on port)");
     await Future.delayed(const Duration(seconds: 1));
   }
   printV("Tor started on port ${CakeTor.instance.port}");

lib/view_model/dashboard/dashboard_view_model.dart

@@ -1075,7 +1075,17 @@ abstract class DashboardViewModelBase with Store {
     }
   }
 
+  static ServicesResponse? cachedServicesResponse; 
+
   Future<ServicesResponse> getServicesStatus() async {
+    if (cachedServicesResponse != null) {
+      return cachedServicesResponse!;
+    }
+    cachedServicesResponse = await _getServicesStatus();
+    return cachedServicesResponse!;
+  }
+
+  Future<ServicesResponse> _getServicesStatus() async {
     try {
       if (isEnabledBulletinAction) {
         final uri = Uri.https(

lib/view_model/start_tor_view_model.dart

@@ -1,10 +1,13 @@
 import 'dart:async';
 
 import 'package:cake_wallet/di.dart';
+import 'package:cake_wallet/main.dart';
+import 'package:cake_wallet/reactions/bootstrap.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/store/app_store.dart';
 import 'package:cake_wallet/store/settings_store.dart';
 import 'package:cake_wallet/utils/tor.dart';
+import 'package:cw_core/utils/proxy_wrapper.dart';
 import 'package:flutter/material.dart';
 import 'package:mobx/mobx.dart';
 
@@ -54,8 +57,15 @@ abstract class StartTorViewModelBase with Store {
       return;
     }
     await ensureTorStarted(context: null);
+    while (true) {
+      await Future.delayed(Duration(milliseconds: 250));
+      if (CakeTor.instance.port != -1 && CakeTor.instance.started) {
+        break;
+      }
+    }
     didStartTor = true;
     final appStore = getIt.get<AppStore>();
+    bootstrapOnline(navigatorKey, loadWallet: true);
     appStore.wallet?.connectToNode(node: appStore.settingsStore.getCurrentNode(appStore.wallet!.type));
     Navigator.pushReplacementNamed(context, Routes.login);
   }

pubspec_base.yaml

@@ -100,7 +100,10 @@ dependencies:
 #    git:
 #      url: https://github.com/cake-tech/tor.git
 #      ref: main
-  socks5_proxy: any
+  socks5_proxy:
+    git:
+      url: https://github.com/LacticWhale/socks_dart.git
+      ref: 27ad7c2efae8d7460325c74b90f660085cbd0685
   flutter_svg: ^2.0.9
   polyseed: ^0.0.7
   nostr_tools:
@@ -178,8 +181,8 @@ dependency_overrides:
       ref: c2e341d8038f1108690ad6f80f7b4b7156aacc76
   socks5_proxy:
     git:
-      url: https://github.com/cake-tech/socks_dart.git
-      ref: d304fcfcc97cb7212bcd347aeb5d96792c128ff3
+      url: https://github.com/LacticWhale/socks_dart.git
+      ref: 27ad7c2efae8d7460325c74b90f660085cbd0685
 
 flutter_icons:
   image_path: "assets/images/app_logo.png"