Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions wen-restart/proto/wen_restart.proto
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,23 @@ message LastVotedForkSlotsRecord {

message LastVotedForkSlotsAggregateRecord {
map<string, LastVotedForkSlotsRecord> received = 1;
optional LastVotedForkSlotsAggregateFinal final_result = 2;
}

message LastVotedForkSlotsAggregateFinal {
map<uint64, uint64> slots_stake_map = 1;
uint64 total_active_stake = 2;
}

message HeaviestFork {
uint64 slot = 1;
string bankhash = 2;
uint64 total_active_stake = 3;
}

message WenRestartProgress {
State state = 1;
optional LastVotedForkSlotsRecord my_last_voted_fork_slots = 2;
optional LastVotedForkSlotsAggregateRecord last_voted_fork_slots_aggregate = 3;
optional HeaviestFork my_heaviest_fork = 4;
}
28 changes: 22 additions & 6 deletions wen-restart/src/last_voted_fork_slots_aggregate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@ pub struct LastVotedForkSlotsAggregateResult {
pub active_percent: f64, /* 0 ~ 100.0 */
}

#[derive(Clone, Debug, PartialEq)]
pub struct LastVotedForkSlotsFinalResult {
pub slots_stake_map: HashMap<Slot, u64>,
pub total_active_stake: u64,
}

impl LastVotedForkSlotsAggregate {
pub(crate) fn new(
root_slot: Slot,
Expand Down Expand Up @@ -131,15 +137,25 @@ impl LastVotedForkSlotsAggregate {
Some(record)
}

pub(crate) fn get_aggregate_result(&self) -> LastVotedForkSlotsAggregateResult {
let total_stake = self.epoch_stakes.total_stake();
let total_active_stake = self.active_peers.iter().fold(0, |sum: u64, pubkey| {
fn total_active_stake(&self) -> u64 {
self.active_peers.iter().fold(0, |sum: u64, pubkey| {
sum.saturating_add(Self::validator_stake(&self.epoch_stakes, pubkey))
});
let active_percent = total_active_stake as f64 / total_stake as f64 * 100.0;
})
}

pub(crate) fn get_aggregate_result(&self) -> LastVotedForkSlotsAggregateResult {
LastVotedForkSlotsAggregateResult {
slots_to_repair: self.slots_to_repair.iter().cloned().collect(),
Comment thread
carllin marked this conversation as resolved.
Outdated
active_percent,
active_percent: self.total_active_stake() as f64
/ self.epoch_stakes.total_stake() as f64
Comment thread
carllin marked this conversation as resolved.
Outdated
* 100.0,
}
}

pub(crate) fn get_final_result(&self) -> LastVotedForkSlotsFinalResult {
LastVotedForkSlotsFinalResult {
slots_stake_map: self.slots_stake_map.clone(),
total_active_stake: self.total_active_stake(),
Comment thread
carllin marked this conversation as resolved.
Outdated
}
}
}
Expand Down
Loading