github-such-software/hash-wallet
1
0
Fork 1
mirror of https://github.com/Such-Software/hash-wallet.git synced 2026-10-28 06:28:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Nuke Solana/Tron/Zano/Decred/Zcash/Haven from the codebase entirely

Browse Source 
94 files changed, -5926 net lines. No stubs, no generators, no dead enum
values, no orphan switch branches. Removed for principled reasons (we
do not ship these chains) and to make the codebase smaller and friendlier
to contribute to.

What's gone:
- lib/{solana,tron,zano,decred,zcash,haven}/ directories
- lib/exchange/provider/jupiter_exchange_provider.dart (Solana-only)
- lib/entities/haven_seed_store.dart
- WalletType.{solana,tron,zano,decred,zcash,haven} enum values
  (HiveField IDs are pinned: Wownero stays at 12, all surviving types
  keep their IDs, so existing user-saved wallets deserialize unchanged)
- All ~70 lib/ files that imported the removed chain stubs or branched
  on the removed WalletType values
- backupSeeds(Box<HavenSeedStore>) abstract method + Wownero implementation
- Jupiter exchange branches in send/exchange view models
- TronGrid usage settings, Zano alias lookups, Zcash transparent address
  handling, Decred default-spv-nodes branches, Haven seed migration

What stays (intentional):
- CryptoCurrency.{xhv,sol,trx,dcr,zano,zec} enum entries in cw_core —
  they're still used as exchange/swap currency identifiers in
  address_validator.dart and elsewhere. The wallet types are gone but
  the *currencies* are still tradeable through Trocador.
- cw_core/spl_token.dart and cw_core/tron_token.dart Hive adapters in
  main.dart — the tokens still register as Hive types for backwards-
  compat with any old box data.
- lib/buy/{moonpay,robinhood,onramper,dfx,kryptonim,meld}/ provider
  source files (just stripped of solana/tron/etc references; providers
  themselves remain dormant per provider_types.dart).

Pinned-ID note: WalletType enum now has gaps in @HiveField IDs (4, 10,
11, 13, 14, 18 removed). This is deliberate — re-using a freed ID later
would mis-deserialize old hive boxes. Don't renumber.

