Add irregular txType, add check for total balance, prevent proposal withhold attack

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 {

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())

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))

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(() -> {

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() {

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;
         }
 

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;

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,19 @@ public long getTotalAmountOfConfiscatedTxOutputs() {
         return daoStateService.getTotalAmountOfConfiscatedTxOutputs();
     }
 
+    public long getBurnedBsqOfAllInvalidTxs() {
+        return daoStateService.getBurnedBsqOfAllInvalidTxs();
+    }
+
+    public List<Tx> getInvalidTxs() {
+        return daoStateService.getInvalidTxs();
+    }
+
+    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);
     }

core/src/main/java/bisq/core/dao/governance/blindvote/network/RepublishGovernanceDataHandler.java

@@ -92,7 +92,8 @@ public void sendRepublishRequest() {
     private void sendRepublishRequest(NodeAddress nodeAddress) {
         RepublishGovernanceDataRequest republishGovernanceDataRequest = new RepublishGovernanceDataRequest();
         if (timeoutTimer == null) {
-            timeoutTimer = UserThread.runAfter(() -> {  // setup before sending to avoid race conditions
+            timeoutTimer = UserThread.runAfter(() -> {
+                        // setup before sending to avoid race conditions
                         if (!stopped) {
                             String errorMessage = "A timeout occurred at sending republishGovernanceDataRequest:" +
                                     " to nodeAddress:" + nodeAddress;

core/src/main/java/bisq/core/dao/governance/merit/MeritConsensus.java

@@ -54,28 +54,27 @@ public static MeritList decryptMeritList(byte[] encryptedMeritList, SecretKey se
     }
 
     public static long getMeritStake(String blindVoteTxId, MeritList meritList, DaoStateService daoStateService) {
-        int txChainHeight = daoStateService.getTx(blindVoteTxId).map(Tx::getBlockHeight).orElse(0);
-        return getMeritStake(blindVoteTxId, meritList, txChainHeight);
-    }
-
-    private static long getMeritStake(String blindVoteTxId, MeritList meritList, int txChainHeight) {
         // We need to take the chain height when the blindVoteTx got published so we get the same merit for the vote even at
         // later blocks (merit decreases with each block).
-        if (txChainHeight == 0) {
+        int blindVoteTxHeight = daoStateService.getTx(blindVoteTxId).map(Tx::getBlockHeight).orElse(0);
+        if (blindVoteTxHeight == 0) {
             log.error("Error at getMeritStake: blindVoteTx not found in daoStateService. blindVoteTxId=" + blindVoteTxId);
             return 0;
         }
 
+        // We only use past issuance. In case we would calculate the merit after the vote result phase we have the
+        // issuance from the same cycle but we must not add that to the merit.
         return meritList.getList().stream()
                 .filter(merit -> isSignatureValid(merit.getSignature(), merit.getIssuance().getPubKey(), blindVoteTxId))
+                .filter(merit -> merit.getIssuance().getChainHeight() <= blindVoteTxHeight)
                 .mapToLong(merit -> {
                     try {
                         Issuance issuance = merit.getIssuance();
                         checkArgument(issuance.getIssuanceType() == IssuanceType.COMPENSATION,
                                 "issuance must be of type COMPENSATION");
                         return getWeightedMeritAmount(issuance.getAmount(),
                                 issuance.getChainHeight(),
-                                txChainHeight,
+                                blindVoteTxHeight,
                                 BLOCKS_PER_YEAR);
                     } catch (Throwable t) {
                         log.error("Error at getMeritStake: error={}, merit={}", t.toString(), merit);
@@ -145,17 +144,20 @@ public static long getWeightedMeritAmount(long amount, int issuanceHeight, int b
     public static long getCurrentlyAvailableMerit(MeritList meritList, int currentChainHeight) {
         // We need to take the chain height when the blindVoteTx got published so we get the same merit for the vote even at
         // later blocks (merit decreases with each block).
+        // We add 1 block to currentChainHeight so that the displayed merit would match the merit in case we get the
+        // blind vote tx into the next block.
+        int height = currentChainHeight + 1;
         return meritList.getList().stream()
                 .mapToLong(merit -> {
                     try {
                         Issuance issuance = merit.getIssuance();
                         checkArgument(issuance.getIssuanceType() == IssuanceType.COMPENSATION, "issuance must be of type COMPENSATION");
                         int issuanceHeight = issuance.getChainHeight();
-                        checkArgument(issuanceHeight <= currentChainHeight,
+                        checkArgument(issuanceHeight <= height,
                                 "issuanceHeight must not be larger as currentChainHeight");
                         return getWeightedMeritAmount(issuance.getAmount(),
                                 issuanceHeight,
-                                currentChainHeight,
+                                height,
                                 BLOCKS_PER_YEAR);
                     } catch (Throwable t) {
                         log.error("Error at getCurrentlyAvailableMerit: " + t.toString());

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); 0.93 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); 0.93 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); 0.93 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

core/src/main/java/bisq/core/dao/governance/proposal/ProposalService.java

@@ -41,6 +41,8 @@
 import bisq.network.p2p.storage.persistence.AppendOnlyDataStoreService;
 import bisq.network.p2p.storage.persistence.ProtectedDataStoreService;
 
+import bisq.common.UserThread;
+
 import org.bitcoinj.core.Coin;
 
 import com.google.inject.Inject;
@@ -52,6 +54,7 @@
 
 import java.util.List;
 import java.util.Optional;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 import lombok.Getter;
@@ -219,12 +222,14 @@ private void publishToAppendOnlyDataStore() {
                 .filter(proposal -> validatorProvider.getValidator(proposal).isValidAndConfirmed(proposal))
                 .map(ProposalPayload::new)
                 .forEach(proposalPayload -> {
-                    boolean success = p2PService.addPersistableNetworkPayload(proposalPayload, true);
-                    if (success)
-                        log.info("We published a ProposalPayload to the P2P network as append-only data. proposalTxId={}",
-                                proposalPayload.getProposal().getTxId());
-                    else
-                        log.warn("publishToAppendOnlyDataStore failed for proposal " + proposalPayload.getProposal());
+                    UserThread.runAfterRandomDelay(() -> {
+                        boolean success = p2PService.addPersistableNetworkPayload(proposalPayload, true);
+                        if (success)
+                            log.info("We published a ProposalPayload to the P2P network as append-only data. proposalTxId={}",
+                                    proposalPayload.getProposal().getTxId());
+                        else
+                            log.warn("publishToAppendOnlyDataStore failed for proposal " + proposalPayload.getProposal());
+                    }, 100, 5000, TimeUnit.MILLISECONDS);
                 });
     }
 

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);
         }