mirror of
https://github.com/cake-tech/cake_wallet.git
synced 2025-01-18 16:55:58 +00:00
Merge branch 'bitcoin-derivations' of https://github.com/cake-tech/cake_wallet into bip39-minor-enhancements
This commit is contained in:
commit
24ffc4286a
2 changed files with 1 additions and 13 deletions
|
@ -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'",
|
||||||
|
|
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue