fix: Do not allow relinquishing votes in Finalising state

Author: SebastianBor

Anchor.toml

@@ -1,4 +1,4 @@
-anchor_version = "0.20.1"
+anchor_version = "0.24.2"
 solana_version = "1.9.9"
 
 [workspace]

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "spl-governance"
-version = "2.2.4"
+version = "2.2.5"
 description = "Solana Program Library Governance Program"
 authors = ["Solana Maintainers <[email protected]>"]
 repository = "https://github.com/solana-labs/solana-program-library"

governance/program/Cargo.toml

@@ -393,6 +393,10 @@ pub enum GovernanceError {
     /// GovernanceConfig change not allowed
     #[error("GovernanceConfig change not allowed")]
     GovernanceConfigChangeNotAllowed,
+
+    /// Cannot Relinquish in Voting state
+    #[error("Cannot Relinquish in Voting state")]
+    CannotRelinquishInVotingState,
 }
 
 impl PrintProgramError for GovernanceError {

governance/program/src/error.rs

@@ -103,6 +103,10 @@ pub fn process_relinquish_vote(program_id: &Pubkey, accounts: &[AccountInfo]) ->
             .checked_sub(1)
             .unwrap();
     } else {
+        if proposal_data.state == ProposalState::Voting {
+            return Err(GovernanceError::CannotRelinquishInVotingState.into());
+        }
+
         vote_record_data.is_relinquished = true;
         vote_record_data.serialize(&mut *vote_record_info.data.borrow_mut())?;
     }

governance/program/src/processor/process_relinquish_vote.rs

@@ -447,7 +447,7 @@ async fn test_relinquish_vote_with_already_relinquished_error() {
 }
 
 #[tokio::test]
-async fn test_relinquish_proposal_in_voting_state_after_vote_time_ended() {
+async fn test_relinquish_proposal_in_voting_state_after_vote_time_ended_error() {
     // Arrange
     let mut governance_test = GovernanceProgramTest::start_new().await;
 
@@ -481,7 +481,7 @@ async fn test_relinquish_proposal_in_voting_state_after_vote_time_ended() {
 
     let clock = governance_test.bench.get_clock().await;
 
-    let mut vote_record_cookie = governance_test
+    governance_test
         .with_cast_vote(&proposal_cookie, &token_owner_record_cookie, YesNoVote::Yes)
         .await
         .unwrap();
@@ -494,32 +494,13 @@ async fn test_relinquish_proposal_in_voting_state_after_vote_time_ended() {
         .await;
 
     // Act
-    governance_test
+    let err = governance_test
         .relinquish_vote(&proposal_cookie, &token_owner_record_cookie)
         .await
+        .err()
         .unwrap();
 
     // Assert
 
-    let proposal_account = governance_test
-        .get_proposal_account(&proposal_cookie.address)
-        .await;
-
-    // Proposal should be still in voting state but the vote count should not change
-    assert_eq!(100, proposal_account.options[0].vote_weight);
-    assert_eq!(ProposalState::Voting, proposal_account.state);
-
-    let token_owner_record = governance_test
-        .get_token_owner_record_account(&token_owner_record_cookie.address)
-        .await;
-
-    assert_eq!(0, token_owner_record.unrelinquished_votes_count);
-    assert_eq!(1, token_owner_record.total_votes_count);
-
-    let vote_record_account = governance_test
-        .get_vote_record_account(&vote_record_cookie.address)
-        .await;
-
-    vote_record_cookie.account.is_relinquished = true;
-    assert_eq!(vote_record_cookie.account, vote_record_account);
+    assert_eq!(err, GovernanceError::CannotRelinquishInVotingState.into());
 }