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

dont allow scheduled enumerate to run while interactive commands are running

Browse source
This commit is contained in:
Craig Raw 2021-03-11 14:37:19 +02:00
parent cfbf9187e6
commit 84d2db427c
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/com/sparrowwallet/sparrow/io/Hwi.java
View file

@ -43,6 +43,7 @@ public class Hwi {
command = List.of(getHwiExecutable(Command.ENUMERATE).getAbsolutePath(), Command.ENUMERATE.toString()); command = List.of(getHwiExecutable(Command.ENUMERATE).getAbsolutePath(), Command.ENUMERATE.toString());
} }
isPromptActive = true;
String output = execute(command); String output = execute(command);
Device[] devices = getGson().fromJson(output, Device[].class); Device[] devices = getGson().fromJson(output, Device[].class);
if(devices == null) { if(devices == null) {
@ -51,6 +52,8 @@ public class Hwi {
return Arrays.stream(devices).filter(device -> device != null && device.getModel() != null).collect(Collectors.toList()); return Arrays.stream(devices).filter(device -> device != null && device.getModel() != null).collect(Collectors.toList());
} catch(IOException e) { } catch(IOException e) {
throw new ImportException(e); throw new ImportException(e);
} finally {
isPromptActive = false;
} }
} }
@ -109,7 +112,7 @@ public class Hwi {
//Remove replace once HWI-2.0.0 is released - see https://github.com/bitcoin-core/HWI/pull/488 //Remove replace once HWI-2.0.0 is released - see https://github.com/bitcoin-core/HWI/pull/488
String descriptor = outputDescriptor.toString().replace("sortedmulti", "multi"); String descriptor = outputDescriptor.toString().replace("sortedmulti", "multi");
isPromptActive = false; isPromptActive = true;
String output; String output;
if(passphrase != null && !passphrase.isEmpty() && device.getModel().externalPassphraseEntry()) { if(passphrase != null && !passphrase.isEmpty() && device.getModel().externalPassphraseEntry()) {
output = execute(getDeviceCommand(device, passphrase, Command.DISPLAY_ADDRESS, "--desc", descriptor)); output = execute(getDeviceCommand(device, passphrase, Command.DISPLAY_ADDRESS, "--desc", descriptor));
@ -130,12 +133,14 @@ public class Hwi {
} }
} catch(IOException e) { } catch(IOException e) {
throw new DisplayAddressException(e); throw new DisplayAddressException(e);
} finally {
isPromptActive = false;
} }
} }
public String signMessage(Device device, String passphrase, String message, String derivationPath) throws SignMessageException { public String signMessage(Device device, String passphrase, String message, String derivationPath) throws SignMessageException {
try { try {
isPromptActive = false; isPromptActive = true;
String output; String output;
if(passphrase != null && !passphrase.isEmpty() && device.getModel().externalPassphraseEntry()) { if(passphrase != null && !passphrase.isEmpty() && device.getModel().externalPassphraseEntry()) {
output = execute(getDeviceCommand(device, passphrase, Command.SIGN_MESSAGE, message, derivationPath)); output = execute(getDeviceCommand(device, passphrase, Command.SIGN_MESSAGE, message, derivationPath));
@ -156,6 +161,8 @@ public class Hwi {
} }
} catch(IOException e) { } catch(IOException e) {
throw new SignMessageException(e); throw new SignMessageException(e);
} finally {
isPromptActive = false;
} }
} }
@ -170,7 +177,6 @@ public class Hwi {
} else { } else {
output = execute(getDeviceCommand(device, Command.SIGN_TX, psbtBase64)); output = execute(getDeviceCommand(device, Command.SIGN_TX, psbtBase64));
} }
isPromptActive = false;
JsonObject result = JsonParser.parseString(output).getAsJsonObject(); JsonObject result = JsonParser.parseString(output).getAsJsonObject();
if(result.get("psbt") != null) { if(result.get("psbt") != null) {
@ -192,6 +198,8 @@ public class Hwi {
throw new SignTransactionException("Could not sign PSBT", e); throw new SignTransactionException("Could not sign PSBT", e);
} catch(PSBTParseException e) { } catch(PSBTParseException e) {
throw new SignTransactionException("Could not parsed signed PSBT", e); throw new SignTransactionException("Could not parsed signed PSBT", e);
} finally {
isPromptActive = false;
} }
} }