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

stake: De-replicode mergable info extraction

This commit is contained in:
Trent Nelson 2020-11-19 12:53:05 -07:00 committed by Trent Nelson
parent dcbb1dca8a
commit dc7f89715a
1 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1055,31 +1055,12 @@ impl<'a> StakeAccount for KeyedAccount<'a> {
return Err(InstructionError::IncorrectProgramId); return Err(InstructionError::IncorrectProgramId);
} }
let meta = match self.state()? { let meta = get_info_if_mergable(self, clock, stake_history)?;
StakeState::Stake(meta, stake) => {
// stake must be fully de-activated
if stake.stake(clock.epoch, Some(stake_history), true) != 0 {
return Err(StakeError::MergeActivatedStake.into());
}
meta
}
StakeState::Initialized(meta) => meta,
_ => return Err(InstructionError::InvalidAccountData),
};
// Authorized staker is allowed to split/merge accounts // Authorized staker is allowed to split/merge accounts
meta.authorized.check(signers, StakeAuthorize::Staker)?; meta.authorized.check(signers, StakeAuthorize::Staker)?;
let source_meta = match source_stake.state()? { let source_meta = get_info_if_mergable(source_stake, clock, stake_history)?;
StakeState::Stake(meta, stake) => {
// stake must be fully de-activated
if stake.stake(clock.epoch, Some(stake_history), true) != 0 {
return Err(StakeError::MergeActivatedStake.into());
}
meta
}
StakeState::Initialized(meta) => meta,
_ => return Err(InstructionError::InvalidAccountData),
};
// Meta must match for both accounts // Meta must match for both accounts
if meta != source_meta { if meta != source_meta {
@ -1168,6 +1149,23 @@ impl<'a> StakeAccount for KeyedAccount<'a> {
} }
} }
fn get_info_if_mergable(
stake_keyed_account: &KeyedAccount,
clock: &Clock,
stake_history: &StakeHistory,
) -> Result<Meta, InstructionError> {
match stake_keyed_account.state()? {
StakeState::Stake(meta, stake) => {
// stake must be fully de-activated
if stake.stake(clock.epoch, Some(stake_history), true) != 0 {
return Err(StakeError::MergeActivatedStake.into());
}
Ok(meta)
}
StakeState::Initialized(meta) => Ok(meta),
_ => Err(InstructionError::InvalidAccountData),
}
}
// utility function, used by runtime // utility function, used by runtime
// returns a tuple of (stakers_reward,voters_reward) // returns a tuple of (stakers_reward,voters_reward)
pub fn redeem_rewards( pub fn redeem_rewards(