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

Move now to after super majority time is calculated 

'now' could end up being earlier than the supermajority calculated time.
Leading to underflow errors and thread panic.
This commit is contained in:
Stephen Akridge 2019-02-08 13:23:28 -08:00 committed by sakridge
parent 1278396bd5
commit 95b28d4d8c
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/compute_leader_confirmation_service.rs
View File

@ -31,7 +31,6 @@ impl ComputeLeaderConfirmationService {
fn get_last_supermajority_timestamp( fn get_last_supermajority_timestamp(
bank: &Arc<Bank>, bank: &Arc<Bank>,
leader_id: Pubkey, leader_id: Pubkey,
now: u64,
last_valid_validator_timestamp: u64, last_valid_validator_timestamp: u64,
) -> result::Result<u64, ConfirmationError> { ) -> result::Result<u64, ConfirmationError> {
let mut total_stake = 0; let mut total_stake = 0;
@ -80,6 +79,7 @@ impl ComputeLeaderConfirmationService {
} }
if last_valid_validator_timestamp != 0 { if last_valid_validator_timestamp != 0 {
let now = timing::timestamp();
submit( submit(
influxdb::Point::new(&"leader-confirmation") influxdb::Point::new(&"leader-confirmation")
.add_field( .add_field(
@ -98,17 +98,14 @@ impl ComputeLeaderConfirmationService {
leader_id: Pubkey, leader_id: Pubkey,
last_valid_validator_timestamp: &mut u64, last_valid_validator_timestamp: &mut u64,
) { ) {
let now = timing::timestamp(); if let Ok(super_majority_timestamp) =
if let Ok(super_majority_timestamp) = Self::get_last_supermajority_timestamp( Self::get_last_supermajority_timestamp(bank, leader_id, *last_valid_validator_timestamp)
bank, {
leader_id, let now = timing::timestamp();
now,
*last_valid_validator_timestamp,
) {
let confirmation_ms = now - super_majority_timestamp; let confirmation_ms = now - super_majority_timestamp;
*last_valid_validator_timestamp = super_majority_timestamp; *last_valid_validator_timestamp = super_majority_timestamp;
bank.set_confirmation_time((now - *last_valid_validator_timestamp) as usize); bank.set_confirmation_time(confirmation_ms as usize);
submit( submit(
influxdb::Point::new(&"leader-confirmation") influxdb::Point::new(&"leader-confirmation")