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

@@ -2621,7 +2621,7 @@ pub fn serve<T: BeaconChainTypes>(
task_spawner_filter.clone(),
);
// TODO(eip7805) update endpoint def
// TODO(heze) update endpoint def
// POST validator/duties/inclusion_list/{epoch}
let post_validator_duties_inclusion_list = eth_v1
.clone()
@@ -2659,7 +2659,7 @@ pub fn serve<T: BeaconChainTypes>(
task_spawner_filter.clone(),
);
// TODO(EIP7805) update endpoint definition format
// TODO(HEZE) update endpoint definition format
// GET validator/inclusion_list?slot
let get_validator_inclusion_list = eth_v1
.clone()