sparrowwallet/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2024-11-05 05:46:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

show error when importing tpubs from usb on mainnet etc

Browse source
This commit is contained in:
Craig Raw 2021-03-11 11:39:19 +02:00
parent 836bd6bc40
commit 5478ac05b8
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/main/java/com/sparrowwallet/sparrow/control/DevicePane.java
View file

@ -442,14 +442,18 @@ public class DevicePane extends TitledDescriptionPane {
getXpubService.setOnSucceeded(workerStateEvent -> { getXpubService.setOnSucceeded(workerStateEvent -> {
String xpub = getXpubService.getValue(); String xpub = getXpubService.getValue();
Keystore keystore = new Keystore(); try {
keystore.setLabel(device.getModel().toDisplayString()); Keystore keystore = new Keystore();
keystore.setSource(KeystoreSource.HW_USB); keystore.setLabel(device.getModel().toDisplayString());
keystore.setWalletModel(device.getModel()); keystore.setSource(KeystoreSource.HW_USB);
keystore.setKeyDerivation(new KeyDerivation(device.getFingerprint(), derivationPath)); keystore.setWalletModel(device.getModel());
keystore.setExtendedPublicKey(ExtendedKey.fromDescriptor(xpub)); keystore.setKeyDerivation(new KeyDerivation(device.getFingerprint(), derivationPath));
keystore.setExtendedPublicKey(ExtendedKey.fromDescriptor(xpub));
EventManager.get().post(new KeystoreImportEvent(keystore)); EventManager.get().post(new KeystoreImportEvent(keystore));
} catch(Exception e) {
setError("Could not retrieve xpub", e.getMessage());
}
}); });
getXpubService.setOnFailed(workerStateEvent -> { getXpubService.setOnFailed(workerStateEvent -> {
setError("Could not retrieve xpub", getXpubService.getException().getMessage()); setError("Could not retrieve xpub", getXpubService.getException().getMessage());