Governance: Remove proposal counter (#127)

* feat: Use proposal seed instead of index

* chore: Rename and reset legacy1 to reserved1

* chore: Make Clippy happy

* chore: Fix Chat tests compilation

Author: SebastianBor

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

@@ -259,8 +259,9 @@ impl GovernanceChatProgramTest {
         let proposal_name = "Proposal #1".to_string();
         let description_link = "Proposal Description".to_string();
         let options = vec!["Yes".to_string()];
-        let proposal_index: u32 = 0;
+
         let use_deny_option = true;
+        let proposal_seed = Pubkey::new_unique();
 
         let create_proposal_ix = create_proposal(
             &self.governance_program_id,
@@ -276,7 +277,7 @@ impl GovernanceChatProgramTest {
             VoteType::SingleChoice,
             options,
             use_deny_option,
-            proposal_index,
+            &proposal_seed,
         );
 
         self.bench
@@ -288,7 +289,7 @@ impl GovernanceChatProgramTest {
             &self.governance_program_id,
             &governance_address,
             &governing_token_mint_keypair.pubkey(),
-            &proposal_index.to_le_bytes(),
+            &proposal_seed,
         );
 
         ProposalCookie {

governance/program/src/instruction.rs

@@ -165,8 +165,8 @@ pub enum GovernanceInstruction {
     /// Creates Proposal account for Transactions which will be executed at some point in the future
     ///
     ///   0. `[]` Realm account the created Proposal belongs to
-    ///   1. `[writable]` Proposal account. PDA seeds ['governance',governance, governing_token_mint, proposal_index]
-    ///   2. `[writable]` Governance account
+    ///   1. `[writable]` Proposal account. PDA seeds ['governance',governance, governing_token_mint, proposal_seed]
+    ///   2. `[]` Governance account
     ///   3. `[writable]` TokenOwnerRecord account of the Proposal owner
     ///   4. `[]` Governing Token Mint the Proposal is created for
     ///   5. `[signer]` Governance Authority (Token Owner or Governance Delegate)
@@ -196,6 +196,10 @@ pub enum GovernanceInstruction {
         /// A proposal without the rejecting option is a non binding survey
         /// Only proposals with the rejecting option can have executable transactions
         use_deny_option: bool,
+
+        #[allow(dead_code)]
+        /// Unique seed for the Proposal PDA
+        proposal_seed: Pubkey,
     },
 
     /// Adds a signatory to the Proposal which means this Proposal can't leave Draft state until yet another Signatory signs
@@ -897,19 +901,15 @@ pub fn create_proposal(
     vote_type: VoteType,
     options: Vec<String>,
     use_deny_option: bool,
-    proposal_index: u32,
+    proposal_seed: &Pubkey,
 ) -> Instruction {
-    let proposal_address = get_proposal_address(
-        program_id,
-        governance,
-        governing_token_mint,
-        &proposal_index.to_le_bytes(),
-    );
+    let proposal_address =
+        get_proposal_address(program_id, governance, governing_token_mint, proposal_seed);
 
     let mut accounts = vec![
         AccountMeta::new_readonly(*realm, false),
         AccountMeta::new(proposal_address, false),
-        AccountMeta::new(*governance, false),
+        AccountMeta::new_readonly(*governance, false),
         AccountMeta::new(*proposal_owner_record, false),
         AccountMeta::new_readonly(*governing_token_mint, false),
         AccountMeta::new_readonly(*governance_authority, true),
@@ -925,6 +925,7 @@ pub fn create_proposal(
         vote_type,
         options,
         use_deny_option,
+        proposal_seed: *proposal_seed,
     };
 
     Instruction {

governance/program/src/processor/mod.rs

@@ -146,6 +146,7 @@ pub fn process_instruction(
             vote_type: proposal_type,
             options,
             use_deny_option,
+            proposal_seed,
         } => process_create_proposal(
             program_id,
             accounts,
@@ -154,6 +155,7 @@ pub fn process_instruction(
             proposal_type,
             options,
             use_deny_option,
+            proposal_seed,
         ),
         GovernanceInstruction::AddSignatory { signatory } => {
             process_add_signatory(program_id, accounts, signatory)

governance/program/src/processor/process_create_governance.rs

@@ -56,8 +56,7 @@ pub fn process_create_governance(
         realm: *realm_info.key,
         governed_account: *governed_account_info.key,
         config,
-        proposals_count: 0,
-
+        reserved1: 0,
         reserved_v2: [0; 128],
     };
 

governance/program/src/processor/process_create_mint_governance.rs

@@ -68,7 +68,7 @@ pub fn process_create_mint_governance(
         realm: *realm_info.key,
         governed_account: *governed_mint_info.key,
         config,
-        proposals_count: 0,
+        reserved1: 0,
         reserved_v2: [0; 128],
     };
 

governance/program/src/processor/process_create_program_governance.rs

@@ -68,7 +68,7 @@ pub fn process_create_program_governance(
         realm: *realm_info.key,
         governed_account: *governed_program_info.key,
         config,
-        proposals_count: 0,
+        reserved1: 0,
         reserved_v2: [0; 128],
     };
 

governance/program/src/processor/process_create_proposal.rs

@@ -28,6 +28,7 @@ use crate::{
 };
 
 /// Processes CreateProposal instruction
+#[allow(clippy::too_many_arguments)]
 pub fn process_create_proposal(
     program_id: &Pubkey,
     accounts: &[AccountInfo],
@@ -36,6 +37,7 @@ pub fn process_create_proposal(
     vote_type: VoteType,
     options: Vec<String>,
     use_deny_option: bool,
+    proposal_seed: Pubkey,
 ) -> ProgramResult {
     let account_info_iter = &mut accounts.iter();
 
@@ -63,7 +65,7 @@ pub fn process_create_proposal(
         governing_token_mint_info.key,
     )?;
 
-    let mut governance_data =
+    let governance_data =
         get_governance_data_for_realm(program_id, governance_info, realm_info.key)?;
 
     governance_data.assert_governing_token_mint_can_vote(
@@ -169,15 +171,12 @@ pub fn process_create_proposal(
         &get_proposal_address_seeds(
             governance_info.key,
             governing_token_mint_info.key,
-            &governance_data.proposals_count.to_le_bytes(),
+            &proposal_seed,
         ),
         program_id,
         system_info,
         &rent,
     )?;
 
-    governance_data.proposals_count = governance_data.proposals_count.checked_add(1).unwrap();
-    governance_data.serialize(&mut *governance_info.data.borrow_mut())?;
-
     Ok(())
 }

governance/program/src/processor/process_create_token_governance.rs

@@ -66,7 +66,7 @@ pub fn process_create_token_governance(
         realm: *realm_info.key,
         governed_account: *governed_token_info.key,
         config,
-        proposals_count: 0,
+        reserved1: 0,
         reserved_v2: [0; 128],
     };
 

governance/program/src/state/governance.rs

@@ -84,8 +84,8 @@ pub struct GovernanceV2 {
     /// or upgrade_authority for a Program account should be transferred to the Governance PDA
     pub governed_account: Pubkey,
 
-    /// Running count of proposals
-    pub proposals_count: u32,
+    /// Reserved space for future versions
+    pub reserved1: u32,
 
     /// Governance config
     pub config: GovernanceConfig,
@@ -192,7 +192,7 @@ impl GovernanceV2 {
                 account_type: self.account_type,
                 realm: self.realm,
                 governed_account: self.governed_account,
-                proposals_count: self.proposals_count,
+                proposals_count: 0,
                 config: self.config,
             };
 
@@ -282,9 +282,8 @@ pub fn get_governance_data(
             account_type,
             realm: governance_data_v1.realm,
             governed_account: governance_data_v1.governed_account,
-            proposals_count: governance_data_v1.proposals_count,
+            reserved1: 0,
             config: governance_data_v1.config,
-            // Add the extra reserved_v2 padding
             reserved_v2: [0; 128],
         }
     } else {
@@ -318,6 +317,9 @@ pub fn get_governance_data(
         // Reset voting_cool_off_time and reserved space previously used for voting_proposal_count
         governance_data.config.voting_cool_off_time = 0;
         governance_data.config.reserved = 0;
+
+        // Reset reserved space previously used for proposal_count
+        governance_data.reserved1 = 0;
     }
 
     Ok(governance_data)
@@ -537,7 +539,7 @@ mod test {
             account_type: GovernanceAccountType::GovernanceV2,
             realm: Pubkey::new_unique(),
             governed_account: Pubkey::new_unique(),
-            proposals_count: 10,
+            reserved1: 0,
             config: create_test_governance_config(),
             reserved_v2: [0; 128],
         }

governance/program/src/state/proposal.rs

@@ -1023,13 +1023,13 @@ pub fn get_proposal_data_for_governance(
 pub fn get_proposal_address_seeds<'a>(
     governance: &'a Pubkey,
     governing_token_mint: &'a Pubkey,
-    proposal_index_le_bytes: &'a [u8],
+    proposal_seed: &'a Pubkey,
 ) -> [&'a [u8]; 4] {
     [
         PROGRAM_AUTHORITY_SEED,
         governance.as_ref(),
         governing_token_mint.as_ref(),
-        proposal_index_le_bytes,
+        proposal_seed.as_ref(),
     ]
 }
 
@@ -1038,10 +1038,10 @@ pub fn get_proposal_address<'a>(
     program_id: &Pubkey,
     governance: &'a Pubkey,
     governing_token_mint: &'a Pubkey,
-    proposal_index_le_bytes: &'a [u8],
+    proposal_seed: &'a Pubkey,
 ) -> Pubkey {
     Pubkey::find_program_address(
-        &get_proposal_address_seeds(governance, governing_token_mint, proposal_index_le_bytes),
+        &get_proposal_address_seeds(governance, governing_token_mint, proposal_seed),
         program_id,
     )
     .0