Merge branch 'staging' into fix/desktop-address-book-chooser
What changed, and why it matters
This large merge commit mostly hardens privacy and fixes amount-input bugs. It routes remote images through Tor when the user has Tor enabled, switches several coins (Fact0rn, Ethereum, Nano) to support Tor, and rewrites amount parsing so changing currency units or locales does not accidentally alter the value being sent. It also migrates existing Fact0rn default nodes to allow Tor while leaving user-customised nodes untouched, and stops Ethereum/Stellar node tests from silently bypassing the Tor proxy.
Reviewers should verify that all prior Image.network/SvgPicture.network call sites in the changed files are covered, that the new Tor proxy client is disposed correctly in long-lived Ethereum wallet loops, and that the amount-lock logic does not skip legitimate user edits. The DB migration tests look solid but should be run against real Fact0rn node records. No CVE or advisory is referenced in the materials, so treat this as a routine privacy/bug-fix merge unless a public disclosure emerges.
Security signals we found
Network traffic that previously bypassed Tor (Image.network/SvgPicture.network) is now routed through Tor when enabled, preventing clearnet IP leaks for remote icons, theme previews, CakePay/ShopInBit images, and exchange provider logos.
Default Fact0rn node is migrated to allow Tor, reducing fingerprinting for existing users, with a guard that preserves user-edited node settings.
Ethereum and Stellar node connections now respect the Tor preference instead of silently using clearnet.
Amount-input recursion bug fixed: changing locale or unit no longer re-parses the displayed text and accidentally changes the send/stake/filter amount.
ShopInBit attachment proxy switched from query-auth URL to header auth, keeping bearer token and customer key out of logged URLs.
Ethereum node form now keeps the port inside the URL for Ethereum (because the port field is ignored), and exposes Tor/clearnet/both radio options for Ethereum nodes.
Evidence from the diff
The patch introduces TorAwareNetworkImage/TorAwareSvgNetworkLoader to replace Image.network/SvgPicture.network across ~15 UI files, ensuring image fetches respect the Tor preference and do not fall back to clearnet. It adds Tor support to Ethereum, Fact0rn and Nano currencies, updates the default Fact0rn node to torEnabled=true, and adds a DB migration (v17→v18) that flips the flag only for untouched default Fact0rn nodes. Ethereum wallet RPCs now build a SOCKS5-proxied web3dart client when Tor is on and throw NodeTorMismatchConfigException for Tor/node-option mismatches; a _TorPreferenceClient rejects requests if the Tor preference changed after the client was created. Stellar node testing also proxies through Tor when enabled. Amount handling is refactored: a new AmountParser.tryParseEditable is used directly on user input, while display updates are wrapped with locks (_updateAmountDisplay) so programmatic locale/unit changes do not recurse into new parses and corrupt the canonical amount. Several send views, token send views, the Salvium stake view, the Frost multisig recipient, and transaction filter parsing are updated accordingly, with extensive new widget/unit tests.
Changed components
lib/networking/tor_aware_network_image.dart (new)lib/db/db_version_migration.dartlib/wallets/wallet/impl/ethereum_wallet.dartlib/wallets/crypto_currency/coins/ethereum.dartlib/wallets/crypto_currency/coins/fact0rn.dartlib/wallets/crypto_currency/intermediate/nano_currency.dartlib/utilities/test_eth_node_connection.dartlib/utilities/test_stellar_node_connection.dartlib/utilities/amount/amount_parser.dart (new)lib/utilities/amount/amount_field_relocalization.dartlib/utilities/amount/amount_formatter.dartlib/pages/send_view/send_view.dartlib/pages/send_view/token_send_view.dartlib/pages/send_view/frost_ms/recipient.dartlib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_send.dartlib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_token_send.dartlib/pages/salvium_stake/salvium_create_stake_view.dartlib/pages/wallet_view/transaction_views/transaction_search_filter_view.dartlib/pages/settings_views/global_settings_view/manage_nodes_views/add_edit_node_view.dartlib/pages/shopinbit/shopinbit_ticket_detail.dartlib/services/shopinbit/src/client.dartMultiple image/icon widgets now using TorAwareNetworkImage/TorAwareSvgNetworkLoaderInspect captured patch +2301 / −462
### 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/salvium_stake/salvium_create_stake_view.dart
@@ -11,6 +11,7 @@ import '../../themes/stack_colors.dart';
import '../../utilities/amount/amount.dart';
import '../../utilities/amount/amount_field_relocalization.dart';
import '../../utilities/amount/amount_formatter.dart';
+import '../../utilities/amount/amount_parser.dart';
import '../../utilities/amount/amount_input_formatter.dart';
import '../../utilities/amount/amount_unit.dart';
import '../../utilities/enums/fee_rate_type_enum.dart';
@@ -58,9 +59,14 @@ class _SalviumCreateStakeViewState
}
void _parseAmount(String string) {
- final cryptoAmount = ref
- .read(pAmountFormatter(ref.read(pWalletCoin(widget.walletId))))
- .tryParseEditable(string);
+ if (_updatingAmountDisplay) return;
+ final coin = ref.read(pWalletCoin(widget.walletId));
+ final cryptoAmount = AmountParser.tryParseEditable(
+ string,
+ locale: ref.read(localeServiceChangeNotifierProvider).locale,
+ unit: ref.read(pAmountUnit(coin)),
+ coin: coin,
+ );
if (_amount != cryptoAmount) {
setState(() {
@@ -69,6 +75,18 @@ class _SalviumCreateStakeViewState
}
}
+ bool _updatingAmountDisplay = false;
+
+ void _updateAmountDisplay(VoidCallback update) {
+ final wasUpdating = _updatingAmountDisplay;
+ _updatingAmountDisplay = true;
+ try {
+ update();
+ } finally {
+ _updatingAmountDisplay = wasUpdating;
+ }
+ }
+
bool _lock = false;
Future<void> _previewPressed() async {
if (_lock) return;
@@ -289,7 +307,18 @@ class _SalviumCreateStakeViewState
final locale = ref.watch(
localeServiceChangeNotifierProvider.select((s) => s.locale),
);
- listenForAmountRelocalization(ref.listen, controllers: [_amountController]);
+ listenForAmountRelocalization(
+ ref.listen,
+ controllers: [_amountController],
+ updateControllers: _updateAmountDisplay,
+ );
+ ref.listen<AmountFormatter>(pAmountFormatter(coin), (previous, next) {
+ if (previous?.unit != next.unit && _amount != null) {
+ _updateAmountDisplay(() {
+ _amountController.text = next.formatEditable(_amount!);
+ });
+ }
+ });
return ConditionalParent(
condition: !Util.isDesktop,
### lib/pages/send_view/frost_ms/recipient.dart
@@ -8,6 +8,7 @@ import '../../../utilities/address_utils.dart';
import '../../../utilities/amount/amount.dart';
import '../../../utilities/amount/amount_field_relocalization.dart';
import '../../../utilities/amount/amount_formatter.dart';
+import '../../../utilities/amount/amount_parser.dart';
import '../../../utilities/amount/amount_input_formatter.dart';
import '../../../utilities/amount/amount_unit.dart';
import '../../../utilities/barcode_scanner_interface.dart';
@@ -85,17 +86,32 @@ class _RecipientState extends ConsumerState<Recipient> {
late final FocusNode addressFocusNode, amountFocusNode;
bool _addressIsEmpty = true;
- final bool _cryptoAmountChangeLock = false;
+ bool _cryptoAmountChangeLock = false;
bool get isSingle => widget.remove == null;
RecipientId get _id => (walletId: widget.walletId, index: widget.index);
+ Amount? _parseAmount() => AmountParser.tryParseEditable(
+ amountController.text,
+ locale: ref.read(localeServiceChangeNotifierProvider).locale,
+ unit: ref.read(pAmountUnit(widget.coin)),
+ coin: widget.coin,
+ );
+
+ void _updateAmountDisplay(VoidCallback update) {
+ final wasLocked = _cryptoAmountChangeLock;
+ _cryptoAmountChangeLock = true;
+ try {
+ update();
+ } finally {
+ _cryptoAmountChangeLock = wasLocked;
+ }
+ }
+
void _updateRecipientData({String? label, bool replaceLabel = false}) {
final address = addressController.text;
- final amount = ref
- .read(pAmountFormatter(widget.coin))
- .tryParseEditable(amountController.text);
+ final amount = _parseAmount();
final previous = ref.read(pRecipient(_id));
ref.read(pRecipient(_id).notifier).state = (
@@ -174,9 +190,7 @@ class _RecipientState extends ConsumerState<Recipient> {
void _cryptoAmountChanged() async {
if (!_cryptoAmountChangeLock) {
- Amount? cryptoAmount = ref
- .read(pAmountFormatter(widget.coin))
- .tryParseEditable(amountController.text);
+ Amount? cryptoAmount = _parseAmount();
if (cryptoAmount != null) {
if (ref.read(pRecipient(_id))?.amount != null &&
ref.read(pRecipient(_id))?.amount == cryptoAmount) {
@@ -299,15 +313,21 @@ class _RecipientState extends ConsumerState<Recipient> {
final String locale = ref.watch(
localeServiceChangeNotifierProvider.select((value) => value.locale),
);
- listenForAmountRelocalization(ref.listen, controllers: [amountController]);
+ listenForAmountRelocalization(
+ ref.listen,
+ controllers: [amountController],
+ updateControllers: _updateAmountDisplay,
+ );
// Keep the amount, rather than the number typed, when the unit changes.
ref.listen<AmountFormatter>(pAmountFormatter(widget.coin), (
previous,
next,
) {
final amount = ref.read(pRecipient(_id))?.amount;
if (previous?.unit != next.unit && amount != null) {
- amountController.text = next.formatEditable(amount);
+ _updateAmountDisplay(() {
+ amountController.text = next.formatEditable(amount);
+ });
}
});
### lib/pages/send_view/send_view.dart
@@ -39,6 +39,7 @@ import '../../utilities/address_utils.dart';
import '../../utilities/amount/amount.dart';
import '../../utilities/amount/amount_field_relocalization.dart';
import '../../utilities/amount/amount_formatter.dart';
+import '../../utilities/amount/amount_parser.dart';
import '../../utilities/amount/amount_input_formatter.dart';
import '../../utilities/amount/amount_unit.dart';
import '../../utilities/assets.dart';
@@ -567,6 +568,7 @@ class _SendViewState extends ConsumerState<SendView> {
}
void _fiatFieldChanged(String baseAmountString) {
+ _xelisSendAll = false;
final baseAmount = Amount.tryParseFiatString(
baseAmountString,
locale: ref.read(localeServiceChangeNotifierProvider).locale,
@@ -616,12 +618,26 @@ class _SendViewState extends ConsumerState<SendView> {
bool _xelisSendAll = false;
+ // Controller assignments used for display must not edit the stored amount.
+ void _updateAmountDisplay(VoidCallback update) {
+ final wasLocked = _cryptoAmountChangeLock;
+ _cryptoAmountChangeLock = true;
+ try {
+ update();
+ } finally {
+ _cryptoAmountChangeLock = wasLocked;
+ }
+ }
+
void _cryptoAmountChanged() async {
- _xelisSendAll = false;
if (!_cryptoAmountChangeLock) {
- final cryptoAmount = ref
- .read(pAmountFormatter(coin))
- .tryParseEditable(cryptoAmountController.text);
+ _xelisSendAll = false;
+ final cryptoAmount = AmountParser.tryParseEditable(
+ cryptoAmountController.text,
+ locale: ref.read(localeServiceChangeNotifierProvider).locale,
+ unit: ref.read(pAmountUnit(coin)),
+ coin: coin,
+ );
final Amount? amount;
if (cryptoAmount != null) {
amount = cryptoAmount;
@@ -1710,15 +1726,17 @@ class _SendViewState extends ConsumerState<SendView> {
listenForAmountRelocalization(
ref.listen,
controllers: [cryptoAmountController, baseAmountController],
- onRelocalized: _cryptoAmountChanged,
+ updateControllers: _updateAmountDisplay,
);
// Keep the amount, rather than the number typed, when the unit changes.
ref.listen<AmountFormatter>(pAmountFormatter(coin), (previous, next) {
final amount = ref.read(pSendAmount);
if (previous?.unit != next.unit && amount != null) {
// Only the display changes, so keep the send all intent.
final xelisSendAll = _xelisSendAll;
- cryptoAmountController.text = next.formatEditable(amount);
+ _updateAmountDisplay(() {
+ cryptoAmountController.text = next.formatEditable(amount);
+ });
_xelisSendAll = xelisSendAll;
}
});
### lib/pages/send_view/token_send_view.dart
@@ -27,6 +27,7 @@ import '../../utilities/address_utils.dart';
import '../../utilities/amount/amount.dart';
import '../../utilities/amount/amount_field_relocalization.dart';
import '../../utilities/amount/amount_formatter.dart';
+import '../../utilities/amount/amount_parser.dart';
import '../../utilities/amount/amount_input_formatter.dart';
import '../../utilities/amount/amount_unit.dart';
import '../../utilities/assets.dart';
@@ -294,14 +295,26 @@ class _TokenSendViewState extends ConsumerState<TokenSendView> {
_updatePreviewButtonState(_address, _amountToSend);
}
+ // Controller assignments used for display must not edit the stored amount.
+ void _updateAmountDisplay(VoidCallback update) {
+ final wasLocked = _cryptoAmountChangeLock;
+ _cryptoAmountChangeLock = true;
+ try {
+ update();
+ } finally {
+ _cryptoAmountChangeLock = wasLocked;
+ }
+ }
+
void _cryptoAmountChanged() async {
if (!_cryptoAmountChangeLock) {
- final cryptoAmount = ref
- .read(pAmountFormatter(coin))
- .tryParseEditable(
- cryptoAmountController.text,
- tokenContract: tokenContract,
- );
+ final cryptoAmount = AmountParser.tryParseEditable(
+ cryptoAmountController.text,
+ locale: ref.read(localeServiceChangeNotifierProvider).locale,
+ unit: ref.read(pAmountUnit(coin)),
+ coin: coin,
+ tokenContract: tokenContract,
+ );
if (cryptoAmount != null) {
_amountToSend = cryptoAmount;
if (_cachedAmountToSend != null &&
@@ -656,8 +669,15 @@ class _TokenSendViewState extends ConsumerState<TokenSendView> {
listenForAmountRelocalization(
ref.listen,
controllers: [cryptoAmountController, baseAmountController],
- onRelocalized: _cryptoAmountChanged,
+ updateControllers: _updateAmountDisplay,
);
+ ref.listen<AmountFormatter>(pAmountFormatter(coin), (previous, next) {
+ if (previous?.unit != next.unit && _amountToSend != null) {
+ _updateAmountDisplay(() {
+ cryptoAmountController.text = next.formatEditable(_amountToSend!);
+ });
+ }
+ });
// ethFee is checked in the ValueListenableBuilder around the preview
// button so fee keystrokes don't rebuild this whole view.
final previewEnabled = ref
### 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/hidden_settings.dart
@@ -41,17 +41,17 @@ class HiddenSettings extends StatelessWidget {
padding: const EdgeInsets.all(8.0),
child: AppBarIconButton(
size: 32,
- color: Theme.of(
- context,
- ).extension<StackColors>()!.textFieldDefaultBG,
+ color: Theme.of(context)
+ .extension<StackColors>()!
+ .textFieldDefaultBG,
shadows: const [],
icon: SvgPicture.asset(
Assets.svg.arrowLeft,
width: 18,
height: 18,
- color: Theme.of(
- context,
- ).extension<StackColors>()!.topNavIconPrimary,
+ color: Theme.of(context)
+ .extension<StackColors>()!
+ .topNavIconPrimary,
),
onPressed: Navigator.of(context).pop,
),
### lib/pages/settings_views/global_settings_view/manage_nodes_views/add_edit_node_view.dart
@@ -1048,15 +1048,19 @@ class _NodeFormState extends ConsumerState<NodeForm> {
final port = uri.hasPort ? uri.port : 0;
if (port != 0) {
_portController.text = port.toString();
- final noPortUri = Uri(
- scheme: uri.scheme,
- userInfo: uri.userInfo,
- host: uri.host,
- path: uri.path,
- query: uri.hasQuery ? uri.query : null,
- fragment: uri.fragment.isNotEmpty ? uri.fragment : null,
- );
- _hostController.text = noPortUri.toString();
+ // eth connects to the host url as is and ignores the port
+ // field, so the port has to stay in the url
+ if (widget.coin is! Ethereum) {
+ final noPortUri = Uri(
+ scheme: uri.scheme,
+ userInfo: uri.userInfo,
+ host: uri.host,
+ path: uri.path,
+ query: uri.hasQuery ? uri.query : null,
+ fragment: uri.fragment.isNotEmpty ? uri.fragment : null,
+ );
+ _hostController.text = noPortUri.toString();
+ }
}
} catch (_) {
if (newValue.contains(":")) {
@@ -1471,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/pages/wallet_view/transaction_views/transaction_search_filter_view.dart
@@ -19,6 +19,8 @@ import '../../../themes/theme_providers.dart';
import '../../../utilities/amount/amount.dart';
import '../../../utilities/amount/amount_field_relocalization.dart';
import '../../../utilities/amount/amount_formatter.dart';
+import '../../../utilities/amount/amount_parser.dart';
+import '../../../utilities/amount/amount_unit.dart';
import '../../../utilities/amount/amount_input_formatter.dart';
import '../../../utilities/constants.dart';
import '../../../utilities/text_styles.dart';
@@ -39,15 +41,21 @@ import '../../../widgets/textfield_icon_button.dart';
({bool isValid, Amount? amount}) parseTransactionFilterAmountInput({
required String text,
required String locale,
- required AmountFormatter formatter,
+ required AmountUnit unit,
+ required CryptoCurrency coin,
}) {
final decimalSeparator =
Util.getSymbolsFor(locale: locale)?.DECIMAL_SEP ?? ".";
if (text.isEmpty || text == decimalSeparator) {
return (isValid: true, amount: null);
}
- final amount = formatter.tryParseEditable(text);
+ final amount = AmountParser.tryParseEditable(
+ text,
+ locale: locale,
+ unit: unit,
+ coin: coin,
+ );
return (isValid: amount != null, amount: amount);
}
@@ -653,7 +661,8 @@ class _TransactionSearchViewState
final parsedAmount = parseTransactionFilterAmountInput(
text: _amountTextEditingController.text,
locale: locale,
- formatter: ref.read(pAmountFormatter(widget.coin)),
+ unit: ref.read(pAmountUnit(widget.coin)),
+ coin: widget.coin,
);
if (!parsedAmount.isValid) {
return;
### lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_send.dart
@@ -45,6 +45,7 @@ import '../../../../utilities/address_utils.dart';
import '../../../../utilities/amount/amount.dart';
import '../../../../utilities/amount/amount_field_relocalization.dart';
import '../../../../utilities/amount/amount_formatter.dart';
+import '../../../../utilities/amount/amount_parser.dart';
import '../../../../utilities/amount/amount_input_formatter.dart';
import '../../../../utilities/amount/amount_unit.dart';
import '../../../../utilities/assets.dart';
@@ -996,12 +997,26 @@ class _DesktopSendState extends ConsumerState<DesktopSend> {
bool _xelisSendAll = false;
+ // Controller assignments used for display must not edit the stored amount.
+ void _updateAmountDisplay(VoidCallback update) {
+ final wasLocked = _cryptoAmountChangeLock;
+ _cryptoAmountChangeLock = true;
+ try {
+ update();
+ } finally {
+ _cryptoAmountChangeLock = wasLocked;
+ }
+ }
+
void _cryptoAmountChanged() async {
- _xelisSendAll = false;
if (!_cryptoAmountChangeLock) {
- final cryptoAmount = ref
- .read(pAmountFormatter(coin))
- .tryParseEditable(cryptoAmountController.text);
+ _xelisSendAll = false;
+ final cryptoAmount = AmountParser.tryParseEditable(
+ cryptoAmountController.text,
+ locale: ref.read(localeServiceChangeNotifierProvider).locale,
+ unit: ref.read(pAmountUnit(coin)),
+ coin: coin,
+ );
final Amount? amount;
if (cryptoAmount != null) {
amount = cryptoAmount;
@@ -1438,6 +1453,7 @@ class _DesktopSendState extends ConsumerState<DesktopSend> {
}
void fiatTextFieldOnChanged(String baseAmountString) {
+ _xelisSendAll = false;
final baseAmount = Amount.tryParseFiatString(
baseAmountString,
locale: ref.read(localeServiceChangeNotifierProvider).locale,
@@ -1648,15 +1664,17 @@ class _DesktopSendState extends ConsumerState<DesktopSend> {
listenForAmountRelocalization(
ref.listen,
controllers: [cryptoAmountController, baseAmountController],
- onRelocalized: _cryptoAmountChanged,
+ updateControllers: _updateAmountDisplay,
);
// Keep the amount, rather than the number typed, when the unit changes.
ref.listen<AmountFormatter>(pAmountFormatter(coin), (previous, next) {
final amount = ref.read(pSendAmount);
if (previous?.unit != next.unit && amount != null) {
// Only the display changes, so keep the send all intent.
final xelisSendAll = _xelisSendAll;
- cryptoAmountController.text = next.formatEditable(amount);
+ _updateAmountDisplay(() {
+ cryptoAmountController.text = next.formatEditable(amount);
+ });
_xelisSendAll = xelisSendAll;
}
});
### lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_token_send.dart
@@ -29,6 +29,7 @@ import '../../../../utilities/address_utils.dart';
import '../../../../utilities/amount/amount.dart';
import '../../../../utilities/amount/amount_field_relocalization.dart';
import '../../../../utilities/amount/amount_formatter.dart';
+import '../../../../utilities/amount/amount_parser.dart';
import '../../../../utilities/amount/amount_input_formatter.dart';
import '../../../../utilities/amount/amount_unit.dart';
import '../../../../utilities/clipboard_interface.dart';
@@ -373,14 +374,26 @@ class _DesktopTokenSendState extends ConsumerState<DesktopTokenSend> {
amount ?? Amount.zeroWith(fractionDigits: tokenDecimals);
}
+ // Controller assignments used for display must not edit the stored amount.
+ void _updateAmountDisplay(VoidCallback update) {
+ final wasLocked = _cryptoAmountChangeLock;
+ _cryptoAmountChangeLock = true;
+ try {
+ update();
+ } finally {
+ _cryptoAmountChangeLock = wasLocked;
+ }
+ }
+
void _cryptoAmountChanged() async {
if (!_cryptoAmountChangeLock) {
- final cryptoAmount = ref
- .read(pAmountFormatter(coin))
- .tryParseEditable(
- cryptoAmountController.text,
- tokenContract: ref.read(pCurrentTokenWallet)!.tokenContract,
- );
+ final cryptoAmount = AmountParser.tryParseEditable(
+ cryptoAmountController.text,
+ locale: ref.read(localeServiceChangeNotifierProvider).locale,
+ unit: ref.read(pAmountUnit(coin)),
+ coin: coin,
+ tokenContract: ref.read(pCurrentTokenWallet)!.tokenContract,
+ );
if (cryptoAmount != null) {
_amountToSend = cryptoAmount;
@@ -700,8 +713,15 @@ class _DesktopTokenSendState extends ConsumerState<DesktopTokenSend> {
listenForAmountRelocalization(
ref.listen,
controllers: [cryptoAmountController, baseAmountController],
- onRelocalized: _cryptoAmountChanged,
+ updateControllers: _updateAmountDisplay,
);
+ ref.listen<AmountFormatter>(pAmountFormatter(coin), (previous, next) {
+ if (previous?.unit != next.unit && _amountToSend != null) {
+ _updateAmountDisplay(() {
+ cryptoAmountController.text = next.formatEditable(_amountToSend!);
+ });
+ }
+ });
final isCustomFee = ref.watch(feeRateTypeDesktopStateProvider).isCustom;
// ethFee is checked in the ValueListenableBuilder around the preview
// button so fee keystrokes don't rebuild this whole view.
### 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/amount/amount_field_relocalization.dart
@@ -57,23 +57,36 @@ void relocalizeAmountController(
/// parsers, then invokes [onRelocalized] so the caller can re-run any
/// parsing/validation that cached state from the old text.
///
+/// [updateControllers] can wrap the assignments to suppress input listeners.
+/// Use it when the caller stores a canonical amount: a display change must not
+/// be interpreted as another edit of that amount.
+///
/// Must be called from a widget's build method with `ref.listen`.
void listenForAmountRelocalization(
ProviderListen<String> listen, {
required List<TextEditingController> controllers,
VoidCallback? onRelocalized,
+ void Function(VoidCallback update)? updateControllers,
}) {
listen(localeServiceChangeNotifierProvider.select((value) => value.locale), (
previous,
next,
) {
if (previous == null || previous == next) return;
- for (final controller in controllers) {
- relocalizeAmountController(
- controller,
- sourceLocale: previous,
- targetLocale: next,
- );
+ void update() {
+ for (final controller in controllers) {
+ relocalizeAmountController(
+ controller,
+ sourceLocale: previous,
+ targetLocale: next,
+ );
+ }
+ }
+
+ if (updateControllers == null) {
+ update();
+ } else {
+ updateControllers(update);
}
onRelocalized?.call();
});
### lib/utilities/amount/amount_formatter.dart
@@ -69,13 +69,4 @@ class AmountFormatter {
String formatEditable(Amount amount) {
return unit.formatEditable(amount: amount, locale: locale);
}
-
- Amount? tryParseEditable(String string, {Contract? tokenContract}) {
- return unit.tryParse(
- string,
- locale: locale,
- coin: coin,
- tokenContract: tokenContract,
- );
- }
}
### lib/utilities/amount/amount_parser.dart
@@ -0,0 +1,24 @@
+import '../../models/isar/models/contract.dart';
+import '../../wallets/crypto_currency/crypto_currency.dart';
+import 'amount.dart';
+import 'amount_unit.dart';
+
+/// Parses editable text using the locale and unit associated with that text.
+///
+/// Parsing deliberately has no provider or cached formatting preferences.
+/// Display updates must preserve the canonical amount instead of parsing their
+/// own output. Only input changes should call this API.
+abstract final class AmountParser {
+ static Amount? tryParseEditable(
+ String text, {
+ required String locale,
+ required AmountUnit unit,
+ required CryptoCurrency coin,
+ Contract? tokenContract,
+ }) => unit.tryParse(
+ text,
+ locale: locale,
+ coin: coin,
+ tokenContract: tokenContract,
+ );
+}
### 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,21 @@
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/http.dart' as http;
+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 +26,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 +93,6 @@ Future<List<TransactionV2>> findReplacedPendingEthereumTransactions({
return replacedTransactions;
}
-// Eth can not use tor with web3dart
-
@visibleForTesting
({BigInt maxFeePerGas, BigInt maxPriorityFeePerGas}) resolveEip1559FeeCaps({
required BigInt baseFee,
@@ -144,12 +150,54 @@ 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. The returned client refuses to send once the tor preference no
+ // longer matches the transport it was built with; see _TorPreferenceClient.
+ static web3.Web3Client createWeb3Client(
+ String url,
+ Prefs prefs,
+ TorService torService,
+ ) {
+ final httpClient = HttpClient();
+
+ if (_shouldProxy(prefs)) {
+ final proxyInfo = torService.getProxyInfo();
+ SocksTCPClient.assignToHttpClient(httpClient, [
+ ProxySettings(proxyInfo.host, proxyInfo.port),
+ ]);
+ }
+
+ return web3.Web3Client(
+ url,
+ _TorPreferenceClient(IOClient(httpClient), prefs),
+ );
}
+ static bool _shouldProxy(Prefs prefs) =>
+ AppConfig.hasFeature(AppFeature.tor) && prefs.useTor;
+
Amount estimateEthFee(BigInt feeRate, int gasLimit, int decimals) {
final gweiAmount = feeRate.toDecimal() / (Decimal.ten.pow(9).toDecimal());
final fee =
@@ -292,8 +340,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 (_) {
@@ -732,3 +780,32 @@ class EthereumWallet extends Bip39Wallet with PrivateKeyInterface {
await super.exit();
}
}
+
+// The proxy is bound to the HttpClient when it is built, but some operations
+// (updateTransactions, the token wallet's tx loop) build one client and reuse
+// it for many RPCs. If the tor preference flips meanwhile, the remaining RPCs
+// would still use the old transport. Fail those instead of sending: the
+// operation errors out and the next one builds a client under the current
+// preference. Nothing is retried here, so a broadcast is never replayed.
+class _TorPreferenceClient extends http.BaseClient {
+ _TorPreferenceClient(this._inner, this._prefs)
+ : _proxied = EthereumWallet._shouldProxy(_prefs);
+
+ final http.Client _inner;
+ final Prefs _prefs;
+ final bool _proxied;
+
+ @override
+ Future<http.StreamedResponse> send(http.BaseRequest request) async {
+ if (EthereumWallet._shouldProxy(_prefs) != _proxied) {
+ throw StateError(
+ 'Tor preference changed since this client was created; '
+ 'the request was not sent',
+ );
+ }
+ return _inner.send(request);
+ }
+
+ @override
+ void close() => _inner.close();
+}
### 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/pages/send_view/amount_display_updates_test.dart
@@ -0,0 +1,240 @@
+import 'dart:io';
+
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:platform/platform.dart' as platform;
+import 'package:stackwallet/models/balance.dart';
+import 'package:stackwallet/models/isar/models/blockchain_data/address.dart';
+import 'package:stackwallet/models/isar/stack_theme.dart';
+import 'package:stackwallet/pages/send_view/send_view.dart';
+import 'package:stackwallet/pages/salvium_stake/salvium_create_stake_view.dart';
+import 'package:stackwallet/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_send.dart';
+import 'package:stackwallet/providers/global/locale_provider.dart';
+import 'package:stackwallet/providers/global/prefs_provider.dart';
+import 'package:stackwallet/providers/global/wallets_provider.dart';
+import 'package:stackwallet/providers/ui/preview_tx_button_state_provider.dart';
+import 'package:stackwallet/services/locale_service.dart';
+import 'package:stackwallet/themes/coin_icon_provider.dart';
+import 'package:stackwallet/themes/stack_colors.dart';
+import 'package:stackwallet/themes/theme_providers.dart';
+import 'package:stackwallet/utilities/amount/amount.dart';
+import 'package:stackwallet/utilities/amount/amount_unit.dart';
+import 'package:stackwallet/utilities/stack_file_system.dart';
+import 'package:stackwallet/utilities/util.dart';
+import 'package:stackwallet/wallets/crypto_currency/crypto_currency.dart';
+import 'package:stackwallet/wallets/isar/models/wallet_info.dart';
+import 'package:stackwallet/wallets/isar/providers/wallet_info_provider.dart';
+import 'package:stackwallet/widgets/desktop/primary_button.dart';
+
+import '../../sample_data/theme_json.dart';
+import '../../wallets/support/xelis_test_fakes.dart';
+
+class _Locale extends LocaleService {
+ String value = 'en_US';
+ @override
+ String get locale => value;
+ void change(String next) {
+ value = next;
+ notifyListeners();
+ }
+}
+
+class _Prefs extends ConfirmationPrefs {
+ @override
+ bool get enableCoinControl => false;
+ AmountUnit selectedUnit = AmountUnit.normal;
+ @override
+ AmountUnit amountUnit(CryptoCurrency coin) => selectedUnit;
+ @override
+ int maxDecimals(CryptoCurrency coin) => coin.fractionDigits;
+ void changeUnit(AmountUnit next) {
+ selectedUnit = next;
+ notifyListeners();
+ }
+}
+
+void main() {
+ const walletId = 'provider-audit-wallet';
+ void setupLayout(WidgetTester tester, bool desktop) {
+ final oldPlatform = Util.layoutPlatform;
+ final oldThemesDir = StackFileSystem.themesDir;
+ Util.layoutPlatform = platform.FakePlatform(
+ operatingSystem: desktop ? 'linux' : 'android',
+ );
+ StackFileSystem.themesDir = Directory('test/sample_data').absolute;
+ tester.view.physicalSize = const Size(1200, 1800);
+ tester.view.devicePixelRatio = 1;
+ addTearDown(() {
+ Util.layoutPlatform = oldPlatform;
+ StackFileSystem.themesDir = oldThemesDir;
+ tester.view.resetPhysicalSize();
+ tester.view.resetDevicePixelRatio();
+ });
+ }
+
+ Future<void> pump(
+ WidgetTester tester,
+ ProviderContainer container,
+ Widget child,
+ ) async {
+ final theme = StackTheme.fromJson(json: lightThemeJsonMap);
+ await tester.pumpWidget(
+ UncontrolledProviderScope(
+ container: container,
+ child: MaterialApp(
+ theme: ThemeData(
+ extensions: [StackColors.fromStackColorTheme(theme)],
+ ),
+ home: Util.isDesktop
+ ? Scaffold(body: SingleChildScrollView(child: child))
+ : child,
+ ),
+ ),
+ );
+ await tester.pumpAndSettle();
+ expect(tester.takeException(), isNull);
+ }
+
+ for (final desktop in [false, true]) {
+ testWidgets('normal send preserves amount on locale change ($desktop)', (
+ tester,
+ ) async {
+ setupLayout(tester, desktop);
+ final wallet = TestWallet(FakeNative());
+ final coin = wallet.cryptoCurrency;
+ final info = WalletInfo(
+ walletId: walletId,
+ name: 'Audit wallet',
+ mainAddressType: AddressType.xelis,
+ coinName: coin.identifier,
+ );
+ final locale = _Locale();
+ final prefs = _Prefs();
+ final theme = StackTheme.fromJson(json: lightThemeJsonMap);
+ final container = ProviderContainer(
+ overrides: [
+ pWallets.overrideWithValue(ConfirmationWallets(wallet)),
+ pWalletInfo(walletId).overrideWithValue(info),
+ pWalletCoin(walletId).overrideWithValue(coin),
+ pWalletName(walletId).overrideWithValue(info.name),
+ pWalletBalance(walletId)
+ .overrideWithValue(Balance.zeroFor(currency: coin)),
+ prefsChangeNotifierProvider.overrideWithValue(prefs),
+ localeServiceChangeNotifierProvider.overrideWithValue(locale),
+ themeProvider.overrideWithProvider(StateProvider((ref) => theme)),
+ coinIconProvider(coin).overrideWithValue(
+ File('test/sample_data/light/assets/dummy.svg').absolute.path,
+ ),
+ ],
+ );
+ addTearDown(container.dispose);
+ await pump(
+ tester,
+ container,
+ desktop
+ ? const DesktopSend(walletId: walletId)
+ : SendView(walletId: walletId, coin: coin),
+ );
+ final field = find.byKey(const Key('amountInputFieldCryptoTextFieldKey'));
+ await tester.enterText(field, '1.25');
+ await tester.pump(const Duration(milliseconds: 600));
+ final expected = container.read(pSendAmount);
+ expect(
+ expected,
+ Amount(
+ rawValue: BigInt.from(125000000),
+ fractionDigits: coin.fractionDigits,
+ ),
+ );
+ locale.change('de_DE');
+ await tester.pump(const Duration(milliseconds: 600));
+ final actual = container.read(pSendAmount);
+ final text = tester.widget<TextField>(field).controller!.text;
+ expect(text, '1,25');
+ await tester.pumpWidget(const SizedBox.shrink());
+ await tester.pumpAndSettle();
+ expect(
+ actual,
+ expected,
+ reason: 'Locale change must preserve the canonical send amount',
+ );
+ });
+ testWidgets('Salvium stake keeps amount and unit consistent ($desktop)', (
+ tester,
+ ) async {
+ setupLayout(tester, desktop);
+ final coin = Salvium(CryptoCurrencyNetwork.main);
+ final prefs = _Prefs();
+ final container = ProviderContainer(
+ overrides: [
+ pWalletCoin(walletId).overrideWithValue(coin),
+ themeProvider.overrideWithProvider(
+ StateProvider(
+ (ref) => StackTheme.fromJson(json: lightThemeJsonMap),
+ ),
+ ),
+ prefsChangeNotifierProvider.overrideWithValue(prefs),
+ localeServiceChangeNotifierProvider.overrideWithValue(_Locale()),
+ ],
+ );
+ addTearDown(container.dispose);
+ await pump(
+ tester,
+ container,
+ const SalviumCreateStakeView(walletId: walletId),
+ );
+ final field = find.byType(TextField).first;
+ await tester.enterText(field, '1.25');
+ await tester.pump();
+ prefs.changeUnit(AmountUnit.milli);
+ await tester.pump();
+ final text = tester.widget<TextField>(field).controller!.text;
+ final preview = find.widgetWithText(PrimaryButton, 'Preview');
+ expect(tester.widget<PrimaryButton>(preview).enabled, true);
+ await tester.pumpWidget(const SizedBox.shrink());
+ await tester.pumpAndSettle();
+ expect(text, '1250', reason: '1.25 SAL must display as 1250 mSAL');
+ });
+ testWidgets('Salvium stake preserves amount on locale change ($desktop)', (
+ tester,
+ ) async {
+ setupLayout(tester, desktop);
+ final coin = Salvium(CryptoCurrencyNetwork.main);
+ final locale = _Locale();
+ final container = ProviderContainer(
+ overrides: [
+ pWalletCoin(walletId).overrideWithValue(coin),
+ themeProvider.overrideWithProvider(
+ StateProvider(
+ (ref) => StackTheme.fromJson(json: lightThemeJsonMap),
+ ),
+ ),
+ prefsChangeNotifierProvider.overrideWithValue(_Prefs()),
+ localeServiceChangeNotifierProvider.overrideWithValue(locale),
+ ],
+ );
+ addTearDown(container.dispose);
+ await pump(
+ tester,
+ container,
+ const SalviumCreateStakeView(walletId: walletId),
+ );
+ final field = find.byType(TextField).first;
+ await tester.enterText(field, '1.25');
+ await tester.pump();
+ final preview = find.widgetWithText(PrimaryButton, 'Preview');
+ expect(tester.widget<PrimaryButton>(preview).enabled, true);
+ locale.change('de_DE');
+ await tester.pump();
+ final enabled = tester.widget<PrimaryButton>(preview).enabled;
+ await tester.pumpWidget(const SizedBox.shrink());
+ await tester.pumpAndSettle();
+ expect(
+ enabled,
+ true,
+ reason: 'Relocalizing the stake must preserve the valid amount',
+ );
+ });
+ }
+}
### test/pages/send_view/amount_input_transition_test.dart
@@ -0,0 +1,262 @@
+import 'dart:io';
+
+import 'package:decimal/decimal.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:platform/platform.dart' as platform;
+import 'package:stackwallet/models/balance.dart';
+import 'package:stackwallet/models/isar/models/blockchain_data/address.dart';
+import 'package:stackwallet/models/isar/stack_theme.dart';
+import 'package:stackwallet/pages/send_view/send_view.dart';
+import 'package:stackwallet/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_send.dart';
+import 'package:stackwallet/providers/global/locale_provider.dart';
+import 'package:stackwallet/providers/global/prefs_provider.dart';
+import 'package:stackwallet/providers/global/price_provider.dart';
+import 'package:stackwallet/providers/global/wallets_provider.dart';
+import 'package:stackwallet/providers/ui/preview_tx_button_state_provider.dart';
+import 'package:stackwallet/services/locale_service.dart';
+import 'package:stackwallet/services/price_service.dart';
+import 'package:stackwallet/themes/coin_icon_provider.dart';
+import 'package:stackwallet/themes/stack_colors.dart';
+import 'package:stackwallet/themes/theme_providers.dart';
+import 'package:stackwallet/utilities/amount/amount.dart';
+import 'package:stackwallet/utilities/amount/amount_unit.dart';
+import 'package:stackwallet/utilities/stack_file_system.dart';
+import 'package:stackwallet/utilities/util.dart';
+import 'package:stackwallet/wallets/crypto_currency/crypto_currency.dart';
+import 'package:stackwallet/wallets/isar/models/wallet_info.dart';
+import 'package:stackwallet/wallets/isar/providers/wallet_info_provider.dart';
+import 'package:stackwallet/wallets/models/tx_data.dart';
+import 'package:stackwallet/widgets/desktop/primary_button.dart';
+
+import '../../sample_data/theme_json.dart';
+import '../../wallets/support/xelis_test_fakes.dart';
+
+class _Locale extends LocaleService {
+ String value = 'en_US';
+ @override
+ String get locale => value;
+ void change(String next) {
+ value = next;
+ notifyListeners();
+ }
+}
+
+class _Prefs extends ConfirmationPrefs {
+ @override
+ bool get enableCoinControl => false;
+ @override
+ bool get externalCalls => true;
+ AmountUnit selectedUnit = AmountUnit.normal;
+ @override
+ AmountUnit amountUnit(CryptoCurrency coin) => selectedUnit;
+ @override
+ int maxDecimals(CryptoCurrency coin) => coin.fractionDigits;
+ void changeUnit(AmountUnit next) {
+ selectedUnit = next;
+ notifyListeners();
+ }
+}
+
+class _Price extends PriceService {
+ _Price() : super('USD');
+ @override
+ ({Decimal value, double change24h})? getPrice(CryptoCurrency coin) =>
+ (value: Decimal.one, change24h: 0);
+}
+
+class _ValidXelis extends Xelis {
+ _ValidXelis() : super(CryptoCurrencyNetwork.test);
+ @override
+ bool validateAddress(String address) => address.isNotEmpty;
+}
+
+class _CaptureWallet extends TestWallet {
+ _CaptureWallet() : super(FakeNative());
+ final _coin = _ValidXelis();
+ @override
+ Xelis get cryptoCurrency => _coin;
+ late WalletInfo testInfo;
+ TxData? captured;
+ @override
+ WalletInfo get info => testInfo;
+ @override
+ Future<TxData> prepareSend({required TxData txData, String? assetId}) async {
+ captured = txData;
+ throw StateError('captured test transaction');
+ }
+}
+
+void main() {
+ const walletId = 'review-wallet';
+ Future<ProviderContainer> mount(
+ WidgetTester tester,
+ bool desktop,
+ _CaptureWallet wallet,
+ _Prefs prefs,
+ _Locale locale,
+ ) async {
+ final oldPlatform = Util.layoutPlatform;
+ final oldThemes = StackFileSystem.themesDir;
+ Util.layoutPlatform = platform.FakePlatform(
+ operatingSystem: desktop ? 'linux' : 'android',
+ );
+ StackFileSystem.themesDir = Directory('test/sample_data').absolute;
+ tester.view.physicalSize = const Size(1200, 1800);
+ tester.view.devicePixelRatio = 1;
+ addTearDown(() {
+ Util.layoutPlatform = oldPlatform;
+ StackFileSystem.themesDir = oldThemes;
+ tester.view.resetPhysicalSize();
+ tester.view.resetDevicePixelRatio();
+ });
+ final coin = wallet.cryptoCurrency;
+ final info = WalletInfo(
+ walletId: walletId,
+ name: 'Test wallet',
+ mainAddressType: AddressType.xelis,
+ coinName: coin.identifier,
+ );
+ wallet.testInfo = info;
+ final theme = StackTheme.fromJson(json: lightThemeJsonMap);
+ final amount = Amount(
+ rawValue: BigInt.from(1000000000),
+ fractionDigits: coin.fractionDigits,
+ );
+ final zero = Amount.zeroWith(fractionDigits: coin.fractionDigits);
+ final balance = Balance(
+ total: amount,
+ spendable: amount,
+ blockedTotal: zero,
+ pendingSpendable: zero,
+ );
+ final container = ProviderContainer(
+ overrides: [
+ pWallets.overrideWithValue(ConfirmationWallets(wallet)),
+ pWalletInfo(walletId).overrideWithValue(info),
+ pWalletCoin(walletId).overrideWithValue(coin),
+ pWalletName(walletId).overrideWithValue(info.name),
+ pWalletBalance(walletId).overrideWithValue(balance),
+ prefsChangeNotifierProvider.overrideWithValue(prefs),
+ localeServiceChangeNotifierProvider.overrideWithValue(locale),
+ priceAnd24hChangeNotifierProvider.overrideWithValue(_Price()),
+ themeProvider.overrideWithProvider(StateProvider((ref) => theme)),
+ coinIconProvider(coin).overrideWithValue(
+ File('test/sample_data/light/assets/dummy.svg').absolute.path,
+ ),
+ ],
+ );
+ addTearDown(container.dispose);
+ final child = desktop
+ ? const DesktopSend(walletId: walletId)
+ : SendView(walletId: walletId, coin: coin);
+ await tester.pumpWidget(
+ UncontrolledProviderScope(
+ container: container,
+ child: MaterialApp(
+ theme: ThemeData(
+ extensions: [StackColors.fromStackColorTheme(theme)],
+ ),
+ home: desktop
+ ? Scaffold(body: SingleChildScrollView(child: child))
+ : child,
+ ),
+ ),
+ );
+ await tester.pumpAndSettle();
+ expect(tester.takeException(), isNull);
+ addTearDown(() async {
+ await tester.pumpWidget(const SizedBox.shrink());
+ await tester.pumpAndSettle();
+ });
+ return container;
+ }
+
+ for (final desktop in [false, true]) {
+ for (final unitFirst in [false, true]) {
+ testWidgets(
+ 'same frame locale and unit desktop=$desktop unitFirst=$unitFirst',
+ (tester) async {
+ final prefs = _Prefs();
+ final locale = _Locale();
+ final container = await mount(
+ tester,
+ desktop,
+ _CaptureWallet(),
+ prefs,
+ locale,
+ );
+ final field = find.byKey(
+ const Key('amountInputFieldCryptoTextFieldKey'),
+ );
+ await tester.enterText(field, '1.2501');
+ await tester.pump(const Duration(milliseconds: 600));
+ final expected = container.read(pSendAmount);
+ if (unitFirst) {
+ prefs.changeUnit(AmountUnit.milli);
+ locale.change('de_DE');
+ } else {
+ locale.change('de_DE');
+ prefs.changeUnit(AmountUnit.milli);
+ }
+ await tester.pump(const Duration(milliseconds: 600));
+ expect(container.read(pSendAmount), expected);
+ expect(tester.widget<TextField>(field).controller!.text, '1250,1');
+ await tester.pumpWidget(const SizedBox.shrink());
+ await tester.pumpAndSettle();
+ },
+ );
+ }
+ testWidgets('fiat input clears send all desktop=$desktop', (tester) async {
+ final prefs = _Prefs();
+ final locale = _Locale();
+ final wallet = _CaptureWallet();
+ final container = await mount(tester, desktop, wallet, prefs, locale);
+ final sendAll = find.textContaining('Send all', findRichText: true);
+ if (sendAll.evaluate().isEmpty) {
+ expect(find.textContaining('Send all'), findsOneWidget);
+ }
+ final sendAllActual = sendAll.evaluate().isEmpty
+ ? find.textContaining('Send all')
+ : sendAll;
+ await tester.ensureVisible(sendAllActual);
+ await tester.tap(sendAllActual);
+ await tester.pump();
+ expect(container.read(pSendAmount)!.decimal, Decimal.fromInt(10));
+ final fiat = find.byKey(const Key('amountInputFieldFiatTextFieldKey'));
+ expect(fiat, findsOneWidget);
+ await tester.enterText(fiat, '1');
+ await tester.pump(const Duration(milliseconds: 600));
+ expect(container.read(pSendAmount)!.decimal, Decimal.one);
+ final address = find.byKey(const Key('sendViewAddressFieldKey'));
+ await tester.enterText(address, 'some-address');
+ await tester.pump();
+ // Trigger the current preview callback without relying on scroll position.
+ if (desktop) {
+ final preview = tester.widget<PrimaryButton>(
+ find.widgetWithText(PrimaryButton, 'Preview send'),
+ );
+ expect(preview.enabled, true);
+ preview.onPressed!();
+ } else {
+ final preview = tester.widget<TextButton>(
+ find.widgetWithText(TextButton, 'Preview'),
+ );
+ expect(preview.onPressed, isNotNull);
+ preview.onPressed!();
+ }
+ await tester.pump(const Duration(milliseconds: 150));
+ await tester.pump(const Duration(milliseconds: 2600));
+ expect(wallet.captured, isNotNull);
+ expect(wallet.captured!.recipients!.single.amount.decimal, Decimal.one);
+ expect(
+ wallet.captured!.xelisSendAll,
+ false,
+ reason: 'Editing the fiat amount must cancel send-all intent',
+ );
+ await tester.pumpWidget(const SizedBox.shrink());
+ await tester.pumpAndSettle();
+ });
+ }
+}
### test/pages/send_view/frost_ms/recipient_test.dart
@@ -30,6 +30,18 @@ class _TestMonero extends Monero {
bool validateAddress(String address) => address.startsWith("address");
}
+class _TestLocaleService extends LocaleService {
+ String _locale = "en_US";
+
+ @override
+ String get locale => _locale;
+
+ void setLocale(String locale) {
+ _locale = locale;
+ notifyListeners();
+ }
+}
+
/// The mobile camera scanner, returning [rawContent].
class _FakeScanner implements BarcodeScannerInterface {
_FakeScanner(this.rawContent);
@@ -59,6 +71,7 @@ void main() {
late List<PaymentUriData> multiRecipientUris;
late _FakeScanner scanner;
late List<String> messages;
+ late _TestLocaleService localeService;
/// Lays widgets out for desktop or mobile on any host platform.
void useLayout({required bool desktop}) {
@@ -85,24 +98,17 @@ void main() {
clipboard = FakeClipboard();
multiRecipientUris = [];
messages = [];
+ localeService = _TestLocaleService();
container = ProviderContainer(
overrides: [
pAmountUnit.overrideWithProvider(
(_) => Provider((ref) => ref.watch(unit)),
),
- pAmountFormatter.overrideWithProvider(
- (coin) => Provider(
- (ref) => AmountFormatter(
- unit: ref.watch(pAmountUnit(coin)),
- locale: "en_US",
- coin: coin,
- maxDecimals: coin.fractionDigits,
- ),
- ),
- ),
- localeServiceChangeNotifierProvider.overrideWithProvider(
- ChangeNotifierProvider((_) => LocaleService()),
+ // Use the production formatter so locale/provider ordering is tested.
+ pMaxDecimals.overrideWithProvider(
+ (coin) => Provider((_) => coin.fractionDigits),
),
+ localeServiceChangeNotifierProvider.overrideWithValue(localeService),
pClipboard.overrideWithValue(clipboard),
pBarcodeScanner.overrideWithValue(scanner),
],
@@ -267,6 +273,52 @@ void main() {
expect(recipient()!.label, isNull);
});
+ for (final desktop in [false, true]) {
+ testWidgets("keeps the recipient amount across locale changes "
+ "on ${desktop ? 'desktop' : 'mobile'}", (tester) async {
+ useLayout(desktop: desktop);
+ await pumpRecipient(
+ tester,
+ initial: (
+ address: "address0",
+ amount: xmr("1.000000000001"),
+ label: "Alice",
+ ),
+ );
+
+ localeService.setLocale("de_DE");
+ await tester.pump();
+ await tester.pump();
+ expect(text(tester, amountField()), "1,000000000001");
+ expect(
+ recipient(),
+ (address: "address0", amount: xmr("1.000000000001"), label: "Alice"),
+ reason:
+ "Changing locale must preserve the stored amount, "
+ "not just its text",
+ );
+
+ await tester.enterText(amountField(), "2,000000000001");
+ await tester.pump();
+ expect(recipient()?.amount, xmr("2.000000000001"));
+
+ localeService.setLocale("en_US");
+ await tester.pump();
+ await tester.pump();
+ expect(text(tester, amountField()), "2.000000000001");
+ expect(recipient()?.amount, xmr("2.000000000001"));
+ expect(recipient()?.label, "Alice");
+
+ await tester.enterText(addressField(), "address1");
+ await tester.pump();
+ expect(recipient(), (
+ address: "address1",
+ amount: xmr("2.000000000001"),
+ label: null,
+ ));
+ });
+ }
+
testWidgets("fills the address, amount, and name from a pasted request", (
tester,
) async {
### test/pages/send_view/recipient_amount_context_test.dart
@@ -0,0 +1,117 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:platform/platform.dart' as platform;
+import 'package:stackwallet/models/isar/stack_theme.dart';
+import 'package:stackwallet/pages/send_view/frost_ms/recipient.dart';
+import 'package:stackwallet/providers/global/locale_provider.dart';
+import 'package:stackwallet/services/locale_service.dart';
+import 'package:stackwallet/themes/stack_colors.dart';
+import 'package:stackwallet/utilities/amount/amount.dart';
+import 'package:stackwallet/utilities/amount/amount_formatter.dart';
+import 'package:stackwallet/utilities/amount/amount_unit.dart';
+import 'package:stackwallet/utilities/util.dart';
+import 'package:stackwallet/wallets/crypto_currency/crypto_currency.dart';
+
+import '../../sample_data/theme_json.dart';
+
+class _TestMonero extends Monero {
+ _TestMonero() : super(CryptoCurrencyNetwork.main);
+ @override
+ bool validateAddress(String address) => address.startsWith("address");
+}
+
+class _Locale extends LocaleService {
+ String _locale = "en_US";
+ @override
+ String get locale => _locale;
+ void setLocale(String l) {
+ _locale = l;
+ notifyListeners();
+ }
+}
+
+void main() {
+ final coin = _TestMonero();
+ const RecipientId id = (walletId: "wallet", index: 1);
+ Amount xmr(String v) =>
+ Amount.tryParseCanonicalAmount(v, fractionDigits: coin.fractionDigits)!;
+
+ for (final unitFirst in [false, true]) {
+ testWidgets('recipient same-frame unit+locale unitFirst=$unitFirst', (
+ tester,
+ ) async {
+ final prev = Util.layoutPlatform;
+ Util.layoutPlatform = platform.FakePlatform(operatingSystem: "android");
+ addTearDown(() => Util.layoutPlatform = prev);
+ final unit = StateProvider((_) => AmountUnit.normal);
+ final locale = _Locale();
+ final container = ProviderContainer(
+ overrides: [
+ pAmountUnit.overrideWithProvider(
+ (_) => Provider((ref) => ref.watch(unit)),
+ ),
+ pMaxDecimals.overrideWithProvider(
+ (coin) => Provider((_) => coin.fractionDigits),
+ ),
+ localeServiceChangeNotifierProvider.overrideWithValue(locale),
+ ],
+ );
+ addTearDown(container.dispose);
+ container.read(pRecipient(id).notifier).state = (
+ address: "address0",
+ amount: xmr("1.2501"),
+ label: null,
+ );
+ await tester.pumpWidget(
+ UncontrolledProviderScope(
+ container: container,
+ child: MaterialApp(
+ theme: ThemeData(
+ extensions: [
+ StackColors.fromStackColorTheme(
+ StackTheme.fromJson(json: lightThemeJsonMap),
+ ),
+ ],
+ ),
+ home: Scaffold(
+ body: SingleChildScrollView(
+ child: Recipient(
+ walletId: id.walletId,
+ index: id.index,
+ displayNumber: 1,
+ coin: coin,
+ remove: () {},
+ addAnotherRecipientTapped: () {},
+ sendAllTapped: () => "",
+ ),
+ ),
+ ),
+ ),
+ ),
+ );
+ final amountField = find.byKey(
+ const Key("amountInputFieldCryptoTextFieldKey"),
+ );
+ final addressField = find.byKey(const Key("sendViewAddressFieldKey"));
+ String text() => tester.widget<TextField>(amountField).controller!.text;
+ expect(text(), "1.2501");
+
+ if (unitFirst) {
+ container.read(unit.notifier).state = AmountUnit.milli;
+ locale.setLocale("de_DE");
+ } else {
+ locale.setLocale("de_DE");
+ container.read(unit.notifier).state = AmountUnit.milli;
+ }
+ await tester.pump();
+ await tester.pump();
+ expect(text(), "1250,1");
+ expect(container.read(pRecipient(id))?.amount, xmr("1.2501"));
+
+ await tester.enterText(addressField, "address1");
+ await tester.pump();
+ expect(container.read(pRecipient(id))?.amount, xmr("1.2501"));
+ });
+ }
+}
### test/pages/send_view/token_amount_display_updates_test.dart
@@ -0,0 +1,271 @@
+import 'dart:io';
+
+import 'package:decimal/decimal.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:platform/platform.dart' as platform;
+import 'package:stackwallet/models/balance.dart';
+import 'package:stackwallet/models/isar/models/blockchain_data/address.dart';
+import 'package:stackwallet/models/isar/models/ethereum/eth_contract.dart';
+import 'package:stackwallet/models/isar/stack_theme.dart';
+import 'package:stackwallet/models/paymint/fee_object_model.dart';
+import 'package:stackwallet/pages/send_view/token_send_view.dart';
+import 'package:stackwallet/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_token_send.dart';
+import 'package:stackwallet/providers/global/locale_provider.dart';
+import 'package:stackwallet/providers/global/prefs_provider.dart';
+import 'package:stackwallet/providers/global/price_provider.dart';
+import 'package:stackwallet/providers/global/wallets_provider.dart';
+import 'package:stackwallet/services/locale_service.dart';
+import 'package:stackwallet/services/price_service.dart';
+import 'package:stackwallet/themes/coin_icon_provider.dart';
+import 'package:stackwallet/themes/stack_colors.dart';
+import 'package:stackwallet/themes/theme_providers.dart';
+import 'package:stackwallet/utilities/amount/amount.dart';
+import 'package:stackwallet/utilities/amount/amount_unit.dart';
+import 'package:stackwallet/utilities/default_eth_tokens.dart';
+import 'package:stackwallet/utilities/stack_file_system.dart';
+import 'package:stackwallet/utilities/util.dart';
+import 'package:stackwallet/wallets/crypto_currency/crypto_currency.dart';
+import 'package:stackwallet/wallets/isar/models/wallet_info.dart';
+import 'package:stackwallet/wallets/isar/providers/eth/current_token_wallet_provider.dart';
+import 'package:stackwallet/wallets/isar/providers/eth/token_balance_provider.dart';
+import 'package:stackwallet/wallets/isar/providers/wallet_info_provider.dart';
+import 'package:stackwallet/wallets/models/tx_data.dart';
+import 'package:stackwallet/wallets/wallet/impl/sub_wallets/eth_token_wallet.dart';
+import 'package:stackwallet/wallets/wallet/wallet.dart';
+import 'package:stackwallet/widgets/desktop/primary_button.dart';
+
+import '../../sample_data/theme_json.dart';
+import '../../wallets/support/xelis_test_fakes.dart';
+
+class _Locale extends LocaleService {
+ String value = 'en_US';
+ @override
+ String get locale => value;
+ void change(String next) {
+ value = next;
+ notifyListeners();
+ }
+}
+
+class _Prefs extends ConfirmationPrefs {
+ AmountUnit value = AmountUnit.normal;
+ @override
+ bool get enableCoinControl => false;
+ @override
+ bool get externalCalls => false;
+ @override
+ AmountUnit amountUnit(CryptoCurrency coin) => value;
+ @override
+ int maxDecimals(CryptoCurrency coin) => coin.fractionDigits;
+ void change(AmountUnit next) {
+ value = next;
+ notifyListeners();
+ }
+}
+
+class _Price extends PriceService {
+ _Price() : super('USD');
+ @override
+ ({Decimal value, double change24h})? getTokenPrice(String contractAddress) =>
+ (value: Decimal.one, change24h: 0);
+}
+
+EthFeeObject get _fees => EthFeeObject(
+ suggestBaseFee: BigInt.one,
+ numberOfBlocksFast: 1,
+ numberOfBlocksAverage: 1,
+ numberOfBlocksSlow: 1,
+ fast: BigInt.one,
+ medium: BigInt.one,
+ slow: BigInt.one,
+);
+
+class _ParentWallet extends Fake implements Wallet<Ethereum> {
+ _ParentWallet(this.info);
+ @override
+ final WalletInfo info;
+ @override
+ Ethereum get cryptoCurrency => info.coin as Ethereum;
+ @override
+ Future<FeeObject> get fees async => _fees;
+ @override
+ Future<Amount> estimateFeeFor(Amount amount, BigInt feeRate) async =>
+ Amount.zeroWith(fractionDigits: 18);
+}
+
+class _TokenWallet extends Fake implements EthTokenWallet {
+ _TokenWallet(this.tokenContract, this.info);
+ @override
+ final EthContract tokenContract;
+ @override
+ final WalletInfo info;
+ @override
+ Ethereum get cryptoCurrency => info.coin as Ethereum;
+ @override
+ Future<EthFeeObject> get fees async => _fees;
+ @override
+ Future<Amount> estimateFeeFor(Amount amount, BigInt feeRate) async =>
+ Amount.zeroWith(fractionDigits: 18);
+ TxData? captured;
+ @override
+ Future<TxData> prepareSend({required TxData txData, String? assetId}) async {
+ captured = txData;
+ throw StateError('capture');
+ }
+}
+
+void main() {
+ const walletId = 'token-r2';
+ for (final desktop in [false, true]) {
+ for (final decimals in [6, 8, 18]) {
+ for (final unitFirst in [false, true]) {
+ testWidgets(
+ 'token input transitions desktop=$desktop decimals=$decimals unitFirst=$unitFirst',
+ (tester) async {
+ final oldPlatform = Util.layoutPlatform;
+ final oldThemes = StackFileSystem.themesDir;
+ Util.layoutPlatform = platform.FakePlatform(
+ operatingSystem: desktop ? 'linux' : 'android',
+ );
+ StackFileSystem.themesDir = Directory('test/sample_data').absolute;
+ tester.view.physicalSize = const Size(1200, 1800);
+ tester.view.devicePixelRatio = 1;
+ addTearDown(() {
+ Util.layoutPlatform = oldPlatform;
+ StackFileSystem.themesDir = oldThemes;
+ tester.view.resetPhysicalSize();
+ tester.view.resetDevicePixelRatio();
+ });
+ final coin = Ethereum(CryptoCurrencyNetwork.main);
+ final contract = DefaultTokens.rsFiro.copyWith(decimals: decimals);
+ final info = WalletInfo(
+ walletId: walletId,
+ name: 'Token test',
+ mainAddressType: AddressType.ethereum,
+ coinName: coin.identifier,
+ );
+ final wallet = _ParentWallet(info);
+ final tokenWallet = _TokenWallet(contract, info);
+ final prefs = _Prefs();
+ final locale = _Locale();
+ final zero = Amount.zeroWith(fractionDigits: decimals);
+ final balance = Balance(
+ total: zero,
+ spendable: zero,
+ blockedTotal: zero,
+ pendingSpendable: zero,
+ );
+ final theme = StackTheme.fromJson(json: lightThemeJsonMap);
+ final container = ProviderContainer(
+ overrides: [
+ pWallets.overrideWithValue(ConfirmationWallets(wallet)),
+ pCurrentTokenWallet.overrideWithValue(tokenWallet),
+ pWalletInfo(walletId).overrideWithValue(info),
+ pWalletCoin(walletId).overrideWithValue(coin),
+ pWalletName(walletId).overrideWithValue(info.name),
+ pTokenBalance((
+ walletId: walletId,
+ contractAddress: contract.address,
+ )).overrideWithValue(balance),
+ prefsChangeNotifierProvider.overrideWithValue(prefs),
+ localeServiceChangeNotifierProvider.overrideWithValue(locale),
+ priceAnd24hChangeNotifierProvider.overrideWithValue(_Price()),
+ themeProvider.overrideWithProvider(
+ StateProvider((ref) => theme),
+ ),
+ coinIconProvider(coin).overrideWithValue(
+ File('test/sample_data/light/assets/dummy.svg').absolute.path,
+ ),
+ ],
+ );
+ addTearDown(container.dispose);
+ final child = desktop
+ ? const DesktopTokenSend(walletId: walletId)
+ : TokenSendView(
+ walletId: walletId,
+ coin: coin,
+ tokenContract: contract,
+ );
+ await tester.pumpWidget(
+ UncontrolledProviderScope(
+ container: container,
+ child: MaterialApp(
+ theme: ThemeData(
+ extensions: [StackColors.fromStackColorTheme(theme)],
+ ),
+ home: desktop
+ ? Scaffold(body: SingleChildScrollView(child: child))
+ : child,
+ ),
+ ),
+ );
+ addTearDown(() async {
+ await tester.pumpWidget(const SizedBox.shrink());
+ await tester.pumpAndSettle();
+ });
+ await tester.pumpAndSettle();
+ expect(tester.takeException(), isNull);
+ final field = find.byKey(
+ const Key('amountInputFieldCryptoTextFieldKey'),
+ );
+ await tester.enterText(field, '1.250001');
+ await tester.pump(const Duration(milliseconds: 600));
+ if (unitFirst) {
+ prefs.change(AmountUnit.milli);
+ locale.change('de_DE');
+ } else {
+ locale.change('de_DE');
+ prefs.change(AmountUnit.milli);
+ }
+ await tester.pump(const Duration(milliseconds: 600));
+ expect(
+ tester.widget<TextField>(field).controller!.text,
+ '1250,001',
+ );
+ final address = find.byKey(
+ Key(
+ desktop
+ ? 'sendViewAddressFieldKey'
+ : 'tokenSendViewAddressFieldKey',
+ ),
+ );
+ await tester.enterText(
+ address,
+ '0x2744ea5ac9b11cb5e3cd63d3a88e858336aeddc2',
+ );
+ await tester.pump();
+ if (desktop) {
+ final preview = tester.widget<PrimaryButton>(
+ find.widgetWithText(PrimaryButton, 'Preview send'),
+ );
+ expect(preview.enabled, true);
+ preview.onPressed!();
+ } else {
+ final preview = tester.widget<TextButton>(
+ find.widgetWithText(TextButton, 'Preview'),
+ );
+ expect(preview.onPressed, isNotNull);
+ preview.onPressed!();
+ }
+ await tester.pump(const Duration(milliseconds: 150));
+ await tester.pump(const Duration(milliseconds: 2600));
+ expect(tokenWallet.captured, isNotNull);
+ final amount = tokenWallet.captured!.recipients!.single.amount;
+ expect(
+ amount,
+ Amount.tryParseCanonicalAmount(
+ '1.250001',
+ fractionDigits: decimals,
+ ),
+ );
+ expect(amount.fractionDigits, decimals);
+ await tester.pumpWidget(const SizedBox.shrink());
+ await tester.pumpAndSettle();
+ },
+ );
+ }
+ }
+ }
+}
### test/pages/wallet_view/transaction_views/transaction_search_filter_view_test.dart
@@ -1,24 +1,17 @@
import "package:flutter_test/flutter_test.dart";
import "package:stackwallet/pages/wallet_view/transaction_views/transaction_search_filter_view.dart";
-import "package:stackwallet/utilities/amount/amount_formatter.dart";
import "package:stackwallet/utilities/amount/amount_unit.dart";
import "package:stackwallet/wallets/crypto_currency/crypto_currency.dart";
void main() {
- AmountFormatter formatter(String locale) => AmountFormatter(
- unit: AmountUnit.normal,
- locale: locale,
- coin: Bitcoin(CryptoCurrencyNetwork.main),
- maxDecimals: 8,
- );
-
test("transaction filter distinguishes empty from malformed amounts", () {
for (final text in ["", "."]) {
expect(
parseTransactionFilterAmountInput(
text: text,
locale: "en_US",
- formatter: formatter("en_US"),
+ unit: AmountUnit.normal,
+ coin: Bitcoin(CryptoCurrencyNetwork.main),
),
(isValid: true, amount: null),
reason: text,
@@ -28,7 +21,8 @@ void main() {
final trailingSeparator = parseTransactionFilterAmountInput(
text: "1.",
locale: "en_US",
- formatter: formatter("en_US"),
+ unit: AmountUnit.normal,
+ coin: Bitcoin(CryptoCurrencyNetwork.main),
);
expect(trailingSeparator.isValid, isTrue);
expect(trailingSeparator.amount?.raw, BigInt.from(100000000));
@@ -38,7 +32,8 @@ void main() {
parseTransactionFilterAmountInput(
text: text,
locale: "en_US",
- formatter: formatter("en_US"),
+ unit: AmountUnit.normal,
+ coin: Bitcoin(CryptoCurrencyNetwork.main),
).isValid,
isFalse,
reason: text,
@@ -51,15 +46,17 @@ void main() {
parseTransactionFilterAmountInput(
text: ",",
locale: "de_DE",
- formatter: formatter("de_DE"),
+ unit: AmountUnit.normal,
+ coin: Bitcoin(CryptoCurrencyNetwork.main),
),
(isValid: true, amount: null),
);
expect(
parseTransactionFilterAmountInput(
text: "1,,",
locale: "de_DE",
- formatter: formatter("de_DE"),
+ unit: AmountUnit.normal,
+ coin: Bitcoin(CryptoCurrencyNetwork.main),
).isValid,
isFalse,
);
### test/utilities/amount/amount_unit_test.dart
@@ -4,6 +4,7 @@ import 'package:flutter_test/flutter_test.dart';
import 'package:stackwallet/models/isar/models/solana/sol_contract.dart';
import 'package:stackwallet/utilities/amount/amount.dart';
import 'package:stackwallet/utilities/amount/amount_formatter.dart';
+import 'package:stackwallet/utilities/amount/amount_parser.dart';
import 'package:stackwallet/utilities/amount/amount_input_formatter.dart';
import 'package:stackwallet/utilities/amount/amount_unit.dart';
import 'package:stackwallet/utilities/util.dart';
@@ -217,7 +218,15 @@ void main() {
maxDecimals: 8,
);
- expect(formatter.tryParseEditable("5")?.decimal, Decimal.fromInt(5));
+ expect(
+ AmountParser.tryParseEditable(
+ "5",
+ locale: formatter.locale,
+ unit: formatter.unit,
+ coin: formatter.coin,
+ )?.decimal,
+ Decimal.fromInt(5),
+ );
for (final value in [
"+5",
@@ -226,15 +235,32 @@ void main() {
for (final codePoint in [0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x20])
"1${String.fromCharCode(codePoint)}234",
]) {
- expect(formatter.tryParseEditable(value), isNull, reason: value);
+ expect(
+ AmountParser.tryParseEditable(
+ value,
+ locale: formatter.locale,
+ unit: formatter.unit,
+ coin: formatter.coin,
+ ),
+ isNull,
+ reason: value,
+ );
expect(
Amount.tryParseFiatString(value, locale: "en_US"),
isNull,
reason: value,
);
}
- expect(formatter.tryParseEditable("0.000000001"), isNull);
+ expect(
+ AmountParser.tryParseEditable(
+ "0.000000001",
+ locale: formatter.locale,
+ unit: formatter.unit,
+ coin: formatter.coin,
+ ),
+ isNull,
+ );
expect(Amount.tryParseFiatString("1.001", locale: "en_US"), isNull);
expect(
@@ -790,7 +816,12 @@ void main() {
);
final text = formatter.formatEditable(amount);
expect(
- formatter.tryParseEditable(text),
+ AmountParser.tryParseEditable(
+ text,
+ locale: formatter.locale,
+ unit: formatter.unit,
+ coin: formatter.coin,
+ ),
amount,
reason: "$locale $unit $text",
);
### test/wallets/ethereum_tor_proxy_test.dart
@@ -0,0 +1,258 @@
+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);
+
+ @override
+ bool 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 connections = 0;
+ 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) {
+ connections++;
+ 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();
+}
+
+// Local node that answers every RPC with the canned result and counts them.
+class _FakeNode {
+ late final HttpServer _server;
+ int requests = 0;
+
+ String get url => 'http://127.0.0.1:${_server.port}';
+
+ Future<void> start() async {
+ _server = await HttpServer.bind(InternetAddress.loopbackIPv4, 0);
+ _server.listen((req) async {
+ requests++;
+ await utf8.decoder.bind(req).join();
+ req.response
+ ..headers.contentType = ContentType.json
+ ..write(_rpcBody);
+ await req.response.close();
+ });
+ }
+
+ Future<void> stop() => _server.close(force: true);
+}
+
+final _torPreferenceChanged = throwsA(
+ isA<StateError>().having(
+ (e) => e.message,
+ 'message',
+ contains('Tor preference changed'),
+ ),
+);
+
+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 node = _FakeNode();
+ await node.start();
+
+ final torService = _FakeTorService((
+ host: InternetAddress.loopbackIPv4,
+ port: socks.listeningPort,
+ ));
+ final client = EthereumWallet.createWeb3Client(
+ node.url,
+ _MockPrefs(false),
+ torService,
+ );
+
+ final height = await client.getBlockNumber();
+ await client.dispose();
+ await node.stop();
+
+ expect(height, 42);
+ expect(node.requests, 1);
+ expect(torService.proxyInfoReads, 0);
+ expect(socks.target, isNull);
+ });
+
+ group('tor preference changed after the client was built', () {
+ late _FakeNode node;
+ late _FakeTorService torService;
+
+ setUp(() async {
+ node = _FakeNode();
+ await node.start();
+ torService = _FakeTorService((
+ host: InternetAddress.loopbackIPv4,
+ port: socks.listeningPort,
+ ));
+ });
+
+ tearDown(() => node.stop());
+
+ test('client built with Tor off refuses to send once Tor is on', () async {
+ final prefs = _MockPrefs(false);
+ final client = EthereumWallet.createWeb3Client(
+ node.url,
+ prefs,
+ torService,
+ );
+
+ expect(await client.getBlockNumber(), 42);
+ expect(node.requests, 1);
+
+ prefs.useTor = true;
+
+ await expectLater(client.getBlockNumber(), _torPreferenceChanged);
+ await client.dispose();
+
+ // Nothing went out directly and nothing was rerouted via the proxy.
+ expect(node.requests, 1);
+ expect(socks.connections, 0);
+ expect(torService.proxyInfoReads, 0);
+ });
+
+ test('client built with Tor on refuses to send once Tor is off', () async {
+ final prefs = _MockPrefs(true);
+ final client = EthereumWallet.createWeb3Client(
+ node.url,
+ prefs,
+ torService,
+ );
+
+ expect(await client.getBlockNumber(), 42);
+ expect(socks.connections, 1);
+ expect(socks.request.toString(), contains('eth_blockNumber'));
+
+ prefs.useTor = false;
+
+ await expectLater(client.getBlockNumber(), _torPreferenceChanged);
+ await client.dispose();
+
+ // No new proxy connection and nothing went to the node directly.
+ expect(socks.connections, 1);
+ expect(node.requests, 0);
+ expect(torService.proxyInfoReads, 1);
+ });
+
+ test('unchanged preference keeps a reused client working', () async {
+ final direct = EthereumWallet.createWeb3Client(
+ node.url,
+ _MockPrefs(false),
+ torService,
+ );
+ expect(await direct.getBlockNumber(), 42);
+ expect(await direct.getBlockNumber(), 42);
+ await direct.dispose();
+ expect(node.requests, 2);
+ expect(socks.connections, 0);
+
+ final proxied = EthereumWallet.createWeb3Client(
+ node.url,
+ _MockPrefs(true),
+ torService,
+ );
+ expect(await proxied.getBlockNumber(), 42);
+ expect(await proxied.getBlockNumber(), 42);
+ await proxied.dispose();
+ expect(node.requests, 2);
+ expect(socks.connections, 2);
+ });
+ });
+}Why this scored 63/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.