Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 13 additions & 21 deletions beacon_node/client/src/notifier.rs
Original file line number Diff line number Diff line change
Expand Up @@ -434,11 +434,9 @@ async fn capella_readiness_logging<T: BeaconChainTypes>(
.canonical_head
.cached_head()
.snapshot
.beacon_block
.message()
.body()
.execution_payload()
.map_or(false, |payload| payload.withdrawals_root().is_ok());
.beacon_state
.fork_name_unchecked()
>= ForkName::Capella;

let has_execution_layer = beacon_chain.execution_layer.is_some();

Expand Down Expand Up @@ -496,11 +494,9 @@ async fn deneb_readiness_logging<T: BeaconChainTypes>(
.canonical_head
.cached_head()
.snapshot
.beacon_block
.message()
.body()
.execution_payload()
.map_or(false, |payload| payload.blob_gas_used().is_ok());
.beacon_state
.fork_name_unchecked()
>= ForkName::Deneb;

let has_execution_layer = beacon_chain.execution_layer.is_some();

Expand Down Expand Up @@ -549,17 +545,13 @@ async fn electra_readiness_logging<T: BeaconChainTypes>(
beacon_chain: &BeaconChain<T>,
log: &Logger,
) {
// TODO(electra): Once Electra has features, this code can be swapped back.
let electra_completed = false;
//let electra_completed = beacon_chain
// .canonical_head
// .cached_head()
// .snapshot
// .beacon_block
// .message()
// .body()
// .execution_payload()
// .map_or(false, |payload| payload.electra_placeholder().is_ok());
let electra_completed = beacon_chain
.canonical_head
.cached_head()
.snapshot
.beacon_state
.fork_name_unchecked()
>= ForkName::Electra;

let has_execution_layer = beacon_chain.execution_layer.is_some();

Expand Down