Ecosystem/stack_wallet
1
0
Fork 0
mirror of https://github.com/cypherstack/stack_wallet.git synced 2024-11-18 02:07:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

update tor handling in fusion wallet interface

Browse source 
removed inaccurate comments ... Stack shouldn't use Tor unless useTor
This commit is contained in:
sneurlax 2023-09-15 16:02:25 -05:00
parent ea223ff7cd
commit 2dcb82f049
1 changed files with 23 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
lib/services/mixins/fusion_wallet_interface.dart
View file

@ -12,6 +12,7 @@ import 'package:stackwallet/models/isar/models/isar_models.dart';
import 'package:stackwallet/services/tor_service.dart'; import 'package:stackwallet/services/tor_service.dart';
import 'package:stackwallet/utilities/enums/coin_enum.dart'; import 'package:stackwallet/utilities/enums/coin_enum.dart';
import 'package:stackwallet/utilities/enums/derive_path_type_enum.dart'; import 'package:stackwallet/utilities/enums/derive_path_type_enum.dart';
import 'package:stackwallet/utilities/stack_file_system.dart';
const String kReservedFusionAddress = "reserved_fusion_address"; const String kReservedFusionAddress = "reserved_fusion_address";
@ -30,7 +31,12 @@ mixin FusionWalletInterface {
DerivePathType derivePathType, DerivePathType derivePathType,
) _generateAddressForChain; ) _generateAddressForChain;
void initFusionInterface({ /// Initializes the FusionWalletInterface mixin.
///
/// This function must be called before any other functions in this mixin.
///
/// Returns a `Future<void>` that resolves when Tor has been started.
Future<void> initFusionInterface({
required String walletId, required String walletId,
required Coin coin, required Coin coin,
required MainDB db, required MainDB db,
@ -39,27 +45,29 @@ mixin FusionWalletInterface {
int, int,
DerivePathType, DerivePathType,
) generateAddressForChain, ) generateAddressForChain,
}) { }) async {
// Set passed in wallet data.
_walletId = walletId; _walletId = walletId;
_coin = coin; _coin = coin;
_db = db; _db = db;
_generateAddressForChain = generateAddressForChain; _generateAddressForChain = generateAddressForChain;
_torService = TorService.sharedInstance; _torService = TorService.sharedInstance;
// Start the Tor service if it's not already running. // Try getting the proxy info.
// TODO fix this. It will cause all Stack Wallet traffic to start being routed //
// through Tor, which is not what we want. // Start the Tor service if it's not already running. Returns if Tor is already
if (_torService.proxyInfo.port == -1) { // connected or else after Tor returns from start().
// -1 indicates that the proxy is not running. try {
// Initialize the ffi lib instance if it hasn't already been set. _torService.getProxyInfo();
_torService.init(); // Proxy info successfully retrieved, Tor is connected.
return;
} catch (e) {
// Init the Tor service if it hasn't already been.
final torDir = await StackFileSystem.applicationTorDirectory();
_torService.init(torDataDirPath: torDir.path);
// Start the Tor service. // Start the Tor service.
// return await _torService.start();
// TODO should we await this? At this point I don't want to make this init function async.
// The risk would be that the Tor service is not started before the Fusion library tries to
// connect to it.
unawaited(_torService.start());
} }
} }
@ -181,7 +189,7 @@ mixin FusionWalletInterface {
// returning the proxy address. // returning the proxy address.
// Return the proxy address. // Return the proxy address.
return _torService.proxyInfo; return _torService.getProxyInfo();
} }
// Initial attempt for CashFusion integration goes here. // Initial attempt for CashFusion integration goes here.