android-apps-mirrors/CakeWallet
0
0
Fork 0
mirror of https://github.com/cake-tech/cake_wallet.git synced 2025-06-28 04:19:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

CW-843: Enhance Wallet Groups Implementation (#2045)

Browse source 
* feat: Enhance Wallet Groups Implementation by using hashedIdentifiers instead of parentAddresses

* fix: Call updateWalletGroups even if group has an hash identifier

* feat: Add secrets to workflow

* feat: Enhance Wallet Groups Implementation by using hashedIdentifiers instead of parentAddresses

* Handle wallet grouping edgecase where wallet is restored via non seed medium

* fix: Valid wallet/wallet groups not showing up when choosing wallet/groups for creating new wallets
This commit is contained in:
David Adegoke 2025-03-06 01:25:38 +01:00 • committed by GitHub
parent e596c19b40
commit 09f20b2a7b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
35 changed files with 181 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/automated_integration_test.yml vendored
View file

@ -223,6 +223,10 @@ jobs:
echo "const nanoTestWalletReceiveAddress = '${{ secrets.NANO_TEST_WALLET_RECEIVE_ADDRESS }}';" >> lib/.secrets.g.dart
echo "const wowneroTestWalletReceiveAddress = '${{ secrets.WOWNERO_TEST_WALLET_RECEIVE_ADDRESS }}';" >> lib/.secrets.g.dart
echo "const moneroTestWalletBlockHeight = '${{ secrets.MONERO_TEST_WALLET_BLOCK_HEIGHT }}';" >> lib/.secrets.g.dart
# end of test secrets
echo "const chainflipApiKey = '${{ secrets.CHAINFLIP_API_KEY }}';" >> lib/.secrets.g.dart
echo "const chainflipAffiliateFee = '${{ secrets.CHAINFLIP_AFFILIATE_FEE }}';" >> lib/.secrets.g.dart
echo "const walletGroupSalt = '${{ secrets.WALLET_GROUP_SALT }}';" >> lib/.secrets.g.dart
- name: Rename app
run: |

1
.github/workflows/pr_test_build_android.yml vendored
View file

@ -172,6 +172,7 @@ jobs:
# end of test secrets
echo "const chainflipApiKey = '${{ secrets.CHAINFLIP_API_KEY }}';" >> lib/.secrets.g.dart
echo "const chainflipAffiliateFee = '${{ secrets.CHAINFLIP_AFFILIATE_FEE }}';" >> lib/.secrets.g.dart
echo "const walletGroupSalt = '${{ secrets.WALLET_GROUP_SALT }}';" >> lib/.secrets.g.dart
- name: prepare monero_c and cache
run: |

1
.github/workflows/pr_test_build_linux.yml vendored
View file

@ -168,6 +168,7 @@ jobs:
# end of test secrets
echo "const chainflipApiKey = '${{ secrets.CHAINFLIP_API_KEY }}';" >> lib/.secrets.g.dart
echo "const chainflipAffiliateFee = '${{ secrets.CHAINFLIP_AFFILIATE_FEE }}';" >> lib/.secrets.g.dart
echo "const walletGroupSalt = '${{ secrets.WALLET_GROUP_SALT }}';" >> lib/.secrets.g.dart
- name: prepare monero_c and cache
run: |

2
cw_bitcoin/lib/bitcoin_wallet_creation_credentials.dart
View file

@ -11,13 +11,11 @@ class BitcoinNewWalletCredentials extends WalletCredentials {
String? derivationPath,
String? passphrase,
this.mnemonic,
String? parentAddress,
}) : super(
name: name,
walletInfo: walletInfo,
password: password,
passphrase: passphrase,
parentAddress: parentAddress,
);
final String? mnemonic;

2
cw_bitcoin_cash/lib/src/bitcoin_cash_wallet_creation_credentials.dart
View file

@ -8,13 +8,11 @@ class BitcoinCashNewWalletCredentials extends WalletCredentials {
String? password,
String? passphrase,
this.mnemonic,
String? parentAddress,
}) : super(
name: name,
walletInfo: walletInfo,
password: password,
passphrase: passphrase,
parentAddress: parentAddress
);
final String? mnemonic;
}

2
cw_core/lib/wallet_credentials.dart
View file

