laantungir/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2026-08-09 00:04:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

reject extended private keys when creating a terminal watch only wallet, and show import errors

Browse Source
This commit is contained in:
Craig Raw
2026-08-04 15:55:45 +02:00
parent 7a3f775a57
commit fa0d48415f
2 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/sparrowwallet/sparrow/terminal/wallet/NewWalletDialog.java
+2 -1
View File
@@ -47,8 +47,9 @@ public abstract class NewWalletDialog extends DialogWindow {
try {
discoverAndSaveWallet(getWallets());
} catch(ImportException e) {
} catch(Exception e) {
log.error("Cannot import wallet", e);
showErrorDialog("Error Creating Wallet", e.getMessage());
}
}
src/main/java/com/sparrowwallet/sparrow/terminal/wallet/WatchOnlyDialog.java
+17 -14
View File
@@ -93,23 +93,26 @@ public class WatchOnlyDialog extends NewWalletDialog {
@Override
protected List<Wallet> getWallets() throws ImportException {
try {
return getWalletFromXpub();
} catch(Exception e1) {
try {
return getWalletFromOutputDescriptor();
} catch(Exception e2) {
log.error("Could not determine wallet from descriptor: " + descriptor.getText(), e2);
String text = descriptor.getText().replaceAll("\\s+", "");
if(ExtendedKey.isValid(text)) {
ExtendedKey extendedKey = ExtendedKey.fromDescriptor(text);
if(!extendedKey.getKey().isPubKeyOnly()) {
throw new ImportException("An extended private key cannot be used to create a watch only wallet. Enter an extended public key, or an output descriptor if the private key is intended to be imported.");
}
return getWalletFromXpub(extendedKey, ExtendedKey.Header.fromExtendedKey(text));
}
return Collections.emptyList();
try {
return getWalletFromOutputDescriptor(text);
} catch(Exception e) {
log.error("Could not determine wallet from descriptor: " + text, e);
throw new ImportException("Could not determine wallet from descriptor: " + e.getMessage(), e);
}
}
private List<Wallet> getWalletFromXpub() {
ExtendedKey xpub = ExtendedKey.fromDescriptor(descriptor.getText().replaceAll("\\s+", ""));
ExtendedKey.Header header = ExtendedKey.Header.fromExtendedKey(descriptor.getText());
private List<Wallet> getWalletFromXpub(ExtendedKey xpub, ExtendedKey.Header header) {
Set<ScriptType> scriptTypes = new LinkedHashSet<>();
scriptTypes.add(ScriptType.P2WPKH);
scriptTypes.add(header.getDefaultScriptType());
@@ -136,8 +139,8 @@ public class WatchOnlyDialog extends NewWalletDialog {
return wallets;
}
private List<Wallet> getWalletFromOutputDescriptor() {
OutputDescriptor outputDescriptor = OutputDescriptor.getOutputDescriptor(descriptor.getText().replaceAll("\\s+", ""));
private List<Wallet> getWalletFromOutputDescriptor(String text) {
OutputDescriptor outputDescriptor = OutputDescriptor.getOutputDescriptor(text);
Wallet wallet = outputDescriptor.toWallet();
wallet.setName(walletName);
return List.of(wallet);