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

feat: xpub restore from bitcoin URI QR

Browse source
This commit is contained in:
Czarek Nakamoto 2025-06-03 12:13:47 +02:00 • committed by cyan
parent cde1274def
commit a4a40356a3
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/view_model/restore/restore_wallet.dart
View file

@ -35,7 +35,7 @@ class RestoredWallet {
factory RestoredWallet.fromKey(Map<String, dynamic> json) { factory RestoredWallet.fromKey(Map<String, dynamic> json) {
try { try {
final codeParsed = jsonDecode(json['raw_qr'].toString()); final codeParsed = jsonDecode(json['raw_qr'].toString());
if (codeParsed["version"] == 0) { if (codeParsed["version"] == 0) {
json['address'] = codeParsed["primaryAddress"]; json['address'] = codeParsed["primaryAddress"];
json['view_key'] = codeParsed["privateViewKey"]; json['view_key'] = codeParsed["privateViewKey"];
@ -44,6 +44,7 @@ class RestoredWallet {
} catch (e) { } catch (e) {
// fine, we don't care, it is only for monero anyway // fine, we don't care, it is only for monero anyway
} }
json['view_key'] ??= json['xpub'];
final height = json['height'] as String?; final height = json['height'] as String?;
return RestoredWallet( return RestoredWallet(
restoreMode: json['mode'] as WalletRestoreMode, restoreMode: json['mode'] as WalletRestoreMode,
@ -51,7 +52,7 @@ class RestoredWallet {
address: json['address'] as String?, address: json['address'] as String?,
spendKey: json['spend_key'] as String?, spendKey: json['spend_key'] as String?,
viewKey: json['view_key'] as String?, viewKey: json['view_key'] as String?,
height: height != null ? int.tryParse(height)??0 : 0, height: height != null ? int.tryParse(height) ?? 0 : 0,
privateKey: json['private_key'] as String?, privateKey: json['private_key'] as String?,
); );
} }

4
lib/view_model/restore/wallet_restore_from_qr_code.dart
View file

@ -158,6 +158,10 @@ class WalletRestoreFromQRCode {
throw Exception('Unexpected restore mode: tx_payment_id is invalid'); throw Exception('Unexpected restore mode: tx_payment_id is invalid');
} }
if (credentials.containsKey("xpub")) {
return WalletRestoreMode.keys;
}
if (credentials['seed'] != null) { if (credentials['seed'] != null) {
final seedValue = credentials['seed'] as String; final seedValue = credentials['seed'] as String;
final words = SeedValidator.getWordList(type: type, language: 'english'); final words = SeedValidator.getWordList(type: type, language: 'english');