fix councilFlag set at initialize of proposal

icon-community · Oct 23, 2024 · fabf351 · fabf351
1 parent 1d22f39
commit fabf351
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 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
@@ -344,7 +344,9 @@ private String getPrepName(Address address) {
             int index = getCouncilManagers().indexOf(address);
             return "Council Manager " + (index + 1);
         }
-        return (String) getPRepInfo(address).get("name");
+        else {
+            return (String) getPRepInfo(address).get("name");
+        }
     }
 
     private BigInteger getStake(Address address) {
@@ -678,6 +680,7 @@ public void submitProposal(ProposalAttributes proposals, MilestonesAttributes[]
         String ipfsHashPrefix = proposalPrefix(ipfsHash);
 
         addDataToProposalDB(proposals, ipfsHashPrefix);
+        councilFlag.at(ipfsHashPrefix).set(getCouncilFlag());
         BigInteger initialPaymentPercentage = callScore(BigInteger.class, getCpsTreasuryScore(), "getOnsetPayment");
 
         BigInteger totalBudget = proposals.total_budget.multiply(EXA);
@@ -1436,7 +1439,6 @@ private void updateProgressReportResult() {
                 } else {
                     if (majorityFlag) {
                         _approved_reports_count += 1;
-
                         if (milestoneStatus == MILESTONE_REPORT_COMPLETED) {
                             milestonePassed += 1;
                             milestoneBudget = milestoneBudget.add(MilestoneDb.budget.at(milestonePrefix).getOrDefault(BigInteger.ZERO));

diff --git a/CPSCore/src/main/java/community/icon/cps/score/cpscore/db/ProposalDataDb.java b/CPSCore/src/main/java/community/icon/cps/score/cpscore/db/ProposalDataDb.java
@@ -1,15 +1,13 @@
 package community.icon.cps.score.cpscore.db;
 
+import community.icon.cps.score.lib.interfaces.CPSCoreInterface.ProposalAttributes;
 import score.*;
 
 import java.math.BigInteger;
 import java.util.Map;
 
-import community.icon.cps.score.lib.interfaces.CPSCoreInterface.ProposalAttributes;
-
 import static community.icon.cps.score.cpscore.utils.ArrayDBUtils.recordTxHash;
 import static community.icon.cps.score.cpscore.utils.Constants.*;
-import static community.icon.cps.score.lib.interfaces.CPSCoreInterface.ProposalAttributes;
 
 public class ProposalDataDb {
     public static final BranchDB<String, VarDB<String>> ipfsHash = Context.newBranchDB(IPFS_HASH, String.class);
@@ -73,10 +71,7 @@ public static void addDataToProposalDB(ProposalAttributes proposalData, String p
         token.at(prefix).set(proposalData.token);
         milestoneCount.at(prefix).set(proposalData.milestoneCount);
         isMilestone.at(prefix).set(true);
-
         majorityFlag.at(prefix).set(false);
-        councilFlag.at(prefix).set(false);
-
     }
 
     public static void updatePercentageCompleted(String prefix, int percentage) {