feat: zano hf + bip39

MrCyjaneK · MrCyjaneK · commit 7e26d45a328c · 2026-06-30T18:42:34.000+02:00
diff --git a/cw_monero/pubspec.lock b/cw_monero/pubspec.lock
@@ -545,8 +545,8 @@ packages:
     dependency: "direct main"
     description:
       path: "impls/monero.dart"
-      ref: "3bfb3856a838f2bf6b729501837bb0295dedf25d"
-      resolved-ref: "3bfb3856a838f2bf6b729501837bb0295dedf25d"
+      ref: "4f23e050f7dec0bbbbe27c36c8e511bb3f52868a"
+      resolved-ref: "4f23e050f7dec0bbbbe27c36c8e511bb3f52868a"
       url: "https://github.com/mrcyjanek/monero_c.git"
     source: git
     version: "0.0.0"
diff --git a/cw_monero/pubspec.yaml b/cw_monero/pubspec.yaml
@@ -26,7 +26,7 @@ dependencies:
   monero:
     git:
       url: https://github.com/mrcyjanek/monero_c.git
-      ref: 3bfb3856a838f2bf6b729501837bb0295dedf25d
+      ref: 4f23e050f7dec0bbbbe27c36c8e511bb3f52868a
       path: impls/monero.dart
   mutex: ^3.1.0
   ledger_flutter_plus: ^1.4.1
diff --git a/cw_wownero/pubspec.lock b/cw_wownero/pubspec.lock
@@ -449,8 +449,8 @@ packages:
     dependency: "direct main"
     description:
       path: "impls/monero.dart"
-      ref: "3bfb3856a838f2bf6b729501837bb0295dedf25d"
-      resolved-ref: "3bfb3856a838f2bf6b729501837bb0295dedf25d"
+      ref: "4f23e050f7dec0bbbbe27c36c8e511bb3f52868a"
+      resolved-ref: "4f23e050f7dec0bbbbe27c36c8e511bb3f52868a"
       url: "https://github.com/mrcyjanek/monero_c.git"
     source: git
     version: "0.0.0"
diff --git a/cw_wownero/pubspec.yaml b/cw_wownero/pubspec.yaml
@@ -24,7 +24,7 @@ dependencies:
   monero:
     git:
       url: https://github.com/mrcyjanek/monero_c.git
-      ref: 3bfb3856a838f2bf6b729501837bb0295dedf25d
+      ref: 4f23e050f7dec0bbbbe27c36c8e511bb3f52868a
       path: impls/monero.dart
   mutex: ^3.1.0
 
diff --git a/cw_zano/lib/bip39_seed.dart b/cw_zano/lib/bip39_seed.dart
@@ -0,0 +1,18 @@
+import 'dart:typed_data';
+
+import 'package:bip39/bip39.dart' as bip39;
+
+bool isBip39Seed(String mnemonic) => bip39.validateMnemonic(mnemonic);
+
+String generateBip39Mnemonic({int strength = 128}) =>
+    bip39.generateMnemonic(strength: strength);
+
+String getSecretDerivationFromBip39(String mnemonic, {String passphrase = ''}) {
+  final seed = bip39.mnemonicToSeed(mnemonic, passphrase: passphrase);
+  return Uint8List.fromList(seed.sublist(0, 32)).toHexString();
+}
+
+extension on Uint8List {
+  String toHexString() =>
+      map((b) => b.toRadixString(16).padLeft(2, '0')).join();
+}
diff --git a/cw_zano/lib/zano_wallet.dart b/cw_zano/lib/zano_wallet.dart
@@ -33,6 +33,7 @@ import 'package:cw_zano/zano_wallet_api.dart';
 import 'package:cw_zano/zano_wallet_exceptions.dart';
 import 'package:cw_zano/zano_wallet_service.dart';
 import 'package:cw_zano/api/model/balance.dart';
+import 'package:cw_zano/bip39_seed.dart';
 
 import 'package:mobx/mobx.dart';
 
@@ -132,14 +133,25 @@ abstract class ZanoWalletBase
     final wallet = ZanoWallet(credentials.walletInfo!, await credentials.walletInfo!.getDerivationInfo(), credentials.password!);
     await wallet.initWallet();
     final path = await pathForWallet(name: credentials.name, type: credentials.walletInfo!.type);
