Governance Abstain vote

.changelog/unreleased/SDK/2128-governance-abstain-vote.md

@@ -0,0 +1,2 @@
+- Updated the `LedgerProposalVote` display method to account for the new
+  `Abstain` vote variant. ([\#2128](https://github.com/anoma/namada/pull/2128))

.changelog/unreleased/features/2128-governance-abstain-vote.md

@@ -0,0 +1,2 @@
+- Added the option to abstain from voting a governance proposal.
+  ([\#2128](https://github.com/anoma/namada/pull/2128))

apps/src/lib/client/rpc.rs

@@ -1226,7 +1226,7 @@ pub async fn query_proposal_result<'a>(
         let proposal_result = compute_proposal_result(
             proposal_votes,
             total_voting_power,
-            TallyType::TwoThird,
+            TallyType::TwoThirds,
         );
 
         display_line!(

apps/src/lib/node/ledger/shell/governance.rs

@@ -147,16 +147,17 @@ where
             }
             TallyResult::Rejected => {
                 if let ProposalType::PGFPayment(_) = proposal_type {
-                    let two_third_nay = proposal_result.two_third_nay();
-                    if two_third_nay {
+                    if proposal_result.two_thirds_nay_over_two_thirds_total() {
                         pgf::remove_steward(
                             &mut shell.wl_storage,
                             &proposal_author,
                         )?;
 
                         tracing::info!(
                             "Governance proposal {} was rejected with 2/3 of \
-                             nay votes. Removing {} from stewards set.",
+                             nay votes over 2/3 of the total voting power. If \
+                             {} is a steward, it's being removed from the \
+                             stewards set.",
                             id,
                             proposal_author
                         );

core/src/ledger/governance/cli/offline.rs

@@ -241,6 +241,21 @@ impl OfflineVote {
         self.vote.is_yay()
     }
 
+    /// Check if the vote is nay
+    pub fn is_nay(&self) -> bool {
+        self.vote.is_nay()
+    }
+
+    /// Check if the vote is abstain
+    pub fn is_abstain(&self) -> bool {
+        self.vote.is_abstain()
+    }
+
+    /// Check if two votes are equal
+    pub fn is_same_side(&self, other: &Self) -> bool {
+        self.vote.is_same_side(&other.vote)
+    }
+
     /// compute the hash of a proposal
     pub fn compute_hash(&self) -> Hash {
         let proposal_hash_data = self.proposal_hash.serialize_to_vec();

core/src/ledger/governance/cli/onchain.rs

@@ -313,7 +313,7 @@ pub struct PgfFundingTarget {
     pub address: Address,
 }
 
-/// Rappresent an proposal vote
+/// Represent an proposal vote
 #[derive(
     Debug,
     Clone,
@@ -324,12 +324,12 @@ pub struct PgfFundingTarget {
     PartialEq,
 )]
 pub enum ProposalVote {
-    /// Rappresent an yay proposal vote
+    /// Represent an yay proposal vote
     Yay,
-    /// Rappresent an nay proposal vote
+    /// Represent an nay proposal vote
     Nay,
-    /// Rappresent an invalid proposal vote
-    Invalid,
+    /// Represent an abstain proposal vote
+    Abstain,
 }
 
 impl TryFrom<String> for ProposalVote {
@@ -339,14 +339,30 @@ impl TryFrom<String> for ProposalVote {
         match value.trim().to_lowercase().as_str() {
             "yay" => Ok(ProposalVote::Yay),
             "nay" => Ok(ProposalVote::Nay),
+            "abstain" => Ok(ProposalVote::Abstain),
             _ => Err("invalid vote".to_string()),
         }
     }
 }
 
 impl ProposalVote {
-    /// Check if the proposal type is yay
+    /// Check if the vote type is yay
     pub fn is_yay(&self) -> bool {
         matches!(self, ProposalVote::Yay)
     }
+
+    /// Check if the vote type is nay
+    pub fn is_nay(&self) -> bool {
+        matches!(self, ProposalVote::Nay)
+    }
+
+    /// Check if the vote type is abstain
+    pub fn is_abstain(&self) -> bool {
+        matches!(self, ProposalVote::Abstain)
+    }
+
+    /// Check if two votes are equal
+    pub fn is_same_side(&self, other: &Self) -> bool {
+        std::mem::discriminant(self) == std::mem::discriminant(other)
+    }
 }

core/src/ledger/governance/storage/vote.rs

@@ -42,6 +42,8 @@ pub enum StorageProposalVote {
     Yay(VoteType),
     /// No
     Nay,
+    /// Abstain
+    Abstain,
 }
 
 impl StorageProposalVote {
@@ -50,6 +52,21 @@ impl StorageProposalVote {
         matches!(self, StorageProposalVote::Yay(_))
     }
 
+    /// Check if a vote is nay
+    pub fn is_nay(&self) -> bool {
+        matches!(self, StorageProposalVote::Nay)
+    }
+
+    /// Check if a vote is abstain
+    pub fn is_abstain(&self) -> bool {
+        matches!(self, StorageProposalVote::Abstain)
+    }
+
+    /// Check if two votes are equal
+    pub fn is_same_side(&self, other: &Self) -> bool {
+        std::mem::discriminant(self) == std::mem::discriminant(other)
+    }
+
     /// Check if vote is of type default
     pub fn is_default_vote(&self) -> bool {
         matches!(
@@ -64,6 +81,7 @@ impl StorageProposalVote {
         match self {
             StorageProposalVote::Yay(vote_type) => proposal_type.eq(vote_type),
             StorageProposalVote::Nay => true,
+            StorageProposalVote::Abstain => true,
         }
     }
 
@@ -106,6 +124,7 @@ impl Display for StorageProposalVote {
             },
 
             StorageProposalVote::Nay => write!(f, "nay"),
+            StorageProposalVote::Abstain => write!(f, "abstain"),
         }
     }
 }