Merge branch 'fix/compromised-wallet-with-no-milestone-progressreport…

…' into fix/contributor-project-getters
icon-community · Jan 25, 2024 · 2867aa3 · 2867aa3
2 parents 9dd738c + 77f985a
commit 2867aa3
Show file tree

Hide file tree

Showing 3 changed files with 405 additions and 58 deletions.
diff --git a/CPSCore/src/main/java/community/icon/cps/score/cpscore/CPSCore.java b/CPSCore/src/main/java/community/icon/cps/score/cpscore/CPSCore.java
@@ -790,7 +790,10 @@ private List<Integer> getMilestoneDeadline(String ipfsHash) {
 
             int currentPeriod = getPeriodCount();
             if (currentPeriod >= computedCompletionPeriod) {
-                milestoneIdList.add(milestoneId);
+                int status = MilestoneDb.status.at(milestonePrefix).getOrDefault(0);
+                if (status != MILESTONE_REPORT_APPROVED ){
+                    milestoneIdList.add(milestoneId);
+                }
             }
         }
         return milestoneIdList;