fix: mint to create spl mint ix data

Author: ananas-block

program-libs/compressed-account/src/instruction_data/zero_copy_set.rs

@@ -50,7 +50,7 @@ impl ZOutputCompressedAccountWithPackedContextMut<'_> {
 // TODO: unit test
 impl ZInAccountMut<'_> {
     #[inline]
-    pub fn set(
+    pub fn set_z(
         &mut self,
         discriminator: [u8; 8],
         data_hash: [u8; 32],
@@ -81,6 +81,39 @@ impl ZInAccountMut<'_> {
         }
         Ok(())
     }
+
+    #[inline]
+    pub fn set(
+        &mut self,
+        discriminator: [u8; 8],
+        data_hash: [u8; 32],
+        merkle_context: &PackedMerkleContext,
+        root_index: U16,
+        lamports: u64,
+        address: Option<&[u8]>,
+    ) -> Result<(), CompressedAccountError> {
+        self.discriminator = discriminator;
+        // Set merkle context fields manually due to mutability constraints
+        self.merkle_context.merkle_tree_pubkey_index = merkle_context.merkle_tree_pubkey_index;
+        self.merkle_context.queue_pubkey_index = merkle_context.queue_pubkey_index;
+        self.merkle_context
+            .leaf_index
+            .set(merkle_context.leaf_index);
+        self.merkle_context.prove_by_index = merkle_context.prove_by_index as u8;
+        *self.root_index = root_index;
+        self.data_hash = data_hash;
+        *self.lamports = lamports.into();
+        if let Some(address) = address {
+            self.address
+                .as_mut()
+                .ok_or(CompressedAccountError::InstructionDataExpectedAddress)?
+                .copy_from_slice(address);
+        }
+        if self.address.is_some() && address.is_none() {
+            return Err(CompressedAccountError::ZeroCopyExpectedAddress);
+        }
+        Ok(())
+    }
 }
 
 impl ZInstructionDataInvokeCpiWithReadOnlyMut<'_> {

program-libs/ctoken-types/src/instructions/create_compressed_mint.rs

