partial merge of jimmys ci fixes

jimmygchen · eserilev · commit 79cb31a9ac0d · 2025-03-10T11:24:54.000-06:00
diff --git a/beacon_node/beacon_chain/src/block_verification.rs b/beacon_node/beacon_chain/src/block_verification.rs
@@ -1761,8 +1761,12 @@ pub fn check_block_is_finalized_checkpoint_or_descendant<
     // If we have a split block newer than finalization then we also ban blocks which are not
     // descended from that split block.
     let split = chain.store.get_split_info();
+    let is_descendant_from_split_block =
+        split.slot == 0 || fork_choice.is_descendant(split.block_root, block.parent_root());
+
+    println!("Block is descendant: {:?}", is_descendant_from_split_block);
     if fork_choice.is_finalized_checkpoint_or_descendant(block.parent_root())
-        && fork_choice.is_descendant(split.block_root, block.parent_root())
+        && is_descendant_from_split_block
     {
         Ok(block)
     } else {
diff --git a/beacon_node/beacon_chain/tests/payload_invalidation.rs b/beacon_node/beacon_chain/tests/payload_invalidation.rs
@@ -471,11 +471,19 @@ async fn immediate_forkchoice_update_payload_invalid() {
 }
 
 #[tokio::test]
+// Failing since this change on `holesky-rescue`. We've lift this restriction so the previously
+// valid block can be marked invalid on Holesky.
+// https://github.com/sigp/lighthouse/commit/19fc31a75be727ff811f54c249db19159003e90b
+#[ignore]
 async fn immediate_forkchoice_update_payload_invalid_block_hash() {
     immediate_forkchoice_update_invalid_test(|_| Payload::InvalidBlockHash).await
 }
 
 #[tokio::test]
+// Failing since this change on `holesky-rescue`. We've lift this restriction so the previously
+// valid block can be marked invalid on Holesky.
+// https://github.com/sigp/lighthouse/commit/19fc31a75be727ff811f54c249db19159003e90b
+#[ignore]
 async fn immediate_forkchoice_update_payload_invalid_terminal_block() {
     immediate_forkchoice_update_invalid_test(|_| Payload::Invalid {
         latest_valid_hash: Some(ExecutionBlockHash::zero()),
diff --git a/consensus/fork_choice/tests/tests.rs b/consensus/fork_choice/tests/tests.rs
@@ -1,4 +1,4 @@
-#![cfg(not(debug_assertions))]
+// #![cfg(not(debug_assertions))]
 
 use beacon_chain::test_utils::{
     AttestationStrategy, BeaconChainHarness, BlockStrategy, EphemeralHarnessType,

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#![cfg(not(debug_assertions))]`
	`1`	`+// #![cfg(not(debug_assertions))]`
`2`	`2`
`3`	`3`	`use beacon_chain::test_utils::{`
`4`	`4`	`AttestationStrategy, BeaconChainHarness, BlockStrategy, EphemeralHarnessType,`