Commit ac35e6b3 authored by zeroleak's avatar zeroleak
Browse files

add config.tx0MinConfirmations

parent 9e1d1804
......@@ -33,6 +33,7 @@ public abstract class CliConfigFile {
@NotEmpty private boolean seedAppendPassphrase;
@NotEmpty private int persistDelay;
@NotEmpty private int refreshPoolsDelay;
@NotEmpty private int tx0MinConfirmations;
@NotEmpty private String proxy;
private Optional<CliProxy> _cliProxy;
@NotEmpty private MixConfig mix;
......@@ -57,6 +58,7 @@ public abstract class CliConfigFile {
this.seedAppendPassphrase = copy.seedAppendPassphrase;
this.persistDelay = copy.persistDelay;
this.refreshPoolsDelay = copy.refreshPoolsDelay;
this.tx0MinConfirmations = copy.tx0MinConfirmations;
this.proxy = copy.proxy;
this.mix = new MixConfig(copy.mix);
}
......@@ -149,6 +151,14 @@ public abstract class CliConfigFile {
this.refreshPoolsDelay = refreshPoolsDelay;
}
public int getTx0MinConfirmations() {
return tx0MinConfirmations;
}
public void setTx0MinConfirmations(int tx0MinConfirmations) {
this.tx0MinConfirmations = tx0MinConfirmations;
}
public String getProxy() {
return proxy;
}
......@@ -385,6 +395,7 @@ public abstract class CliConfigFile {
}
config.setPersistDelay(persistDelay);
config.setRefreshPoolsDelay(refreshPoolsDelay);
config.setTx0MinConfirmations(tx0MinConfirmations);
config.setMaxClients(mix.getClients());
config.setMaxClientsPerPool(mix.getClientsPerPool());
......@@ -412,6 +423,7 @@ public abstract class CliConfigFile {
configInfo.put("cli/seedEncrypted", ClientUtils.maskString(seed));
configInfo.put("cli/persistDelay", Integer.toString(persistDelay));
configInfo.put("cli/refreshPoolsDelay", Integer.toString(refreshPoolsDelay));
configInfo.put("cli/tx0MinConfirmations", Integer.toString(tx0MinConfirmations));
configInfo.put("cli/proxy", proxy != null ? ClientUtils.maskString(proxy) : "null");
configInfo.putAll(mix.getConfigInfo());
return configInfo;
......
......@@ -18,6 +18,7 @@ cli.seed =
cli.seedAppendPassphrase = true
cli.persistDelay = 2
cli.refreshPoolsDelay = 30
cli.tx0MinConfirmations = 1
cli.proxy =
cli.mix.clients =
......
......@@ -40,7 +40,7 @@ public class WhirlpoolPairingPayloadTest {
PairingVersion.V1_0_0,
PairingNetwork.MAINNET,
"rV2e6YUj33akmh6+k32mjVEE0Amm8XrLRDe4Qvi1WZ1PWAWXHxpuaHwbbXZzzzIlwLnLMNJ8fxtMQMAGR77xew==",
true); // passphrase=true for V1
true); // passphrase=true for V1
// valid V2
payload =
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment