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

governance/chat/program/Cargo.toml

@@ -21,7 +21,7 @@ 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" ]}
 thiserror = "1.0"
 
 

governance/program/Cargo.toml

@@ -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 <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana-program-library"
@@ -26,12 +26,12 @@ 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/program/tests/program_test/addins.rs

@@ -0,0 +1,25 @@
+use lazy_static::lazy_static;
+use solana_program_test::find_file;
+use std::{process::Command, sync::Mutex};
+
+lazy_static! {
+    pub static ref VOTER_WEIGHT_ADDIN_BUILD_GUARD: Mutex::<u8> = Mutex::new(0);
+}
+
+pub fn ensure_voter_weight_addin_is_built() {
+    if find_file("spl_governance_voter_weight_addin.so").is_none() {
+        let guard = VOTER_WEIGHT_ADDIN_BUILD_GUARD.lock().unwrap();
+        if find_file("spl_governance_voter_weight_addin.so").is_none() {
+            assert!(Command::new("cargo")
+                .args(&[
+                    "build-bpf",
+                    "--manifest-path",
+                    "../voter-weight-addin/program/Cargo.toml",
+                ])
+                .status()
+                .expect("Failed to build voter-weight-addin program")
+                .success());
+        }
+        std::mem::drop(guard);
+    }
+}

governance/program/tests/program_test/mod.rs

@@ -52,6 +52,7 @@ use spl_governance::{
     tools::bpf_loader_upgradeable::get_program_data_address,
 };
 
+pub mod addins;
 pub mod cookies;
 
 use crate::program_test::cookies::{
@@ -63,10 +64,13 @@ use spl_governance_test_sdk::{
     ProgramTestBench, TestBenchProgram,
 };
 
-use self::cookies::{
-    GovernanceCookie, GovernedAccountCookie, GovernedMintCookie, GovernedProgramCookie,
-    GovernedTokenCookie, ProposalCookie, ProposalInstructionCookie, RealmCookie,
-    TokenOwnerRecordCookie, VoteRecordCookie,
+use self::{
+    addins::ensure_voter_weight_addin_is_built,
+    cookies::{
+        GovernanceCookie, GovernedAccountCookie, GovernedMintCookie, GovernedProgramCookie,
+        GovernedTokenCookie, ProposalCookie, ProposalInstructionCookie, RealmCookie,
+        TokenOwnerRecordCookie, VoteRecordCookie,
+    },
 };
 
 pub struct GovernanceProgramTest {
@@ -84,6 +88,8 @@ impl GovernanceProgramTest {
 
     #[allow(dead_code)]
     pub async fn start_with_voter_weight_addin() -> Self {
+        ensure_voter_weight_addin_is_built();
+
         Self::start_impl(true).await
     }
 

governance/voter-weight-addin/program/Cargo.toml

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