stash

Author: ananas-block

sdk-libs/compressed-token-sdk/src/cpi/accounts.rs

@@ -1,4 +1,3 @@
-use anchor_lang::Key;
 use light_compressed_token_types::{
     constants::{
         ACCOUNT_COMPRESSION_PROGRAM_ID, CPI_AUTHORITY_PDA, LIGHT_SYSTEM_PROGRAM_ID,
@@ -152,7 +151,7 @@ pub fn to_compressed_token_account_metas(
             TokenSdkError::CpiError("Missing compress/decompress account".to_string())
         })?;
         account_metas.push(AccountMeta {
-            pubkey: account.key(),
+            pubkey: *account.key,
             is_signer: false,
             is_writable: false,
         });

sdk-libs/compressed-token-sdk/src/cpi/mod.rs

@@ -1,17 +1,3 @@
-//! CPI helpers for compressed token operations
-//!
-//! This module provides utilities to invoke the compressed token program via cross program invocation (CPI).
-//! It follows the same patterns as light-sdk's CPI module.
-//!
-//! ```ignore
-//! let token_account = CTokenAccount::new_empty(recipient, output_tree_index);
-//! let cpi_inputs = CpiInputs::new_compress(vec![token_account]);
-//!
-//! cpi_inputs
-//!     .invoke_compressed_token_program(light_cpi_accounts)
-//!     .map_err(ProgramError::from)?;
-//! ```
-
 pub mod accounts;
 mod invoke;
 

sdk-libs/compressed-token-sdk/src/instruction/mod.rs

@@ -1 +1,4 @@
+pub mod token_accounts;
 
+// Re-export all instruction utilities
+pub use token_accounts::*;

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

@@ -1,7 +1,7 @@
 pub mod account;
 pub mod cpi;
 pub mod error;
-pub mod instruction;
+pub mod instructions;
 pub mod token_pool;
 
 pub use light_compressed_token_types::*;

sdk-libs/compressed-token-sdk/src/instruction/token_accounts.rs renamed to sdk-libs/compressed-token-sdk/src/instructions/token_accounts.rs

@@ -44,11 +44,12 @@ fn test_to_compressed_token_account_metas_compress() {
     let mut system_program_account = TestAccount::new(system_program, Pubkey::default(), 0);
 
     let fee_payer_info = fee_payer_account.get_account_info();
+    let authority_info = authority_account.get_account_info();
 
     // Create account infos in the correct order for CpiAccounts
     let account_infos = vec![
         light_system_account.get_account_info(), // 0: light_system_program
-        authority_account.get_account_info(),    // 1: authority
+        authority_info.clone(),                  // 1: authority
         registered_program_account.get_account_info(), // 2: registered_program_pda
         noop_account.get_account_info(),         // 3: noop_program
         compression_authority_account.get_account_info(), // 4: account_compression_authority
@@ -75,7 +76,7 @@ fn test_to_compressed_token_account_metas_compress() {
     // Create CpiAccounts with default config (no optional accounts)
     let config = CpiAccountsConfig::default();
     let cpi_accounts =
-        CpiAccounts::new_with_config(&fee_payer_info, &authority, &account_infos, config);
+        CpiAccounts::new_with_config(&fee_payer_info, &authority_info, &account_infos, config);
 
     // Test our function
     let result = to_compressed_token_account_metas(&cpi_accounts);
@@ -134,11 +135,12 @@ fn test_to_compressed_token_account_metas_with_optional_accounts() {
     let mut token_program_ctx_account = TestAccount::new(token_program, Pubkey::default(), 0);
 
     let fee_payer_info = fee_payer_account.get_account_info();
+    let authority_info = authority_account.get_account_info();
 
     // Create account infos in the correct order for CpiAccounts with all optional accounts
     let account_infos = vec![
         light_system_account.get_account_info(), // 0: light_system_program
-        authority_account.get_account_info(),    // 1: authority
+        authority_info.clone(),                  // 1: authority
         registered_program_account.get_account_info(), // 2: registered_program_pda
         noop_account.get_account_info(),         // 3: noop_program
         compression_authority_account.get_account_info(), // 4: account_compression_authority
@@ -173,7 +175,7 @@ fn test_to_compressed_token_account_metas_with_optional_accounts() {
         decompress: false,
     };
     let cpi_accounts =
-        CpiAccounts::new_with_config(&fee_payer_info, &authority, &account_infos, config);
+        CpiAccounts::new_with_config(&fee_payer_info, &authority_info, &account_infos, config);
 
     // Test our function
     let result = to_compressed_token_account_metas(&cpi_accounts);