From 6552b24139ef50f20c39ff9c2f25812f1ea82716 Mon Sep 17 00:00:00 2001 From: s-medvedev <40623263+s-medvedev@users.noreply.github.com> Date: Wed, 11 May 2022 17:06:14 +0300 Subject: [PATCH] Place VoterWeightRecord and MaxVoterWeightRecord by default address #31 (#32) Co-authored-by: Semen Medvedev --- addin-fixed-weights/program/src/instruction.rs | 4 ++-- addin-fixed-weights/program/src/processor.rs | 4 ++-- addin-vesting/program/src/max_voter_weight.rs | 2 +- addin-vesting/program/src/voter_weight.rs | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/addin-fixed-weights/program/src/instruction.rs b/addin-fixed-weights/program/src/instruction.rs index 06e3218..ef6c02b 100644 --- a/addin-fixed-weights/program/src/instruction.rs +++ b/addin-fixed-weights/program/src/instruction.rs @@ -49,13 +49,13 @@ pub enum VoterWeightAddinInstruction { /// Get VoterVeightRecord account address and bump seed pub fn get_voter_weight_address(program_id: &Pubkey, realm: &Pubkey, governing_token_mint: &Pubkey, governing_token_owner: &Pubkey) -> (Pubkey, u8) { - let seeds: &[&[u8]] = &[b"voter_weight", &realm.to_bytes(), &governing_token_mint.to_bytes(), &governing_token_owner.to_bytes()]; + let seeds: &[&[u8]] = &[b"voter-weight-record", &realm.to_bytes(), &governing_token_mint.to_bytes(), &governing_token_owner.to_bytes()]; Pubkey::find_program_address(seeds, program_id) } /// Get MaxVoterVeightRecord account address and bump seed pub fn get_max_voter_weight_address(program_id: &Pubkey, realm: &Pubkey, governing_token_mint: &Pubkey) -> (Pubkey, u8) { - let seeds: &[&[u8]] = &[b"max_voter_weight", &realm.to_bytes(), &governing_token_mint.to_bytes()]; + let seeds: &[&[u8]] = &[b"max-voter-weight-record", &realm.to_bytes(), &governing_token_mint.to_bytes()]; Pubkey::find_program_address(seeds, program_id) } diff --git a/addin-fixed-weights/program/src/processor.rs b/addin-fixed-weights/program/src/processor.rs index 4f76223..3863bf4 100644 --- a/addin-fixed-weights/program/src/processor.rs +++ b/addin-fixed-weights/program/src/processor.rs @@ -88,7 +88,7 @@ pub fn process_setup_voter_weight_record( reserved: [0; 8], }; - let seeds: &[&[u8]] = &[b"voter_weight", &realm_info.key.to_bytes(), &governing_token_mint_info.key.to_bytes(), &governing_token_owner_info.key.to_bytes()]; + let seeds: &[&[u8]] = &[b"voter-weight-record", &realm_info.key.to_bytes(), &governing_token_mint_info.key.to_bytes(), &governing_token_owner_info.key.to_bytes()]; let rent = Rent::get()?; create_and_serialize_account_signed( @@ -180,7 +180,7 @@ pub fn process_setup_max_voter_weight_record( reserved: [0; 8], }; - let seeds: &[&[u8]] = &[b"max_voter_weight", &realm_info.key.to_bytes(), &governing_token_mint_info.key.to_bytes()]; + let seeds: &[&[u8]] = &[b"max-voter-weight-record", &realm_info.key.to_bytes(), &governing_token_mint_info.key.to_bytes()]; let rent = Rent::get()?; create_and_serialize_account_signed( diff --git a/addin-vesting/program/src/max_voter_weight.rs b/addin-vesting/program/src/max_voter_weight.rs index b3ff8cf..46de681 100644 --- a/addin-vesting/program/src/max_voter_weight.rs +++ b/addin-vesting/program/src/max_voter_weight.rs @@ -16,7 +16,7 @@ pub fn get_max_voter_weight_record_seeds<'a>( realm: &'a Pubkey, mint: &'a Pubkey, ) -> [&'a [u8]; 3] { - [b"max_voter_weight", realm.as_ref(), mint.as_ref()] + [b"max-voter-weight-record", realm.as_ref(), mint.as_ref()] } /// Returns MaxVoterWeightRecord PDA address diff --git a/addin-vesting/program/src/voter_weight.rs b/addin-vesting/program/src/voter_weight.rs index e8d1b12..070fb4c 100644 --- a/addin-vesting/program/src/voter_weight.rs +++ b/addin-vesting/program/src/voter_weight.rs @@ -90,7 +90,7 @@ pub fn get_voter_weight_record_seeds<'a>( mint: &'a Pubkey, owner: &'a Pubkey, ) -> [&'a [u8]; 4] { - [b"voter_weight", realm.as_ref(), mint.as_ref(), owner.as_ref()] + [b"voter-weight-record", realm.as_ref(), mint.as_ref(), owner.as_ref()] } /// Returns ExtendedVoterWeightRecord PDA address