Merge pull request #1726 from ManfredKarrer/master

Small improvements
bisq-network · Sep 26, 2018 · ede4203 · ede4203
2 parents 5d46a99 + b1182e9
commit ede4203
Show file tree

Hide file tree

Showing 14 changed files with 92 additions and 56 deletions.
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
diff --git a/core/src/main/java/bisq/core/app/BisqExecutable.java b/core/src/main/java/bisq/core/app/BisqExecutable.java
@@ -18,6 +18,7 @@
 package bisq.core.app;
 
 import bisq.core.arbitration.ArbitratorManager;
+import bisq.core.btc.BaseCurrencyNetwork;
 import bisq.core.btc.BtcOptionKeys;
 import bisq.core.btc.setup.RegTestHost;
 import bisq.core.btc.setup.WalletsSetup;
@@ -208,7 +209,11 @@ protected void applyInjector() {
 
     protected void setupDevEnv() {
         DevEnv.setDevMode(injector.getInstance(Key.get(Boolean.class, Names.named(CommonOptionKeys.USE_DEV_MODE))));
-        DevEnv.setDaoActivated(injector.getInstance(Key.get(Boolean.class, Names.named(DaoOptionKeys.DAO_ACTIVATED))));
+
+        BaseCurrencyNetwork baseCurrencyNetwork = BisqEnvironment.getBaseCurrencyNetwork();
+        boolean isRegTestOrTestNet = (baseCurrencyNetwork.isTestnet() || baseCurrencyNetwork.isRegtest());
+        boolean isDaoActivatedOptionSet = injector.getInstance(Key.get(Boolean.class, Names.named(DaoOptionKeys.DAO_ACTIVATED)));
+        DevEnv.setDaoActivated(isDaoActivatedOptionSet || isRegTestOrTestNet);
     }
 
     private void setCorruptedDataBaseFilesHandler() {

diff --git a/core/src/main/java/bisq/core/btc/BaseCurrencyNetwork.java b/core/src/main/java/bisq/core/btc/BaseCurrencyNetwork.java
@@ -67,6 +67,10 @@ public boolean isMainnet() {
         return "MAINNET".equals(network);
     }
 
+    public boolean isTestnet() {
+        return "TESTNET".equals(network);
+    }
+
     public boolean isRegtest() {
         return "REGTEST".equals(network);
     }

diff --git a/core/src/main/java/bisq/core/dao/node/parser/BlockParser.java b/core/src/main/java/bisq/core/dao/node/parser/BlockParser.java
@@ -122,7 +122,7 @@ public Block parseBlock(RawBlock rawBlock) throws BlockNotConnectingException {
     private void validateIfBlockIsConnecting(RawBlock rawBlock) throws BlockNotConnectingException {
         LinkedList<Block> blocks = bsqStateService.getBlocks();
         if (!isBlockConnecting(rawBlock, blocks)) {
-            final Block last = blocks.getLast();
+            Block last = blocks.getLast();
             log.warn("addBlock called with a not connecting block. New block:\n" +
                             "height()={}, hash()={}, lastBlock.height()={}, lastBlock.hash()={}",
                     rawBlock.getHeight(),

diff --git a/core/src/main/java/bisq/core/dao/state/GenesisTxInfo.java b/core/src/main/java/bisq/core/dao/state/GenesisTxInfo.java
@@ -17,6 +17,8 @@
 
 package bisq.core.dao.state;
 
+import bisq.core.app.BisqEnvironment;
+import bisq.core.btc.BaseCurrencyNetwork;
 import bisq.core.dao.DaoOptionKeys;
 
 import org.bitcoinj.core.Coin;
@@ -45,8 +47,11 @@ public class GenesisTxInfo {
 
     public static final Coin GENESIS_TOTAL_SUPPLY = Coin.parseCoin("2.5");
 
-    private static final String DEFAULT_GENESIS_TX_ID = "81855816eca165f17f0668898faa8724a105196e90ffc4993f4cac980176674e";
-    private static final int DEFAULT_GENESIS_BLOCK_HEIGHT = 524717; // 2018-05-27
+    private static final String MAINNET_GENESIS_TX_ID = "81855816eca165f17f0668898faa8724a105196e90ffc4993f4cac980176674e";
+    private static final int MAINNET_GENESIS_BLOCK_HEIGHT = 524717; // 2018-05-27
+
+    private static final String TESTNET_GENESIS_TX_ID = "7085539068b4fc27dfc6c39b0feae2adc7fe20f925e79ca0ba064725fe6c9991";
+    private static final int TESTNET_GENESIS_BLOCK_HEIGHT = 1414332; // 2018-09-25
 
 
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -60,14 +65,6 @@ public class GenesisTxInfo {
     @Getter
     private final int genesisBlockHeight;
 
-
-    //TODO not sure if we will use that
-  /*  private static final int ISSUANCE_MATURITY = 144 * 30; // 30 days
-
-    static int getIssuanceMaturity() {
-        return ISSUANCE_MATURITY;
-    }*/
-
     // mainnet
     // this tx has a lot of outputs
     // https://blockchain.info/de/tx/ee921650ab3f978881b8fe291e0c025e0da2b7dc684003d7a03d9649dfee2e15
@@ -85,15 +82,34 @@ static int getIssuanceMaturity() {
     // private static final String DEFAULT_GENESIS_TX_ID = "--";
     // private static final int DEFAULT_GENESIS_BLOCK_HEIGHT = 499000; // recursive test 137298, 499000 dec 2017
 
-
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Constructor
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
     public GenesisTxInfo(@Nullable @Named(DaoOptionKeys.GENESIS_TX_ID) String genesisTxId,
                          @Named(DaoOptionKeys.GENESIS_BLOCK_HEIGHT) int genesisBlockHeight) {
-        this.genesisTxId = genesisTxId != null ? genesisTxId : DEFAULT_GENESIS_TX_ID;
-        this.genesisBlockHeight = genesisBlockHeight != 0 ? genesisBlockHeight : DEFAULT_GENESIS_BLOCK_HEIGHT;
+        BaseCurrencyNetwork baseCurrencyNetwork = BisqEnvironment.getBaseCurrencyNetwork();
+        boolean isMainnet = baseCurrencyNetwork.isMainnet();
+        boolean isTestnet = baseCurrencyNetwork.isTestnet();
+        if (genesisTxId != null && !genesisTxId.isEmpty()) {
+            this.genesisTxId = genesisTxId;
+        } else if (isMainnet) {
+            this.genesisTxId = MAINNET_GENESIS_TX_ID;
+        } else if (isTestnet) {
+            this.genesisTxId = TESTNET_GENESIS_TX_ID;
+        } else {
+            this.genesisTxId = "genesisTxId is undefined";
+        }
+
+        if (genesisBlockHeight != 0) {
+            this.genesisBlockHeight = genesisBlockHeight;
+        } else if (isMainnet) {
+            this.genesisBlockHeight = MAINNET_GENESIS_BLOCK_HEIGHT;
+        } else if (isTestnet) {
+            this.genesisBlockHeight = TESTNET_GENESIS_BLOCK_HEIGHT;
+        } else {
+            this.genesisBlockHeight = 0;
+        }
     }
 }
diff --git a/core/src/main/java/bisq/core/dao/state/SnapshotManager.java b/core/src/main/java/bisq/core/dao/state/SnapshotManager.java
@@ -45,6 +45,7 @@ public class SnapshotManager implements BsqStateListener {
 
     private final BsqState bsqState;
     private final BsqStateService bsqStateService;
+    private final GenesisTxInfo genesisTxInfo;
     private final Storage<BsqState> storage;
 
     private BsqState snapshotCandidate;
@@ -53,9 +54,11 @@ public class SnapshotManager implements BsqStateListener {
     public SnapshotManager(BsqState bsqState,
                            BsqStateService bsqStateService,
                            PersistenceProtoResolver persistenceProtoResolver,
+                           GenesisTxInfo genesisTxInfo,
                            @Named(Storage.STORAGE_DIR) File storageDir) {
         this.bsqState = bsqState;
         this.bsqStateService = bsqStateService;
+        this.genesisTxInfo = genesisTxInfo;
         storage = new Storage<>(storageDir, persistenceProtoResolver);
 
         this.bsqStateService.addBsqStateListener(this);
@@ -80,7 +83,8 @@ public void onParseTxsComplete(Block block) {
             if (snapshotCandidate != null) {
                 // We clone because storage is in a threaded context
                 final BsqState cloned = bsqState.getClone(snapshotCandidate);
-                storage.queueUpForSave(cloned);
+                if (cloned.getBlocks().getLast().getHeight() >= genesisTxInfo.getGenesisBlockHeight())
+                    storage.queueUpForSave(cloned);
                 log.info("Saved snapshotCandidate to Disc at height " + chainHeadHeight);
             }
             // Now we clone and keep it in memory for the next trigger
@@ -104,7 +108,8 @@ public void applySnapshot() {
         BsqState persisted = storage.initAndGetPersisted(bsqState, 100);
         if (persisted != null) {
             log.info("applySnapshot persisted.chainHeadHeight=" + new LinkedList<>(persisted.getBlocks()).getLast().getHeight());
-            bsqStateService.applySnapshot(persisted);
+            if (persisted.getBlocks().getLast().getHeight() >= genesisTxInfo.getGenesisBlockHeight())
+                bsqStateService.applySnapshot(persisted);
         } else {
             log.info("Try to apply snapshot but no stored snapshot available");
         }

diff --git a/core/src/main/java/bisq/core/dao/state/period/CycleService.java b/core/src/main/java/bisq/core/dao/state/period/CycleService.java
@@ -17,17 +17,15 @@
 
 package bisq.core.dao.state.period;
 
-import bisq.core.dao.DaoOptionKeys;
 import bisq.core.dao.DaoSetupService;
 import bisq.core.dao.state.BsqStateListener;
 import bisq.core.dao.state.BsqStateService;
+import bisq.core.dao.state.GenesisTxInfo;
 import bisq.core.dao.state.blockchain.Block;
 import bisq.core.dao.state.governance.Param;
 
 import com.google.inject.Inject;
 
-import javax.inject.Named;
-
 import com.google.common.collect.ImmutableList;
 
 import java.util.Arrays;
@@ -51,9 +49,9 @@ public class CycleService implements BsqStateListener, DaoSetupService {
 
     @Inject
     public CycleService(BsqStateService bsqStateService,
-                        @Named(DaoOptionKeys.GENESIS_BLOCK_HEIGHT) int genesisBlockHeight) {
+                        GenesisTxInfo genesisTxInfo) {
         this.bsqStateService = bsqStateService;
-        this.genesisBlockHeight = genesisBlockHeight;
+        this.genesisBlockHeight = genesisTxInfo.getGenesisBlockHeight();
     }
 
 

diff --git a/core/src/main/java/bisq/core/network/p2p/seed/DefaultSeedNodeAddresses.java b/core/src/main/java/bisq/core/network/p2p/seed/DefaultSeedNodeAddresses.java
@@ -79,8 +79,9 @@ class DefaultSeedNodeAddresses {
             // new NodeAddress("uqxi3zrpobhtoes6.onion:8000"),
 
             // BTC testnet
-            new NodeAddress("nbphlanpgbei4okt.onion:8001"),
-            // new NodeAddress("vjkh4ykq7x5skdlt.onion:8001"), // dev test
+            new NodeAddress("nbphlanpgbei4okt.onion:8001"), // 88.99.216.98
+            new NodeAddress("o5qw2hy6l7jsf654.onion:8001"), // explorer node
+            new NodeAddress("vjkh4ykq7x5skdlt.onion:8001"), // local dev test
 
             // BTC regtest
             // For development you need to change that to your local onion addresses

diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties
@@ -854,7 +854,7 @@ setting.preferences.resetAllFlags=Reset all \"Don't show again\" flags:
 setting.preferences.reset=Reset
 settings.preferences.languageChange=To apply the language change to all screens requires a restart.
 settings.preferences.arbitrationLanguageWarning=In case of a dispute, please note that arbitration is handled in {0}.
-settings.preferences.selectCurrencyNetwork=Select base currency
+settings.preferences.selectCurrencyNetwork=Select network
 
 settings.net.btcHeader=Bitcoin network
 settings.net.p2pHeader=P2P network

diff --git a/core/src/test/java/bisq/core/dao/state/SnapshotManagerTest.java b/core/src/test/java/bisq/core/dao/state/SnapshotManagerTest.java
@@ -46,6 +46,7 @@ public void setup() {
         snapshotManager = new SnapshotManager(mock(BsqState.class),
                 mock(BsqStateService.class),
                 mock(PersistenceProtoResolver.class),
+                mock(GenesisTxInfo.class),
                 mock(File.class));
     }
 

diff --git a/desktop/src/main/java/bisq/desktop/app/BisqApp.java b/desktop/src/main/java/bisq/desktop/app/BisqApp.java
@@ -17,7 +17,6 @@
 
 package bisq.desktop.app;
 
-import bisq.desktop.SystemTray;
 import bisq.desktop.common.view.CachingViewLoader;
 import bisq.desktop.common.view.View;
 import bisq.desktop.common.view.ViewLoader;
@@ -35,6 +34,7 @@
 import bisq.core.alert.AlertManager;
 import bisq.core.app.AppOptionKeys;
 import bisq.core.app.AvoidStandbyMode;
+import bisq.core.app.BisqEnvironment;
 import bisq.core.btc.wallet.BtcWalletService;
 import bisq.core.btc.wallet.WalletsManager;
 import bisq.core.filter.FilterManager;
@@ -219,6 +219,10 @@ private void setupStage(Scene scene) {
 
         // 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]";
         stage.setTitle(appName);
         stage.setScene(scene);
         stage.setMinWidth(1020);

diff --git a/...rc/main/java/bisq/desktop/SystemTray.java → ...ain/java/bisq/desktop/app/SystemTray.java b/...rc/main/java/bisq/desktop/SystemTray.java → ...ain/java/bisq/desktop/app/SystemTray.java
@@ -15,7 +15,7 @@
  * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.desktop;
+package bisq.desktop.app;
 
 import bisq.desktop.util.GUIUtil;
 import bisq.desktop.util.ImageUtil;

diff --git a/desktop/src/main/java/bisq/desktop/main/dao/governance/result/CycleListItem.java b/desktop/src/main/java/bisq/desktop/main/dao/governance/result/CycleListItem.java
@@ -47,7 +47,8 @@ public class CycleListItem {
 
     public String getCycle() {
         int displayIndex = resultsOfCycle.getCycleIndex() + 1;
-        String dateTime = bsqFormatter.formatDateTime(new Date(resultsOfCycle.getCycleStartTime()));
+        long cycleStartTime = resultsOfCycle.getCycleStartTime();
+        String dateTime = cycleStartTime > 0 ? bsqFormatter.formatDateTime(new Date(cycleStartTime)) : Res.get("shared.na");
         return Res.get("dao.results.results.table.item.cycle", displayIndex, dateTime);
     }