refactor: extract instruction handlers for cutils, nft-operations, group, permanent-delegate

mikemaccana-edwardbot · mikemaccana-edwardbot · commit c4811848b2b7 · 2026-04-17T02:36:24.000Z
- compression/cutils: rename actions/ → instructions/, update mod references
- tokens/nft-operations: rename contexts/ → instructions/, rename handlers to handler()
- tokens/token-2022/group: extract handler and context into instructions/
- tokens/token-2022/permanent-delegate: extract handler and context into instructions/

All programs now follow the standard instructions/ directory pattern matching anchor init.
diff --git a/compression/cutils/anchor/programs/cutils/src/instructions/mint.rs b/compression/cutils/anchor/programs/cutils/src/instructions/mint.rs
diff --git a/compression/cutils/anchor/programs/cutils/src/instructions/mod.rs b/compression/cutils/anchor/programs/cutils/src/instructions/mod.rs
diff --git a/compression/cutils/anchor/programs/cutils/src/instructions/verify.rs b/compression/cutils/anchor/programs/cutils/src/instructions/verify.rs
diff --git a/compression/cutils/anchor/programs/cutils/src/lib.rs b/compression/cutils/anchor/programs/cutils/src/lib.rs
@@ -1,5 +1,5 @@
-pub mod actions;
-pub use actions::*;
+pub mod instructions;
+pub use instructions::*;
 
 pub mod bubblegum_types;
 
diff --git a/tokens/nft-operations/anchor/programs/mint-nft/src/instructions/create_collection.rs b/tokens/nft-operations/anchor/programs/mint-nft/src/instructions/create_collection.rs
@@ -63,7 +63,7 @@ pub struct CreateCollection<'info> {
     token_metadata_program: Program<'info, Metadata>,
 }
 
