fix:

update contributor as well as sponsor address for the compromised wallet
icon-community · Jan 25, 2024 · b6bf2e5 · b6bf2e5
1 parent 327692e
commit b6bf2e5
Showing 1 changed file with 31 additions and 31 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
@@ -1092,37 +1092,6 @@ public int checkChangeVote(Address address, String ipfsHash, String proposalType
         }
     }
 
-    @Override
-    @External
-    public void updateContributor(String _ipfs_hash, Address _new_contributor, Address _new_sponsor) {
-        validateAdmins();
-        Context.require(!_new_contributor.isContract(), TAG + ": Contract Address not supported.");
-        Map<String, Object> _proposal_details = getProposalDetails(_ipfs_hash);
-        String _proposal_status = (String) _proposal_details.get(STATUS);
-        Context.require(_proposal_status.equals(ACTIVE), TAG + ": Proposal must be active");
-
-        // update contributor's address
-        Address _contributor_address = (Address) _proposal_details.get(CONTRIBUTOR_ADDRESS);
-        removeContributor(_contributor_address, _ipfs_hash);
-
-        contributors.add(_new_contributor);
-        contributorProjects.at(_new_contributor).add(_ipfs_hash);
-
-        // update sponsor's address
-        Address _sponsor_address = (Address) _proposal_details.get(SPONSOR_ADDRESS);
-        removeSponsor(_sponsor_address, _ipfs_hash);
-
-        sponsors.add(_new_sponsor);
-        sponsorProjects.at(_new_sponsor).add(_ipfs_hash);
-
-        // request update contributor address and sponsor address to cps treasury
-        callScore(getCpsTreasuryScore(), "update_contributor_sponsor_address", _ipfs_hash, _new_contributor,_new_sponsor);
-
-        // emit event
-        UpdateContributorAddress(_contributor_address, _new_contributor);
-        UpdateSponsorAddress(_sponsor_address, _new_sponsor);
-    }
-
     @External(readonly = true)
     public Map<String, Object> getProjectAmounts() {
         List<String> statusList = List.of(PENDING, ACTIVE, PAUSED, COMPLETED, DISQUALIFIED);
@@ -2639,6 +2608,37 @@ public void milestoneDbMigration(String ipfsHash) {
         }
     }
 
+    @Override
+    @External
+    public void updateContributor(String _ipfs_hash, Address _new_contributor, Address _new_sponsor) {
+        validateAdmins();
+        Context.require(!_new_contributor.isContract(), TAG + ": Contract Address not supported.");
+        Map<String, Object> _proposal_details = getProposalDetails(_ipfs_hash);
+        String _proposal_status = (String) _proposal_details.get(STATUS);
+        Context.require(List.of(ACTIVE,PAUSED).contains(_proposal_status), TAG + ": Proposal must be in active or paused state.");
+
+        // update contributor's address
+        Address _contributor_address = (Address) _proposal_details.get(CONTRIBUTOR_ADDRESS);
+        removeContributor(_contributor_address, _ipfs_hash);
+
+        contributors.add(_new_contributor);
+        contributorProjects.at(_new_contributor).add(_ipfs_hash);
+
+        // update sponsor's address
+        Address _sponsor_address = (Address) _proposal_details.get(SPONSOR_ADDRESS);
+        removeSponsor(_sponsor_address, _ipfs_hash);
+
+        sponsors.add(_new_sponsor);
+        sponsorProjects.at(_new_sponsor).add(_ipfs_hash);
+
+        // request update contributor address and sponsor address to cps treasury
+        callScore(getCpsTreasuryScore(), "updateContributorSponsorAddress", _ipfs_hash, _new_contributor,_new_sponsor);
+
+        // emit event
+        UpdateContributorAddress(_contributor_address, _new_contributor);
+        UpdateSponsorAddress(_sponsor_address, _new_sponsor);
+    }
+
 
     //    =====================================TEMPORARY MIGRATIONS METHODS===============================================