From a1b98f2558cd764850eb5eaa3a43aa7ab6a86557 Mon Sep 17 00:00:00 2001 From: realbigsean Date: Wed, 15 May 2024 04:15:28 -0400 Subject: [PATCH 1/2] use electra feature in notifier completeness check --- beacon_node/client/src/notifier.rs | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/beacon_node/client/src/notifier.rs b/beacon_node/client/src/notifier.rs index a6fd07789d8..70d1c6bd387 100644 --- a/beacon_node/client/src/notifier.rs +++ b/beacon_node/client/src/notifier.rs @@ -549,17 +549,13 @@ async fn electra_readiness_logging( beacon_chain: &BeaconChain, 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(); From d79228f62f5eeaa198813ad36616eb3b8cea93a8 Mon Sep 17 00:00:00 2001 From: realbigsean Date: Wed, 15 May 2024 04:57:31 -0400 Subject: [PATCH 2/2] update capella and denab readiness chacks to use fork name rather than random fields --- beacon_node/client/src/notifier.rs | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/beacon_node/client/src/notifier.rs b/beacon_node/client/src/notifier.rs index 70d1c6bd387..0a2f24748d0 100644 --- a/beacon_node/client/src/notifier.rs +++ b/beacon_node/client/src/notifier.rs @@ -434,11 +434,9 @@ async fn capella_readiness_logging( .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(); @@ -496,11 +494,9 @@ async fn deneb_readiness_logging( .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();