Skip to content

Fix logic for end-of-epoch checkpoint when dkg has failed #19976

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 2 commits into from
Oct 23, 2024
Merged

Fix logic for end-of-epoch checkpoint when dkg has failed #19976

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
41fcd8e
Fix logic for end-of-epoch checkpoint when dkg has failed
mystenmark Oct 22, 2024
eb18f06
PR comments
mystenmark Oct 23, 2024
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
34 changes: 19 additions & 15 deletions crates/sui-core/src/authority/authority_per_epoch_store.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2930,7 +2930,6 @@ impl AuthorityPerEpochStore {
};
let make_checkpoint = should_accept_tx || final_round;
if make_checkpoint {
// Generate pending checkpoint for regular user tx.
let checkpoint_height = if self.randomness_state_enabled() {
consensus_commit_info.round * 2
} else {
Expand All @@ -2951,29 +2950,34 @@ impl AuthorityPerEpochStore {
}
}
checkpoint_roots.extend(roots.into_iter());

if let Some(randomness_round) = randomness_round {
randomness_roots.insert(TransactionKey::RandomnessRound(
self.epoch(),
randomness_round,
));
}

// Determine whether to write pending checkpoint for user tx with randomness.
// - If randomness is not generated for this commit, we will skip the
// checkpoint with the associated height. Therefore checkpoint heights may
// not be contiguous.
// - Exception: if DKG fails, we always need to write out a PendingCheckpoint
// for randomness tx that are canceled.
let should_write_random_checkpoint =
randomness_round.is_some() || (dkg_failed && !randomness_roots.is_empty());

let pending_checkpoint = PendingCheckpointV2::V2(PendingCheckpointV2Contents {
roots: checkpoint_roots,
details: PendingCheckpointInfo {
timestamp_ms: consensus_commit_info.timestamp,
last_of_epoch: final_round && randomness_round.is_none(),
last_of_epoch: final_round && !should_write_random_checkpoint,
checkpoint_height,
},
});
self.write_pending_checkpoint(&mut output, &pending_checkpoint)?;

// Generate pending checkpoint for user tx with randomness.
// - If randomness is not generated for this commit, we will skip the
// checkpoint with the associated height. Therefore checkpoint heights may
// not be contiguous.
// - Exception: if DKG fails, we always need to write out a PendingCheckpoint
// for randomness tx that are canceled.
if let Some(randomness_round) = randomness_round {
randomness_roots.insert(TransactionKey::RandomnessRound(
self.epoch(),
randomness_round,
));
}
if randomness_round.is_some() || (dkg_failed && !randomness_roots.is_empty()) {
if should_write_random_checkpoint {
let pending_checkpoint = PendingCheckpointV2::V2(PendingCheckpointV2Contents {
roots: randomness_roots.into_iter().collect(),
details: PendingCheckpointInfo {
Expand Down
Loading