From 0acbff6e601001f79df61e5a9cb9b5c2bb9bb5e1 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Tue, 19 Feb 2019 15:18:04 -0500 Subject: [PATCH] Add DAO_TESTNET baseCurrencyNetwork enum --- .../main/java/bisq/core/app/BisqEnvironment.java | 3 +-- .../java/bisq/core/btc/BaseCurrencyNetwork.java | 5 +++++ .../java/bisq/core/dao/governance/param/Param.java | 14 +++++++------- .../java/bisq/core/dao/node/full/RpcService.java | 4 +++- .../java/bisq/core/dao/state/GenesisTxInfo.java | 9 +++++++++ .../main/java/bisq/core/locale/CurrencyUtil.java | 3 +-- .../src/main/java/bisq/desktop/app/BisqApp.java | 7 +++---- 7 files changed, 29 insertions(+), 16 deletions(-) diff --git a/core/src/main/java/bisq/core/app/BisqEnvironment.java b/core/src/main/java/bisq/core/app/BisqEnvironment.java index aa0aef44d1..9a3ca198c4 100644 --- a/core/src/main/java/bisq/core/app/BisqEnvironment.java +++ b/core/src/main/java/bisq/core/app/BisqEnvironment.java @@ -166,8 +166,7 @@ public class BisqEnvironment extends StandardEnvironment { public static boolean isDaoActivated(Environment environment) { Boolean daoActivatedFromOptions = environment.getProperty(DaoOptionKeys.DAO_ACTIVATED, Boolean.class, false); BaseCurrencyNetwork baseCurrencyNetwork = BisqEnvironment.getBaseCurrencyNetwork(); - boolean isRegTestOrTestNet = (baseCurrencyNetwork.isTestnet() || baseCurrencyNetwork.isRegtest()); - return daoActivatedFromOptions || isRegTestOrTestNet; + return daoActivatedFromOptions || !baseCurrencyNetwork.isMainnet(); } diff --git a/core/src/main/java/bisq/core/btc/BaseCurrencyNetwork.java b/core/src/main/java/bisq/core/btc/BaseCurrencyNetwork.java index 11138d12a3..1e6f8734ad 100644 --- a/core/src/main/java/bisq/core/btc/BaseCurrencyNetwork.java +++ b/core/src/main/java/bisq/core/btc/BaseCurrencyNetwork.java @@ -27,6 +27,7 @@ import lombok.Getter; public enum BaseCurrencyNetwork { BTC_MAINNET(MainNetParams.get(), "BTC", "MAINNET", "Bitcoin"), BTC_TESTNET(TestNet3Params.get(), "BTC", "TESTNET", "Bitcoin"), + BTC_DAO_TESTNET(RegTestParams.get(), "BTC", "DAO_TESTNET", "Bitcoin"), // server side regtest BTC_REGTEST(RegTestParams.get(), "BTC", "REGTEST", "Bitcoin"); @Getter @@ -53,6 +54,10 @@ public enum BaseCurrencyNetwork { return "TESTNET".equals(network); } + public boolean isDaoTestNet() { + return BTC_DAO_TESTNET.name().equals(network); + } + public boolean isRegtest() { return "REGTEST".equals(network); } diff --git a/core/src/main/java/bisq/core/dao/governance/param/Param.java b/core/src/main/java/bisq/core/dao/governance/param/Param.java index b04a499144..a0beb5181d 100644 --- a/core/src/main/java/bisq/core/dao/governance/param/Param.java +++ b/core/src/main/java/bisq/core/dao/governance/param/Param.java @@ -128,43 +128,43 @@ public enum Param { "3601" : // mainnet; 24 days BisqEnvironment.getBaseCurrencyNetwork().isRegtest() ? "4" : // regtest - "380", // testnet; 2.6 days + "380", // testnet or dao testnet (server side regtest); 2.6 days ParamType.BLOCK, 3, 3), PHASE_BREAK1(BisqEnvironment.getBaseCurrencyNetwork().isMainnet() ? "149" : // mainnet; 1 day BisqEnvironment.getBaseCurrencyNetwork().isRegtest() ? "1" : // regtest - "10", // testnet + "10", // testnet or dao testnet (server side regtest) ParamType.BLOCK, 3, 3), PHASE_BLIND_VOTE(BisqEnvironment.getBaseCurrencyNetwork().isMainnet() ? "601" : // mainnet; 4 days BisqEnvironment.getBaseCurrencyNetwork().isRegtest() ? "2" : // regtest - "300", // testnet; 2 days + "300", // testnet or dao testnet (server side regtest); 2 days ParamType.BLOCK, 3, 3), PHASE_BREAK2(BisqEnvironment.getBaseCurrencyNetwork().isMainnet() ? "9" : // mainnet BisqEnvironment.getBaseCurrencyNetwork().isRegtest() ? "1" : // regtest - "10", // testnet + "10", // testnet or dao testnet (server side regtest) ParamType.BLOCK, 3, 23), PHASE_VOTE_REVEAL(BisqEnvironment.getBaseCurrencyNetwork().isMainnet() ? "301" : // mainnet; 2 days BisqEnvironment.getBaseCurrencyNetwork().isRegtest() ? "2" : // regtest - "300", // testnet; 2 days + "300", // testnet or dao testnet (server side regtest); 2 days ParamType.BLOCK, 3, 3), PHASE_BREAK3(BisqEnvironment.getBaseCurrencyNetwork().isMainnet() ? "9" : // mainnet BisqEnvironment.getBaseCurrencyNetwork().isRegtest() ? "1" : // regtest - "10", // testnet + "10", // testnet or dao testnet (server side regtest) ParamType.BLOCK, 3, 3), PHASE_RESULT(BisqEnvironment.getBaseCurrencyNetwork().isMainnet() ? "10" : // mainnet BisqEnvironment.getBaseCurrencyNetwork().isRegtest() ? "2" : // regtest - "2", // testnet + "2", // testnet or dao testnet (server side regtest) ParamType.BLOCK, 3, 3); @Getter diff --git a/core/src/main/java/bisq/core/dao/node/full/RpcService.java b/core/src/main/java/bisq/core/dao/node/full/RpcService.java index 303b3677e2..eda60b4308 100644 --- a/core/src/main/java/bisq/core/dao/node/full/RpcService.java +++ b/core/src/main/java/bisq/core/dao/node/full/RpcService.java @@ -101,10 +101,12 @@ public class RpcService { boolean isPortSet = rpcPort != null && !rpcPort.isEmpty(); boolean isMainnet = BisqEnvironment.getBaseCurrencyNetwork().isMainnet(); boolean isTestnet = BisqEnvironment.getBaseCurrencyNetwork().isTestnet(); + boolean isDaoTestNet = BisqEnvironment.getBaseCurrencyNetwork().isDaoTestNet(); this.rpcPort = isPortSet ? rpcPort : isMainnet ? "8332" : isTestnet ? "18332" : - "18443"; // regtest + isDaoTestNet ? "18554" : + "18443"; // regtest this.rpcBlockPort = rpcBlockPort != null && !rpcBlockPort.isEmpty() ? rpcBlockPort : "5125"; this.dumpBlockchainData = dumpBlockchainData; diff --git a/core/src/main/java/bisq/core/dao/state/GenesisTxInfo.java b/core/src/main/java/bisq/core/dao/state/GenesisTxInfo.java index d0b6656b76..dfb0e51e23 100644 --- a/core/src/main/java/bisq/core/dao/state/GenesisTxInfo.java +++ b/core/src/main/java/bisq/core/dao/state/GenesisTxInfo.java @@ -51,6 +51,10 @@ public class GenesisTxInfo { private static final String TESTNET_GENESIS_TX_ID = "09e70ce0ab7a962a82a2ca84c9ae8a89140bf1c3fb6f7efad6162e39e4b362ae"; private static final int TESTNET_GENESIS_BLOCK_HEIGHT = 1446300; // 2018-12-02 + //TODO + private static final String DAO_TESTNET_GENESIS_TX_ID = "09e70ce0ab7a962a82a2ca84c9ae8a89140bf1c3fb6f7efad6162e39e4b362ae"; + private static final int DAO_TESTNET_GENESIS_BLOCK_HEIGHT = 1446300; // 2019-02-19 + private static final String REGTEST_GENESIS_TX_ID = "30af0050040befd8af25068cc697e418e09c2d8ebd8d411d2240591b9ec203cf"; private static final int REGTEST_GENESIS_BLOCK_HEIGHT = 111; @@ -93,6 +97,7 @@ public class GenesisTxInfo { BaseCurrencyNetwork baseCurrencyNetwork = BisqEnvironment.getBaseCurrencyNetwork(); boolean isMainnet = baseCurrencyNetwork.isMainnet(); boolean isTestnet = baseCurrencyNetwork.isTestnet(); + boolean isDaoTestNet = baseCurrencyNetwork.isDaoTestNet(); boolean isRegtest = baseCurrencyNetwork.isRegtest(); if (!genesisTxId.isEmpty()) { this.genesisTxId = genesisTxId; @@ -100,6 +105,8 @@ public class GenesisTxInfo { this.genesisTxId = MAINNET_GENESIS_TX_ID; } else if (isTestnet) { this.genesisTxId = TESTNET_GENESIS_TX_ID; + } else if (isDaoTestNet) { + this.genesisTxId = DAO_TESTNET_GENESIS_TX_ID; } else if (isRegtest) { this.genesisTxId = REGTEST_GENESIS_TX_ID; } else { @@ -112,6 +119,8 @@ public class GenesisTxInfo { this.genesisBlockHeight = MAINNET_GENESIS_BLOCK_HEIGHT; } else if (isTestnet) { this.genesisBlockHeight = TESTNET_GENESIS_BLOCK_HEIGHT; + } else if (isDaoTestNet) { + this.genesisBlockHeight = DAO_TESTNET_GENESIS_BLOCK_HEIGHT; } else if (isRegtest) { this.genesisBlockHeight = REGTEST_GENESIS_BLOCK_HEIGHT; } else { diff --git a/core/src/main/java/bisq/core/locale/CurrencyUtil.java b/core/src/main/java/bisq/core/locale/CurrencyUtil.java index b429410a37..02ba5357fc 100644 --- a/core/src/main/java/bisq/core/locale/CurrencyUtil.java +++ b/core/src/main/java/bisq/core/locale/CurrencyUtil.java @@ -422,8 +422,7 @@ public class CurrencyUtil { // We want all coins available also in testnet or regtest for testing purpose public static boolean coinMatchesNetworkIfMainnet(Coin coin, BaseCurrencyNetwork baseCurrencyNetwork) { boolean matchesNetwork = assetMatchesNetwork(coin, baseCurrencyNetwork); - return !baseCurrencyNetwork.isMainnet() || - matchesNetwork; + return !baseCurrencyNetwork.isMainnet() || matchesNetwork; } private static CryptoCurrency assetToCryptoCurrency(Asset asset) { diff --git a/desktop/src/main/java/bisq/desktop/app/BisqApp.java b/desktop/src/main/java/bisq/desktop/app/BisqApp.java index 6ebb4b912f..b6313d4a6f 100644 --- a/desktop/src/main/java/bisq/desktop/app/BisqApp.java +++ b/desktop/src/main/java/bisq/desktop/app/BisqApp.java @@ -238,10 +238,9 @@ public class BisqApp extends Application implements UncaughtExceptionHandler { // configure the primary stage String appName = injector.getInstance(Key.get(String.class, Names.named(AppOptionKeys.APP_NAME_KEY))); - if (BisqEnvironment.getBaseCurrencyNetwork().isTestnet()) - appName += " [TESTNET]"; - else if (BisqEnvironment.getBaseCurrencyNetwork().isRegtest()) - appName += " [REGTEST]"; + if (!BisqEnvironment.getBaseCurrencyNetwork().isMainnet()) + appName += " [" + BisqEnvironment.getBaseCurrencyNetwork().name() + "]"; + stage.setTitle(appName); stage.setScene(scene); stage.setMinWidth(MIN_WINDOW_WIDTH);