github/reth
1
1
Fork 0
mirror of https://github.com/paradigmxyz/reth.git synced 2026-01-30 01:28:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix(consensus-engine): handle pipeline unwind (#1938)

Browse Source
This commit is contained in:
Roman Krasiuk
2023-03-23 23:13:58 +02:00
committed by GitHub
parent 1ce021f250
commit 95815c7e99
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
crates/consensus/beacon/src/engine/mod.rs
View File

@@ -321,12 +321,17 @@ where
}
match result {
Ok(_) => {
// Terminate the sync early if it's reached the maximum user
// configured block.
let minimum_pipeline_progress = *pipeline.minimum_progress();
if this.has_reached_max_block(minimum_pipeline_progress) {
return Poll::Ready(Ok(()))
Ok(ctrl) => {
if ctrl.is_unwind() {
this.require_pipeline_run(PipelineTarget::Head);
} else {
// Terminate the sync early if it's reached the maximum user
// configured block.
let minimum_pipeline_progress =
*pipeline.minimum_progress();
if this.has_reached_max_block(minimum_pipeline_progress) {
return Poll::Ready(Ok(()))
}
}
}
// Any pipeline error at this point is fatal.

4
crates/stages/src/pipeline/ctrl.rs
View File

@@ -25,4 +25,8 @@ impl ControlFlow {
pub fn should_continue(&self) -> bool {
matches!(self, ControlFlow::Continue { .. } | ControlFlow::NoProgress { .. })
}
pub fn is_unwind(&self) -> bool {
matches!(self, ControlFlow::Unwind { .. })
}
}