gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-05-30 20:57:10 +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:48:04 +02:00
parent bab71429f8 a3c91f6ecb
commit 027fdc1a68
86 changed files with 2835 additions and 1038 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -923,7 +923,7 @@ async fn invalid_signature_attester_slashing() {
.push(attester_slashing.as_electra().unwrap().clone())
.expect("should update attester slashing");
}
BeaconBlockBodyRefMut::Eip7805(blk) => {
BeaconBlockBodyRefMut::Heze(blk) => {
blk.attester_slashings
.push(attester_slashing.as_electra().unwrap().clone())
.expect("should update attester slashing");
@@ -933,6 +933,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));
@@ -992,7 +997,7 @@ async fn invalid_signature_attestation() {
.attestations
.get_mut(0)
.map(|att| att.signature = junk_aggregate_signature()),
BeaconBlockBodyRefMut::Eip7805(blk) => blk
BeaconBlockBodyRefMut::Heze(blk) => blk
.attestations
.get_mut(0)
.map(|att| att.signature = junk_aggregate_signature()),
@@ -1000,6 +1005,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 {

8
beacon_node/beacon_chain/tests/inclusion_list_verification.rs
View File

@@ -19,15 +19,15 @@ static KEYPAIRS: LazyLock<Vec<Keypair>> =
pub type E = MainnetEthSpec;
/// Returns a beacon chain harness for the eip7805 fork
fn get_harness_eip7805(validator_count: usize) -> BeaconChainHarness<EphemeralHarnessType<E>> {
/// Returns a beacon chain harness for the heze fork
fn get_harness_heze(validator_count: usize) -> BeaconChainHarness<EphemeralHarnessType<E>> {
let mut spec = E::default_spec();
spec.altair_fork_epoch = Some(Epoch::new(0));
spec.bellatrix_fork_epoch = Some(Epoch::new(0));
spec.capella_fork_epoch = Some(Epoch::new(0));
spec.deneb_fork_epoch = Some(Epoch::new(0));
spec.electra_fork_epoch = Some(Epoch::new(0));
spec.eip7805_fork_epoch = Some(Epoch::new(0));
spec.heze_fork_epoch = Some(Epoch::new(0));
let spec = Arc::new(spec);
let harness = BeaconChainHarness::builder(MainnetEthSpec)
@@ -140,7 +140,7 @@ struct InclusionListGossipTester {
impl InclusionListGossipTester {
pub async fn new() -> Self {
let harness = get_harness_eip7805(VALIDATOR_COUNT);
let harness = get_harness_heze(VALIDATOR_COUNT);
// Extend the chain out a few epochs so we have some chain depth to play with.
harness