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()

View File

@@ -385,6 +385,7 @@ pub async fn proposer_boost_re_org_weight_misprediction() {
/// - `num_empty_votes`: percentage of comm of attestations for the parent block
/// - `num_head_votes`: number of attestations for the head block
/// - `should_re_org`: whether the proposer should build on the parent rather than the head
#[allow(clippy::large_stack_frames)]
pub async fn proposer_boost_re_org_test(
ReOrgTest {
head_slot,

View File

@@ -8994,7 +8994,7 @@ async fn create_signed_inclusion_lists() {
config.spec.deneb_fork_epoch = Some(Epoch::new(0));
config.spec.electra_fork_epoch = Some(Epoch::new(0));
config.spec.fulu_fork_epoch = Some(Epoch::new(0));
config.spec.eip7805_fork_epoch = Some(Epoch::new(0));
config.spec.heze_fork_epoch = Some(Epoch::new(0));
ApiTester::new_from_config(config)
.await
.test_create_inclusion_lists()
@@ -9010,7 +9010,7 @@ async fn test_post_validator_duties_inclusion_list() {
config.spec.deneb_fork_epoch = Some(Epoch::new(0));
config.spec.electra_fork_epoch = Some(Epoch::new(0));
config.spec.fulu_fork_epoch = Some(Epoch::new(0));
config.spec.eip7805_fork_epoch = Some(Epoch::new(0));
config.spec.heze_fork_epoch = Some(Epoch::new(0));
ApiTester::new_from_config(config)
.await
.test_post_validator_duties_inclusion_list()