Use native Anchor accounts for governance addin api (#39)

* chore: use native Anchor accounts for governance addin api

* chore: update and publish npm

Author: SebastianBor

.vscode/settings.json

@@ -1,6 +1,7 @@
 {
   "cSpell.words": [
     "addin",
+    "arrayref",
     "itertools",
     "Keypair",
     "Metaplex",

Cargo.lock

@@ -1,6 +1,6 @@
 {
     "name": "@solana/governance-program-library",
-    "version": "0.13.0",
+    "version": "0.14.0",
     "description": "Client for Governance Program Library which is a set of extensions for Solana's spl-governance program.",
     "author": "Solana Maintainers <[email protected]>",
     "license": "MIT",

package.json

@@ -23,7 +23,6 @@ itertools = "0.10.2"
 mpl-token-metadata = { version = "1.1.0", features = ["no-entrypoint"] }
 solana-program = "1.9.5"
 spl-governance = { version = "2.2.2", features = ["no-entrypoint"] }
-spl-governance-addin-api  = "0.1.1"
 spl-governance-tools=  "0.1.2"
 spl-token = { version = "3.3", features = [ "no-entrypoint" ] }
 

programs/nft-voter/Cargo.toml

@@ -1,7 +1,6 @@
 use anchor_lang::prelude::*;
 use anchor_lang::{Accounts};
 use itertools::Itertools;
-use spl_governance_addin_api::voter_weight::VoterWeightAction;
 use spl_governance_tools::account::create_and_serialize_account_signed;
 use crate::{state::*, id};
 use crate::error::NftVoterError;

programs/nft-voter/src/instructions/cast_nft_vote.rs

@@ -8,8 +8,8 @@ use anchor_lang::prelude::*;
 use anchor_spl::token::Mint;
 use spl_governance::state::realm;
 
-use crate::state::{CollectionConfig, Registrar};
-use crate::{error::NftVoterError, state::MaxVoterWeightRecord};
+use crate::state::{CollectionConfig, Registrar, max_voter_weight_record::MaxVoterWeightRecord};
+use crate::{error::NftVoterError};
 
 /// Configures NFT voting collection which defines what NFTs can be used for governances
 /// and what weight they have

programs/nft-voter/src/instructions/configure_collection.rs

@@ -2,7 +2,7 @@ use anchor_lang::prelude::*;
 use anchor_spl::token::Mint;
 use spl_governance::state::realm;
 
-use crate::state::MaxVoterWeightRecord;
+use crate::state::max_voter_weight_record::MaxVoterWeightRecord;
 
 /// Creates MaxVoterWeightRecord used by spl-gov
 /// This instruction should only be executed once per realm/governing_token_mint to create the account
@@ -44,9 +44,6 @@ pub fn create_max_voter_weight_record(ctx: Context<CreateMaxVoterWeightRecord>)
 
     let max_voter_weight_record = &mut ctx.accounts.max_voter_weight_record;
 
-    max_voter_weight_record.account_discriminator =
-        spl_governance_addin_api::max_voter_weight::MaxVoterWeightRecord::ACCOUNT_DISCRIMINATOR;
-
     max_voter_weight_record.realm = ctx.accounts.realm.key();
     max_voter_weight_record.governing_token_mint = ctx.accounts.realm_governing_token_mint.key();
 

programs/nft-voter/src/instructions/create_max_voter_weight_record.rs

@@ -1,9 +1,8 @@
+use crate::state::*;
 use anchor_lang::prelude::*;
 use anchor_spl::token::Mint;
 use spl_governance::state::realm;
 
-use crate::state::VoterWeightRecord;
-
 /// Creates VoterWeightRecord used by spl-gov
 /// This instruction should only be executed once per realm/governing_token_mint/governing_token_owner
 /// to create the account
@@ -50,9 +49,6 @@ pub fn create_voter_weight_record(
 
     let voter_weight_record = &mut ctx.accounts.voter_weight_record;
 
-    voter_weight_record.account_discriminator =
-        spl_governance_addin_api::voter_weight::VoterWeightRecord::ACCOUNT_DISCRIMINATOR;
-
     voter_weight_record.realm = ctx.accounts.realm.key();
     voter_weight_record.governing_token_mint = ctx.accounts.realm_governing_token_mint.key();
     voter_weight_record.governing_token_owner = governing_token_owner;

programs/nft-voter/src/instructions/create_voter_weight_record.rs

@@ -2,9 +2,8 @@ use anchor_lang::prelude::*;
 use spl_governance::state::{enums::ProposalState, governance, proposal};
 use spl_governance_tools::account::dispose_account;
 use crate::error::NftVoterError;
+use crate::state::*;
 use crate::tools::governance::get_vote_record_address;
-use crate::{state::*};
-
 use crate::state::{get_nft_vote_record_data_for_proposal_and_token_owner, Registrar};
 
 /// Disposes NftVoteRecord and recovers the rent from the accounts   

programs/nft-voter/src/instructions/relinquish_nft_vote.rs

@@ -1,11 +1,9 @@
 use crate::{
-    error::NftVoterError,
-    state::{Registrar, VoterWeightRecord, resolve_nft_vote_weight_and_mint},
+    error::NftVoterError
 };
+use crate::state::*;
 use anchor_lang::prelude::*;
 use itertools::Itertools;
-use spl_governance_addin_api::voter_weight::VoterWeightAction;
-
 
 
 /// Updates VoterWeightRecord to evaluate governance power for non voting use cases: CreateProposal, CreateGovernance etc...