fix MintActionCompressedInstructionData

Author: SwenSchaeferjohann

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

@@ -11,6 +11,7 @@ use crate::{
     state::{BaseCompressedMint, CompressedMint, ExtensionStruct},
     AnchorDeserialize, AnchorSerialize, CTokenError,
 };
+use light_compressed_account::Pubkey;
 
 #[repr(C)]
 #[derive(Debug, Clone, AnchorSerialize, AnchorDeserialize, ZeroCopy)]
@@ -49,13 +50,13 @@ pub struct MintActionCompressedInstructionData {
     /// If proof by index not used.
     pub root_index: u16,
     pub compressed_address: [u8; 32],
+    /// If some -> no input because we create mint
+    pub mint: CompressedMintInstructionData,
     pub token_pool_bump: u8,
     pub token_pool_index: u8,
     pub actions: Vec<Action>,
     pub proof: Option<CompressedProof>,
     pub cpi_context: Option<CpiContext>,
-    /// If some -> no input because we create mint
-    pub mint: CompressedMintInstructionData,
 }
 
 #[repr(C)]
@@ -83,13 +84,15 @@ impl CompressedMintWithContext {
             root_index,
             address: compressed_address,
             mint: CompressedMintInstructionData {
-                version: 0,
-                spl_mint,
-                supply: 0, // TODO: dynamic?
-                decimals,
-                is_decompressed: false,
-                mint_authority,
-                freeze_authority,
+                base: BaseCompressedMint {
+                    version: 0,
+                    spl_mint,
+                    supply: 0, // TODO: dynamic?
+                    decimals,
+                    is_decompressed: false,
+                    mint_authority,
+                    freeze_authority,
+                },
                 extensions: None,
             },
         }
@@ -110,13 +113,15 @@ impl CompressedMintWithContext {
             root_index,
             address: compressed_address,
             mint: CompressedMintInstructionData {
-                version: 0,
-                spl_mint,
-                supply: 0,
-                decimals,
-                is_decompressed: false,
-                mint_authority,
-                freeze_authority,
+                base: BaseCompressedMint {
+                    version: 0,
+                    spl_mint,
+                    supply: 0, // TODO: dynamic?
+                    decimals,
+                    is_decompressed: false,
+                    mint_authority,
+                    freeze_authority,
+                },
                 extensions,
             },
         }

sdk-tests/anchor-compressible/tests/test_decompress_multiple.rs

@@ -15,6 +15,7 @@ use light_compressed_token_sdk::{
 use light_compressible_client::CompressibleInstruction;
 use light_ctoken_types::{
     instructions::mint_action::{CompressedMintInstructionData, CompressedMintWithContext},
+    state::BaseCompressedMint,
     COMPRESSED_TOKEN_PROGRAM_ID,
 };
 use light_macros::pubkey;
@@ -1458,14 +1459,16 @@ async fn create_user_record_and_game_session(
                 root_index: mint_address_tree_info.root_index,
                 address: compressed_mint_address,
                 mint: CompressedMintInstructionData {
-                    version: 1,
-                    spl_mint: spl_mint.into(),
-                    supply: 0,
-                    decimals,
-                    mint_authority: Some(mint_authority.into()),
-                    freeze_authority: Some(freeze_authority.into()),
+                    base: BaseCompressedMint {
+                        version: 1,
+                        spl_mint: spl_mint.into(),
+                        supply: 0,
+                        decimals,
+                        mint_authority: Some(mint_authority.into()),
+                        freeze_authority: Some(freeze_authority.into()),
+                        is_decompressed: false,
+                    },
                     extensions: None,
-                    is_decompressed: false,
                 },
             },
         },