-pub fn handle_create_collection(accounts: &mut CreateCollection, bumps: &CreateCollectionBumps) -> Result<()> {
+pub fn handler(accounts: &mut CreateCollection, bumps: &CreateCollectionBumps) -> Result<()> {
 
         let metadata = &accounts.metadata.to_account_info();
         let master_edition = &accounts.master_edition.to_account_info();
diff --git a/tokens/nft-operations/anchor/programs/mint-nft/src/instructions/mint_nft.rs b/tokens/nft-operations/anchor/programs/mint-nft/src/instructions/mint_nft.rs
@@ -65,7 +65,7 @@ pub struct MintNFT<'info> {
     pub token_metadata_program: Program<'info, Metadata>,
 }
 
-pub fn handle_mint_nft(accounts: &mut MintNFT, bumps: &MintNFTBumps) -> Result<()> {
+pub fn handler(accounts: &mut MintNFT, bumps: &MintNFTBumps) -> Result<()> {
 
         let metadata = &accounts.metadata.to_account_info();
         let master_edition = &accounts.master_edition.to_account_info();
diff --git a/tokens/nft-operations/anchor/programs/mint-nft/src/instructions/mod.rs b/tokens/nft-operations/anchor/programs/mint-nft/src/instructions/mod.rs
diff --git a/tokens/nft-operations/anchor/programs/mint-nft/src/instructions/verify_collection.rs b/tokens/nft-operations/anchor/programs/mint-nft/src/instructions/verify_collection.rs
@@ -38,7 +38,7 @@ pub struct VerifyCollectionMint<'info> {
     pub token_metadata_program: Program<'info, Metadata>,
 }
 
-pub fn handle_verify_collection(accounts: &mut VerifyCollectionMint, bumps: &VerifyCollectionMintBumps) -> Result<()> {
+pub fn handler(accounts: &mut VerifyCollectionMint, bumps: &VerifyCollectionMintBumps) -> Result<()> {
         let metadata = &accounts.metadata.to_account_info();
         let authority = &accounts.mint_authority.to_account_info();
         let collection_mint = &accounts.collection_mint.to_account_info();
diff --git a/tokens/nft-operations/anchor/programs/mint-nft/src/lib.rs b/tokens/nft-operations/anchor/programs/mint-nft/src/lib.rs
@@ -2,23 +2,23 @@ use anchor_lang::prelude::*;
 
 declare_id!("3EMcczaGi9ivdLxvvFwRbGYeEUEHpGwabXegARw4jLxa");
 
-pub mod contexts;
+pub mod instructions;
 
-pub use contexts::*;
+pub use instructions::*;
 
 #[program]
 pub mod mint_nft {
 
     use super::*;
     pub fn create_collection(mut context: Context<CreateCollection>) -> Result<()> {
-        handle_create_collection(&mut context.accounts, &context.bumps)
+        instructions::create_collection::handler(&mut context.accounts, &context.bumps)
     }
 
     pub fn mint_nft(mut context: Context<MintNFT>) -> Result<()> {
-        handle_mint_nft(&mut context.accounts, &context.bumps)
+        instructions::mint_nft::handler(&mut context.accounts, &context.bumps)
     }
 
     pub fn verify_collection(mut context: Context<VerifyCollectionMint>) -> Result<()> {
-        handle_verify_collection(&mut context.accounts, &context.bumps)
+        instructions::verify_collection::handler(&mut context.accounts, &context.bumps)
     }
 }
diff --git a/tokens/token-2022/group/anchor/programs/group/src/instructions/mod.rs b/tokens/token-2022/group/anchor/programs/group/src/instructions/mod.rs
@@ -0,0 +1,3 @@
+pub mod test_initialize_group;
+
+pub use test_initialize_group::*;
diff --git a/tokens/token-2022/group/anchor/programs/group/src/instructions/test_initialize_group.rs b/tokens/token-2022/group/anchor/programs/group/src/instructions/test_initialize_group.rs
@@ -0,0 +1,66 @@
+use anchor_lang::prelude::*;
+use anchor_spl::token_2022::spl_token_2022::extension::group_pointer::GroupPointer;
+use anchor_spl::token_interface::{
+    spl_token_2022::{
+        extension::{BaseStateWithExtensions, StateWithExtensions},
+        state::Mint as MintState,
+    },
+    Mint, Token2022,
+};
+
+#[derive(Accounts)]
+pub struct InitializeGroup<'info> {
+    #[account(mut)]
+    pub payer: Signer<'info>,
+
+    #[account(
+        init,
+        seeds = [b"group"],
+        bump,
+        payer = payer,
+        mint::decimals = 2,
+        mint::authority = mint_account,
+        mint::freeze_authority = mint_account,
+        extensions::group_pointer::authority = mint_account,
+        extensions::group_pointer::group_address = mint_account,
+    )]
+    pub mint_account: InterfaceAccount<'info, Mint>,
+    pub token_program: Program<'info, Token2022>,
+    pub system_program: Program<'info, System>,
+}
+
+fn check_mint_data(accounts: &mut InitializeGroup) -> Result<()> {
+    let mint = &accounts.mint_account.to_account_info();
+    let mint_data = mint.data.borrow();
+    let mint_with_extension = StateWithExtensions::<MintState>::unpack(&mint_data)?;
+    let extension_data = mint_with_extension.get_extension::<GroupPointer>()?;
+
+    msg!("{:?}", mint_with_extension);
+    msg!("{:?}", extension_data);
+    Ok(())
+}
+
+pub fn handler(mut context: Context<InitializeGroup>) -> Result<()> {
+    check_mint_data(&mut context.accounts)?;
+
+    // // Token Group and Token Member extensions features not enabled yet on the Token2022 program
+    // // This is temporary placeholder to update one extensions are live
+    // // Initializing the "pointers" works, but you can't initialize the group/member data yet
+
+    // let signer_seeds: &[&[&[u8]]] = &[&[b"group", &[context.bumps.mint_account]]];
+    // token_group_initialize(
+    //     CpiContext::new(
+    //         context.accounts.token_program.to_account_info(),
+    //         TokenGroupInitialize {
+    //             token_program_id: context.accounts.token_program.to_account_info(),
+    //             group: context.accounts.mint_account.to_account_info(),
+    //             mint: context.accounts.mint_account.to_account_info(),
+    //             mint_authority: context.accounts.mint_account.to_account_info(),
+    //         },
+    //     )
+    //     .with_signer(signer_seeds),
+    //     Some(context.accounts.payer.key()), // update_authority
+    //     10,                             // max_size
+    // )?;
+    Ok(())
+}
diff --git a/tokens/token-2022/group/anchor/programs/group/src/lib.rs b/tokens/token-2022/group/anchor/programs/group/src/lib.rs
@@ -1,12 +1,7 @@
 use anchor_lang::prelude::*;
-use anchor_spl::token_2022::spl_token_2022::extension::group_pointer::GroupPointer;
-use anchor_spl::token_interface::{
-    spl_token_2022::{
-        extension::{BaseStateWithExtensions, StateWithExtensions},
-        state::Mint as MintState,
-    },
-    token_group_initialize, Mint, Token2022, TokenGroupInitialize,
-};
+
+mod instructions;
+use instructions::*;
 
 declare_id!("4XCDGMD8fsdjUzmYj6d9if8twFt1f23Ym52iDmWK8fFs");
 
@@ -15,61 +10,7 @@ pub mod group {
 
     use super::*;
 
-    pub fn test_initialize_group(mut context: Context<InitializeGroup>) -> Result<()> {
-        handle_check_mint_data(&mut context.accounts)?;
-
-        // // Token Group and Token Member extensions features not enabled yet on the Token2022 program
-        // // This is temporary placeholder to update one extensions are live
-        // // Initializing the "pointers" works, but you can't initialize the group/member data yet
-
-        // let signer_seeds: &[&[&[u8]]] = &[&[b"group", &[context.bumps.mint_account]]];
-        // token_group_initialize(
-        //     CpiContext::new(
-        //         context.accounts.token_program.to_account_info(),
-        //         TokenGroupInitialize {
-        //             token_program_id: context.accounts.token_program.to_account_info(),
-        //             group: context.accounts.mint_account.to_account_info(),
-        //             mint: context.accounts.mint_account.to_account_info(),
-        //             mint_authority: context.accounts.mint_account.to_account_info(),
-        //         },
-        //     )
-        //     .with_signer(signer_seeds),
-        //     Some(context.accounts.payer.key()), // update_authority
-        //     10,                             // max_size
-        // )?;
-        Ok(())
+    pub fn test_initialize_group(context: Context<InitializeGroup>) -> Result<()> {
+        instructions::test_initialize_group::handler(context)
     }
 }
-
-#[derive(Accounts)]
-pub struct InitializeGroup<'info> {
-    #[account(mut)]
-    pub payer: Signer<'info>,
-
-    #[account(
-        init,
-        seeds = [b"group"],
-        bump,
-        payer = payer,
-        mint::decimals = 2,
-        mint::authority = mint_account,
-        mint::freeze_authority = mint_account,
-        extensions::group_pointer::authority = mint_account,
-        extensions::group_pointer::group_address = mint_account,
-    )]
-    pub mint_account: InterfaceAccount<'info, Mint>,
-    pub token_program: Program<'info, Token2022>,
-    pub system_program: Program<'info, System>,
-}
-
-pub fn handle_check_mint_data(accounts: &mut InitializeGroup) -> Result<()> {
-        let mint = &accounts.mint_account.to_account_info();
-        let mint_data = mint.data.borrow();
-        let mint_with_extension = StateWithExtensions::<MintState>::unpack(&mint_data)?;
-        let extension_data = mint_with_extension.get_extension::<GroupPointer>()?;
-
-        msg!("{:?}", mint_with_extension);
-        msg!("{:?}", extension_data);
-        Ok(())
-    }
-
diff --git a/tokens/token-2022/permanent-delegate/anchor/programs/permanent-delegate/src/instructions/initialize.rs b/tokens/token-2022/permanent-delegate/anchor/programs/permanent-delegate/src/instructions/initialize.rs
@@ -0,0 +1,50 @@
+use anchor_lang::prelude::*;
+use anchor_spl::{
+    token_2022::spl_token_2022::extension::permanent_delegate::PermanentDelegate,
+    token_interface::{
+        spl_pod::optional_keys::OptionalNonZeroPubkey,
+        spl_token_2022::{
+            extension::{BaseStateWithExtensions, StateWithExtensions},
+            state::Mint as MintState,
+        },
+        Mint, Token2022,
+    },
+};
+
+#[derive(Accounts)]
+pub struct Initialize<'info> {
+    #[account(mut)]
+    pub payer: Signer<'info>,
+
+    #[account(
+        init,
+        payer = payer,
+        mint::decimals = 2,
+        mint::authority = payer,
+        extensions::permanent_delegate::delegate = payer,
+    )]
+    pub mint_account: InterfaceAccount<'info, Mint>,
+    pub token_program: Program<'info, Token2022>,
+    pub system_program: Program<'info, System>,
+}
+
+// helper to check mint data, and demonstrate how to read mint extension data within a program
+fn check_mint_data(accounts: &mut Initialize) -> Result<()> {
+    let mint = &accounts.mint_account.to_account_info();
+    let mint_data = mint.data.borrow();
+    let mint_with_extension = StateWithExtensions::<MintState>::unpack(&mint_data)?;
+    let extension_data = mint_with_extension.get_extension::<PermanentDelegate>()?;
+
+    assert_eq!(
+        extension_data.delegate,
+        OptionalNonZeroPubkey::try_from(Some(accounts.payer.key()))?
+    );
+
+    msg!("{:?}", extension_data);
+    Ok(())
+}
+
+pub fn handler(mut context: Context<Initialize>) -> Result<()> {
+    check_mint_data(&mut context.accounts)?;
+    Ok(())
+}
diff --git a/tokens/token-2022/permanent-delegate/anchor/programs/permanent-delegate/src/instructions/mod.rs b/tokens/token-2022/permanent-delegate/anchor/programs/permanent-delegate/src/instructions/mod.rs
@@ -0,0 +1,3 @@
+pub mod initialize;
+
+pub use initialize::*;
diff --git a/tokens/token-2022/permanent-delegate/anchor/programs/permanent-delegate/src/lib.rs b/tokens/token-2022/permanent-delegate/anchor/programs/permanent-delegate/src/lib.rs
@@ -1,58 +1,15 @@
 use anchor_lang::prelude::*;
