rpc: getStakeActivation now correctly returns the inactivate lamports for deactivat{ed,ing} stake account in all cases #26595
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 tasks
joncinque
reviewed
Jul 12, 2022
rpc/src/rpc.rs
Outdated
| @@ -1783,7 +1783,9 @@ impl JsonRpcRequestProcessor { | |||
| StakeActivationState::Activating => activating, | |||
| StakeActivationState::Active => 0, | |||
| StakeActivationState::Deactivating => delegation.stake.saturating_sub(effective), | |||
There was a problem hiding this comment.
When looking at this earlier, I thought this might need to be
StakeActivationState::Deactivating => deactivating,
But this inactive_stake really means Deactivated stake, and is only non-zero in the case of multi-epoch deactivations.
If a redelegated stake ever goes through a multi-epoch deactivation, this would also show too much stake overall on the system. What do you think about this being stake_account.lamports().saturating_sub(effective + rent_exempt_reserve)?
…deactivat{ed,ing} stake account in all cases
mvines
changed the title
joncinque
approved these changes
Jul 12, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
For a newly created stake account,
getStakeActivationreturnsStakeActivationState::Inactivewith aninactiveamount equal to the number of lamports held by the stake account, minus the rent exempt reserve.However for a fully deactivated stake account,
getStakeActivationreturnsStakeActivationState::Inactivewith aninactiveamount equal to the number of lamports in the previously active delegation. This is wrong because the user may have deposited or withdrawn lamports from the account since it was deactivated, and is inconsistent with the result returned for newly created stake accounts.Likewise
StakeActivationState::Deactivatingcould return an incorrect amount ofinactivestake due to user deposits or withdrawals