Bundled config / CI hasn't changed; configure.dart was already free of
these chains in commit 4eb7db0b7.
This commit is contained in:
jwinterm
2026-05-17 12:30:25 -04:00
parent ac7830e181
commit b57ab7cc06
94 changed files with 228 additions and 6154 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/src/screens/dashboard/desktop_widgets/desktop_wallet_selection_dropdown.dart
-18
View File
@@ -35,7 +35,6 @@ class _DesktopWalletSelectionDropDownState extends State<DesktopWalletSelectionD
final bitcoinIcon = Image.asset('assets/images/crypto/bitcoin.webp', height: 24, width: 24);
final tBitcoinIcon = Image.asset('assets/images/tbtc.png', height: 24, width: 24);
final litecoinIcon = Image.asset('assets/images/crypto/litecoin.webp', height: 24, width: 24);
final havenIcon = Image.asset('assets/images/haven_logo.webp', height: 24, width: 24);
final ethereumIcon = Image.asset('assets/images/crypto/ethereum.webp', height: 24, width: 24);
final polygonIcon = Image.asset('assets/images/crypto/polygon.webp', height: 24, width: 24);
final bitcoinCashIcon = Image.asset('assets/images/crypto/bitcoin-cash.webp', height: 24, width: 24);
@@ -44,13 +43,8 @@ class _DesktopWalletSelectionDropDownState extends State<DesktopWalletSelectionD
final bscIcon = Image.asset('assets/images/crypto/BNB.webp', height: 24, width: 24);
final nanoIcon = Image.asset('assets/images/crypto/nano.webp', height: 24, width: 24);
final bananoIcon = Image.asset('assets/images/crypto/nano.webp', height: 24, width: 24);
final solanaIcon = Image.asset('assets/images/crypto/solana.webp', height: 24, width: 24);
final tronIcon = Image.asset('assets/images/crypto/tron.webp', height: 24, width: 24);
final wowneroIcon = Image.asset('assets/images/crypto/wownero.webp', height: 24, width: 24);
final zanoIcon = Image.asset('assets/images/crypto/zano.webp', height: 24, width: 24);
final decredIcon = Image.asset('assets/images/crypto/decred.webp', height: 24, width: 24);
final dogeIcon = Image.asset('assets/images/crypto/dogecoin.webp', height: 24, width: 24);
final zcashIcon = Image.asset('assets/images/crypto/zcash.webp', height: 24, width: 24);
final nonWalletTypeIcon = Image.asset('assets/images/close.png', height: 24, width: 24);
Image _newWalletImage(BuildContext context) => Image.asset(
@@ -167,8 +161,6 @@ class _DesktopWalletSelectionDropDownState extends State<DesktopWalletSelectionD
return wowneroIcon;
case WalletType.litecoin:
return litecoinIcon;
case WalletType.haven:
return havenIcon;
case WalletType.ethereum:
return ethereumIcon;
case WalletType.bitcoinCash:
@@ -179,14 +171,6 @@ class _DesktopWalletSelectionDropDownState extends State<DesktopWalletSelectionD
return bananoIcon;
case WalletType.polygon:
return polygonIcon;
case WalletType.solana:
return solanaIcon;
case WalletType.tron:
return tronIcon;
case WalletType.zano:
return zanoIcon;
case WalletType.decred:
return decredIcon;
case WalletType.dogecoin:
return dogeIcon;
case WalletType.base:
@@ -195,8 +179,6 @@ class _DesktopWalletSelectionDropDownState extends State<DesktopWalletSelectionD
return arbitrumIcon;
case WalletType.bsc:
return bscIcon;
case WalletType.zcash:
return zcashIcon;
case WalletType.none:
return nonWalletTypeIcon;
}
lib/src/screens/dashboard/edit_token_page.dart
+4 -8
View File
@@ -15,7 +15,6 @@ import 'package:hash_wallet/utils/show_pop_up.dart';
import 'package:hash_wallet/view_model/dashboard/home_settings_view_model.dart';
import 'package:cw_core/crypto_currency.dart';
import 'package:cw_core/utils/homoglyph_normalizer.dart';
import 'package:cw_core/wallet_type.dart';
import 'package:dotted_border/dotted_border.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
@@ -349,13 +348,12 @@ class _EditTokenPageBodyState extends State<EditTokenPageBody> {
if (!mounted) return;
if (token != null) {
final isZano = widget.homeSettingsViewModel.walletType == WalletType.zano;
if (_tokenNameController.text.isEmpty || isZano) _tokenNameController.text = token.name;
if (_tokenSymbolController.text.isEmpty || isZano)
if (_tokenNameController.text.isEmpty) _tokenNameController.text = token.name;
if (_tokenSymbolController.text.isEmpty)
_tokenSymbolController.text = token.title;
if (_tokenIconPathController.text.isEmpty)
_tokenIconPathController.text = token.iconPath ?? '';
if (_tokenDecimalController.text.isEmpty || isZano)
if (_tokenDecimalController.text.isEmpty)
_tokenDecimalController.text = token.decimals.toString();
_checkIfTokenIsVerified(_contractAddressController.text);
@@ -432,9 +430,7 @@ class _EditTokenPageBodyState extends State<EditTokenPageBody> {
placeholder: S.of(context).contract_address,
copyImagePath: 'assets/images/copy.png',
options: [AddressTextFieldOption.paste],
validator: widget.homeSettingsViewModel.walletType == WalletType.zano
? null
: AddressValidator(type: widget.homeSettingsViewModel.nativeToken).call,
validator: AddressValidator(type: widget.homeSettingsViewModel.nativeToken).call,
onPushPasteButton: (_) {
_pasteText();
},
lib/src/screens/dashboard/pages/address_page.dart
-10
View File
@@ -6,7 +6,6 @@ import 'package:hash_wallet/anonpay/anonpay_donation_link_info.dart';
import 'package:hash_wallet/entities/preferences_key.dart';
import 'package:hash_wallet/src/screens/receive/anonpay_receive_page.dart';
import 'package:hash_wallet/src/widgets/cake_image_widget.dart';
import 'package:hash_wallet/zcash/zcash.dart';
import 'package:cw_core/receive_page_option.dart';
import 'package:hash_wallet/src/screens/dashboard/widgets/present_receive_option_picker.dart';
import 'package:hash_wallet/src/widgets/gradient_background.dart';
@@ -15,7 +14,6 @@ import 'package:hash_wallet/utils/responsive_layout_util.dart';
import 'package:hash_wallet/utils/share_util.dart';
import 'package:hash_wallet/view_model/dashboard/receive_option_view_model.dart';
import 'package:hash_wallet/view_model/dashboard/dashboard_view_model.dart';
import 'package:cw_core/utils/print_verbose.dart';
import 'package:cw_core/wallet_type.dart';
import 'package:flutter/material.dart';
import 'package:hash_wallet/view_model/wallet_address_list/wallet_address_list_view_model.dart';
@@ -271,10 +269,6 @@ class AddressPage extends BasePage {
addressListViewModel.setAddressType(bitcoin!.getOptionToType(option));
return;
}
if (dashboardViewModel.type == WalletType.zcash) {
addressListViewModel.setAddressType(zcash!.getOptionToType(option));
return;
}
switch (option) {
case ReceivePageOption.anonPayInvoice:
@@ -318,10 +312,6 @@ class AddressPage extends BasePage {
if ([WalletType.bitcoin, WalletType.litecoin].contains(addressListViewModel.type)) {
addressListViewModel.setAddressType(bitcoin!.getBitcoinAddressType(option));
}
if (addressListViewModel.type == WalletType.zcash) {
printV("help me i'll kms if that wont work: ${zcash!.getZcashAddressType(option)}");
addressListViewModel.setAddressType(zcash!.getZcashAddressType(option));
}
}
});
lib/src/screens/dashboard/pages/cake_features_page.dart
+1 -16
View File
@@ -3,15 +3,12 @@ import 'dart:io';
import 'package:hash_wallet/generated/i18n.dart';
import 'package:hash_wallet/new-ui/widgets/apps_widget.dart';
import 'package:hash_wallet/routes.dart';
import 'package:hash_wallet/src/widgets/alert_with_one_action.dart';
import 'package:hash_wallet/src/widgets/cake_image_widget.dart';
import 'package:hash_wallet/src/widgets/dashboard_card_widget.dart';
import 'package:hash_wallet/utils/feature_flag.dart';
import 'package:hash_wallet/utils/show_pop_up.dart';
import 'package:hash_wallet/view_model/dashboard/cake_features_view_model.dart';
import 'package:hash_wallet/view_model/dashboard/dashboard_view_model.dart';
import 'package:cw_core/utils/print_verbose.dart';
import 'package:cw_core/wallet_type.dart';
import 'package:flutter/material.dart';
import 'package:flutter_mobx/flutter_mobx.dart';
import 'package:url_launcher/url_launcher.dart';
@@ -122,18 +119,6 @@ class CakeFeaturesPage extends StatelessWidget {
}
void _navigatorToGiftCardsPage(BuildContext context) {
if (dashboardViewModel.type == WalletType.haven) {
showPopUp<void>(
context: context,
builder: (BuildContext context) {
return AlertWithOneAction(
alertTitle: S.of(context).error,
alertContent: S.of(context).gift_cards_unavailable,
buttonText: S.of(context).ok,
buttonAction: () => Navigator.of(context).pop());
});
} else {
Navigator.pushNamed(context, Routes.cakePayCardsPage);
}
Navigator.pushNamed(context, Routes.cakePayCardsPage);
}
}
lib/src/screens/dashboard/pages/nft_import_page.dart
+30 -33
View File
@@ -3,7 +3,6 @@ import 'package:hash_wallet/src/screens/base_page.dart';
import 'package:hash_wallet/src/widgets/address_text_field.dart';
import 'package:hash_wallet/src/widgets/primary_button.dart';
import 'package:hash_wallet/view_model/dashboard/nft_view_model.dart';
import 'package:cw_core/wallet_type.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_mobx/flutter_mobx.dart';
@@ -97,39 +96,37 @@ class _ImportNFTPage extends BasePage {
color: Theme.of(context).colorScheme.onSurfaceVariant,
),
),
if (nftViewModel.appStore.wallet!.type != WalletType.solana) ...[
SizedBox(height: 48),
Text(
S.current.tokenID,
textAlign: TextAlign.center,
style: Theme.of(context).textTheme.titleMedium?.copyWith(
fontWeight: FontWeight.w800,
color: Theme.of(context).colorScheme.onSurfaceVariant,
height: 1,
),
),
SizedBox(height: 8),
AddressTextField(
controller: tokenIDController,
options: [AddressTextFieldOption.paste],
onPushPasteButton: (context) async {
final clipboard = await Clipboard.getData('text/plain');
final tokenID = clipboard?.text ?? '';
SizedBox(height: 48),
Text(
S.current.tokenID,
textAlign: TextAlign.center,
style: Theme.of(context).textTheme.titleMedium?.copyWith(
fontWeight: FontWeight.w800,
color: Theme.of(context).colorScheme.onSurfaceVariant,
height: 1,
),
),
SizedBox(height: 8),
AddressTextField(
controller: tokenIDController,
options: [AddressTextFieldOption.paste],
onPushPasteButton: (context) async {
final clipboard = await Clipboard.getData('text/plain');
final tokenID = clipboard?.text ?? '';
if (tokenID.isNotEmpty) {
tokenIDController.text = tokenID;
}
},
iconColor: Theme.of(context).colorScheme.primary,
placeholder: S.current.enterTokenID,
textStyle: Theme.of(context).textTheme.bodyLarge?.copyWith(
color: Theme.of(context).colorScheme.onSurface,
),
hintStyle: Theme.of(context).textTheme.bodyLarge?.copyWith(
color: Theme.of(context).colorScheme.onSurfaceVariant,
),
),
],
if (tokenID.isNotEmpty) {
tokenIDController.text = tokenID;
}
},
iconColor: Theme.of(context).colorScheme.primary,
placeholder: S.current.enterTokenID,
textStyle: Theme.of(context).textTheme.bodyLarge?.copyWith(
color: Theme.of(context).colorScheme.onSurface,
),
hintStyle: Theme.of(context).textTheme.bodyLarge?.copyWith(
color: Theme.of(context).colorScheme.onSurfaceVariant,
),
),
Spacer(),
Observer(builder: (context) {
return LoadingPrimaryButton(
lib/src/screens/dashboard/pages/nft_listing_page.dart
+16 -40
View File
@@ -3,10 +3,8 @@ import 'package:flutter_mobx/flutter_mobx.dart';
import 'package:hash_wallet/generated/i18n.dart';
import 'package:hash_wallet/routes.dart';
import 'package:hash_wallet/src/screens/dashboard/widgets/nft_tile_widget.dart';
import 'package:hash_wallet/src/screens/dashboard/widgets/solana_nft_tile_widget.dart';
import 'package:hash_wallet/src/widgets/primary_button.dart';
import 'package:hash_wallet/view_model/dashboard/nft_view_model.dart';
import 'package:cw_core/wallet_type.dart';
class NFTListingPage extends StatefulWidget {
final NFTViewModel nftViewModel;
@@ -78,8 +76,6 @@ class NFTListWidget extends StatelessWidget {
Widget build(BuildContext context) {
return Observer(
builder: (context) {
final isSolana = nftViewModel.appStore.wallet!.type == WalletType.solana;
final emptyMessage = Center(
child: Text(
S.current.noNFTYet,
@@ -90,43 +86,23 @@ class NFTListWidget extends StatelessWidget {
),
);
if (isSolana) {
if (nftViewModel.solanaNftAssetModels.isEmpty) return emptyMessage;
if (nftViewModel.nftAssetByWalletModels.isEmpty) return emptyMessage;
return Padding(
padding: EdgeInsets.only(
bottom: 64),
child: ListView.separated(
shrinkWrap: true,
physics: NeverScrollableScrollPhysics(),
padding: const EdgeInsets.symmetric(horizontal: 4, vertical: 16),
separatorBuilder: (context, index) => const SizedBox(height: 8),
itemCount: nftViewModel.solanaNftAssetModels.length,
itemBuilder: (context, index) {
final nftAsset = nftViewModel.solanaNftAssetModels[index];
return SolanaNFTTileWidget(nftAsset: nftAsset);
},
),
);
} else {
if (nftViewModel.nftAssetByWalletModels.isEmpty) return emptyMessage;
return Padding(
padding: EdgeInsets.only(
bottom: 64),
child: ListView.separated(
shrinkWrap: true,
physics: NeverScrollableScrollPhysics(),
padding: const EdgeInsets.symmetric(horizontal: 4, vertical: 16),
separatorBuilder: (context, index) => const SizedBox(height: 8),
itemCount: nftViewModel.nftAssetByWalletModels.length,
itemBuilder: (context, index) {
final nftAsset = nftViewModel.nftAssetByWalletModels[index];
return NFTTileWidget(nftAsset: nftAsset);
},
),
);
}
return Padding(
padding: EdgeInsets.only(
bottom: 64),
child: ListView.separated(
shrinkWrap: true,
physics: NeverScrollableScrollPhysics(),
padding: const EdgeInsets.symmetric(horizontal: 4, vertical: 16),
separatorBuilder: (context, index) => const SizedBox(height: 8),
itemCount: nftViewModel.nftAssetByWalletModels.length,
itemBuilder: (context, index) {
final nftAsset = nftViewModel.nftAssetByWalletModels[index];
return NFTTileWidget(nftAsset: nftAsset);
},
),
);
},
);
}
lib/src/screens/dashboard/widgets/menu_widget.dart
+1 -25
View File
@@ -27,7 +27,6 @@ class MenuWidgetState extends State<MenuWidget> {
this.moneroIcon = Image.asset('assets/images/crypto/monero.webp'),
this.bitcoinIcon = Image.asset('assets/images/crypto/bitcoin.webp'),
this.litecoinIcon = Image.asset('assets/images/crypto/litecoin.webp'),
this.havenIcon = Image.asset('assets/images/haven_menu.webp'),
this.ethereumIcon = Image.asset('assets/images/crypto/ethereum.webp'),
this.nanoIcon = Image.asset('assets/images/crypto/nano.webp'),
this.bananoIcon = Image.asset('assets/images/crypto/nano.webp'),
@@ -36,13 +35,8 @@ class MenuWidgetState extends State<MenuWidget> {
this.baseIcon = Image.asset('assets/images/crypto/base_icon.webp'),
this.arbitrumIcon = Image.asset('assets/images/crypto/arbitrum.webp'),
this.bscIcon = Image.asset('assets/images/crypto/BNB.webp'),
this.solanaIcon = Image.asset('assets/images/crypto/solana.webp'),
this.tronIcon = Image.asset('assets/images/crypto/tron.webp'),
this.wowneroIcon = Image.asset('assets/images/crypto/wownero.webp'),
this.zanoIcon = Image.asset('assets/images/crypto/zano.webp'),
this.decredIcon = Image.asset('assets/images/crypto/decred.webp'),
this.dogecoinIcon = Image.asset('assets/images/crypto/dogecoin.webp'),
this.zcashIcon = Image.asset('assets/images/crypto/zcash.webp');
this.dogecoinIcon = Image.asset('assets/images/crypto/dogecoin.webp');
final largeScreen = 731;
@@ -58,7 +52,6 @@ class MenuWidgetState extends State<MenuWidget> {
Image moneroIcon;
Image bitcoinIcon;
Image litecoinIcon;
Image havenIcon;
Image ethereumIcon;
Image bitcoinCashIcon;
Image nanoIcon;
@@ -67,13 +60,8 @@ class MenuWidgetState extends State<MenuWidget> {
Image baseIcon;
Image arbitrumIcon;
Image bscIcon;
Image solanaIcon;
Image tronIcon;
Image wowneroIcon;
Image zanoIcon;
Image decredIcon;
Image dogecoinIcon;
Image zcashIcon;
@override
void initState() {
@@ -241,8 +229,6 @@ class MenuWidgetState extends State<MenuWidget> {
return bitcoinIcon;
case WalletType.litecoin:
return litecoinIcon;
case WalletType.haven:
return havenIcon;
case WalletType.ethereum:
return ethereumIcon;
case WalletType.bitcoinCash:
@@ -253,26 +239,16 @@ class MenuWidgetState extends State<MenuWidget> {
return bananoIcon;
case WalletType.polygon:
return polygonIcon;
case WalletType.solana:
return solanaIcon;
case WalletType.base:
return baseIcon;
case WalletType.arbitrum:
return arbitrumIcon;
case WalletType.bsc:
return bscIcon;
case WalletType.tron:
return tronIcon;
case WalletType.wownero:
return wowneroIcon;
case WalletType.zano:
return zanoIcon;
case WalletType.decred:
return decredIcon;
case WalletType.dogecoin:
return dogecoinIcon;
case WalletType.zcash:
return zcashIcon;
default:
throw Exception('No icon for ${type.toString()}');
}
lib/src/screens/dev/moneroc_call_profiler.dart
-4
View File
@@ -7,7 +7,6 @@ import 'package:hash_wallet/monero/monero.dart';
import 'package:hash_wallet/src/widgets/primary_button.dart';
import 'package:hash_wallet/view_model/dashboard/dashboard_view_model.dart';
import 'package:hash_wallet/wownero/wownero.dart';
import 'package:hash_wallet/zano/zano.dart';
import 'package:cw_core/wallet_type.dart';
import 'package:flutter/material.dart';
import 'package:hash_wallet/src/screens/base_page.dart';
@@ -36,7 +35,6 @@ class PerformanceDebug extends StatefulWidget {
enum ProfilableWallet {
monero,
wownero,
zano,
}
class _PerformanceDebugState extends State<PerformanceDebug> {
@@ -47,7 +45,6 @@ class _PerformanceDebugState extends State<PerformanceDebug> {
late ProfilableWallet wallet = switch (dashboardViewModel.wallet.type) {
WalletType.monero => ProfilableWallet.monero,
WalletType.wownero => ProfilableWallet.wownero,
WalletType.zano => ProfilableWallet.zano,
_ => throw Exception("Unknown wallet type"),
};
final precalc = 1700298;
@@ -55,7 +52,6 @@ class _PerformanceDebugState extends State<PerformanceDebug> {
late Map<String, List<int>> debugCallLength = switch (wallet) {
ProfilableWallet.monero => monero!.debugCallLength(),
ProfilableWallet.wownero => wownero!.debugCallLength(),
ProfilableWallet.zano => zano!.debugCallLength(),
};
int getOpenWalletTime() {
lib/src/screens/new_wallet/advanced_privacy_settings_page.dart
+1 -2
View File
@@ -281,8 +281,7 @@ class _AdvancedPrivacySettingsBodyState extends State<_AdvancedPrivacySettingsBo
],
);
}),
if (widget.privacySettingsViewModel.type == WalletType.bitcoin ||
widget.privacySettingsViewModel.type == WalletType.decred)
if (widget.privacySettingsViewModel.type == WalletType.bitcoin)
Builder(builder: (_) {
final val = testnetValue ?? false;
return SettingsSwitcherCell(
lib/src/screens/new_wallet/new_wallet_type_page.dart
-13
View File
@@ -7,13 +7,11 @@ import 'package:hash_wallet/reactions/wallet_utils.dart';
import 'package:hash_wallet/routes.dart';
import 'package:hash_wallet/src/screens/base_page.dart';
import 'package:hash_wallet/src/screens/new_wallet/widgets/select_button.dart';
import 'package:hash_wallet/src/screens/setup_2fa/widgets/popup_cancellable_alert.dart';
import 'package:hash_wallet/src/widgets/cake_image_widget.dart';
import 'package:hash_wallet/src/widgets/primary_button.dart';
import 'package:hash_wallet/src/widgets/scrollable_with_bottom_section.dart';
import 'package:hash_wallet/src/widgets/search_bar_widget.dart';
import 'package:hash_wallet/utils/responsive_layout_util.dart';
import 'package:hash_wallet/utils/show_pop_up.dart';
import 'package:hash_wallet/wallet_types.g.dart';
import 'package:cw_core/currency_for_wallet_type.dart';
import 'package:cw_core/hardware/device_connection_type.dart';
@@ -176,17 +174,6 @@ class WalletTypeFormState extends State<WalletTypeForm> {
Future<void> onTypeSelected() async {
if (selected == null) throw Exception('Wallet Type is not selected yet.');
if (selected == WalletType.haven && widget.isCreate) {
return await showPopUp<void>(
context: context,
builder: (BuildContext context) => PopUpCancellableAlertDialog(
contentText: S.of(context).pause_wallet_creation,
actionButtonText: S.of(context).ok,
buttonAction: () => Navigator.of(context).pop(),
),
);
}
// If it's a restore flow, trigger the external callback
// If it's not a BIP39 Wallet or if there are no other wallets, route to the newWallet page
// Any other scenario, route to pre-existing seed page
lib/src/screens/nodes/widgets/node_form.dart
+1 -4
View File
@@ -9,7 +9,6 @@ import 'package:hash_wallet/utils/feature_flag.dart';
import 'package:hash_wallet/view_model/node_list/node_create_or_edit_view_model.dart';
import 'package:flutter/material.dart';
import 'package:flutter_mobx/flutter_mobx.dart';
import 'package:cw_core/wallet_type.dart';
import 'package:fluttertoast/fluttertoast.dart';
import 'package:mobx/mobx.dart';
@@ -75,9 +74,7 @@ class NodeFormState extends State<NodeForm> {
keyValue: vm.nodeAddressUIKey,
label: S.current.node_address,
initialValue: vm.address,
validator: vm.walletType == WalletType.decred
? NodeAddressValidatorDecredBlankException()
: NodeAddressValidator(),
validator: NodeAddressValidator(),
),
if (vm.hasPathSupport)
ListItemTextField(
lib/src/screens/receive/widgets/address_list.dart
+1 -2
View File
@@ -83,8 +83,7 @@ class _AddressListState extends State<AddressList> {
walletAddressListViewModel: widget.addressListViewModel,
trailingButtonTap: () async {
if (widget.addressListViewModel.type == WalletType.monero ||
widget.addressListViewModel.type == WalletType.wownero ||
widget.addressListViewModel.type == WalletType.haven) {
widget.addressListViewModel.type == WalletType.wownero) {
await showPopUp<void>(
context: context,
builder: (_) => getIt.get<MoneroAccountListPage>(),
lib/src/screens/rescan/rescan_page.dart
+43 -71
View File
@@ -10,7 +10,6 @@ import 'package:hash_wallet/view_model/rescan_view_model.dart';
import 'package:hash_wallet/src/widgets/blockchain_height_widget.dart';
import 'package:hash_wallet/src/widgets/primary_button.dart';
import 'package:hash_wallet/generated/i18n.dart';
import 'package:cw_core/wallet_type.dart';
import 'package:modal_bottom_sheet/modal_bottom_sheet.dart';
class RescanPage extends StatefulWidget {
@@ -28,79 +27,52 @@ class _RescanPageState extends State<RescanPage> {
@override
Widget build(BuildContext context) {
Widget child;
if (widget._rescanViewModel.wallet.type != WalletType.decred) {
child = Padding(
padding: EdgeInsets.only(left: 24, right: 24, bottom: 24),
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Observer(
builder: (_) => SingleChildScrollView(
controller: ModalScrollController.of(context),
child: BlockchainHeightWidget(
// key: _blockchainHeightWidgetKey,
onHeightOrDateEntered: (value) => widget._rescanViewModel.isButtonEnabled = value,
isSilentPaymentsScan: widget._rescanViewModel.isSilentPaymentsScan,
isMwebScan: widget._rescanViewModel.isMwebScan,
doSingleScan: widget._rescanViewModel.doSingleScan,
hasDatePicker: !widget._rescanViewModel.isMwebScan,
// disable date picker for mweb for now
toggleSingleScan: () =>
widget._rescanViewModel.doSingleScan = !widget._rescanViewModel.doSingleScan,
walletType: widget._rescanViewModel.wallet.type,
heightController: _heightController,
bitcoinMempoolAPIEnabled: widget._rescanViewModel.isBitcoinMempoolAPIEnabled,
),
Widget child = Padding(
padding: EdgeInsets.only(left: 24, right: 24, bottom: 24),
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Observer(
builder: (_) => SingleChildScrollView(
controller: ModalScrollController.of(context),
child: BlockchainHeightWidget(
// key: _blockchainHeightWidgetKey,
onHeightOrDateEntered: (value) => widget._rescanViewModel.isButtonEnabled = value,
isSilentPaymentsScan: widget._rescanViewModel.isSilentPaymentsScan,
isMwebScan: widget._rescanViewModel.isMwebScan,
doSingleScan: widget._rescanViewModel.doSingleScan,
hasDatePicker: !widget._rescanViewModel.isMwebScan,
// disable date picker for mweb for now
toggleSingleScan: () =>
widget._rescanViewModel.doSingleScan = !widget._rescanViewModel.doSingleScan,
walletType: widget._rescanViewModel.wallet.type,
heightController: _heightController,
bitcoinMempoolAPIEnabled: widget._rescanViewModel.isBitcoinMempoolAPIEnabled,
),
),
Observer(
builder: (_) => LoadingPrimaryButton(
isLoading: widget._rescanViewModel.state == RescanWalletState.rescaning,
text: S.of(context).rescan,
onPressed: () async {
if (widget._rescanViewModel.isSilentPaymentsScan) {
return _toggleSilentPaymentsScanning(context);
}
widget._rescanViewModel.rescanCurrentWallet(
restoreHeight: int.tryParse(_heightController.text) ?? 0);
Navigator.of(context).pop();
},
color: Theme.of(context).colorScheme.primary,
textColor: Theme.of(context).colorScheme.onPrimary,
isDisabled: !widget._rescanViewModel.isButtonEnabled,
),
)
],
),
);
} else {
child = Center(
child: Padding(
padding: EdgeInsets.only(left: 24, right: 24, bottom: 24),
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Spacer(),
Observer(
builder: (_) => LoadingPrimaryButton(
isLoading: widget._rescanViewModel.state == RescanWalletState.rescaning,
text: S.of(context).rescan,
onPressed: () async {
await widget._rescanViewModel.rescanCurrentWallet(restoreHeight: 0);
Navigator.of(context).pop();
},
color: Theme.of(context).colorScheme.primary,
textColor: Theme.of(context).colorScheme.onPrimary,
),
)
],
),
),
);
}
Observer(
builder: (_) => LoadingPrimaryButton(
isLoading: widget._rescanViewModel.state == RescanWalletState.rescaning,
text: S.of(context).rescan,
onPressed: () async {
if (widget._rescanViewModel.isSilentPaymentsScan) {
return _toggleSilentPaymentsScanning(context);
}
widget._rescanViewModel.rescanCurrentWallet(
restoreHeight: int.tryParse(_heightController.text) ?? 0);
Navigator.of(context).pop();
},
color: Theme.of(context).colorScheme.primary,
textColor: Theme.of(context).colorScheme.onPrimary,
isDisabled: !widget._rescanViewModel.isButtonEnabled,
),
)
],
),
);
return GestureDetector(
behavior: HitTestBehavior.opaque,
// onTap: () => FocusScope.of(context).unfocus(),
lib/src/screens/restore/wallet_restore_from_keys_form.dart
+2 -2
View File
@@ -246,7 +246,7 @@ class WalletRestoreFromKeysFormState extends State<WalletRestoreFromKeysForm> {
if (widget.walletRestoreViewModel.hasBlockchainHeightSelector)
BlockchainHeightWidget(
key: blockchainHeightKey,
hasDatePicker: widget.walletRestoreViewModel.type != WalletType.haven,
hasDatePicker: true,
onHeightChange: (_) => null,
onHeightOrDateEntered: widget.onHeightOrDateEntered,
walletType: widget.walletRestoreViewModel.type,
@@ -299,7 +299,7 @@ class WalletRestoreFromKeysFormState extends State<WalletRestoreFromKeysForm> {
if (widget.walletRestoreViewModel.hasBlockchainHeightSelector)
BlockchainHeightWidget(
key: blockchainHeightKey,
hasDatePicker: widget.walletRestoreViewModel.type != WalletType.haven,
hasDatePicker: true,
onHeightChange: (_) => null,
onHeightOrDateEntered: widget.onHeightOrDateEntered,
walletType: widget.walletRestoreViewModel.type,
lib/src/screens/restore/wallet_restore_from_seed_form.dart
+1 -1
View File
@@ -286,7 +286,7 @@ class WalletRestoreFromSeedFormState extends State<WalletRestoreFromSeedForm> {
'wallet_restore_from_seed_blockheight_textfield_key',
),
onHeightOrDateEntered: widget.onHeightOrDateEntered,
hasDatePicker: [WalletType.monero, WalletType.wownero, WalletType.zcash].contains(
hasDatePicker: [WalletType.monero, WalletType.wownero].contains(
widget.type,
),
walletType: widget.type,
lib/src/screens/restore/wallet_restore_page.dart
+2 -8
View File
@@ -601,7 +601,6 @@ class _WalletRestorePageBodyState extends State<_WalletRestorePageBody>
final seedWords = seedPhrase.split(' ');
if (seedWords.length == 14 && walletRestoreViewModel.type == WalletType.wownero) return true;
if (seedWords.length == 26 && walletRestoreViewModel.type == WalletType.zano) return true;
if (seedWords.length == 12 && walletRestoreViewModel.type == WalletType.monero) {
return walletRestoreFromSeedFormKey.currentState?.blockchainHeightKey.currentState
@@ -609,7 +608,7 @@ class _WalletRestorePageBodyState extends State<_WalletRestorePageBody>
true;
}
if ([WalletType.monero, WalletType.wownero, WalletType.haven]
if ([WalletType.monero, WalletType.wownero]
.contains(walletRestoreViewModel.type) &&
seedWords.length == WalletRestoreViewModelBase.moneroSeedMnemonicLength) {
return true;
@@ -617,18 +616,13 @@ class _WalletRestorePageBodyState extends State<_WalletRestorePageBody>
// bip39:
final validBip39SeedLengths = [12, 18, 24];
final nonBip39WalletTypes = [WalletType.wownero, WalletType.haven, WalletType.decred];
final nonBip39WalletTypes = [WalletType.wownero];
// if it's a bip39 wallet and the length is not valid return false
if (!nonBip39WalletTypes.contains(walletRestoreViewModel.type) &&
!(validBip39SeedLengths.contains(seedWords.length))) {
return false;
}
if ((walletRestoreViewModel.type == WalletType.decred) &&
seedWords.length != WalletRestoreViewModelBase.decredSeedMnemonicLength) {
return false;
}
final words =
walletRestoreFromSeedFormKey.currentState!.seedWidgetStateKey.currentState!.words.toSet();
return seedWords.toSet().difference(words).toSet().isEmpty;
lib/src/screens/send/widgets/send_card.dart
-17
View File
@@ -185,23 +185,6 @@ class SendCardState extends State<SendCard> with AutomaticKeepAliveClientMixin<S
paymentRequest,
fixedNetwork: result.walletType,
);
break;
case PaymentFlowType.solanaTokenSelection:
await _showTokenSelectionFlow(
paymentViewModel,
walletSwitcherViewModel,
paymentRequest,
fixedNetwork: WalletType.solana,
);
break;
case PaymentFlowType.tronTokenSelection:
await _showTokenSelectionFlow(
paymentViewModel,
walletSwitcherViewModel,
paymentRequest,
fixedNetwork: WalletType.tron,
);
break;
case PaymentFlowType.currentWalletCompatible:
case PaymentFlowType.error:
lib/src/screens/settings/other_settings_page.dart
+1 -1
View File
@@ -161,7 +161,7 @@ class OtherSettingsPage extends BasePage {
keyValue: "[dev] monero background sync",
label: "[dev] monero background sync",
onTap: () => Navigator.of(context).pushNamed(Routes.devMoneroBackgroundSync)),
if ([WalletType.monero, WalletType.wownero, WalletType.zano]
if ([WalletType.monero, WalletType.wownero]
.contains(_otherSettingsViewModel.walletType))
ListItemRegularRow(
keyValue: "[dev] xmr call profiler",
lib/src/screens/wallet_connect/services/key_service/wallet_connect_key_service.dart
-5
View File
@@ -1,6 +1,5 @@
import 'package:hash_wallet/evm/evm.dart';
import 'package:hash_wallet/reactions/wallet_connect.dart';
import 'package:hash_wallet/solana/solana.dart';
import 'package:hash_wallet/src/screens/wallet_connect/services/key_service/chain_key_model.dart';
import 'package:cw_core/wallet_base.dart';
import 'package:cw_core/wallet_type.dart';
@@ -24,8 +23,6 @@ class KeyServiceImpl implements WalletConnectKeyService {
case WalletType.arbitrum:
case WalletType.bsc:
return evm!.getPrivateKey(wallet);
case WalletType.solana:
return solana!.getPrivateKey(wallet);
default:
return '';
}
@@ -39,8 +36,6 @@ class KeyServiceImpl implements WalletConnectKeyService {
case WalletType.arbitrum:
case WalletType.bsc:
return evm!.getPublicKey(wallet);
case WalletType.solana:
return solana!.getPublicKey(wallet);
default:
return '';
}
lib/src/screens/wallet_connect/services/walletkit_service.dart
-14
View File
@@ -2,7 +2,6 @@ import 'dart:async';
import 'dart:convert';
import 'dart:typed_data';
import 'package:cw_core/wallet_type.dart';
import 'package:eth_sig_util/util/utils.dart';
import 'package:flutter/material.dart';
import 'package:mobx/mobx.dart';
@@ -26,8 +25,6 @@ import 'package:hash_wallet/src/screens/wallet_connect/widgets/wc_session_auth_r
import 'package:hash_wallet/store/app_store.dart';
import 'bottom_sheet_service.dart';
import 'chain_service/solana/solana_chain_id.dart';
import 'chain_service/solana/solana_chain_service.dart';
part 'walletkit_service.g.dart';
@@ -167,17 +164,6 @@ abstract class WalletKitServiceBase with Store {
}
}
if (appStore.wallet!.type == WalletType.solana) {
for (final cId in SolanaChainId.values) {
SolanaChainService(
reference: cId,
appStore: appStore,
wcKeyService: walletKeyService,
bottomSheetService: _bottomSheetHandler,
walletKit: _walletKit,
);
}
}
}
@action
lib/src/widgets/blockchain_height_widget.dart
+1 -7
View File
@@ -2,14 +2,12 @@ import 'package:hash_wallet/bitcoin/bitcoin.dart';
import 'package:hash_wallet/src/widgets/standard_switch.dart';
import 'package:hash_wallet/utils/date_picker.dart';
import 'package:hash_wallet/wownero/wownero.dart';
import 'package:hash_wallet/zcash/zcash.dart';
import 'package:cw_core/wallet_type.dart';
import 'package:flutter/material.dart';
import 'package:intl/intl.dart';
import 'package:hash_wallet/generated/i18n.dart';
import 'package:hash_wallet/monero/monero.dart';
import 'package:hash_wallet/src/widgets/base_text_form_field.dart';
import 'package:hash_wallet/decred/decred.dart';
class BlockchainHeightWidget extends StatefulWidget {
BlockchainHeightWidget({
@@ -191,14 +189,10 @@ class BlockchainHeightState extends State<BlockchainHeightWidget> {
bitcoinMempoolAPIEnabled: await widget.bitcoinMempoolAPIEnabled,
);
} else {
if (widget.walletType == WalletType.decred) {
height = decred!.heightByDate(date);
} else if (widget.walletType == WalletType.monero) {
if (widget.walletType == WalletType.monero) {
height = monero!.getHeightByDate(date: date);
} else if (widget.walletType == WalletType.wownero){
height = wownero!.getHeightByDate(date: date);
} else if (widget.walletType == WalletType.zcash) {
height = await zcash!.getHeightByDate(date);
} else {
throw Exception("unknown currency in BlockchainHeightWidget");
}
lib/src/widgets/bottom_sheet/token_selection_bottom_sheet.dart
+16 -66
View File
@@ -129,22 +129,10 @@ class _TokenSelectionContentState extends State<_TokenSelectionContent> {
}
String _getEcosystemTitle() {
if (selectedNetwork == WalletType.solana) {
return 'Solana\n${S.current.address_detected.toLowerCase()}';
}
if (selectedNetwork == WalletType.tron) {
return 'Tron\n${S.current.address_detected.toLowerCase()}';
}
return '${S.current.ethereum_ecosystem}\n${S.current.address_detected.toLowerCase()}';
}
String _getEcosystemDescription() {
if (selectedNetwork == WalletType.solana) {
return 'Select a token to send on Solana network';
}
if (selectedNetwork == WalletType.tron) {
return 'Select a token to send on Tron network';
}
return S.current.evm_ecosystem_description;
}
@@ -339,60 +327,22 @@ class _TokenSelectionContentState extends State<_TokenSelectionContent> {
final compatibleWallets = await widget.paymentViewModel.getWalletsByType(selectedNetwork!);
PaymentFlowResult newResult;
if (selectedNetwork == WalletType.solana) {
newResult = PaymentFlowResult.solanaTokenSelection(
AddressDetectionResult(
address: widget.paymentRequest.address,
detectedWalletType: WalletType.solana,
detectedCurrency: selectedToken!,
isValid: true,
amount: widget.paymentRequest.amount,
note: widget.paymentRequest.note,
scheme: widget.paymentRequest.scheme,
pjUri: widget.paymentRequest.pjUri,
callbackUrl: widget.paymentRequest.callbackUrl,
callbackMessage: widget.paymentRequest.callbackMessage,
),
compatibleWallets: compatibleWallets,
wallet: compatibleWallets.isNotEmpty ? compatibleWallets.first : null,
);
} else if (selectedNetwork == WalletType.tron) {
newResult = PaymentFlowResult.tronTokenSelection(
AddressDetectionResult(
address: widget.paymentRequest.address,
detectedWalletType: WalletType.tron,
detectedCurrency: selectedToken!,
isValid: true,
amount: widget.paymentRequest.amount,
note: widget.paymentRequest.note,
scheme: widget.paymentRequest.scheme,
pjUri: widget.paymentRequest.pjUri,
callbackUrl: widget.paymentRequest.callbackUrl,
callbackMessage: widget.paymentRequest.callbackMessage,
),
compatibleWallets: compatibleWallets,
wallet: compatibleWallets.isNotEmpty ? compatibleWallets.first : null,
);
} else {
newResult = PaymentFlowResult.evmNetworkSelection(
AddressDetectionResult(
address: widget.paymentRequest.address,
detectedWalletType: selectedNetwork!,
detectedCurrency: selectedToken!,
isValid: true,
amount: widget.paymentRequest.amount,
note: widget.paymentRequest.note,
scheme: widget.paymentRequest.scheme,
pjUri: widget.paymentRequest.pjUri,
callbackUrl: widget.paymentRequest.callbackUrl,
callbackMessage: widget.paymentRequest.callbackMessage,
),
compatibleWallets: compatibleWallets,
wallet: compatibleWallets.isNotEmpty ? compatibleWallets.first : null,
);
}
PaymentFlowResult newResult = PaymentFlowResult.evmNetworkSelection(
AddressDetectionResult(
address: widget.paymentRequest.address,
detectedWalletType: selectedNetwork!,
detectedCurrency: selectedToken!,
isValid: true,
amount: widget.paymentRequest.amount,
note: widget.paymentRequest.note,
scheme: widget.paymentRequest.scheme,
pjUri: widget.paymentRequest.pjUri,
callbackUrl: widget.paymentRequest.callbackUrl,
callbackMessage: widget.paymentRequest.callbackMessage,
),
compatibleWallets: compatibleWallets,
wallet: compatibleWallets.isNotEmpty ? compatibleWallets.first : null,
);
widget.paymentViewModel.detectedWalletType = selectedNetwork!;
widget.onNext(newResult);