mirror of
https://github.com/cake-tech/cake_wallet.git
synced 2025-01-07 03:19:31 +00:00
minor enhancements
This commit is contained in:
parent
a008c1f2dd
commit
09da014dd8
5 changed files with 75 additions and 53 deletions
|
@ -287,6 +287,18 @@ class CWBitcoin extends Bitcoin {
|
||||||
}) async {
|
}) async {
|
||||||
List<DerivationInfo> list = [];
|
List<DerivationInfo> list = [];
|
||||||
|
|
||||||
|
List<DerivationType> types = await compareDerivationMethods(mnemonic: mnemonic, node: node);
|
||||||
|
if (types.length == 1 && types.first == DerivationType.electrum) {
|
||||||
|
return [
|
||||||
|
DerivationInfo(
|
||||||
|
derivationType: DerivationType.electrum,
|
||||||
|
derivationPath: "m/0'/0",
|
||||||
|
description: "Electrum",
|
||||||
|
scriptType: "p2wpkh",
|
||||||
|
)
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
final electrumClient = ElectrumClient();
|
final electrumClient = ElectrumClient();
|
||||||
await electrumClient.connectToUri(node.uri);
|
await electrumClient.connectToUri(node.uri);
|
||||||
|
|
||||||
|
|
|
@ -106,7 +106,6 @@ class CWNano extends Nano {
|
||||||
required String mnemonic,
|
required String mnemonic,
|
||||||
required DerivationType derivationType,
|
required DerivationType derivationType,
|
||||||
}) {
|
}) {
|
||||||
|
|
||||||
if (mnemonic.split(" ").length == 12 && derivationType != DerivationType.bip39) {
|
if (mnemonic.split(" ").length == 12 && derivationType != DerivationType.bip39) {
|
||||||
throw Exception("Invalid mnemonic for derivation type!");
|
throw Exception("Invalid mnemonic for derivation type!");
|
||||||
}
|
}
|
||||||
|
@ -126,7 +125,6 @@ class CWNano extends Nano {
|
||||||
required String seedKey,
|
required String seedKey,
|
||||||
required DerivationType derivationType,
|
required DerivationType derivationType,
|
||||||
}) {
|
}) {
|
||||||
|
|
||||||
if (seedKey.length == 128 && derivationType != DerivationType.bip39) {
|
if (seedKey.length == 128 && derivationType != DerivationType.bip39) {
|
||||||
throw Exception("Invalid seed key length for derivation type!");
|
throw Exception("Invalid seed key length for derivation type!");
|
||||||
}
|
}
|
||||||
|
@ -192,7 +190,6 @@ class CWNano extends Nano {
|
||||||
}
|
}
|
||||||
|
|
||||||
class CWNanoUtil extends NanoUtil {
|
class CWNanoUtil extends NanoUtil {
|
||||||
|
|
||||||
@override
|
@override
|
||||||
bool isValidBip39Seed(String seed) {
|
bool isValidBip39Seed(String seed) {
|
||||||
return NanoDerivations.isValidBip39Seed(seed);
|
return NanoDerivations.isValidBip39Seed(seed);
|
||||||
|
@ -346,4 +343,54 @@ class CWNanoUtil extends NanoUtil {
|
||||||
return [DerivationType.nano, DerivationType.bip39];
|
return [DerivationType.nano, DerivationType.bip39];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<List<DerivationInfo>> getDerivationsFromMnemonic({
|
||||||
|
String? mnemonic,
|
||||||
|
String? seedKey,
|
||||||
|
required Node node,
|
||||||
|
}) async {
|
||||||
|
List<DerivationInfo> list = [];
|
||||||
|
|
||||||
|
List<DerivationType> possibleDerivationTypes = await compareDerivationMethods(
|
||||||
|
mnemonic: mnemonic,
|
||||||
|
privateKey: seedKey,
|
||||||
|
node: node,
|
||||||
|
);
|
||||||
|
if (possibleDerivationTypes.length == 1) {
|
||||||
|
return [DerivationInfo(derivationType: possibleDerivationTypes.first)];
|
||||||
|
}
|
||||||
|
|
||||||
|
AccountInfoResponse? bip39Info = await nanoUtil!.getInfoFromSeedOrMnemonic(
|
||||||
|
DerivationType.bip39,
|
||||||
|
mnemonic: mnemonic,
|
||||||
|
seedKey: seedKey,
|
||||||
|
node: node,
|
||||||
|
);
|
||||||
|
AccountInfoResponse? standardInfo = await nanoUtil!.getInfoFromSeedOrMnemonic(
|
||||||
|
DerivationType.nano,
|
||||||
|
mnemonic: mnemonic,
|
||||||
|
seedKey: seedKey,
|
||||||
|
node: node,
|
||||||
|
);
|
||||||
|
|
||||||
|
if (standardInfo?.confirmationHeight != null && standardInfo!.confirmationHeight > 0) {
|
||||||
|
list.add(DerivationInfo(
|
||||||
|
derivationType: DerivationType.nano,
|
||||||
|
balance: nanoUtil!.getRawAsUsableString(standardInfo.balance, nanoUtil!.rawPerNano),
|
||||||
|
address: standardInfo.address!,
|
||||||
|
transactionsCount: standardInfo.confirmationHeight,
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (bip39Info?.confirmationHeight != null && bip39Info!.confirmationHeight > 0) {
|
||||||
|
list.add(DerivationInfo(
|
||||||
|
derivationType: DerivationType.bip39,
|
||||||
|
balance: nanoUtil!.getRawAsUsableString(bip39Info.balance, nanoUtil!.rawPerNano),
|
||||||
|
address: bip39Info.address!,
|
||||||
|
transactionsCount: bip39Info.confirmationHeight,
|
||||||
|
));
|
||||||
|
}
|
||||||
|
return list;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -113,13 +113,19 @@ abstract class WalletCreationVMBase with Store {
|
||||||
derivationType: DerivationType.nano,
|
derivationType: DerivationType.nano,
|
||||||
);
|
);
|
||||||
case WalletType.bitcoin:
|
case WalletType.bitcoin:
|
||||||
case WalletType.litecoin:
|
|
||||||
return DerivationInfo(
|
return DerivationInfo(
|
||||||
derivationType: DerivationType.bip39,
|
derivationType: DerivationType.bip39,
|
||||||
derivationPath: "m/84'/0'/0'/0",
|
derivationPath: "m/84'/0'/0'/0",
|
||||||
description: "Standard BIP84 native segwit",
|
description: "Standard BIP84 native segwit",
|
||||||
scriptType: "p2wpkh",
|
scriptType: "p2wpkh",
|
||||||
);
|
);
|
||||||
|
case WalletType.litecoin:
|
||||||
|
return DerivationInfo(
|
||||||
|
derivationType: DerivationType.bip39,
|
||||||
|
derivationPath: "m/84'/2'/0'/0",
|
||||||
|
description: "Standard BIP84 native segwit (litecoin)",
|
||||||
|
scriptType: "p2wpkh",
|
||||||
|
);
|
||||||
default:
|
default:
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
|
@ -212,65 +212,17 @@ abstract class WalletRestoreViewModelBase extends WalletCreationVM with Store {
|
||||||
case WalletType.nano:
|
case WalletType.nano:
|
||||||
String? mnemonic = credentials['seed'] as String?;
|
String? mnemonic = credentials['seed'] as String?;
|
||||||
String? seedKey = credentials['private_key'] as String?;
|
String? seedKey = credentials['private_key'] as String?;
|
||||||
AccountInfoResponse? bip39Info = await nanoUtil!.getInfoFromSeedOrMnemonic(
|
return nanoUtil!.getDerivationsFromMnemonic(
|
||||||
DerivationType.bip39,
|
|
||||||
mnemonic: mnemonic,
|
|
||||||
seedKey: seedKey,
|
|
||||||
node: node);
|
|
||||||
AccountInfoResponse? standardInfo = await nanoUtil!.getInfoFromSeedOrMnemonic(
|
|
||||||
DerivationType.nano,
|
|
||||||
mnemonic: mnemonic,
|
mnemonic: mnemonic,
|
||||||
seedKey: seedKey,
|
seedKey: seedKey,
|
||||||
node: node,
|
node: node,
|
||||||
);
|
);
|
||||||
|
|
||||||
if (standardInfo?.balance != null) {
|
|
||||||
list.add(DerivationInfo(
|
|
||||||
derivationType: DerivationType.nano,
|
|
||||||
balance: nanoUtil!.getRawAsUsableString(standardInfo!.balance, nanoUtil!.rawPerNano),
|
|
||||||
address: standardInfo.address!,
|
|
||||||
transactionsCount: standardInfo.confirmationHeight,
|
|
||||||
));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (bip39Info?.balance != null) {
|
|
||||||
list.add(DerivationInfo(
|
|
||||||
derivationType: DerivationType.bip39,
|
|
||||||
balance: nanoUtil!.getRawAsUsableString(bip39Info!.balance, nanoUtil!.rawPerNano),
|
|
||||||
address: bip39Info.address!,
|
|
||||||
transactionsCount: bip39Info.confirmationHeight,
|
|
||||||
));
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<List<DerivationType>> getDerivationTypes(dynamic options) async {
|
|
||||||
final seedKey = options['private_key'] as String?;
|
|
||||||
final mnemonic = options['seed'] as String?;
|
|
||||||
WalletType walletType = options['walletType'] as WalletType;
|
|
||||||
var appStore = getIt.get<AppStore>();
|
|
||||||
var node = appStore.settingsStore.getCurrentNode(walletType);
|
|
||||||
|
|
||||||
switch (type) {
|
|
||||||
case WalletType.bitcoin:
|
|
||||||
case WalletType.litecoin:
|
|
||||||
return bitcoin!.compareDerivationMethods(mnemonic: mnemonic!, node: node);
|
|
||||||
case WalletType.nano:
|
|
||||||
return nanoUtil!.compareDerivationMethods(
|
|
||||||
mnemonic: mnemonic,
|
|
||||||
privateKey: seedKey,
|
|
||||||
node: node,
|
|
||||||
);
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
return [DerivationType.def];
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Future<WalletBase> process(WalletCredentials credentials) async {
|
Future<WalletBase> process(WalletCredentials credentials) async {
|
||||||
if (mode == WalletRestoreMode.keys) {
|
if (mode == WalletRestoreMode.keys) {
|
||||||
|
|
|
@ -914,6 +914,11 @@ abstract class NanoUtil {
|
||||||
String? privateKey,
|
String? privateKey,
|
||||||
required Node node,
|
required Node node,
|
||||||
});
|
});
|
||||||
|
Future<List<DerivationInfo>> getDerivationsFromMnemonic({
|
||||||
|
String? mnemonic,
|
||||||
|
String? seedKey,
|
||||||
|
required Node node,
|
||||||
|
});
|
||||||
}
|
}
|
||||||
""";
|
""";
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue