Skip to content

[DRAFT] chore: convert custom group/member PDAs to native Token22 #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[DRAFT] chore: convert custom group/member PDAs to native Token22 #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 22 additions & 25 deletions programs/wen_new_standard/src/instructions/group/create.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,15 @@ use anchor_lang::{prelude::*, solana_program::entrypoint::ProgramResult};
use anchor_spl::{
associated_token::AssociatedToken,
token_interface::{
mint_to, set_authority, spl_token_2022::instruction::AuthorityType,
mint_to, set_authority,
spl_token_2022::instruction::AuthorityType,
token_group::{token_group_initialize, TokenGroupInitialize},
token_metadata_initialize, Mint, MintTo, SetAuthority, Token2022, TokenAccount,
TokenMetadataInitialize,
},
};

use crate::{
update_account_lamports_to_minimum_balance, Manager, TokenGroup, GROUP_ACCOUNT_SEED,
MANAGER_SEED,
};
use crate::{update_account_lamports_to_minimum_balance, Manager, MANAGER_SEED};

#[derive(AnchorDeserialize, AnchorSerialize)]
pub struct CreateGroupAccountArgs {
Expand All @@ -31,14 +30,6 @@ pub struct CreateGroupAccount<'info> {
#[account()]
/// CHECK: can be any account
pub receiver: UncheckedAccount<'info>,
#[account(
init,
seeds = [GROUP_ACCOUNT_SEED, mint.key().as_ref()],
bump,
payer = payer,
space = 8 + TokenGroup::INIT_SPACE
)]
pub group: Account<'info, TokenGroup>,
#[account(
init,
signer,
Expand All @@ -49,9 +40,8 @@ pub struct CreateGroupAccount<'info> {
mint::freeze_authority = manager,
extensions::metadata_pointer::authority = authority,
extensions::metadata_pointer::metadata_address = mint,
// group pointer authority is left as the manager so that it can be updated once token group support inside mint is added
extensions::group_pointer::authority = manager,
extensions::group_pointer::group_address = group,
extensions::group_pointer::authority = authority,
extensions::group_pointer::group_address = mint,
// temporary mint close authority until a better program accounts can be used
extensions::close_authority::authority = manager,
)]
Expand Down Expand Up @@ -88,6 +78,19 @@ impl<'info> CreateGroupAccount<'info> {
Ok(())
}

fn initialize_group(&self, max_size: u32) -> Result<()> {
let cpi_accounts = TokenGroupInitialize {
group: self.mint.to_account_info(),
mint: self.mint.to_account_info(),
mint_authority: self.authority.to_account_info(),
token_program_id: self.token_program.to_account_info(),
};

let cpi_ctx = CpiContext::new(self.token_program.to_account_info(), cpi_accounts);
token_group_initialize(cpi_ctx, Some(self.authority.key()), max_size)?;
Ok(())
}

fn mint_to_receiver(&self) -> Result<()> {
let cpi_ctx = MintTo {
mint: self.mint.to_account_info(),
Expand All @@ -105,9 +108,7 @@ impl<'info> CreateGroupAccount<'info> {
account_or_mint: self.mint.to_account_info(),
};
let cpi_ctx = CpiContext::new(self.token_program.to_account_info(), cpi_accounts);
// manager needs to be the new authority so that when solana upgrades to support group accounts, the mint can be updated
// this will updated to None once solana supports group accounts
set_authority(cpi_ctx, AuthorityType::MintTokens, Some(self.manager.key()))?;
set_authority(cpi_ctx, AuthorityType::MintTokens, None)?;
Ok(())
}
}
Expand All @@ -117,12 +118,8 @@ pub fn handler(ctx: Context<CreateGroupAccount>, args: CreateGroupAccountArgs) -
ctx.accounts
.initialize_metadata(args.name, args.symbol, args.uri)?;

// using a custom group account until token22 implements group account
let group = &mut ctx.accounts.group;
group.max_size = args.max_size;
group.update_authority = ctx.accounts.authority.key();
group.mint = ctx.accounts.mint.key();
group.size = 0;
// initialize group account
ctx.accounts.initialize_group(args.max_size)?;

