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

implement sweeping of funds from a bip38 encrypted private key

Browse source
This commit is contained in:
Craig Raw 2022-07-19 13:22:20 +02:00
parent 22303a2efc
commit ecf9b78753
2 changed files with 59 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drongo

@ -1 +1 @@
Subproject commit 5de3abd36230d545f11bad3b25a21d23ffbbe9cd Subproject commit f10688279a7a761c734c80c051237c0a4a90928b

58
src/main/java/com/sparrowwallet/sparrow/control/PrivateKeySweepDialog.java
View file

@ -4,6 +4,7 @@ import com.google.common.io.Files;
import com.sparrowwallet.drongo.KeyPurpose; import com.sparrowwallet.drongo.KeyPurpose;
import com.sparrowwallet.drongo.address.Address; import com.sparrowwallet.drongo.address.Address;
import com.sparrowwallet.drongo.address.InvalidAddressException; import com.sparrowwallet.drongo.address.InvalidAddressException;
import com.sparrowwallet.drongo.crypto.BIP38;
import com.sparrowwallet.drongo.crypto.DumpedPrivateKey; import com.sparrowwallet.drongo.crypto.DumpedPrivateKey;
import com.sparrowwallet.drongo.crypto.ECKey; import com.sparrowwallet.drongo.crypto.ECKey;
import com.sparrowwallet.drongo.policy.PolicyType; import com.sparrowwallet.drongo.policy.PolicyType;
@ -27,6 +28,7 @@ import javafx.scene.layout.VBox;
import javafx.stage.FileChooser; import javafx.stage.FileChooser;
import javafx.stage.Stage; import javafx.stage.Stage;
import javafx.util.StringConverter; import javafx.util.StringConverter;
import org.controlsfx.control.textfield.CustomPasswordField;
import org.controlsfx.glyphfont.Glyph; import org.controlsfx.glyphfont.Glyph;
import org.controlsfx.validation.ValidationResult; import org.controlsfx.validation.ValidationResult;
import org.controlsfx.validation.ValidationSupport; import org.controlsfx.validation.ValidationSupport;
@ -149,6 +151,10 @@ public class PrivateKeySweepDialog extends Dialog<Transaction> {
}); });
key.textProperty().addListener((observable, oldValue, newValue) -> { key.textProperty().addListener((observable, oldValue, newValue) -> {
if(isEncryptedKey()) {
decryptKey();
}
boolean isValidKey = isValidKey(); boolean isValidKey = isValidKey();
createButton.setDisable(!isValidKey || !isValidToAddress()); createButton.setDisable(!isValidKey || !isValidToAddress());
if(isValidKey) { if(isValidKey) {
@ -199,6 +205,27 @@ public class PrivateKeySweepDialog extends Dialog<Transaction> {
} }
} }
private boolean isEncryptedKey() {
return key.getText().length() == 58 && key.getText().startsWith("6P");
}
private void decryptKey() {
PassphraseDialog passphraseDialog = new PassphraseDialog();
Optional<String> optPassphrase = passphraseDialog.showAndWait();
if(optPassphrase.isPresent()) {
try {
DumpedPrivateKey decryptedKey = BIP38.decrypt(optPassphrase.get(), key.getText());
Platform.runLater(() -> key.setText(decryptedKey.toString()));
} catch(Exception e) {
log.error("Failed to decrypt BIP38 key", e);
AppServices.showErrorDialog("Failed to decrypt BIP38 key", e.getMessage());
Platform.runLater(() -> key.setText(""));
}
} else {
Platform.runLater(() -> key.setText(""));
}
}
private DumpedPrivateKey getPrivateKey() { private DumpedPrivateKey getPrivateKey() {
return DumpedPrivateKey.fromBase58(key.getText()); return DumpedPrivateKey.fromBase58(key.getText());
} }
@ -342,4 +369,35 @@ public class PrivateKeySweepDialog extends Dialog<Transaction> {
glyph.setFontSize(12); glyph.setFontSize(12);
return glyph; return glyph;
} }
public class PassphraseDialog extends Dialog<String> {
private final CustomPasswordField passphrase;
public PassphraseDialog() {
this.passphrase = new ViewPasswordField();
final DialogPane dialogPane = getDialogPane();
setTitle("BIP38 Passphrase");
dialogPane.setHeaderText("Enter the BIP38 passphrase for this key:");
dialogPane.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
AppServices.setStageIcon(dialogPane.getScene().getWindow());
dialogPane.getButtonTypes().addAll(ButtonType.CANCEL, ButtonType.OK);
dialogPane.setPrefWidth(380);
dialogPane.setPrefHeight(200);
AppServices.moveToActiveWindowScreen(this);
Glyph key = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.KEY);
key.setFontSize(50);
dialogPane.setGraphic(key);
final VBox content = new VBox(10);
content.setPrefHeight(50);
content.getChildren().add(passphrase);
dialogPane.setContent(content);
Platform.runLater(passphrase::requestFocus);
setResultConverter(dialogButton -> dialogButton == ButtonType.OK ? passphrase.getText() : null);
}
}
} }