Merge conflicts

This commit is contained in:
Eitan Seri-Levi
2026-04-30 09:48:04 +02:00
86 changed files with 2835 additions and 1038 deletions

View File

@@ -400,6 +400,13 @@ impl CandidateBeaconNode {
hint = UPDATE_REQUIRED_LOG_HINT,
"Beacon node has mismatched Gloas fork epoch"
);
} else if beacon_node_spec.heze_fork_epoch != spec.heze_fork_epoch {
warn!(
endpoint = %self.beacon_node,
endpoint_heze_fork_epoch = ?beacon_node_spec.heze_fork_epoch,
hint = UPDATE_REQUIRED_LOG_HINT,
"Beacon node has mismatched Heze fork epoch"
);
}
Ok(())