Skip to content

fix(pipeline): clear MerkleStage checkpoints on invalid root #3973

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
onbjerg merged 5 commits into from
Jul 31, 2023
Merged

fix(pipeline): clear MerkleStage checkpoints on invalid root #3973

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ea979ab
clear merkle checkpoint on invalid root
joshieDo Jul 27, 2023
7ca8bc6
place on the correct if branch
joshieDo Jul 27, 2023
a49c84a
explicitly drop provider_rw
joshieDo Jul 28, 2023
6b339a3
chore: mark fixme
onbjerg Jul 31, 2023
3e5c7d9
chore: formatting
onbjerg Jul 31, 2023
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 crates/stages/src/pipeline/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,6 +431,19 @@ where
"Stage encountered a validation error: {error}"
);

// FIXME: When handling errors, we do not commit the database transaction.
// This leads to the Merkle stage not clearing its
// checkpoint, and restarting from an invalid place.
drop(provider_rw);
provider_rw = factory.provider_rw().map_err(PipelineError::Interface)?;
provider_rw
.save_stage_checkpoint_progress(StageId::MerkleExecute, vec![])?;
provider_rw.save_stage_checkpoint(
StageId::MerkleExecute,
prev_checkpoint.unwrap_or_default(),
)?;
provider_rw.commit()?;

// We unwind because of a validation error. If the unwind itself fails,
// we bail entirely, otherwise we restart the execution loop from the
// beginning.
Expand Down