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

@@ -205,7 +205,7 @@ mod test {
spec.bellatrix_fork_epoch = Some(Epoch::new(256));
spec.deneb_fork_epoch = Some(Epoch::new(257));
spec.electra_fork_epoch = None;
spec.eip7805_fork_epoch = None;
spec.heze_fork_epoch = None;
spec.fulu_fork_epoch = None;
spec.gloas_fork_epoch = None;
let result = validator_fork_epochs(&spec);