Skip to content

refactor: ctoken sdk dir structure #2065

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ananas-block merged 2 commits into from
Nov 21, 2025
Merged

refactor: ctoken sdk dir structure #2065

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28789fc
stash
ananas-block Nov 20, 2025
cd65069
refactor: compressed-token-sdk
ananas-block Nov 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion forester/src/compressible/compressor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use std::{str::FromStr, sync::Arc};
use anchor_lang::{InstructionData, ToAccountMetas};
use forester_utils::rpc_pool::SolanaRpcPool;
use light_client::rpc::Rpc;
use light_compressed_token_sdk::instructions::compress_and_close::CompressAndCloseAccounts as CTokenAccounts;
use light_compressed_token_sdk::compressed_token::compress_and_close::CompressAndCloseAccounts as CTokenAccounts;
use light_compressible::config::CompressibleConfig;
use light_ctoken_types::COMPRESSED_TOKEN_PROGRAM_ID;
use light_registry::{
Expand Down
2 changes: 1 addition & 1 deletion forester/tests/test_compressible_ctoken.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use light_client::{
local_test_validator::{spawn_validator, LightValidatorConfig},
rpc::{LightClient, LightClientConfig, Rpc},
};
use light_compressed_token_sdk::instructions::create_compressed_mint;
use light_compressed_token_sdk::compressed_token::create_compressed_mint;
use light_ctoken_types::state::TokenDataVersion;
use light_registry::{
protocol_config::state::ProtocolConfigPda,
Expand Down
6 changes: 3 additions & 3 deletions program-tests/compressed-token-test/tests/ctoken/compress_and_close.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ async fn test_compress_and_close_owner_scenarios() {
.await;

// Set token balance on ATA
use light_compressed_token_sdk::instructions::create_associated_token_account::derive_ctoken_ata;
use light_compressed_token_sdk::ctoken::create_associated_token_account::derive_ctoken_ata;
let (ata_pubkey, _bump) =
derive_ctoken_ata(&context.owner_keypair.pubkey(), &context.mint_pubkey);

Expand Down Expand Up @@ -440,8 +440,8 @@ async fn test_compressible_account_with_custom_rent_payer_close_with_compression

// Initialize compressible token account
let create_token_account_ix =
light_compressed_token_sdk::instructions::create_compressible_token_account_instruction(
light_compressed_token_sdk::instructions::CreateCompressibleTokenAccount {
light_compressed_token_sdk::ctoken::create_token_account::create_compressible_token_account_instruction(
light_compressed_token_sdk::ctoken::create_token_account::CreateCompressibleTokenAccount {
account_pubkey: token_account_pubkey,
mint_pubkey: context.mint_pubkey,
owner_pubkey: context.owner_keypair.pubkey(),
Expand Down
16 changes: 8 additions & 8 deletions program-tests/compressed-token-test/tests/ctoken/create.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,8 +227,8 @@ async fn test_create_compressible_token_account_failing() {
let token_account_pubkey = Keypair::new();

let create_token_account_ix =
light_compressed_token_sdk::instructions::create_compressible_token_account_instruction(
light_compressed_token_sdk::instructions::CreateCompressibleTokenAccount {
light_compressed_token_sdk::ctoken::create_token_account::create_compressible_token_account_instruction(
light_compressed_token_sdk::ctoken::create_token_account::CreateCompressibleTokenAccount {
account_pubkey: token_account_pubkey.pubkey(),
mint_pubkey: context.mint_pubkey,
owner_pubkey: context.owner_keypair.pubkey(),
Expand Down Expand Up @@ -364,8 +364,8 @@ async fn test_create_compressible_token_account_failing() {
};

let create_token_account_ix =
light_compressed_token_sdk::instructions::create_compressible_token_account_instruction(
light_compressed_token_sdk::instructions::CreateCompressibleTokenAccount {
light_compressed_token_sdk::ctoken::create_token_account::create_compressible_token_account_instruction(
light_compressed_token_sdk::ctoken::create_token_account::CreateCompressibleTokenAccount {
account_pubkey: token_account_pubkey,
mint_pubkey: context.mint_pubkey,
owner_pubkey: context.owner_keypair.pubkey(),
Expand Down Expand Up @@ -412,8 +412,8 @@ async fn test_create_compressible_token_account_failing() {
.unwrap();

let create_token_account_ix =
light_compressed_token_sdk::instructions::create_compressible_token_account_instruction(
light_compressed_token_sdk::instructions::CreateCompressibleTokenAccount {
light_compressed_token_sdk::ctoken::create_token_account::create_compressible_token_account_instruction(
light_compressed_token_sdk::ctoken::create_token_account::CreateCompressibleTokenAccount {
account_pubkey: context.token_account_keypair.pubkey(),
mint_pubkey: context.mint_pubkey,
owner_pubkey: context.owner_keypair.pubkey(),
Expand Down Expand Up @@ -452,8 +452,8 @@ async fn test_create_compressible_token_account_failing() {
let wrong_account_type = context.rpc.test_accounts.protocol.governance_authority_pda;

let create_token_account_ix =
light_compressed_token_sdk::instructions::create_compressible_token_account_instruction(
light_compressed_token_sdk::instructions::CreateCompressibleTokenAccount {
light_compressed_token_sdk::ctoken::create_token_account::create_compressible_token_account_instruction(
light_compressed_token_sdk::ctoken::create_token_account::CreateCompressibleTokenAccount {
account_pubkey: context.token_account_keypair.pubkey(),
mint_pubkey: context.mint_pubkey,
owner_pubkey: context.owner_keypair.pubkey(),
Expand Down
24 changes: 12 additions & 12 deletions program-tests/compressed-token-test/tests/ctoken/create_ata.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,8 +275,8 @@ async fn test_create_ata_failing() {
context.mint_pubkey = solana_sdk::pubkey::Pubkey::new_unique();
let new_owner = solana_sdk::signature::Keypair::new();

let create_ata_ix = light_compressed_token_sdk::instructions::create_compressible_associated_token_account(
light_compressed_token_sdk::instructions::CreateCompressibleAssociatedTokenAccountInputs {
let create_ata_ix = light_compressed_token_sdk::ctoken::create_associated_token_account::create_compressible_associated_token_account(
light_compressed_token_sdk::ctoken::create_associated_token_account::CreateCompressibleAssociatedTokenAccountInputs {
payer: poor_payer_pubkey,
owner: new_owner.pubkey(),
mint: context.mint_pubkey,
Expand Down Expand Up @@ -442,7 +442,7 @@ async fn test_create_ata_failing() {
// Compressible config must be owned by the compressed-token program
// Error: 14 (InvalidAccountOwner)
{
use light_compressed_token_sdk::instructions::create_compressible_associated_token_account;
use light_compressed_token_sdk::ctoken::create_associated_token_account::create_compressible_associated_token_account;

// Use different mint for this test
context.mint_pubkey = solana_sdk::pubkey::Pubkey::new_unique();
Expand All @@ -451,7 +451,7 @@ async fn test_create_ata_failing() {
let fake_config = solana_sdk::system_program::ID;

let create_ata_ix = create_compressible_associated_token_account(
light_compressed_token_sdk::instructions::CreateCompressibleAssociatedTokenAccountInputs {
light_compressed_token_sdk::ctoken::create_associated_token_account::CreateCompressibleAssociatedTokenAccountInputs {
payer: payer_pubkey,
owner: context.owner_keypair.pubkey(),
mint: context.mint_pubkey,
Expand All @@ -478,7 +478,7 @@ async fn test_create_ata_failing() {
// Using the protocol config account which has a different discriminator.
// Error: 20000 (InvalidDiscriminator from account-checks)
{
use light_compressed_token_sdk::instructions::create_compressible_associated_token_account;
use light_compressed_token_sdk::ctoken::create_associated_token_account::create_compressible_associated_token_account;

// Use different mint for this test
context.mint_pubkey = solana_sdk::pubkey::Pubkey::new_unique();
Expand All @@ -487,7 +487,7 @@ async fn test_create_ata_failing() {
let wrong_account_type = context.rpc.test_accounts.protocol.governance_authority_pda;

let create_ata_ix = create_compressible_associated_token_account(
light_compressed_token_sdk::instructions::CreateCompressibleAssociatedTokenAccountInputs {
light_compressed_token_sdk::ctoken::create_associated_token_account::CreateCompressibleAssociatedTokenAccountInputs {
payer: payer_pubkey,
owner: context.owner_keypair.pubkey(),
mint: context.mint_pubkey,
Expand Down Expand Up @@ -601,8 +601,8 @@ async fn test_ata_multiple_owners_same_mint() {
};

// Create ATAs for each owner with the same mint
let create_ata_ix1 = light_compressed_token_sdk::instructions::create_compressible_associated_token_account(
light_compressed_token_sdk::instructions::CreateCompressibleAssociatedTokenAccountInputs {
let create_ata_ix1 = light_compressed_token_sdk::ctoken::create_associated_token_account::create_compressible_associated_token_account(
light_compressed_token_sdk::ctoken::create_associated_token_account::CreateCompressibleAssociatedTokenAccountInputs {
payer: payer_pubkey,
owner: owner1,
mint,
Expand Down Expand Up @@ -632,8 +632,8 @@ async fn test_ata_multiple_owners_same_mint() {
)
.await;

let create_ata_ix2 = light_compressed_token_sdk::instructions::create_compressible_associated_token_account(
light_compressed_token_sdk::instructions::CreateCompressibleAssociatedTokenAccountInputs {
let create_ata_ix2 = light_compressed_token_sdk::ctoken::create_associated_token_account::create_compressible_associated_token_account(
light_compressed_token_sdk::ctoken::create_associated_token_account::CreateCompressibleAssociatedTokenAccountInputs {
payer: payer_pubkey,
owner: owner2,
mint,
Expand Down Expand Up @@ -663,8 +663,8 @@ async fn test_ata_multiple_owners_same_mint() {
)
.await;

let create_ata_ix3 = light_compressed_token_sdk::instructions::create_compressible_associated_token_account(
light_compressed_token_sdk::instructions::CreateCompressibleAssociatedTokenAccountInputs {
let create_ata_ix3 = light_compressed_token_sdk::ctoken::create_associated_token_account::create_compressible_associated_token_account(
light_compressed_token_sdk::ctoken::create_associated_token_account::CreateCompressibleAssociatedTokenAccountInputs {
payer: payer_pubkey,
owner: owner3,
mint,
Expand Down
10 changes: 5 additions & 5 deletions program-tests/compressed-token-test/tests/ctoken/create_ata2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ async fn create_and_assert_ata2(

let create_ata_ix = if let Some(compressible) = compressible_data.as_ref() {
let create_fn = if idempotent {
light_compressed_token_sdk::instructions::create_compressible_associated_token_account2_idempotent
light_compressed_token_sdk::ctoken::create_associated_token_account::create_compressible_associated_token_account2_idempotent
} else {
light_compressed_token_sdk::instructions::create_compressible_associated_token_account2
light_compressed_token_sdk::ctoken::create_associated_token_account::create_compressible_associated_token_account2
};

create_fn(
light_compressed_token_sdk::instructions::CreateCompressibleAssociatedTokenAccountInputs {
light_compressed_token_sdk::ctoken::create_associated_token_account::CreateCompressibleAssociatedTokenAccountInputs {
payer: payer_pubkey,
owner: owner_pubkey,
mint: context.mint_pubkey,
Expand All @@ -35,9 +35,9 @@ async fn create_and_assert_ata2(
.unwrap()
} else {
let create_fn = if idempotent {
light_compressed_token_sdk::instructions::create_associated_token_account2_idempotent
light_compressed_token_sdk::ctoken::create_associated_token_account::create_associated_token_account2_idempotent
} else {
light_compressed_token_sdk::instructions::create_associated_token_account2
light_compressed_token_sdk::ctoken::create_associated_token_account::create_associated_token_account2
};

create_fn(payer_pubkey, owner_pubkey, context.mint_pubkey).unwrap()
Expand Down
4 changes: 2 additions & 2 deletions program-tests/compressed-token-test/tests/ctoken/functional.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@ async fn test_compressible_account_with_compression_authority_lifecycle() {

// Initialize compressible token account
let create_token_account_ix =
light_compressed_token_sdk::instructions::create_compressible_token_account_instruction(
light_compressed_token_sdk::instructions::CreateCompressibleTokenAccount {
light_compressed_token_sdk::ctoken::create_token_account::create_compressible_token_account_instruction(
light_compressed_token_sdk::ctoken::create_token_account::CreateCompressibleTokenAccount {
account_pubkey: token_account_pubkey,
mint_pubkey: context.mint_pubkey,
owner_pubkey: context.owner_keypair.pubkey(),
Expand Down
12 changes: 6 additions & 6 deletions program-tests/compressed-token-test/tests/ctoken/functional_ata.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use light_compressed_token_sdk::instructions::create_associated_token_account_idempotent;
use light_compressed_token_sdk::ctoken::create_associated_token_account::create_associated_token_account_idempotent;
use light_test_utils::assert_create_token_account::assert_create_associated_token_account;

use super::shared::*;
Expand All @@ -18,7 +18,7 @@ async fn test_associated_token_account_operations() {
let owner_pubkey = context.owner_keypair.pubkey();

// Create basic ATA using SDK function
let instruction = light_compressed_token_sdk::instructions::create_associated_token_account(
let instruction = light_compressed_token_sdk::ctoken::create_associated_token_account::create_associated_token_account(
payer_pubkey,
owner_pubkey,
context.mint_pubkey,
Expand Down Expand Up @@ -47,8 +47,8 @@ async fn test_associated_token_account_operations() {
let num_prepaid_epochs = 0;
let lamports_per_write = Some(150);
// Create compressible ATA
let compressible_instruction = light_compressed_token_sdk::instructions::create_compressible_associated_token_account(
light_compressed_token_sdk::instructions::CreateCompressibleAssociatedTokenAccountInputs {
let compressible_instruction = light_compressed_token_sdk::ctoken::create_associated_token_account::create_compressible_associated_token_account(
light_compressed_token_sdk::ctoken::create_associated_token_account::CreateCompressibleAssociatedTokenAccountInputs {
payer: payer_pubkey,
owner: compressible_owner_pubkey,
mint: context.mint_pubkey,
Expand Down Expand Up @@ -139,7 +139,7 @@ async fn test_create_ata_idempotent() {
let payer_pubkey = context.payer.pubkey();
let owner_pubkey = context.owner_keypair.pubkey();
// Create ATA using non-idempotent instruction (first creation)
let instruction = light_compressed_token_sdk::instructions::create_associated_token_account::create_associated_token_account(
let instruction = light_compressed_token_sdk::ctoken::create_associated_token_account::create_associated_token_account(
payer_pubkey,
owner_pubkey,
context.mint_pubkey,
Expand All @@ -162,7 +162,7 @@ async fn test_create_ata_idempotent() {
.await;

// Attempt to create the same ATA again using non-idempotent instruction (should fail)
let instruction = light_compressed_token_sdk::instructions::create_associated_token_account::create_associated_token_account(
let instruction = light_compressed_token_sdk::ctoken::create_associated_token_account::create_associated_token_account(
payer_pubkey,
owner_pubkey,
context.mint_pubkey,
Expand Down
Loading
Loading