Skip to content

Commit 532856a

Browse files
snawazsnawaz
committed
feat: add AccountSizeClass and compute sizes for 4 instructions
1 parent d58eb95 commit 532856a

10 files changed

Lines changed: 223 additions & 0 deletions

‎src/account_size_class.rs‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
2+
pub enum AccountSizeClass {
3+
// account size <= 256 B
4+
//
5+
// - sysvars (rent, clock, epoch schedule)
6+
// - SPL token account and ATA
7+
// - SPL token mint
8+
// - delegation_metadata_pda
9+
// - delegation_record_pda
10+
// - commit_record_pda
11+
// - program_config_pda
12+
// - validator
13+
// - fees_vault_pda
14+
Tiny,
15+
16+
// account size <= 1 KB
17+
//
18+
// - sysvars (recent blockhash)
19+
Small,
20+
21+
// account size <= 8 KB
22+
//
23+
// - sysvars (instructions)
24+
Medium,
25+
26+
// account size <= 64 KB
27+
//
28+
// - sysvars (state history)
29+
Large,
30+
31+
// account size <= 256 KB
32+
//
33+
ExtraLarge,
34+
35+
// account size <= 1 MB
36+
Huge,
37+
38+
// any legal value
39+
Dynamic(u32),
40+
}
41+
42+
impl AccountSizeClass {
43+
pub const fn size_budget(self) -> u32 {
44+
const KB: u32 = 1024;
45+
const MB: u32 = 1024 * KB;
46+
47+
match self {
48+
Self::Tiny => 256,
49+
Self::Small => KB,
50+
Self::Medium => 8 * KB,
51+
Self::Large => 64 * KB,
52+
Self::ExtraLarge => 256 * KB,
53+
Self::Huge => MB,
54+
Self::Dynamic(n) => n,
55+
}
56+
}
57+
}
58+
59+
pub fn total_size_budget(classes: &[AccountSizeClass]) -> u32 {
60+
classes.iter().map(|f| f.size_budget()).sum()
61+
}

‎src/instruction_builder/call_handler.rs‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
use crate::args::CallHandlerArgs;
22
use crate::discriminator::DlpDiscriminator;
33
use crate::pda::{ephemeral_balance_pda_from_payer, validator_fees_vault_pda_from_validator};
4+
use crate::{total_size_budget, AccountSizeClass};
45
use borsh::to_vec;
56
use solana_program::instruction::Instruction;
67
use solana_program::{instruction::AccountMeta, pubkey::Pubkey};
@@ -38,3 +39,18 @@ pub fn call_handler(
3839
.concat(),
3940
}
4041
}
42+
43+
///
44+
/// Returns accounts-data-size budget for call_handler instruction.
45+
///
46+
/// This value can be used with ComputeBudgetInstruction::SetLoadedAccountsDataSizeLimit
47+
///
48+
pub fn call_handler_size_budget(destination_program: AccountSizeClass, other_accounts: u32) -> u32 {
49+
total_size_budget(&[
50+
AccountSizeClass::Tiny, // validator
51+
AccountSizeClass::Tiny, // validator_fees_vault_pda
52+
destination_program,
53+
AccountSizeClass::Tiny, // escrow_authority
54+
AccountSizeClass::Tiny, // escrow_account
55+
]) + other_accounts
56+
}

‎src/instruction_builder/commit_diff.rs‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ use crate::pda::{
1010
delegation_metadata_pda_from_delegated_account, delegation_record_pda_from_delegated_account,
1111
program_config_from_program_id, validator_fees_vault_pda_from_validator,
1212
};
13+
use crate::{total_size_budget, AccountSizeClass};
1314

1415
/// Builds a commit state instruction.
1516
/// See [crate::processor::fast::process_commit_diff] for docs.
@@ -43,3 +44,22 @@ pub fn commit_diff(
4344
data: [DlpDiscriminator::CommitDiff.to_vec(), commit_args].concat(),
4445
}
4546
}
47+
48+
///
49+
/// Returns accounts-data-size budget for commit_diff instruction.
50+
///
51+
/// This value can be used with ComputeBudgetInstruction::SetLoadedAccountsDataSizeLimit
52+
///
53+
pub fn commit_diff_size_budget(delegated_account: AccountSizeClass) -> u32 {
54+
total_size_budget(&[
55+
AccountSizeClass::Tiny, // validator
56+
delegated_account, // delegated_account
57+
delegated_account, // commit_state_pda
58+
AccountSizeClass::Tiny, // commit_record_pda
59+
AccountSizeClass::Tiny, // delegation_record_pda
60+
AccountSizeClass::Tiny, // delegation_metadata_pda
61+
AccountSizeClass::Tiny, // validator_fees_vault_pda
62+
AccountSizeClass::Tiny, // program_config_pda
63+
AccountSizeClass::Tiny, // system_program
64+
])
65+
}

