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

rename locktower's slot to epoch (#3776)

This commit is contained in:
Rob Walker 2019-04-15 10:46:14 -07:00 committed by GitHub
parent 5e2831f09e
commit 5c4689a326
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
core/src/locktower.rs
View File

@ -14,7 +14,7 @@ const MAX_RECENT_VOTES: usize = 16;
#[derive(Default)] #[derive(Default)]
pub struct EpochStakes { pub struct EpochStakes {
slot: u64, epoch: u64,
stakes: HashMap<Pubkey, u64>, stakes: HashMap<Pubkey, u64>,
self_staked: u64, self_staked: u64,
total_staked: u64, total_staked: u64,
@ -36,11 +36,11 @@ pub struct Locktower {
} }
impl EpochStakes { impl EpochStakes {
pub fn new(slot: u64, stakes: HashMap<Pubkey, u64>, delegate_id: &Pubkey) -> Self { pub fn new(epoch: u64, stakes: HashMap<Pubkey, u64>, delegate_id: &Pubkey) -> Self {
let total_staked = stakes.values().sum(); let total_staked = stakes.values().sum();
let self_staked = *stakes.get(&delegate_id).unwrap_or(&0); let self_staked = *stakes.get(&delegate_id).unwrap_or(&0);
Self { Self {
slot, epoch,
stakes, stakes,
total_staked, total_staked,
self_staked, self_staked,
@ -54,9 +54,9 @@ impl EpochStakes {
&Pubkey::default(), &Pubkey::default(),
) )
} }
pub fn new_from_stake_accounts(slot: u64, accounts: &[(Pubkey, Account)]) -> Self { pub fn new_from_stake_accounts(epoch: u64, accounts: &[(Pubkey, Account)]) -> Self {
let stakes = accounts.iter().map(|(k, v)| (*k, v.lamports)).collect(); let stakes = accounts.iter().map(|(k, v)| (*k, v.lamports)).collect();
Self::new(slot, stakes, &accounts[0].0) Self::new(epoch, stakes, &accounts[0].0)
} }
pub fn new_from_bank(bank: &Bank, my_id: &Pubkey) -> Self { pub fn new_from_bank(bank: &Bank, my_id: &Pubkey) -> Self {
let bank_epoch = bank.get_epoch_and_slot_index(bank.slot()).0; let bank_epoch = bank.get_epoch_and_slot_index(bank.slot()).0;
@ -87,7 +87,7 @@ impl Locktower {
let bank = locktower.find_heaviest_bank(bank_forks).unwrap(); let bank = locktower.find_heaviest_bank(bank_forks).unwrap();
locktower.lockouts = locktower.lockouts =
Self::initialize_lockouts_from_bank(&bank, locktower.epoch_stakes.slot); Self::initialize_lockouts_from_bank(&bank, locktower.epoch_stakes.epoch);
locktower locktower
} }
pub fn new(epoch_stakes: EpochStakes, threshold_depth: usize, threshold_size: f64) -> Self { pub fn new(epoch_stakes: EpochStakes, threshold_depth: usize, threshold_size: f64) -> Self {
@ -195,32 +195,32 @@ impl Locktower {
pub fn is_recent_epoch(&self, bank: &Bank) -> bool { pub fn is_recent_epoch(&self, bank: &Bank) -> bool {
let bank_epoch = bank.get_epoch_and_slot_index(bank.slot()).0; let bank_epoch = bank.get_epoch_and_slot_index(bank.slot()).0;
bank_epoch >= self.epoch_stakes.slot bank_epoch >= self.epoch_stakes.epoch
} }
pub fn update_epoch(&mut self, bank: &Bank) { pub fn update_epoch(&mut self, bank: &Bank) {
trace!( trace!(
"updating bank epoch {} {}", "updating bank epoch slot: {} epoch: {}",
bank.slot(), bank.slot(),
self.epoch_stakes.slot self.epoch_stakes.epoch
); );
let bank_epoch = bank.get_epoch_and_slot_index(bank.slot()).0; let bank_epoch = bank.get_epoch_and_slot_index(bank.slot()).0;
if bank_epoch != self.epoch_stakes.slot { if bank_epoch != self.epoch_stakes.epoch {
assert!( assert!(
self.is_recent_epoch(bank), self.is_recent_epoch(bank),
"epoch_stakes cannot move backwards" "epoch_stakes cannot move backwards"
); );
info!( info!(
"Locktower updated epoch bank {} {}", "Locktower updated epoch bank slot: {} epoch: {}",
bank.slot(), bank.slot(),
self.epoch_stakes.slot self.epoch_stakes.epoch
); );
self.epoch_stakes = EpochStakes::new_from_bank(bank, &self.epoch_stakes.delegate_id); self.epoch_stakes = EpochStakes::new_from_bank(bank, &self.epoch_stakes.delegate_id);
solana_metrics::submit( solana_metrics::submit(
influxdb::Point::new("counter-locktower-epoch") influxdb::Point::new("counter-locktower-epoch")
.add_field( .add_field(
"slot", "epoch",
influxdb::Value::Integer(self.epoch_stakes.slot as i64), influxdb::Value::Integer(self.epoch_stakes.epoch as i64),
) )
.add_field( .add_field(
"self_staked", "self_staked",