-use anchor_spl::{
-    token_2022::spl_token_2022::extension::permanent_delegate::PermanentDelegate,
-    token_interface::{
-        spl_pod::optional_keys::OptionalNonZeroPubkey,
-        spl_token_2022::{
-            extension::{BaseStateWithExtensions, StateWithExtensions},
-            state::Mint as MintState,
-        },
-        Mint, Token2022,
-    },
-};
+
+mod instructions;
+use instructions::*;
 
 declare_id!("A9rxKS84ZoJVyeTfQbCEfxME2vvAM4uwSMjkmhR5XWb1");
 
 #[program]
 pub mod permanent_delegate {
     use super::*;
 
-    pub fn initialize(mut context: Context<Initialize>) -> Result<()> {
-        handle_check_mint_data(&mut context.accounts)?;
-        Ok(())
+    pub fn initialize(context: Context<Initialize>) -> Result<()> {
+        instructions::initialize::handler(context)
     }
 }
-
-#[derive(Accounts)]
-pub struct Initialize<'info> {
-    #[account(mut)]
-    pub payer: Signer<'info>,
-
-    #[account(
-        init,
-        payer = payer,
-        mint::decimals = 2,
-        mint::authority = payer,
-        extensions::permanent_delegate::delegate = payer,
-    )]
-    pub mint_account: InterfaceAccount<'info, Mint>,
-    pub token_program: Program<'info, Token2022>,
-    pub system_program: Program<'info, System>,
-}
-
-// helper to check mint data, and demonstrate how to read mint extension data within a program
-pub fn handle_check_mint_data(accounts: &mut Initialize) -> Result<()> {
-        let mint = &accounts.mint_account.to_account_info();
-        let mint_data = mint.data.borrow();
-        let mint_with_extension = StateWithExtensions::<MintState>::unpack(&mint_data)?;
-        let extension_data = mint_with_extension.get_extension::<PermanentDelegate>()?;
-
-        assert_eq!(
-            extension_data.delegate,
-            OptionalNonZeroPubkey::try_from(Some(accounts.payer.key()))?
-        );
-
-        msg!("{:?}", extension_data);
-        Ok(())
-    }
-

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ pub struct CreateCollection<'info> {`
`63`	`63`	`token_metadata_program: Program<'info, Metadata>,`
`64`	`64`	`}`
`65`	`65`
`66`		`-pub fn handle_create_collection(accounts: &mut CreateCollection, bumps: &CreateCollectionBumps) -> Result<()> {`
	`66`	`+pub fn handler(accounts: &mut CreateCollection, bumps: &CreateCollectionBumps) -> Result<()> {`
