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

support checking if derivation path matches another network

Browse source
This commit is contained in:
Craig Raw 2024-03-01 11:23:09 +02:00
parent c12dac9a25
commit c8165e154a
2 changed files with 39 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -8,8 +8,6 @@ import com.sparrowwallet.drongo.crypto.ChildNumber;
import com.sparrowwallet.drongo.crypto.ECKey; import com.sparrowwallet.drongo.crypto.ECKey;
import com.sparrowwallet.drongo.policy.PolicyType; import com.sparrowwallet.drongo.policy.PolicyType;
import java.time.LocalDate;
import java.time.Month;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -1174,10 +1172,31 @@ public enum ScriptType {
return Collections.unmodifiableList(copy); return Collections.unmodifiableList(copy);
} }
public static boolean derivationMatchesAnotherNetwork(String derivationPath) {
if(KeyDerivation.isValid(derivationPath)) {
List<ChildNumber> derivation = new ArrayList<>(KeyDerivation.parsePath(derivationPath));
if(derivation.size() > 1) {
int networkIndex = derivation.get(1).num();
return Network.get() == Network.MAINNET ? (networkIndex == 1) : (networkIndex == 0);
}
}
return false;
}
public int getAccount(String derivationPath) { public int getAccount(String derivationPath) {
return getAccount(derivationPath, false);
}
public int getAccount(String derivationPath, boolean ignoreNetwork) {
if(KeyDerivation.isValid(derivationPath)) { if(KeyDerivation.isValid(derivationPath)) {
List<ChildNumber> derivation = new ArrayList<>(KeyDerivation.parsePath(derivationPath)); List<ChildNumber> derivation = new ArrayList<>(KeyDerivation.parsePath(derivationPath));
if(derivation.size() > 2) { if(derivation.size() > 2) {
if(ignoreNetwork) {
ChildNumber networkChildNumber = new ChildNumber(Network.get() == Network.MAINNET ? 0 : 1, true);
derivation.set(1, networkChildNumber);
}
int account = derivation.get(2).num(); int account = derivation.get(2).num();
List<ChildNumber> defaultDerivation = getDefaultDerivation(account); List<ChildNumber> defaultDerivation = getDefaultDerivation(account);
if(defaultDerivation.equals(derivation)) { if(defaultDerivation.equals(derivation)) {

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

@ -26,6 +26,7 @@ public class Wallet extends Persistable implements Comparable<Wallet> {
public static final int DEFAULT_LOOKAHEAD = 20; public static final int DEFAULT_LOOKAHEAD = 20;
public static final int SEARCH_LOOKAHEAD = 4000; public static final int SEARCH_LOOKAHEAD = 4000;
public static final String ALLOW_DERIVATIONS_MATCHING_OTHER_SCRIPT_TYPES_PROPERTY = "com.sparrowwallet.allowDerivationsMatchingOtherScriptTypes"; public static final String ALLOW_DERIVATIONS_MATCHING_OTHER_SCRIPT_TYPES_PROPERTY = "com.sparrowwallet.allowDerivationsMatchingOtherScriptTypes";
public static final String ALLOW_DERIVATIONS_MATCHING_OTHER_NETWORKS_PROPERTY = "com.sparrowwallet.allowDerivationsMatchingOtherNetworks";
private String name; private String name;
private String label; private String label;
@ -1773,6 +1774,10 @@ public class Wallet extends Persistable implements Comparable<Wallet> {
if(derivationMatchesAnotherScriptType(keystore.getKeyDerivation().getDerivationPath())) { if(derivationMatchesAnotherScriptType(keystore.getKeyDerivation().getDerivationPath())) {
throw new InvalidWalletException("Keystore " + keystore.getLabel() + " derivation of " + keystore.getKeyDerivation().getDerivationPath() + " in " + scriptType.getName() + " wallet matches another default script type."); throw new InvalidWalletException("Keystore " + keystore.getLabel() + " derivation of " + keystore.getKeyDerivation().getDerivationPath() + " in " + scriptType.getName() + " wallet matches another default script type.");
} }
if(derivationMatchesAnotherNetwork(keystore.getKeyDerivation().getDerivationPath())) {
throw new InvalidWalletException("Keystore " + keystore.getLabel() + " derivation of " + keystore.getKeyDerivation().getDerivationPath() + " in " + scriptType.getName() + " wallet matches another network.");
}
} }
if(containsDuplicateExtendedKeys()) { if(containsDuplicateExtendedKeys()) {
@ -1789,7 +1794,19 @@ public class Wallet extends Persistable implements Comparable<Wallet> {
return false; return false;
} }
return Arrays.stream(ScriptType.values()).anyMatch(scriptType -> !scriptType.equals(this.scriptType) && scriptType.getAccount(derivationPath) > -1); return Arrays.stream(ScriptType.values()).anyMatch(scriptType -> !scriptType.equals(this.scriptType) && scriptType.getAccount(derivationPath, true) > -1);
}
public boolean derivationMatchesAnotherNetwork(String derivationPath) {
if(Boolean.TRUE.toString().equals(System.getProperty(ALLOW_DERIVATIONS_MATCHING_OTHER_NETWORKS_PROPERTY))) {
return false;
}
if(scriptType != null && scriptType.getAccount(derivationPath, true) > -1) {
return ScriptType.derivationMatchesAnotherNetwork(derivationPath);
}
return false;
} }
public boolean containsDuplicateKeystoreLabels() { public boolean containsDuplicateKeystoreLabels() {