Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ pub struct CompressibleExtensionInstructionData {
/// Rent payment in epochs.
/// Paid once at initialization.
pub rent_payment: u8,
pub has_top_up: u8,
/// Placeholder for future use. If true, the compressed token account cannot be transferred,
/// only decompressed. Currently unused - always set to 0.
pub compression_only: u8,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,6 @@ async fn test_create_ata_failing() {
token_account_version: light_ctoken_interface::state::TokenDataVersion::ShaFlat
as u8,
rent_payment: 2,
has_top_up: 1,
write_top_up: 100,
compress_to_account_pubkey: Some(compress_to_pubkey), // Forbidden for ATAs!
}),
Expand Down Expand Up @@ -405,7 +404,6 @@ async fn test_create_ata_failing() {
token_account_version: light_ctoken_interface::state::TokenDataVersion::ShaFlat
as u8,
rent_payment: 2,
has_top_up: 1,
write_top_up: 100,
compress_to_account_pubkey: None,
}),
Expand Down
4 changes: 0 additions & 4 deletions program-tests/registry-test/tests/compressible.rs
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,6 @@ async fn pause_compressible_config<R: Rpc>(
let compressible_config = CompressibleConfig::ctoken_v1_config_pda();

let accounts = UpdateCompressibleConfigAccounts {
fee_payer: payer.pubkey(),
update_authority: update_authority.pubkey(),
compressible_config,
new_update_authority: None,
Expand Down Expand Up @@ -355,7 +354,6 @@ async fn unpause_compressible_config<R: Rpc>(
let compressible_config = CompressibleConfig::ctoken_v1_config_pda();

let accounts = UpdateCompressibleConfigAccounts {
fee_payer: payer.pubkey(),
update_authority: update_authority.pubkey(),
compressible_config,
new_update_authority: None,
Expand Down Expand Up @@ -390,7 +388,6 @@ async fn deprecate_compressible_config<R: Rpc>(
let compressible_config = CompressibleConfig::ctoken_v1_config_pda();

let accounts = UpdateCompressibleConfigAccounts {
fee_payer: payer.pubkey(),
update_authority: update_authority.pubkey(),
compressible_config,
new_update_authority: None,
Expand Down Expand Up @@ -425,7 +422,6 @@ async fn update_compressible_config_authorities<R: Rpc>(
let compressible_config = CompressibleConfig::ctoken_v1_config_pda();

let accounts = UpdateCompressibleConfigAccounts {
fee_payer: payer.pubkey(),
update_authority: update_authority.pubkey(),
compressible_config,
new_update_authority: new_update_authority.map(|k| k.pubkey()),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,11 @@ pub struct AccountsConfig {
/// 4. SPL mint is either:
/// 4.1. already initialized
/// 4.2. or is initialized in this instruction
// TODO: SPL token accounts (mint, token_pool_pda, token_program) are required when
// spl_mint_initialized is true, but they are only actually used for MintToCompressed,
// MintToCToken, or CreateSplMint actions. For authority/metadata update actions
// (UpdateMintAuthority, UpdateFreezeAuthority, UpdateMetadataField, etc.), the SPL
// accounts are not needed. This cannot be tested until associated SPL mint is supported.
pub spl_mint_initialized: bool,
/// 5. Mint
pub has_mint_to_actions: bool,
Expand Down
3 changes: 0 additions & 3 deletions programs/registry/src/compressible/update_config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ use light_compressible::config::CompressibleConfig;
/// Context for updating a compressible config
#[derive(Accounts)]
pub struct UpdateCompressibleConfig<'info> {
#[account(mut)]
pub fee_payer: Signer<'info>,

/// Authority that can update the config - must match the config's update_authority
pub update_authority: Signer<'info>,

Expand Down
5 changes: 0 additions & 5 deletions sdk-libs/ctoken-sdk/src/ctoken/create.rs
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,6 @@ impl CreateCTokenAccount {
.map(|config| CompressibleExtensionInstructionData {
token_account_version: config.token_account_version as u8,
rent_payment: config.pre_pay_num_epochs,
has_top_up: if config.lamports_per_write.is_some() {
1
} else {
0
},
compression_only: 0,
write_top_up: config.lamports_per_write.unwrap_or(0),
compress_to_account_pubkey: config.compress_to_account_pubkey.clone(),
Expand Down
5 changes: 0 additions & 5 deletions sdk-libs/ctoken-sdk/src/ctoken/create_ata.rs
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,6 @@ impl CreateAssociatedTokenAccount {
.map(|config| CompressibleExtensionInstructionData {
token_account_version: config.token_account_version as u8,
rent_payment: config.pre_pay_num_epochs,
has_top_up: if config.lamports_per_write.is_some() {
1
} else {
0
},
compression_only: 0,
write_top_up: config.lamports_per_write.unwrap_or(0),
compress_to_account_pubkey: None,
Expand Down
Loading