mirror of
https://github.com/cake-tech/cake_wallet.git
synced 2024-12-23 03:59:23 +00:00
electrum restore fixes
This commit is contained in:
parent
60f2c3c450
commit
287f3e06f7
3 changed files with 26 additions and 13 deletions
|
@ -108,6 +108,17 @@ Future<String> generateElectrumMnemonic({int strength = 264, String prefix = seg
|
|||
return result;
|
||||
}
|
||||
|
||||
Future<bool> checkIfMnemonicIsElectrum2(String mnemonic) async {
|
||||
return prefixMatches(mnemonic, [segwit]).first;
|
||||
}
|
||||
|
||||
Future<String> getMnemonicHash(String mnemonic) async {
|
||||
final hmacSha512 = Hmac(sha512, utf8.encode('Seed version'));
|
||||
final digest = hmacSha512.convert(utf8.encode(normalizeText(mnemonic)));
|
||||
final hx = digest.toString();
|
||||
return hx;
|
||||
}
|
||||
|
||||
Future<Uint8List> mnemonicToSeedBytes(String mnemonic, {String prefix = segwit}) async {
|
||||
final pbkdf2 =
|
||||
cryptography.Pbkdf2(macAlgorithm: cryptography.Hmac.sha512(), iterations: 2048, bits: 512);
|
||||
|
|
|
@ -113,17 +113,11 @@ class BitcoinWalletService extends WalletService<BitcoinNewWalletCredentials,
|
|||
|
||||
static Future<List<DerivationType>> compareDerivationMethods(
|
||||
{required String mnemonic, required Node node}) async {
|
||||
// if the mnemonic is 12 words, then it could be electrum 1.0,
|
||||
// if the mnemonic is 24 words, then it could be electrum 2.0
|
||||
// bip39 is possible with any number of words
|
||||
// int wordCount = mnemonic.split(" ").length;
|
||||
// if (wordCount == 24) {
|
||||
// return [DerivationType.bip39, DerivationType.electrum1];
|
||||
// } else if (wordCount == 12) {
|
||||
// return [DerivationType.bip39, DerivationType.electrum2];
|
||||
// } else {
|
||||
// return [DerivationType.bip39];
|
||||
// }
|
||||
|
||||
if (await checkIfMnemonicIsElectrum2(mnemonic)) {
|
||||
return [DerivationType.electrum2];
|
||||
}
|
||||
|
||||
return [DerivationType.bip39, DerivationType.electrum2];
|
||||
}
|
||||
|
||||
|
|
|
@ -229,12 +229,19 @@ class WalletRestorePage extends BasePage {
|
|||
return false;
|
||||
}
|
||||
|
||||
if ((walletRestoreViewModel.type == WalletType.bitcoin ||
|
||||
walletRestoreViewModel.type == WalletType.litecoin) &&
|
||||
if ((walletRestoreViewModel.type == WalletType.litecoin) &&
|
||||
(seedWords.length != WalletRestoreViewModelBase.electrumSeedMnemonicLength &&
|
||||
seedWords.length != WalletRestoreViewModelBase.electrumShortSeedMnemonicLength)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// bip39:
|
||||
const validSeedLengths = [12, 15, 18, 21, 24];
|
||||
if (walletRestoreViewModel.type == WalletType.bitcoin &&
|
||||
!(validSeedLengths.contains(seedWords.length))) {
|
||||
return false;
|
||||
}
|
||||
|
||||
final words =
|
||||
walletRestoreFromSeedFormKey.currentState!.seedWidgetStateKey.currentState!.words.toSet();
|
||||
return seedWords.toSet().difference(words).toSet().isEmpty;
|
||||
|
@ -331,6 +338,7 @@ class WalletRestorePage extends BasePage {
|
|||
this.derivationType = derivationInfo.derivationType;
|
||||
this.derivationPath = derivationInfo.derivationPath;
|
||||
} else {
|
||||
// electrum derivation:
|
||||
this.derivationType = derivationTypes[0];
|
||||
this.derivationPath = "m/0'/1";
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue