diff --git a/beacon_node/beacon_chain/src/beacon_chain.rs b/beacon_node/beacon_chain/src/beacon_chain.rs index 9a6838d8ad..5b98490247 100644 --- a/beacon_node/beacon_chain/src/beacon_chain.rs +++ b/beacon_node/beacon_chain/src/beacon_chain.rs @@ -7399,7 +7399,7 @@ impl BeaconChain { } pub fn on_verified_inclusion_list(&self, signed_il: SignedInclusionList) { - debug!(self.log, "Adding verified inclusion list to the cache"); + info!(self.log, "Adding verified inclusion list to the cache"); self.inclusion_list_cache .write() .on_inclusion_list(signed_il, &self.log); diff --git a/beacon_node/execution_layer/src/engine_api/new_payload_request.rs b/beacon_node/execution_layer/src/engine_api/new_payload_request.rs index c622d34855..b2801eef2f 100644 --- a/beacon_node/execution_layer/src/engine_api/new_payload_request.rs +++ b/beacon_node/execution_layer/src/engine_api/new_payload_request.rs @@ -47,7 +47,7 @@ pub struct NewPayloadRequest<'block, E: EthSpec> { pub parent_beacon_block_root: Hash256, #[superstruct(only(Electra, Fulu))] pub execution_requests: &'block ExecutionRequests, - #[superstruct(only(Electra, Fulu))] + #[superstruct(only(Fulu))] pub il_transactions: InclusionListTransactions, } @@ -204,7 +204,6 @@ impl<'a, E: EthSpec> NewPayloadRequest<'a, E> { .collect(), parent_beacon_block_root: block_ref.parent_root, execution_requests: &block_ref.body.execution_requests, - il_transactions, })), BeaconBlockRef::Fulu(block_ref) => Ok(Self::Fulu(NewPayloadRequestFulu { execution_payload: &block_ref.body.execution_payload.execution_payload, @@ -259,7 +258,6 @@ impl<'a, E: EthSpec> TryFrom> for NewPayloadRequest<'a, E> .collect(), parent_beacon_block_root: block_ref.parent_root, execution_requests: &block_ref.body.execution_requests, - il_transactions: vec![].into(), })), BeaconBlockRef::Fulu(block_ref) => Ok(Self::Fulu(NewPayloadRequestFulu { execution_payload: &block_ref.body.execution_payload.execution_payload, diff --git a/beacon_node/http_api/src/publish_inclusion_lists.rs b/beacon_node/http_api/src/publish_inclusion_lists.rs index c961ea4a88..ffe2d8243e 100644 --- a/beacon_node/http_api/src/publish_inclusion_lists.rs +++ b/beacon_node/http_api/src/publish_inclusion_lists.rs @@ -193,7 +193,7 @@ fn verify_and_publish_inclusion_list( inclusion_list: &SignedInclusionList, seen_timestamp: Duration, network_tx: &UnboundedSender>, - _log: &Logger, + log: &Logger, ) -> Result<(), Error> { let verified_inclusion_list = chain .verify_inclusion_list_for_gossip(inclusion_list) @@ -207,6 +207,12 @@ fn verify_and_publish_inclusion_list( }) .map_err(|_| Error::Publication)?; + info!( + log, + "Published inclusion list"; + "slot" => verified_inclusion_list.signed_il.message.slot + ); + // TODO(focil) add reprocess logic? // Notify the validator monitor. diff --git a/consensus/types/src/chain_spec.rs b/consensus/types/src/chain_spec.rs index 58c793027d..102a61595c 100644 --- a/consensus/types/src/chain_spec.rs +++ b/consensus/types/src/chain_spec.rs @@ -456,14 +456,14 @@ impl ChainSpec { /// Returns true if the given epoch is greater than or equal to the `EIP7805_FORK_EPOCH`. pub fn is_focil_enabled_for_epoch(&self, block_epoch: Epoch) -> bool { - self.eip7805_fork_epoch.map_or(false, |eip7805_fork_epoch| { + self.eip7805_fork_epoch.is_some_and(|eip7805_fork_epoch| { block_epoch >= eip7805_fork_epoch }) } /// Returns true if `EIP7805_FORK_EPOCH` is set and is not set to `FAR_FUTURE_EPOCH`. pub fn is_focil_scheduled(&self) -> bool { - self.eip7805_fork_epoch.map_or(false, |eip7805_fork_epoch| { + self.eip7805_fork_epoch.is_some_and(|eip7805_fork_epoch| { eip7805_fork_epoch != self.far_future_epoch }) } diff --git a/validator_client/validator_services/src/duties_service.rs b/validator_client/validator_services/src/duties_service.rs index a73663f1ab..934bf81f26 100644 --- a/validator_client/validator_services/src/duties_service.rs +++ b/validator_client/validator_services/src/duties_service.rs @@ -1402,10 +1402,10 @@ async fn poll_beacon_inclusion_list_duties_for_epoch>()