-    final createWalletResult = await wallet.createWallet(path, credentials.password!);
+    final strength = credentials.seedPhraseLength == 24 ? 256 : 128;
+    final mnemonic = generateBip39Mnemonic(strength: strength);
+    final passphrase = credentials.passphrase ?? '';
+    final secretDerivation = getSecretDerivationFromBip39(mnemonic, passphrase: passphrase);
+    final creationTimestamp = DateTime.now().millisecondsSinceEpoch ~/ 1000;
+    final createWalletResult = await wallet.restoreWalletFromDerivations(
+      path,
+      credentials.password!,
+      secretDerivation,
+      creationTimestamp: creationTimestamp,
+    );
     await wallet.initWallet();
-    await wallet.parseCreateWalletResult(createWalletResult);
+    await wallet.setBip39Secrets(mnemonic: mnemonic, creationTimestamp: creationTimestamp);
     if (credentials.passphrase != null) {
       await wallet.setPassphrase(credentials.passphrase!);
-      wallet.seed = await createWalletResult.seed(wallet);
-      wallet.passphrase = await wallet.getPassphrase();
     }
+    await wallet.parseCreateWalletResult(createWalletResult);
+    wallet.seed = mnemonic;
+    wallet.passphrase = await wallet.getPassphrase();
     await wallet.init(createWalletResult.wi.address);
     return wallet;
   }
@@ -149,15 +161,33 @@ abstract class ZanoWalletBase
     final wallet = ZanoWallet(credentials.walletInfo!, await credentials.walletInfo!.getDerivationInfo(), credentials.password!);
     await wallet.initWallet();
     final path = await pathForWallet(name: credentials.name, type: credentials.walletInfo!.type);
-    final createWalletResult = await wallet.restoreWalletFromSeed(
-        path, credentials.password!, credentials.mnemonic, credentials.passphrase);
+    final passphrase = credentials.passphrase ?? '';
+    final CreateWalletResult createWalletResult;
+    if (isBip39Seed(credentials.mnemonic)) {
+      final secretDerivation =
+          getSecretDerivationFromBip39(credentials.mnemonic, passphrase: passphrase);
+      final creationTimestamp = (credentials.height ?? 0) > 0 ? credentials.height! : 0;
+      createWalletResult = await wallet.restoreWalletFromDerivations(
+        path,
+        credentials.password!,
+        secretDerivation,
+        creationTimestamp: creationTimestamp,
+      );
+      await wallet.setBip39Secrets(
+        mnemonic: credentials.mnemonic,
+        creationTimestamp: creationTimestamp,
+      );
+    } else {
+      createWalletResult = await wallet.restoreWalletFromSeed(
+          path, credentials.password!, credentials.mnemonic, credentials.passphrase);
+    }
     await wallet.initWallet();
-    await wallet.parseCreateWalletResult(createWalletResult);
     if (credentials.passphrase != null) {
       await wallet.setPassphrase(credentials.passphrase!);
-      wallet.seed = await createWalletResult.seed(wallet);
-      wallet.passphrase = await wallet.getPassphrase();
     }
+    await wallet.parseCreateWalletResult(createWalletResult);
+    wallet.seed = await createWalletResult.seed(wallet);
+    wallet.passphrase = await wallet.getPassphrase();
     await wallet.init(createWalletResult.wi.address);
     return wallet;
   }
diff --git a/cw_zano/lib/zano_wallet_api.dart b/cw_zano/lib/zano_wallet_api.dart
@@ -123,7 +123,25 @@ mixin ZanoWalletApi {
     return _setWalletSecret("passphrase", passphrase);
   }
 
