blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add new error if stake delegation is below the minimum (#25709)

This commit is contained in:
Brooks Prumo 2022-06-01 20:29:57 -05:00 committed by GitHub
parent 369ff0858d
commit 0b2d5291f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
programs/stake/src/stake_instruction.rs
View File

@ -3886,7 +3886,10 @@ mod tests {
]; ];
for (stake_delegation, expected_result) in &[ for (stake_delegation, expected_result) in &[
(minimum_delegation, Ok(())), (minimum_delegation, Ok(())),
(minimum_delegation - 1, Err(StakeError::InsufficientStake)), (
minimum_delegation - 1,
Err(StakeError::InsufficientDelegation),
),
] { ] {
for stake_state in &[ for stake_state in &[
StakeState::Initialized(meta), StakeState::Initialized(meta),
@ -7029,7 +7032,7 @@ mod tests {
fn test_behavior_withdrawal_then_redelegate_with_less_than_minimum_stake_delegation() { fn test_behavior_withdrawal_then_redelegate_with_less_than_minimum_stake_delegation() {
do_test_behavior_withdrawal_then_redelegate_with_less_than_minimum_stake_delegation( do_test_behavior_withdrawal_then_redelegate_with_less_than_minimum_stake_delegation(
new_feature_set(), new_feature_set(),
Err(StakeError::InsufficientStake.into()), Err(StakeError::InsufficientDelegation.into()),
); );
} }
#[test] #[test]

2
programs/stake/src/stake_state.rs
View File

@ -1034,7 +1034,7 @@ fn validate_delegated_amount(
|| feature_set.is_active(&feature_set::stake_raise_minimum_delegation_to_1_sol::id())) || feature_set.is_active(&feature_set::stake_raise_minimum_delegation_to_1_sol::id()))
&& stake_amount < crate::get_minimum_delegation(feature_set) && stake_amount < crate::get_minimum_delegation(feature_set)
{ {
return Err(StakeError::InsufficientStake.into()); return Err(StakeError::InsufficientDelegation.into());
} }
Ok(ValidatedDelegatedInfo { stake_amount }) Ok(ValidatedDelegatedInfo { stake_amount })
} }

3
sdk/program/src/stake/instruction.rs
View File

@ -57,6 +57,9 @@ pub enum StakeError {
"stake account has not been delinquent for the minimum epochs required for deactivation" "stake account has not been delinquent for the minimum epochs required for deactivation"
)] )]
MinimumDelinquentEpochsForDeactivationNotMet, MinimumDelinquentEpochsForDeactivationNotMet,
#[error("delegation amount is less than the minimum")]
InsufficientDelegation,
} }
impl<E> DecodeError<E> for StakeError { impl<E> DecodeError<E> for StakeError {