← Watch feed
support qr and file methods for signing messages via psbt when bip322 is selected
Public commit record
50/100 · Thin
What the developer wrote
Authored by Craig Raw
support qr and file methods for signing messages via psbt when bip322 is selected
✓ Specific, descriptive subject✓ Names a concrete action or component! No meaningful explanatory body
What changed, and why it matters
This commit adds new ways to sign Bitcoin messages using the BIP-322 standard through QR codes and PSBT files in Sparrow Wallet. It changes how the wallet decides which signing formats are allowed and removes a fallback that previously forced older P2PKH-style signing for wallets that couldn't sign BIP-322. The main concern is that the new logic may let users select a signing format their hardware wallet or keystore doesn't actually support, or may mishandle PSBT files imported back from an external signer. There is no direct evidence in the commit of a vulnerability being fixed or introduced, but the change touches security-sensitive signing code.
Recommended action
Review the new format-selection logic to ensure users cannot attempt BIP-322 signing with keystores that do not support it, and verify that imported PSBTs are validated before signature extraction. Consider requesting a security review or release note from the project maintainers, as the commit message does not disclose security relevance.
Security signals we found
01
Change to security-sensitive message signing flow (BIP-322)
02
Removal of previous format fallback/downgrade logic (getSigningScriptType)
03
New PSBT serialization/deserialization paths for message signatures
04
UI enable/disable logic changed for signing format selection
05
No explicit security fix or vulnerability disclosure in commit message
Evidence from the diff
The patch modifies MessageSignDialog.java to support QR and file-based BIP-322 message signing via PSBT. Key changes: (1) replaces getSigningScriptType() with direct use of walletNode.getWallet().getScriptType(); (2) renames canSignBip322() to canSignAllFormats() and uses it to enable/disable the Sign button based on selected format; (3) adds showBip322Qr() and exportBip322File() to create BIP-322 PSBTs with derivation info; (4) updates scanQr() and importFile() to parse returned/saved PSBTs and extract BIP-322 signatures. The removed getSigningScriptType() previously downgraded the signing script type to P2PKH when the wallet could sign but not BIP-322. The new behavior may expose format-selection UI states that were previously suppressed. No explicit security bug or CVE is described in the commit message or diff.
Changed components
src/main/java/com/sparrowwallet/sparrow/control/MessageSignDialog.javaBIP-322 message signingPSBT QR code export/importPSBT file export/importWallet signing format selection UIInspect captured patch +119 / −12
diff --git a/src/main/java/com/sparrowwallet/sparrow/control/MessageSignDialog.java b/src/main/java/com/sparrowwallet/sparrow/control/MessageSignDialog.java
index 25a2ea7..e4c14d5 100644
--- a/src/main/java/com/sparrowwallet/sparrow/control/MessageSignDialog.java
+++ b/src/main/java/com/sparrowwallet/sparrow/control/MessageSignDialog.java
@@ -10,7 +10,12 @@ import com.sparrowwallet.drongo.crypto.Bip322;
import com.sparrowwallet.drongo.crypto.ECKey;
import com.sparrowwallet.drongo.policy.PolicyType;
import com.sparrowwallet.drongo.protocol.ScriptType;
+import com.sparrowwallet.drongo.psbt.PSBT;
+import com.sparrowwallet.drongo.psbt.PSBTInput;
import com.sparrowwallet.drongo.wallet.*;
+import com.sparrowwallet.hummingbird.registry.CryptoPSBT;
+import com.sparrowwallet.sparrow.io.bbqr.BBQR;
+import com.sparrowwallet.sparrow.io.bbqr.BBQRType;
import com.sparrowwallet.sparrow.AppServices;
import com.sparrowwallet.sparrow.EventManager;
import com.sparrowwallet.sparrow.event.*;
@@ -242,7 +247,7 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
if(wallet != null) {
setWalletNodeFromAddress(wallet, address);
if(walletNode != null) {
- setFormatFromScriptType(getSigningScriptType(walletNode));
+ setFormatFromScriptType(walletNode.getWallet().getScriptType());
}
}
} catch(InvalidAddressException e) {
@@ -250,6 +255,13 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
}
}
});
+
+ formatGroup.selectedToggleProperty().addListener((_, _, newVal) -> {
+ if(wallet != null) {
+ boolean canSignSelectedFormat = canSignAllFormats(wallet) || newVal == formatElectrum;
+ signButton.setDisable(!isValidAddress() || !canSign || !canSignSelectedFormat);
+ }
+ });
}
EventManager.get().register(this);
@@ -277,7 +289,7 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
}
if(wallet != null && walletNode != null) {
- setFormatFromScriptType(getSigningScriptType(walletNode));
+ setFormatFromScriptType(walletNode.getWallet().getScriptType());
} else {
formatGroup.selectToggle(formatElectrum);
}
@@ -296,7 +308,7 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
|| wallet.getKeystores().getFirst().getWalletModel().isCard();
}
- private boolean canSignBip322(Wallet wallet) {
+ private boolean canSignAllFormats(Wallet wallet) {
return wallet.getKeystores().getFirst().hasPrivateKey();
}
@@ -321,11 +333,6 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
walletNode = wallet.getWalletAddresses().get(address);
}
- private ScriptType getSigningScriptType(WalletNode walletNode) {
- ScriptType scriptType = walletNode.getWallet().getScriptType();
- return canSign(walletNode.getWallet()) && !canSignBip322(walletNode.getWallet()) ? ScriptType.P2PKH : scriptType;
- }
-
private void setFormatFromScriptType(ScriptType scriptType) {
formatElectrum.setDisable(scriptType == ScriptType.P2TR);
formatTrezor.setDisable(scriptType == ScriptType.P2TR || scriptType == ScriptType.P2PKH);
@@ -473,6 +480,11 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
return;
}
+ if(isBip322()) {
+ showBip322Qr();
+ return;
+ }
+
//Note we can expect a single keystore due to the check in the constructor
KeyDerivation firstDerivation = walletNode.getWallet().getKeystores().get(0).getKeyDerivation();
String derivationPath = KeyDerivation.writePath(firstDerivation.extend(walletNode.getDerivation()).getDerivation(), false);
@@ -486,13 +498,57 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
}
}
+ private void showBip322Qr() {
+ Wallet signingWallet = walletNode.getWallet();
+ ScriptType scriptType = signingWallet.getScriptType();
+
+ PSBT psbt = Bip322.getBip322Psbt(scriptType, walletNode.getAddress(), message.getText().trim());
+ addBip322DerivationInfo(psbt, signingWallet);
+
+ byte[] psbtBytes = psbt.serialize();
+ CryptoPSBT cryptoPSBT = new CryptoPSBT(psbtBytes);
+ BBQR bbqr = new BBQR(BBQRType.PSBT, psbtBytes);
+ QRDisplayDialog qrDisplayDialog = new QRDisplayDialog(cryptoPSBT.toUR(), bbqr, false, true, QREncoding.UR);
+ qrDisplayDialog.initOwner(getDialogPane().getScene().getWindow());
+ Optional<ButtonType> optButtonType = qrDisplayDialog.showAndWait();
+ if(optButtonType.isPresent() && optButtonType.get().getButtonData() == ButtonBar.ButtonData.OK_DONE) {
+ scanQr();
+ }
+ }
+
+ private void addBip322DerivationInfo(PSBT psbt, Wallet signingWallet) {
+ ScriptType scriptType = signingWallet.getScriptType();
+ PSBTInput psbtInput = psbt.getPsbtInputs().get(0);
+ Keystore keystore = signingWallet.getKeystores().get(0);
+ ECKey pubKey = keystore.getPubKey(walletNode);
+ KeyDerivation fullDerivation = keystore.getKeyDerivation().extend(walletNode.getDerivation());
+
+ if(scriptType == ScriptType.P2TR) {
+ psbtInput.setTapInternalKey(pubKey);
+ psbtInput.getTapDerivedPublicKeys().put(ECKey.fromPublicOnly(pubKey.getPubKeyXCoord()), Map.of(fullDerivation, Collections.emptyList()));
+ } else {
+ psbtInput.getDerivedPublicKeys().put(scriptType.getOutputKey(pubKey), fullDerivation);
+ }
+ }
+
private void scanQr() {
QRScanDialog qrScanDialog = new QRScanDialog();
qrScanDialog.initOwner(getDialogPane().getScene().getWindow());
Optional<QRScanDialog.Result> optionalResult = qrScanDialog.showAndWait();
if(optionalResult.isPresent()) {
QRScanDialog.Result result = optionalResult.get();
- if(result.payload != null) {
+ if(result.psbt != null) {
+ try {
+ Wallet signingWallet = walletNode.getWallet();
+ ECKey pubKey = signingWallet.getKeystores().get(0).getPubKey(walletNode);
+ String sig = Bip322.getBip322SignatureFromPsbt(signingWallet.getScriptType(), result.psbt, pubKey);
+ signature.clear();
+ signature.appendText(sig);
+ } catch(Exception e) {
+ log.error("Error extracting BIP-322 signature from PSBT", e);
+ AppServices.showErrorDialog("Error extracting signature", e.getMessage());
+ }
+ } else if(result.payload != null) {
signature.clear();
signature.appendText(result.payload);
} else if(result.exception != null) {
@@ -510,6 +566,11 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
return;
}
+ if(isBip322()) {
+ exportBip322File();
+ return;
+ }
+
StringJoiner joiner = new StringJoiner("\n");
joiner.add(message.getText().trim().replaceAll("\r*\n*", ""));
//Note we can expect a single keystore due to the check in the constructor
@@ -538,20 +599,66 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
}
}
+ private void exportBip322File() {
+ Wallet signingWallet = walletNode.getWallet();
+ ScriptType scriptType = signingWallet.getScriptType();
+ PSBT psbt = Bip322.getBip322Psbt(scriptType, walletNode.getAddress(), message.getText().trim());
+ addBip322DerivationInfo(psbt, signingWallet);
+
+ Stage window = new Stage();
+ FileChooser fileChooser = new FileChooser();
+ fileChooser.setTitle("Save PSBT File");
+ fileChooser.setInitialFileName("bip322-signmessage.psbt");
+ AppServices.moveToActiveWindowScreen(window, 800, 450);
+ File file = fileChooser.showSaveDialog(window);
+ if(file != null) {
+ try(OutputStream os = new FileOutputStream(file)) {
+ os.write(psbt.serialize());
+ } catch(IOException e) {
+ log.error("Error saving BIP-322 PSBT", e);
+ AppServices.showErrorDialog("Error saving PSBT", "Cannot write to " + file.getAbsolutePath());
+ }
+ }
+ }
+
private void importFile() {
Stage window = new Stage();
FileChooser fileChooser = new FileChooser();
- fileChooser.setTitle("Open Signed Text File");
+ fileChooser.setTitle("Open Signed File");
fileChooser.getExtensionFilters().addAll(
new FileChooser.ExtensionFilter("All Files", OsType.getCurrent().equals(OsType.UNIX) ? "*" : "*.*"),
- new FileChooser.ExtensionFilter("Text Files", "*.txt")
+ new FileChooser.ExtensionFilter("Text Files", "*.txt"),
+ new FileChooser.ExtensionFilter("PSBT Files", "*.psbt")
);
AppServices.moveToActiveWindowScreen(window, 800, 450);
File file = fileChooser.showOpenDialog(window);
if(file != null) {
+ if(file.getName().toLowerCase(Locale.ROOT).endsWith(".psbt") || isBip322()) {
+ if(walletNode == null) {
+ AppServices.showErrorDialog("Address not in wallet", "The provided address is not present in the currently selected wallet.");
+ return;
+ }
+ try {
+ byte[] psbtBytes = Files.readAllBytes(file.toPath());
+ PSBT signedPsbt = new PSBT(psbtBytes, false);
+ ECKey pubKey = walletNode.getWallet().getKeystores().get(0).getPubKey(walletNode);
+ String sig = Bip322.getBip322SignatureFromPsbt(walletNode.getWallet().getScriptType(), signedPsbt, pubKey);
+ signature.clear();
+ signature.appendText(sig);
+ return;
+ } catch(Exception e) {
+ if(file.getName().toLowerCase(Locale.ROOT).endsWith(".psbt")) {
+ log.error("Error loading signed PSBT", e);
+ AppServices.showErrorDialog("Error loading signed PSBT", e.getMessage());
+ return;
+ }
+ //Fall through to text handling for non-.psbt files
+ }
+ }
+
try {
String content = Files.readString(file.toPath(), StandardCharsets.UTF_8);
Matcher matcher = signedMessagePattern.matcher(content);
Risk score
Our methodology →Why this scored 22/100
Human-validated context
Community notes
Notes can correct, qualify, or add evidence to the AI analysis. Every note shown here has been validated by a human moderator.
No validated notes yet.
The AI analysis stands alone for now. Submit a note if you can add evidence or important context.