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

gate the display address, sign message and keystore discovery panes on a fingerprint resolved after pin entry

Browse Source
This commit is contained in:
Craig Raw
2026-08-26 15:04:38 +02:00
parent 0e8d8192fb
commit 5f7770b873
2 changed files with 34 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lark
+1 -1
Submodule lark updated: 33fbba951e...13001e8acf
src/main/java/com/sparrowwallet/sparrow/control/DevicePane.java
+33 -13
View File
@@ -378,11 +378,6 @@ public class DevicePane extends TitledDescriptionPane {
});
displayAddressButton.managedProperty().bind(displayAddressButton.visibleProperty());
displayAddressButton.setVisible(false);
List<String> fingerprints = outputDescriptor.getExtendedPublicKeys().stream().map(extKey -> outputDescriptor.getKeyDerivation(extKey).getMasterFingerprint()).collect(Collectors.toList());
if(device.getFingerprint() != null && !fingerprints.contains(device.getFingerprint())) {
displayAddressButton.setDisable(true);
}
}
private void createSignMessageButton() {
@@ -394,10 +389,6 @@ public class DevicePane extends TitledDescriptionPane {
});
signMessageButton.managedProperty().bind(signMessageButton.visibleProperty());
signMessageButton.setVisible(false);
if(device.getFingerprint() != null && !device.getFingerprint().equals(requiredDerivation.getMasterFingerprint())) {
signMessageButton.setDisable(true);
}
}
private void createDiscoverKeystoresButton() {
@@ -629,11 +620,26 @@ public class DevicePane extends TitledDescriptionPane {
setPassphraseButton.setDisable(true);
setContent(getPassphraseEntry());
setExpanded(true);
} else if(device.getFingerprint() == null && (deviceOperation.equals(DeviceOperation.DISPLAY_ADDRESS) || deviceOperation.equals(DeviceOperation.SIGN_MESSAGE)
|| deviceOperation.equals(DeviceOperation.DISCOVER_KEYSTORES))) {
//A PIN protected device reports no fingerprint until it is unlocked, and these operations gate on it to avoid using the wrong device
Hwi.EnumerateService enumerateService = new Hwi.EnumerateService(passphrase.get());
enumerateService.setOnSucceeded(enumerateEvent -> {
for(Device freshDevice : enumerateService.getValue()) {
if(device.getPath().equals(freshDevice.getPath()) && device.getModel().equals(freshDevice.getModel())) {
device.setFingerprint(freshDevice.getFingerprint());
}
}
showUnlockedOperation();
});
enumerateService.setOnFailed(enumerateEvent -> {
showUnlockedOperation();
setError("Error", enumerateService.getException().getMessage());
});
enumerateService.start();
} else {
showOperationButton();
if(!deviceOperation.equals(DeviceOperation.IMPORT)) {
setContent(getTogglePassphraseOn());
}
showUnlockedOperation();
}
} else {
setError("Incorrect PIN", null);
@@ -652,6 +658,13 @@ public class DevicePane extends TitledDescriptionPane {
sendPinService.start();
}
private void showUnlockedOperation() {
showOperationButton();
if(!deviceOperation.equals(DeviceOperation.IMPORT)) {
setContent(getTogglePassphraseOn());
}
}
private void sendPassphrase(String passphrase) {
Hwi.EnumerateService enumerateService = new Hwi.EnumerateService(passphrase);
enumerateService.setOnSucceeded(workerStateEvent -> {
@@ -1193,16 +1206,23 @@ public class DevicePane extends TitledDescriptionPane {
signButton.setVisible(true);
showHideLink.setVisible(false);
} else if(deviceOperation.equals(DeviceOperation.DISPLAY_ADDRESS)) {
//A device which has not yet been unlocked reports no fingerprint, so this check is only meaningful once the operation button is shown
List<String> fingerprints = outputDescriptor.getExtendedPublicKeys().stream().map(extKey -> outputDescriptor.getKeyDerivation(extKey).getMasterFingerprint()).collect(Collectors.toList());
displayAddressButton.setDefaultButton(defaultDevice);
displayAddressButton.setVisible(true);
displayAddressButton.setDisable(device.getFingerprint() != null && !fingerprints.contains(device.getFingerprint()));
showHideLink.setVisible(false);
} else if(deviceOperation.equals(DeviceOperation.SIGN_MESSAGE)) {
signMessageButton.setDefaultButton(defaultDevice);
signMessageButton.setVisible(true);
signMessageButton.setDisable(device.getFingerprint() != null && !device.getFingerprint().equals(requiredDerivation.getMasterFingerprint()));
showHideLink.setVisible(false);
} else if(deviceOperation.equals(DeviceOperation.DISCOVER_KEYSTORES)) {
//Discovery stamps the wallet master fingerprint on keystores built from the device xpubs, so a mismatched device is silently persisted
discoverKeystoresButton.setDefaultButton(defaultDevice);
discoverKeystoresButton.setVisible(true);
discoverKeystoresButton.setDisable(device.getFingerprint() != null && wallet.getKeystores().size() == 1
&& !device.getFingerprint().equals(wallet.getKeystores().get(0).getKeyDerivation().getMasterFingerprint()));
showHideLink.setVisible(false);
} else if(deviceOperation.equals(DeviceOperation.GET_PRIVATE_KEY)) {
if(defaultDevice) {