Merge conflicts

beacon_node/beacon_chain/tests/block_verification.rs

@@ -928,6 +928,11 @@ async fn invalid_signature_attester_slashing() {
                     .push(attester_slashing.as_electra().unwrap().clone())
                     .expect("should update attester slashing");
             }
+            BeaconBlockBodyRefMut::Heze(blk) => {
+                blk.attester_slashings
+                    .push(attester_slashing.as_electra().unwrap().clone())
+                    .expect("should update attester slashing");
+            }
         }
         snapshots[block_index].beacon_block =
             Arc::new(SignedBeaconBlock::from_block(block, signature));
@@ -991,6 +996,10 @@ async fn invalid_signature_attestation() {
                 .attestations
                 .get_mut(0)
                 .map(|att| att.signature = junk_aggregate_signature()),
+            BeaconBlockBodyRefMut::Heze(blk) => blk
+                .attestations
+                .get_mut(0)
+                .map(|att| att.signature = junk_aggregate_signature()),
         };
 
         if block.body().attestations_len() > 0 {

beacon_node/http_api/tests/interactive_tests.rs

@@ -385,6 +385,7 @@ pub async fn proposer_boost_re_org_weight_misprediction() {
 /// - `num_empty_votes`: percentage of comm of attestations for the parent block
 /// - `num_head_votes`: number of attestations for the head block
 /// - `should_re_org`: whether the proposer should build on the parent rather than the head
+#[allow(clippy::large_stack_frames)]
 pub async fn proposer_boost_re_org_test(
     ReOrgTest {
         head_slot,

consensus/types/src/light_client/light_client_header.rs

@@ -153,10 +153,7 @@ impl<E: EthSpec> LightClientHeader<E> {
     }
 
     pub fn ssz_max_var_len_for_fork(fork_name: ForkName) -> usize {
-        if fork_name.heze_enabled() {
-            // TODO(EIP7732): check this
-            0
-        } else if fork_name.gloas_enabled() {
+        if fork_name.gloas_enabled() || fork_name.heze_enabled() {
             // TODO(EIP7732): check this
             0
         } else if fork_name.capella_enabled() {