gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-05-31 13:17:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge conflicts

Browse Source
This commit is contained in:
Eitan Seri-Levi
2026-04-30 09:27:49 +02:00
parent c57a49b3af a3c91f6ecb
commit af196a5558
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
beacon_node/beacon_chain/tests/block_verification.rs
View File

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

1
beacon_node/http_api/tests/interactive_tests.rs
View File

@@ -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_empty_votes`: percentage of comm of attestations for the parent block
/// - `num_head_votes`: number of attestations for the head 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 /// - `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( pub async fn proposer_boost_re_org_test(
ReOrgTest { ReOrgTest {
head_slot, head_slot,

5
consensus/types/src/light_client/light_client_header.rs
View File

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