`67`	`67`
`68`	`68`	`let metadata = &accounts.metadata.to_account_info();`
`69`	`69`	`let master_edition = &accounts.master_edition.to_account_info();`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ pub struct MintNFT<'info> {`
`65`	`65`	`pub token_metadata_program: Program<'info, Metadata>,`
`66`	`66`	`}`
`67`	`67`
`68`		`-pub fn handle_mint_nft(accounts: &mut MintNFT, bumps: &MintNFTBumps) -> Result<()> {`
	`68`	`+pub fn handler(accounts: &mut MintNFT, bumps: &MintNFTBumps) -> Result<()> {`
`69`	`69`
`70`	`70`	`let metadata = &accounts.metadata.to_account_info();`
`71`	`71`	`let master_edition = &accounts.master_edition.to_account_info();`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ pub struct VerifyCollectionMint<'info> {`
`38`	`38`	`pub token_metadata_program: Program<'info, Metadata>,`
`39`	`39`	`}`
`40`	`40`
`41`		`-pub fn handle_verify_collection(accounts: &mut VerifyCollectionMint, bumps: &VerifyCollectionMintBumps) -> Result<()> {`
	`41`	`+pub fn handler(accounts: &mut VerifyCollectionMint, bumps: &VerifyCollectionMintBumps) -> Result<()> {`