@@ -1,7 +1,4 @@
-use light_compressed_account::{
-    compressed_account::PackedMerkleContext, instruction_data::compressed_proof::CompressedProof,
-    Pubkey,
-};
+use light_compressed_account::{instruction_data::compressed_proof::CompressedProof, Pubkey};
 use light_zero_copy::ZeroCopy;
 
 use crate::{
@@ -26,7 +23,9 @@ pub struct CreateCompressedMintInstructionData {
 
 #[derive(Debug, Clone, AnchorSerialize, AnchorDeserialize, ZeroCopy)]
 pub struct UpdateCompressedMintInstructionData {
-    pub merkle_context: PackedMerkleContext,
+    // pub merkle_context: PackedMerkleContext,
+    pub leaf_index: u32,
+    pub prove_by_index: bool,
     pub root_index: u16,
     pub address: [u8; 32],
     pub proof: Option<CompressedProof>,

program-libs/ctoken-types/src/instructions/mint_to_compressed.rs

@@ -1,7 +1,4 @@
-use light_compressed_account::{
-    compressed_account::PackedMerkleContext, instruction_data::compressed_proof::CompressedProof,
-    Pubkey,
-};
+use light_compressed_account::{instruction_data::compressed_proof::CompressedProof, Pubkey};
 use light_zero_copy::ZeroCopy;
 
 use crate::{
@@ -11,11 +8,11 @@ use crate::{
 
 #[derive(Debug, Clone, AnchorSerialize, AnchorDeserialize, ZeroCopy)]
 pub struct CompressedMintInputs {
-    pub merkle_context: PackedMerkleContext,
+    pub leaf_index: u32,
+    pub prove_by_index: bool,
     pub root_index: u16,
     pub address: [u8; 32],
     pub compressed_mint_input: CompressedMint, //TODO: move supply and authority last so that we can send only the hash chain.
-    pub output_merkle_tree_index: u8,
 }
 
 #[derive(Debug, Clone, AnchorSerialize, AnchorDeserialize, ZeroCopy)]

programs/compressed-token/program/src/create_spl_mint/processor.rs

@@ -9,6 +9,7 @@ use light_ctoken_types::{
     state::{CompressedMint, CompressedMintConfig},
     COMPRESSED_MINT_SEED,
 };
+use light_sdk::instruction::PackedMerkleContext;
 use light_zero_copy::{borsh::Deserialize, borsh_mut::DeserializeMut, ZeroCopyNew};
 use pinocchio::account_info::AccountInfo;
 use spl_token::solana_program::log::sol_log_compute_units;
@@ -85,9 +86,8 @@ pub fn process_create_spl_mint(
     Ok(())
 }
 
-// TODO: remove tree indices from instructiond data we hardcode the order.
-//const IN_TREE: u8 = 0;
-//const IN_OUTPUT_QUEUE: u8 = 1;
+const IN_TREE: u8 = 0;
+const IN_OUTPUT_QUEUE: u8 = 1;
 
 const OUT_OUTPUT_QUEUE: u8 = 2;
 
@@ -146,6 +146,12 @@ fn update_compressed_mint_to_decompressed<'info>(
             &mut context,
             &instruction_data.mint,
             &hashed_mint_authority,
+            PackedMerkleContext {
+                leaf_index: instruction_data.mint.leaf_index.into(),
+                prove_by_index: instruction_data.mint.prove_by_index(),
+                merkle_tree_pubkey_index: IN_TREE,
+                queue_pubkey_index: IN_OUTPUT_QUEUE,
+            },
         )?;
 
         // Process output compressed mint account (with is_decompressed = true)
@@ -181,7 +187,7 @@ fn update_compressed_mint_to_decompressed<'info>(
             mint_authority,
             mint_inputs.supply,
             mint_config,
-            *instruction_data.mint.address,
+            instruction_data.mint.address,
             OUT_OUTPUT_QUEUE,
             instruction_data.mint.mint.version,
             true, // Set is_decompressed = true for create_spl_mint

programs/compressed-token/program/src/mint/mint_input.rs

@@ -6,6 +6,7 @@ use light_ctoken_types::{
     state::CompressedMint,
 };
 use light_hasher::{Hasher, Poseidon};
+use light_sdk::instruction::PackedMerkleContext;
 
 use crate::{
     constants::COMPRESSED_MINT_DISCRIMINATOR, extensions::processor::create_extension_hash_chain,
@@ -25,6 +26,7 @@ pub fn create_input_compressed_mint_account(
     context: &mut TokenContext,
     compressed_mint_inputs: &ZUpdateCompressedMintInstructionData,
     hashed_mint_authority: &[u8; 32],
+    merkle_context: PackedMerkleContext,
 ) -> Result<(), ProgramError> {
     // 2. Extract and validate compressed mint data
     let compressed_mint_input = &compressed_mint_inputs.mint;
@@ -75,8 +77,8 @@ pub fn create_input_compressed_mint_account(
     input_compressed_account.set(
         COMPRESSED_MINT_DISCRIMINATOR,
         data_hash,
-        &compressed_mint_inputs.merkle_context,
-        *compressed_mint_inputs.root_index,
+        &merkle_context,
+        compressed_mint_inputs.root_index,
         0,
         Some(compressed_mint_inputs.address.as_ref()),
     )?;

programs/compressed-token/program/src/mint_to_compressed/processor.rs

@@ -6,6 +6,7 @@ use light_ctoken_types::{
     context::TokenContext, instructions::mint_to_compressed::MintToCompressedInstructionData,
     state::CompressedMintConfig,
 };
+use light_sdk::instruction::PackedMerkleContext;
 use light_zero_copy::{borsh::Deserialize, ZeroCopyNew};
 use pinocchio::account_info::AccountInfo;
 use spl_token::solana_program::log::sol_log_compute_units;
@@ -76,6 +77,17 @@ pub fn process_mint_to_compressed(
             &mut context,
             &parsed_instruction_data.compressed_mint_inputs,
             &hashed_mint_authority,
+            PackedMerkleContext {
+                merkle_tree_pubkey_index: 0,
+                queue_pubkey_index: 1,
+                leaf_index: parsed_instruction_data
+                    .compressed_mint_inputs
+                    .leaf_index
+                    .into(),
+                prove_by_index: parsed_instruction_data
+                    .compressed_mint_inputs
+                    .prove_by_index(),
+            },
         )?;
 
         let mint_inputs = &parsed_instruction_data.compressed_mint_inputs.mint;
@@ -112,7 +124,7 @@ pub fn process_mint_to_compressed(
             Some(Pubkey::from(*validated_accounts.authority.key())),
             supply,
             mint_config,
-            *parsed_instruction_data.compressed_mint_inputs.address,
+            parsed_instruction_data.compressed_mint_inputs.address,
             2,
             parsed_instruction_data.compressed_mint_inputs.mint.version,
             parsed_instruction_data

programs/compressed-token/program/src/shared/token_input.rs

@@ -63,7 +63,7 @@ pub fn set_input_compressed_account<const IS_FROZEN: bool>(
     };
 
     input_compressed_account
-        .set(
+        .set_z(
             version.discriminator(),
             data_hash,
             &input_token_data.merkle_context,

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

@@ -29,10 +29,14 @@ impl CreateCompressedMintMetaConfig {
     }
 
     /// Create a new CreateCompressedMintMetaConfig for client-side (CPI) usage
-    pub fn new_client(address_tree_pubkey: Pubkey, output_queue: Pubkey) -> Self {
+    pub fn new_client(
+        mint_seed: Pubkey,
+        address_tree_pubkey: Pubkey,
+        output_queue: Pubkey,
+    ) -> Self {
         Self {
             fee_payer: None,
-            mint_signer: None,
+            mint_signer: Some(mint_seed),
             address_tree_pubkey,
             output_queue,
         }

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

@@ -29,6 +29,7 @@ pub struct CreateCompressedMintInputs {
     pub address_tree_pubkey: Pubkey,
     pub output_queue: Pubkey,
     pub extensions: Option<Vec<ExtensionInstructionData>>,
+    pub version: u8,
 }
 
 /// Creates a compressed mint instruction with a pre-computed mint address
@@ -47,7 +48,7 @@ pub fn create_compressed_mint_cpi(
         address_merkle_tree_root_index: input.address_merkle_tree_root_index,
         extensions: input.extensions,
         mint_address,
-        version: 0,
+        version: input.version,
     };
 
     // Create account meta config for create_compressed_mint

sdk-libs/compressed-token-sdk/src/instructions/create_spl_mint.rs

@@ -72,7 +72,8 @@ pub fn create_spl_mint_instruction_with_bump(
         .is_none();
     // Create UpdateCompressedMintInstructionData from the compressed mint inputs
     let update_mint_data = UpdateCompressedMintInstructionData {
-        merkle_context: compressed_mint_inputs.merkle_context,
+        leaf_index: compressed_mint_inputs.leaf_index.into(),
+        prove_by_index: compressed_mint_inputs.prove_by_index,
         root_index: compressed_mint_inputs.root_index,
         address: compressed_mint_inputs.address,
         proof: proof.into(),