Merge branch 'feat/governance-snapshots' into governance-v2-merkle-proof

multiversx · Aug 7, 2023 · 2571f42 · 2571f42
2 parents 7948025 + 3a1e7a8
commit 2571f42
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/energy-integration/governance-v2/src/configurable.rs b/energy-integration/governance-v2/src/configurable.rs
@@ -35,7 +35,7 @@ const MIN_VOTING_PERIOD: u64 = 14_400; // 24 Hours
 const MAX_VOTING_PERIOD: u64 = 201_600; // 2 Weeks
 const MIN_QUORUM: u64 = 1_000; // 10%
 const MAX_QUORUM: u64 = 6_000; // 60%
-const MIN_MIN_FEE_FOR_PROPOSE: u64 = 2_000_000;
+const MIN_MIN_FEE_FOR_PROPOSE: u64 = 1;
 const MAX_MIN_FEE_FOR_PROPOSE: u64 = 200_000_000_000;
 const DECIMALS_CONST: u64 = 1_000_000_000_000_000_000;
 

diff --git a/energy-integration/governance-v2/src/errors.rs b/energy-integration/governance-v2/src/errors.rs
@@ -8,7 +8,7 @@ pub const INVALID_ROOT_HASH: &[u8] = b"Invalid root hash provided";
 pub const PROPOSAL_NO_ACTION: &[u8] = b"Proposal has no actions";
 pub const EXEEDED_MAX_ACTIONS: &[u8] = b"Exceeded max actions per proposal";
 pub const ONLY_PROPOSER_CANCEL: &[u8] = b"Only original proposer may cancel a pending proposal";
-pub const ONLY_PROPOSER_WITHDRAW: &[u8] = b"Only original proposer may cancel a pending proposal";
+pub const ONLY_PROPOSER_WITHDRAW: &[u8] = b"Only original proposer may withdraw a pending proposal";
 pub const NO_PROPOSAL: &[u8] = b"Proposal does not exist";
 pub const WITHDRAW_NOT_ALLOWED: &[u8] = b"You may not withdraw funds from this proposal!";
 pub const INVALID_MERKLE_PROOF: &[u8] = b"Invalid merkle proof provided";
diff --git a/energy-integration/governance-v2/src/lib.rs b/energy-integration/governance-v2/src/lib.rs
@@ -161,7 +161,7 @@ pub trait GovernanceV2:
         let new_user = self.user_voted_proposals(&voter).insert(proposal_id);
         require!(new_user, ALREADY_VOTED_ERR_MSG);
 
-        let voting_power = user_quorum.sqrt();
+        let voting_power = &user_quorum;
 
         match self.get_root_hash(proposal_id) {
             OptionalValue::None => {
@@ -178,31 +178,31 @@ pub trait GovernanceV2:
         match vote {
             VoteType::UpVote => {
                 self.proposal_votes(proposal_id).update(|proposal_votes| {
-                    proposal_votes.up_votes += &voting_power.clone();
+                    proposal_votes.up_votes += voting_power.clone();
                     proposal_votes.quorum += &user_quorum.clone();
                 });
-                self.up_vote_cast_event(&voter, proposal_id, &voting_power, &user_quorum);
+                self.up_vote_cast_event(&voter, proposal_id, voting_power, &user_quorum);
             }
             VoteType::DownVote => {
                 self.proposal_votes(proposal_id).update(|proposal_votes| {
-                    proposal_votes.down_votes += &voting_power.clone();
+                    proposal_votes.down_votes += voting_power.clone();
                     proposal_votes.quorum += &user_quorum.clone();
                 });
-                self.down_vote_cast_event(&voter, proposal_id, &voting_power, &user_quorum);
+                self.down_vote_cast_event(&voter, proposal_id, voting_power, &user_quorum);
             }
             VoteType::DownVetoVote => {
                 self.proposal_votes(proposal_id).update(|proposal_votes| {
-                    proposal_votes.down_veto_votes += &voting_power.clone();
+                    proposal_votes.down_veto_votes += voting_power.clone();
                     proposal_votes.quorum += &user_quorum.clone();
                 });
-                self.down_veto_vote_cast_event(&voter, proposal_id, &voting_power, &user_quorum);
+                self.down_veto_vote_cast_event(&voter, proposal_id, voting_power, &user_quorum);
             }
             VoteType::AbstainVote => {
                 self.proposal_votes(proposal_id).update(|proposal_votes| {
-                    proposal_votes.abstain_votes += &voting_power.clone();
+                    proposal_votes.abstain_votes += voting_power.clone();
                     proposal_votes.quorum += &user_quorum.clone();
                 });
-                self.abstain_vote_cast_event(&voter, proposal_id, &voting_power, &user_quorum);
+                self.abstain_vote_cast_event(&voter, proposal_id, voting_power, &user_quorum);
             }
         }
     }

diff --git a/energy-integration/governance-v2/tests/gov_rust_test.rs b/energy-integration/governance-v2/tests/gov_rust_test.rs
@@ -470,7 +470,7 @@ fn gov_withdraw_defeated_proposal_test() {
     // Other user (not proposer) try to withdraw the fee -> Fail
     gov_setup
         .withdraw_after_defeated(&third_user_addr, proposal_id)
-        .assert_error(4, "Only original proposer may cancel a pending proposal");
+        .assert_error(4, "Only original proposer may withdraw a pending proposal");
 
     // Proposer withdraw
     gov_setup
@@ -562,7 +562,7 @@ fn gov_modify_withdraw_defeated_proposal_test() {
     // Other user (not proposer) try to withdraw the fee -> Fail
     gov_setup
         .withdraw_after_defeated(&third_user_addr, proposal_id)
-        .assert_error(4, "Only original proposer may cancel a pending proposal");
+        .assert_error(4, "Only original proposer may withdraw a pending proposal");
 
     // Proposer withdraw
     gov_setup
@@ -650,7 +650,7 @@ fn gov_withdraw_no_with_veto_defeated_proposal_test() {
     // Other user (not proposer) try to withdraw the fee -> Fail
     gov_setup
         .withdraw_after_defeated(&third_user_addr, proposal_id)
-        .assert_error(4, "Only original proposer may cancel a pending proposal");
+        .assert_error(4, "Only original proposer may withdraw a pending proposal");
 
     // Proposer withdraw
     gov_setup