sparrowwallet/drongo
1
0
Fork 0
mirror of https://github.com/sparrowwallet/drongo.git synced 2025-11-05 11:56:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

improve pubkey checks to consider just x-only and compressed keys

Browse source
This commit is contained in:
Craig Raw 2025-08-20 07:46:09 +02:00
parent 68966e5c26
commit a4d86f9ee3
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/com/sparrowwallet/drongo/silentpayments/SilentPaymentUtils.java
View file

@ -46,17 +46,20 @@ public class SilentPaymentUtils {
if(scriptType.isScriptType(output.getScript())) { if(scriptType.isScriptType(output.getScript())) {
switch(scriptType) { switch(scriptType) {
case P2TR: case P2TR:
keys.add(output.getScript().getPubKey()); keys.add(ScriptType.P2TR.getPublicKeyFromScript(output.getScript()));
break; break;
case P2WPKH: case P2WPKH:
case P2SH_P2WPKH: case P2SH_P2WPKH:
if(input.getWitness() != null && input.getWitness().getPushCount() == 2) { if(input.getWitness() != null && input.getWitness().getPushCount() == 2) {
keys.add(ECKey.fromPublicOnly(input.getWitness().getPushes().get(input.getWitness().getPushCount() - 1))); byte[] pubKey = input.getWitness().getPushes().get(input.getWitness().getPushCount() - 1);
if(pubKey != null && pubKey.length == 33) {
keys.add(ECKey.fromPublicOnly(pubKey));
}
} }
break; break;
case P2PKH: case P2PKH:
for(ScriptChunk scriptChunk : input.getScriptSig().getChunks()) { for(ScriptChunk scriptChunk : input.getScriptSig().getChunks()) {
if(scriptChunk.isPubKey()) { if(scriptChunk.isPubKey() && scriptChunk.getData().length == 33) {
keys.add(scriptChunk.getPubKey()); keys.add(scriptChunk.getPubKey());
} }
} }