Merge remote-tracking branch 'origin/unstable' into electra_attestation_changes

This commit is contained in:
Michael Sproul
2024-06-14 12:32:47 +10:00
34 changed files with 92 additions and 95 deletions

View File

@@ -561,8 +561,8 @@ impl<E: EthSpec> Discovery<E> {
/// Updates the `eth2` field of our local ENR.
pub fn update_eth2_enr(&mut self, enr_fork_id: EnrForkId) {
// to avoid having a reference to the spec constant, for the logging we assume
// FAR_FUTURE_EPOCH is u64::max_value()
let next_fork_epoch_log = if enr_fork_id.next_fork_epoch == u64::max_value() {
// FAR_FUTURE_EPOCH is u64::MAX
let next_fork_epoch_log = if enr_fork_id.next_fork_epoch == u64::MAX {
String::from("No other fork")
} else {
format!("{:?}", enr_fork_id.next_fork_epoch)