@ -10,7 +10,6 @@ abstract class WalletCredentials {
this.passphrase,
this.derivationInfo,
this.hardwareWalletType,
this.parentAddress,
}) {
if (this.walletInfo != null && derivationInfo != null) {
this.walletInfo!.derivationInfo = derivationInfo;
@ -19,7 +18,6 @@ abstract class WalletCredentials {
final String name;
final int? height;
String? parentAddress;
int? seedPhraseLength;
String? password;
String? passphrase;

11
cw_core/lib/wallet_info.dart
View file

@ -81,6 +81,8 @@ class WalletInfo extends HiveObject {
this.derivationInfo,
this.hardwareWalletType,
this.parentAddress,
this.hashedWalletIdentifier,
this.isNonSeedWallet,
) : _yatLastUsedAddressController = StreamController<String>.broadcast();
factory WalletInfo.external({
@ -99,6 +101,8 @@ class WalletInfo extends HiveObject {
DerivationInfo? derivationInfo,
HardwareWalletType? hardwareWalletType,
String? parentAddress,
String? hashedWalletIdentifier,
bool? isNonSeedWallet,
}) {
return WalletInfo(
id,
@ -116,6 +120,8 @@ class WalletInfo extends HiveObject {
derivationInfo,
hardwareWalletType,
parentAddress,
hashedWalletIdentifier,
isNonSeedWallet ?? false,
);
}
@ -196,8 +202,11 @@ class WalletInfo extends HiveObject {
@HiveField(24)
List<String>? manualAddresses;
@HiveField(25)
String? hashedWalletIdentifier;
@HiveField(26, defaultValue: false)
bool isNonSeedWallet;
String get yatLastUsedAddress => yatLastUsedAddressRaw ?? '';

1
cw_evm/lib/evm_chain_wallet_creation_credentials.dart
View file

@ -7,7 +7,6 @@ class EVMChainNewWalletCredentials extends WalletCredentials {
required super.name,
super.walletInfo,
super.password,
super.parentAddress,
this.mnemonic,
super.passphrase,
});

2
cw_nano/lib/nano_wallet_creation_credentials.dart
View file

@ -8,13 +8,11 @@ class NanoNewWalletCredentials extends WalletCredentials {
String? password,
DerivationType? derivationType,
this.mnemonic,
String? parentAddress,
String? passphrase,
}) : super(
name: name,
password: password,
walletInfo: walletInfo,
parentAddress: parentAddress,
passphrase: passphrase,
);

2
cw_solana/lib/solana_wallet_creation_credentials.dart
View file

@ -6,14 +6,12 @@ class SolanaNewWalletCredentials extends WalletCredentials {
required String name,
WalletInfo? walletInfo,
String? password,
String? parentAddress,
this.mnemonic,
String? passphrase,
}) : super(
name: name,
walletInfo: walletInfo,
password: password,
parentAddress: parentAddress,
passphrase: passphrase,
);
final String? mnemonic;

2
cw_tron/lib/tron_wallet_creation_credentials.dart
View file

@ -7,13 +7,11 @@ class TronNewWalletCredentials extends WalletCredentials {
WalletInfo? walletInfo,
String? password,
this.mnemonic,
String? parentAddress,
String? passphrase,
}) : super(
name: name,
walletInfo: walletInfo,
password: password,
parentAddress: parentAddress,
passphrase: passphrase,
);

2
ios/Podfile.lock
View file

@ -277,4 +277,4 @@ SPEC CHECKSUMS:
PODFILE CHECKSUM: e448f662d4c41f0c0b1ccbb78afd57dbf895a597
COCOAPODS: 1.15.2
COCOAPODS: 1.15.2

2
lib/bitcoin/cw_bitcoin.dart
View file

@ -34,7 +34,6 @@ class CWBitcoin extends Bitcoin {
String? password,
String? passphrase,
String? mnemonic,
String? parentAddress,
}) =>
BitcoinNewWalletCredentials(
name: name,
@ -42,7 +41,6 @@ class CWBitcoin extends Bitcoin {
password: password,
passphrase: passphrase,
mnemonic: mnemonic,
parentAddress: parentAddress,
);
@override

2
lib/bitcoin_cash/cw_bitcoin_cash.dart
View file

@ -17,14 +17,12 @@ class CWBitcoinCash extends BitcoinCash {
String? password,
String? passphrase,
String? mnemonic,
String? parentAddress,
}) =>
BitcoinCashNewWalletCredentials(
name: name,
walletInfo: walletInfo,
password: password,
passphrase: passphrase,
parentAddress: parentAddress,
mnemonic: mnemonic,
);

2
lib/core/new_wallet_arguments.dart
View file

@ -3,12 +3,10 @@ import 'package:cw_core/wallet_type.dart';
class NewWalletArguments {
final WalletType type;
final String? mnemonic;
final String? parentAddress;
final bool isChildWallet;
NewWalletArguments({
required this.type,
this.parentAddress,
this.mnemonic,
this.isChildWallet = false,
});

11
lib/di.dart
View file

@ -392,11 +392,10 @@ Future<void> setup({
getIt.registerFactory<NewWalletTypeViewModel>(() => NewWalletTypeViewModel(_walletInfoSource));
getIt.registerFactory<WalletManager>(
() {
final instance = WalletManager(_walletInfoSource, getIt.get<SharedPreferences>());
instance.updateWalletGroups();
return instance;
},
() => WalletManager(
_walletInfoSource,
getIt.get<SharedPreferences>(),
),
);
getIt.registerFactoryParam<WalletGroupsDisplayViewModel, WalletType, void>(
@ -812,7 +811,7 @@ Future<void> setup({
editingWallet: arguments.editingWallet,
isWalletGroup: arguments.isWalletGroup,
groupName: arguments.groupName,
parentAddress: arguments.parentAddress,
walletGroupKey: arguments.walletGroupKey,
),
);
});

21
lib/entities/hash_wallet_identifier.dart Normal file
View file

@ -0,0 +1,21 @@
import 'dart:convert';
import 'package:cake_wallet/.secrets.g.dart' as secrets;
import 'package:cw_core/wallet_base.dart';
import 'package:hashlib/hashlib.dart';
String createHashedWalletIdentifier(WalletBase wallet) {
if (wallet.seed == null) return '';
final salt = secrets.walletGroupSalt;
final combined = '$salt.${wallet.seed}';
// Convert to UTF-8 bytes.
final bytes = utf8.encode(combined);
// Perform SHA-256 hash.
final digest = sha256.convert(bytes);
// Return the hex string representation of the hash.
return digest.toString();
}

4
lib/entities/wallet_edit_page_arguments.dart
View file

@ -10,7 +10,7 @@ class WalletEditPageArguments {
this.isWalletGroup = false,
this.walletListViewModel,
this.groupName = '',
this.parentAddress = '',
this.walletGroupKey = '',
this.walletEditViewModel,
this.walletNewVM,
this.authService,
@ -19,7 +19,7 @@ class WalletEditPageArguments {
final WalletListItem editingWallet;
final bool isWalletGroup;
final String groupName;
final String parentAddress;
final String walletGroupKey;
final WalletListViewModel? walletListViewModel;
final WalletEditViewModel? walletEditViewModel;

11
lib/entities/wallet_group.dart
View file

@ -1,13 +1,14 @@
import 'package:cw_core/wallet_info.dart';
class WalletGroup {
WalletGroup(this.parentAddress) : wallets = [];
WalletGroup(this.groupKey) : wallets = [];
/// Main identifier for each group, compulsory.
final String parentAddress;
/// Primary identifier for the group. Previously was `parentAddress`.
/// Now we store either the wallet's hash OR fallback to parentAddress/address.
final String groupKey;
/// Child wallets that share the same parent address within this group
List<WalletInfo> wallets;
/// Child wallets that share the same group key
final List<WalletInfo> wallets;
/// Custom name for the group, editable for multi-child wallet groups
String? groupName;

145
lib/entities/wallet_manager.dart
View file

@ -1,70 +1,61 @@
import 'package:cake_wallet/entities/hash_wallet_identifier.dart';
import 'package:cake_wallet/entities/wallet_group.dart';
import 'package:cw_core/wallet_base.dart';
import 'package:cw_core/wallet_info.dart';
import 'package:hive/hive.dart';
import 'package:shared_preferences/shared_preferences.dart';
class WalletManager {
WalletManager(
this._walletInfoSource,
this._sharedPreferences,
);
WalletManager(this._walletInfoSource, this._sharedPreferences);
final Box<WalletInfo> _walletInfoSource;
final SharedPreferences _sharedPreferences;
final List<WalletGroup> walletGroups = [];
/// Categorize wallets into groups based on their parentAddress.
///
/// Update the lead wallet for each group and clean up empty groups
/// i.e remove group if there's no lead wallet (i.e, no wallets left)
void updateWalletGroups() {
walletGroups.clear();
for (var walletInfo in _walletInfoSource.values) {
final group = _getOrCreateGroup(_resolveParentAddress(walletInfo));
for (final walletInfo in _walletInfoSource.values) {
final groupKey = _resolveGroupKey(walletInfo);
final group = _getOrCreateGroup(groupKey);
group.wallets.add(walletInfo);
}
walletGroups.removeWhere((group) => group.wallets.isEmpty);
walletGroups.removeWhere((g) => g.wallets.isEmpty);
_loadCustomGroupNames();
}
/// Function to determine the correct parentAddress for a wallet.
///
/// If it's a parent wallet (parentAddress is null),
/// use its own address as parentAddress.
String _resolveParentAddress(WalletInfo walletInfo) {
String _resolveGroupKey(WalletInfo walletInfo) {
if (walletInfo.hashedWalletIdentifier != null &&
walletInfo.hashedWalletIdentifier!.isNotEmpty) {
return walletInfo.hashedWalletIdentifier!;
}
// Fallback to old logic
return walletInfo.parentAddress ?? walletInfo.address;
}
/// Check if a group with the parentAddress already exists,
/// If no group exists, create a new one.
///
WalletGroup _getOrCreateGroup(String parentAddress) {
WalletGroup _getOrCreateGroup(String groupKey) {
return walletGroups.firstWhere(
(group) => group.parentAddress == parentAddress,
(g) => g.groupKey == groupKey,
orElse: () {
final newGroup = WalletGroup(parentAddress);
final newGroup = WalletGroup(groupKey);
walletGroups.add(newGroup);
return newGroup;
},
);
}
/// Add a new wallet and update lead wallet after adding.
void addWallet(WalletInfo walletInfo) {
final group = _getOrCreateGroup(_resolveParentAddress(walletInfo));
final groupKey = _resolveGroupKey(walletInfo);
final group = _getOrCreateGroup(groupKey);
group.wallets.add(walletInfo);
}
/// Removes a wallet from a group i.e when it's deleted.
///
/// Update lead wallet after removing,
/// Remove the group if it's empty (i.e., no lead wallet).
void removeWallet(WalletInfo walletInfo) {
final group = _getOrCreateGroup(_resolveParentAddress(walletInfo));
final groupKey = _resolveGroupKey(walletInfo);
final group = _getOrCreateGroup(groupKey);
group.wallets.remove(walletInfo);
if (group.wallets.isEmpty) {
@ -72,39 +63,99 @@ class WalletManager {
}
}
/// Returns all the child wallets within a group.
///
/// If the group is not found, returns an empty group with no wallets.
List<WalletInfo> getWalletsInGroup(String parentAddress) {
List<WalletInfo> getWalletsInGroup(String groupKey) {
return walletGroups
.firstWhere(
(group) => group.parentAddress == parentAddress,
orElse: () => WalletGroup(parentAddress),
(g) => g.groupKey == groupKey,
orElse: () => WalletGroup(groupKey),
)
.wallets;
}
/// Iterate through all groups and load their custom names from storage
void _loadCustomGroupNames() {
for (var group in walletGroups) {
final groupName = _sharedPreferences.getString('wallet_group_name_${group.parentAddress}');
final key = 'wallet_group_name_${group.groupKey}';
final groupName = _sharedPreferences.getString(key);
if (groupName != null && group.wallets.length > 1) {
group.groupName = groupName; // Restore custom name
group.groupName = groupName;
}
}
}
/// Save custom name for a group
void _saveCustomGroupName(String parentAddress, String name) {
_sharedPreferences.setString('wallet_group_name_$parentAddress', name);
void _saveCustomGroupName(String groupKey, String name) {
_sharedPreferences.setString('wallet_group_name_$groupKey', name);
}
// Set custom group name and persist it
void setGroupName(String parentAddress, String name) {
if (parentAddress.isEmpty || name.isEmpty) return;
void setGroupName(String groupKey, String name) {
if (groupKey.isEmpty || name.isEmpty) return;
final group = walletGroups.firstWhere((group) => group.parentAddress == parentAddress);
final group = walletGroups.firstWhere((g) => g.groupKey == groupKey);
group.setCustomName(name);
_saveCustomGroupName(parentAddress, name); // Persist the custom name
_saveCustomGroupName(groupKey, name);
}
// ---------------------------------------------------------------------------
// This performs a Group-Based Lazy Migration:
// If the user opens a wallet in an old group,
// we migrate ALL wallets that share its old group key to a new hash.
// ---------------------------------------------------------------------------
/// When a user opens a wallet, check if it has a real hash.
/// If not, migrate the ENTIRE old group so they keep the same group name
/// and end up with the same new hash (preserving grouping).
Future<void> ensureGroupHasHashedIdentifier(WalletBase openedWallet) async {
WalletInfo walletInfo = openedWallet.walletInfo;
// If the openedWallet already has an hash, then there is nothing to do
if (walletInfo.hashedWalletIdentifier != null &&
walletInfo.hashedWalletIdentifier!.isNotEmpty) {
updateWalletGroups(); // Still skeptical of calling this here. Looking for a better spot.
return;
}
// Identify the old group key for this wallet
final oldGroupKey = _resolveGroupKey(walletInfo); // parentAddress fallback
// Find all wallets that share this old group key (i.e the old group)
final oldGroupWallets = _walletInfoSource.values.where((w) {
final key = w.hashedWalletIdentifier != null && w.hashedWalletIdentifier!.isNotEmpty
? w.hashedWalletIdentifier
: (w.parentAddress ?? w.address);
return key == oldGroupKey;
}).toList();
if (oldGroupWallets.isEmpty) {
// This shouldn't happen, but just in case it does, we return.
return;
}
// Next, we determine the new group hash for these wallets
// Since they share the same seed, we can assign that group hash
// to all the wallets to preserve grouping.
final newGroupHash = createHashedWalletIdentifier(openedWallet);
// Migrate the old group name from oldGroupKey(i.e parentAddress) to newGroupHash
await _migrateGroupName(oldGroupKey, newGroupHash);
// Then we assign this new hash to each wallet in that old group and save them
for (final wallet in oldGroupWallets) {
wallet.hashedWalletIdentifier = newGroupHash;
await wallet.save();
}
// Finally, we rebuild the groups so that these wallets are now in the new group
updateWalletGroups();
}
/// Copy an old group name to the new group key, then remove the old key.
Future<void> _migrateGroupName(String oldGroupKey, String newGroupKey) async {
final oldNameKey = 'wallet_group_name_$oldGroupKey';
final newNameKey = 'wallet_group_name_$newGroupKey';
final oldGroupName = _sharedPreferences.getString(oldNameKey);
if (oldGroupName != null) {
await _sharedPreferences.setString(newNameKey, oldGroupName);
await _sharedPreferences.remove(oldNameKey);
}
}
}

2
lib/ethereum/cw_ethereum.dart
View file

@ -11,7 +11,6 @@ class CWEthereum extends Ethereum {
WalletCredentials createEthereumNewWalletCredentials({
required String name,
String? mnemonic,
String? parentAddress,
WalletInfo? walletInfo,
String? password,
String? passphrase,
@ -20,7 +19,6 @@ class CWEthereum extends Ethereum {
name: name,
walletInfo: walletInfo,
password: password,
parentAddress: parentAddress,
mnemonic: mnemonic,
passphrase: passphrase,
);

2
lib/nano/cw_nano.dart
View file

@ -94,14 +94,12 @@ class CWNano extends Nano {
WalletInfo? walletInfo,
String? password,
String? mnemonic,
String? parentAddress,
String? passphrase,
}) =>
NanoNewWalletCredentials(
name: name,
password: password,
mnemonic: mnemonic,
parentAddress: parentAddress,
walletInfo: walletInfo,
passphrase: passphrase,
);

2
lib/polygon/cw_polygon.dart
View file

@ -11,7 +11,6 @@ class CWPolygon extends Polygon {
WalletCredentials createPolygonNewWalletCredentials({
required String name,
String? mnemonic,
String? parentAddress,
WalletInfo? walletInfo,
String? password,
String? passphrase,
@ -21,7 +20,6 @@ class CWPolygon extends Polygon {
walletInfo: walletInfo,
password: password,
mnemonic: mnemonic,
parentAddress: parentAddress,
passphrase: passphrase,
);

4
lib/reactions/on_current_wallet_change.dart
View file

@ -1,6 +1,8 @@
import 'package:cake_wallet/di.dart';
import 'package:cake_wallet/entities/auto_generate_subaddress_status.dart';
import 'package:cake_wallet/entities/fiat_api_mode.dart';
import 'package:cake_wallet/entities/update_haven_rate.dart';
import 'package:cake_wallet/entities/wallet_manager.dart';
import 'package:cake_wallet/ethereum/ethereum.dart';
import 'package:cake_wallet/polygon/polygon.dart';
import 'package:cake_wallet/solana/solana.dart';
@ -59,6 +61,8 @@ void startCurrentWalletChangeReaction(
return;
}
await getIt.get<WalletManager>().ensureGroupHasHashedIdentifier(wallet);
final node = settingsStore.getCurrentNode(wallet.type);
startWalletSyncStatusChangeReaction(wallet, fiatConversionStore);

2
lib/solana/cw_solana.dart
View file

@ -11,7 +11,6 @@ class CWSolana extends Solana {
WalletCredentials createSolanaNewWalletCredentials({
required String name,
String? mnemonic,
String? parentAddress,
WalletInfo? walletInfo,
String? password,
String? passphrase,
@ -21,7 +20,6 @@ class CWSolana extends Solana {
walletInfo: walletInfo,
password: password,
mnemonic: mnemonic,
parentAddress: parentAddress,
passphrase: passphrase,
);

1
lib/src/screens/new_wallet/wallet_group_display_page.dart
View file

@ -150,7 +150,6 @@ class WalletGroupsDisplayBody extends StatelessWidget {
arguments: NewWalletArguments(
type: walletGroupsDisplayViewModel.type,
mnemonic: mnemonic,
parentAddress: walletGroupsDisplayViewModel.parentAddress,
isChildWallet: true,
),
);

4
lib/src/screens/wallet/wallet_edit_page.dart
View file

@ -112,7 +112,7 @@ class WalletEditPage extends BasePage {
pageArguments.editingWallet,
password: password,
isWalletGroup: pageArguments.isWalletGroup,
groupParentAddress: pageArguments.parentAddress,
walletGroupKey: pageArguments.walletGroupKey,
);
},
callback: (bool isAuthenticatedSuccessfully,
@ -128,7 +128,7 @@ class WalletEditPage extends BasePage {
await walletEditViewModel.changeName(
pageArguments.editingWallet,
isWalletGroup: pageArguments.isWalletGroup,
groupParentAddress: pageArguments.parentAddress,
walletGroupKey: pageArguments.walletGroupKey,
);
confirmed = true;
}

2
lib/src/screens/wallet_list/wallet_list_page.dart
View file

@ -227,7 +227,7 @@ class WalletListBodyState extends State<WalletListBody> {
editingWallet: wallet,
isWalletGroup: true,
groupName: groupName,
parentAddress: group.parentAddress,
walletGroupKey: group.groupKey,
),
);
},

13
lib/tron/cw_tron.dart
View file

@ -14,16 +14,15 @@ class CWTron extends Tron {
WalletInfo? walletInfo,
String? password,
String? mnemonic,
String? parentAddress,
String? passphrase,
}) =>
TronNewWalletCredentials(
name: name,
walletInfo: walletInfo,
password: password,
mnemonic: mnemonic,
passphrase: passphrase,
parentAddress: parentAddress);
name: name,
walletInfo: walletInfo,
password: password,
mnemonic: mnemonic,
passphrase: passphrase,
);
@override
WalletCredentials createTronRestoreWalletFromSeedCredentials({

6
lib/view_model/wallet_creation_vm.dart
View file

@ -4,6 +4,7 @@ import 'package:cake_wallet/core/wallet_creation_service.dart';
import 'package:cake_wallet/di.dart';
import 'package:cake_wallet/entities/background_tasks.dart';
import 'package:cake_wallet/entities/generate_name.dart';
import 'package:cake_wallet/entities/hash_wallet_identifier.dart';
import 'package:cake_wallet/generated/i18n.dart';
import 'package:cake_wallet/nano/nano.dart';
import 'package:cake_wallet/store/app_store.dart';
@ -103,13 +104,16 @@ abstract class WalletCreationVMBase with Store {
showIntroCakePayCard: (!walletCreationService.typeExists(type)) && type != WalletType.haven,
derivationInfo: credentials.derivationInfo ?? getDefaultCreateDerivation(),
hardwareWalletType: credentials.hardwareWalletType,
parentAddress: credentials.parentAddress,
);
credentials.walletInfo = walletInfo;
final wallet = restoreWallet != null
? await processFromRestoredWallet(credentials, restoreWallet)
: await process(credentials);
final isNonSeedWallet = isRecovery ? wallet.seed == null : false;
walletInfo.isNonSeedWallet = isNonSeedWallet;
walletInfo.hashedWalletIdentifier = createHashedWalletIdentifier(wallet);
walletInfo.address = wallet.walletAddresses.address;
await _walletInfoSource.add(walletInfo);
await _appStore.changeCurrentWallet(wallet);

10
lib/view_model/wallet_groups_display_view_model.dart
View file

@ -47,8 +47,6 @@ abstract class WalletGroupsDisplayViewModelBase with Store {
@observable
WalletInfo? selectedSingleWallet;
@observable
String? parentAddress;
@observable
bool isFetchingMnemonic;
@ -77,9 +75,6 @@ abstract class WalletGroupsDisplayViewModelBase with Store {
walletToUse.name,
);
parentAddress =
isGroupSelected ? selectedWalletGroup!.parentAddress : selectedSingleWallet!.address;
return wallet.seed;
} catch (e) {
return null;
@ -130,11 +125,14 @@ abstract class WalletGroupsDisplayViewModelBase with Store {
// Check that selected wallet type is not present already in group
bool isSameTypeAsSelectedWallet = wallet.type == type;
bool isNonSeedWallet = wallet.isNonSeedWallet;
// Exclude if any of these conditions are true
return isNonBIP39Wallet ||
isNanoDerivationType ||
isElectrumDerivationType ||
isSameTypeAsSelectedWallet;
isSameTypeAsSelectedWallet ||
isNonSeedWallet;
});
if (shouldExcludeGroup) continue;

4
lib/view_model/wallet_list/wallet_edit_view_model.dart
View file

@ -40,7 +40,7 @@ abstract class WalletEditViewModelBase with Store {
Future<void> changeName(
WalletListItem walletItem, {
String? password,
String? groupParentAddress,
String? walletGroupKey,
bool isWalletGroup = false,
}) async {
state = WalletEditRenamePending();
@ -48,7 +48,7 @@ abstract class WalletEditViewModelBase with Store {
if (isWalletGroup) {
_walletManager.updateWalletGroups();
_walletManager.setGroupName(groupParentAddress!, newName);
_walletManager.setGroupName(walletGroupKey!, newName);
} else {
await _walletLoadingService.renameWallet(
walletItem.type,

7
lib/view_model/wallet_new_vm.dart
View file

@ -109,7 +109,6 @@ abstract class WalletNewVMBase extends WalletCreationVM with Store {
password: walletPassword,
passphrase: passphrase,
mnemonic: newWalletArguments!.mnemonic,
parentAddress: newWalletArguments!.parentAddress,
);
case WalletType.haven:
return haven!.createHavenNewWalletCredentials(
@ -119,7 +118,6 @@ abstract class WalletNewVMBase extends WalletCreationVM with Store {
name: name,
password: walletPassword,
mnemonic: newWalletArguments!.mnemonic,
parentAddress: newWalletArguments!.parentAddress,
passphrase: passphrase,
);
case WalletType.bitcoinCash:
@ -128,7 +126,6 @@ abstract class WalletNewVMBase extends WalletCreationVM with Store {
password: walletPassword,
passphrase: passphrase,
mnemonic: newWalletArguments!.mnemonic,
parentAddress: newWalletArguments!.parentAddress,
);
case WalletType.nano:
case WalletType.banano:
@ -136,7 +133,6 @@ abstract class WalletNewVMBase extends WalletCreationVM with Store {
name: name,
password: walletPassword,
mnemonic: newWalletArguments!.mnemonic,
parentAddress: newWalletArguments!.parentAddress,
passphrase: passphrase,
);
case WalletType.polygon:
@ -144,7 +140,6 @@ abstract class WalletNewVMBase extends WalletCreationVM with Store {
name: name,
password: walletPassword,
mnemonic: newWalletArguments!.mnemonic,
parentAddress: newWalletArguments!.parentAddress,
passphrase: passphrase,
);
case WalletType.solana:
@ -152,7 +147,6 @@ abstract class WalletNewVMBase extends WalletCreationVM with Store {
name: name,
password: walletPassword,
mnemonic: newWalletArguments!.mnemonic,
parentAddress: newWalletArguments!.parentAddress,
passphrase: passphrase,
);
case WalletType.tron:
@ -160,7 +154,6 @@ abstract class WalletNewVMBase extends WalletCreationVM with Store {
name: name,
password: walletPassword,
mnemonic: newWalletArguments!.mnemonic,
parentAddress: newWalletArguments!.parentAddress,
passphrase: passphrase,
);
case WalletType.wownero:

13
tool/configure.dart
View file

@ -160,7 +160,7 @@ abstract class Bitcoin {
String? passphrase,
});
WalletCredentials createBitcoinRestoreWalletFromWIFCredentials({required String name, required String password, required String wif, WalletInfo? walletInfo});
WalletCredentials createBitcoinNewWalletCredentials({required String name, WalletInfo? walletInfo, String? password, String? passphrase, String? mnemonic, String? parentAddress});
WalletCredentials createBitcoinNewWalletCredentials({required String name, WalletInfo? walletInfo, String? password, String? passphrase, String? mnemonic});
WalletCredentials createBitcoinHardwareWalletCredentials({required String name, required HardwareAccountData accountData, WalletInfo? walletInfo});
List<String> getWordList();
Map<String, String> getWalletKeys(Object wallet);
@ -882,7 +882,7 @@ import 'package:eth_sig_util/util/utils.dart';
abstract class Ethereum {
List<String> getEthereumWordList(String language);
WalletService createEthereumWalletService(Box<WalletInfo> walletInfoSource, bool isDirect);
WalletCredentials createEthereumNewWalletCredentials({required String name, WalletInfo? walletInfo, String? password, String? mnemonic, String? parentAddress, String? passphrase});
WalletCredentials createEthereumNewWalletCredentials({required String name, WalletInfo? walletInfo, String? password, String? mnemonic, String? passphrase});
WalletCredentials createEthereumRestoreWalletFromSeedCredentials({required String name, required String mnemonic, required String password, String? passphrase});
WalletCredentials createEthereumRestoreWalletFromPrivateKey({required String name, required String privateKey, required String password});
WalletCredentials createEthereumHardwareWalletCredentials({required String name, required HardwareAccountData hwAccountData, WalletInfo? walletInfo});
@ -989,7 +989,7 @@ import 'package:eth_sig_util/util/utils.dart';
abstract class Polygon {
List<String> getPolygonWordList(String language);
WalletService createPolygonWalletService(Box<WalletInfo> walletInfoSource, bool isDirect);
WalletCredentials createPolygonNewWalletCredentials({required String name, WalletInfo? walletInfo, String? password, String? mnemonic, String? parentAddress, String? passphrase});
WalletCredentials createPolygonNewWalletCredentials({required String name, WalletInfo? walletInfo, String? password, String? mnemonic, String? passphrase});
WalletCredentials createPolygonRestoreWalletFromSeedCredentials({required String name, required String mnemonic, required String password, String? passphrase});
WalletCredentials createPolygonRestoreWalletFromPrivateKey({required String name, required String privateKey, required String password});
WalletCredentials createPolygonHardwareWalletCredentials({required String name, required HardwareAccountData hwAccountData, WalletInfo? walletInfo});
@ -1077,7 +1077,7 @@ abstract class BitcoinCash {
Box<WalletInfo> walletInfoSource, Box<UnspentCoinsInfo> unspentCoinSource, bool isDirect);
WalletCredentials createBitcoinCashNewWalletCredentials(
{required String name, WalletInfo? walletInfo, String? password, String? passphrase, String? mnemonic, String? parentAddress});
{required String name, WalletInfo? walletInfo, String? password, String? passphrase, String? mnemonic});
WalletCredentials createBitcoinCashRestoreWalletFromSeedCredentials(
{required String name, required String mnemonic, required String password, String? passphrase});
@ -1161,7 +1161,6 @@ abstract class Nano {
required String name,
String? password,
String? mnemonic,
String? parentAddress,
WalletInfo? walletInfo,
String? passphrase,
});
@ -1281,7 +1280,7 @@ abstract class Solana {
List<String> getSolanaWordList(String language);
WalletService createSolanaWalletService(Box<WalletInfo> walletInfoSource, bool isDirect);
WalletCredentials createSolanaNewWalletCredentials(
{required String name, WalletInfo? walletInfo, String? password, String? mnemonic, String? parentAddress, String? passphrase});
{required String name, WalletInfo? walletInfo, String? password, String? mnemonic, String? passphrase});
WalletCredentials createSolanaRestoreWalletFromSeedCredentials(
{required String name, required String mnemonic, required String password, String? passphrase});
WalletCredentials createSolanaRestoreWalletFromPrivateKey(
@ -1369,7 +1368,7 @@ import 'package:cw_tron/default_tron_tokens.dart';
abstract class Tron {
List<String> getTronWordList(String language);
WalletService createTronWalletService(Box<WalletInfo> walletInfoSource, bool isDirect);
WalletCredentials createTronNewWalletCredentials({required String name, WalletInfo? walletInfo, String? password, String? mnemonic, String? parentAddress, String? passphrase});
WalletCredentials createTronNewWalletCredentials({required String name, WalletInfo? walletInfo, String? password, String? mnemonic, String? passphrase});
WalletCredentials createTronRestoreWalletFromSeedCredentials({required String name, required String mnemonic, required String password, String? passphrase});
WalletCredentials createTronRestoreWalletFromPrivateKey({required String name, required String privateKey, required String password});
String getAddress(WalletBase wallet);

2
tool/utils/secret_key.dart
View file

@ -77,6 +77,7 @@ class SecretKey {
SecretKey('moneroTestWalletBlockHeight', () => ''),
SecretKey('chainflipApiKey', () => ''),
SecretKey('chainflipAffiliateFee', () => ''),
SecretKey('walletGroupSalt', () => hex.encode(encrypt.Key.fromSecureRandom(16).bytes)),
];
static final evmChainsSecrets = [
@ -88,6 +89,7 @@ class SecretKey {
static final solanaSecrets = [
SecretKey('ankrApiKey', () => ''),
SecretKey('nowNodesApiKey', () => ''),
SecretKey('chainStackApiKey', () => ''),
];