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

add system property to disable script type derivation validation

Browse source
This commit is contained in:
Craig Raw 2021-02-22 16:04:34 +02:00
parent 79216fac91
commit fe91063e8f
1 changed files with 5 additions and 0 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

@ -21,6 +21,7 @@ import static com.sparrowwallet.drongo.protocol.Transaction.WITNESS_SCALE_FACTOR
public class Wallet { public class Wallet {
public static final int DEFAULT_LOOKAHEAD = 20; public static final int DEFAULT_LOOKAHEAD = 20;
public static final String ALLOW_DERIVATIONS_MATCHING_OTHER_SCRIPT_TYPES_PROPERTY = "com.sparrowwallet.allowDerivationsMatchingOtherScriptTypes";
private String name; private String name;
private Network network = Network.get(); private Network network = Network.get();
@ -980,6 +981,10 @@ public class Wallet {
} }
public boolean derivationMatchesAnotherScriptType(String derivationPath) { public boolean derivationMatchesAnotherScriptType(String derivationPath) {
if(Boolean.TRUE.toString().equals(System.getProperty(ALLOW_DERIVATIONS_MATCHING_OTHER_SCRIPT_TYPES_PROPERTY))) {
return false;
}
if(scriptType != null && scriptType.getAccount(derivationPath) > -1) { if(scriptType != null && scriptType.getAccount(derivationPath) > -1) {
return false; return false;
} }