‎src/instruction_builder/commit_diff_from_buffer.rs‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ use crate::pda::{
1010
delegation_metadata_pda_from_delegated_account, delegation_record_pda_from_delegated_account,
1111
program_config_from_program_id, validator_fees_vault_pda_from_validator,
1212
};
13+
use crate::{total_size_budget, AccountSizeClass};
1314

1415
/// Builds a commit state from buffer instruction.
1516
/// See [crate::processor::process_commit_diff_from_buffer] for docs.
@@ -45,3 +46,23 @@ pub fn commit_diff_from_buffer(
4546
data: [DlpDiscriminator::CommitDiffFromBuffer.to_vec(), commit_args].concat(),
4647
}
4748
}
49+
50+
///
51+
/// Returns accounts-data-size budget for commit_diff_from_buffer instruction.
52+
///
53+
/// This value can be used with ComputeBudgetInstruction::SetLoadedAccountsDataSizeLimit
54+
///
55+
pub fn commit_diff_from_buffer_size_budget(delegated_account: AccountSizeClass) -> u32 {
56+
total_size_budget(&[
57+
AccountSizeClass::Tiny, // validator
58+
delegated_account, // delegated_account
59+
delegated_account, // commit_state_pda
60+
AccountSizeClass::Tiny, // commit_record_pda
61+
AccountSizeClass::Tiny, // delegation_record_pda
62+
AccountSizeClass::Tiny, // delegation_metadata_pda
63+
delegated_account, // commit_state_buffer
64+
AccountSizeClass::Tiny, // validator_fees_vault_pda
65+
AccountSizeClass::Tiny, // program_config_pda
66+
AccountSizeClass::Tiny, // system_program
67+
])
68+
}

‎src/instruction_builder/commit_state.rs‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ use crate::pda::{
1010
delegation_metadata_pda_from_delegated_account, delegation_record_pda_from_delegated_account,
1111
program_config_from_program_id, validator_fees_vault_pda_from_validator,
1212
};
13+
use crate::{total_size_budget, AccountSizeClass};
1314

1415
/// Builds a commit state instruction.
1516
/// See [crate::processor::process_commit_state] for docs.
@@ -43,3 +44,22 @@ pub fn commit_state(
4344
data: [DlpDiscriminator::CommitState.to_vec(), commit_args].concat(),
4445
}
4546
}
47+
48+
///
49+
/// Returns accounts-data-size budget for commit_state instruction.
50+
///
51+
/// This value can be used with ComputeBudgetInstruction::SetLoadedAccountsDataSizeLimit
52+
///
53+
pub fn commit_size_budget(delegated_account: AccountSizeClass) -> u32 {
54+
total_size_budget(&[
55+
AccountSizeClass::Tiny, // validator
56+
delegated_account, // delegated_account
57+
delegated_account, // commit_state_pda
58+
AccountSizeClass::Tiny, // commit_record_pda
59+
AccountSizeClass::Tiny, // delegation_record_pda
60+
AccountSizeClass::Tiny, // delegation_metadata_pda
61+
AccountSizeClass::Tiny, // validator_fees_vault_pda
62+
AccountSizeClass::Tiny, // program_config_pda
63+
AccountSizeClass::Tiny, // system_program
64+
])
65+
}

‎src/instruction_builder/commit_state_from_buffer.rs‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ use crate::pda::{
1010
delegation_metadata_pda_from_delegated_account, delegation_record_pda_from_delegated_account,
1111
program_config_from_program_id, validator_fees_vault_pda_from_validator,
1212
};
13+
use crate::{total_size_budget, AccountSizeClass};
1314

1415
/// Builds a commit state from buffer instruction.
1516
/// See [crate::processor::process_commit_state_from_buffer] for docs.
@@ -49,3 +50,23 @@ pub fn commit_state_from_buffer(
4950
.concat(),
5051
}
5152
}
53+
54+
///
55+
/// Returns accounts-data-size budget for commit_state_from_buffer instruction.
56+
///
57+
/// This value can be used with ComputeBudgetInstruction::SetLoadedAccountsDataSizeLimit
58+
///
59+
pub fn commit_state_from_buffer_size_budget(delegated_account: AccountSizeClass) -> u32 {
60+
total_size_budget(&[
61+
AccountSizeClass::Tiny, // validator
62+
delegated_account, // delegated_account
63+
delegated_account, // commit_state_pda
64+
AccountSizeClass::Tiny, // commit_record_pda
65+
AccountSizeClass::Tiny, // delegation_record_pda
66+
AccountSizeClass::Tiny, // delegation_metadata_pda
67+
delegated_account, // commit_state_buffer
68+
AccountSizeClass::Tiny, // validator_fees_vault_pda
69+
AccountSizeClass::Tiny, // program_config_pda
70+
AccountSizeClass::Tiny, // system_program
71+
])
72+
}