// mint to receiver
ctx.accounts.mint_to_receiver()?;
Expand Down
8 changes: 3 additions & 5 deletions programs/wen_new_standard/src/instructions/mint/create.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ pub struct CreateMintAccount<'info> {
mint::freeze_authority = manager,
extensions::metadata_pointer::authority = authority,
extensions::metadata_pointer::metadata_address = mint,
extensions::group_member_pointer::authority = manager,
extensions::group_member_pointer::authority = authority,
extensions::group_member_pointer::member_address = mint,
extensions::transfer_hook::authority = authority,
extensions::permanent_delegate::delegate = args.permanent_delegate.unwrap_or_else(|| manager.key()),
// temporary mint close authority until a better program accounts can be used
Expand Down Expand Up @@ -101,9 +102,7 @@ impl<'info> CreateMintAccount<'info> {
account_or_mint: self.mint.to_account_info(),
};
let cpi_ctx = CpiContext::new(self.token_program.to_account_info(), cpi_accounts);
// manager needs to be the new authority so that when solana upgrades to support member accounts, the mint can be updated
// this will updated to None once solana supports member accounts
set_authority(cpi_ctx, AuthorityType::MintTokens, Some(self.manager.key()))?;
set_authority(cpi_ctx, AuthorityType::MintTokens, None)?;
Ok(())
}

Expand Down Expand Up @@ -139,7 +138,6 @@ pub fn handler(ctx: Context<CreateMintAccount>, args: CreateMintAccountArgs) ->

// remove mint authority
ctx.accounts.update_mint_authority()?;
// TODO: Once Token Extension program supports Group/Member accounts natively, should lock Mint Authority

// transfer minimum rent to mint account
update_account_lamports_to_minimum_balance(
Expand Down
77 changes: 24 additions & 53 deletions programs/wen_new_standard/src/instructions/mint/group/add.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
use anchor_lang::prelude::*;

use anchor_spl::token_interface::{
group_member_pointer_update, GroupMemberPointerUpdate, Mint, Token2022,
};

use crate::{
get_bump_in_seed_form, Manager, TokenGroup, TokenGroupMember, MANAGER_SEED,
MEMBER_ACCOUNT_SEED, TOKEN22,
use anchor_spl::{
token_2022::ID as TOKEN_2022_PROGRAM_ID,
token_interface::{
token_group::{token_member_initialize, TokenMemberInitialize},
Mint, Token2022,
},
};

#[derive(Accounts)]
Expand All @@ -15,69 +14,41 @@ pub struct AddGroup<'info> {
#[account(mut)]
pub payer: Signer<'info>,
#[account()]
pub authority: Signer<'info>,
pub group_update_authority: Signer<'info>,
#[account()]
pub member_mint_authority: Signer<'info>,
#[account(
mut,
constraint = group.update_authority == authority.key(),
mint::token_program = TOKEN_2022_PROGRAM_ID
)]
pub group: Account<'info, TokenGroup>,
pub group_mint: Box<InterfaceAccount<'info, Mint>>,
#[account(
init,
seeds = [MEMBER_ACCOUNT_SEED, mint.key().as_ref()],
bump,
payer = payer,
space = 8 + TokenGroupMember::INIT_SPACE
)]
pub member: Account<'info, TokenGroupMember>,
#[account(
mint::token_program = TOKEN22
mut,
mint::token_program = TOKEN_2022_PROGRAM_ID
)]
pub mint: Box<InterfaceAccount<'info, Mint>>,
#[account(
seeds = [MANAGER_SEED],
bump
)]
pub manager: Box<Account<'info, Manager>>,
pub system_program: Program<'info, System>,
pub token_program: Program<'info, Token2022>,
}

