fix: debugging keystone integration

MrCyjaneK · MrCyjaneK · commit 1094b78f70f6 · 2025-09-22T08:27:25.000-04:00
feat: support for zpub view only restore
diff --git a/cw_bitcoin/lib/bitcoin_wallet.dart b/cw_bitcoin/lib/bitcoin_wallet.dart
@@ -13,6 +13,7 @@ import 'package:cw_bitcoin/electrum_derivations.dart';
 import 'package:cw_bitcoin/electrum_wallet.dart';
 import 'package:cw_bitcoin/electrum_wallet_snapshot.dart';
 import 'package:cw_bitcoin/payjoin/manager.dart';
+import 'package:cw_bitcoin/utils.dart';
 import 'package:cw_bitcoin/payjoin/storage.dart';
 import 'package:cw_bitcoin/pending_bitcoin_transaction.dart';
 import 'package:cw_bitcoin/psbt/signer.dart';
@@ -241,7 +242,7 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
 
     return BitcoinWallet(
         mnemonic: mnemonic,
-        xpub: keysData.xPub,
+        xpub: keysData.xPub != null ? convertZpubToXpub(keysData.xPub!) : null,
         password: password,
         passphrase: passphrase,
         walletInfo: walletInfo,
diff --git a/cw_bitcoin/lib/bitcoin_wallet_service.dart b/cw_bitcoin/lib/bitcoin_wallet_service.dart
@@ -4,6 +4,7 @@ import 'package:cw_bitcoin/bitcoin_mnemonic.dart';
 import 'package:cw_bitcoin/bitcoin_mnemonics_bip39.dart';
 import 'package:cw_bitcoin/mnemonic_is_incorrect_exception.dart';
 import 'package:cw_bitcoin/bitcoin_wallet_creation_credentials.dart';
+import 'package:cw_bitcoin/utils.dart';
 import 'package:cw_core/encryption_file_utils.dart';
 import 'package:cw_core/payjoin_session.dart';
 import 'package:cw_core/unspent_coins_info.dart';
@@ -150,9 +151,12 @@ class BitcoinWalletService extends WalletService<
     credentials.walletInfo?.network = network.value;
     credentials.walletInfo?.derivationInfo?.derivationPath =
         credentials.hwAccountData.derivationPath;
+    
+    final xpub = convertZpubToXpub(credentials.hwAccountData.xpub!);
+    
     final wallet = await BitcoinWallet(
       password: credentials.password!,
-      xpub: credentials.hwAccountData.xpub,
+      xpub: xpub,
       walletInfo: credentials.walletInfo!,
       unspentCoinsInfo: unspentCoinsInfoSource,
       networkParam: network,
@@ -166,13 +170,15 @@ class BitcoinWalletService extends WalletService<
 
   @override
   Future<BitcoinWallet> restoreFromKeys(BitcoinWalletFromKeysCredentials credentials,
-          {bool? isTestnet}) async {
+      {bool? isTestnet}) async {
     final network = isTestnet == true ? BitcoinNetwork.testnet : BitcoinNetwork.mainnet;
     credentials.walletInfo?.network = network.value;
 
+    final xpub = convertZpubToXpub(credentials.xpub);
+
     final wallet = await BitcoinWallet(
       password: credentials.password!,
-      xpub: credentials.xpub,
+      xpub: xpub,
       walletInfo: credentials.walletInfo!,
       unspentCoinsInfo: unspentCoinsInfoSource,
       networkParam: network,
diff --git a/cw_bitcoin/lib/utils.dart b/cw_bitcoin/lib/utils.dart
@@ -1,3 +1,4 @@
+import 'dart:typed_data';
 import 'package:bitcoin_base/bitcoin_base.dart';
 import 'package:blockchain_utils/blockchain_utils.dart';
 
@@ -52,3 +53,45 @@ String generateP2TRAddress({
     ECPublic.fromBip32(hd.childKey(Bip32KeyIndex(index)).publicKey)
         .toTaprootAddress()
         .toAddress(network);
+
+String convertZpubToXpub(String zpub) {
+  try {
+    final decoded = Base58Decoder.checkDecode(zpub);
+    
+    if (decoded.length < 4) {
+      throw ArgumentError('Invalid extended public key length');
+    }
+    
+    final versionBytes = decoded.sublist(0, 4);
+    final zpubVersionBytes = [0x04, 0xb2, 0x47, 0x46]; // zpub mainnet version
+    final zpubTestnetVersionBytes = [0x04, 0x5f, 0x1c, 0xf6]; // vpub testnet version
+    
+    bool isZpub = listEquals(versionBytes, zpubVersionBytes);
+    bool isVpub = listEquals(versionBytes, zpubTestnetVersionBytes);
+    
+    if (!isZpub && !isVpub) {
+      return zpub;
+    }
+    
+    final xpubVersionBytes = isZpub ? 
+      [0x04, 0x88, 0xb2, 0x1e] : // xpub mainnet
+      [0x04, 0x35, 0x87, 0xcf]; // tpub testnet
+    
+    final newExtendedKey = Uint8List.fromList([
+      ...xpubVersionBytes,
+      ...decoded.sublist(4),
+    ]);
+    
+    return Base58Encoder.checkEncode(newExtendedKey);
+  } catch (e) {
+    throw ArgumentError('Failed to convert zpub to xpub: $e');
+  }
+}
+
+bool listEquals<T>(List<T> a, List<T> b) {
+  if (a.length != b.length) return false;
+  for (int i = 0; i < a.length; i++) {
+    if (a[i] != b[i]) return false;
+  }
+  return true;
+}
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -69,8 +69,6 @@ PODS:
     - Flutter
   - image_picker_ios (0.0.1):
     - Flutter
-  - image_picker_ios (0.0.1):
-    - Flutter
   - in_app_review (2.0.0):
     - Flutter
   - integration_test (0.0.1):
@@ -87,9 +85,9 @@ PODS:
   - reown_yttrium (0.0.1):
     - Flutter
     - YttriumWrapper (= 0.8.35)
-  - SDWebImage (5.20.0):
-    - SDWebImage/Core (= 5.20.0)
-  - SDWebImage/Core (5.20.0)
+  - SDWebImage (5.21.2):
+    - SDWebImage/Core (= 5.21.2)
+  - SDWebImage/Core (5.21.2)
   - sensitive_clipboard (0.0.1):
     - Flutter
   - share_plus (0.0.1):
@@ -256,7 +254,7 @@ SPEC CHECKSUMS:
   payjoin_flutter: d9d4c8aa16bd5dfedb9b21d0edc8199e0187d96e
   permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d
   reown_yttrium: cee334ade64725b1d83f7b34c706a6aae2696d58
-  SDWebImage: 73c6079366fea25fa4bb9640d5fb58f0893facd8
+  SDWebImage: 9f177d83116802728e122410fb25ad88f5c7608a
   sensitive_clipboard: 161e9abc3d56b3131309d8a321eb4690a803c16b
   share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a
   shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
diff --git a/lib/di.dart b/lib/di.dart
@@ -36,6 +36,7 @@ import 'package:cake_wallet/src/screens/dev/monero_background_sync.dart';
 import 'package:cake_wallet/src/screens/dev/moneroc_cache_debug.dart';
 import 'package:cake_wallet/src/screens/dev/moneroc_call_profiler.dart';
 import 'package:cake_wallet/src/screens/dev/network_requests.dart';
+import 'package:cake_wallet/src/screens/dev/qr_tools_page.dart';
 import 'package:cake_wallet/src/screens/dev/secure_preferences_page.dart';
 import 'package:cake_wallet/src/screens/dev/shared_preferences_page.dart';
 import 'package:cake_wallet/src/screens/integrations/deuro/savings_page.dart';
@@ -1562,9 +1563,12 @@ Future<void> setup({
   getIt.registerFactory(() => DevBackgroundSyncLogsPage(getIt.get<BackgroundSyncLogsViewModel>()));
   
   getIt.registerFactory(() => SocketHealthLogsViewModel());
+
   getIt.registerFactory(() => DevSocketHealthLogsPage(getIt.get<SocketHealthLogsViewModel>()));
   
   getIt.registerFactory(() => DevNetworkRequests());
+  
+  getIt.registerFactory(() => DevQRToolsPage());
 
   getIt.registerFactory(() => StartTorPage(StartTorViewModel(),));
   
diff --git a/lib/router.dart b/lib/router.dart
@@ -39,6 +39,7 @@ import 'package:cake_wallet/src/screens/dev/monero_background_sync.dart';
 import 'package:cake_wallet/src/screens/dev/moneroc_cache_debug.dart';
 import 'package:cake_wallet/src/screens/dev/moneroc_call_profiler.dart';
 import 'package:cake_wallet/src/screens/dev/network_requests.dart';
+import 'package:cake_wallet/src/screens/dev/qr_tools_page.dart';
 import 'package:cake_wallet/src/screens/dev/secure_preferences_page.dart';
 import 'package:cake_wallet/src/screens/dev/shared_preferences_page.dart';
 import 'package:cake_wallet/src/screens/dev/background_sync_logs_page.dart';
@@ -920,6 +921,11 @@ Route<dynamic> createRoute(RouteSettings settings) {
         builder: (_) => getIt.get<DevSocketHealthLogsPage>(),
       );
     
+    case Routes.devQRTools:
+      return MaterialPageRoute<void>(
+        builder: (_) => getIt.get<DevQRToolsPage>(),
+      );
+
     case Routes.devNetworkRequests:
       return MaterialPageRoute<void>(
         builder: (_) => getIt.get<DevNetworkRequests>(),
diff --git a/lib/routes.dart b/lib/routes.dart
@@ -123,6 +123,7 @@ class Routes {
   static const devBackgroundSyncLogs = '/dev/background_sync_logs';
   static const devSocketHealthLogs = '/dev/socket_health_logs';
   static const devNetworkRequests = '/dev/network_requests';
+  static const devQRTools = '/dev/qr_tools';
 
   static const signPage = '/sign_page';
   static const connectDevices = '/device/connect';
diff --git a/lib/src/screens/dev/qr_tools_page.dart b/lib/src/screens/dev/qr_tools_page.dart
@@ -0,0 +1,39 @@
+import 'package:cake_wallet/src/screens/base_page.dart';
+import 'package:cake_wallet/src/screens/dev/moneroc_cache_debug.dart';
+import 'package:cake_wallet/view_model/dev/qr_tools_view_model.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_mobx/flutter_mobx.dart';
+
+class DevQRToolsPage extends BasePage {
+  @override
+  String? get title => "[dev] *QR tools";
+
+  final QRToolsViewModel viewModel = QRToolsViewModel();
+
+  late final textCtrl = TextEditingController(text: viewModel.input);
+
+  @override
+  Widget body(BuildContext context) {
+    return Container(
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          TextField(
+            controller: textCtrl,
+            maxLines: 8,
+            onChanged: (value) {
+              viewModel.input = value;
+            }
+          ),
+          Observer(
+            builder: (_) {
+              return Expanded(
+              child: JsonExplorer(data: viewModel.data, title: "result"),
+            );
+            },
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/src/screens/settings/other_settings_page.dart b/lib/src/screens/settings/other_settings_page.dart
@@ -111,6 +111,12 @@ class OtherSettingsPage extends BasePage {
                   handler: (BuildContext context) =>
                       Navigator.of(context).pushNamed(Routes.devNetworkRequests),
                 ),
+              if (FeatureFlag.hasDevOptions)
+                SettingsCellWithArrow(
+                  title: '[dev] *QR tools',
+                  handler: (BuildContext context) =>
+                      Navigator.of(context).pushNamed(Routes.devQRTools),
+                ),
               Spacer(),
               SettingsVersionCell(
                   title: S.of(context).version(_otherSettingsViewModel.currentVersion)),
diff --git a/lib/view_model/dev/qr_tools_view_model.dart b/lib/view_model/dev/qr_tools_view_model.dart
@@ -0,0 +1,81 @@
+import 'dart:convert';
+
+import 'package:flutter/foundation.dart';
+import 'package:ur/cbor_lite.dart';
+import 'package:ur/ur.dart';
+import 'package:mobx/mobx.dart';
+import 'package:ur/ur_decoder.dart';
+
+part 'qr_tools_view_model.g.dart';
+
+class QRToolsViewModel = QRToolsViewModelBase with _$QRToolsViewModel;
+
+enum DevQrType {
+  zpub,
+  xpub,
+  bbqr,
+  bcur,
+  unknown,
+}
+
+abstract class QRToolsViewModelBase with Store {
+  @observable
+  String input = '';
+
+
+
+  @computed
+  Map<String, dynamic> get data => _getResult(input);
+
+  Uint8List _decodeCBOR(Uint8List cbor) {
+    final cborDecoder = CBORDecoder(cbor);
+    final out = cborDecoder.decodeBytes();
+    return out.$1;
+  }
+
+
+  Map<String, dynamic> _getResult(String input) {
+    try {
+      final decoder = URDecoder();
+      for (var part in input.split('\n')) {
+        part = part.toLowerCase();
+        part = part.trim();
+        if (part.startsWith('-')) {
+          part = part.substring(1).trim();
+        }
+        if (!part.startsWith('ur:')) {
+          continue;
+        }
+        decoder.receivePart(part);
+      }
+      return {
+        "result": (decoder.result != null) ? switch (decoder.result.runtimeType) {
+          UR => {
+            "cbor": (decoder.result as UR).cbor,
+            "_cbor.decode.base64": base64.encode(_decodeCBOR((decoder.result as UR).cbor)),
+            "type": (decoder.result as UR).type,
+            "toString": (decoder.result as UR).toString(),
+          },
+          _ => "unknown type: ${decoder.result.runtimeType}"
+        } : null,
+        "expectedType": decoder.expectedType,
+        "estimatedPercentComplete": decoder.estimatedPercentComplete(),
+        "processedPartsCount": decoder.processedPartsCount(),
+        "expectedPartCount": decoder.expectedPartCount(),
+        "isComplete": decoder.isComplete(),
+        "isFailure": decoder.isFailure(),
+        "isSuccess": decoder.isSuccess(),
+        "lastPartIndexes": decoder.lastPartIndexes(),
+        "receivedPartIndexes": decoder.receivedPartIndexes(),
+        "resultError": decoder.resultError(),
+        "resultMessage": decoder.resultMessage(),
+        "toString": decoder.toString(),
+
+      };
+    } catch (e) {
+      return {
+        "error": e.toString(),
+      };
+    }
+  }
+}
diff --git a/lib/view_model/restore/restore_wallet.dart b/lib/view_model/restore/restore_wallet.dart
@@ -2,6 +2,7 @@ import 'dart:convert';
 
 import 'package:cake_wallet/view_model/restore/restore_mode.dart';
 import 'package:cw_core/wallet_type.dart';
+import 'package:cw_bitcoin/utils.dart';
 
 class RestoredWallet {
   RestoredWallet(
@@ -44,6 +45,9 @@ class RestoredWallet {
     } catch (e) {
       // fine, we don't care, it is only for monero anyway
     }
+    if (json['zpub'] != null) {
+      json['xpub'] = convertZpubToXpub(json['zpub'] as String);
+    }
     json['view_key'] ??= json['xpub'];
     final height = json['height'] as String?;
     return RestoredWallet(
diff --git a/lib/view_model/restore/wallet_restore_from_qr_code.dart b/lib/view_model/restore/wallet_restore_from_qr_code.dart
@@ -58,6 +58,7 @@ class WalletRestoreFromQRCode {
     final extracted = sortedKeys.firstWhereOrNull((key) => code.toLowerCase().contains(key));
 
     if (code.startsWith("xpub")) return WalletType.bitcoin;
+    if (code.startsWith("zpub")) return WalletType.bitcoin;
 
     if (extracted == null) {
       // Special case for view-only monero wallet
@@ -111,7 +112,7 @@ class WalletRestoreFromQRCode {
 
     String formattedUri = '';
     WalletType? walletType = _extractWalletType(code);
-
+    final prefix = code.startsWith('xpub') ? 'xpub' : code.startsWith('zpub') ? 'zpub' : '????';
     if (walletType == null) {
       await _specifyWalletAssets(context, "Can't determine wallet type, please pick it manually");
       walletType =
@@ -122,14 +123,14 @@ class WalletRestoreFromQRCode {
 
       formattedUri = seedPhrase != null
           ? '$walletType:?seed=$seedPhrase'
-          : code.startsWith('xpub') 
-            ? '$walletType:?xpub=$code' 
+          : code.startsWith(prefix) 
+            ? '$walletType:?$prefix=$code' 
             : throw Exception('Failed to determine valid seed phrase');
     } else {
       final index = code.indexOf(':');
       final query = code.substring(index + 1).replaceAll('?', '&');
-      formattedUri = code.startsWith('xpub') 
-        ? '$walletType:?xpub=$code' 
+      formattedUri = code.startsWith(prefix) 
+        ? '$walletType:?$prefix=$code' 
         :'$walletType:?$query';
     }
 
@@ -167,7 +168,8 @@ class WalletRestoreFromQRCode {
       throw Exception('Unexpected restore mode: tx_payment_id is invalid');
     }
 
-    if (credentials.containsKey("xpub")) {
+    if (credentials.containsKey("xpub") ||
+        credentials.containsKey("zpub")) {
       return WalletRestoreMode.keys;
     }
 
