Skip to content

Commit fea50e3

Browse files
committed
refactor: set better default compressible values
1 parent e1f7d11 commit fea50e3

7 files changed

Lines changed: 13 additions & 30 deletions

File tree

programs/compressed-token/program/src/create_token_account.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,9 @@ impl<'info> CreateCTokenAccounts<'info> {
9797

9898
#[profile]
9999
#[inline(always)]
100-
pub fn parse_config_account<'info>(
101-
config_account: &'info AccountInfo,
102-
) -> Result<&'info CompressibleConfig, ProgramError> {
100+
pub fn parse_config_account(
101+
config_account: &AccountInfo,
102+
) -> Result<&CompressibleConfig, ProgramError> {
103103
// Validate config account owner
104104
check_owner(
105105
&pubkey!("Lighton6oQpVkeewmo2mcPTQQp7kYHr4fWpAgJyEmDX").to_bytes(),

programs/compressed-token/program/src/ctoken_transfer.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ use crate::shared::{
1515
/// Process ctoken transfer instruction
1616
#[profile]
1717
#[inline(always)]
18-
pub fn process_ctoken_transfer<'a>(
19-
accounts: &'a [AccountInfo],
18+
pub fn process_ctoken_transfer(
19+
accounts: &[AccountInfo],
2020
instruction_data: &[u8],
2121
) -> Result<(), ProgramError> {
2222
if accounts.len() < 3 {

programs/compressed-token/program/src/shared/create_pda_account.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ use crate::{shared::convert_program_error, LIGHT_CPI_SIGNER};
3232
///
3333
/// ## Parameters
3434
/// - `configs`: ArrayVec of PDA configs. First config is for the new account being created.
35-
/// Additional configs are for fee payer PDAs that need to sign.
35+
/// Additional configs are for fee payer PDAs that need to sign.
3636
#[profile]
3737
pub fn create_pda_account<const N: usize>(
3838
fee_payer: &AccountInfo,

sdk-libs/compressed-token-sdk/src/ctoken/compressible.rs

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,28 +21,25 @@ impl Default for CompressibleParams {
2121
Self {
2222
compressible_config: COMPRESSIBLE_CONFIG_V1,
2323
rent_sponsor: RENT_SPONSOR,
24-
pre_pay_num_epochs: 2,
25-
lamports_per_write: Some(100),
24+
pre_pay_num_epochs: 35,
25+
lamports_per_write: Some(766),
2626
compress_to_account_pubkey: None,
2727
token_account_version: TokenDataVersion::ShaFlat,
2828
}
2929
}
3030
}
3131

3232
impl CompressibleParams {
33-
pub fn new(lamports_per_write: u32, pre_pay_num_epochs: u8) -> Self {
34-
Self {
35-
lamports_per_write: Some(lamports_per_write),
36-
pre_pay_num_epochs,
37-
..Default::default()
38-
}
33+
pub fn new() -> Self {
34+
Self::default()
3935
}
4036

4137
pub fn compress_to_pubkey(mut self, compress_to: CompressToPubkey) -> Self {
4238
self.compress_to_account_pubkey = Some(compress_to);
4339
self
4440
}
4541
}
42+
4643
pub struct CompressibleParamsInfos<'info> {
4744
pub compressible_config: AccountInfo<'info>,
4845
pub rent_sponsor: AccountInfo<'info>,
@@ -55,8 +52,6 @@ pub struct CompressibleParamsInfos<'info> {
5552

5653
impl<'info> CompressibleParamsInfos<'info> {
5754
pub fn new(
58-
pre_pay_num_epochs: u8,
59-
lamports_per_write: u32,
6055
compressible_config: AccountInfo<'info>,
6156
rent_sponsor: AccountInfo<'info>,
6257
system_program: AccountInfo<'info>,
@@ -65,8 +60,8 @@ impl<'info> CompressibleParamsInfos<'info> {
6560
compressible_config,
6661
rent_sponsor,
6762
system_program,
68-
pre_pay_num_epochs,
69-
lamports_per_write: Some(lamports_per_write),
63+
pre_pay_num_epochs: CompressibleParams::default().pre_pay_num_epochs,
64+
lamports_per_write: CompressibleParams::default().lamports_per_write,
7065
compress_to_account_pubkey: None,
7166
token_account_version: TokenDataVersion::ShaFlat,
7267
}

sdk-tests/sdk-ctoken-test/src/create_ata.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ pub fn process_create_ata_invoke(
3434

3535
// Build the compressible params using constructor
3636
let compressible_params = CompressibleParamsInfos::new(
37-
data.pre_pay_num_epochs,
38-
data.lamports_per_write,
3937
accounts[3].clone(),
4038
accounts[4].clone(),
4139
accounts[2].clone(),
@@ -82,8 +80,6 @@ pub fn process_create_ata_invoke_signed(
8280

8381
// Build the compressible params using constructor
8482
let compressible_params = CompressibleParamsInfos::new(
85-
data.pre_pay_num_epochs,
86-
data.lamports_per_write,
8783
accounts[3].clone(),
8884
accounts[4].clone(),
8985
accounts[2].clone(),

sdk-tests/sdk-ctoken-test/src/create_ata2.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ pub fn process_create_ata2_invoke(
3333
}
3434

3535
let compressible_params = CompressibleParamsInfos::new(
36-
data.pre_pay_num_epochs,
37-
data.lamports_per_write,
3836
accounts[5].clone(),
3937
accounts[6].clone(),
4038
accounts[4].clone(),
@@ -82,8 +80,6 @@ pub fn process_create_ata2_invoke_signed(
8280
}
8381

8482
let compressible_params = CompressibleParamsInfos::new(
85-
data.pre_pay_num_epochs,
86-
data.lamports_per_write,
8783
accounts[5].clone(),
8884
accounts[6].clone(),
8985
accounts[4].clone(),

sdk-tests/sdk-ctoken-test/src/create_token_account.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ pub fn process_create_token_account_invoke(
3535

3636
// Build the compressible params using constructor
3737
let compressible_params = CompressibleParamsInfos::new(
38-
data.pre_pay_num_epochs,
39-
data.lamports_per_write,
4038
accounts[3].clone(),
4139
accounts[5].clone(),
4240
accounts[4].clone(),
@@ -82,8 +80,6 @@ pub fn process_create_token_account_invoke_signed(
8280

8381
// Build the compressible params using constructor
8482
let compressible_params = CompressibleParamsInfos::new(
85-
data.pre_pay_num_epochs,
86-
data.lamports_per_write,
8783
accounts[3].clone(),
8884
accounts[5].clone(),
8985
accounts[4].clone(),

0 commit comments

Comments
 (0)