impl AddGroup<'_> {
fn update_group_member_pointer_member_address(
&self,
member: Pubkey,
signer_seeds: &[&[&[u8]]],
) -> Result<()> {
let cpi_accounts = GroupMemberPointerUpdate {
fn initialize_token_member(&self) -> Result<()> {
let cpi_accounts = TokenMemberInitialize {
token_program_id: self.token_program.to_account_info(),
mint: self.mint.to_account_info(),
authority: self.manager.to_account_info(),
group: self.group_mint.to_account_info(),
member: self.mint.to_account_info(),
member_mint: self.mint.to_account_info(),
group_update_authority: self.group_update_authority.to_account_info(),
member_mint_authority: self.member_mint_authority.to_account_info(),
};
let cpi_ctx = CpiContext::new_with_signer(
self.token_program.to_account_info(),
cpi_accounts,
signer_seeds,
);
group_member_pointer_update(cpi_ctx, Some(member))?;

let cpi_ctx = CpiContext::new(self.token_program.to_account_info(), cpi_accounts);
token_member_initialize(cpi_ctx)?;
Ok(())
}
}

pub fn handler(ctx: Context<AddGroup>) -> Result<()> {
let group = &mut ctx.accounts.group;
group.increment_size()?;

let member = &mut ctx.accounts.member;
member.group = group.key();
member.mint = ctx.accounts.mint.key();
member.member_number = group.size;

let member_address = member.key();

let signer_seeds = &[MANAGER_SEED, &get_bump_in_seed_form(&ctx.bumps.manager)];

ctx.accounts
.update_group_member_pointer_member_address(member_address, &[&signer_seeds[..]])?;

ctx.accounts.initialize_token_member()?;
Ok(())
}
32 changes: 9 additions & 23 deletions tests/wen_new_standard.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,7 +605,6 @@ describe("wen_new_standard", () => {
mint: groupMintPublicKey,
authority: groupAuthorityPublicKey,
receiver: groupAuthorityPublicKey,
group,
associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
tokenProgram: TOKEN_2022_PROGRAM_ID,
payer,
Expand Down Expand Up @@ -745,12 +744,11 @@ describe("wen_new_standard", () => {
await program.methods
.addMintToGroup()
.accountsStrict({
authority: groupAuthorityPublicKey,
group,
groupMint: groupMintPublicKey,
memberMintAuthority: mintAuthPublicKey,
groupUpdateAuthority: groupAuthorityPublicKey,
mint: mintPublicKey,
payer: mintAuthPublicKey,
manager,
member,
systemProgram: SystemProgram.programId,
tokenProgram: TOKEN_2022_PROGRAM_ID,
})
Expand All @@ -761,26 +759,15 @@ describe("wen_new_standard", () => {
preflightCommitment: "confirmed",
commitment: "confirmed",
});

memberAccountInfo = await program.account.tokenGroupMember.getAccountInfo(
member
);
memberAccount = program.coder.accounts.decode(
"tokenGroupMember",
memberAccountInfo.data
);
});

it("should be an account owned by the program", async () => {
expect(memberAccountInfo.owner).to.eql(program.programId);
});
it("should point back to the group", async () => {
it.skip("should point back to the group", async () => {
expect(memberAccount.group).to.eql(group);
});
it("should have the right member number", async () => {
it.skip("should have the right member number", async () => {
expect(memberAccount.memberNumber.toString()).to.eql("1");
});
it("should have the right member mint", async () => {
it.skip("should have the right member mint", async () => {
expect(memberAccount.mint).to.eql(mintPublicKey);
});
});
Expand Down Expand Up @@ -841,12 +828,11 @@ describe("wen_new_standard", () => {
await program.methods
.addMintToGroup()
.accountsStrict({
authority: groupAuthorityPublicKey,
group,
groupMint: groupMintPublicKey,
memberMintAuthority: mintAuthPublicKey,
groupUpdateAuthority: groupAuthorityPublicKey,
mint: mintPublicKey,
payer: mintAuthPublicKey,
manager,
member,
systemProgram: SystemProgram.programId,
tokenProgram: TOKEN_2022_PROGRAM_ID,
})
Expand Down