remove backwards compat reexport

Author: ananas-block

Cargo.lock

@@ -30,6 +30,7 @@ light-program-test = { workspace = true }
 light-compressible = { workspace = true, default-features = false, features = ["solana"] }
 light-token-interface = { workspace = true }
 light-token = { workspace = true }
+light-compressed-token-sdk = { workspace = true }
 solana-rpc-client-api = { workspace = true }
 solana-transaction-status = { workspace = true }
 bb8 = { workspace = true }

forester/Cargo.toml

@@ -4,13 +4,13 @@ use anchor_lang::{InstructionData, ToAccountMetas};
 use forester_utils::rpc_pool::SolanaRpcPool;
 use light_client::{indexer::TreeInfo, rpc::Rpc};
 use light_compressed_account::TreeType;
+use light_compressed_token_sdk::compressed_token::compress_and_close::CompressAndCloseAccounts as CTokenAccounts;
 use light_compressible::config::CompressibleConfig;
 use light_registry::{
     accounts::CompressAndCloseContext, compressible::compressed_token::CompressAndCloseIndices,
     instruction::CompressAndClose,
 };
 use light_sdk::instruction::PackedAccounts;
-use light_token::compressed_token::compress_and_close::CompressAndCloseAccounts as CTokenAccounts;
 use light_token_interface::LIGHT_TOKEN_PROGRAM_ID;
 use solana_pubkey::pubkey;
 use solana_sdk::{

forester/src/compressible/compressor.rs

@@ -11,6 +11,7 @@ use light_client::{
     local_test_validator::{spawn_validator, LightValidatorConfig},
     rpc::{LightClient, LightClientConfig, Rpc},
 };
+use light_compressed_token_sdk::compressed_token::create_compressed_mint;
 use light_registry::{
     protocol_config::state::ProtocolConfigPda,
     sdk::{
@@ -20,7 +21,6 @@ use light_registry::{
     utils::{get_forester_pda, get_protocol_config_pda_address},
     ForesterConfig,
 };
-use light_token::compressed_token::create_compressed_mint;
 use light_token_client::actions::{
     create_compressible_token_account, CreateCompressibleTokenAccountInputs,
 };

forester/tests/test_compressible_ctoken.rs

@@ -47,6 +47,7 @@ light-token-interface = { workspace = true }
 light-token-client = { workspace = true }
 light-compressible = { workspace = true }
 light-token = { workspace = true }
+light-compressed-token-sdk = { workspace = true }
 spl-token-2022 = { workspace = true }
 spl-pod = { workspace = true }
 light-zero-copy = { workspace = true , features = ["std", "derive", "mut"]}

program-tests/compressed-token-test/Cargo.toml

@@ -20,11 +20,9 @@ async fn test_compress_and_close_ctoken_with_extensions() {
     #[allow(unused_imports)]
     use light_client::indexer::CompressedTokenAccount;
     use light_client::indexer::Indexer;
+    use light_compressed_token_sdk::spl_interface::find_spl_interface_pda_with_index;
     use light_test_utils::mint_2022::{create_token_22_account, mint_spl_tokens_22};
-    use light_token::{
-        instruction::{CompressibleParams, CreateTokenAccount, TransferFromSpl},
-        spl_interface::find_spl_interface_pda_with_index,
-    };
+    use light_token::instruction::{CompressibleParams, CreateTokenAccount, TransferFromSpl};
     use light_token_client::instructions::transfer2::{
         create_generic_transfer2_instruction, DecompressInput, Transfer2InstructionType,
     };

program-tests/compressed-token-test/tests/compress_only/all.rs

@@ -4,6 +4,7 @@
 //! decompressed to the exact same ATA pubkey that was originally compressed.
 
 use light_client::indexer::Indexer;
+use light_compressed_token_sdk::spl_interface::find_spl_interface_pda_with_index;
 use light_program_test::{
     program_test::TestRpc, utils::assert::assert_rpc_error, LightProgramTest, ProgramTestConfig,
 };
@@ -14,12 +15,9 @@ use light_test_utils::{
     },
     Rpc, RpcError,
 };
-use light_token::{
-    instruction::{
-        derive_token_ata, CompressibleParams, CreateAssociatedTokenAccount, CreateTokenAccount,
-        TransferFromSpl,
-    },
-    spl_interface::find_spl_interface_pda_with_index,
+use light_token::instruction::{
+    derive_token_ata, CompressibleParams, CreateAssociatedTokenAccount, CreateTokenAccount,
+    TransferFromSpl,
 };
 use light_token_client::instructions::transfer2::{
     create_generic_transfer2_instruction, DecompressInput, Transfer2InstructionType,
@@ -790,10 +788,10 @@ async fn test_decompress_skips_delegate_if_destination_has_delegate() {
 async fn test_ata_decompress_with_mismatched_amount_fails() {
     use borsh::BorshSerialize;
     use light_compressed_account::compressed_account::PackedMerkleContext;
-    use light_sdk::instruction::PackedAccounts;
-    use light_token::compressed_token::transfer2::account_metas::{
+    use light_compressed_token_sdk::compressed_token::transfer2::account_metas::{
         get_transfer2_instruction_account_metas, Transfer2AccountsMetaConfig,
     };
+    use light_sdk::instruction::PackedAccounts;
     use light_token_interface::{
         instructions::transfer2::{
             CompressedTokenInstructionDataTransfer2, Compression, CompressionMode,

program-tests/compressed-token-test/tests/compress_only/ata_decompress.rs

@@ -5,6 +5,7 @@
 //! - Spec #14: CompressedOnly inputs must decompress complete account (no change output)
 
 use light_client::indexer::Indexer;
+use light_compressed_token_sdk::spl_interface::find_spl_interface_pda_with_index;
 use light_program_test::{
     program_test::{LightProgramTest, TestRpc},
     utils::assert::assert_rpc_error,
@@ -14,10 +15,7 @@ use light_test_utils::mint_2022::{
     create_mint_22_with_extension_types, create_token_22_account, mint_spl_tokens_22,
     RESTRICTED_EXTENSIONS,
 };
-use light_token::{
-    instruction::{CompressibleParams, CreateTokenAccount, TransferFromSpl},
-    spl_interface::find_spl_interface_pda_with_index,
-};
+use light_token::instruction::{CompressibleParams, CreateTokenAccount, TransferFromSpl};
 use light_token_client::instructions::transfer2::{
     create_generic_transfer2_instruction, DecompressInput, Transfer2InstructionType,
 };

program-tests/compressed-token-test/tests/compress_only/decompress_restrictions.rs

@@ -8,6 +8,7 @@
 
 use anchor_spl::token_2022::spl_token_2022;
 use light_client::indexer::Indexer;
+use light_compressed_token_sdk::spl_interface::find_spl_interface_pda_with_index;
 use light_program_test::{
     program_test::{LightProgramTest, TestRpc},
     utils::assert::assert_rpc_error,
@@ -17,10 +18,7 @@ use light_test_utils::mint_2022::{
     create_mint_22_with_extension_types, create_token_22_account, mint_spl_tokens_22,
     RESTRICTED_EXTENSIONS,
 };
-use light_token::{
-    instruction::{CompressibleParams, CreateTokenAccount, TransferFromSpl},
-    spl_interface::find_spl_interface_pda_with_index,
-};
+use light_token::instruction::{CompressibleParams, CreateTokenAccount, TransferFromSpl};
 use light_token_client::instructions::transfer2::{
     create_generic_transfer2_instruction, DecompressInput, Transfer2InstructionType,
 };

program-tests/compressed-token-test/tests/compress_only/invalid_destination.rs

@@ -9,6 +9,10 @@
 
 use anchor_lang::{system_program, InstructionData, ToAccountMetas};
 use light_client::indexer::Indexer;
+use light_compressed_token_sdk::{
+    constants::CPI_AUTHORITY_PDA,
+    spl_interface::find_spl_interface_pda_with_index as sdk_find_spl_interface_pda,
+};
 use light_program_test::{
     program_test::{LightProgramTest, TestRpc},
     utils::assert::assert_rpc_error,
@@ -17,10 +21,8 @@ use light_program_test::{
 use light_test_utils::mint_2022::{
     create_token_22_account, mint_spl_tokens_22, set_mint_transfer_fee, set_mint_transfer_hook,
 };
-use light_token::{
-    constants::CPI_AUTHORITY_PDA,
-    instruction::{CompressibleParams, CreateTokenAccount, TransferFromSpl, TransferToSpl},
-    spl_interface::find_spl_interface_pda_with_index as sdk_find_spl_interface_pda,
+use light_token::instruction::{
+    CompressibleParams, CreateTokenAccount, TransferFromSpl, TransferToSpl,
 };
 use light_token_client::instructions::transfer2::{
     create_generic_transfer2_instruction, DecompressInput, Transfer2InstructionType,