Governance: use runtime program_id (#1947)

* feat: use runtime program_id
* chore: make clippy happy

Author: SebastianBor

governance/program/src/instruction.rs

@@ -11,7 +11,5 @@ pub mod tools;
 // Export current sdk types for downstream users building with a different sdk version
 pub use solana_program;
 
-solana_program::declare_id!("GovernancerdmUu324nahyv33G5poQdLUEZ1nEytDeP");
-
 /// Seed prefix for Governance  PDAs
 pub const PROGRAM_AUTHORITY_SEED: &[u8] = b"governance";

governance/program/src/lib.rs

@@ -84,7 +84,7 @@ pub fn process_instruction(
 
         GovernanceInstruction::SetGovernanceDelegate {
             new_governance_delegate,
-        } => process_set_governance_delegate(accounts, &new_governance_delegate),
+        } => process_set_governance_delegate(program_id, accounts, &new_governance_delegate),
 
         GovernanceInstruction::CreateProgramGovernance {
             config,

governance/program/src/processor/mod.rs

@@ -39,10 +39,11 @@ pub fn process_add_signatory(
     let rent_sysvar_info = next_account_info(account_info_iter)?; // 6
     let rent = &Rent::from_account_info(rent_sysvar_info)?;
 
-    let mut proposal_data = get_proposal_data(proposal_info)?;
+    let mut proposal_data = get_proposal_data(program_id, proposal_info)?;
     proposal_data.assert_can_edit_signatories()?;
 
     let token_owner_record_data = get_token_owner_record_data_for_proposal_owner(
+        program_id,
         token_owner_record_info,
         &proposal_data.token_owner_record,
     )?;

governance/program/src/processor/process_add_signatory.rs

@@ -15,7 +15,7 @@ use crate::state::{
 };
 
 /// Processes CancelProposal instruction
-pub fn process_cancel_proposal(_program_id: &Pubkey, accounts: &[AccountInfo]) -> ProgramResult {
+pub fn process_cancel_proposal(program_id: &Pubkey, accounts: &[AccountInfo]) -> ProgramResult {
     let account_info_iter = &mut accounts.iter();
 
     let proposal_info = next_account_info(account_info_iter)?; // 0
@@ -25,10 +25,11 @@ pub fn process_cancel_proposal(_program_id: &Pubkey, accounts: &[AccountInfo]) -
     let clock_info = next_account_info(account_info_iter)?; // 3
     let clock = Clock::from_account_info(clock_info)?;
 
-    let mut proposal_data = get_proposal_data(proposal_info)?;
+    let mut proposal_data = get_proposal_data(program_id, proposal_info)?;
     proposal_data.assert_can_cancel()?;
 
     let token_owner_record_data = get_token_owner_record_data_for_proposal_owner(
+        program_id,
         token_owner_record_info,
         &proposal_data.token_owner_record,
     )?;

governance/program/src/processor/process_cancel_proposal.rs

@@ -53,16 +53,18 @@ pub fn process_cast_vote(
         return Err(GovernanceError::VoteAlreadyExists.into());
     }
 
-    let governance_data = get_governance_data(governance_info)?;
+    let governance_data = get_governance_data(program_id, governance_info)?;
 
     let mut proposal_data = get_proposal_data_for_governance_and_governing_mint(
+        program_id,
         &proposal_info,
         governance_info.key,
         governing_token_mint_info.key,
     )?;
     proposal_data.assert_can_cast_vote(&governance_data.config, clock.slot)?;
 
     let mut token_owner_record_data = get_token_owner_record_data_for_realm_and_governing_mint(
+        program_id,
         &token_owner_record_info,
         &governance_data.config.realm,
         governing_token_mint_info.key,

governance/program/src/processor/process_cast_vote.rs

@@ -34,7 +34,7 @@ pub fn process_create_account_governance(
     let rent_sysvar_info = next_account_info(account_info_iter)?; // 3
     let rent = &Rent::from_account_info(rent_sysvar_info)?;
 
-    assert_is_valid_governance_config(&config, realm_info)?;
+    assert_is_valid_governance_config(program_id, &config, realm_info)?;
 
     let account_governance_data = Governance {
         account_type: GovernanceAccountType::AccountGovernance,

governance/program/src/processor/process_create_account_governance.rs

@@ -47,7 +47,7 @@ pub fn process_create_program_governance(
     let rent_sysvar_info = next_account_info(account_info_iter)?; // 6
     let rent = &Rent::from_account_info(rent_sysvar_info)?;
 
-    assert_is_valid_governance_config(&config, &realm_info)?;
+    assert_is_valid_governance_config(program_id, &config, &realm_info)?;
 
     let program_governance_data = Governance {
         account_type: GovernanceAccountType::ProgramGovernance,

governance/program/src/processor/process_create_program_governance.rs

@@ -50,9 +50,10 @@ pub fn process_create_proposal(
         return Err(GovernanceError::ProposalAlreadyExists.into());
     }
 
-    let mut governance_data = get_governance_data(governance_info)?;
+    let mut governance_data = get_governance_data(program_id, governance_info)?;
 
     let token_owner_record_data = get_token_owner_record_data_for_realm_and_governing_mint(
+        program_id,
         &token_owner_record_info,
         &governance_data.config.realm,
         &governing_token_mint,

governance/program/src/processor/process_create_proposal.rs

@@ -47,7 +47,7 @@ pub fn process_deposit_governing_tokens(
     let rent_sysvar_info = next_account_info(account_info_iter)?; // 9
     let rent = &Rent::from_account_info(rent_sysvar_info)?;
 
-    let realm_data = get_realm_data(realm_info)?;
+    let realm_data = get_realm_data(program_id, realm_info)?;
     let governing_token_mint = get_spl_token_mint(governing_token_holding_info)?;
 
     realm_data.assert_is_valid_governing_token_mint(&governing_token_mint)?;
@@ -100,6 +100,7 @@ pub fn process_deposit_governing_tokens(
         )?;
     } else {
         let mut token_owner_record_data = get_token_owner_record_data_for_seeds(
+            program_id,
             token_owner_record_info,
             &token_owner_record_address_seeds,
         )?;