Merge pull request bisq-network#2757 from sqrrm/count-voting-cycles

Count cycles correctly, fix bisq-network#2706
devinbileck · Apr 21, 2019 · 25931c0 · 25931c0
2 parents eb1c4fd + d0c0bd9
commit 25931c0
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/core/src/main/java/bisq/core/dao/governance/period/CycleService.java b/core/src/main/java/bisq/core/dao/governance/period/CycleService.java
@@ -90,7 +90,8 @@ public void addFirstCycle() {
     }
 
     public int getCycleIndex(Cycle cycle) {
-        return (cycle.getHeightOfFirstBlock() - genesisBlockHeight) / cycle.getDuration();
+        Optional<Cycle> previousCycle = getCycle(cycle.getHeightOfFirstBlock() - 1, daoStateService.getCycles());
+        return previousCycle.map(cycle1 -> getCycleIndex(cycle1) + 1).orElse(0);
     }
 
     public boolean isTxInCycle(Cycle cycle, String txId) {