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

support invalid script type warnings

Browse source
This commit is contained in:
Craig Raw 2025-03-04 11:47:22 +02:00
parent 5fd8e9416a
commit 66ff275f46
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/com/sparrowwallet/drongo/protocol/ScriptType.java
View file

@ -1154,6 +1154,10 @@ public enum ScriptType {
return description; return description;
} }
public String getDescription(boolean includePolicyType) {
return includePolicyType && !getAllowedPolicyTypes().isEmpty() ? getAllowedPolicyTypes().getFirst().getName().toLowerCase(Locale.ROOT) + " " + description : description;
}
public String getDefaultDerivationPath() { public String getDefaultDerivationPath() {
return Network.get() != Network.MAINNET ? defaultDerivationPath.replace("/0'/0'", "/1'/0'") : defaultDerivationPath; return Network.get() != Network.MAINNET ? defaultDerivationPath.replace("/0'/0'", "/1'/0'") : defaultDerivationPath;
} }

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

@ -1812,15 +1812,19 @@ public class Wallet extends Persistable implements Comparable<Wallet> {
} }
public boolean derivationMatchesAnotherScriptType(String derivationPath) { public boolean derivationMatchesAnotherScriptType(String derivationPath) {
return getOtherScriptTypeMatchingDerivation(derivationPath).isPresent();
}
public Optional<ScriptType> getOtherScriptTypeMatchingDerivation(String derivationPath) {
if(Boolean.TRUE.toString().equals(System.getProperty(ALLOW_DERIVATIONS_MATCHING_OTHER_SCRIPT_TYPES_PROPERTY))) { if(Boolean.TRUE.toString().equals(System.getProperty(ALLOW_DERIVATIONS_MATCHING_OTHER_SCRIPT_TYPES_PROPERTY))) {
return false; return Optional.empty();
} }
if(scriptType != null && scriptType.getAccount(derivationPath) > -1) { if(scriptType != null && scriptType.getAccount(derivationPath) > -1) {
return false; return Optional.empty();
} }
return Arrays.stream(ScriptType.values()).anyMatch(scriptType -> !scriptType.equals(this.scriptType) && scriptType.getAccount(derivationPath, true) > -1); return Arrays.stream(ScriptType.values()).filter(scriptType -> !scriptType.equals(this.scriptType) && scriptType.getAccount(derivationPath, true) > -1).findFirst();
} }
public boolean derivationMatchesAnotherNetwork(String derivationPath) { public boolean derivationMatchesAnotherNetwork(String derivationPath) {