Governance: Voter-weight-addin cleanup (#2512)

* chore: Ensure voter-weight-addin is built for tests

fix: build addin during test run

fix: build voter weight addin for tests using the addin only

chore: use mutex to build addin only once

chore: move build guard to separate file

chore: update governance version for chat

* chore: create tools crate for common utility functions in governance ecosystem

* chore: add test-sdk and tools readme

* chore: rename reserved addins to specific names

* chore: remove todo comment

* chore: remove unnecessary var drop

* chore: move all account tools to shared crate

* chore: fix chat compilation

* chore: move program_id to first position

Author: SebastianBor

Cargo.lock

@@ -13,6 +13,7 @@ members = [
   "governance/voter-weight-addin/program",
   "governance/program",
   "governance/test-sdk",
+  "governance/tools",
   "governance/chat/program",
   "libraries/math",
   "memo/program",

Cargo.toml

@@ -21,7 +21,8 @@ serde = "1.0.127"
 serde_derive = "1.0.103"
 solana-program = "1.8.0"
 spl-token = { version = "3.2", path = "../../../token/program", features = [ "no-entrypoint" ] }
-spl-governance= { version = "2.1.0", path ="../../program", features = [ "no-entrypoint" ]}
+spl-governance= { version = "2.1.2", path ="../../program", features = [ "no-entrypoint" ]}
+spl-governance-tools= { version = "0.1.0", path ="../../tools"}
 thiserror = "1.0"
 
 

governance/chat/program/Cargo.toml

@@ -6,7 +6,6 @@ pub mod error;
 pub mod instruction;
 pub mod processor;
 pub mod state;
-pub mod tools;
 
 // Export current sdk types for downstream users building with a different sdk version
 pub use solana_program;

governance/chat/program/src/lib.rs

@@ -4,7 +4,6 @@ use crate::{
     error::GovernanceChatError,
     instruction::GovernanceChatInstruction,
     state::{assert_is_valid_chat_message, ChatMessage, GovernanceChatAccountType, MessageBody},
-    tools::account::create_and_serialize_account,
 };
 use borsh::BorshDeserialize;
 
@@ -21,6 +20,7 @@ use spl_governance::state::{
     governance::get_governance_data, proposal::get_proposal_data_for_governance,
     token_owner_record::get_token_owner_record_data_for_realm,
 };
+use spl_governance_tools::account::create_and_serialize_account;
 
 /// Processes an instruction
 pub fn process_instruction(

governance/chat/program/src/processor.rs

@@ -4,7 +4,8 @@ use borsh::{BorshDeserialize, BorshSchema, BorshSerialize};
 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, AccountMaxSize};
 
 /// Defines all GovernanceChat accounts types
 #[repr(C)]

governance/chat/program/src/state.rs

@@ -1,6 +1,6 @@
 [package]
 name = "spl-governance"
-version = "2.1.1"
+version = "2.1.2"
 description = "Solana Program Library Governance Program"
 authors = ["Solana Maintainers <[email protected]>"]
 repository = "https://github.com/solana-labs/solana-program-library"
@@ -21,17 +21,18 @@ serde = "1.0.130"
 serde_derive = "1.0.103"
 solana-program = "1.8.0"
 spl-token = { version = "3.2", path = "../../token/program", features = [ "no-entrypoint" ] }
+spl-governance-tools= { version = "0.1.0", path ="../tools"}
 thiserror = "1.0"
 
 [dev-dependencies]
 assert_matches = "1.5.0"
 base64 = "0.13"
+lazy_static = "1.4.0"
 proptest = "1.0"
 solana-program-test = "1.8.0"
 solana-sdk = "1.8.0"
 spl-governance-test-sdk = { version = "0.1.0", path ="../test-sdk"}
 spl-governance-v1 = {package="spl-governance", version = "1.1.1", features = [ "no-entrypoint" ] }
 
-
 [lib]
 crate-type = ["cdylib", "lib"]

governance/chat/program/src/tools/account.rs

@@ -9,12 +9,9 @@ use solana_program::{
     pubkey::Pubkey,
     sysvar::Sysvar,
 };
+use spl_governance_tools::account::{get_account_data, AccountMaxSize};
 
-use crate::{
-    error::GovernanceError,
-    state::token_owner_record::TokenOwnerRecord,
-    tools::account::{get_account_data, AccountMaxSize},
-};
+use crate::{error::GovernanceError, state::token_owner_record::TokenOwnerRecord};
 
 /// VoterWeight account type
 #[derive(Clone, Debug, PartialEq, BorshDeserialize, BorshSerialize, BorshSchema)]
@@ -82,7 +79,7 @@ pub fn get_voter_weight_record_data(
     program_id: &Pubkey,
     voter_weight_record_info: &AccountInfo,
 ) -> Result<VoterWeightRecord, ProgramError> {
-    get_account_data::<VoterWeightRecord>(voter_weight_record_info, program_id)
+    get_account_data::<VoterWeightRecord>(program_id, voter_weight_record_info)
 }
 
 /// Deserializes VoterWeightRecord account, checks owner program and asserts it's for the same realm, mint and token owner as the provided TokenOwnerRecord