Skip to content
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

[core] Set the no_more_fragments correctly #2715

Merged
merged 5 commits into from
Jun 29, 2022
Merged

[core] Set the no_more_fragments correctly #2715

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1c1a811
Set the `no_more_fragments` correctly
Jun 25, 2022
05fcabc
fix flakey
Jun 28, 2022
24ab113
Added test
Jun 29, 2022
da2c4d6
try fix test_full_node_sync_flood
Jun 29, 2022
b07cb27
fix does not fix ci
Jun 29, 2022
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
Next Next commit
Set the no_more_fragments correctly
  • Loading branch information
George Danezis committed Jun 29, 2022
commit 1c1a8114e9ed24fd4f65079592ce606fdc8279ec
139 changes: 71 additions & 68 deletions crates/sui-core/src/checkpoints/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,8 +616,12 @@ impl CheckpointStore {

// We have a proposal so lets try to re-construct the checkpoint.
let next_sequence_number = self.next_checkpoint();
let locals = self.get_locals();

// Ok to unwrap because of the check above
let our_proposal = locals.current_proposal.as_ref().unwrap();

if let Ok(Some(contents)) = self.reconstruct_contents(committee) {
if let Ok(Some(contents)) = self.reconstruct_contents(committee, our_proposal) {
// Here we check, and ensure, all transactions are processed before we
// move to sign the checkpoint.
if !self
Expand Down Expand Up @@ -650,6 +654,7 @@ impl CheckpointStore {
pub fn reconstruct_contents(
&mut self,
committee: &Committee,
our_proposal: &CheckpointProposal,
) -> Result<Option<CheckpointContents>, FragmentInternalError> {
let next_sequence_number = self.next_checkpoint();
let fragments: Vec<_> = self
Expand All @@ -667,81 +672,79 @@ impl CheckpointStore {
.map_err(FragmentInternalError::Error)?;

if let Some(reconstructed) = _potential_checkpoint {
if let Some(proposal) = &self.get_locals().current_proposal {
// By definition the proposal and the new checkpoint must be in the
// same sequence number of checkpoint.
// A little argument about how the fragment -> checkpoint process is live
//
// A global checkpoint candidate must contain at least 2f+1 stake. And as
// a result of this f+1 stake will be from honest nodes that by definition
// must have submitted a proposal (because it is included!).
// So f+1 honest authorities will be able to reconstruct and sign the
// checkpoint. And all other authorities by asking all authorities will be
// able to get f+1 signatures and construct a checkpoint certificate.

// By definition the proposal and the new checkpoint must be in the
// same sequence number of checkpoint.

// Strategy 1 to reconstruct checkpoint -- we are included in it!

if reconstructed
.global
.authority_waypoints
.contains_key(&self.name)
{
// We are included in the proposal, so we can go ahead and construct the
// full checkpoint!
let mut contents = our_proposal.transactions.clone();
contents.transactions.extend(
// Add all items missing to reach then global waypoint
reconstructed.global.authority_waypoints[&self.name]
.items
.clone(),
);

return Ok(Some(contents));
}

// Strategy 1 to reconstruct checkpoint -- we are included in it!
// Strategy 2 to reconstruct checkpoint -- There is a link between us and the checkpoint set

let local_links: HashSet<_> = self.local_fragments.keys().collect();
let checkpoint_keys: HashSet<_> = reconstructed
.global
.authority_waypoints
.keys()
.cloned()
.collect();

if let Some(auth) = local_links.intersection(&checkpoint_keys).next() {
let fragment = self
.local_fragments
.get(auth)
.map_err(|err| FragmentInternalError::Error(err.into()))?
.unwrap();

// Extract the diff
let diff = if fragment.proposer.authority() == &self.name {
fragment.diff
} else {
fragment.diff.swap()
};

if reconstructed
if let Ok(contents) = reconstructed
.global
.authority_waypoints
.contains_key(&self.name)
.checkpoint_items(&diff, our_proposal.transactions.transactions.clone())
{
// We are included in the proposal, so we can go ahead and construct the
// full checkpoint!
let mut contents = proposal.transactions.clone();
contents.transactions.extend(
// Add all items missing to reach then global waypoint
reconstructed.global.authority_waypoints[&self.name]
.items
.clone(),
);

let contents = CheckpointContents::new(contents.into_iter());
return Ok(Some(contents));
}

// Strategy 2 to reconstruct checkpoint -- There is a link between us and the checkpoint set

let local_links: HashSet<_> = self.local_fragments.keys().collect();
let checkpoint_keys: HashSet<_> = reconstructed
.global
.authority_waypoints
.keys()
.cloned()
.collect();

if let Some(auth) = local_links.intersection(&checkpoint_keys).next() {
let fragment = self
.local_fragments
.get(auth)
.map_err(|err| FragmentInternalError::Error(err.into()))?
.unwrap();

// Extract the diff
let diff = if fragment.proposer.authority() == &self.name {
fragment.diff
} else {
fragment.diff.swap()
};

if let Ok(contents) = reconstructed
.global
.checkpoint_items(&diff, proposal.transactions.transactions.clone())
{
let contents = CheckpointContents::new(contents.into_iter());
return Ok(Some(contents));
}
}
} else {
// A little argument about how the fragment -> checkpoint process is live
//
// A global checkpoint candidate must contain at least 2f+1 stake. And as
// a result of this f+1 stake will be from honest nodes that by definition
// must have submitted a proposal (because it is included!).
// So f+1 honest authorities will be able to reconstruct and sign the
// checkpoint. And all other authorities by asking all authorities will be
// able to get f+1 signatures and construct a checkpoint certificate.

// Sets the reconstruction to false, we have all fragments we need, but
// just cannot reconstruct the contents.
let locals = self.get_locals();
let mut new_locals = locals.as_ref().clone();
new_locals.no_more_fragments = true;
self.set_locals(locals, new_locals)
.map_err(FragmentInternalError::Error)?;
}

// Sets the reconstruction to false, we have all fragments we need, but
// just cannot reconstruct the contents.
let locals = self.get_locals();
let mut new_locals = locals.as_ref().clone();
new_locals.no_more_fragments = true;
self.set_locals(locals, new_locals)
.map_err(FragmentInternalError::Error)?;

return Err(FragmentInternalError::Error(SuiError::from(
"Missing info to construct known checkpoint.",
)));
Expand Down