‎src/instruction_builder/delegate.rs‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ use crate::pda::{
99
delegate_buffer_pda_from_delegated_account_and_owner_program,
1010
delegation_metadata_pda_from_delegated_account, delegation_record_pda_from_delegated_account,
1111
};
12+
use crate::{total_size_budget, AccountSizeClass};
1213

1314
/// Builds a delegate instruction
1415
/// See [crate::processor::process_delegate] for docs.
@@ -41,3 +42,20 @@ pub fn delegate(
4142
data,
4243
}
4344
}
45+
46+
///
47+
/// Returns accounts-data-size budget for delegate instruction.
48+
///
49+
/// This value can be used with ComputeBudgetInstruction::SetLoadedAccountsDataSizeLimit
50+
///
51+
pub fn delegate_size_budget(delegated_account: AccountSizeClass) -> u32 {
52+
total_size_budget(&[
53+
AccountSizeClass::Tiny, // payer
54+
delegated_account, // delegated_account
55+
AccountSizeClass::Tiny, // owner
56+
delegated_account, // delegate_buffer_pda
57+
AccountSizeClass::Tiny, // delegation_record_pda
58+
AccountSizeClass::Tiny, // delegation_metadata_pda
59+
AccountSizeClass::Tiny, // system_program
60+
])
61+
}

‎src/instruction_builder/finalize.rs‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ use crate::pda::{
88
delegation_metadata_pda_from_delegated_account, delegation_record_pda_from_delegated_account,
99
validator_fees_vault_pda_from_validator,
1010
};
11+
use crate::{total_size_budget, AccountSizeClass};
1112

1213
/// Builds a finalize state instruction.
1314
/// See [crate::processor::process_finalize] for docs.
@@ -33,3 +34,21 @@ pub fn finalize(validator: Pubkey, delegated_account: Pubkey) -> Instruction {
3334
data: DlpDiscriminator::Finalize.to_vec(),
3435
}
3536
}
37+
38+
///
39+
/// Returns accounts-data-size budget for finalize instruction.
40+
///
41+
/// This value can be used with ComputeBudgetInstruction::SetLoadedAccountsDataSizeLimit
42+
///
43+
pub fn finalize_size_budget(delegated_account: AccountSizeClass) -> u32 {
44+
total_size_budget(&[
45+
AccountSizeClass::Tiny, // validator
46+
delegated_account, // delegated_account
47+
delegated_account, // commit_state_pda
48+
AccountSizeClass::Tiny, // commit_record_pda
49+
AccountSizeClass::Tiny, // delegation_record_pda
50+
AccountSizeClass::Tiny, // delegation_metadata_pda
51+
AccountSizeClass::Tiny, // validator_fees_vault_pda
52+
AccountSizeClass::Tiny, // system_program
53+
])
54+
}

‎src/instruction_builder/undelegate.rs‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ use crate::pda::{
99
fees_vault_pda, undelegate_buffer_pda_from_delegated_account,
1010
validator_fees_vault_pda_from_validator,
1111
};
12+
use crate::{total_size_budget, AccountSizeClass};
1213

1314
/// Builds an undelegate instruction.
1415
/// See [crate::processor::process_undelegate] for docs.
@@ -46,3 +47,25 @@ pub fn undelegate(
4647
data: DlpDiscriminator::Undelegate.to_vec(),
4748
}
4849
}
50+
51+
///
52+
/// Returns accounts-data-size budget for undelegate instruction.
53+
///
54+
/// This value can be used with ComputeBudgetInstruction::SetLoadedAccountsDataSizeLimit
55+
///
56+
pub fn undelegate_size_budget(delegated_account: AccountSizeClass) -> u32 {
57+
total_size_budget(&[
58+
AccountSizeClass::Tiny, // validator
59+
delegated_account, // delegated_account
60+
AccountSizeClass::Tiny, // owner_program
61+
delegated_account, // undelegate_buffer_pda
62+
delegated_account, // commit_state_pda
63+
AccountSizeClass::Tiny, // commit_record_pda
64+
AccountSizeClass::Tiny, // delegation_record_pda
65+
AccountSizeClass::Tiny, // delegation_metadata_pda
66+
AccountSizeClass::Tiny, // rent_reimbursement
67+
AccountSizeClass::Tiny, // fees_vault_pda
68+
AccountSizeClass::Tiny, // validator_fees_vault_pda
69+
AccountSizeClass::Tiny, // system_program
70+
])
71+
}

‎src/lib.rs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ pub mod instruction_builder;
3131
pub mod pda;
3232
pub mod state;
3333

34+
mod account_size_class;
35+
36+
pub use account_size_class::*;
37+
3438
#[cfg(not(feature = "sdk"))]
3539
mod diff;
3640
#[cfg(not(feature = "sdk"))]

0 commit comments

Comments
 (0)