`42`	`42`	`let metadata = &accounts.metadata.to_account_info();`
`43`	`43`	`let authority = &accounts.mint_authority.to_account_info();`
`44`	`44`	`let collection_mint = &accounts.collection_mint.to_account_info();`
Original file line number	Diff line number	Diff line change
`@@ -2,23 +2,23 @@ use anchor_lang::prelude::*;`
`2`	`2`
`3`	`3`	`declare_id!("3EMcczaGi9ivdLxvvFwRbGYeEUEHpGwabXegARw4jLxa");`
`4`	`4`
`5`		`-pub mod contexts;`
	`5`	`+pub mod instructions;`
`6`	`6`
`7`		`-pub use contexts::*;`
	`7`	`+pub use instructions::*;`
`8`	`8`
`9`	`9`	`#[program]`
`10`	`10`	`pub mod mint_nft {`
`11`	`11`
`12`	`12`	`use super::*;`
`13`	`13`	`pub fn create_collection(mut context: Context<CreateCollection>) -> Result<()> {`
`14`		`- handle_create_collection(&mut context.accounts, &context.bumps)`
	`14`	`+ instructions::create_collection::handler(&mut context.accounts, &context.bumps)`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`pub fn mint_nft(mut context: Context<MintNFT>) -> Result<()> {`
`18`		`- handle_mint_nft(&mut context.accounts, &context.bumps)`
	`18`	`+ instructions::mint_nft::handler(&mut context.accounts, &context.bumps)`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`pub fn verify_collection(mut context: Context<VerifyCollectionMint>) -> Result<()> {`
`22`		`- handle_verify_collection(&mut context.accounts, &context.bumps)`
	`22`	`+ instructions::verify_collection::handler(&mut context.accounts, &context.bumps)`
`23`	`23`	`}`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+pub mod test_initialize_group;`
	`2`	`+`
	`3`	`+pub use test_initialize_group::*;`