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

disable bip47 support for taproot script type

Browse source
This commit is contained in:
Craig Raw 2022-03-21 09:39:04 +02:00
parent fe57ad3e7a
commit 88bd6ada98
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/com/sparrowwallet/drongo/wallet/Wallet.java
View file

@ -184,7 +184,7 @@ public class Wallet extends Persistable implements Comparable<Wallet> {
throw new IllegalStateException("Cannot add payment code wallet to " + policyType.getName() + " wallet");
}
if(scriptType != P2PKH && scriptType != P2WPKH) {
if(scriptType != P2PKH && scriptType != P2SH_P2WPKH && scriptType != P2WPKH) {
throw new IllegalStateException("Cannot add payment code wallet to " + scriptType.getName() + " wallet");
}
@ -244,7 +244,8 @@ public class Wallet extends Persistable implements Comparable<Wallet> {
}
public boolean hasPaymentCode() {
return getKeystores().size() == 1 && getKeystores().get(0).getBip47ExtendedPrivateKey() != null;
return getKeystores().size() == 1 && getKeystores().get(0).getBip47ExtendedPrivateKey() != null && policyType == PolicyType.SINGLE
&& (scriptType == P2PKH || scriptType == P2SH_P2WPKH || scriptType == P2WPKH);
}
public PaymentCode getPaymentCode() {