diff --git a/program-libs/ctoken-interface/src/instructions/extensions/compressible.rs b/program-libs/ctoken-interface/src/instructions/extensions/compressible.rs index 5f5a51171b..1a6c92c67f 100644 --- a/program-libs/ctoken-interface/src/instructions/extensions/compressible.rs +++ b/program-libs/ctoken-interface/src/instructions/extensions/compressible.rs @@ -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, diff --git a/program-tests/compressed-token-test/tests/ctoken/create_ata.rs b/program-tests/compressed-token-test/tests/ctoken/create_ata.rs index 688647cfff..d0dda794a7 100644 --- a/program-tests/compressed-token-test/tests/ctoken/create_ata.rs +++ b/program-tests/compressed-token-test/tests/ctoken/create_ata.rs @@ -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! }), @@ -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, }), diff --git a/program-tests/registry-test/tests/compressible.rs b/program-tests/registry-test/tests/compressible.rs index 2fe99f1be6..8df41a4c52 100644 --- a/program-tests/registry-test/tests/compressible.rs +++ b/program-tests/registry-test/tests/compressible.rs @@ -320,7 +320,6 @@ async fn pause_compressible_config( 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, @@ -355,7 +354,6 @@ async fn unpause_compressible_config( 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, @@ -390,7 +388,6 @@ async fn deprecate_compressible_config( 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, @@ -425,7 +422,6 @@ async fn update_compressible_config_authorities( 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()), diff --git a/programs/compressed-token/program/src/mint_action/accounts.rs b/programs/compressed-token/program/src/mint_action/accounts.rs index dd04083d62..780c0523aa 100644 --- a/programs/compressed-token/program/src/mint_action/accounts.rs +++ b/programs/compressed-token/program/src/mint_action/accounts.rs @@ -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, diff --git a/programs/registry/src/compressible/update_config.rs b/programs/registry/src/compressible/update_config.rs index cdc5951cee..6fa39c3d3c 100644 --- a/programs/registry/src/compressible/update_config.rs +++ b/programs/registry/src/compressible/update_config.rs @@ -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>, diff --git a/sdk-libs/ctoken-sdk/src/ctoken/create.rs b/sdk-libs/ctoken-sdk/src/ctoken/create.rs index 6f468f27b3..6c385f779b 100644 --- a/sdk-libs/ctoken-sdk/src/ctoken/create.rs +++ b/sdk-libs/ctoken-sdk/src/ctoken/create.rs @@ -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(), diff --git a/sdk-libs/ctoken-sdk/src/ctoken/create_ata.rs b/sdk-libs/ctoken-sdk/src/ctoken/create_ata.rs index 20a9381241..94b28b0fbb 100644 --- a/sdk-libs/ctoken-sdk/src/ctoken/create_ata.rs +++ b/sdk-libs/ctoken-sdk/src/ctoken/create_ata.rs @@ -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,