Governance: Council Vote Threshold (#3135)

* wip: Replace proposal_cool_off_time with council_vote_threshold

* wip: serialise governance vec

* wip: cool off time

* chore: create test to deserialize legacy config

* wip: default council_vote_threshold from community_vote_threshold for legacy accounts

* chore: fix chat compilation

* feat: use community_vote_threshold for voting

* feat: assert all voting thresholds are not disabled

* chore: simplify tests without config mutation

* feat: assert proposal is created for valid vote threshold

* chore: update test name

* chore: test_finalize_council_vote

* chore: test_cast_council_vote

* chore: test for disabled voter threshold

* feat: Ensure GovernanceConfig reserved buffer is always empty

* chore: change error name to AtLeastOneVoteThresholdRequired

* chore: add comments

* chore: Add VoteThreshold.Any comments

Author: SebastianBor

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "spl-governance-chat"
-version = "0.2.5"
+version = "0.2.6"
 description = "Solana Program Library Governance Chat Program"
 authors = ["Solana Maintainers <[email protected]>"]
 repository = "https://github.com/solana-labs/solana-program-library"
@@ -21,7 +21,7 @@ serde = "1.0.127"
 serde_derive = "1.0.103"
 solana-program = "1.10.10"
 spl-token = { version = "3.3", path = "../../../token/program", features = [ "no-entrypoint" ] }
-spl-governance= { version = "2.2.4", path ="../../program", features = [ "no-entrypoint" ]}
+spl-governance= { version = "3.0.0", path ="../../program", features = [ "no-entrypoint" ]}
 spl-governance-tools= { version = "0.1.2", path ="../../tools"}
 spl-governance-addin-api= { version = "0.1.2", path ="../../addin-api"}
 thiserror = "1.0"

governance/chat/program/Cargo.toml

@@ -185,7 +185,8 @@ impl GovernanceChatProgramTest {
             max_voting_time: 10,
             community_vote_threshold: VoteThreshold::YesVotePercentage(60),
             vote_tipping: spl_governance::state::enums::VoteTipping::Strict,
-            proposal_cool_off_time: 0,
+            council_vote_threshold: VoteThreshold::YesVotePercentage(10),
+            reserved: [0; 2],
         };
 
         let token_owner_record_address = get_token_owner_record_address(

governance/chat/program/tests/program_test/mod.rs

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

governance/program/Cargo.toml

@@ -246,17 +246,17 @@ pub enum GovernanceError {
     #[error("Current token owner must sign transaction")]
     TokenOwnerMustSign,
 
-    /// Given VoteThresholdPercentageType is not supported
-    #[error("Given VoteThresholdPercentageType is not supported")]
-    VoteThresholdPercentageTypeNotSupported,
+    /// Given VoteThresholdType is not supported
+    #[error("Given VoteThresholdType is not supported")]
+    VoteThresholdTypeNotSupported,
 
     /// Given VoteWeightSource is not supported
     #[error("Given VoteWeightSource is not supported")]
     VoteWeightSourceNotSupported,
 
-    /// Proposal cool off time is not supported
-    #[error("Proposal cool off time is not supported")]
-    ProposalCoolOffTimeNotSupported,
+    /// GoverningTokenMint not allowed to vote
+    #[error("GoverningTokenMint not allowed to vote")]
+    GoverningTokenMintNotAllowedToVote, // 560
 
     /// Governance PDA must sign
     #[error("Governance PDA must sign")]
@@ -393,6 +393,14 @@ pub enum GovernanceError {
     /// GovernanceConfig change not allowed
     #[error("GovernanceConfig change not allowed")]
     GovernanceConfigChangeNotAllowed,
+
+    /// At least one VoteThreshold is required
+    #[error("At least one VoteThreshold is required")]
+    AtLeastOneVoteThresholdRequired,
+
+    /// Reserved buffer must be empty
+    #[error("Reserved buffer must be empty")]
+    ReservedBufferMustBeEmpty,
 }
 
 impl PrintProgramError for GovernanceError {

governance/program/src/error.rs

@@ -143,10 +143,14 @@ pub fn process_cast_vote(
         &realm_data,
     )?;
 
+    let vote_threshold =
+        governance_data.resolve_vote_threshold(&realm_data, governing_token_mint_info.key)?;
+
     if proposal_data.try_tip_vote(
         max_voter_weight,
         &governance_data.config,
         clock.unix_timestamp,
+        &vote_threshold,
     )? {
         // Deserialize proposal owner and validate it's the actual owner of the proposal
         let mut proposal_owner_record_data = get_token_owner_record_data_for_proposal_owner(

governance/program/src/processor/process_cast_vote.rs

@@ -64,6 +64,9 @@ pub fn process_create_proposal(
     let mut governance_data =
         get_governance_data_for_realm(program_id, governance_info, realm_info.key)?;
 
+    governance_data
+        .assert_governing_token_mint_can_vote(&realm_data, governing_token_mint_info.key)?;
+
     let mut proposal_owner_record_data = get_token_owner_record_data_for_realm(
         program_id,
         proposal_owner_record_info,

governance/program/src/processor/process_create_proposal.rs

@@ -54,10 +54,14 @@ pub fn process_finalize_vote(program_id: &Pubkey, accounts: &[AccountInfo]) -> P
         &realm_data,
     )?;
 
+    let vote_threshold =
+        governance_data.resolve_vote_threshold(&realm_data, governing_token_mint_info.key)?;
+
     proposal_data.finalize_vote(
         max_voter_weight,
         &governance_data.config,
         clock.unix_timestamp,
+        &vote_threshold,
     )?;
 
     let mut proposal_owner_record_data = get_token_owner_record_data_for_proposal_owner(

governance/program/src/processor/process_finalize_vote.rs

@@ -137,7 +137,9 @@ impl Default for ProposalState {
     }
 }
 
-/// The type of the vote threshold percentage used to resolve a vote on a Proposal
+/// The type of the vote threshold used to resolve a vote on a Proposal
+///
+/// Note: In the current version only YesVotePercentage and Disabled thresholds are supported
 #[repr(C)]
 #[derive(Clone, Debug, PartialEq, BorshDeserialize, BorshSerialize, BorshSchema)]
 pub enum VoteThreshold {
@@ -152,6 +154,20 @@ pub enum VoteThreshold {
     /// Once the quorum is achieved a simple majority (50%+1) of Yes votes is required for the vote to succeed
     /// Note: Quorum is not implemented in the current version
     QuorumPercentage(u8),
+
+    /// Disabled vote threshold indicates the given voting population (community or council) is not allowed to vote
+    /// on proposals for the given Governance
+    Disabled,
+    //
+    // Absolute vote threshold expressed in the voting mint units
+    // It can be implemented once Solana runtime supports accounts resizing to accommodate u64 size extension
+    // Alternatively we could use the reserved space if it becomes a priority
+    // Absolute(u64)
+    //
+    // Vote threshold which is always accepted
+    // It can be used in a setup where the only security gate is proposal creation
+    // and once created it's automatically approved
+    // Any
 }
 
 /// The type of vote tipping to use on a Proposal.