Skip to content

fix(l1): skip fork-choice update if snap-syncing #5548

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
MegaRedHand merged 3 commits into from
Dec 10, 2025
Merged

fix(l1): skip fork-choice update if snap-syncing #5548

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
27d6e1f
fix(l1): skip FCU if snap-syncing
MegaRedHand Dec 7, 2025
dd3570c
Merge branch 'main' into skip-fcu-during-snapsync
MegaRedHand Dec 9, 2025
f21cada
refactor: remove inner `if`
MegaRedHand Dec 9, 2025
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
21 changes: 5 additions & 16 deletions crates/networking/rpc/engine/fork_choice.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ use ethrex_blockchain::{
payload::{BuildPayloadArgs, create_payload},
};
use ethrex_common::types::{BlockHeader, ELASTICITY_MULTIPLIER};
use ethrex_p2p::sync::SyncMode;
use serde_json::Value;
use tracing::{info, warn};

Expand Down Expand Up @@ -219,22 +220,10 @@ async fn handle_forkchoice(
));
}

/* Revert #4985
if context.syncer.sync_mode() == SyncMode::Snap {
// Don't trigger a sync if the block is already canonical
if context
.storage
.is_canonical_sync(fork_choice_state.head_block_hash)?
{
// Disable snapsync mode so we can process incoming payloads
context.syncer.disable_snap();
} else {
context
.syncer
.sync_to_head(fork_choice_state.head_block_hash);
return Ok((None, PayloadStatus::syncing().into()));
}
} */
if syncer.sync_mode() == SyncMode::Snap {
syncer.sync_to_head(fork_choice_state.head_block_hash);
return Ok((None, PayloadStatus::syncing().into()));
}

match apply_fork_choice(
&context.storage,
Expand Down