diff --git a/beacon_node/beacon_chain/src/inclusion_list_verification.rs b/beacon_node/beacon_chain/src/inclusion_list_verification.rs index b4fc82e735..f687bc2e4e 100644 --- a/beacon_node/beacon_chain/src/inclusion_list_verification.rs +++ b/beacon_node/beacon_chain/src/inclusion_list_verification.rs @@ -49,14 +49,13 @@ impl GossipVerifiedInclusionList { .now() .ok_or(BeaconChainError::UnableToReadSlot)?; - // TODO(focil) move 8192 to config if signed_il .message .transactions .iter() .map(|v| v.len()) .sum::() - > 8192 + > chain.spec.max_bytes_per_inclusion_list as usize { return Err(GossipInclusionListError::TooManyTransactions); } @@ -124,10 +123,9 @@ impl GossipVerifiedInclusionList { return Err(GossipInclusionListError::PriorInclusionListKnown); } - // Compute timeliness: timely if received before INCLUSION_LIST_DUE_BPS into the slot - // INCLUSION_LIST_DUE_BPS = 6667 basis points = 66.67% of slot duration let slot_duration_ms = chain.spec.get_slot_duration().as_millis() as u64; - let inclusion_list_due_ms = slot_duration_ms * 6667 / 10000; + let inclusion_list_due_ms = + slot_duration_ms * chain.spec.inclusion_list_due_bps / 10000; let il_delay_ms = get_slot_delay_ms(timestamp_now(), message_slot, &chain.slot_clock).as_millis() as u64; let is_timely = il_delay_ms <= inclusion_list_due_ms; diff --git a/consensus/types/src/core/chain_spec.rs b/consensus/types/src/core/chain_spec.rs index e6cf1a01e3..1d2a2d9d62 100644 --- a/consensus/types/src/core/chain_spec.rs +++ b/consensus/types/src/core/chain_spec.rs @@ -235,6 +235,9 @@ pub struct ChainSpec { */ pub domain_inclusion_list_committee: u32, pub inclusion_list_committee_size: u64, + pub max_bytes_per_inclusion_list: u64, + pub max_request_inclusion_list: u64, + pub inclusion_list_due_bps: u64, /* * Fulu hard fork params @@ -1292,6 +1295,9 @@ impl ChainSpec { */ domain_inclusion_list_committee: 12, inclusion_list_committee_size: 16, + max_bytes_per_inclusion_list: 8192, + max_request_inclusion_list: 16, + inclusion_list_due_bps: 6667, /* * Fulu hard fork params @@ -1730,6 +1736,9 @@ impl ChainSpec { */ domain_inclusion_list_committee: 12, inclusion_list_committee_size: 16, + max_bytes_per_inclusion_list: 8192, + max_request_inclusion_list: 16, + inclusion_list_due_bps: 6667, /* * Fulu hard fork params diff --git a/validator_client/validator_services/src/inclusion_list_service.rs b/validator_client/validator_services/src/inclusion_list_service.rs index c447a120d3..b57a2d4090 100644 --- a/validator_client/validator_services/src/inclusion_list_service.rs +++ b/validator_client/validator_services/src/inclusion_list_service.rs @@ -274,7 +274,7 @@ impl InclusionListService