sparrowwallet/drongo
1
0
Fork 0
mirror of https://github.com/sparrowwallet/drongo.git synced 2024-11-04 11:06:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

throw exception for bip322 multisig signatures

Browse source
This commit is contained in:
Craig Raw 2023-07-04 09:21:48 +02:00
parent f47d5de392
commit 6a7d2aac28
2 changed files with 29 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/main/java/com/sparrowwallet/drongo/crypto/Bip322.java
View file

@ -41,7 +41,7 @@ public class Bip322 {
return Base64.getEncoder().encodeToString(finalizedTxInput.getWitness().toByteArray()); return Base64.getEncoder().encodeToString(finalizedTxInput.getWitness().toByteArray());
} }
public static void verifyMessageBip322(ScriptType scriptType, Address address, String message, String signatureBase64) throws SignatureException { public static boolean verifyMessageBip322(ScriptType scriptType, Address address, String message, String signatureBase64) throws SignatureException {
checkScriptType(scriptType); checkScriptType(scriptType);
byte[] signatureEncoded; byte[] signatureEncoded;
@ -55,6 +55,10 @@ public class Bip322 {
TransactionSignature signature; TransactionSignature signature;
ECKey pubKey; ECKey pubKey;
if(witness.getWitnessScript() != null) {
throw new IllegalArgumentException("Multisig signatures are not supported.");
}
if(scriptType == ScriptType.P2WPKH) { if(scriptType == ScriptType.P2WPKH) {
signature = witness.getSignatures().get(0); signature = witness.getSignatures().get(0);
pubKey = ECKey.fromPublicOnly(witness.getPushes().get(1)); pubKey = ECKey.fromPublicOnly(witness.getPushes().get(1));
@ -66,7 +70,7 @@ public class Bip322 {
signature = witness.getSignatures().get(0); signature = witness.getSignatures().get(0);
pubKey = P2TR.getPublicKeyFromScript(address.getOutputScript()); pubKey = P2TR.getPublicKeyFromScript(address.getOutputScript());
} else { } else {
throw new IllegalArgumentException(scriptType + " addresses are not supported"); throw new SignatureException(scriptType + " addresses are not supported");
} }
Transaction toSpend = getBip322ToSpend(address, message); Transaction toSpend = getBip322ToSpend(address, message);
@ -86,8 +90,10 @@ public class Bip322 {
try { try {
psbt.verifySignatures(); psbt.verifySignatures();
} catch(PSBTSignatureException e) { } catch(PSBTSignatureException e) {
throw new SignatureException("Signature did not match for message", e); return false;
} }
return true;
} }
private static void checkScriptType(ScriptType scriptType) { private static void checkScriptType(ScriptType scriptType) {
@ -104,6 +110,10 @@ public class Bip322 {
} }
} }
public static boolean isSupported(ScriptType scriptType) {
return scriptType == ScriptType.P2WPKH || scriptType == P2TR;
}
public static Transaction getBip322ToSpend(Address address, String message) { public static Transaction getBip322ToSpend(Address address, String message) {
Transaction toSpend = new Transaction(); Transaction toSpend = new Transaction();
toSpend.setVersion(0); toSpend.setVersion(0);

22
src/test/java/com/sparrowwallet/drongo/crypto/Bip322Test.java
View file

@ -32,13 +32,13 @@ public class Bip322Test {
Assert.assertEquals("AkcwRAIgZRfIY3p7/DoVTty6YZbWS71bc5Vct9p9Fia83eRmw2QCICK/ENGfwLtptFluMGs2KsqoNSk89pO7F29zJLUx9a/sASECx/EgAxlkQpQ9hYjgGu6EBCPMVPwVIVJqO4XCsMvViHI=", signature2); Assert.assertEquals("AkcwRAIgZRfIY3p7/DoVTty6YZbWS71bc5Vct9p9Fia83eRmw2QCICK/ENGfwLtptFluMGs2KsqoNSk89pO7F29zJLUx9a/sASECx/EgAxlkQpQ9hYjgGu6EBCPMVPwVIVJqO4XCsMvViHI=", signature2);
} }
@Test(expected = SignatureException.class) @Test
public void verifyMessageBip322Fail() throws InvalidAddressException, SignatureException { public void verifyMessageBip322Fail() throws InvalidAddressException, SignatureException {
Address address = Address.fromString("bc1q9vza2e8x573nczrlzms0wvx3gsqjx7vavgkx0l"); Address address = Address.fromString("bc1q9vza2e8x573nczrlzms0wvx3gsqjx7vavgkx0l");
String message1 = ""; String message1 = "";
String signature2 = "AkcwRAIgZRfIY3p7/DoVTty6YZbWS71bc5Vct9p9Fia83eRmw2QCICK/ENGfwLtptFluMGs2KsqoNSk89pO7F29zJLUx9a/sASECx/EgAxlkQpQ9hYjgGu6EBCPMVPwVIVJqO4XCsMvViHI="; String signature2 = "AkcwRAIgZRfIY3p7/DoVTty6YZbWS71bc5Vct9p9Fia83eRmw2QCICK/ENGfwLtptFluMGs2KsqoNSk89pO7F29zJLUx9a/sASECx/EgAxlkQpQ9hYjgGu6EBCPMVPwVIVJqO4XCsMvViHI=";
Bip322.verifyMessageBip322(ScriptType.P2WPKH, address, message1, signature2); Assert.assertFalse(Bip322.verifyMessageBip322(ScriptType.P2WPKH, address, message1, signature2));
} }
@Test @Test
@ -47,14 +47,14 @@ public class Bip322Test {
String message1 = ""; String message1 = "";
String signature1 = "AkcwRAIgM2gBAQqvZX15ZiysmKmQpDrG83avLIT492QBzLnQIxYCIBaTpOaD20qRlEylyxFSeEA2ba9YOixpX8z46TSDtS40ASECx/EgAxlkQpQ9hYjgGu6EBCPMVPwVIVJqO4XCsMvViHI="; String signature1 = "AkcwRAIgM2gBAQqvZX15ZiysmKmQpDrG83avLIT492QBzLnQIxYCIBaTpOaD20qRlEylyxFSeEA2ba9YOixpX8z46TSDtS40ASECx/EgAxlkQpQ9hYjgGu6EBCPMVPwVIVJqO4XCsMvViHI=";
Bip322.verifyMessageBip322(ScriptType.P2WPKH, address, message1, signature1); Assert.assertTrue(Bip322.verifyMessageBip322(ScriptType.P2WPKH, address, message1, signature1));
String message2 = "Hello World"; String message2 = "Hello World";
String signature2 = "AkcwRAIgZRfIY3p7/DoVTty6YZbWS71bc5Vct9p9Fia83eRmw2QCICK/ENGfwLtptFluMGs2KsqoNSk89pO7F29zJLUx9a/sASECx/EgAxlkQpQ9hYjgGu6EBCPMVPwVIVJqO4XCsMvViHI="; String signature2 = "AkcwRAIgZRfIY3p7/DoVTty6YZbWS71bc5Vct9p9Fia83eRmw2QCICK/ENGfwLtptFluMGs2KsqoNSk89pO7F29zJLUx9a/sASECx/EgAxlkQpQ9hYjgGu6EBCPMVPwVIVJqO4XCsMvViHI=";
Bip322.verifyMessageBip322(ScriptType.P2WPKH, address, message2, signature2); Assert.assertTrue(Bip322.verifyMessageBip322(ScriptType.P2WPKH, address, message2, signature2));
String signature3 = "AkgwRQIhAOzyynlqt93lOKJr+wmmxIens//zPzl9tqIOua93wO6MAiBi5n5EyAcPScOjf1lAqIUIQtr3zKNeavYabHyR8eGhowEhAsfxIAMZZEKUPYWI4BruhAQjzFT8FSFSajuFwrDL1Yhy"; String signature3 = "AkgwRQIhAOzyynlqt93lOKJr+wmmxIens//zPzl9tqIOua93wO6MAiBi5n5EyAcPScOjf1lAqIUIQtr3zKNeavYabHyR8eGhowEhAsfxIAMZZEKUPYWI4BruhAQjzFT8FSFSajuFwrDL1Yhy";
Bip322.verifyMessageBip322(ScriptType.P2WPKH, address, message2, signature3); Assert.assertTrue(Bip322.verifyMessageBip322(ScriptType.P2WPKH, address, message2, signature3));
} }
@Test @Test
@ -76,7 +76,7 @@ public class Bip322Test {
String message1 = "Hello World"; String message1 = "Hello World";
String signature1 = "AUHd69PrJQEv+oKTfZ8l+WROBHuy9HKrbFCJu7U1iK2iiEy1vMU5EfMtjc+VSHM7aU0SDbak5IUZRVno2P5mjSafAQ=="; String signature1 = "AUHd69PrJQEv+oKTfZ8l+WROBHuy9HKrbFCJu7U1iK2iiEy1vMU5EfMtjc+VSHM7aU0SDbak5IUZRVno2P5mjSafAQ==";
Bip322.verifyMessageBip322(ScriptType.P2TR, address, message1, signature1); Assert.assertTrue(Bip322.verifyMessageBip322(ScriptType.P2TR, address, message1, signature1));
} }
@Test(expected = UnsupportedOperationException.class) @Test(expected = UnsupportedOperationException.class)
@ -100,4 +100,14 @@ public class Bip322Test {
Bip322.verifyMessageBip322(ScriptType.P2SH_P2WPKH, address, message1, signature1); Bip322.verifyMessageBip322(ScriptType.P2SH_P2WPKH, address, message1, signature1);
} }
@Test(expected = IllegalArgumentException.class)
public void verifyMessageBip322Multisig() throws SignatureException, InvalidAddressException {
Address address = Address.fromString("bc1ppv609nr0vr25u07u95waq5lucwfm6tde4nydujnu8npg4q75mr5sxq8lt3");
String message1 = "This will be a p2wsh 3-of-3 multisig BIP 322 signed message";
String signature1 = "BQBIMEUCIQDQoXvGKLH58exuujBOta+7+GN7vi0lKwiQxzBpuNuXuAIgIE0XYQlFDOfxbegGYYzlf+tqegleAKE6SXYIa1U+uCcBRzBEAiATegywVl6GWrG9jJuPpNwtgHKyVYCX2yfuSSDRFATAaQIgTLlU6reLQsSIrQSF21z3PtUO2yAUseUWGZqRUIE7VKoBSDBFAiEAgxtpidsU0Z4u/+5RB9cyeQtoCW5NcreLJmWXZ8kXCZMCIBR1sXoEinhZE4CF9P9STGIcMvCuZjY6F5F0XTVLj9SjAWlTIQP3dyWvTZjUENWJowMWBsQrrXCUs20Gu5YF79CG5Ga0XSEDwqI5GVBOuFkFzQOGH5eTExSAj2Z/LDV/hbcvAPQdlJMhA17FuuJd+4wGuj+ZbVxEsFapTKAOwyhfw9qpch52JKxbU64=";
Bip322.verifyMessageBip322(ScriptType.P2TR, address, message1, signature1);
}
} }