bisq-network · ManfredKarrer · Mar 31, 2019 · Mar 26, 2019 · Mar 26, 2019 · Mar 26, 2019
diff --git a/common/src/main/proto/pb.proto b/common/src/main/proto/pb.proto
@@ -1440,6 +1440,7 @@ enum TxType {
     UNLOCK = 13;
     ASSET_LISTING_FEE = 14;
     PROOF_OF_BURN = 15;
+    IRREGULAR = 16;
 }
 
 message TxInput {

diff --git a/core/src/main/java/bisq/core/app/BisqEnvironment.java b/core/src/main/java/bisq/core/app/BisqEnvironment.java
@@ -361,9 +361,14 @@ public BisqEnvironment(PropertySource commandLineProperties) {
             final String bannedBtcNodesAsString = getProperty(FilterManager.BANNED_BTC_NODES, "");
             bannedBtcNodes = !bannedBtcNodesAsString.isEmpty() ? Arrays.asList(StringUtils.deleteWhitespace(bannedBtcNodesAsString).split(",")) : null;
 
-            baseCurrencyNetwork = BaseCurrencyNetwork.valueOf(getProperty(BtcOptionKeys.BASE_CURRENCY_NETWORK,
-                    getDefaultBaseCurrencyNetwork().name()).toUpperCase());
-
+            try {
+                // We replaced DAO_TESTNET with DAO_REGTEST. If user had DAO_TESTNET in his property file we
+                // get an exception and set the baseCurrencyNetwork to BTC_DAO_REGTEST
+                baseCurrencyNetwork = BaseCurrencyNetwork.valueOf(getProperty(BtcOptionKeys.BASE_CURRENCY_NETWORK,
+                        getDefaultBaseCurrencyNetwork().name()).toUpperCase());
+            } catch (Throwable t) {
+                baseCurrencyNetwork = BaseCurrencyNetwork.BTC_DAO_REGTEST;
+            }
             btcNetworkDir = Paths.get(appDataDir, baseCurrencyNetwork.name().toLowerCase()).toString();
             File btcNetworkDirFile = new File(btcNetworkDir);
             if (!btcNetworkDirFile.exists())

diff --git a/core/src/main/java/bisq/core/app/BisqExecutable.java b/core/src/main/java/bisq/core/app/BisqExecutable.java
@@ -494,7 +494,7 @@ protected void customizeOptionParsing(OptionParser parser) {
                 format("Base currency network (default: %s)", BisqEnvironment.getDefaultBaseCurrencyNetwork().name()))
                 .withRequiredArg()
                 .ofType(String.class)
-                .describedAs(format("%s|%s|%s|%s", BTC_MAINNET, BTC_TESTNET, BTC_REGTEST, BTC_DAO_TESTNET, BTC_DAO_BETANET));
+                .describedAs(format("%s|%s|%s|%s", BTC_MAINNET, BTC_TESTNET, BTC_REGTEST, BTC_DAO_REGTEST, BTC_DAO_BETANET));
 
         parser.accepts(BtcOptionKeys.REG_TEST_HOST,
                 format("Bitcoin regtest host when using BTC_REGTEST network (default: %s)", RegTestHost.DEFAULT_HOST))

diff --git a/core/src/main/java/bisq/core/app/BisqSetup.java b/core/src/main/java/bisq/core/app/BisqSetup.java
@@ -418,7 +418,7 @@ private void maybeShowTac() {
 
     private void checkIfLocalHostNodeIsRunning() {
         // For DAO testnet we ignore local btc node
-        if (BisqEnvironment.getBaseCurrencyNetwork().isDaoTestNet()) {
+        if (BisqEnvironment.getBaseCurrencyNetwork().isDaoRegTest()) {
             step3();
         } else {
             Thread checkIfLocalHostNodeIsRunningThread = new Thread(() -> {

diff --git a/core/src/main/java/bisq/core/btc/BaseCurrencyNetwork.java b/core/src/main/java/bisq/core/btc/BaseCurrencyNetwork.java
@@ -28,7 +28,7 @@ public enum BaseCurrencyNetwork {
     BTC_MAINNET(MainNetParams.get(), "BTC", "MAINNET", "Bitcoin"),
     BTC_TESTNET(TestNet3Params.get(), "BTC", "TESTNET", "Bitcoin"),
     BTC_REGTEST(RegTestParams.get(), "BTC", "REGTEST", "Bitcoin"),
-    BTC_DAO_TESTNET(RegTestParams.get(), "BTC", "REGTEST", "Bitcoin"), // server side regtest
+    BTC_DAO_REGTEST(RegTestParams.get(), "BTC", "REGTEST", "Bitcoin"), // server side regtest
     BTC_DAO_BETANET(MainNetParams.get(), "BTC", "MAINNET", "Bitcoin"); // mainnet test genesis
 
     @Getter
@@ -55,8 +55,8 @@ public boolean isTestnet() {
         return "BTC_TESTNET".equals(name());
     }
 
-    public boolean isDaoTestNet() {
-        return "BTC_DAO_TESTNET".equals(name());
+    public boolean isDaoRegTest() {
+        return "BTC_DAO_REGTEST".equals(name());
     }
 
     public boolean isDaoBetaNet() {

diff --git a/core/src/main/java/bisq/core/btc/BitcoinModule.java b/core/src/main/java/bisq/core/btc/BitcoinModule.java
@@ -54,12 +54,12 @@ public BitcoinModule(Environment environment) {
 
     @Override
     protected void configure() {
-        // We we have selected BTC_DAO_TESTNET we use our master regtest node, otherwise the specified host or default
+        // We we have selected BTC_DAO_REGTEST we use our master regtest node, otherwise the specified host or default
         // (localhost)
         String regTestHost = environment.getProperty(BtcOptionKeys.REG_TEST_HOST, String.class, "");
         if (regTestHost.isEmpty()) {
-            regTestHost = BisqEnvironment.getBaseCurrencyNetwork().isDaoTestNet() ?
-                    "104.248.31.39" :
+            regTestHost = BisqEnvironment.getBaseCurrencyNetwork().isDaoRegTest() ?
+                    "134.209.242.206" :
                     RegTestHost.DEFAULT_HOST;
         }
 

diff --git a/core/src/main/java/bisq/core/btc/setup/WalletConfig.java b/core/src/main/java/bisq/core/btc/setup/WalletConfig.java
@@ -235,7 +235,7 @@ private PeerGroup createPeerGroup() {
 
         // For dao testnet (server side regtest) we prevent to connect to a localhost node to avoid confusion
         // if local btc node is not synced with our dao testnet master node.
-        if (BisqEnvironment.getBaseCurrencyNetwork().isDaoTestNet())
+        if (BisqEnvironment.getBaseCurrencyNetwork().isDaoRegTest())
             peerGroup.setUseLocalhostPeerWhenPossible(false);
 
         return peerGroup;

diff --git a/core/src/main/java/bisq/core/dao/DaoFacade.java b/core/src/main/java/bisq/core/dao/DaoFacade.java
@@ -56,6 +56,7 @@
 import bisq.core.dao.state.DaoStateService;
 import bisq.core.dao.state.DaoStateStorageService;
 import bisq.core.dao.state.model.blockchain.BaseTx;
+import bisq.core.dao.state.model.blockchain.BaseTxOutput;
 import bisq.core.dao.state.model.blockchain.Block;
 import bisq.core.dao.state.model.blockchain.Tx;
 import bisq.core.dao.state.model.blockchain.TxOutput;
@@ -543,6 +544,11 @@ public long getTotalAmountOfConfiscatedTxOutputs() {
         return daoStateService.getTotalAmountOfConfiscatedTxOutputs();
     }
 
+    public long getTotalAmountOfUnspentTxOutputs() {
+        // Does not consider confiscated outputs (they stay as utxo)
+        return daoStateService.getUnspentTxOutputMap().values().stream().mapToLong(BaseTxOutput::getValue).sum();
+    }
+
     public Optional<Integer> getLockTime(String txId) {
         return daoStateService.getLockTime(txId);
     }

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
@@ -142,55 +142,55 @@ public enum Param {
                     "4" :       // regtest
                     BisqEnvironment.getBaseCurrencyNetwork().isDaoBetaNet() ?
                             "144" :       // daoBetaNet; 1 day
-                            "380",      // testnet or dao testnet (server side regtest); 2.6 days
+                            "134",      // testnet or dao regtest (server side regtest); 2.6 days
             ParamType.BLOCK, 2, 2),
     PHASE_BREAK1(BisqEnvironment.getBaseCurrencyNetwork().isMainnet() ?
             "149" :     // mainnet; 1 day
             BisqEnvironment.getBaseCurrencyNetwork().isRegtest() ?
                     "1" :       // regtest
                     BisqEnvironment.getBaseCurrencyNetwork().isDaoBetaNet() ?
                             "10" :       // daoBetaNet
-                            "10",       // testnet or dao testnet (server side regtest)
+                            "10",       // testnet or dao regtest (server side regtest)
             ParamType.BLOCK, 2, 2),
     PHASE_BLIND_VOTE(BisqEnvironment.getBaseCurrencyNetwork().isMainnet() ?
             "451" :     // mainnet; 3 days
             BisqEnvironment.getBaseCurrencyNetwork().isRegtest() ?
                     "2" :       // regtest
                     BisqEnvironment.getBaseCurrencyNetwork().isDaoBetaNet() ?
                             "144" :       // daoBetaNet; 1 day
-                            "300",      // testnet or dao testnet (server side regtest); 2 days
+                            "134",      // testnet or dao regtest (server side regtest); 2 days
             ParamType.BLOCK, 2, 2),
     PHASE_BREAK2(BisqEnvironment.getBaseCurrencyNetwork().isMainnet() ?
             "9" :       // mainnet
             BisqEnvironment.getBaseCurrencyNetwork().isRegtest() ?
                     "1" :       // regtest
                     BisqEnvironment.getBaseCurrencyNetwork().isDaoBetaNet() ?
                             "10" :       // daoBetaNet
-                            "10",       // testnet or dao testnet (server side regtest)
+                            "10",       // testnet or dao regtest (server side regtest)
             ParamType.BLOCK, 2, 2),
     PHASE_VOTE_REVEAL(BisqEnvironment.getBaseCurrencyNetwork().isMainnet() ?
             "451" :     // mainnet; 3 days
             BisqEnvironment.getBaseCurrencyNetwork().isRegtest() ?
                     "2" :       // regtest
                     BisqEnvironment.getBaseCurrencyNetwork().isDaoBetaNet() ?
                             "144" :       // daoBetaNet; 1 day
-                            "300",      // testnet or dao testnet (server side regtest); 2 days
+                            "132",      // testnet or dao regtest (server side regtest); 2 days
             ParamType.BLOCK, 2, 2),
     PHASE_BREAK3(BisqEnvironment.getBaseCurrencyNetwork().isMainnet() ?
             "9" :       // mainnet
             BisqEnvironment.getBaseCurrencyNetwork().isRegtest() ?
                     "1" :       // regtest
                     BisqEnvironment.getBaseCurrencyNetwork().isDaoBetaNet() ?
                             "10" :       // daoBetaNet
-                            "10",       // testnet or dao testnet (server side regtest)
+                            "10",       // testnet or dao regtest (server side regtest)
             ParamType.BLOCK, 2, 2),
     PHASE_RESULT(BisqEnvironment.getBaseCurrencyNetwork().isMainnet() ?
             "10" :      // mainnet
             BisqEnvironment.getBaseCurrencyNetwork().isRegtest() ?
                     "2" :       // regtest
                     BisqEnvironment.getBaseCurrencyNetwork().isDaoBetaNet() ?
                             "10" :       // daoBetaNet
-                            "2",        // testnet or dao testnet (server side regtest)
+                            "2",        // testnet or dao regtest (server side regtest)
             ParamType.BLOCK, 2, 2);
 
     @Getter

diff --git a/core/src/main/java/bisq/core/dao/governance/voteresult/VoteResultConsensus.java b/core/src/main/java/bisq/core/dao/governance/voteresult/VoteResultConsensus.java
@@ -109,10 +109,15 @@ public static TxOutput getConnectedBlindVoteStakeOutput(Tx voteRevealTx, DaoStat
             Optional<TxOutput> optionalBlindVoteStakeOutput = daoStateService.getConnectedTxOutput(stakeTxInput);
             checkArgument(optionalBlindVoteStakeOutput.isPresent(), "blindVoteStakeOutput must be present");
             TxOutput blindVoteStakeOutput = optionalBlindVoteStakeOutput.get();
-            checkArgument(blindVoteStakeOutput.getTxOutputType() == TxOutputType.BLIND_VOTE_LOCK_STAKE_OUTPUT,
-                    "blindVoteStakeOutput must be of type BLIND_VOTE_LOCK_STAKE_OUTPUT but is " +
-                            blindVoteStakeOutput.getTxOutputType() + ". VoteRevealTx=" + voteRevealTx);
+            if (blindVoteStakeOutput.getTxOutputType() != TxOutputType.BLIND_VOTE_LOCK_STAKE_OUTPUT) {
+                String message = "blindVoteStakeOutput must be of type BLIND_VOTE_LOCK_STAKE_OUTPUT but is " +
+                        blindVoteStakeOutput.getTxOutputType();
+                log.warn(message + ". VoteRevealTx=" + voteRevealTx);
+                throw new VoteResultException.ValidationException(message + ". VoteRevealTxId=" + voteRevealTx.getId());
+            }
             return blindVoteStakeOutput;
+        } catch (VoteResultException.ValidationException t) {
+            throw t;
         } catch (Throwable t) {
             throw new VoteResultException.ValidationException(t);
         }

diff --git a/core/src/main/java/bisq/core/dao/governance/votereveal/VoteRevealService.java b/core/src/main/java/bisq/core/dao/governance/votereveal/VoteRevealService.java
@@ -179,8 +179,11 @@ private void maybeRevealVotes(int chainHeight) {
                 .filter(myVote -> myVote.getRevealTxId() == null) // we have not already revealed
                 .forEach(myVote -> {
                     boolean isInVoteRevealPhase = periodService.getPhaseForHeight(chainHeight) == DaoPhase.Phase.VOTE_REVEAL;
+                    // If we would create the tx in the last block it would be confirmed in the best case in th next
+                    // block which would be already the break and would invalidate the vote reveal.
+                    boolean isLastBlockInPhase = chainHeight == periodService.getLastBlockOfPhase(chainHeight, DaoPhase.Phase.VOTE_REVEAL);
                     boolean isBlindVoteTxInCorrectPhaseAndCycle = periodService.isTxInPhaseAndCycle(myVote.getTxId(), DaoPhase.Phase.BLIND_VOTE, chainHeight);
-                    if (isInVoteRevealPhase && isBlindVoteTxInCorrectPhaseAndCycle) {
+                    if (isInVoteRevealPhase && !isLastBlockInPhase && isBlindVoteTxInCorrectPhaseAndCycle) {
                         log.info("We call revealVote at blockHeight {} for blindVoteTxId {}", chainHeight, myVote.getTxId());
                         // Standard case that we are in the correct phase and cycle and create the reveal tx.
                         revealVote(myVote, true);

diff --git a/core/src/main/java/bisq/core/dao/monitoring/DaoStateMonitoringService.java b/core/src/main/java/bisq/core/dao/monitoring/DaoStateMonitoringService.java
@@ -26,7 +26,9 @@
 import bisq.core.dao.state.DaoStateListener;
 import bisq.core.dao.state.DaoStateService;
 import bisq.core.dao.state.GenesisTxInfo;
+import bisq.core.dao.state.model.blockchain.BaseTxOutput;
 import bisq.core.dao.state.model.blockchain.Block;
+import bisq.core.dao.state.model.governance.IssuanceType;
 
 import bisq.network.p2p.NodeAddress;
 import bisq.network.p2p.network.Connection;
@@ -134,6 +136,22 @@ public void onParseBlockChainComplete() {
         daoStateNetworkService.requestHashesFromAllConnectedSeedNodes(fromHeight);
     }
 
+    @Override
+    public void onDaoStateChanged(Block block) {
+        long genesisTotalSupply = daoStateService.getGenesisTotalSupply().value;
+        long totalBurntFee = daoStateService.getTotalBurntFee();
+        long compensationIssuance = daoStateService.getTotalIssuedAmount(IssuanceType.COMPENSATION);
+        long reimbursementIssuance = daoStateService.getTotalIssuedAmount(IssuanceType.REIMBURSEMENT);
+        long totalConfiscatedAmount = daoStateService.getTotalAmountOfConfiscatedTxOutputs();
+        // confiscated funds are still in the utxo set
+        long sumUtxo = daoStateService.getUnspentTxOutputMap().values().stream().mapToLong(BaseTxOutput::getValue).sum();
+        long sumBsq = genesisTotalSupply + compensationIssuance + reimbursementIssuance - totalBurntFee;
+
+        if (sumBsq != sumUtxo) {
+            throw new RuntimeException("There is a mismatch between the UTXO set and the DAO state. Please contact the Bisq devlopers.");
+        }
+    }
+
     ///////////////////////////////////////////////////////////////////////////////////////////
     // StateNetworkService.Listener
     ///////////////////////////////////////////////////////////////////////////////////////////

diff --git a/core/src/main/java/bisq/core/dao/node/explorer/JsonTxType.java b/core/src/main/java/bisq/core/dao/node/explorer/JsonTxType.java
@@ -36,7 +36,8 @@ enum JsonTxType {
     LOCKUP("Lockup"),
     UNLOCK("Unlock"),
     ASSET_LISTING_FEE("Asset listing fee"),
-    PROOF_OF_BURN("Proof of burn");
+    PROOF_OF_BURN("Proof of burn"),
+    IRREGULAR("Irregular");
 
     @Getter
     private String displayString;

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
@@ -99,7 +99,7 @@ public RpcService(Preferences preferences,
         boolean isPortSet = rpcPort != null && !rpcPort.isEmpty();
         boolean isMainnet = BisqEnvironment.getBaseCurrencyNetwork().isMainnet();
         boolean isTestnet = BisqEnvironment.getBaseCurrencyNetwork().isTestnet();
-        boolean isDaoTestNet = BisqEnvironment.getBaseCurrencyNetwork().isDaoTestNet();
+        boolean isDaoTestNet = BisqEnvironment.getBaseCurrencyNetwork().isDaoRegTest();
         boolean isDaoBetaNet = BisqEnvironment.getBaseCurrencyNetwork().isDaoBetaNet();
         this.rpcPort = isPortSet ? rpcPort :
                 isMainnet || isDaoBetaNet ? "8332" :