Governance: add v2 account padding (#2842)

* chore: create RealmV2 account type

* feat: add padding to Realm account

* chore: move RealmConfigArgsV1 and GovernanceInstructionV1 to tests

* chore: Add RealmV2 comments

* chore: rename TokenOwnerRecord to V2 and add reserved space

* feat: translate TokenOwnerRecordV1

* chore: rename Governance to GovernanceV2

* feat: add reserved_v2 to Governance

* chore: make clippy happy

* feat: translate GovernanceV1 accounts

* chore: fix chat build

* fix: update seeds logic for governance V1 accounts

* fix: add check for RealmV1 and GovernanceV1

* chore: add padding to ProposalTransaction

* chore: add padding to VoteRecordV2

* chore: add padding to SignatoryRecord V2

* feat: translate SignatoryRecordV1 account

Author: SebastianBor

governance/chat/program/src/state.rs

@@ -5,7 +5,7 @@ use solana_program::{
     account_info::AccountInfo, clock::UnixTimestamp, program_error::ProgramError, pubkey::Pubkey,
 };
 
-use spl_governance_tools::account::{assert_is_valid_account, AccountMaxSize};
+use spl_governance_tools::account::{assert_is_valid_account_of_type, AccountMaxSize};
 
 /// Defines all GovernanceChat accounts types
 #[repr(C)]
@@ -67,7 +67,7 @@ pub fn assert_is_valid_chat_message(
     program_id: &Pubkey,
     chat_message_info: &AccountInfo,
 ) -> Result<(), ProgramError> {
-    assert_is_valid_account(
+    assert_is_valid_account_of_type(
         chat_message_info,
         GovernanceChatAccountType::ChatMessage,
         program_id,

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

@@ -223,7 +223,7 @@ impl GovernanceChatProgramTest {
         let create_governance_ix = create_governance(
             &self.governance_program_id,
             &realm_address,
-            &governed_account_address,
+            Some(&governed_account_address),
             &token_owner_record_address,
             &self.bench.payer.pubkey(),
             &token_owner.pubkey(),

governance/program/src/addins/voter_weight.rs

@@ -7,7 +7,7 @@ use solana_program::{
 use spl_governance_addin_api::voter_weight::{VoterWeightAction, VoterWeightRecord};
 use spl_governance_tools::account::get_account_data;
 
-use crate::{error::GovernanceError, state::token_owner_record::TokenOwnerRecord};
+use crate::{error::GovernanceError, state::token_owner_record::TokenOwnerRecordV2};
 
 /// Asserts the VoterWeightRecord hasn't expired and matches the given action and target if specified
 pub fn assert_is_valid_voter_weight(
@@ -53,7 +53,7 @@ pub fn get_voter_weight_record_data(
 pub fn get_voter_weight_record_data_for_token_owner_record(
     program_id: &Pubkey,
     voter_weight_record_info: &AccountInfo,
-    token_owner_record: &TokenOwnerRecord,
+    token_owner_record: &TokenOwnerRecordV2,
 ) -> Result<VoterWeightRecord, ProgramError> {
     let voter_weight_record_data =
         get_voter_weight_record_data(program_id, voter_weight_record_info)?;

governance/program/src/processor/process_add_signatory.rs

@@ -12,7 +12,7 @@ use spl_governance_tools::account::create_and_serialize_account_signed;
 use crate::state::{
     enums::GovernanceAccountType,
     proposal::get_proposal_data,
-    signatory_record::{get_signatory_record_address_seeds, SignatoryRecord},
+    signatory_record::{get_signatory_record_address_seeds, SignatoryRecordV2},
     token_owner_record::get_token_owner_record_data_for_proposal_owner,
 };
 
@@ -46,14 +46,15 @@ pub fn process_add_signatory(
 
     token_owner_record_data.assert_token_owner_or_delegate_is_signer(governance_authority_info)?;
 
-    let signatory_record_data = SignatoryRecord {
-        account_type: GovernanceAccountType::SignatoryRecord,
+    let signatory_record_data = SignatoryRecordV2 {
+        account_type: GovernanceAccountType::SignatoryRecordV2,
         proposal: *proposal_info.key,
         signatory,
         signed_off: false,
+        reserved_v2: [0; 8],
     };
 
-    create_and_serialize_account_signed::<SignatoryRecord>(
+    create_and_serialize_account_signed::<SignatoryRecordV2>(
         payer_info,
         signatory_record_info,
         &signatory_record_data,

governance/program/src/processor/process_cancel_proposal.rs

@@ -1,6 +1,5 @@
 //! Program state processor
 
-use borsh::BorshSerialize;
 use solana_program::{
     account_info::{next_account_info, AccountInfo},
     clock::Clock,

governance/program/src/processor/process_cast_vote.rs

@@ -26,8 +26,6 @@ use crate::{
     },
 };
 
-use borsh::BorshSerialize;
-
 /// Processes CastVote instruction
 pub fn process_cast_vote(
     program_id: &Pubkey,
@@ -176,6 +174,8 @@ pub fn process_cast_vote(
         governance_data.serialize(&mut *governance_info.data.borrow_mut())?;
     }
 
+    let governing_token_owner = voter_token_owner_record_data.governing_token_owner;
+
     voter_token_owner_record_data
         .serialize(&mut *voter_token_owner_record_info.data.borrow_mut())?;
 
@@ -185,10 +185,11 @@ pub fn process_cast_vote(
     let vote_record_data = VoteRecordV2 {
         account_type: GovernanceAccountType::VoteRecordV2,
         proposal: *proposal_info.key,
-        governing_token_owner: voter_token_owner_record_data.governing_token_owner,
+        governing_token_owner,
         voter_weight,
         vote,
         is_relinquished: false,
+        reserved_v2: [0; 8],
     };
 
     create_and_serialize_account_signed::<VoteRecordV2>(

governance/program/src/processor/process_create_governance.rs

@@ -3,8 +3,8 @@
 use crate::state::{
     enums::GovernanceAccountType,
     governance::{
-        assert_valid_create_governance_args, get_governance_address_seeds, Governance,
-        GovernanceConfig,
+        assert_valid_create_governance_args, get_governance_address_seeds, GovernanceConfig,
+        GovernanceV2,
     },
     realm::get_realm_data,
 };
@@ -51,17 +51,18 @@ pub fn process_create_governance(
         account_info_iter, // realm_config_info 7, voter_weight_record_info 8
     )?;
 
-    let governance_data = Governance {
-        account_type: GovernanceAccountType::Governance,
+    let governance_data = GovernanceV2 {
+        account_type: GovernanceAccountType::GovernanceV2,
         realm: *realm_info.key,
         governed_account: *governed_account_info.key,
         config,
         proposals_count: 0,
         reserved: [0; 6],
         voting_proposal_count: 0,
+        reserved_v2: [0; 128],
     };
 
-    create_and_serialize_account_signed::<Governance>(
+    create_and_serialize_account_signed::<GovernanceV2>(
         payer_info,
         governance_info,
         &governance_data,

governance/program/src/processor/process_create_mint_governance.rs

@@ -4,8 +4,8 @@ use crate::{
     state::{
         enums::GovernanceAccountType,
         governance::{
-            assert_valid_create_governance_args, get_mint_governance_address_seeds, Governance,
-            GovernanceConfig,
+            assert_valid_create_governance_args, get_mint_governance_address_seeds,
+            GovernanceConfig, GovernanceV2,
         },
         realm::get_realm_data,
     },
@@ -63,17 +63,18 @@ pub fn process_create_mint_governance(
         account_info_iter, // realm_config_info 9, voter_weight_record_info 10
     )?;
 
-    let mint_governance_data = Governance {
-        account_type: GovernanceAccountType::MintGovernance,
+    let mint_governance_data = GovernanceV2 {
+        account_type: GovernanceAccountType::MintGovernanceV2,
         realm: *realm_info.key,
         governed_account: *governed_mint_info.key,
         config,
         proposals_count: 0,
         reserved: [0; 6],
         voting_proposal_count: 0,
+        reserved_v2: [0; 128],
     };
 
-    create_and_serialize_account_signed::<Governance>(
+    create_and_serialize_account_signed::<GovernanceV2>(
         payer_info,
         mint_governance_info,
         &mint_governance_data,

governance/program/src/processor/process_create_program_governance.rs

@@ -1,7 +1,7 @@
 //! Program state processor
 
 use crate::{
-    state::governance::Governance,
+    state::governance::GovernanceV2,
     state::{
         enums::GovernanceAccountType,
         governance::{
@@ -63,17 +63,18 @@ pub fn process_create_program_governance(
         account_info_iter, // realm_config_info 10, voter_weight_record_info 11
     )?;
 
-    let program_governance_data = Governance {
-        account_type: GovernanceAccountType::ProgramGovernance,
+    let program_governance_data = GovernanceV2 {
+        account_type: GovernanceAccountType::ProgramGovernanceV2,
         realm: *realm_info.key,
         governed_account: *governed_program_info.key,
         config,
         proposals_count: 0,
         reserved: [0; 6],
         voting_proposal_count: 0,
+        reserved_v2: [0; 128],
     };
 
-    create_and_serialize_account_signed::<Governance>(
+    create_and_serialize_account_signed::<GovernanceV2>(
         payer_info,
         program_governance_info,
         &program_governance_data,

governance/program/src/processor/process_create_proposal.rs

@@ -1,6 +1,5 @@
 //! Program state processor
 
-use borsh::BorshSerialize;
 use solana_program::{
     account_info::{next_account_info, AccountInfo},
     clock::Clock,