Bip39 passphrase support (#1412)

* save * passphrase working * fix for when loading wallets + translation update * minor fix * Fix Nano * minor fix [skip ci] --------- Co-authored-by: OmarHatem <omarh.ismail1@gmail.com>
2024-12-22 11:39:22 +00:00 · 2024-04-29 09:57:46 -07:00 · 2024-04-29 09:57:46 -07:00 · 5ecc1a1db6
commit 5ecc1a1db6
parent d38ef8a9a8
42 changed files with 174 additions and 63 deletions
--- a/cw_bitcoin/lib/bitcoin_derivations.dart
+++ b/cw_bitcoin/lib/bitcoin_derivations.dart
@ -54,7 +54,19 @@ Map<DerivationType, List<DerivationInfo>> bitcoin_derivations = {
    ),
    DerivationInfo(
      derivationType: DerivationType.bip39,
-      derivationPath: "m/44'|49'|84'/0'/0'",
+      derivationPath: "m/44'/0'/0'",
+      description: "Samourai Deposit",
+      scriptType: "p2wpkh",
+    ),
+    DerivationInfo(
+      derivationType: DerivationType.bip39,
+      derivationPath: "m/49'/0'/0'",
+      description: "Samourai Deposit",
+      scriptType: "p2wpkh",
+    ),
+      DerivationInfo(
+      derivationType: DerivationType.bip39,
+      derivationPath: "m/84'/0'/0'",
      description: "Samourai Deposit",
      scriptType: "p2wpkh",
    ),
--- a/cw_bitcoin/lib/bitcoin_wallet.dart
+++ b/cw_bitcoin/lib/bitcoin_wallet.dart
@ -31,8 +31,10 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
    ElectrumBalance? initialBalance,
    Map<String, int>? initialRegularAddressIndex,
    Map<String, int>? initialChangeAddressIndex,
+    String? passphrase,
  }) : super(
            mnemonic: mnemonic,
+            passphrase: passphrase,
            password: password,
            walletInfo: walletInfo,
            unspentCoinsInfo: unspentCoinsInfo,
@ -70,6 +72,7 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
    required String password,
    required WalletInfo walletInfo,
    required Box<UnspentCoinsInfo> unspentCoinsInfo,
+    String? passphrase,
    String? addressPageType,
    BasedUtxoNetwork? network,
    List<BitcoinAddressRecord>? initialAddresses,
@ -81,7 +84,10 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {

    switch (walletInfo.derivationInfo?.derivationType) {
      case DerivationType.bip39:
-        seedBytes = await bip39.mnemonicToSeed(mnemonic);
+        seedBytes = await bip39.mnemonicToSeed(
+          mnemonic,
+          passphrase: passphrase ?? "",
+        );
        break;
      case DerivationType.electrum:
      default:
@ -90,6 +96,7 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
    }
    return BitcoinWallet(
      mnemonic: mnemonic,
+      passphrase: passphrase ?? "",
      password: password,
      walletInfo: walletInfo,
      unspentCoinsInfo: unspentCoinsInfo,
@ -130,13 +137,17 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
        break;
      case DerivationType.bip39:
      default:
-        seedBytes = await bip39.mnemonicToSeed(snp.mnemonic);
+        seedBytes = await bip39.mnemonicToSeed(
+          snp.mnemonic,
+          passphrase: snp.passphrase ?? '',
+        );
        break;
    }

    return BitcoinWallet(
      mnemonic: snp.mnemonic,
      password: password,
+      passphrase: snp.passphrase,
      walletInfo: walletInfo,
      unspentCoinsInfo: unspentCoinsInfo,
      initialAddresses: snp.addresses,
--- a/cw_bitcoin/lib/bitcoin_wallet_creation_credentials.dart
+++ b/cw_bitcoin/lib/bitcoin_wallet_creation_credentials.dart
@ -21,9 +21,11 @@ class BitcoinRestoreWalletFromSeedCredentials extends WalletCredentials {
    WalletInfo? walletInfo,
    required DerivationType derivationType,
    required String derivationPath,
+    String? passphrase,
  }) : super(
            name: name,
            password: password,
+            passphrase: passphrase,
            walletInfo: walletInfo,
            derivationInfo: DerivationInfo(
              derivationType: derivationType,
--- a/cw_bitcoin/lib/bitcoin_wallet_service.dart
+++ b/cw_bitcoin/lib/bitcoin_wallet_service.dart
@ -3,7 +3,6 @@ import 'package:bitcoin_base/bitcoin_base.dart';
 import 'package:cw_bitcoin/bitcoin_mnemonic.dart';
 import 'package:cw_bitcoin/mnemonic_is_incorrect_exception.dart';
 import 'package:cw_bitcoin/bitcoin_wallet_creation_credentials.dart';
-import 'package:cw_core/node.dart';
 import 'package:cw_core/unspent_coins_info.dart';
 import 'package:cw_core/wallet_base.dart';
 import 'package:cw_core/wallet_service.dart';
@ -33,6 +32,7 @@ class BitcoinWalletService extends WalletService<BitcoinNewWalletCredentials,
    final wallet = await BitcoinWalletBase.create(
      mnemonic: await generateElectrumMnemonic(),
      password: credentials.password!,
+      passphrase: credentials.passphrase,
      walletInfo: credentials.walletInfo!,
      unspentCoinsInfo: unspentCoinsInfoSource,
      network: network,
@ -116,6 +116,7 @@ class BitcoinWalletService extends WalletService<BitcoinNewWalletCredentials,

    final wallet = await BitcoinWalletBase.create(
      password: credentials.password!,
+      passphrase: credentials.passphrase,
      mnemonic: credentials.mnemonic,
      walletInfo: credentials.walletInfo!,
      unspentCoinsInfo: unspentCoinsInfoSource,
@ -125,8 +126,4 @@ class BitcoinWalletService extends WalletService<BitcoinNewWalletCredentials,
    await wallet.init();
    return wallet;
  }
-
-  static Future<dynamic> getInfoFromSeed({required String seed, required Node node}) async {
-    throw UnimplementedError();
-  }
 }
--- a/cw_bitcoin/lib/electrum_wallet.dart
+++ b/cw_bitcoin/lib/electrum_wallet.dart
@ -55,6 +55,7 @@ abstract class ElectrumWalletBase
      required this.networkType,
      required this.mnemonic,
      required Uint8List seedBytes,
+      this.passphrase,
      List<BitcoinAddressRecord>? initialAddresses,
      ElectrumClient? electrumClient,
      ElectrumBalance? initialBalance,
@ -93,6 +94,7 @@ abstract class ElectrumWalletBase

  final bitcoin.HDWallet hd;
  final String mnemonic;
+  final String? passphrase;

  @override
  @observable
@ -618,6 +620,7 @@ abstract class ElectrumWalletBase

  String toJSON() => json.encode({
        'mnemonic': mnemonic,
+        'passphrase': passphrase ?? '',
        'account_index': walletAddresses.currentReceiveAddressIndexByType,
        'change_address_index': walletAddresses.currentChangeAddressIndexByType,
        'addresses': walletAddresses.allAddresses.map((addr) => addr.toJSON()).toList(),
--- a/cw_bitcoin/lib/electrum_wallet_snapshot.dart
+++ b/cw_bitcoin/lib/electrum_wallet_snapshot.dart
@ -18,6 +18,7 @@ class ElectrumWalletSnapshot {
    required this.regularAddressIndex,
    required this.changeAddressIndex,
    required this.addressPageType,
+    this.passphrase,
    this.derivationType,
    this.derivationPath,
  });
@ -32,6 +33,7 @@ class ElectrumWalletSnapshot {
  ElectrumBalance balance;
  Map<String, int> regularAddressIndex;
  Map<String, int> changeAddressIndex;
+  String? passphrase;
  DerivationType? derivationType;
  String? derivationPath;

@ -42,6 +44,7 @@ class ElectrumWalletSnapshot {
    final data = json.decode(jsonSource) as Map;
    final addressesTmp = data['addresses'] as List? ?? <Object>[];
    final mnemonic = data['mnemonic'] as String;
+    final passphrase = data['passphrase'] as String? ?? '';
    final addresses = addressesTmp
        .whereType<String>()
        .map((addr) => BitcoinAddressRecord.fromJSON(addr, network))
@ -74,6 +77,7 @@ class ElectrumWalletSnapshot {
      name: name,
      type: type,
      password: password,
+      passphrase: passphrase,
      mnemonic: mnemonic,
      addresses: addresses,
      balance: balance,
--- a/cw_core/lib/wallet_credentials.dart
+++ b/cw_core/lib/wallet_credentials.dart
@ -7,6 +7,7 @@ abstract class WalletCredentials {
    this.seedPhraseLength,
    this.walletInfo,
    this.password,
+    this.passphrase,
    this.derivationInfo,
  }) {
    if (this.walletInfo != null && derivationInfo != null) {
@ -18,6 +19,7 @@ abstract class WalletCredentials {
  final int? height;
  int? seedPhraseLength;
  String? password;
+  String? passphrase;
  WalletInfo? walletInfo;
  DerivationInfo? derivationInfo;
 }
--- a/cw_core/lib/wallet_info.dart
+++ b/cw_core/lib/wallet_info.dart
@ -19,6 +19,7 @@ enum DerivationType {
  @HiveField(4)
  electrum,
 }
+
@HiveType(typeId: DerivationInfo.typeId)
 class DerivationInfo extends HiveObject {
  DerivationInfo({
@ -33,11 +34,10 @@ class DerivationInfo extends HiveObject {

  static const typeId = DERIVATION_INFO_TYPE_ID;

-
-  @HiveField(0)
+  @HiveField(0, defaultValue: '')
  String address;

-  @HiveField(1)
+  @HiveField(1, defaultValue: '')
  String balance;

  @HiveField(2)
@ -90,19 +90,20 @@ class WalletInfo extends HiveObject {
    DerivationInfo? derivationInfo,
  }) {
    return WalletInfo(
-        id,
-        name,
-        type,
-        isRecovery,
-        restoreHeight,
-        date.millisecondsSinceEpoch,
-        dirPath,
-        path,
-        address,
-        yatEid,
-        yatLastUsedAddressRaw,
-        showIntroCakePayCard,
-        derivationInfo);
+      id,
+      name,
+      type,
+      isRecovery,
+      restoreHeight,
+      date.millisecondsSinceEpoch,
+      dirPath,
+      path,
+      address,
+      yatEid,
+      yatLastUsedAddressRaw,
+      showIntroCakePayCard,
+      derivationInfo,
+    );
  }

  static const typeId = WALLET_INFO_TYPE_ID;
@ -154,10 +155,10 @@ class WalletInfo extends HiveObject {
  List<String>? usedAddresses;

  @HiveField(16)
-  DerivationType? derivationType;// no longer used
+  DerivationType? derivationType; // no longer used

  @HiveField(17)
-  String? derivationPath;// no longer used
+  String? derivationPath; // no longer used

  @HiveField(18)
  String? addressPageType;
--- a/lib/bitcoin/cw_bitcoin.dart
+++ b/lib/bitcoin/cw_bitcoin.dart
@ -7,13 +7,16 @@ class CWBitcoin extends Bitcoin {
    required String password,
    required DerivationType derivationType,
    required String derivationPath,
+    String? passphrase,
  }) =>
      BitcoinRestoreWalletFromSeedCredentials(
-          name: name,
-          mnemonic: mnemonic,
-          password: password,
-          derivationType: derivationType,
-          derivationPath: derivationPath);
+        name: name,
+        mnemonic: mnemonic,
+        password: password,
+        derivationType: derivationType,
+        derivationPath: derivationPath,
+        passphrase: passphrase,
+      );

  @override
  WalletCredentials createBitcoinRestoreWalletFromWIFCredentials(
@ -277,8 +280,11 @@ class CWBitcoin extends Bitcoin {
  }

  @override
-  Future<List<DerivationInfo>> getDerivationsFromMnemonic(
-      {required String mnemonic, required Node node}) async {
+  Future<List<DerivationInfo>> getDerivationsFromMnemonic({
+    required String mnemonic,
+    required Node node,
+    String? passphrase,
+  }) async {
    List<DerivationInfo> list = [];

    final electrumClient = ElectrumClient();
@ -303,7 +309,7 @@ class CWBitcoin extends Bitcoin {
      if (dType == DerivationType.electrum) {
        seedBytes = await mnemonicToSeedBytes(mnemonic);
      } else if (dType == DerivationType.bip39) {
-        seedBytes = bip39.mnemonicToSeed(mnemonic);
+        seedBytes = bip39.mnemonicToSeed(mnemonic, passphrase: passphrase ?? '');
      }

      for (DerivationInfo dInfo in bitcoin_derivations[dType]!) {
--- a/lib/src/screens/restore/wallet_restore_from_seed_form.dart
+++ b/lib/src/screens/restore/wallet_restore_from_seed_form.dart
@ -20,6 +20,7 @@ class WalletRestoreFromSeedForm extends StatefulWidget {
      {Key? key,
      required this.displayLanguageSelector,
      required this.displayBlockHeightSelector,
+      required this.displayPassphrase,
      required this.type,
      required this.seedTypeViewModel,
      this.blockHeightFocusNode,
@ -31,6 +32,7 @@ class WalletRestoreFromSeedForm extends StatefulWidget {
  final WalletType type;
  final bool displayLanguageSelector;
  final bool displayBlockHeightSelector;
+  final bool displayPassphrase;
  final SeedTypeViewModel seedTypeViewModel;
  final FocusNode? blockHeightFocusNode;
  final Function(bool)? onHeightOrDateEntered;
@ -48,6 +50,7 @@ class WalletRestoreFromSeedFormState extends State<WalletRestoreFromSeedForm> {
        formKey = GlobalKey<FormState>(),
        languageController = TextEditingController(),
        nameTextEditingController = TextEditingController(),
+        passphraseController = TextEditingController(),
        seedTypeController = TextEditingController();

  final GlobalKey<SeedWidgetState> seedWidgetStateKey;
@ -55,6 +58,7 @@ class WalletRestoreFromSeedFormState extends State<WalletRestoreFromSeedForm> {
  final TextEditingController languageController;
  final TextEditingController nameTextEditingController;
  final TextEditingController seedTypeController;
+  final TextEditingController passphraseController;
  final GlobalKey<FormState> formKey;
  late ReactionDisposer moneroSeedTypeReaction;
  String language;
@ -194,6 +198,13 @@ class WalletRestoreFromSeedFormState extends State<WalletRestoreFromSeedForm> {
                key: blockchainHeightKey,
                onHeightOrDateEntered: widget.onHeightOrDateEntered,
                hasDatePicker: widget.type == WalletType.monero),
+          if (widget.displayPassphrase) ...[
+            const SizedBox(height: 10),
+            BaseTextFormField(
+              hintText: S.current.passphrase,
+              controller: passphraseController,
+            ),
+          ]
        ]));
  }

--- a/lib/src/screens/restore/wallet_restore_page.dart
+++ b/lib/src/screens/restore/wallet_restore_page.dart
@ -38,6 +38,7 @@ class WalletRestorePage extends BasePage {
              displayBlockHeightSelector:
                  walletRestoreViewModel.hasBlockchainHeightLanguageSelector,
              displayLanguageSelector: walletRestoreViewModel.hasSeedLanguageSelector,
+              displayPassphrase: walletRestoreViewModel.hasPassphrase,
              type: walletRestoreViewModel.type,
              key: walletRestoreFromSeedFormKey,
              blockHeightFocusNode: _blockHeightFocusNode,
@ -296,6 +297,11 @@ class WalletRestorePage extends BasePage {
                -1;
      }

+      if (walletRestoreViewModel.hasPassphrase) {
+        credentials['passphrase'] =
+            walletRestoreFromSeedFormKey.currentState!.passphraseController.text;
+      }
+
      credentials['name'] =
          walletRestoreFromSeedFormKey.currentState!.nameTextEditingController.text;
    } else if (walletRestoreViewModel.mode == WalletRestoreMode.keys) {
@ -367,18 +373,16 @@ class WalletRestorePage extends BasePage {
        }
      }

+            //   dInfo = await Navigator.of(context).pushNamed(Routes.restoreWalletChooseDerivation,
+            // arguments: derivations) as DerivationInfo?;
+
      if (derivationsWithHistory > 1) {
        dInfo = await Navigator.of(context).pushNamed(Routes.restoreWalletChooseDerivation,
            arguments: derivations) as DerivationInfo?;
      } else if (derivationsWithHistory == 1) {
        dInfo = derivations[derivationWithHistoryIndex];
-      } else if (derivationsWithHistory == 0 && derivations.isNotEmpty) {
-        dInfo = DerivationInfo(
-          derivationType: DerivationType.bip39,
-          derivationPath: "m/84'/0'/0'",
-          description: "Standard BIP84 native segwit",
-          scriptType: "p2wpkh",
-        );
+      } else {
+        dInfo = walletRestoreViewModel.getCommonRestoreDerivation();
      }

      if (dInfo == null) {
--- a/lib/src/screens/wallet_list/wallet_list_page.dart
+++ b/lib/src/screens/wallet_list/wallet_list_page.dart
@ -343,7 +343,9 @@ class WalletListBodyState extends State<WalletListBody> {
            });
          }
        } catch (e) {
-          changeProcessText(S.of(context).wallet_list_failed_to_load(wallet.name, e.toString()));
+          if (this.mounted) {
+            changeProcessText(S.of(context).wallet_list_failed_to_load(wallet.name, e.toString()));
+          }
        }
      },
      conditionToDetermineIfToUse2FA:
--- a/lib/view_model/restore/restore_from_qr_vm.dart
+++ b/lib/view_model/restore/restore_from_qr_vm.dart
@ -53,9 +53,11 @@ abstract class WalletRestorationFromQRVMBase extends WalletCreationVM with Store
  WalletCredentials getCredentialsFromRestoredWallet(
      dynamic options, RestoredWallet restoreWallet) {
    final password = generateWalletPassword();
+    String? passphrase;
    DerivationInfo? derivationInfo;
    if (options != null) {
      derivationInfo = options["derivationInfo"] as DerivationInfo?;
+      passphrase = options["passphrase"] as String?;
    }
    derivationInfo ??= getDefaultDerivation();

@ -91,31 +93,37 @@ abstract class WalletRestorationFromQRVMBase extends WalletCreationVM with Store
        switch (restoreWallet.type) {
          case WalletType.monero:
            return monero!.createMoneroRestoreWalletFromSeedCredentials(
-                name: name,
-                height: restoreWallet.height ?? 0,
-                mnemonic: restoreWallet.mnemonicSeed ?? '',
-                password: password);
+              name: name,
+              height: restoreWallet.height ?? 0,
+              mnemonic: restoreWallet.mnemonicSeed ?? '',
+              password: password,
+            );
          case WalletType.bitcoin:
          case WalletType.litecoin:
            return bitcoin!.createBitcoinRestoreWalletFromSeedCredentials(
              name: name,
              mnemonic: restoreWallet.mnemonicSeed ?? '',
              password: password,
+              passphrase: passphrase,
              derivationType: derivationInfo!.derivationType!,
              derivationPath: derivationInfo.derivationPath!,
            );
          case WalletType.bitcoinCash:
            return bitcoinCash!.createBitcoinCashRestoreWalletFromSeedCredentials(
-                name: name, mnemonic: restoreWallet.mnemonicSeed ?? '', password: password);
+              name: name,
+              mnemonic: restoreWallet.mnemonicSeed ?? '',
+              password: password,
+            );
          case WalletType.ethereum:
            return ethereum!.createEthereumRestoreWalletFromSeedCredentials(
                name: name, mnemonic: restoreWallet.mnemonicSeed ?? '', password: password);
          case WalletType.nano:
            return nano!.createNanoRestoreWalletFromSeedCredentials(
-                name: name,
-                mnemonic: restoreWallet.mnemonicSeed ?? '',
-                password: password,
-                derivationType: derivationInfo!.derivationType!);
+              name: name,
+              mnemonic: restoreWallet.mnemonicSeed ?? '',
+              password: password,
+              derivationType: derivationInfo!.derivationType!,
+            );
          case WalletType.polygon:
            return polygon!.createPolygonRestoreWalletFromSeedCredentials(
                name: name, mnemonic: restoreWallet.mnemonicSeed ?? '', password: password);
--- a/lib/view_model/wallet_creation_vm.dart
+++ b/lib/view_model/wallet_creation_vm.dart
@ -106,6 +106,25 @@ abstract class WalletCreationVMBase with Store {
    }
  }

+  DerivationInfo? getCommonRestoreDerivation() {
+    switch (this.type) {
+      case WalletType.nano:
+        return DerivationInfo(
+          derivationType: DerivationType.nano,
+        );
+      case WalletType.bitcoin:
+      case WalletType.litecoin:
+        return DerivationInfo(
+          derivationType: DerivationType.bip39,
+          derivationPath: "m/84'/0'/0'/0",
+          description: "Standard BIP84 native segwit",
+          scriptType: "p2wpkh",
+        );
+      default:
+        return null;
+    }
+  }
+
  WalletCredentials getCredentials(dynamic options) => throw UnimplementedError();

  Future<WalletBase> process(WalletCredentials credentials) => throw UnimplementedError();
--- a/lib/view_model/wallet_restore_view_model.dart
+++ b/lib/view_model/wallet_restore_view_model.dart
@ -67,6 +67,8 @@ abstract class WalletRestoreViewModelBase extends WalletCreationVM with Store {
  final bool hasBlockchainHeightLanguageSelector;
  final bool hasRestoreFromPrivateKey;

+  bool get hasPassphrase => [WalletType.bitcoin].contains(type);
+
  @observable
  WalletRestoreMode mode;

@ -76,6 +78,7 @@ abstract class WalletRestoreViewModelBase extends WalletCreationVM with Store {
  @override
  WalletCredentials getCredentials(dynamic options) {
    final password = generateWalletPassword();
+    String? passphrase = options['passphrase'] as String?;
    final height = options['height'] as int? ?? 0;
    name = options['name'] as String;
    DerivationInfo? derivationInfo = options["derivationInfo"] as DerivationInfo?;
@ -87,18 +90,12 @@ abstract class WalletRestoreViewModelBase extends WalletCreationVM with Store {
          return monero!.createMoneroRestoreWalletFromSeedCredentials(
              name: name, height: height, mnemonic: seed, password: password);
        case WalletType.bitcoin:
-          return bitcoin!.createBitcoinRestoreWalletFromSeedCredentials(
-            name: name,
-            mnemonic: seed,
-            password: password,
-            derivationType: derivationInfo!.derivationType!,
-            derivationPath: derivationInfo.derivationPath!,
-          );
        case WalletType.litecoin:
          return bitcoin!.createBitcoinRestoreWalletFromSeedCredentials(
            name: name,
            mnemonic: seed,
            password: password,
+            passphrase: passphrase,
            derivationType: derivationInfo!.derivationType!,
            derivationPath: derivationInfo.derivationPath!,
          );
@ -206,7 +203,12 @@ abstract class WalletRestoreViewModelBase extends WalletCreationVM with Store {
      case WalletType.bitcoin:
      case WalletType.litecoin:
        String? mnemonic = credentials['seed'] as String?;
-        return bitcoin!.getDerivationsFromMnemonic(mnemonic: mnemonic!, node: node);
+        String? passphrase = credentials['passphrase'] as String?;
+        return bitcoin!.getDerivationsFromMnemonic(
+          mnemonic: mnemonic!,
+          node: node,
+          passphrase: passphrase,
+        );
      case WalletType.nano:
        String? mnemonic = credentials['seed'] as String?;
        String? seedKey = credentials['private_key'] as String?;
--- a/res/values/strings_ar.arb
+++ b/res/values/strings_ar.arb
@ -411,6 +411,7 @@
  "outputs": "المخرجات",
  "overwrite_amount": "تغير المبلغ",
  "pairingInvalidEvent": "ﺢﻟﺎﺻ ﺮﻴﻏ ﺙﺪﺣ ﻥﺍﺮﻗﺇ",
+  "passphrase": "عبارة الممر (اختياري)",
  "password": "كلمة المرور",
  "paste": "لصق",
  "pause_wallet_creation": ".ﺎﻴًﻟﺎﺣ ﺎﺘًﻗﺆﻣ ﺔﻔﻗﻮﺘﻣ Haven Wallet ءﺎﺸﻧﺇ ﻰﻠﻋ ﺓﺭﺪﻘﻟﺍ",
--- a/res/values/strings_bg.arb
+++ b/res/values/strings_bg.arb
@ -411,6 +411,7 @@
  "outputs": "Изходи",
  "overwrite_amount": "Промени сума",
  "pairingInvalidEvent": "Невалидно събитие при сдвояване",
+  "passphrase": "Passphrase (по избор)",
  "password": "Парола",
  "paste": "Поставяне",
  "pause_wallet_creation": "Възможността за създаване на Haven Wallet в момента е на пауза.",
--- a/res/values/strings_cs.arb
+++ b/res/values/strings_cs.arb
@ -411,6 +411,7 @@
  "outputs": "Výstupy",
  "overwrite_amount": "Přepsat částku",
  "pairingInvalidEvent": "Neplatná událost párování",
+  "passphrase": "Passphrase (volitelné)",
  "password": "Heslo",
  "paste": "Vložit",
  "pause_wallet_creation": "Možnost vytvářet Haven Wallet je momentálně pozastavena.",
--- a/res/values/strings_de.arb
+++ b/res/values/strings_de.arb
@ -411,6 +411,7 @@
  "outputs": "Ausgänge",
  "overwrite_amount": "Overwrite amount",
  "pairingInvalidEvent": "Paarung ungültiges Ereignis",
+  "passphrase": "Passphrase (optional)",
  "password": "Passwort",
  "paste": "Einfügen",
  "pause_wallet_creation": "Die Möglichkeit, Haven Wallet zu erstellen, ist derzeit pausiert.",
@ -425,8 +426,8 @@
  "placeholder_transactions": "Ihre Transaktionen werden hier angezeigt",
  "please_fill_totp": "Bitte geben Sie den 8-stelligen Code ein, der auf Ihrem anderen Gerät vorhanden ist",
  "please_make_selection": "Bitte treffen Sie unten eine Auswahl zum Erstellen oder Wiederherstellen Ihrer Wallet.",
-  "Please_reference_document": "Weitere Informationen finden Sie in den Dokumenten unten.",
  "please_reference_document": "Bitte verweisen Sie auf die folgenden Dokumente, um weitere Informationen zu erhalten.",
+  "Please_reference_document": "Weitere Informationen finden Sie in den Dokumenten unten.",
  "please_select": "Bitte auswählen:",
  "please_select_backup_file": "Bitte wählen Sie die Sicherungsdatei und geben Sie das Sicherungskennwort ein.",
  "please_try_to_connect_to_another_node": "Bitte versuchen Sie, sich mit einem anderen Knoten zu verbinden",
@ -822,4 +823,4 @@
  "you_will_get": "Konvertieren zu",
  "you_will_send": "Konvertieren von",
  "yy": "YY"
-}
+}
--- a/res/values/strings_en.arb
+++ b/res/values/strings_en.arb
@ -411,6 +411,7 @@
  "outputs": "Outputs",
  "overwrite_amount": "Overwrite amount",
  "pairingInvalidEvent": "Pairing Invalid Event",
+  "passphrase": "Passphrase (Optional)",
  "password": "Password",
  "paste": "Paste",
  "pause_wallet_creation": "Ability to create Haven Wallet is currently paused.",
--- a/res/values/strings_es.arb
+++ b/res/values/strings_es.arb
@ -411,6 +411,7 @@
  "outputs": "Salidas",
  "overwrite_amount": "Overwrite amount",
  "pairingInvalidEvent": "Evento de emparejamiento no válido",
+  "passphrase": "Passfrase (opcional)",
  "password": "Contraseña",
  "paste": "Pegar",
  "pause_wallet_creation": "La capacidad para crear Haven Wallet está actualmente pausada.",
--- a/res/values/strings_fr.arb
+++ b/res/values/strings_fr.arb
@ -411,6 +411,7 @@
  "outputs": "Les sorties",
  "overwrite_amount": "Remplacer le montant",
  "pairingInvalidEvent": "Événement de couplage non valide",
+  "passphrase": "Phrase de passe (facultative)",
  "password": "Mot de passe",
  "paste": "Coller",
  "pause_wallet_creation": "La possibilité de créer Haven Wallet est actuellement suspendue.",
--- a/res/values/strings_ha.arb
+++ b/res/values/strings_ha.arb
@ -413,6 +413,7 @@
  "outputs": "Abubuwan fashewa",
  "overwrite_amount": "Rubuta adadin",
  "pairingInvalidEvent": "Haɗa Lamarin mara inganci",
+  "passphrase": "Passphrase (Zabi)",
  "password": "Kalmar wucewa",
  "paste": "Manna",
  "pause_wallet_creation": "A halin yanzu an dakatar da ikon ƙirƙirar Haven Wallet.",
--- a/res/values/strings_hi.arb
+++ b/res/values/strings_hi.arb
@ -411,6 +411,7 @@
  "outputs": "आउटपुट",
  "overwrite_amount": "Overwrite amount",
  "pairingInvalidEvent": "अमान्य ईवेंट युग्मित करना",
+  "passphrase": "पासफ्रेज़ (वैकल्पिक)",
  "password": "पारण शब्द",
  "paste": "पेस्ट करें",
  "pause_wallet_creation": "हेवन वॉलेट बनाने की क्षमता फिलहाल रुकी हुई है।",
--- a/res/values/strings_hr.arb
+++ b/res/values/strings_hr.arb
@ -411,6 +411,7 @@
  "outputs": "Izlazi",
  "overwrite_amount": "Overwrite amount",
  "pairingInvalidEvent": "Nevažeći događaj uparivanja",
+  "passphrase": "Prolaznica (neobavezno)",
  "password": "Lozinka",
  "paste": "Zalijepi",
  "pause_wallet_creation": "Mogućnost stvaranja novčanika Haven trenutno je pauzirana.",
--- a/res/values/strings_id.arb
+++ b/res/values/strings_id.arb
@ -413,6 +413,7 @@
  "outputs": "Output",
  "overwrite_amount": "Timpa jumlah",
  "pairingInvalidEvent": "Menyandingkan Acara Tidak Valid",
+  "passphrase": "Frasa sandi (opsional)",
  "password": "Kata Sandi",
  "paste": "Tempel",
  "pause_wallet_creation": "Kemampuan untuk membuat Haven Wallet saat ini dijeda.",
--- a/res/values/strings_it.arb
+++ b/res/values/strings_it.arb
@ -413,6 +413,7 @@
  "outputs": "Output",
  "overwrite_amount": "Sovrascrivi quantità",
  "pairingInvalidEvent": "Associazione evento non valido",
+  "passphrase": "Passphrase (opzionale)",
  "password": "Password",
  "paste": "Incolla",
  "pause_wallet_creation": "La possibilità di creare Haven Wallet è attualmente sospesa.",
--- a/res/values/strings_ja.arb
+++ b/res/values/strings_ja.arb
@ -412,6 +412,7 @@
  "outputs": "出力",
  "overwrite_amount": "Overwrite amount",
  "pairingInvalidEvent": "ペアリング無効イベント",
+  "passphrase": "パスフレーズ（オプション）",
  "password": "パスワード",
  "paste": "ペースト",
  "pause_wallet_creation": "Haven Wallet を作成する機能は現在一時停止されています。",
--- a/res/values/strings_ko.arb
+++ b/res/values/strings_ko.arb
@ -411,6 +411,7 @@
  "outputs": "출력",
  "overwrite_amount": "Overwrite amount",
  "pairingInvalidEvent": "잘못된 이벤트 페어링",
+  "passphrase": "암호화 (선택 사항)",
  "password": "암호",
  "paste": "풀",
  "pause_wallet_creation": "Haven Wallet 생성 기능이 현재 일시 중지되었습니다.",
@ -425,8 +426,8 @@
  "placeholder_transactions": "거래가 여기에 표시됩니다",
  "please_fill_totp": "다른 기기에 있는 8자리 코드를 입력하세요.",
  "please_make_selection": "아래에서 선택하십시오 지갑 만들기 또는 복구.",
-  "please_reference_document": "자세한 내용은 아래 문서를 참조하십시오.",
  "Please_reference_document": "자세한 내용은 아래 문서를 참조하십시오.",
+  "please_reference_document": "자세한 내용은 아래 문서를 참조하십시오.",
  "please_select": "선택 해주세요:",
  "please_select_backup_file": "백업 파일을 선택하고 백업 암호를 입력하십시오.",
  "please_try_to_connect_to_another_node": "다른 노드에 연결을 시도하십시오",
--- a/res/values/strings_my.arb
+++ b/res/values/strings_my.arb
@ -411,6 +411,7 @@
  "outputs": "ထုတ်လုပ်မှု",
  "overwrite_amount": "ပမာဏကို ထပ်ရေးပါ။",
  "pairingInvalidEvent": "မမှန်ကန်သောဖြစ်ရပ်ကို တွဲချိတ်ခြင်း။",
+  "passphrase": "passphrase (optional)",
  "password": "စကားဝှက်",
  "paste": "ငါးပိ",
  "pause_wallet_creation": "Haven Wallet ဖန်တီးနိုင်မှုကို လောလောဆယ် ခေတ္တရပ်ထားသည်။",
--- a/res/values/strings_nl.arb
+++ b/res/values/strings_nl.arb
@ -411,6 +411,7 @@
  "outputs": "Uitgangen",
  "overwrite_amount": "Overwrite amount",
  "pairingInvalidEvent": "Koppelen Ongeldige gebeurtenis",
+  "passphrase": "PassaspHRASE (optioneel)",
  "password": "Wachtwoord",
  "paste": "Plakken",
  "pause_wallet_creation": "De mogelijkheid om Haven Wallet te maken is momenteel onderbroken.",
--- a/res/values/strings_pl.arb
+++ b/res/values/strings_pl.arb
@ -411,6 +411,7 @@
  "outputs": "Wyjścia",
  "overwrite_amount": "Nadpisz ilość",
  "pairingInvalidEvent": "Nieprawidłowe zdarzenie parowania",
+  "passphrase": "PassPhraza (opcjonalnie)",
  "password": "Hasło",
  "paste": "Wklej",
  "pause_wallet_creation": "Możliwość utworzenia Portfela Haven jest obecnie wstrzymana.",
--- a/res/values/strings_pt.arb
+++ b/res/values/strings_pt.arb
@ -413,6 +413,7 @@
  "outputs": "Saídas",
  "overwrite_amount": "Overwrite amount",
  "pairingInvalidEvent": "Emparelhamento de evento inválido",
+  "passphrase": "Senha (opcional)",
  "password": "Senha",
  "paste": "Colar",
  "pause_wallet_creation": "A capacidade de criar a Haven Wallet está atualmente pausada.",
--- a/res/values/strings_ru.arb
+++ b/res/values/strings_ru.arb
@ -412,6 +412,7 @@
  "outputs": "Выходы",
  "overwrite_amount": "Overwrite amount",
  "pairingInvalidEvent": "Недействительное событие сопряжения",
+  "passphrase": "Passfrase (необязательно)",
  "password": "Пароль",
  "paste": "Вставить",
  "pause_wallet_creation": "Возможность создания Haven Wallet в настоящее время приостановлена.",
--- a/res/values/strings_th.arb
+++ b/res/values/strings_th.arb
@ -411,6 +411,7 @@
  "outputs": "เอาต์พุต",
  "overwrite_amount": "เขียนทับจำนวน",
  "pairingInvalidEvent": "การจับคู่เหตุการณ์ที่ไม่ถูกต้อง",
+  "passphrase": "ข้อความรหัสผ่าน (ไม่บังคับ)",
  "password": "รหัสผ่าน",
  "paste": "วาง",
  "pause_wallet_creation": "ขณะนี้ความสามารถในการสร้าง Haven Wallet ถูกหยุดชั่วคราว",
--- a/res/values/strings_tl.arb
+++ b/res/values/strings_tl.arb
@ -411,6 +411,7 @@
  "outputs": "Mga output",
  "overwrite_amount": "Overwrite na halaga",
  "pairingInvalidEvent": "Pagpares ng Di-wastong Kaganapan",
+  "passphrase": "Passphrase (opsyonal)",
  "password": "Password",
  "paste": "I -paste",
  "pause_wallet_creation": "Kasalukuyang naka-pause ang kakayahang gumawa ng Haven Wallet.",
--- a/res/values/strings_tr.arb
+++ b/res/values/strings_tr.arb
@ -411,6 +411,7 @@
  "outputs": "çıktılar",
  "overwrite_amount": "Miktarın üzerine yaz",
  "pairingInvalidEvent": "Geçersiz Etkinliği Eşleştirme",
+  "passphrase": "Passfrase (isteğe bağlı)",
  "password": "Parola",
  "paste": "Yapıştır",
  "pause_wallet_creation": "Haven Cüzdanı oluşturma yeteneği şu anda duraklatıldı.",
--- a/res/values/strings_uk.arb
+++ b/res/values/strings_uk.arb
@ -411,6 +411,7 @@
  "outputs": "Виходи",
  "overwrite_amount": "Overwrite amount",
  "pairingInvalidEvent": "Недійсна подія сполучення",
+  "passphrase": "Пасофрази (необов’язково)",
  "password": "Пароль",
  "paste": "Вставити",
  "pause_wallet_creation": "Можливість створення гаманця Haven зараз призупинено.",
--- a/res/values/strings_ur.arb
+++ b/res/values/strings_ur.arb
@ -413,6 +413,7 @@
  "outputs": "نتائج",
  "overwrite_amount": "رقم کو اوور رائٹ کریں۔",
  "pairingInvalidEvent": "ﭧﻧﻮﯾﺍ ﻂﻠﻏ ﺎﻧﺎﻨﺑ ﺍﮌﻮﺟ",
+  "passphrase": "پاسفریز (اختیاری)",
  "password": "پاس ورڈ",
  "paste": "چسپاں کریں۔",
  "pause_wallet_creation": "Haven Wallet ۔ﮯﮨ ﻑﻮﻗﻮﻣ ﻝﺎﺤﻟﺍ ﯽﻓ ﺖﯿﻠﮨﺍ ﯽﮐ ﮯﻧﺎﻨﺑ",
--- a/res/values/strings_yo.arb
+++ b/res/values/strings_yo.arb
@ -412,6 +412,7 @@
  "outputs": "Awọn iṣan",
  "overwrite_amount": "Pààrọ̀ iye owó",
  "pairingInvalidEvent": "Pipọpọ Iṣẹlẹ Ti ko tọ",
+  "passphrase": "Ọrọ kukuru (iyan)",
  "password": "Ọ̀rọ̀ aṣínà",
  "paste": "Fikún ẹ̀dà yín",
  "pause_wallet_creation": "Agbara lati ṣẹda Haven Wallet ti wa ni idaduro lọwọlọwọ.",
--- a/res/values/strings_zh.arb
+++ b/res/values/strings_zh.arb
@ -411,6 +411,7 @@
  "outputs": "输出",
  "overwrite_amount": "Overwrite amount",
  "pairingInvalidEvent": "配对无效事件",
+  "passphrase": "密码（可选）",
  "password": "密码",
  "paste": "粘贴",
  "pause_wallet_creation": "创建 Haven 钱包的功能当前已暂停。",
--- a/tool/configure.dart
+++ b/tool/configure.dart
@ -130,6 +130,7 @@ abstract class Bitcoin {
    required String password,
    required DerivationType derivationType,
    required String derivationPath,
+    String? passphrase,
  });
  WalletCredentials createBitcoinRestoreWalletFromWIFCredentials({required String name, required String password, required String wif, WalletInfo? walletInfo});
  WalletCredentials createBitcoinNewWalletCredentials({required String name, WalletInfo? walletInfo});
@ -168,7 +169,7 @@ abstract class Bitcoin {
  Future<List<DerivationType>> compareDerivationMethods(
      {required String mnemonic, required Node node});
  Future<List<DerivationInfo>> getDerivationsFromMnemonic(
-      {required String mnemonic, required Node node});
+      {required String mnemonic, required Node node, String? passphrase});
  Future<void> setAddressType(Object wallet, dynamic option);
  ReceivePageOption getSelectedAddressType(Object wallet);
  List<ReceivePageOption> getBitcoinReceivePageOptions();