+  Future<String?> getBip39Mnemonic() async {
+    return await _getWalletSecret("bip39_mnemonic");
+  }
+
+  Future<void> setBip39Secrets({
+    required String mnemonic,
+    required int creationTimestamp,
+  }) async {
+    final secrets = await _getSecrets();
+    secrets["bip39_mnemonic"] = mnemonic;
+    secrets["creation_timestamp"] = creationTimestamp.toString();
+    await _setSecrets(secrets);
+  }
+
   Future<String> getSeed() async {
+    final bip39Mnemonic = await getBip39Mnemonic();
+    if (bip39Mnemonic != null) {
+      return bip39Mnemonic;
+    }
     final passphrase = await getPassphrase();
     final respStr = await invokeMethod("get_restore_info", {"seed_password": passphrase??""});
     final resp = convert.json.decode(respStr);
@@ -319,6 +337,43 @@ mixin ZanoWalletApi {
     return result;
   }
 
+  Future<CreateWalletResult> restoreWalletFromDerivations(
+    String path,
+    String password,
+    String secretDerivation, {
+    bool isAuditable = false,
+    required int creationTimestamp,
+  }) async {
+    printV('restore_wallet_from_derivations path $path');
+    final params = jsonEncode({
+      "creation_timestamp": creationTimestamp,
+      "is_auditable": isAuditable,
+      "pass": password,
+      "path": path,
+      "secret_derivation": secretDerivation,
+    });
+    final json = await callSyncMethod('restore_from_derivations', 0, params);
+    final map = jsonDecode(json) as Map<String, dynamic>?;
+    if (map?['error'] != null) {
+      final code = map!['error']!['code'] ?? '';
+      final message = map['error']!['message'] ?? '';
+      if (code == Consts.errorWrongSeed) {
+        throw RestoreFromSeedsException(
+            'Error restoring wallet\nPlease check the seed words are correct. Additionally, if you created this wallet with a passphrase please add it under the Advanced Settings page.');
+      } else if (code == Consts.errorAlreadyExists) {
+        throw RestoreFromSeedsException('Error restoring wallet, already exists');
+      }
+      throw RestoreFromSeedsException('Error restoring wallet, $message ($code)');
+    }
+    if (map?['result'] == null) {
+      throw RestoreFromSeedsException('Error restoring wallet, empty response');
+    }
+    final result = CreateWalletResult.fromJson(map!['result'] as Map<String, dynamic>);
+    openWalletCache[path] = result;
+    printV('restore_wallet_from_derivations ${result.name} ${result.wi.address}');
+    return result;
+  }
+
   Future<CreateWalletResult> restoreWalletFromSeed(String path, String password, String seed, String? passphrase) async {
     printV('restore_wallet path $path');
     final json = zano.PlainWallet_restore(seed, path, password, passphrase??'');
diff --git a/cw_zano/pubspec.lock b/cw_zano/pubspec.lock
@@ -50,6 +50,14 @@ packages:
       url: "https://github.com/cake-tech/bech32.git"
     source: git
     version: "0.2.2"
+  bip39:
+    dependency: "direct main"
+    description:
+      name: bip39
+      sha256: de1ee27ebe7d96b84bb3a04a4132a0a3007dcdd5ad27dd14aa87a29d97c45edc
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.6"
   blockchain_utils:
     dependency: transitive
     description:
@@ -298,6 +306,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.3.2"
+  hex:
+    dependency: transitive
+    description:
+      name: hex
+      sha256: "4e7cd54e4b59ba026432a6be2dd9d96e4c5205725194997193bf871703b82c4a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.0"
   hive:
     dependency: "direct dev"
     description:
@@ -454,8 +470,8 @@ packages:
     dependency: "direct main"
     description:
       path: "impls/monero.dart"
-      ref: "3bfb3856a838f2bf6b729501837bb0295dedf25d"
-      resolved-ref: "3bfb3856a838f2bf6b729501837bb0295dedf25d"
+      ref: "4f23e050f7dec0bbbbe27c36c8e511bb3f52868a"
+      resolved-ref: "4f23e050f7dec0bbbbe27c36c8e511bb3f52868a"
       url: "https://github.com/mrcyjanek/monero_c.git"
     source: git
     version: "0.0.0"
diff --git a/cw_zano/pubspec.yaml b/cw_zano/pubspec.yaml
@@ -11,6 +11,7 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
+  bip39: ^1.0.6
   ffi: ^2.0.1
   http: ^1.1.0
   path_provider: ^2.0.11
@@ -25,7 +26,7 @@ dependencies:
   monero:
     git:
       url: https://github.com/mrcyjanek/monero_c.git
-      ref: 3bfb3856a838f2bf6b729501837bb0295dedf25d
+      ref: 4f23e050f7dec0bbbbe27c36c8e511bb3f52868a
       path: impls/monero.dart
 dev_dependencies:
   flutter_test:
diff --git a/lib/core/wallet_creation_service.dart b/lib/core/wallet_creation_service.dart
@@ -86,12 +86,13 @@ class WalletCreationService {
       case WalletType.nano:
       case WalletType.zcash:
         return true;
+      case WalletType.zano:
+        return true;
       case WalletType.monero:
       case WalletType.wownero:
       case WalletType.none:
       case WalletType.haven:
       case WalletType.banano:
-      case WalletType.zano:
       case WalletType.decred:
         return false;
     }
diff --git a/lib/src/screens/restore/wallet_restore_page.dart b/lib/src/screens/restore/wallet_restore_page.dart
@@ -13,6 +13,7 @@ import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:cake_wallet/view_model/restore/restore_mode.dart';
 import 'package:cake_wallet/view_model/seed_settings_view_model.dart';
 import 'package:cake_wallet/view_model/wallet_restore_view_model.dart';
+import 'package:cake_wallet/zano/zano.dart';
 import 'package:cw_core/wallet_info.dart';
 import 'package:cw_core/wallet_type.dart';
 import 'package:flutter/material.dart';
@@ -601,7 +602,14 @@ 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 (walletRestoreViewModel.type == WalletType.zano) {
+      if (seedWords.length == 26) return true;
+      if ([12, 24].contains(seedWords.length) &&
+          zano!.isBip39Seed(seedPhrase.trim())) {
+        return true;
+      }
+      return false;
+    }
 
     if (seedWords.length == 12 && walletRestoreViewModel.type == WalletType.monero) {
       return walletRestoreFromSeedFormKey.currentState?.blockchainHeightKey.currentState
@@ -617,7 +625,7 @@ class _WalletRestorePageBodyState extends State<_WalletRestorePageBody>
 
     // bip39:
     final validBip39SeedLengths = [12, 18, 24];
-    final nonBip39WalletTypes = [WalletType.wownero, WalletType.haven, WalletType.decred];
+    final nonBip39WalletTypes = [WalletType.wownero, WalletType.haven, WalletType.decred, WalletType.zano];
     // if it's a bip39 wallet and the length is not valid return false
     if (!nonBip39WalletTypes.contains(walletRestoreViewModel.type) &&
         !(validBip39SeedLengths.contains(seedWords.length))) {
diff --git a/lib/view_model/advanced_privacy_settings_view_model.dart b/lib/view_model/advanced_privacy_settings_view_model.dart
@@ -59,6 +59,7 @@ abstract class AdvancedPrivacySettingsViewModelBase with Store {
       case WalletType.solana:
       case WalletType.tron:
       case WalletType.zcash:
+      case WalletType.zano:
         return true;
 
       case WalletType.bitcoin:
@@ -73,7 +74,6 @@ abstract class AdvancedPrivacySettingsViewModelBase with Store {
       case WalletType.wownero:
       case WalletType.none:
       case WalletType.haven:
-      case WalletType.zano:
       case WalletType.decred:
         return false;
     }
diff --git a/lib/zano/cw_zano.dart b/lib/zano/cw_zano.dart
@@ -134,6 +134,9 @@ class CWZano extends Zano {
   @override
   bool validateAddress(String address) => ZanoUtils.validateAddress(address);
 
+  @override
+  bool isBip39Seed(String mnemonic) => zano_bip39.isBip39Seed(mnemonic);
+
   @override
   Map<String, List<int>> debugCallLength() {
     return api.debugCallLength();
diff --git a/scripts/prepare_moneroc.sh b/scripts/prepare_moneroc.sh
@@ -16,7 +16,7 @@ fi
 # NOTE: Make sure to update monero_c prebuilds link in workflow files
 # https://github.com/MrCyjaneK/monero_c/releases/download/v0.18.4.6-RC2/release-bundle.zip
 git fetch -a
-git checkout 5952bef2ec01b0b7e57c11613cbdc081dcd727c5
+git checkout 4f23e050f7dec0bbbbe27c36c8e511bb3f52868a
 git reset --hard
 git submodule update --init --force --recursive
 
diff --git a/tool/configure.dart b/tool/configure.dart
@@ -1171,6 +1171,7 @@ import 'package:cw_core/zano_asset.dart';
 import 'package:hive/hive.dart';
 """;
   const zanoCWHeaders = """
+import 'package:cw_zano/bip39_seed.dart' as zano_bip39;
 import 'package:cw_zano/mnemonics/english.dart';
 import 'package:cw_zano/model/zano_transaction_credentials.dart';
 import 'package:cw_zano/model/zano_transaction_info.dart';
@@ -1204,6 +1205,7 @@ abstract class Zano {
   Future<CryptoCurrency?> getZanoAsset(WalletBase wallet, String contractAddress);
   String getAddress(WalletBase wallet);
   bool validateAddress(String address);
+  bool isBip39Seed(String mnemonic);
   Map<String, List<int>> debugCallLength();
   bool isTokenAlreadyAdded(WalletBase wallet, String contractAddress);
 }
