mirror of
https://github.com/sparrowwallet/drongo.git
synced 2024-12-26 01:56:44 +00:00
add wallet label and mixConfig indexRange
This commit is contained in:
parent
24d9e5fcda
commit
434c18ef0a
2 changed files with 21 additions and 2 deletions
|
@ -5,6 +5,7 @@ import java.io.File;
|
||||||
public class MixConfig extends Persistable {
|
public class MixConfig extends Persistable {
|
||||||
private String scode;
|
private String scode;
|
||||||
private Boolean mixOnStartup;
|
private Boolean mixOnStartup;
|
||||||
|
private String indexRange;
|
||||||
private File mixToWalletFile;
|
private File mixToWalletFile;
|
||||||
private String mixToWalletName;
|
private String mixToWalletName;
|
||||||
private Integer minMixes;
|
private Integer minMixes;
|
||||||
|
@ -14,9 +15,10 @@ public class MixConfig extends Persistable {
|
||||||
public MixConfig() {
|
public MixConfig() {
|
||||||
}
|
}
|
||||||
|
|
||||||
public MixConfig(String scode, Boolean mixOnStartup, File mixToWalletFile, String mixToWalletName, Integer minMixes, int receiveIndex, int changeIndex) {
|
public MixConfig(String scode, Boolean mixOnStartup, String indexRange, File mixToWalletFile, String mixToWalletName, Integer minMixes, int receiveIndex, int changeIndex) {
|
||||||
this.scode = scode;
|
this.scode = scode;
|
||||||
this.mixOnStartup = mixOnStartup;
|
this.mixOnStartup = mixOnStartup;
|
||||||
|
this.indexRange = indexRange;
|
||||||
this.mixToWalletFile = mixToWalletFile;
|
this.mixToWalletFile = mixToWalletFile;
|
||||||
this.mixToWalletName = mixToWalletName;
|
this.mixToWalletName = mixToWalletName;
|
||||||
this.minMixes = minMixes;
|
this.minMixes = minMixes;
|
||||||
|
@ -40,6 +42,14 @@ public class MixConfig extends Persistable {
|
||||||
this.mixOnStartup = mixOnStartup;
|
this.mixOnStartup = mixOnStartup;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getIndexRange() {
|
||||||
|
return indexRange;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setIndexRange(String indexRange) {
|
||||||
|
this.indexRange = indexRange;
|
||||||
|
}
|
||||||
|
|
||||||
public File getMixToWalletFile() {
|
public File getMixToWalletFile() {
|
||||||
return mixToWalletFile;
|
return mixToWalletFile;
|
||||||
}
|
}
|
||||||
|
@ -81,6 +91,6 @@ public class MixConfig extends Persistable {
|
||||||
}
|
}
|
||||||
|
|
||||||
public MixConfig copy() {
|
public MixConfig copy() {
|
||||||
return new MixConfig(scode, mixOnStartup, mixToWalletFile, mixToWalletName, minMixes, receiveIndex, changeIndex);
|
return new MixConfig(scode, mixOnStartup, indexRange, mixToWalletFile, mixToWalletName, minMixes, receiveIndex, changeIndex);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -27,6 +27,7 @@ public class Wallet extends Persistable implements Comparable<Wallet> {
|
||||||
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";
|
||||||
|
|
||||||
private String name;
|
private String name;
|
||||||
|
private String label;
|
||||||
private Wallet masterWallet;
|
private Wallet masterWallet;
|
||||||
private List<Wallet> childWallets = new ArrayList<>();
|
private List<Wallet> childWallets = new ArrayList<>();
|
||||||
private Network network = Network.get();
|
private Network network = Network.get();
|
||||||
|
@ -196,6 +197,14 @@ public class Wallet extends Persistable implements Comparable<Wallet> {
|
||||||
this.name = name;
|
this.name = name;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getLabel() {
|
||||||
|
return label;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setLabel(String label) {
|
||||||
|
this.label = label;
|
||||||
|
}
|
||||||
|
|
||||||
public Network getNetwork() {
|
public Network getNetwork() {
|
||||||
return network;
|
return network;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue