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

correct insert stake filtering

This commit is contained in:
musitdev 2023-09-18 18:21:12 +02:00
parent c7e794b25f
commit f282b5e282
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
stake_aggregate/src/leader_schedule.rs
View File

@ -72,6 +72,7 @@ enum LeaderScheduleResult {
End(Option<LeaderSchedule>, EpochInfo), End(Option<LeaderSchedule>, EpochInfo),
} }
//TODO remove desactivated account after leader schedule calculus.
fn process_leadershedule_event( fn process_leadershedule_event(
event: LeaderScheduleEvent, event: LeaderScheduleEvent,
stakestore: &mut StakeStore, stakestore: &mut StakeStore,

8
stake_aggregate/src/stakestore.rs
View File

@ -54,7 +54,7 @@ fn stake_map_notify_stake(
//doesn't erase new state with an old one. Can arrive during bootstrapping. //doesn't erase new state with an old one. Can arrive during bootstrapping.
//several instructions can be done in the same slot. //several instructions can be done in the same slot.
if strstake.last_update_slot <= stake.last_update_slot { if strstake.last_update_slot <= stake.last_update_slot {
if stake.is_activated(current_epoch) { if stake.is_inserted(current_epoch) {
log::info!("stake_map_notify_stake Stake store updated stake: {stake_account} old_stake:{strstake:?} stake:{stake:?}"); log::info!("stake_map_notify_stake Stake store updated stake: {stake_account} old_stake:{strstake:?} stake:{stake:?}");
*strstake = stake; *strstake = stake;
false false
@ -67,7 +67,7 @@ fn stake_map_notify_stake(
} }
// If value doesn't exist yet, then insert a new value of 1 // If value doesn't exist yet, then insert a new value of 1
std::collections::hash_map::Entry::Vacant(vacant) => { std::collections::hash_map::Entry::Vacant(vacant) => {
if stake.is_activated(current_epoch) { if stake.is_inserted(current_epoch) {
log::info!("stake_map_notify_stake Stake store insert stake: {stake_account} stake:{stake:?}"); log::info!("stake_map_notify_stake Stake store insert stake: {stake_account} stake:{stake:?}");
vacant.insert(stake); vacant.insert(stake);
} }
@ -101,7 +101,7 @@ pub struct StoredStake {
} }
impl StoredStake { impl StoredStake {
fn is_activated(&self, current_epoch: u64) -> bool { fn is_inserted(&self, current_epoch: u64) -> bool {
if self.stake.deactivation_epoch == crate::leader_schedule::MAX_EPOCH_VALUE { if self.stake.deactivation_epoch == crate::leader_schedule::MAX_EPOCH_VALUE {
true true
} else if self.stake.activation_epoch == crate::leader_schedule::MAX_EPOCH_VALUE { } else if self.stake.activation_epoch == crate::leader_schedule::MAX_EPOCH_VALUE {
@ -113,8 +113,6 @@ impl StoredStake {
true true
} else if self.stake.deactivation_epoch < current_epoch { } else if self.stake.deactivation_epoch < current_epoch {
false false
} else if self.stake.activation_epoch > current_epoch {
false
} else { } else {
true true
} }