cleanup

Author: ananas-block

program-libs/ctoken-types/src/instructions/mint_action/builder.rs

@@ -62,6 +62,27 @@ impl MintActionCompressedInstructionData {
         }
     }
 
+    pub fn new_mint_write_to_cpi_context(
+        compressed_address: [u8; 32],
+        root_index: u16,
+        mint: CompressedMintInstructionData,
+        cpi_context: CpiContext,
+    ) -> Self {
+        Self {
+            leaf_index: 0,
+            prove_by_index: false,
+            root_index,
+            compressed_address,
+            token_pool_bump: 0,
+            token_pool_index: 0,
+            create_mint: Some(CreateMint::default()),
+            actions: Vec::new(),
+            proof: None, // Proof is verified with execution not write
+            cpi_context: Some(cpi_context),
+            mint,
+        }
+    }
+
     #[must_use = "with_mint_to_compressed returns a new value"]
     pub fn with_mint_to_compressed(mut self, action: MintToCompressedAction) -> Self {
         self.actions.push(Action::MintToCompressed(action));

sdk-libs/compressed-token-sdk/src/instructions/create_compressed_mint/instruction.rs

@@ -48,7 +48,6 @@ pub fn create_compressed_mint_cpi(
     cpi_context: Option<CpiContext>,
     cpi_context_pubkey: Option<Pubkey>,
 ) -> Result<Instruction> {
-    // Build CompressedMintInstructionData from the input parameters
     let compressed_mint_instruction_data = CompressedMintInstructionData {
         supply: 0,
         decimals: input.decimals,
@@ -65,7 +64,6 @@ pub fn create_compressed_mint_cpi(
         extensions: input.extensions,
     };
 
-    // Build CompressedMintWithContext
     let compressed_mint_with_context = CompressedMintWithContext {
         address: mint_address,
         mint: compressed_mint_instruction_data,
@@ -86,15 +84,13 @@ pub fn create_compressed_mint_cpi(
     }
 
     let meta_config = if cpi_context_pubkey.is_some() {
-        // CPI context mode
         MintActionMetaConfig::new_cpi_context(
             &instruction_data,
             input.mint_authority,
             input.payer,
             cpi_context_pubkey.unwrap(),
         )?
     } else {
-        // Regular CPI mode
         MintActionMetaConfig::new_create_mint(
             &instruction_data,
             input.mint_authority,
@@ -121,7 +117,6 @@ pub fn create_compressed_mint_cpi(
     })
 }
 
-/// Input struct for creating a compressed mint instruction in CPI write mode
 #[derive(Debug, Clone, AnchorDeserialize, AnchorSerialize)]
 pub struct CreateCompressedMintInputsCpiWrite {
     pub decimals: u8,
@@ -148,7 +143,6 @@ pub fn create_compressed_mint_cpi_write(
         return Err(TokenSdkError::InvalidAccountData);
     }
 
-    // Build CompressedMintInstructionData
     let compressed_mint_instruction_data = CompressedMintInstructionData {
         supply: 0,
         decimals: input.decimals,
@@ -165,12 +159,11 @@ pub fn create_compressed_mint_cpi_write(
         extensions: input.extensions,
     };
 
-    let instruction_data = light_ctoken_types::instructions::mint_action::MintActionCompressedInstructionData::new_mint(
+    let instruction_data = light_ctoken_types::instructions::mint_action::MintActionCompressedInstructionData::new_mint_write_to_cpi_context(
         input.mint_address,
         input.address_merkle_tree_root_index,
-        light_compressed_account::instruction_data::compressed_proof::CompressedProof::default(), // Dummy proof for CPI write
-        compressed_mint_instruction_data,
-    ).with_cpi_context(input.cpi_context);
+        compressed_mint_instruction_data,input.cpi_context
+    );
 
     let meta_config = MintActionMetaConfigCpiWrite {
         fee_payer: input.payer,

sdk-libs/compressed-token-sdk/src/instructions/mint_to_compressed/instruction.rs

@@ -73,15 +73,13 @@ pub fn create_mint_to_compressed_instruction(
     }
 
     let meta_config = if cpi_context_pubkey.is_some() {
-        // CPI context mode
         MintActionMetaConfig::new_cpi_context(
             &instruction_data,
             mint_authority,
             payer,
             cpi_context_pubkey.unwrap(),
         )?
     } else {
-        // Regular CPI mode
         MintActionMetaConfig::new(
             &instruction_data,
             mint_authority,

sdk-libs/compressed-token-sdk/src/instructions/update_compressed_mint/instruction.rs

@@ -133,7 +133,6 @@ pub fn create_update_compressed_mint_cpi_write(
         }
     };
 
-    // Add CPI context
     instruction_data = instruction_data.with_cpi_context(inputs.cpi_context);
 
     let meta_config = MintActionMetaConfigCpiWrite {

sdk-tests/sdk-compressible-test/src/instructions/create_user_record_and_game_session.rs

@@ -155,7 +155,6 @@ pub fn create_user_record_and_game_session<'info>(
             ),
         ]));
 
-    // Add CPI context
     instruction_data = instruction_data.with_cpi_context(
         light_ctoken_types::instructions::mint_action::CpiContext {
             address_tree_pubkey: address_tree_pubkey.to_bytes(),

sdk-tests/sdk-token-test/src/ctoken_pda/mint.rs

@@ -36,7 +36,6 @@ pub fn process_mint_action<'a, 'info>(
             .map(|auth| auth.to_bytes().into()),
     });
 
-    // Add CPI context
     instruction_data = instruction_data.with_cpi_context(
         light_ctoken_types::instructions::mint_action::CpiContext {
             set_context: false,