Skip to content

Add next epoch seed finality check in VRF evalutor #787

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 10, 2024
Merged

Add next epoch seed finality check in VRF evalutor #787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 9 additions & 0 deletions node/src/block_producer/block_producer_effects.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ use mina_p2p_messages::v2::{
MinaStateSnarkTransitionValueStableV2, ProverExtendBlockchainInputStableV2,
};
use openmina_core::bug_condition;
use openmina_core::consensus::in_seed_update_range;

use crate::account::AccountSecretKey;
use crate::ledger::write::{LedgerWriteAction, LedgerWriteRequest};
Expand Down Expand Up @@ -56,6 +57,7 @@ pub fn block_producer_effects<S: crate::Service>(
};
let next_epoch_first_slot = next_epoch_first_slot(&global_slot);
let current_epoch = store.state().current_epoch();
let current_slot = store.state().current_slot();

store.dispatch(BlockProducerVrfEvaluatorAction::InitializeEvaluator {
best_tip: best_tip.clone(),
Expand All @@ -77,8 +79,15 @@ pub fn block_producer_effects<S: crate::Service>(
}
}

let is_next_epoch_seed_finalized = if let Some(current_slot) = current_slot {
!in_seed_update_range(current_slot, best_tip.constants())
} else {
false
};

store.dispatch(BlockProducerVrfEvaluatorAction::CheckEpochEvaluability {
current_epoch,
is_next_epoch_seed_finalized,
root_block_epoch,
best_tip_epoch,
best_tip_slot,
Expand Down
1 change: 1 addition & 0 deletions node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_actions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ pub enum BlockProducerVrfEvaluatorAction {
#[action_event(level = info, fields(current_epoch, best_tip_epoch, best_tip_slot, best_tip_global_slot))]
CheckEpochEvaluability {
current_epoch: Option<u32>,
is_next_epoch_seed_finalized: bool,
best_tip_epoch: u32,
root_block_epoch: u32,
best_tip_slot: u32,
Expand Down
1 change: 1 addition & 0 deletions node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_effects.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ impl BlockProducerVrfEvaluatorAction {
best_tip_slot,
next_epoch_first_slot,
current_epoch: _,
is_next_epoch_seed_finalized: _,
staking_epoch_data: _,
next_epoch_data: _,
} => {
Expand Down
2 changes: 2 additions & 0 deletions node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_reducer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ impl BlockProducerVrfEvaluatorState {
}
BlockProducerVrfEvaluatorAction::CheckEpochEvaluability {
current_epoch,
is_next_epoch_seed_finalized,
best_tip_epoch,
root_block_epoch,
staking_epoch_data,
Expand All @@ -76,6 +77,7 @@ impl BlockProducerVrfEvaluatorState {
self.status = BlockProducerVrfEvaluatorStatus::ReadinessCheck {
time: meta.time(),
current_epoch: *current_epoch,
is_next_epoch_seed_finalized: *is_next_epoch_seed_finalized,
best_tip_epoch: *best_tip_epoch,
root_block_epoch: *root_block_epoch,
is_current_epoch_evaluated: self.is_epoch_evaluated(*best_tip_epoch),
Expand Down
36 changes: 34 additions & 2 deletions node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ impl BlockProducerVrfEvaluatorState {
best_tip_epoch,
root_block_epoch,
current_epoch,
is_next_epoch_seed_finalized,
staking_epoch_data,
next_epoch_data,
..
Expand All @@ -111,7 +112,7 @@ impl BlockProducerVrfEvaluatorState {
if !self.is_epoch_evaluated(best_tip_epoch) {
self.epoch_context = EpochContext::Current((*staking_epoch_data).into())
} else if !self.is_epoch_evaluated(best_tip_epoch + 1) {
if root_block_epoch == best_tip_epoch {
if root_block_epoch == best_tip_epoch && is_next_epoch_seed_finalized {
self.epoch_context = EpochContext::Next((*next_epoch_data).into())
} else {
self.epoch_context = EpochContext::Waiting
Expand Down Expand Up @@ -495,6 +496,7 @@ pub enum BlockProducerVrfEvaluatorStatus {
ReadinessCheck {
time: redux::Timestamp,
current_epoch: Option<u32>,
is_next_epoch_seed_finalized: bool,
best_tip_epoch: u32,
root_block_epoch: u32,
is_current_epoch_evaluated: bool,
Expand Down Expand Up @@ -658,6 +660,7 @@ mod test {
best_tip_epoch: 0,
is_current_epoch_evaluated: false,
is_next_epoch_evaluated: false,
is_next_epoch_seed_finalized: false,
last_evaluated_epoch: None,
staking_epoch_data: Box::new(DUMMY_STAKING_EPOCH_DATA.to_owned()),
next_epoch_data: Box::new(DUMMY_NEXT_EPOCH_DATA.to_owned()),
Expand All @@ -680,6 +683,7 @@ mod test {
best_tip_epoch: 0,
is_current_epoch_evaluated: true,
is_next_epoch_evaluated: false,
is_next_epoch_seed_finalized: true,
last_evaluated_epoch: Some(0),
staking_epoch_data: Box::new(DUMMY_STAKING_EPOCH_DATA.to_owned()),
next_epoch_data: Box::new(DUMMY_NEXT_EPOCH_DATA.to_owned()),
Expand All @@ -702,6 +706,7 @@ mod test {
best_tip_epoch: 0,
is_current_epoch_evaluated: true,
is_next_epoch_evaluated: true,
is_next_epoch_seed_finalized: true,
last_evaluated_epoch: Some(1),
staking_epoch_data: Box::new(DUMMY_STAKING_EPOCH_DATA.to_owned()),
next_epoch_data: Box::new(DUMMY_NEXT_EPOCH_DATA.to_owned()),
Expand All @@ -724,6 +729,7 @@ mod test {
best_tip_epoch: 2,
is_current_epoch_evaluated: false,
is_next_epoch_evaluated: false,
is_next_epoch_seed_finalized: false,
last_evaluated_epoch: None,
staking_epoch_data: Box::new(DUMMY_STAKING_EPOCH_DATA.to_owned()),
next_epoch_data: Box::new(DUMMY_NEXT_EPOCH_DATA.to_owned()),
Expand All @@ -747,6 +753,7 @@ mod test {
is_current_epoch_evaluated: true,
is_next_epoch_evaluated: false,
last_evaluated_epoch: Some(2),
is_next_epoch_seed_finalized: false,
staking_epoch_data: Box::new(DUMMY_STAKING_EPOCH_DATA.to_owned()),
next_epoch_data: Box::new(DUMMY_NEXT_EPOCH_DATA.to_owned()),
},
Expand Down Expand Up @@ -804,6 +811,7 @@ mod test {
#[test]
fn generic_epoch_correctly_switch_to_next_epoch() {
// Staking ledger not yet materialized (wait k=290 blocks)
// The epoch seed is not finalized yet
let mut vrf_evaluator_state = SECOND_EPOCH_CURRENT_EPOCH_EVALUATED_WAIT_FOR_NEXT
.lock()
.unwrap();
Expand All @@ -815,13 +823,15 @@ mod test {

// Epoch has changed but the root is still from the previous epoch.
// Next epoch must not be evaluated yet.
// The epoch seed is not finalized yet.
vrf_evaluator_state.status = BlockProducerVrfEvaluatorStatus::ReadinessCheck {
time: redux::Timestamp::global_now(),
current_epoch: Some(2), // TODO(adonagy)
root_block_epoch: 1,
best_tip_epoch: 2,
is_current_epoch_evaluated: true,
is_next_epoch_evaluated: false,
is_next_epoch_seed_finalized: false,
last_evaluated_epoch: Some(2),
staking_epoch_data: Box::new(DUMMY_STAKING_EPOCH_DATA.to_owned()),
next_epoch_data: Box::new(DUMMY_NEXT_EPOCH_DATA.to_owned()),
Expand All @@ -834,14 +844,36 @@ mod test {
));

// Epoch has changed, and the root is already at that epoch too.
// Next epoch must be evaluated now.
// The epoch seed is still not finalized.
vrf_evaluator_state.status = BlockProducerVrfEvaluatorStatus::ReadinessCheck {
time: redux::Timestamp::global_now(),
current_epoch: Some(2), // TODO(adonagy)
root_block_epoch: 2,
best_tip_epoch: 2,
is_current_epoch_evaluated: true,
is_next_epoch_evaluated: false,
is_next_epoch_seed_finalized: false,
last_evaluated_epoch: Some(2),
staking_epoch_data: Box::new(DUMMY_STAKING_EPOCH_DATA.to_owned()),
next_epoch_data: Box::new(DUMMY_NEXT_EPOCH_DATA.to_owned()),
};

vrf_evaluator_state.set_epoch_context();
assert!(matches!(
vrf_evaluator_state.epoch_context(),
EpochContext::Waiting
));

// Epoch has changed, and the root is already at that epoch too.
// The epoch seed is also finalized.
vrf_evaluator_state.status = BlockProducerVrfEvaluatorStatus::ReadinessCheck {
time: redux::Timestamp::global_now(),
current_epoch: Some(2), // TODO(adonagy)
root_block_epoch: 2,
best_tip_epoch: 2,
is_current_epoch_evaluated: true,
is_next_epoch_evaluated: false,
is_next_epoch_seed_finalized: true,
last_evaluated_epoch: Some(2),
staking_epoch_data: Box::new(DUMMY_STAKING_EPOCH_DATA.to_owned()),
next_epoch_data: Box::new(DUMMY_NEXT_EPOCH_DATA.to_owned()),
Expand Down
4 changes: 4 additions & 0 deletions node/src/state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,10 @@ impl State {
self.cur_slot(|b| b.global_slot())
}

pub fn current_slot(&self) -> Option<u32> {
self.cur_slot(|b| b.global_slot() % b.constants().slots_per_epoch.as_u32())
}

pub fn cur_global_slot_since_genesis(&self) -> Option<u32> {
self.cur_slot(|b| b.global_slot_since_genesis())
}
Expand Down
Loading