Merge branch 'fix/update-contributor-address-for-compromised-wallets'…

… into main
icon-community · Jan 23, 2024 · 9b1b979 · 9b1b979
2 parents e316452 + d15face
commit 9b1b979
Show file tree

Hide file tree

Showing 24 changed files with 2,909 additions and 1,384 deletions.
diff --git a/CPFTreasury/build.gradle b/CPFTreasury/build.gradle
@@ -1,4 +1,4 @@
-version = '0.9.1'
+version = '1.2.0'
 
 dependencies {
     compileOnly 'foundation.icon:javaee-api:0.9.1'

diff --git a/CPFTreasury/src/main/java/community/icon/cps/score/cpftreasury/CPFTreasury.java b/CPFTreasury/src/main/java/community/icon/cps/score/cpftreasury/CPFTreasury.java
diff --git a/CPFTreasury/src/main/java/community/icon/cps/score/cpftreasury/Constants.java b/CPFTreasury/src/main/java/community/icon/cps/score/cpftreasury/Constants.java
@@ -16,6 +16,8 @@ public class Constants {
     public static final String PROPOSAL_BUDGETS = "_proposals_budgets";
     public static final String PROPOSALS_KEYS = "_proposals_keys";
     public static final String TREASURY_FUND = "treasury_fund";
+    public static final String EMERGENCY_FUND = "emergencyFund";
+    public static final String AVAILABLE_BALANCE = "availableBalance";
     public static final String TREASURY_FUND_BNUSD = "treasury_fund_bnusd";
 
     public static final String CPS_TREASURY_SCORE = "_cps_treasury_score";
@@ -27,12 +29,24 @@ public class Constants {
     public static final String SICX_SCORE = "sicx_score";
     public static final String ROUTER_SCORE = "router_score";
     public static final String ORACLE_ADDRESS = "oracle_address";
-
+    public static final String BNUSD_BALANCE = "bnusdBalance";
     public static final String SWAP_STATE = "swap_state";
     public static final String SWAP_COUNT = "swap_count";
     public static final String SWAP_LIMIT_AMOUNT = "swap_limit_amount";
     public static final String ORACLE_PERCENTAGE_DIFF = "oracle_percentage_diff";
     public static final String SWAP_FLAG = "swap_flag";
+    public static final String MAX_CAP = "maxCap";
+    public static final String REMAINING_TO_SWAP = "remainingToSwap";
+    public static final String PROJECT_IPFS_HASH = "ipfs_hash";
+    public static final String PROJECT_DURATION = "project_duration";
+    public static final String SPONSOR_ADDRESS = "sponsor_address";
+    public static final String CONTRIBUTOR_ADDRESS = "contributor_address";
+    public static final String PROJECT_TOTAL_BUDGET = "total_budget";
+    public static final String SPONSOR_REWARD = "sponsor_reward";
+    public static final String TOKEN = "token";
+    public static final String COUNT = "count";
+    public static final String DATA = "data";
+    public static final String STATE = "state";
     public static final Address SYSTEM_ADDRESS = Address.fromString("cx0000000000000000000000000000000000000000");
 
     public static final int sICXICXPoolID = 1;

diff --git a/CPFTreasury/src/main/java/community/icon/cps/score/cpftreasury/SetterGetter.java b/CPFTreasury/src/main/java/community/icon/cps/score/cpftreasury/SetterGetter.java
@@ -1,18 +1,23 @@
 package community.icon.cps.score.cpftreasury;
 
 import score.Address;
+import score.Context;
 import score.annotation.External;
 
+import java.math.BigInteger;
+
+import static community.icon.cps.score.cpftreasury.Validations.validateGovernanceContract;
+
 public class SetterGetter {
     /**
      * Sets the cps score address. Only owner can set the method
      *
-     * @param _score: Score address of cps score
+     * @param score: Score address of cps score
      */
     @External
-    public void setCpsScore(Address _score) {
-        Validations.validateAdminScore(_score);
-        CPFTreasury.cpsScore.set(_score);
+    public void setCpsScore(Address score) {
+        Validations.validateAdminScore(score);
+        CPFTreasury.cpsScore.set(score);
     }
 
     /**
@@ -28,12 +33,12 @@ public Address getCpsScore() {
     /**
      * Sets the cps treasury score address. Only cps admins can set the method
      *
-     * @param _score: Score address of cps treasury score
+     * @param score: Score address of cps treasury score
      */
     @External
-    public void setCpsTreasuryScore(Address _score) {
-        Validations.validateAdminScore(_score);
-        CPFTreasury.cpsTreasuryScore.set(_score);
+    public void setCpsTreasuryScore(Address score) {
+        Validations.validateAdminScore(score);
+        CPFTreasury.cpsTreasuryScore.set(score);
     }
 
     /**
@@ -49,12 +54,12 @@ public Address getCpsTreasuryScore() {
     /**
      * Sets the bnUSD score address. Only cps admins can set the method
      *
-     * @param _score: Score address of bnUSD score
+     * @param score: Score address of bnUSD score
      */
     @External
-    public void setBnUSDScore(Address _score) {
-        Validations.validateAdminScore(_score);
-        CPFTreasury.balancedDollar.set(_score);
+    public void setBnUSDScore(Address score) {
+        Validations.validateAdminScore(score);
+        CPFTreasury.balancedDollar.set(score);
     }
 
     /**
@@ -70,12 +75,12 @@ public Address getBnUSDScore() {
     /**
      * Sets the sicx score address. Only cps admins can set the method
      *
-     * @param _score: Score address of sicx score
+     * @param score: Score address of sicx score
      */
     @External
-    public void setSicxScore(Address _score) {
-        Validations.validateAdminScore(_score);
-        CPFTreasury.sICXScore.set(_score);
+    public void setSicxScore(Address score) {
+        Validations.validateAdminScore(score);
+        CPFTreasury.sICXScore.set(score);
     }
 
     /**
@@ -91,12 +96,12 @@ public Address getSicxScore() {
     /**
      * Sets the dex score address. Only owner can set the method
      *
-     * @param _score: Score address of dex score
+     * @param score: Score address of dex score
      */
     @External
-    public void setDexScore(Address _score) {
-        Validations.validateAdminScore(_score);
-        CPFTreasury.dexScore.set(_score);
+    public void setDexScore(Address score) {
+        Validations.validateAdminScore(score);
+        CPFTreasury.dexScore.set(score);
     }
 
     /**
@@ -112,12 +117,12 @@ public Address getDexScore() {
     /**
      * Sets the router score address. Only owner can set the method
      *
-     * @param _score: Score address of router score
+     * @param score: Score address of router score
      */
     @External
-    public void setRouterScore(Address _score) {
-        Validations.validateAdminScore(_score);
-        CPFTreasury.routerScore.set(_score);
+    public void setRouterScore(Address score) {
+        Validations.validateAdminScore(score);
+        CPFTreasury.routerScore.set(score);
     }
 
     /**
@@ -131,9 +136,9 @@ public Address getRouterScore() {
     }
 
     @External
-    public void setOracleAddress(Address _score) {
-        Validations.validateAdminScore(_score);
-        CPFTreasury.oracleAddress.set(_score);
+    public void setOracleAddress(Address score) {
+        Validations.validateAdminScore(score);
+        CPFTreasury.oracleAddress.set(score);
     }
 
     /**
@@ -146,4 +151,22 @@ public Address getOracleAddress() {
         return CPFTreasury.oracleAddress.get();
     }
 
+    @External
+    public void setSponsorBondPercentage(BigInteger bondValue) {
+        validateGovernanceContract();
+        Context.call( getCpsScore(), "setSponsorBondPercentage",bondValue);
+    }
+
+    @External
+    public void setPeriod(BigInteger applicationPeriod) {
+        validateGovernanceContract();
+        Context.call(getCpsScore(), "setPeriod",applicationPeriod);
+    }
+
+    @External
+    public void setOnsetPayment(BigInteger paymentPercentage) {
+        validateGovernanceContract();
+        Context.call(getCpsTreasuryScore(), "setOnsetPayment",paymentPercentage);
+    }
+
 }
diff --git a/CPFTreasury/src/main/java/community/icon/cps/score/cpftreasury/Validations.java b/CPFTreasury/src/main/java/community/icon/cps/score/cpftreasury/Validations.java
@@ -3,6 +3,7 @@
 import score.Address;
 import score.Context;
 
+import static community.icon.cps.score.cpftreasury.Constants.SYSTEM_ADDRESS;
 import static community.icon.cps.score.cpftreasury.Constants.TAG;
 
 public class Validations {
@@ -12,6 +13,12 @@ public static void validateAdmins() {
 
     }
 
+    public static void validateGovernanceContract() {
+        Context.require(Context.getCaller().equals(SYSTEM_ADDRESS),
+                TAG + ": Only Admins can call this method");
+
+    }
+
 
     public static void validateAdminScore(Address _score) {
         validateAdmins();