Merge pull request #1494 from cypherstack/pr1479/eth-transport-controls
What changed, and why it matters
This update improves privacy and security in Stack Wallet by making network image downloads and Ethereum/Stellar node connections respect the user's Tor setting. Previously, Ethereum could not route through Tor and several image loaders always used the regular internet, potentially exposing user activity. The patch also enables Tor by default for the Fact0rn coin's built-in node and lets users choose Tor/clearnet/both for Ethereum nodes. It is a defensive privacy fix rather than a remote exploit.
Review the new TorAwareNetworkImage implementation for proxyInfo null-safety and error handling; verify that Ethereum node Tor/clearnet options are persisted and honored consistently; ensure the Fact0rn migration only touches unmodified default nodes as intended; consider auditing remaining direct HTTP calls for similar Tor bypasses.
Security signals we found
Previously clearnet-only image fetches now route through Tor when enabled, reducing IP/metadata leakage
Ethereum and Stellar RPC connections can now be proxied over Tor SOCKS5
ShopInBit attachment URLs no longer embed auth tokens/customer keys in query strings, moving credentials to headers
Fact0rn default node migrated to Tor-enabled with clearnet fallback
Node Tor/clearnet mismatch now throws NodeTorMismatchConfigException instead of silently falling back
Evidence from the diff
The commit introduces TorAwareNetworkImage/TorAwareSvgNetworkImage wrappers that route image fetches through the app’s HTTP/Tor proxy when Tor is enabled, replacing direct Image.network/SvgPicture.network calls across UI surfaces (token icons, exchange logos, CakePay/ShopInBit images, theme previews). It adds SOCKS5 proxy support to web3dart via IOClient+SocksTCPClient for Ethereum and Stellar test connections, exposes Tor/clearnet/both radio options for Ethereum in the node editor, sets Ethereum.torSupport=true, Nano.torSupport=true, and Fact0rn.torSupport=true, and migrates existing unmodified Fact0rn default nodes to torEnabled=true. A ShopInBit attachment change switches from query-auth URLs to header auth to keep tokens/customer keys out of logged URLs. Tests cover proxy routing, cache scoping, and migration behavior.
Changed components
lib/networking/tor_aware_network_image.dartlib/wallets/wallet/impl/ethereum_wallet.dartlib/utilities/test_eth_node_connection.dartlib/utilities/test_stellar_node_connection.dartlib/pages/settings_views/global_settings_view/manage_nodes_views/add_edit_node_view.dartlib/services/shopinbit/src/client.dartlib/db/db_version_migration.dartlib/wallets/crypto_currency/coins/ethereum.dartlib/wallets/crypto_currency/coins/fact0rn.dartlib/wallets/crypto_currency/intermediate/nano_currency.dartInspect captured patch +917 / −361
### lib/db/db_version_migration.dart
@@ -25,6 +25,7 @@ import '../services/wallets_service.dart';
import '../utilities/amount/amount.dart';
import '../utilities/constants.dart';
import '../utilities/default_eth_tokens.dart';
+import '../utilities/default_nodes.dart';
import '../utilities/flutter_secure_storage_interface.dart';
import '../utilities/logger.dart';
import '../utilities/prefs.dart';
@@ -423,6 +424,16 @@ class DbVersionMigrator with WalletDB {
);
return await migrate(17, secureStore: secureStore);
+ case 17:
+ await _v17();
+
+ await DB.instance.put<dynamic>(
+ boxName: DB.boxNameDBInfo,
+ key: "hive_data_version",
+ value: 18,
+ );
+ return await migrate(18, secureStore: secureStore);
+
default:
// finally return
return;
@@ -711,4 +722,37 @@ class DbVersionMigrator with WalletDB {
await primariesBox.deleteFromDisk();
}
+
+ Future<void> _v17() async {
+ final nodesBox = await DB.instance.hive.openBox<NodeModel>(
+ DB.boxNameNodeModels,
+ );
+ final id = DefaultNodes.buildId(Fact0rn(CryptoCurrencyNetwork.main));
+ final node = nodesBox.get(id);
+
+ // The Fact0rn default node used to ship clearnet only. Only touch a node
+ // that still matches everything the user could have edited on it, so a
+ // customised node keeps its settings.
+ final untouched =
+ node != null &&
+ node.host == "electrumx2.projectfactor.io" &&
+ node.port == 50002 &&
+ node.name == DefaultNodes.defaultName &&
+ node.useSSL &&
+ node.isFailover &&
+ node.loginName == null &&
+ !node.torEnabled &&
+ node.clearnetEnabled;
+
+ if (untouched) {
+ await nodesBox.put(
+ id,
+ node.copyWith(
+ loginName: node.loginName,
+ trusted: node.trusted,
+ torEnabled: true,
+ ),
+ );
+ }
+ }
}
### lib/networking/tor_aware_network_image.dart
@@ -0,0 +1,138 @@
+import 'dart:async';
+import 'dart:convert';
+import 'dart:ui' as ui;
+
+import 'package:flutter/foundation.dart';
+import 'package:flutter/widgets.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+
+import '../app_config.dart';
+import '../services/tor_service.dart';
+import '../utilities/prefs.dart';
+import 'http.dart';
+
+/// Fetches [url] through the app's [HTTP] client, routing over Tor when it is
+/// enabled. Throws if Tor is enabled but not connected, so nothing falls back
+/// to clearnet.
+Future<Uint8List> fetchTorAwareBytes(
+ String url, {
+ Map<String, String>? headers,
+}) async {
+ final response = await const HTTP().get(
+ url: Uri.parse(url),
+ headers: headers,
+ proxyInfo: !AppConfig.hasFeature(AppFeature.tor)
+ ? null
+ : Prefs.instance.useTor
+ ? TorService.sharedInstance.getProxyInfo()
+ : null,
+ );
+
+ if (response.code != 200) {
+ throw Exception("Failed to load $url: status=${response.code}");
+ }
+
+ return Uint8List.fromList(response.bodyBytes);
+}
+
+/// Drop-in replacement for [NetworkImage] that respects the Tor preference.
+/// Use with [Image] instead of [Image.network], which always goes clearnet.
+@immutable
+class TorAwareNetworkImage extends ImageProvider<TorAwareNetworkImage> {
+ const TorAwareNetworkImage(this.url, {this.headers, this.cacheScope});
+
+ final String url;
+
+ /// Sent with the request but not part of the cache key, so e.g. a refreshed
+ /// auth token doesn't cause a refetch.
+ final Map<String, String>? headers;
+
+ /// Part of the cache key, unlike [headers]. Set it to a stable identity
+ /// (e.g. a customer key) when the same [url] can serve different content
+ /// depending on who is asking, so one identity never sees another's image.
+ final String? cacheScope;
+
+ @override
+ Future<TorAwareNetworkImage> obtainKey(ImageConfiguration configuration) =>
+ SynchronousFuture<TorAwareNetworkImage>(this);
+
+ @override
+ ImageStreamCompleter loadImage(
+ TorAwareNetworkImage key,
+ ImageDecoderCallback decode,
+ ) {
+ final chunkEvents = StreamController<ImageChunkEvent>();
+ return MultiFrameImageStreamCompleter(
+ codec: _load(key, decode, chunkEvents),
+ chunkEvents: chunkEvents.stream,
+ scale: 1.0,
+ debugLabel: key.url,
+ );
+ }
+
+ Future<ui.Codec> _load(
+ TorAwareNetworkImage key,
+ ImageDecoderCallback decode,
+ StreamController<ImageChunkEvent> chunkEvents,
+ ) async {
+ try {
+ // Lets loadingBuilder show its indicator while the request runs.
+ chunkEvents.add(
+ const ImageChunkEvent(
+ cumulativeBytesLoaded: 0,
+ expectedTotalBytes: null,
+ ),
+ );
+ final bytes = await fetchTorAwareBytes(key.url, headers: key.headers);
+ final buffer = await ui.ImmutableBuffer.fromUint8List(bytes);
+ return await decode(buffer);
+ } catch (_) {
+ // Don't keep a failed load in the cache.
+ scheduleMicrotask(() {
+ PaintingBinding.instance.imageCache.evict(key);
+ });
+ rethrow;
+ } finally {
+ unawaited(chunkEvents.close());
+ }
+ }
+
+ @override
+ bool operator ==(Object other) =>
+ other is TorAwareNetworkImage &&
+ other.url == url &&
+ other.cacheScope == cacheScope;
+
+ @override
+ int get hashCode => Object.hash(url, cacheScope);
+
+ @override
+ String toString() =>
+ "${objectRuntimeType(this, "TorAwareNetworkImage")}"
+ "(\"$url\")";
+}
+
+/// Drop-in replacement for the loader behind [SvgPicture.network] that
+/// respects the Tor preference.
+/// Use as `SvgPicture(TorAwareSvgNetworkLoader(url))`.
+@immutable
+class TorAwareSvgNetworkLoader extends SvgLoader<Uint8List> {
+ const TorAwareSvgNetworkLoader(this.url);
+
+ final String url;
+
+ @override
+ Future<Uint8List?> prepareMessage(BuildContext? context) =>
+ fetchTorAwareBytes(url);
+
+ @override
+ String provideSvg(Uint8List? message) =>
+ utf8.decode(message!, allowMalformed: true);
+
+ @override
+ bool operator ==(Object other) =>
+ other is TorAwareSvgNetworkLoader && other.url == url;
+
+ @override
+ int get hashCode => url.hashCode;
+}
### lib/pages/add_wallet_views/add_token_view/sub_widgets/add_token_list_element.dart
@@ -16,6 +16,7 @@ import 'package:isar_community/isar.dart';
import '../../../../models/isar/exchange_cache/currency.dart';
import '../../../../models/isar/models/contract.dart';
import '../../../../models/isar/models/ethereum/eth_contract.dart';
+import '../../../../networking/tor_aware_network_image.dart';
import '../../../../services/exchange/change_now/change_now_exchange.dart';
import '../../../../services/exchange/exchange_data_loading_service.dart';
import '../../../../themes/stack_colors.dart';
@@ -101,8 +102,8 @@ class _AddTokenListElementState extends ConsumerState<AddTokenListElement> {
)
else
currency != null
- ? SvgPicture.network(
- currency!.image,
+ ? SvgPicture(
+ TorAwareSvgNetworkLoader(currency!.image),
width: iconSize,
height: iconSize,
placeholderBuilder: (_) =>
### lib/pages/add_wallet_views/add_wallet_view/sub_widgets/coin_select_item.dart
@@ -19,6 +19,7 @@ import '../../../../models/add_wallet_list_entity/add_wallet_list_entity.dart';
import '../../../../models/add_wallet_list_entity/sub_classes/eth_token_entity.dart';
import '../../../../models/add_wallet_list_entity/sub_classes/sol_token_entity.dart';
import '../../../../models/isar/exchange_cache/currency.dart';
+import '../../../../networking/tor_aware_network_image.dart';
import '../../../../providers/providers.dart';
import '../../../../services/exchange/change_now/change_now_exchange.dart';
import '../../../../services/exchange/exchange_data_loading_service.dart';
@@ -146,15 +147,15 @@ class _CoinSelectItemState extends ConsumerState<CoinSelectItem> {
else
tokenImageUri != null
? tokenImageUri!.toLowerCase().endsWith(".svg")
- ? SvgPicture.network(
- tokenImageUri!,
+ ? SvgPicture(
+ TorAwareSvgNetworkLoader(tokenImageUri!),
width: 26,
height: 26,
placeholderBuilder: (_) =>
const AppIcon(width: 26, height: 26),
)
- : Image.network(
- tokenImageUri!,
+ : Image(
+ image: TorAwareNetworkImage(tokenImageUri!),
width: 26,
height: 26,
errorBuilder: (_, _, _) => SvgPicture.file(
### lib/pages/cakepay/cakepay_card_detail_view.dart
@@ -3,6 +3,7 @@ import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
+import '../../networking/tor_aware_network_image.dart';
import '../../providers/global/locale_provider.dart';
import '../../services/cakepay/cakepay_service.dart';
import '../../services/cakepay/src/models/card.dart';
@@ -340,8 +341,8 @@ class _CardImage extends StatelessWidget {
),
child: ClipRRect(
borderRadius: BorderRadius.circular(8),
- child: Image.network(
- imageUrl,
+ child: Image(
+ image: TorAwareNetworkImage(imageUrl),
width: isDesktop ? 300 : null,
fit: isDesktop ? .contain : .fitWidth,
loadingBuilder: (_, child, event) {
### lib/pages/cakepay/cakepay_vendors_view.dart
@@ -2,6 +2,7 @@ import 'package:dropdown_button2/dropdown_button2.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
+import '../../networking/tor_aware_network_image.dart';
import '../../services/cakepay/cakepay_service.dart';
import '../../services/cakepay/src/models/card.dart';
import '../../themes/stack_colors.dart';
@@ -87,9 +88,8 @@ class _CakePayVendorsViewState extends State<CakePayVendorsView> {
}
Future<void> _onCardTapped(CakePayCard card) async {
- await Navigator.of(
- context,
- ).pushNamed(CakePayCardDetailView.routeName, arguments: card);
+ await Navigator.of(context)
+ .pushNamed(CakePayCardDetailView.routeName, arguments: card);
}
@override
@@ -130,9 +130,9 @@ class _CakePayVendorsViewState extends State<CakePayVendorsView> {
condition: !isDesktop,
builder: (child) => Background(
child: Scaffold(
- backgroundColor: Theme.of(
- context,
- ).extension<StackColors>()!.background,
+ backgroundColor: Theme.of(context)
+ .extension<StackColors>()!
+ .background,
appBar: AppBar(
leading: AppBarBackButton(
onPressed: () => Navigator.of(context).pop(),
@@ -210,9 +210,9 @@ class _CakePayVendorsViewState extends State<CakePayVendorsView> {
child: Text(
"No items",
style: STextStyles.w500_14(context).copyWith(
- color: Theme.of(
- context,
- ).extension<StackColors>()!.textSubtitle1,
+ color: Theme.of(context)
+ .extension<StackColors>()!
+ .textSubtitle1,
),
),
),
@@ -226,9 +226,9 @@ class _CakePayVendorsViewState extends State<CakePayVendorsView> {
Text(
error.toString(),
style: STextStyles.w500_14(context).copyWith(
- color: Theme.of(
- context,
- ).extension<StackColors>()!.textSubtitle1,
+ color: Theme.of(context)
+ .extension<StackColors>()!
+ .textSubtitle1,
),
),
const SizedBox(height: 16),
@@ -276,9 +276,9 @@ class _SearchField extends StatelessWidget {
focusNode: focusNode,
style: isDesktop
? STextStyles.desktopTextExtraSmall(context).copyWith(
- color: Theme.of(
- context,
- ).extension<StackColors>()!.textFieldActiveText,
+ color: Theme.of(context)
+ .extension<StackColors>()!
+ .textFieldActiveText,
)
: STextStyles.field(context),
decoration:
@@ -327,9 +327,8 @@ class _CountryDropdown extends StatelessWidget {
);
final itemStyle = isDesktop
- ? STextStyles.desktopTextExtraSmall(
- context,
- ).copyWith(color: colors.textFieldActiveText)
+ ? STextStyles.desktopTextExtraSmall(context)
+ .copyWith(color: colors.textFieldActiveText)
: STextStyles.w500_14(context);
return ClipRRect(
@@ -341,9 +340,8 @@ class _CountryDropdown extends StatelessWidget {
hint: Text(
"All countries",
style: isDesktop
- ? STextStyles.desktopTextExtraSmall(
- context,
- ).copyWith(color: colors.textFieldDefaultSearchIconLeft)
+ ? STextStyles.desktopTextExtraSmall(context)
+ .copyWith(color: colors.textFieldDefaultSearchIconLeft)
: STextStyles.fieldLabel(context),
),
items: [
@@ -446,8 +444,8 @@ class _CardTile extends StatelessWidget {
ClipRRect(
borderRadius: BorderRadius.circular(4),
child: card.cardImageUrl != null
- ? Image.network(
- card.cardImageUrl!,
+ ? Image(
+ image: TorAwareNetworkImage(card.cardImageUrl!),
width: isDesktop ? 60 : 48,
height: isDesktop ? 40 : 32,
fit: BoxFit.cover,
@@ -483,9 +481,8 @@ class _CardTile extends StatelessWidget {
].join(' '),
style: isDesktop
? STextStyles.desktopTextExtraExtraSmall(context)
- : STextStyles.itemSubtitle12(
- context,
- ).copyWith(color: colors.textSubtitle1),
+ : STextStyles.itemSubtitle12(context)
+ .copyWith(color: colors.textSubtitle1),
),
],
),
### lib/pages/exchange_view/exchange_coin_selection/exchange_currency_selection_view.dart
@@ -19,6 +19,7 @@ import '../../../app_config.dart';
import '../../../models/exchange/aggregate_currency.dart';
import '../../../models/isar/exchange_cache/currency.dart';
import '../../../models/isar/exchange_cache/pair.dart';
+import '../../../networking/tor_aware_network_image.dart';
import '../../../services/exchange/exchange.dart';
import '../../../services/exchange/exchange_data_loading_service.dart';
import '../../../themes/stack_colors.dart';
@@ -73,19 +74,19 @@ class _ExchangeCurrencySelectionViewState
showDialog<void>(
context: context,
barrierDismissible: false,
- builder:
- (_) => WillPopScope(
- onWillPop: () async => false,
- child: Container(
- color: Theme.of(
- context,
- ).extension<StackColors>()!.overlay.withOpacity(0.6),
- child: const CustomLoadingOverlay(
- message: "Loading currencies",
- eventBus: null,
- ),
- ),
+ builder: (_) => WillPopScope(
+ onWillPop: () async => false,
+ child: Container(
+ color: Theme.of(context)
+ .extension<StackColors>()!
+ .overlay
+ .withOpacity(0.6),
+ child: const CustomLoadingOverlay(
+ message: "Loading currencies",
+ eventBus: null,
),
+ ),
+ ),
),
);
@@ -101,36 +102,33 @@ class _ExchangeCurrencySelectionViewState
Future<List<AggregateCurrency>> _loadCurrencies() async {
await ExchangeDataLoadingService.instance.initDB();
final isar = await ExchangeDataLoadingService.instance.isar;
- final currencies =
- await isar.currencies
- .where()
- .filter()
- .isFiatEqualTo(false)
- .and()
- .group(
- (q) =>
- widget.isFixedRate
- ? q
- .rateTypeEqualTo(SupportedRateType.both)
- .or()
- .rateTypeEqualTo(SupportedRateType.fixed)
- : q
- .rateTypeEqualTo(SupportedRateType.both)
- .or()
- .rateTypeEqualTo(SupportedRateType.estimated),
- )
- .sortByIsStackCoin()
- .thenByName()
- .findAll();
+ final currencies = await isar.currencies
+ .where()
+ .filter()
+ .isFiatEqualTo(false)
+ .and()
+ .group(
+ (q) => widget.isFixedRate
+ ? q
+ .rateTypeEqualTo(SupportedRateType.both)
+ .or()
+ .rateTypeEqualTo(SupportedRateType.fixed)
+ : q
+ .rateTypeEqualTo(SupportedRateType.both)
+ .or()
+ .rateTypeEqualTo(SupportedRateType.estimated),
+ )
+ .sortByIsStackCoin()
+ .thenByName()
+ .findAll();
// If using Tor, filter exchanges which do not support Tor.
if (Prefs.instance.useTor) {
if (Exchange.exchangeNamesWithTorSupport.isNotEmpty) {
currencies.removeWhere(
- (element) =>
- !Exchange.exchangeNamesWithTorSupport.contains(
- element.exchangeName,
- ),
+ (element) => !Exchange.exchangeNamesWithTorSupport.contains(
+ element.exchangeName,
+ ),
);
}
}
@@ -163,20 +161,18 @@ class _ExchangeCurrencySelectionViewState
results.remove(widget.pairedCurrency);
}
- final walletCoins =
- results
- .where(
- (currency) =>
- AppConfig.coins
- .where(
- (coin) =>
- coin.ticker.toLowerCase() ==
- currency.ticker.toLowerCase() &&
- currency.fuzzyNet == coin.ticker.toLowerCase(),
- )
- .isNotEmpty,
- )
- .toList();
+ final walletCoins = results
+ .where(
+ (currency) => AppConfig.coins
+ .where(
+ (coin) =>
+ coin.ticker.toLowerCase() ==
+ currency.ticker.toLowerCase() &&
+ currency.fuzzyNet == coin.ticker.toLowerCase(),
+ )
+ .isNotEmpty,
+ )
+ .toList();
final list = results.toList();
@@ -240,8 +236,9 @@ class _ExchangeCurrencySelectionViewState
builder: (child) {
return Background(
child: Scaffold(
- backgroundColor:
- Theme.of(context).extension<StackColors>()!.background,
+ backgroundColor: Theme.of(context)
+ .extension<StackColors>()!
+ .background,
appBar: AppBar(
leading: AppBarBackButton(
onPressed: () async {
@@ -286,45 +283,45 @@ class _ExchangeCurrencySelectionViewState
focusNode: _searchFocusNode,
onChanged: (value) => setState(() => _searchString = value),
style: STextStyles.field(context),
- decoration: standardInputDecoration(
- "Search",
- _searchFocusNode,
- context,
- desktopMed: isDesktop,
- ).copyWith(
- prefixIcon: Padding(
- padding: const EdgeInsets.symmetric(
- horizontal: 10,
- vertical: 16,
- ),
- child: SvgPicture.asset(
- Assets.svg.search,
- width: 16,
- height: 16,
- ),
- ),
- suffixIcon:
- _searchController.text.isNotEmpty
+ decoration:
+ standardInputDecoration(
+ "Search",
+ _searchFocusNode,
+ context,
+ desktopMed: isDesktop,
+ ).copyWith(
+ prefixIcon: Padding(
+ padding: const EdgeInsets.symmetric(
+ horizontal: 10,
+ vertical: 16,
+ ),
+ child: SvgPicture.asset(
+ Assets.svg.search,
+ width: 16,
+ height: 16,
+ ),
+ ),
+ suffixIcon: _searchController.text.isNotEmpty
? Padding(
- padding: const EdgeInsets.only(right: 0),
- child: UnconstrainedBox(
- child: Row(
- children: [
- TextFieldIconButton(
- child: const XIcon(),
- onTap: () async {
- setState(() {
- _searchController.text = "";
- _searchString = "";
- });
- },
- ),
- ],
+ padding: const EdgeInsets.only(right: 0),
+ child: UnconstrainedBox(
+ child: Row(
+ children: [
+ TextFieldIconButton(
+ child: const XIcon(),
+ onTap: () async {
+ setState(() {
+ _searchController.text = "";
+ _searchString = "";
+ });
+ },
+ ),
+ ],
+ ),
),
- ),
- )
+ )
: null,
- ),
+ ),
),
),
const SizedBox(height: 20),
@@ -358,23 +355,20 @@ class _ExchangeCurrencySelectionViewState
height: 24,
child:
AppConfig.isStackCoin(
- items[index].ticker,
- )
- ? CoinIconForTicker(
- ticker: items[index].ticker,
- size: 24,
- )
- : hasImageUrl
- ? _NetImage(
- url: image,
- key: ValueKey(
- image + items[index].fuzzyNet,
- ),
- )
- : const SizedBox(
- width: 24,
- height: 24,
+ items[index].ticker,
+ )
+ ? CoinIconForTicker(
+ ticker: items[index].ticker,
+ size: 24,
+ )
+ : hasImageUrl
+ ? _NetImage(
+ url: image,
+ key: ValueKey(
+ image + items[index].fuzzyNet,
),
+ )
+ : const SizedBox(width: 24, height: 24),
),
const SizedBox(width: 10),
Expanded(
@@ -399,24 +393,21 @@ class _ExchangeCurrencySelectionViewState
left: 12,
),
child: CoinTickerTag(
- ticker:
- items[index].fuzzyNet
- .toUpperCase(),
+ ticker: items[index].fuzzyNet
+ .toUpperCase(),
),
),
],
),
const SizedBox(height: 2),
Text(
items[index].ticker.toUpperCase(),
- style: STextStyles.smallMed12(
- context,
- ).copyWith(
- color:
- Theme.of(context)
+ style: STextStyles.smallMed12(context)
+ .copyWith(
+ color: Theme.of(context)
.extension<StackColors>()!
.textSubtitle1,
- ),
+ ),
),
],
),
@@ -447,15 +438,20 @@ class _NetImage extends StatelessWidget {
@override
Widget build(BuildContext context) {
if (url.endsWith(".svg")) {
- return SvgPicture.network(
+ return SvgPicture(
key: key,
- url,
+ TorAwareSvgNetworkLoader(url),
width: 24,
height: 24,
placeholderBuilder: (_) => const LoadingIndicator(),
);
} else {
- return Image.network(url, width: 24, height: 24, key: key);
+ return Image(
+ image: TorAwareNetworkImage(url),
+ width: 24,
+ height: 24,
+ key: key,
+ );
}
}
}
### lib/pages/exchange_view/sub_widgets/exchange_provider_option.dart
@@ -15,6 +15,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
import '../../../app_config.dart';
import '../../../models/exchange/aggregate_currency.dart';
import '../../../models/exchange/response_objects/estimate.dart';
+import '../../../networking/tor_aware_network_image.dart';
import '../../../providers/exchange/exchange_form_state_provider.dart';
import '../../../providers/global/locale_provider.dart';
import '../../../services/exchange/exchange.dart';
@@ -164,9 +165,9 @@ class _ExchangeOptionState extends ConsumerState<ExchangeOption> {
isDesktop
? Container(
height: 1,
- color: Theme.of(
- context,
- ).extension<StackColors>()!.background,
+ color: Theme.of(context)
+ .extension<StackColors>()!
+ .background,
)
: const SizedBox(height: 16),
child,
@@ -215,9 +216,9 @@ class _ExchangeOptionState extends ConsumerState<ExchangeOption> {
estimate: null,
pair: pair,
rateString: message ?? "Failed to fetch rate",
- rateColor: Theme.of(
- context,
- ).extension<StackColors>()!.textError,
+ rateColor: Theme.of(context)
+ .extension<StackColors>()!
+ .textError,
);
},
);
@@ -354,9 +355,9 @@ class _ProviderOptionState extends ConsumerState<ExchProviderOption> {
child: Padding(
padding: EdgeInsets.only(top: isDesktop ? 20.0 : 15.0),
child: Radio(
- activeColor: Theme.of(
- context,
- ).extension<StackColors>()!.radioButtonIconEnabled,
+ activeColor: Theme.of(context)
+ .extension<StackColors>()!
+ .radioButtonIconEnabled,
value: _id,
groupValue: groupValue,
onChanged: (_) {
@@ -382,8 +383,10 @@ class _ProviderOptionState extends ConsumerState<ExchProviderOption> {
widget.estimate!.exchangeProviderLogo!.isNotEmpty
? ClipRRect(
borderRadius: BorderRadius.circular(5),
- child: Image.network(
- widget.estimate!.exchangeProviderLogo!,
+ child: Image(
+ image: TorAwareNetworkImage(
+ widget.estimate!.exchangeProviderLogo!,
+ ),
loadingBuilder:
(context, child, loadingProgress) {
if (loadingProgress == null) {
@@ -427,9 +430,9 @@ class _ProviderOptionState extends ConsumerState<ExchProviderOption> {
widget.estimate?.exchangeProvider ??
widget.exchange.name,
style: STextStyles.titleBold12(context).copyWith(
- color: Theme.of(
- context,
- ).extension<StackColors>()!.textDark2,
+ color: Theme.of(context)
+ .extension<StackColors>()!
+ .textDark2,
),
),
),
@@ -443,9 +446,9 @@ class _ProviderOptionState extends ConsumerState<ExchProviderOption> {
],
style: STextStyles.itemSubtitle12(context)
.copyWith(
- color: Theme.of(
- context,
- ).extension<StackColors>()!.textSubtitle1,
+ color: Theme.of(context)
+ .extension<StackColors>()!
+ .textSubtitle1,
),
)
: Text(
### lib/pages/settings_views/global_settings_view/appearance_settings/sub_widgets/stack_theme_card.dart
@@ -17,6 +17,7 @@ import 'package:flutter_svg/svg.dart';
import 'package:isar_community/isar.dart';
import '../../../../../models/isar/stack_theme.dart';
+import '../../../../../networking/tor_aware_network_image.dart';
import '../../../../../notifications/show_flush_bar.dart';
import '../../../../../providers/db/main_db_provider.dart';
import '../../../../../providers/global/prefs_provider.dart';
@@ -69,18 +70,16 @@ class _StackThemeCardState extends ConsumerState<StackThemeCard> {
}
Future<void> _downloadPressed() async {
- final result =
- (await showLoading(
- whileFuture: _downloadAndInstall(),
- context: context,
- message: "Downloading and installing theme...",
- ))!;
+ final result = (await showLoading(
+ whileFuture: _downloadAndInstall(),
+ context: context,
+ message: "Downloading and installing theme...",
+ ))!;
if (mounted) {
- final message =
- result
- ? "${widget.data.name} theme installed!"
- : "Failed to install ${widget.data.name} theme";
+ final message = result
+ ? "${widget.data.name} theme installed!"
+ : "Failed to install ${widget.data.name} theme";
if (isDesktop) {
await showFloatingFlushBar(
type: result ? FlushBarType.success : FlushBarType.warning,
@@ -90,16 +89,15 @@ class _StackThemeCardState extends ConsumerState<StackThemeCard> {
} else {
await showDialog<void>(
context: context,
- builder:
- (_) => StackOkDialog(
- title: message,
- onOkPressed: (_) {
- setState(() {
- _needsUpdate = !result;
- _hasTheme = result;
- });
- },
- ),
+ builder: (_) => StackOkDialog(
+ title: message,
+ onOkPressed: (_) {
+ setState(() {
+ _needsUpdate = !result;
+ _hasTheme = result;
+ });
+ },
+ ),
);
}
}
@@ -155,14 +153,13 @@ class _StackThemeCardState extends ConsumerState<StackThemeCard> {
}
}
- StackTheme? getInstalled() =>
- ref
- .read(mainDBProvider)
- .isar
- .stackThemes
- .where()
- .themeIdEqualTo(widget.data.id)
- .findFirstSync();
+ StackTheme? getInstalled() => ref
+ .read(mainDBProvider)
+ .isar
+ .stackThemes
+ .where()
+ .themeIdEqualTo(widget.data.id)
+ .findFirstSync();
@override
void initState() {
@@ -207,39 +204,41 @@ class _StackThemeCardState extends ConsumerState<StackThemeCard> {
Widget build(BuildContext context) {
return RoundedWhiteContainer(
radiusMultiplier: isDesktop ? 2.5 : 1,
- borderColor:
- isDesktop
- ? Theme.of(context).extension<StackColors>()!.textSubtitle6
- : null,
+ borderColor: isDesktop
+ ? Theme.of(context).extension<StackColors>()!.textSubtitle6
+ : null,
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
Padding(
padding: const EdgeInsets.symmetric(horizontal: 18),
- child:
- widget.data.previewImageUrl.isNotEmpty
- ? AspectRatio(
- aspectRatio: 1,
- child: ClipRRect(
- borderRadius: BorderRadius.circular(100),
- child: Image.network(widget.data.previewImageUrl),
+ child: widget.data.previewImageUrl.isNotEmpty
+ ? AspectRatio(
+ aspectRatio: 1,
+ child: ClipRRect(
+ borderRadius: BorderRadius.circular(100),
+ child: Image(
+ image: TorAwareNetworkImage(
+ widget.data.previewImageUrl,
+ ),
),
- )
- : Builder(
- builder: (context) {
- final themePreview =
- ref
- .watch(pThemeService)
- .getTheme(themeId: widget.data.id)
- ?.assets
- .themePreview ??
- "";
-
- return (themePreview.endsWith(".png"))
- ? Image.file(File(themePreview), height: 100)
- : SvgPicture.file(File(themePreview), height: 100);
- },
),
+ )
+ : Builder(
+ builder: (context) {
+ final themePreview =
+ ref
+ .watch(pThemeService)
+ .getTheme(themeId: widget.data.id)
+ ?.assets
+ .themePreview ??
+ "";
+
+ return (themePreview.endsWith(".png"))
+ ? Image.file(File(themePreview), height: 100)
+ : SvgPicture.file(File(themePreview), height: 100);
+ },
+ ),
),
const SizedBox(height: 12),
Text(widget.data.name, style: STextStyles.itemSubtitle12(context)),
@@ -276,10 +275,9 @@ class _StackThemeCardState extends ConsumerState<StackThemeCard> {
const SizedBox(height: 12),
AnimatedCrossFade(
duration: const Duration(milliseconds: 300),
- crossFadeState:
- _hasTheme
- ? CrossFadeState.showSecond
- : CrossFadeState.showFirst,
+ crossFadeState: _hasTheme
+ ? CrossFadeState.showSecond
+ : CrossFadeState.showFirst,
firstChild: PrimaryButton(
label: "Download",
buttonHeight: isDesktop ? ButtonHeight.s : ButtonHeight.l,
### lib/pages/settings_views/global_settings_view/manage_nodes_views/add_edit_node_view.dart
@@ -1475,60 +1475,57 @@ class _NodeFormState extends ConsumerState<NodeForm> {
),
],
),
- if (widget.coin is! Ethereum) const SizedBox(height: 16),
- if (widget.coin is! Ethereum)
- Row(
- children: [
- RadioTextButton(
- label: "Only TOR traffic",
- enabled: !widget.readOnly,
- value: TorPlainNetworkOption.tor,
- groupValue: netOption,
- onChanged: (value) {
- if (!widget.readOnly) {
- setState(() => netOption = TorPlainNetworkOption.tor);
- _updateState();
- }
- },
- ),
- ],
- ),
- if (widget.coin is! Ethereum) const SizedBox(height: 8),
- if (widget.coin is! Ethereum)
- Row(
- children: [
- RadioTextButton(
- label: "Only non-TOR traffic",
- enabled: !widget.readOnly,
- value: TorPlainNetworkOption.clear,
- groupValue: netOption,
- onChanged: (value) {
- if (!widget.readOnly) {
- setState(() => netOption = TorPlainNetworkOption.clear);
- _updateState();
- }
- },
- ),
- ],
- ),
- if (widget.coin is! Ethereum) const SizedBox(height: 8),
- if (widget.coin is! Ethereum)
- Row(
- children: [
- RadioTextButton(
- label: "Allow both",
- enabled: !widget.readOnly,
- value: TorPlainNetworkOption.both,
- groupValue: netOption,
- onChanged: (value) {
- if (!widget.readOnly) {
- setState(() => netOption = TorPlainNetworkOption.both);
- _updateState();
- }
- },
- ),
- ],
- ),
+ const SizedBox(height: 16),
+ Row(
+ children: [
+ RadioTextButton(
+ label: "Only TOR traffic",
+ enabled: !widget.readOnly,
+ value: TorPlainNetworkOption.tor,
+ groupValue: netOption,
+ onChanged: (value) {
+ if (!widget.readOnly) {
+ setState(() => netOption = TorPlainNetworkOption.tor);
+ _updateState();
+ }
+ },
+ ),
+ ],
+ ),
+ const SizedBox(height: 8),
+ Row(
+ children: [
+ RadioTextButton(
+ label: "Only non-TOR traffic",
+ enabled: !widget.readOnly,
+ value: TorPlainNetworkOption.clear,
+ groupValue: netOption,
+ onChanged: (value) {
+ if (!widget.readOnly) {
+ setState(() => netOption = TorPlainNetworkOption.clear);
+ _updateState();
+ }
+ },
+ ),
+ ],
+ ),
+ const SizedBox(height: 8),
+ Row(
+ children: [
+ RadioTextButton(
+ label: "Allow both",
+ enabled: !widget.readOnly,
+ value: TorPlainNetworkOption.both,
+ groupValue: netOption,
+ onChanged: (value) {
+ if (!widget.readOnly) {
+ setState(() => netOption = TorPlainNetworkOption.both);
+ _updateState();
+ }
+ },
+ ),
+ ],
+ ),
if (widget.coin is CryptonoteCurrency && _isLocalNode())
const SizedBox(height: 8),
if (widget.coin is CryptonoteCurrency && _isLocalNode())
### lib/pages/shopinbit/shopinbit_ticket_detail.dart
@@ -10,6 +10,7 @@ import 'package:url_launcher/url_launcher.dart';
import '../../db/drift/shared_db/shared_database.dart';
import '../../models/shopinbit/shopinbit_enums.dart';
+import '../../networking/tor_aware_network_image.dart';
import '../../notifications/show_flush_bar.dart';
import '../../providers/db/drift_provider.dart';
import '../../providers/global/shopin_bit_service_provider.dart';
@@ -432,9 +433,8 @@ class _ShopInBitTicketDetailState extends ConsumerState<ShopInBitTicketDetail>
);
}
if (context.mounted) {
- await Navigator.of(
- context,
- ).pushNamed(ShopInBitOfferView.routeName, arguments: _id);
+ await Navigator.of(context)
+ .pushNamed(ShopInBitOfferView.routeName, arguments: _id);
}
}
@@ -443,9 +443,9 @@ class _ShopInBitTicketDetailState extends ConsumerState<ShopInBitTicketDetail>
padding: .only(bottom: isDesktop ? 12 : 8),
child: RoundedWhiteContainer(
borderColor: isDesktop
- ? Theme.of(
- context,
- ).extension<StackColors>()!.textFieldDefaultBG
+ ? Theme.of(context)
+ .extension<StackColors>()!
+ .textFieldDefaultBG
: null,
child: ConditionalParent(
condition: Util.isDesktop,
@@ -559,9 +559,9 @@ class _ShopInBitTicketDetailState extends ConsumerState<ShopInBitTicketDetail>
? STextStyles.desktopTextExtraSmall(context)
: STextStyles.field(context))
.copyWith(
- color: Theme.of(
- context,
- ).extension<StackColors>()!.textDark,
+ color: Theme.of(context)
+ .extension<StackColors>()!
+ .textDark,
),
decoration: InputDecoration(
hintText: "Type a message...",
@@ -585,9 +585,9 @@ class _ShopInBitTicketDetailState extends ConsumerState<ShopInBitTicketDetail>
Assets.svg.send,
width: 24,
height: 24,
- color: Theme.of(
- context,
- ).extension<StackColors>()!.accentColorBlue,
+ color: Theme.of(context)
+ .extension<StackColors>()!
+ .accentColorBlue,
),
),
],
@@ -600,9 +600,9 @@ class _ShopInBitTicketDetailState extends ConsumerState<ShopInBitTicketDetail>
padding: EdgeInsets.only(bottom: isDesktop ? 12 : 8),
child: RoundedWhiteContainer(
borderColor: isDesktop
- ? Theme.of(
- context,
- ).extension<StackColors>()!.textFieldDefaultBG
+ ? Theme.of(context)
+ .extension<StackColors>()!
+ .textFieldDefaultBG
: null,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
@@ -698,9 +698,9 @@ class _ShopInBitTicketDetailState extends ConsumerState<ShopInBitTicketDetail>
condition: !isDesktop,
builder: (child) => Background(
child: Scaffold(
- backgroundColor: Theme.of(
- context,
- ).extension<StackColors>()!.background,
+ backgroundColor: Theme.of(context)
+ .extension<StackColors>()!
+ .background,
appBar: AppBar(
leading: AppBarBackButton(
onPressed: () => Navigator.of(context).pop(),
@@ -827,9 +827,14 @@ class _AttachmentChip extends StatelessWidget {
/// Renders an authenticated `/attachment-proxy/` image.
///
-/// The signed URL future is built once in [initState] (and only rebuilt when
+/// The request future is built once in [initState] (and only rebuilt when
/// [proxyPath] or [customerKey] actually change) so the surrounding 30s poll
-/// can't re-fire `getAttachmentUrl`/re-fetch the image on every rebuild.
+/// can't re-fire `getAttachmentRequest`/re-fetch the image on every rebuild.
+typedef _AttachmentLoad = ({
+ ApiResponse<AttachmentRequest> response,
+ String customerKey,
+});
+
class _ProxyImage extends StatefulWidget {
const _ProxyImage({
required this.client,
@@ -848,26 +853,31 @@ class _ProxyImage extends StatefulWidget {
}
class _ProxyImageState extends State<_ProxyImage> {
- late Future<ApiResponse<Uri>> _urlFuture;
-
- Future<ApiResponse<Uri>> _buildFuture() => widget.client.getAttachmentUrl(
- widget.proxyPath,
- useQueryAuth: true,
- customerKey: widget.customerKey,
- );
+ late Future<_AttachmentLoad> _requestFuture;
+
+ // Header auth: a query-auth URL would put the token and customer key into
+ // logged HTTP errors. The customer key travels with the response because
+ // FutureBuilder keeps showing the previous snapshot while a new future is
+ // pending, and that snapshot must not be paired with a newer key.
+ Future<_AttachmentLoad> _buildFuture() {
+ final customerKey = widget.customerKey;
+ return widget.client
+ .getAttachmentRequest(widget.proxyPath, customerKey: customerKey)
+ .then((response) => (response: response, customerKey: customerKey));
+ }
@override
void initState() {
super.initState();
- _urlFuture = _buildFuture();
+ _requestFuture = _buildFuture();
}
@override
void didUpdateWidget(covariant _ProxyImage oldWidget) {
super.didUpdateWidget(oldWidget);
if (oldWidget.proxyPath != widget.proxyPath ||
oldWidget.customerKey != widget.customerKey) {
- _urlFuture = _buildFuture();
+ _requestFuture = _buildFuture();
}
}
@@ -879,23 +889,30 @@ class _ProxyImageState extends State<_ProxyImage> {
borderRadius: BorderRadius.circular(8),
child: ConstrainedBox(
constraints: const BoxConstraints(maxHeight: _kAttachmentMaxHeight),
- child: FutureBuilder<ApiResponse<Uri>>(
- future: _urlFuture,
+ child: FutureBuilder<_AttachmentLoad>(
+ future: _requestFuture,
builder: (context, snapshot) {
if (!snapshot.hasData) {
return const SizedBox(
height: _kAttachmentLoaderHeight,
child: LoadingIndicator(width: _kAttachmentLoaderWidth),
);
}
- final resp = snapshot.data!;
+ final resp = snapshot.data!.response;
if (resp.hasError || resp.value == null) {
return widget.fallback();
}
- return Image.network(
- resp.value!.toString(),
+ return Image(
+ image: ResizeImage.resizeIfNeeded(
+ null,
+ _kAttachmentDecodeHeight,
+ TorAwareNetworkImage(
+ resp.value!.uri.toString(),
+ headers: resp.value!.headers,
+ cacheScope: snapshot.data!.customerKey,
+ ),
+ ),
fit: BoxFit.contain,
- cacheHeight: _kAttachmentDecodeHeight,
semanticLabel: "Image attachment",
errorBuilder: (_, _, _) => widget.fallback(),
);
### lib/services/shopinbit/src/client.dart
@@ -309,6 +309,31 @@ class ShopInBitClient {
}
}
+ /// URL and auth headers for fetching an attachment via
+ /// `/attachment-proxy/<path>` from an HTTP client that can set headers.
+ Future<ApiResponse<AttachmentRequest>> getAttachmentRequest(
+ String attachmentPath, {
+ String? customerKey,
+ }) async {
+ try {
+ final token = await _tokenManager.getValidToken();
+ final resolved = _resolvePath('/attachment-proxy/$attachmentPath');
+ return ApiResponse(
+ value: (
+ uri: Uri.parse('$baseUrl$resolved'),
+ headers: {
+ 'Authorization': 'Bearer $token',
+ if (customerKey != null) 'External-Customer-Key': customerKey,
+ },
+ ),
+ );
+ } on ApiException catch (e) {
+ return ApiResponse(exception: e);
+ } catch (e) {
+ return ApiResponse(exception: ApiException.network(e));
+ }
+ }
+
/// Download an attachment from `/attachment-proxy/<path>`.
Future<ApiResponse<Response>> getAttachment(
String attachmentPath, {
@@ -1055,6 +1080,8 @@ const kAllowedAttachmentExtensions = [
typedef ResolvedAttachment = ({String mimeType, AttachmentCategory category});
+typedef AttachmentRequest = ({Uri uri, Map<String, String> headers});
+
/// Path + content type, materialized into multipart bytes inside
/// [_multipartRequest]: validation stays separate from encoding, and the
/// encoded bytes can be resent on 401 without re-reading files from disk.
@@ -1075,8 +1102,7 @@ ResolvedAttachment? resolveAttachmentType(String fileName) {
"gif" => (mimeType: "image/gif", category: .image),
"pdf" => (mimeType: "application/pdf", category: .document),
"docx" => (
- mimeType:
- "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+ mimeType: "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
category: .document,
),
"xlsx" => (
### lib/utilities/constants.dart
@@ -40,7 +40,7 @@ abstract class Constants {
// Enable Logger.print statements
static const bool disableLogger = false;
- static const int currentDataVersion = 17;
+ static const int currentDataVersion = 18;
static const int rescanV1 = 1;
### lib/utilities/test_eth_node_connection.dart
@@ -1,12 +1,19 @@
-import 'package:http/http.dart';
-import 'package:web3dart/web3dart.dart' as web3;
+import '../services/tor_service.dart';
+import '../wallets/wallet/impl/ethereum_wallet.dart';
+import 'prefs.dart';
-Future<bool> testEthNodeConnection(String host) async {
- final web3.Web3Client client = web3.Web3Client(host, Client());
+Future<bool> testEthNodeConnection(
+ String host, {
+ required Prefs prefs,
+ required TorService torService,
+}) async {
+ final client = EthereumWallet.createWeb3Client(host, prefs, torService);
try {
await client.getBlockNumber();
return true;
} catch (_) {
return false;
+ } finally {
+ await client.dispose();
}
}
### lib/utilities/test_node_connection.dart
@@ -235,7 +235,11 @@ Future<bool> testNodeConnection({
case Ethereum():
try {
- testPassed = await testEthNodeConnection(formData.host!);
+ testPassed = await testEthNodeConnection(
+ formData.host!,
+ prefs: read(prefsChangeNotifierProvider),
+ torService: read(pTorService),
+ );
} catch (_) {
testPassed = false;
}
### lib/utilities/test_stellar_node_connection.dart
@@ -1,5 +1,7 @@
import 'dart:convert';
+import 'dart:io';
+import 'package:socks5_proxy/socks.dart';
import 'package:stellar_flutter_sdk/stellar_flutter_sdk.dart';
import '../app_config.dart';
@@ -28,7 +30,15 @@ Future<bool> testStellarNodeConnection(String host, int port) async {
if (response.code == 200) {
//Get chain height for sdk
- final StellarSDK stellarSdk = StellarSDK(host);
+ HttpClient? httpClient;
+ if (AppConfig.hasFeature(AppFeature.tor) && Prefs.instance.useTor) {
+ final proxyInfo = TorService.sharedInstance.getProxyInfo();
+ httpClient = HttpClient();
+ SocksTCPClient.assignToHttpClient(httpClient, [
+ ProxySettings(proxyInfo.host, proxyInfo.port),
+ ]);
+ }
+ final StellarSDK stellarSdk = StellarSDK(host, httpClient: httpClient);
final height = await stellarSdk.ledgers
.order(RequestBuilderOrder.DESC)
.limit(1)
### lib/wallets/crypto_currency/coins/ethereum.dart
@@ -47,6 +47,9 @@ class Ethereum extends Bip39Currency {
@override
bool get hasTokenSupport => true;
+ @override
+ bool get torSupport => true;
+
@override
NodeModel defaultNode({required bool isPrimary}) => NodeModel(
host: "https://eth2.stackwallet.com",
### lib/wallets/crypto_currency/coins/fact0rn.dart
@@ -48,7 +48,7 @@ class Fact0rn extends Bip39HDCurrency with ElectrumXCurrencyInterface {
String get ticker => _ticker;
@override
- bool get torSupport => false;
+ bool get torSupport => true;
@override
List<DerivePathType> get supportedDerivationPathTypes => [
@@ -184,7 +184,7 @@ class Fact0rn extends Bip39HDCurrency with ElectrumXCurrencyInterface {
coinName: identifier,
isFailover: true,
isDown: false,
- torEnabled: false,
+ torEnabled: true,
clearnetEnabled: true,
isPrimary: isPrimary,
);
### lib/wallets/crypto_currency/intermediate/nano_currency.dart
@@ -18,6 +18,9 @@ abstract class NanoCurrency extends Bip39Currency {
@override
bool get hasBuySupport => false;
+ @override
+ bool get torSupport => true;
+
@override
int get defaultSeedPhraseLength => 24;
### lib/wallets/wallet/impl/ethereum_wallet.dart
@@ -1,16 +1,20 @@
import 'dart:async';
import 'dart:convert';
+import 'dart:io';
import 'package:decimal/decimal.dart';
import 'package:ethereum_addresses/ethereum_addresses.dart';
import 'package:flutter/foundation.dart';
-import 'package:http/http.dart';
+import 'package:http/io_client.dart';
import 'package:isar_community/isar.dart';
+import 'package:socks5_proxy/socks.dart';
import 'package:wallet/wallet.dart' as eth_wallet;
import 'package:web3dart/json_rpc.dart' show RPCError;
import 'package:web3dart/web3dart.dart' as web3;
+import '../../../app_config.dart';
import '../../../dto/ethereum/eth_tx_dto.dart';
+import '../../../exceptions/wallet/node_tor_mismatch_config_exception.dart';
import '../../../models/balance.dart';
import '../../../models/isar/models/blockchain_data/address.dart';
import '../../../models/isar/models/blockchain_data/transaction.dart';
@@ -21,9 +25,12 @@ import '../../../models/paymint/fee_object_model.dart';
import '../../../services/ethereum/ethereum_api.dart';
import '../../../services/event_bus/events/global/updated_in_background_event.dart';
import '../../../services/event_bus/global_event_bus.dart';
+import '../../../services/tor_service.dart';
import '../../../utilities/amount/amount.dart';
import '../../../utilities/eth_commons.dart';
import '../../../utilities/logger.dart';
+import '../../../utilities/prefs.dart';
+import '../../../utilities/tor_plain_net_option_enum.dart';
import '../../crypto_currency/crypto_currency.dart';
import '../../models/tx_data.dart';
import '../intermediate/bip39_wallet.dart';
@@ -85,8 +92,6 @@ Future<List<TransactionV2>> findReplacedPendingEthereumTransactions({
return replacedTransactions;
}
-// Eth can not use tor with web3dart
-
@visibleForTesting
({BigInt maxFeePerGas, BigInt maxPriorityFeePerGas}) resolveEip1559FeeCaps({
required BigInt baseFee,
@@ -144,10 +149,45 @@ class EthereumWallet extends Bip39Wallet with PrivateKeyInterface {
web3.Web3Client getEthClient() {
final node = getCurrentNode();
- // Eth can not use tor with web3dart as Client does not support proxies
- final client = Client();
+ final netOption = TorPlainNetworkOption.fromNodeData(
+ node.torEnabled,
+ node.clearnetEnabled,
+ );
- return web3.Web3Client(node.host, client);
+ if (prefs.useTor) {
+ if (netOption == TorPlainNetworkOption.clear) {
+ throw NodeTorMismatchConfigException(
+ message: "TOR enabled but node set to clearnet only",
+ );
+ }
+ } else {
+ if (netOption == TorPlainNetworkOption.tor) {
+ throw NodeTorMismatchConfigException(
+ message: "TOR off but node set to TOR only",
+ );
+ }
+ }
+
+ return createWeb3Client(node.host, prefs, TorService.sharedInstance);
+ }
+
+ // static helper function for building a web3 client, proxied over tor if
+ // enabled
+ static web3.Web3Client createWeb3Client(
+ String url,
+ Prefs prefs,
+ TorService torService,
+ ) {
+ final httpClient = HttpClient();
+
+ if (AppConfig.hasFeature(AppFeature.tor) && prefs.useTor) {
+ final proxyInfo = torService.getProxyInfo();
+ SocksTCPClient.assignToHttpClient(httpClient, [
+ ProxySettings(proxyInfo.host, proxyInfo.port),
+ ]);
+ }
+
+ return web3.Web3Client(url, IOClient(httpClient));
}
Amount estimateEthFee(BigInt feeRate, int gasLimit, int decimals) {
@@ -292,8 +332,8 @@ class EthereumWallet extends Bip39Wallet with PrivateKeyInterface {
@override
Future<bool> pingCheck() async {
- final web3.Web3Client client = getEthClient();
try {
+ final client = getEthClient();
await client.getBlockNumber();
return true;
} catch (_) {
### lib/widgets/icon_widgets/eth_token_icon.dart
@@ -16,6 +16,7 @@ import 'package:flutter_svg/svg.dart';
import 'package:isar_community/isar.dart';
import '../../models/isar/exchange_cache/currency.dart';
+import '../../networking/tor_aware_network_image.dart';
import '../../services/exchange/change_now/change_now_exchange.dart';
import '../../services/exchange/exchange_data_loading_service.dart';
import '../../themes/coin_icon_provider.dart';
@@ -87,8 +88,8 @@ class _EthTokenIconState extends ConsumerState<EthTokenIcon> {
height: widget.size,
);
} else {
- return SvgPicture.network(
- imageUrl!,
+ return SvgPicture(
+ TorAwareSvgNetworkLoader(imageUrl!),
width: widget.size,
height: widget.size,
placeholderBuilder: (_) => const LoadingIndicator(),
### lib/widgets/icon_widgets/sol_token_icon.dart
@@ -15,6 +15,7 @@ import 'package:flutter_svg/svg.dart';
import 'package:isar_community/isar.dart';
import '../../models/isar/exchange_cache/currency.dart';
+import '../../networking/tor_aware_network_image.dart';
import '../../services/exchange/change_now/change_now_exchange.dart';
import '../../services/exchange/exchange_data_loading_service.dart';
import '../../themes/coin_icon_provider.dart';
@@ -84,8 +85,8 @@ class _SolTokenIconState extends ConsumerState<SolTokenIcon> {
);
} else {
// Display token icon from network.
- return SvgPicture.network(
- imageUrl!,
+ return SvgPicture(
+ TorAwareSvgNetworkLoader(imageUrl!),
width: widget.size,
height: widget.size,
placeholderBuilder: (_) => const LoadingIndicator(),
### lib/widgets/textfields/exchange_textfield.dart
@@ -14,6 +14,7 @@ import 'package:flutter_svg/svg.dart';
import '../../app_config.dart';
import '../../models/exchange/aggregate_currency.dart';
+import '../../networking/tor_aware_network_image.dart';
import '../../pages/buy_view/sub_widgets/crypto_selection_view.dart';
import '../../providers/global/locale_provider.dart';
import '../../themes/stack_colors.dart';
@@ -181,8 +182,10 @@ class _ExchangeTextFieldState extends ConsumerState<ExchangeTextField> {
} else if (widget.currency != null &&
widget.currency!.image.isNotEmpty) {
return Center(
- child: SvgPicture.network(
- widget.currency!.image,
+ child: SvgPicture(
+ TorAwareSvgNetworkLoader(
+ widget.currency!.image,
+ ),
height: 18,
placeholderBuilder: (_) => Container(
width: 18,
### lib/widgets/wallet_info_row/sub_widgets/wallet_info_row_coin_icon.dart
@@ -16,6 +16,7 @@ import 'package:flutter_svg/svg.dart';
import 'package:isar_community/isar.dart';
import '../../../models/isar/exchange_cache/currency.dart';
+import '../../../networking/tor_aware_network_image.dart';
import '../../../services/exchange/change_now/change_now_exchange.dart';
import '../../../services/exchange/exchange_data_loading_service.dart';
import '../../../themes/coin_icon_provider.dart';
@@ -48,18 +49,14 @@ class _WalletInfoCoinIconState extends ConsumerState<WalletInfoCoinIcon> {
ExchangeDataLoadingService.instance.isar.then((isar) async {
if (widget.contractAddress != null) {
- final currency =
- await isar.currencies
- .where()
- .exchangeNameEqualTo(ChangeNowExchange.exchangeName)
- .filter()
- .tokenContractEqualTo(
- widget.contractAddress!,
- caseSensitive: false,
- )
- .and()
- .imageIsNotEmpty()
- .findFirst();
+ final currency = await isar.currencies
+ .where()
+ .exchangeNameEqualTo(ChangeNowExchange.exchangeName)
+ .filter()
+ .tokenContractEqualTo(widget.contractAddress!, caseSensitive: false)
+ .and()
+ .imageIsNotEmpty()
+ .findFirst();
if (mounted) {
WidgetsBinding.instance.addPostFrameCallback((_) {
@@ -87,14 +84,17 @@ class _WalletInfoCoinIconState extends ConsumerState<WalletInfoCoinIcon> {
),
child: Padding(
padding: EdgeInsets.all(widget.size / 5),
- child:
- imageUrl != null && imageUrl!.isNotEmpty
- ? SvgPicture.network(imageUrl!, width: 20, height: 20)
- : SvgPicture.file(
- File(ref.watch(coinIconProvider(widget.coin))),
- width: 20,
- height: 20,
- ),
+ child: imageUrl != null && imageUrl!.isNotEmpty
+ ? SvgPicture(
+ TorAwareSvgNetworkLoader(imageUrl!),
+ width: 20,
+ height: 20,
+ )
+ : SvgPicture.file(
+ File(ref.watch(coinIconProvider(widget.coin))),
+ width: 20,
+ height: 20,
+ ),
),
);
}
### test/db_version_migration_test.dart
@@ -6,9 +6,11 @@ import 'package:stackwallet/db/db_version_migration.dart';
import 'package:stackwallet/db/hive/db.dart';
import 'package:stackwallet/db/isar/main_db.dart';
import 'package:stackwallet/models/isar/models/ethereum/eth_contract.dart';
+import 'package:stackwallet/models/node_model.dart';
import 'package:stackwallet/utilities/constants.dart';
import 'package:stackwallet/utilities/default_eth_tokens.dart';
import 'package:stackwallet/utilities/flutter_secure_storage_interface.dart';
+import 'package:stackwallet/wallets/crypto_currency/crypto_currency.dart';
import 'hive/hive_ce_test_utils.dart';
@@ -34,8 +36,8 @@ void main() {
DbVersionMigrator().migrate(version, secureStore: FakeSecureStorage());
await migrate(16);
- expect(Constants.currentDataVersion, 17);
- expect(info.get('hive_data_version'), 17);
+ expect(Constants.currentDataVersion, 18);
+ expect(info.get('hive_data_version'), 18);
expect(await db.getEthContracts().isEmpty(), isTrue);
final custom = DefaultTokens.usdc.copyWith(name: 'Custom token');
@@ -58,4 +60,62 @@ void main() {
await migrate(info.get('hive_data_version') as int);
expect(await db.getEthContracts().count(), 1);
});
+
+ test('v18 lets the default Fact0rn node use Tor', () async {
+ await setUpHiveCeTest();
+ addTearDown(tearDownHiveCeTest);
+ final adapter = NodeModelAdapter();
+ if (!DB.instance.hive.isAdapterRegistered(adapter.typeId)) {
+ DB.instance.hive.registerAdapter(adapter);
+ }
+ final info = await DB.instance.hive.openBox<dynamic>(DB.boxNameDBInfo);
+ final nodes = await DB.instance.hive.openBox<NodeModel>(
+ DB.boxNameNodeModels,
+ );
+ NodeModel clearOnly(CryptoCurrency coin) => coin
+ .defaultNode(isPrimary: true)
+ .copyWith(loginName: null, trusted: null, torEnabled: false);
+ final fact0rn = clearOnly(Fact0rn(CryptoCurrencyNetwork.main));
+ final bitcoin = clearOnly(Bitcoin(CryptoCurrencyNetwork.main));
+ await nodes.put(fact0rn.id, fact0rn);
+ await nodes.put(bitcoin.id, bitcoin);
+
+ await DbVersionMigrator().migrate(17, secureStore: FakeSecureStorage());
+
+ expect(info.get('hive_data_version'), 18);
+ expect(nodes.get(fact0rn.id)!.torEnabled, isTrue);
+ expect(nodes.get(fact0rn.id)!.clearnetEnabled, isTrue);
+ expect(nodes.get(fact0rn.id)!.isPrimary, isTrue);
+ expect(nodes.get(bitcoin.id)!.torEnabled, isFalse);
+ });
+
+ test('v18 leaves an edited Fact0rn default node alone', () async {
+ await setUpHiveCeTest();
+ addTearDown(tearDownHiveCeTest);
+ final adapter = NodeModelAdapter();
+ if (!DB.instance.hive.isAdapterRegistered(adapter.typeId)) {
+ DB.instance.hive.registerAdapter(adapter);
+ }
+ await DB.instance.hive.openBox<dynamic>(DB.boxNameDBInfo);
+ final nodes = await DB.instance.hive.openBox<NodeModel>(
+ DB.boxNameNodeModels,
+ );
+ final shipped = Fact0rn(CryptoCurrencyNetwork.main)
+ .defaultNode(isPrimary: true)
+ .copyWith(loginName: null, trusted: null, torEnabled: false);
+ final edited = [
+ shipped.copyWith(loginName: null, trusted: null, isFailover: false),
+ shipped.copyWith(loginName: null, trusted: null, host: "example.com"),
+ shipped.copyWith(loginName: null, trusted: null, port: 50001),
+ shipped.copyWith(loginName: null, trusted: null, useSSL: false),
+ shipped.copyWith(loginName: null, trusted: null, name: "Mine"),
+ shipped.copyWith(loginName: "user", trusted: null),
+ ];
+
+ for (final node in edited) {
+ await nodes.put(node.id, node);
+ await DbVersionMigrator().migrate(17, secureStore: FakeSecureStorage());
+ expect(nodes.get(node.id)!.torEnabled, isFalse, reason: "$node");
+ }
+ });
}
### test/networking/tor_aware_network_image_test.dart
@@ -0,0 +1,57 @@
+import 'dart:io';
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:stackwallet/networking/tor_aware_network_image.dart';
+
+void main() {
+ late HttpServer server;
+ late List<HttpRequest> requests;
+
+ setUp(() async {
+ requests = [];
+ server = await HttpServer.bind(InternetAddress.loopbackIPv4, 0);
+ server.listen((request) {
+ requests.add(request);
+ request.response.add([1]);
+ request.response.close();
+ });
+ });
+
+ tearDown(() => server.close(force: true));
+
+ String url(String path) => "http://127.0.0.1:${server.port}$path";
+
+ test("network image sends headers but keys the cache on the url", () async {
+ await fetchTorAwareBytes(
+ url("/a.png"),
+ headers: {"Authorization": "Bearer abc"},
+ );
+ expect(requests.single.headers.value("Authorization"), "Bearer abc");
+
+ expect(
+ TorAwareNetworkImage(
+ url("/a.png"),
+ headers: const {"Authorization": "a"},
+ ),
+ TorAwareNetworkImage(
+ url("/a.png"),
+ headers: const {"Authorization": "b"},
+ ),
+ );
+ });
+
+ test("network image cache is scoped by cacheScope", () {
+ expect(
+ TorAwareNetworkImage(url("/a.png"), cacheScope: "customer-a"),
+ TorAwareNetworkImage(url("/a.png"), cacheScope: "customer-a"),
+ );
+ expect(
+ TorAwareNetworkImage(url("/a.png"), cacheScope: "customer-a"),
+ isNot(TorAwareNetworkImage(url("/a.png"), cacheScope: "customer-b")),
+ );
+ expect(
+ TorAwareNetworkImage(url("/a.png"), cacheScope: "customer-a"),
+ isNot(TorAwareNetworkImage(url("/a.png"))),
+ );
+ });
+}
### test/wallets/ethereum_tor_proxy_test.dart
@@ -0,0 +1,148 @@
+import 'dart:convert';
+import 'dart:io';
+import 'dart:typed_data';
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mockito/mockito.dart';
+import 'package:stackwallet/services/tor_service.dart';
+import 'package:stackwallet/utilities/prefs.dart';
+import 'package:stackwallet/wallets/wallet/impl/ethereum_wallet.dart';
+
+class _MockPrefs extends Mock implements Prefs {
+ _MockPrefs(this._useTor);
+
+ final bool _useTor;
+
+ @override
+ bool get useTor => _useTor;
+}
+
+class _FakeTorService extends Fake implements TorService {
+ _FakeTorService(this.proxyInfo);
+
+ final ({InternetAddress host, int port}) proxyInfo;
+ int proxyInfoReads = 0;
+
+ @override
+ ({InternetAddress host, int port}) getProxyInfo() {
+ proxyInfoReads++;
+ return proxyInfo;
+ }
+}
+
+const _rpcBody = '{"jsonrpc":"2.0","id":0,"result":"0x2a"}';
+
+String _rpcHttpResponse() =>
+ 'HTTP/1.1 200 OK\r\n'
+ 'Content-Type: application/json\r\n'
+ 'Content-Length: ${_rpcBody.length}\r\n'
+ 'Connection: close\r\n\r\n'
+ '$_rpcBody';
+
+// Minimal SOCKS5 server that records the CONNECT target and answers the
+// tunnelled HTTP request with a canned JSON-RPC eth_blockNumber result.
+class _FakeSocksServer {
+ late final ServerSocket _server;
+ int? addressType;
+ String? target;
+ int? port;
+ final request = StringBuffer();
+
+ int get listeningPort => _server.port;
+
+ Future<void> start() async {
+ _server = await ServerSocket.bind(InternetAddress.loopbackIPv4, 0);
+ _server.listen((socket) {
+ var stage = 0;
+ socket.listen((Uint8List bytes) {
+ switch (stage) {
+ case 0:
+ socket.add([0x05, 0x00]);
+ stage = 1;
+ case 1:
+ addressType = bytes[3];
+ if (addressType == 0x03) {
+ target = String.fromCharCodes(bytes.sublist(5, 5 + bytes[4]));
+ } else {
+ target = bytes.sublist(4, bytes.length - 2).join('.');
+ }
+ port = (bytes[bytes.length - 2] << 8) | bytes[bytes.length - 1];
+ socket.add([0x05, 0x00, 0x00, 0x01, 0, 0, 0, 0, 0, 0]);
+ stage = 2;
+ case 2:
+ request.write(utf8.decode(bytes, allowMalformed: true));
+ socket.write(_rpcHttpResponse());
+ socket.close();
+ stage = 3;
+ default:
+ request.write(utf8.decode(bytes, allowMalformed: true));
+ }
+ });
+ });
+ }
+
+ Future<void> stop() => _server.close();
+}
+
+void main() {
+ late _FakeSocksServer socks;
+
+ setUp(() async {
+ socks = _FakeSocksServer();
+ await socks.start();
+ });
+
+ tearDown(() => socks.stop());
+
+ test('web3 client sends RPC through the Tor SOCKS5 proxy', () async {
+ final torService = _FakeTorService((
+ host: InternetAddress.loopbackIPv4,
+ port: socks.listeningPort,
+ ));
+ final client = EthereumWallet.createWeb3Client(
+ 'http://eth.example.invalid:8545',
+ _MockPrefs(true),
+ torService,
+ );
+
+ final height = await client.getBlockNumber();
+ await client.dispose();
+
+ expect(height, 42);
+ expect(torService.proxyInfoReads, 1);
+ // Hostname goes to the proxy, so there is no local DNS lookup.
+ expect(socks.addressType, 0x03);
+ expect(socks.target, 'eth.example.invalid');
+ expect(socks.port, 8545);
+ expect(socks.request.toString(), contains('eth_blockNumber'));
+ });
+
+ test('web3 client connects directly when Tor is off', () async {
+ final server = await HttpServer.bind(InternetAddress.loopbackIPv4, 0);
+ server.listen((req) async {
+ await utf8.decoder.bind(req).join();
+ req.response
+ ..headers.contentType = ContentType.json
+ ..write(_rpcBody);
+ await req.response.close();
+ });
+
+ final torService = _FakeTorService((
+ host: InternetAddress.loopbackIPv4,
+ port: socks.listeningPort,
+ ));
+ final client = EthereumWallet.createWeb3Client(
+ 'http://127.0.0.1:${server.port}',
+ _MockPrefs(false),
+ torService,
+ );
+
+ final height = await client.getBlockNumber();
+ await client.dispose();
+ await server.close(force: true);
+
+ expect(height, 42);
+ expect(torService.proxyInfoReads, 0);
+ expect(socks.target, isNull);
+ });
+}Why this scored 47/100
Community notes
Notes can correct, qualify, or add evidence to the AI analysis. Every note shown here has been validated by a human moderator.
The AI analysis stands alone for now. Submit a note if you can add evidence or important context.