Dao fix majorityvote issue

common/src/main/java/bisq/common/util/PermutationUtil.java

@@ -53,6 +53,8 @@ public static <T> List<T> getPartialList(List<T> list, List<Integer> indicesToRe
         return altered;
     }
 
+    //TODO optimize algorithm so that it starts from all objects and goes down instead starting with from the bottom.
+    // That should help that we are not hitting the iteration limit so easily.
     /**
      * Returns a list of all possible permutations of a give sorted list ignoring duplicates.
      * E.g. List [A,B,C] results in this list of permutations: [[A], [B], [A,B], [C], [A,C], [B,C], [A,B,C]]

core/src/main/java/bisq/core/btc/wallet/BsqWalletService.java

@@ -182,20 +182,12 @@ public void onWalletChanged(Wallet wallet) {
     // DaoStateListener
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    @Override
-    public void onNewBlockHeight(int blockHeight) {
-    }
-
     @Override
     public void onParseTxsCompleteAfterBatchProcessing(Block block) {
         if (isWalletReady())
             updateBsqWalletTransactions();
     }
 
-    @Override
-    public void onParseBlockChainComplete() {
-    }
-
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Overridden Methods

core/src/main/java/bisq/core/dao/DaoFacade.java

@@ -186,10 +186,6 @@ public void onNewBlockHeight(int blockHeight) {
                 if (blockHeight > 0 && periodService.getCurrentCycle() != null)
                     periodService.getCurrentCycle().getPhaseForHeight(blockHeight).ifPresent(phaseProperty::set);
             }
-
-            @Override
-            public void onParseBlockChainComplete() {
-            }
         });
     }
 

core/src/main/java/bisq/core/dao/governance/asset/AssetService.java

@@ -270,10 +270,6 @@ private List<Tx> getFeeTxs(StatefulAsset statefulAsset) {
     // DaoStateListener
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    @Override
-    public void onNewBlockHeight(int blockHeight) {
-    }
-
     @Override
     public void onParseTxsCompleteAfterBatchProcessing(Block block) {
         int chainHeight = daoStateService.getChainHeight();
@@ -283,10 +279,6 @@ public void onParseTxsCompleteAfterBatchProcessing(Block block) {
 
     }
 
-    @Override
-    public void onParseBlockChainComplete() {
-    }
-
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // API

core/src/main/java/bisq/core/dao/governance/ballot/BallotListPresentation.java

@@ -74,6 +74,7 @@ public BallotListPresentation(BallotListService ballotListService,
 
     @Override
     public void onNewBlockHeight(int blockHeight) {
+        //TODO should it be in onParseTxsComplete?
         ballotsOfCycle.setPredicate(ballot -> periodService.isTxInCorrectCycle(ballot.getTxId(), blockHeight));
     }
 
@@ -82,12 +83,6 @@ public void onParseTxsCompleteAfterBatchProcessing(Block block) {
         onListChanged(ballotListService.getValidatedBallotList());
     }
 
-    @Override
-    public void onParseBlockChainComplete() {
-        // As we update the list in ProposalService.onParseBlockChainComplete we need to update here as well.
-        onListChanged(ballotListService.getValidatedBallotList());
-    }
-
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // BallotListService.BallotListChangeListener

core/src/main/java/bisq/core/dao/governance/blindvote/BlindVoteListService.java

@@ -93,10 +93,6 @@ public void start() {
     // DaoStateListener
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    @Override
-    public void onNewBlockHeight(int blockHeight) {
-    }
-
     @Override
     public void onParseBlockChainComplete() {
         fillListFromAppendOnlyDataStore();

core/src/main/java/bisq/core/dao/governance/blindvote/MyBlindVoteListService.java

@@ -170,10 +170,6 @@ public void readPersisted() {
     // DaoStateListener
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    @Override
-    public void onNewBlockHeight(int blockHeight) {
-    }
-
     @Override
     public void onParseBlockChainComplete() {
         rePublishOnceWellConnected();

core/src/main/java/bisq/core/dao/governance/bond/BondRepository.java

@@ -156,18 +156,10 @@ public BondRepository(DaoStateService daoStateService, BsqWalletService bsqWalle
     @Override
     public void addListeners() {
         daoStateService.addBsqStateListener(new DaoStateListener() {
-            @Override
-            public void onNewBlockHeight(int blockHeight) {
-            }
-
             @Override
             public void onParseTxsCompleteAfterBatchProcessing(Block block) {
                 update();
             }
-
-            @Override
-            public void onParseBlockChainComplete() {
-            }
         });
         bsqWalletService.getWalletTransactions().addListener((ListChangeListener<Transaction>) c -> update());
     }

core/src/main/java/bisq/core/dao/governance/bond/reputation/MyBondedReputationRepository.java

@@ -80,18 +80,10 @@ public MyBondedReputationRepository(DaoStateService daoStateService,
     @Override
     public void addListeners() {
         daoStateService.addBsqStateListener(new DaoStateListener() {
-            @Override
-            public void onNewBlockHeight(int blockHeight) {
-            }
-
             @Override
             public void onParseTxsCompleteAfterBatchProcessing(Block block) {
                 update();
             }
-
-            @Override
-            public void onParseBlockChainComplete() {
-            }
         });
         bsqWalletService.getWalletTransactions().addListener((ListChangeListener<Transaction>) c -> update());
     }

core/src/main/java/bisq/core/dao/governance/period/CycleService.java

@@ -82,10 +82,6 @@ public void onNewBlockHeight(int blockHeight) {
                     .ifPresent(daoStateService.getCycles()::add);
     }
 
-    @Override
-    public void onParseBlockChainComplete() {
-    }
-
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // API

core/src/main/java/bisq/core/dao/governance/proofofburn/ProofOfBurnService.java

@@ -120,19 +120,11 @@ public void updateList() {
     // DaoStateListener
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    @Override
-    public void onNewBlockHeight(int blockHeight) {
-    }
-
     @Override
     public void onParseTxsCompleteAfterBatchProcessing(Block block) {
         updateList();
     }
 
-    @Override
-    public void onParseBlockChainComplete() {
-    }
-
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // API

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

@@ -120,10 +120,6 @@ public void readPersisted() {
     // DaoStateListener
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    @Override
-    public void onNewBlockHeight(int blockHeight) {
-    }
-
     @Override
     public void onParseBlockChainComplete() {
         rePublishOnceWellConnected();

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

@@ -90,20 +90,11 @@ public ProposalListPresentation(ProposalService proposalService,
     // DaoStateListener
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    // At new cycle we don't get a list change but we want to update our predicates
-    @Override
-    public void onNewBlockHeight(int blockHeight) {
-    }
-
     @Override
     public void onParseTxsCompleteAfterBatchProcessing(Block block) {
         updateLists();
     }
 
-    @Override
-    public void onParseBlockChainComplete() {
-    }
-
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // MyProposalListService.Listener

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

@@ -154,10 +154,6 @@ public void onAdded(PersistableNetworkPayload payload) {
     // DaoStateListener
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    @Override
-    public void onNewBlockHeight(int blockHeight) {
-    }
-
     @Override
     public void onParseTxsCompleteAfterBatchProcessing(Block block) {
         int heightForRepublishing = periodService.getFirstBlockOfPhase(daoStateService.getChainHeight(), DaoPhase.Phase.BREAK1);

core/src/main/java/bisq/core/dao/governance/voteresult/VoteResultException.java

@@ -26,6 +26,7 @@
 import lombok.Getter;
 import lombok.Value;
 
+@EqualsAndHashCode(callSuper = true)
 public class VoteResultException extends Exception {
     @Getter
     private final int heightOfFirstBlockInCycle;
@@ -83,24 +84,6 @@ private MissingDataException(String message) {
         }
     }
 
-    @EqualsAndHashCode(callSuper = true)
-    @Value
-    public static class MissingBlindVoteDataException extends MissingDataException {
-        private String blindVoteTxId;
-
-        MissingBlindVoteDataException(String blindVoteTxId) {
-            super("Blind vote tx ID " + blindVoteTxId + " is missing");
-            this.blindVoteTxId = blindVoteTxId;
-        }
-
-        @Override
-        public String toString() {
-            return "MissingBlindVoteDataException{" +
-                    "\n     blindVoteTxId='" + blindVoteTxId + '\'' +
-                    "\n} " + super.toString();
-        }
-    }
-
     @EqualsAndHashCode(callSuper = true)
     @Value
     public static class MissingBallotException extends MissingDataException {