Merge branch 'bitcoin-derivations' of https://github.com/cake-tech/cake_wallet into bip39-minor-enhancements

This commit is contained in:
Matthew Fosse 2024-04-29 16:53:42 -07:00
commit 24ffc4286a
2 changed files with 1 additions and 13 deletions

View file

@ -46,12 +46,6 @@ Map<DerivationType, List<DerivationInfo>> electrum_derivations = {
description: "Non-standard native segwit", description: "Non-standard native segwit",
scriptType: "p2wpkh", scriptType: "p2wpkh",
), ),
DerivationInfo(
derivationType: DerivationType.bip39,
derivationPath: "m/44'/0'/0'",
description: "Copay native segwit",
scriptType: "p2wpkh",
),
DerivationInfo( DerivationInfo(
derivationType: DerivationType.bip39, derivationType: DerivationType.bip39,
derivationPath: "m/44'/0'/0'", derivationPath: "m/44'/0'/0'",
@ -64,12 +58,6 @@ Map<DerivationType, List<DerivationInfo>> electrum_derivations = {
description: "Samourai Deposit", description: "Samourai Deposit",
scriptType: "p2wpkh", scriptType: "p2wpkh",
), ),
DerivationInfo(
derivationType: DerivationType.bip39,
derivationPath: "m/84'/0'/0'",
description: "Samourai Deposit",
scriptType: "p2wpkh",
),
DerivationInfo( DerivationInfo(
derivationType: DerivationType.bip39, derivationType: DerivationType.bip39,
derivationPath: "m/84'/0'/2147483644'", derivationPath: "m/84'/0'/2147483644'",

View file

@ -393,7 +393,7 @@ class WalletRestorePage extends BasePage {
this.derivationInfo = dInfo; this.derivationInfo = dInfo;
if (this.derivationInfo == null) { if (this.derivationInfo == null) {
walletRestoreViewModel.state = InitialExecutionState(); this.derivationInfo = walletRestoreViewModel.getDefaultDerivation();
return; return;
} }