From e77651ac06ff6b5b81e1677dafbb849a27565862 Mon Sep 17 00:00:00 2001 From: Michael Sproul Date: Thu, 26 Mar 2026 10:27:20 +1100 Subject: [PATCH] Revert changes in load_parent --- beacon_node/beacon_chain/src/block_verification.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/beacon_node/beacon_chain/src/block_verification.rs b/beacon_node/beacon_chain/src/block_verification.rs index a452d528a1..d4c63a0551 100644 --- a/beacon_node/beacon_chain/src/block_verification.rs +++ b/beacon_node/beacon_chain/src/block_verification.rs @@ -1961,13 +1961,13 @@ fn load_parent>( { if block.as_block().is_parent_block_full(parent_bid_block_hash) { // TODO(gloas): loading the envelope here is not very efficient - if let Some(envelope) = chain.store.get_payload_envelope(&root)? { - (StatePayloadStatus::Full, envelope.message.state_root) - } else { - // The envelope hasn't been stored yet (e.g. genesis block, or payload - // not yet delivered). Fall back to the pending/empty state. - (StatePayloadStatus::Pending, parent_block.state_root()) - } + // TODO(gloas): check parent payload existence prior to this point? + let envelope = chain.store.get_payload_envelope(&root)?.ok_or_else(|| { + BeaconChainError::DBInconsistent(format!( + "Missing envelope for parent block {root:?}", + )) + })?; + (StatePayloadStatus::Full, envelope.message.state_root) } else { (StatePayloadStatus::Pending, parent_block.state_root()) }