From 795892f7c95c4677b3dd1ad29846db8d27aa6470 Mon Sep 17 00:00:00 2001
From: Craig Raw <craigraw@gmail.com>
Date: Tue, 4 Jul 2023 09:22:15 +0200
Subject: [PATCH] show error for bip322 multisig signatures

---
 drongo                                                |  2 +-
 .../sparrow/control/MessageSignDialog.java            | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/drongo b/drongo
index f47d5de3..6a7d2aac 160000
--- a/drongo
+++ b/drongo
@@ -1 +1 @@
-Subproject commit f47d5de3922a88ae385e586dcc3947f05c2ae803
+Subproject commit 6a7d2aac285e9300b5897d1b64d0e5baa25e428d
diff --git a/src/main/java/com/sparrowwallet/sparrow/control/MessageSignDialog.java b/src/main/java/com/sparrowwallet/sparrow/control/MessageSignDialog.java
index c052718f..1a851f2d 100644
--- a/src/main/java/com/sparrowwallet/sparrow/control/MessageSignDialog.java
+++ b/src/main/java/com/sparrowwallet/sparrow/control/MessageSignDialog.java
@@ -392,12 +392,13 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
                 }
             }
 
-            if(!verified) {
+            if(!verified && Bip322.isSupported(getAddress().getScriptType())) {
                 try {
-                    Bip322.verifyMessageBip322(getAddress().getScriptType(), getAddress(), message.getText().trim(), signature.getText().trim());
-                    verified = true;
-                    formatGroup.selectToggle(formatBip322);
-                } catch(Exception e) {
+                    verified = Bip322.verifyMessageBip322(getAddress().getScriptType(), getAddress(), message.getText().trim(), signature.getText().trim());
+                    if(verified) {
+                        formatGroup.selectToggle(formatBip322);
+                    }
+                } catch(SignatureException e) {
                     //ignore
                 }
             }