From 79c855a1c4d03b02ee902a2c829d8984702f1e16 Mon Sep 17 00:00:00 2001 From: Eitan Seri-Levi Date: Thu, 30 Apr 2026 15:02:35 +0200 Subject: [PATCH] linting --- .../beacon_chain/src/beacon_block_streamer.rs | 1 - .../src/inclusion_list_verification.rs | 2 - beacon_node/beacon_chain/src/test_utils.rs | 3 - .../beacon_chain/tests/block_verification.rs | 9 -- .../tests/inclusion_list_verification.rs | 1 - .../execution_layer/src/engine_api/http.rs | 25 +----- .../src/engine_api/new_payload_request.rs | 2 +- beacon_node/execution_layer/src/lib.rs | 3 - .../test_utils/execution_block_generator.rs | 11 +-- .../src/test_utils/handle_rpc.rs | 32 ------- .../src/test_utils/mock_builder.rs | 14 +-- beacon_node/http_api/src/lib.rs | 2 +- .../lighthouse_network/src/rpc/codec.rs | 11 --- .../lighthouse_network/src/types/pubsub.rs | 4 - .../lighthouse_network/tests/common.rs | 1 - consensus/types/src/block/beacon_block.rs | 88 +++++-------------- .../types/src/block/beacon_block_body.rs | 20 +---- .../types/src/block/signed_beacon_block.rs | 12 +-- consensus/types/src/core/preset.rs | 2 +- .../src/execution/execution_payload_bid.rs | 10 ++- .../execution/signed_execution_payload_bid.rs | 12 ++- consensus/types/src/fork/fork_macros.rs | 4 - .../light_client/light_client_bootstrap.rs | 8 +- .../light_client_finality_update.rs | 10 +-- .../src/light_client/light_client_header.rs | 5 +- .../light_client_optimistic_update.rs | 7 +- .../src/light_client/light_client_update.rs | 7 +- consensus/types/src/state/beacon_state.rs | 50 ++--------- testing/ef_tests/src/cases/fork.rs | 1 - .../src/cases/merkle_proof_validity.rs | 8 -- testing/ef_tests/src/cases/transition.rs | 8 -- .../signing_method/src/web3signer.rs | 5 -- .../validator_services/src/duties_service.rs | 4 +- 33 files changed, 76 insertions(+), 306 deletions(-) diff --git a/beacon_node/beacon_chain/src/beacon_block_streamer.rs b/beacon_node/beacon_chain/src/beacon_block_streamer.rs index 13e6aaaa7d..ef8990b174 100644 --- a/beacon_node/beacon_chain/src/beacon_block_streamer.rs +++ b/beacon_node/beacon_chain/src/beacon_block_streamer.rs @@ -100,7 +100,6 @@ fn reconstruct_default_header_block( ForkName::Capella => ExecutionPayloadCapella::default().into(), ForkName::Deneb => ExecutionPayloadDeneb::default().into(), ForkName::Electra => ExecutionPayloadElectra::default().into(), - ForkName::Heze => ExecutionPayloadHeze::default().into(), ForkName::Fulu => ExecutionPayloadFulu::default().into(), ForkName::Gloas => ExecutionPayloadGloas::default().into(), ForkName::Heze => ExecutionPayloadHeze::default().into(), diff --git a/beacon_node/beacon_chain/src/inclusion_list_verification.rs b/beacon_node/beacon_chain/src/inclusion_list_verification.rs index f687bc2e4e..4ef9cc58c8 100644 --- a/beacon_node/beacon_chain/src/inclusion_list_verification.rs +++ b/beacon_node/beacon_chain/src/inclusion_list_verification.rs @@ -1,5 +1,3 @@ -use std::time::Duration; - use crate::{ BeaconChain, BeaconChainError, BeaconChainTypes, validator_monitor::get_slot_delay_ms, diff --git a/beacon_node/beacon_chain/src/test_utils.rs b/beacon_node/beacon_chain/src/test_utils.rs index f9d8c40d1c..dcd7c6c6af 100644 --- a/beacon_node/beacon_chain/src/test_utils.rs +++ b/beacon_node/beacon_chain/src/test_utils.rs @@ -695,9 +695,6 @@ pub fn mock_execution_layer_from_parts( HARNESS_GENESIS_TIME + (spec.get_slot_duration().as_secs()) * E::slots_per_epoch() * epoch.as_u64() }); - let heze_time = spec.heze_fork_epoch.map(|epoch| { - HARNESS_GENESIS_TIME + spec.get_slot_duration().as_secs() * E::slots_per_epoch() * epoch.as_u64() - }); let osaka_time = spec.fulu_fork_epoch.map(|epoch| { HARNESS_GENESIS_TIME + (spec.get_slot_duration().as_secs()) * E::slots_per_epoch() * epoch.as_u64() diff --git a/beacon_node/beacon_chain/tests/block_verification.rs b/beacon_node/beacon_chain/tests/block_verification.rs index f0761734b9..a93a1bf519 100644 --- a/beacon_node/beacon_chain/tests/block_verification.rs +++ b/beacon_node/beacon_chain/tests/block_verification.rs @@ -923,11 +923,6 @@ 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"); - } BeaconBlockBodyRefMut::Gloas(blk) => { blk.attester_slashings .push(attester_slashing.as_electra().unwrap().clone()) @@ -997,10 +992,6 @@ 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()), BeaconBlockBodyRefMut::Gloas(blk) => blk .attestations .get_mut(0) diff --git a/beacon_node/beacon_chain/tests/inclusion_list_verification.rs b/beacon_node/beacon_chain/tests/inclusion_list_verification.rs index 49ba074f1e..4bde1374cf 100644 --- a/beacon_node/beacon_chain/tests/inclusion_list_verification.rs +++ b/beacon_node/beacon_chain/tests/inclusion_list_verification.rs @@ -33,7 +33,6 @@ fn get_harness_heze(validator_count: usize) -> BeaconChainHarness { - if engine_capabilities.new_payload_v4 { - self.new_payload_v4_heze(new_payload_request_heze) - .await - } else { - Err(Error::RequiredMethodUnsupported("engine_newPayloadV4")) - } - } NewPayloadRequest::Gloas(new_payload_request_gloas) => { if engine_capabilities.new_payload_v5 { self.new_payload_v5_gloas(new_payload_request_gloas).await @@ -1649,13 +1640,6 @@ impl HttpJsonRpc { Err(Error::RequiredMethodUnsupported("engine_getPayloadv4")) } } - ForkName::Heze => { - if engine_capabilities.get_payload_v4 { - self.get_payload_v4(fork_name, payload_id).await - } else { - Err(Error::RequiredMethodUnsupported("engine_getPayloadv4")) - } - } ForkName::Fulu => { if engine_capabilities.get_payload_v5 { self.get_payload_v5(fork_name, payload_id).await @@ -1663,14 +1647,7 @@ impl HttpJsonRpc { Err(Error::RequiredMethodUnsupported("engine_getPayloadv5")) } } - ForkName::Gloas => { - if engine_capabilities.get_payload_v6 { - self.get_payload_v6(fork_name, payload_id).await - } else { - Err(Error::RequiredMethodUnsupported("engine_getPayloadV6")) - } - } - ForkName::Heze => { + ForkName::Gloas | ForkName::Heze => { if engine_capabilities.get_payload_v6 { self.get_payload_v6(fork_name, payload_id).await } else { diff --git a/beacon_node/execution_layer/src/engine_api/new_payload_request.rs b/beacon_node/execution_layer/src/engine_api/new_payload_request.rs index 6130f9511e..b26908ead1 100644 --- a/beacon_node/execution_layer/src/engine_api/new_payload_request.rs +++ b/beacon_node/execution_layer/src/engine_api/new_payload_request.rs @@ -185,7 +185,7 @@ impl<'block, E: EthSpec> NewPayloadRequest<'block, E> { impl<'a, E: EthSpec> NewPayloadRequest<'a, E> { pub fn try_from_block_and_il_transactions( block: BeaconBlockRef<'a, E>, - il_transactions: Transactions, + _il_transactions: Transactions, ) -> Result { match block { BeaconBlockRef::Base(_) | BeaconBlockRef::Altair(_) => { diff --git a/beacon_node/execution_layer/src/lib.rs b/beacon_node/execution_layer/src/lib.rs index ea5732ba1f..6ff9f61f39 100644 --- a/beacon_node/execution_layer/src/lib.rs +++ b/beacon_node/execution_layer/src/lib.rs @@ -1804,9 +1804,6 @@ impl ExecutionLayer { ForkName::Gloas => { return Err(Error::InvalidForkForPayload); } - ForkName::Heze => { - return Err(Error::InvalidForkForPayload); - } }; return Ok(Some(payload)); } diff --git a/beacon_node/execution_layer/src/test_utils/execution_block_generator.rs b/beacon_node/execution_layer/src/test_utils/execution_block_generator.rs index c398eebcd9..368a5d9132 100644 --- a/beacon_node/execution_layer/src/test_utils/execution_block_generator.rs +++ b/beacon_node/execution_layer/src/test_utils/execution_block_generator.rs @@ -1005,12 +1005,6 @@ pub fn generate_genesis_header(spec: &ChainSpec) -> Option { - let mut header = ExecutionPayloadHeader::Heze(<_>::default()); - *header.block_hash_mut() = genesis_block_hash.unwrap_or_default(); - *header.transactions_root_mut() = empty_transactions_root; - Some(header) - } ForkName::Fulu => { let mut header = ExecutionPayloadHeader::Fulu(<_>::default()); *header.block_hash_mut() = genesis_block_hash.unwrap_or_default(); @@ -1098,9 +1092,6 @@ mod test { const DIFFICULTY_INCREMENT: u64 = 1; let mut generator: ExecutionBlockGenerator = ExecutionBlockGenerator::new( - Uint256::from(TERMINAL_DIFFICULTY), - TERMINAL_BLOCK, - ExecutionBlockHash::zero(), None, None, None, @@ -1109,6 +1100,8 @@ mod test { None, None, ); + generator.terminal_total_difficulty = Uint256::from(TERMINAL_DIFFICULTY); + generator.terminal_block_number = TERMINAL_BLOCK; for i in 0..=TERMINAL_BLOCK { if i > 0 { diff --git a/beacon_node/execution_layer/src/test_utils/handle_rpc.rs b/beacon_node/execution_layer/src/test_utils/handle_rpc.rs index 1cba1d1726..5310f051e2 100644 --- a/beacon_node/execution_layer/src/test_utils/handle_rpc.rs +++ b/beacon_node/execution_layer/src/test_utils/handle_rpc.rs @@ -238,22 +238,6 @@ pub async fn handle_rpc( )); } } - ForkName::Gloas => { - if method != ENGINE_NEW_PAYLOAD_V5 { - return Err(( - format!("{} called after Gloas fork!", method), - GENERIC_ERROR_CODE, - )); - } - } - ForkName::Heze => { - if method != ENGINE_NEW_PAYLOAD_V5 { - return Err(( - format!("{} called after Heze fork!", method), - GENERIC_ERROR_CODE, - )); - } - } _ => unreachable!(), }; @@ -714,22 +698,6 @@ pub async fn handle_rpc( )); } } - ForkName::Gloas => { - if method != ENGINE_FORKCHOICE_UPDATED_V4 { - return Err(( - format!("{} called after Gloas fork! Use V4.", method), - FORK_REQUEST_MISMATCH_ERROR_CODE, - )); - } - } - ForkName::Heze => { - if method != ENGINE_FORKCHOICE_UPDATED_V4 { - return Err(( - format!("{} called after Heze fork! Use V4.", method), - FORK_REQUEST_MISMATCH_ERROR_CODE, - )); - } - } _ => unreachable!(), }; } diff --git a/beacon_node/execution_layer/src/test_utils/mock_builder.rs b/beacon_node/execution_layer/src/test_utils/mock_builder.rs index b730439f55..c6c3e2142f 100644 --- a/beacon_node/execution_layer/src/test_utils/mock_builder.rs +++ b/beacon_node/execution_layer/src/test_utils/mock_builder.rs @@ -30,7 +30,7 @@ use tracing::{debug, error, info, warn}; use tree_hash::TreeHash; use types::ExecutionBlockHash; use types::builder::{ - BuilderBid, BuilderBidBellatrix, BuilderBidCapella, BuilderBidDeneb, BuilderBidHeze, + BuilderBid, BuilderBidBellatrix, BuilderBidCapella, BuilderBidDeneb, BuilderBidElectra, BuilderBidFulu, SignedBuilderBid, }; use types::{ @@ -638,18 +638,6 @@ impl MockBuilder { pubkey: self.builder_sk.public_key().compress(), execution_requests: maybe_requests.unwrap_or_default(), }), - ForkName::Heze => BuilderBid::Heze(BuilderBidHeze { - header: payload - .as_heze() - .map_err(|_| "incorrect payload variant".to_string())? - .into(), - blob_kzg_commitments: maybe_blobs_bundle - .map(|b| b.commitments) - .unwrap_or_default(), - value: self.get_bid_value(value), - pubkey: self.builder_sk.public_key().compress(), - execution_requests: maybe_requests.unwrap_or_default(), - }), ForkName::Electra => BuilderBid::Electra(BuilderBidElectra { header: payload .as_electra() diff --git a/beacon_node/http_api/src/lib.rs b/beacon_node/http_api/src/lib.rs index 65283f2c82..ca44ed5def 100644 --- a/beacon_node/http_api/src/lib.rs +++ b/beacon_node/http_api/src/lib.rs @@ -95,7 +95,7 @@ use tokio_stream::{ use tracing::{debug, error, info, warn}; use types::{ BeaconStateError, Checkpoint, ConfigAndPreset, Epoch, EthSpec, ForkName, Hash256, - SignedBlindedBeaconBlock, SignedInclusionList, Slot, + SignedBlindedBeaconBlock, SignedInclusionList, }; use validator::execution_payload_envelope::get_validator_execution_payload_envelope; use version::{ diff --git a/beacon_node/lighthouse_network/src/rpc/codec.rs b/beacon_node/lighthouse_network/src/rpc/codec.rs index 173eb26899..f65ff776aa 100644 --- a/beacon_node/lighthouse_network/src/rpc/codec.rs +++ b/beacon_node/lighthouse_network/src/rpc/codec.rs @@ -890,11 +890,6 @@ fn handle_rpc_response( decoded_buffer, )?), )))), - Some(ForkName::Heze) => Ok(Some(RpcSuccessResponse::BlocksByRange(Arc::new( - SignedBeaconBlock::Heze(SignedBeaconBlockHeze::from_ssz_bytes( - decoded_buffer, - )?), - )))), Some(ForkName::Fulu) => Ok(Some(RpcSuccessResponse::BlocksByRange(Arc::new( SignedBeaconBlock::Fulu(SignedBeaconBlockFulu::from_ssz_bytes(decoded_buffer)?), )))), @@ -937,11 +932,6 @@ fn handle_rpc_response( decoded_buffer, )?), )))), - Some(ForkName::Heze) => Ok(Some(RpcSuccessResponse::BlocksByRoot(Arc::new( - SignedBeaconBlock::Heze(SignedBeaconBlockHeze::from_ssz_bytes( - decoded_buffer, - )?), - )))), Some(ForkName::Fulu) => Ok(Some(RpcSuccessResponse::BlocksByRoot(Arc::new( SignedBeaconBlock::Fulu(SignedBeaconBlockFulu::from_ssz_bytes(decoded_buffer)?), )))), @@ -1024,7 +1014,6 @@ mod tests { ForkName::Deneb => spec.deneb_fork_epoch, ForkName::Electra => spec.electra_fork_epoch, ForkName::Fulu => spec.fulu_fork_epoch, - ForkName::Heze => spec.heze_fork_epoch, ForkName::Gloas => spec.gloas_fork_epoch, ForkName::Heze => spec.heze_fork_epoch, }; diff --git a/beacon_node/lighthouse_network/src/types/pubsub.rs b/beacon_node/lighthouse_network/src/types/pubsub.rs index 7d947e2901..6fd0084b96 100644 --- a/beacon_node/lighthouse_network/src/types/pubsub.rs +++ b/beacon_node/lighthouse_network/src/types/pubsub.rs @@ -256,10 +256,6 @@ impl PubsubMessage { SignedBeaconBlockFulu::from_ssz_bytes(data) .map_err(|e| format!("{:?}", e))?, ), - Some(ForkName::Heze) => SignedBeaconBlock::::Heze( - SignedBeaconBlockHeze::from_ssz_bytes(data) - .map_err(|e| format!("{:?}", e))?, - ), Some(ForkName::Gloas) => SignedBeaconBlock::::Gloas( SignedBeaconBlockGloas::from_ssz_bytes(data) .map_err(|e| format!("{:?}", e))?, diff --git a/beacon_node/lighthouse_network/tests/common.rs b/beacon_node/lighthouse_network/tests/common.rs index dd9d3ec0d0..3ee65e5ded 100644 --- a/beacon_node/lighthouse_network/tests/common.rs +++ b/beacon_node/lighthouse_network/tests/common.rs @@ -45,7 +45,6 @@ pub fn fork_context(fork_name: ForkName, spec: &ChainSpec) -> ForkContext { ForkName::Deneb => spec.deneb_fork_epoch, ForkName::Electra => spec.electra_fork_epoch, ForkName::Fulu => spec.fulu_fork_epoch, - ForkName::Heze => spec.heze_fork_epoch, ForkName::Gloas => spec.gloas_fork_epoch, ForkName::Heze => spec.heze_fork_epoch, }; diff --git a/consensus/types/src/block/beacon_block.rs b/consensus/types/src/block/beacon_block.rs index 98d96a47b4..fa1603e7ec 100644 --- a/consensus/types/src/block/beacon_block.rs +++ b/consensus/types/src/block/beacon_block.rs @@ -266,6 +266,7 @@ impl<'a, E: EthSpec, Payload: AbstractExecPayload> BeaconBlockRef<'a, E, Payl BeaconBlockRef::Fulu { .. } => ForkName::Fulu, BeaconBlockRef::Gloas { .. } => ForkName::Gloas, BeaconBlockRef::Heze { .. } => ForkName::Heze, + } } @@ -1110,26 +1111,6 @@ mod tests { }); } - #[test] - fn roundtrip_heze_block() { - let rng = &mut XorShiftRng::from_seed([42; 16]); - let spec = &ForkName::Heze.make_genesis_spec(MainnetEthSpec::default_spec()); - - let inner_block = BeaconBlockHeze { - slot: Slot::random_for_test(rng), - proposer_index: u64::random_for_test(rng), - parent_root: Hash256::random_for_test(rng), - state_root: Hash256::random_for_test(rng), - body: BeaconBlockBodyHeze::random_for_test(rng), - }; - - let block = BeaconBlock::Heze(inner_block.clone()); - - test_ssz_tree_hash_pair_with(&block, &inner_block, |bytes| { - BeaconBlock::from_ssz_bytes(bytes, spec) - }); - } - #[test] fn roundtrip_fulu_block() { let rng = &mut XorShiftRng::from_seed([42; 16]); @@ -1150,26 +1131,6 @@ mod tests { }); } - #[test] - fn roundtrip_heze_block() { - let rng = &mut XorShiftRng::from_seed([42; 16]); - let spec = &ForkName::Heze.make_genesis_spec(MainnetEthSpec::default_spec()); - - let inner_block = BeaconBlockHeze { - slot: Slot::random_for_test(rng), - proposer_index: u64::random_for_test(rng), - parent_root: Hash256::random_for_test(rng), - state_root: Hash256::random_for_test(rng), - body: BeaconBlockBodyHeze::random_for_test(rng), - }; - - let block = BeaconBlock::Heze(inner_block.clone()); - - test_ssz_tree_hash_pair_with(&block, &inner_block, |bytes| { - BeaconBlock::from_ssz_bytes(bytes, spec) - }); - } - #[test] fn roundtrip_gloas_block() { let rng = &mut XorShiftRng::from_seed([42; 16]); @@ -1190,6 +1151,26 @@ mod tests { }); } + #[test] + fn roundtrip_heze_block() { + let rng = &mut XorShiftRng::from_seed([42; 16]); + let spec = &ForkName::Heze.make_genesis_spec(MainnetEthSpec::default_spec()); + + let inner_block = BeaconBlockHeze { + slot: Slot::random_for_test(rng), + proposer_index: u64::random_for_test(rng), + parent_root: Hash256::random_for_test(rng), + state_root: Hash256::random_for_test(rng), + body: BeaconBlockBodyHeze::random_for_test(rng), + }; + + let block = BeaconBlock::Heze(inner_block.clone()); + + test_ssz_tree_hash_pair_with(&block, &inner_block, |bytes| { + BeaconBlock::from_ssz_bytes(bytes, spec) + }); + } + #[test] fn decode_base_and_altair() { type E = MainnetEthSpec; @@ -1209,9 +1190,7 @@ mod tests { let deneb_slot = deneb_epoch.start_slot(E::slots_per_epoch()); let electra_epoch = deneb_epoch + 1; let electra_slot = electra_epoch.start_slot(E::slots_per_epoch()); - let heze_epoch = electra_epoch + 1; - let heze_slot = heze_epoch.start_slot(E::slots_per_epoch()); - let fulu_epoch = heze_epoch + 1; + let fulu_epoch = electra_epoch + 1; let fulu_slot = fulu_epoch.start_slot(E::slots_per_epoch()); let gloas_epoch = fulu_epoch + 1; let gloas_slot = gloas_epoch.start_slot(E::slots_per_epoch()); @@ -1222,7 +1201,6 @@ mod tests { spec.capella_fork_epoch = Some(capella_epoch); spec.deneb_fork_epoch = Some(deneb_epoch); spec.electra_fork_epoch = Some(electra_epoch); - spec.heze_fork_epoch = Some(heze_epoch); spec.fulu_fork_epoch = Some(fulu_epoch); spec.gloas_fork_epoch = Some(gloas_epoch); spec.heze_fork_epoch = Some(heze_epoch); @@ -1337,28 +1315,6 @@ mod tests { .expect_err("bad electra block cannot be decoded"); } - // BeaconBlockHeze - { - let good_block = BeaconBlock::Heze(BeaconBlockHeze { - slot: heze_slot, - ..<_>::random_for_test(rng) - }); - // It's invalid to have an Electra block with a epoch lower than the fork epoch. - let bad_block = { - let mut bad = good_block.clone(); - *bad.slot_mut() = deneb_slot; - bad - }; - - assert_eq!( - BeaconBlock::from_ssz_bytes(&good_block.as_ssz_bytes(), &spec) - .expect("good heze block can be decoded"), - good_block - ); - BeaconBlock::from_ssz_bytes(&bad_block.as_ssz_bytes(), &spec) - .expect_err("bad heze block cannot be decoded"); - } - // BeaconBlockFulu { let good_block = BeaconBlock::Fulu(BeaconBlockFulu { diff --git a/consensus/types/src/block/beacon_block_body.rs b/consensus/types/src/block/beacon_block_body.rs index 61a16bbea1..1c4a86d729 100644 --- a/consensus/types/src/block/beacon_block_body.rs +++ b/consensus/types/src/block/beacon_block_body.rs @@ -23,11 +23,11 @@ use crate::{ deposit::Deposit, execution::{ AbstractExecPayload, BlindedPayload, BlindedPayloadBellatrix, BlindedPayloadCapella, - BlindedPayloadDeneb, BlindedPayloadHeze, BlindedPayloadElectra, BlindedPayloadFulu, + BlindedPayloadDeneb, BlindedPayloadElectra, BlindedPayloadFulu, Eth1Data, ExecutionPayload, ExecutionPayloadBellatrix, ExecutionPayloadCapella, - ExecutionPayloadDeneb, ExecutionPayloadHeze, ExecutionPayloadElectra, + ExecutionPayloadDeneb, ExecutionPayloadElectra, ExecutionPayloadFulu, ExecutionPayloadGloas, ExecutionRequests, FullPayload, - FullPayloadBellatrix, FullPayloadCapella, FullPayloadDeneb, FullPayloadHeze, + FullPayloadBellatrix, FullPayloadCapella, FullPayloadDeneb, FullPayloadElectra, FullPayloadFulu, SignedBlsToExecutionChange, }, exit::SignedVoluntaryExit, @@ -258,10 +258,6 @@ impl<'a, E: EthSpec, Payload: AbstractExecPayload> BeaconBlockBodyRef<'a, E, beacon_block_body_electra_fields!(body, |_, field| leaves .push(field.tree_hash_root())); } - Self::Heze(body) => { - beacon_block_body_heze_fields!(body, |_, field| leaves - .push(field.tree_hash_root())); - } Self::Fulu(body) => { beacon_block_body_fulu_fields!(body, |_, field| leaves .push(field.tree_hash_root())); @@ -388,7 +384,6 @@ impl<'a, E: EthSpec, Payload: AbstractExecPayload> BeaconBlockBodyRef<'a, E, Self::Capella(body) => Box::new(body.attestations.iter().map(AttestationRef::Base)), Self::Deneb(body) => Box::new(body.attestations.iter().map(AttestationRef::Base)), Self::Electra(body) => Box::new(body.attestations.iter().map(AttestationRef::Electra)), - Self::Heze(body) => Box::new(body.attestations.iter().map(AttestationRef::Electra)), Self::Fulu(body) => Box::new(body.attestations.iter().map(AttestationRef::Electra)), Self::Gloas(body) => Box::new(body.attestations.iter().map(AttestationRef::Electra)), Self::Heze(body) => Box::new(body.attestations.iter().map(AttestationRef::Electra)), @@ -427,11 +422,6 @@ impl<'a, E: EthSpec, Payload: AbstractExecPayload> BeaconBlockBodyRef<'a, E, .iter() .map(AttesterSlashingRef::Electra), ), - Self::Heze(body) => Box::new( - body.attester_slashings - .iter() - .map(AttesterSlashingRef::Electra), - ), Self::Fulu(body) => Box::new( body.attester_slashings .iter() @@ -472,9 +462,6 @@ impl<'a, E: EthSpec, Payload: AbstractExecPayload> BeaconBlockBodyRefMut<'a, Self::Electra(body) => { Box::new(body.attestations.iter_mut().map(AttestationRefMut::Electra)) } - Self::Heze(body) => { - Box::new(body.attestations.iter_mut().map(AttestationRefMut::Electra)) - } Self::Fulu(body) => { Box::new(body.attestations.iter_mut().map(AttestationRefMut::Electra)) } @@ -498,7 +485,6 @@ impl> BeaconBlockBodyRef<'_, E, Payl BeaconBlockBodyRef::Capella { .. } => ForkName::Capella, BeaconBlockBodyRef::Deneb { .. } => ForkName::Deneb, BeaconBlockBodyRef::Electra { .. } => ForkName::Electra, - BeaconBlockBodyRef::Heze { .. } => ForkName::Heze, BeaconBlockBodyRef::Fulu { .. } => ForkName::Fulu, BeaconBlockBodyRef::Gloas { .. } => ForkName::Gloas, BeaconBlockBodyRef::Heze { .. } => ForkName::Heze, diff --git a/consensus/types/src/block/signed_beacon_block.rs b/consensus/types/src/block/signed_beacon_block.rs index c042cfb33a..f33ee41aaf 100644 --- a/consensus/types/src/block/signed_beacon_block.rs +++ b/consensus/types/src/block/signed_beacon_block.rs @@ -25,11 +25,11 @@ use crate::{ core::{ChainSpec, Domain, Epoch, EthSpec, Hash256, SignedRoot, SigningData, Slot}, execution::{ AbstractExecPayload, BlindedPayload, BlindedPayloadBellatrix, BlindedPayloadCapella, - BlindedPayloadDeneb, BlindedPayloadHeze, BlindedPayloadElectra, BlindedPayloadFulu, + BlindedPayloadDeneb, BlindedPayloadElectra, BlindedPayloadFulu, ExecutionPayload, ExecutionPayloadBellatrix, ExecutionPayloadCapella, - ExecutionPayloadDeneb, ExecutionPayloadHeze, ExecutionPayloadElectra, + ExecutionPayloadDeneb, ExecutionPayloadElectra, ExecutionPayloadFulu, FullPayload, FullPayloadBellatrix, FullPayloadCapella, - FullPayloadDeneb, FullPayloadHeze, FullPayloadElectra, FullPayloadFulu, + FullPayloadDeneb, FullPayloadElectra, FullPayloadFulu, }, fork::{Fork, ForkName, ForkVersionDecode, InconsistentFork, map_fork_name}, kzg_ext::format_kzg_commitments, @@ -205,9 +205,6 @@ impl> SignedBeaconBlock BeaconBlock::Electra(message) => { SignedBeaconBlock::Electra(SignedBeaconBlockElectra { message, signature }) } - BeaconBlock::Heze(message) => { - SignedBeaconBlock::Heze(SignedBeaconBlockHeze { message, signature }) - } BeaconBlock::Fulu(message) => { SignedBeaconBlock::Fulu(SignedBeaconBlockFulu { message, signature }) } @@ -921,9 +918,6 @@ pub mod ssz_tagged_signed_beacon_block { ForkName::Electra => Ok(SignedBeaconBlock::Electra( SignedBeaconBlockElectra::from_ssz_bytes(body)?, )), - ForkName::Heze => Ok(SignedBeaconBlock::Heze( - SignedBeaconBlockHeze::from_ssz_bytes(body)?, - )), ForkName::Fulu => Ok(SignedBeaconBlock::Fulu( SignedBeaconBlockFulu::from_ssz_bytes(body)?, )), diff --git a/consensus/types/src/core/preset.rs b/consensus/types/src/core/preset.rs index 242c7cb32a..8648ae2040 100644 --- a/consensus/types/src/core/preset.rs +++ b/consensus/types/src/core/preset.rs @@ -421,7 +421,7 @@ mod test { assert_eq!(electra, ElectraPreset::from_chain_spec::(&spec)); let heze: HezePreset = preset_from_file(&preset_name, "heze.yaml"); - assert_eq!(heze, HezePreset::from_chain_spec(&spec)); + assert_eq!(heze, HezePreset::from_chain_spec::(&spec)); let fulu: FuluPreset = preset_from_file(&preset_name, "fulu.yaml"); assert_eq!(fulu, FuluPreset::from_chain_spec::(&spec)); diff --git a/consensus/types/src/execution/execution_payload_bid.rs b/consensus/types/src/execution/execution_payload_bid.rs index ffdbf0ed6c..4522a48791 100644 --- a/consensus/types/src/execution/execution_payload_bid.rs +++ b/consensus/types/src/execution/execution_payload_bid.rs @@ -101,6 +101,12 @@ mod tests { use super::*; use crate::MainnetEthSpec; - ssz_and_tree_hash_tests!(ExecutionPayloadBidGloas); - ssz_and_tree_hash_tests!(ExecutionPayloadBidHeze); + mod gloas { + use super::*; + ssz_and_tree_hash_tests!(ExecutionPayloadBidGloas); + } + mod heze { + use super::*; + ssz_and_tree_hash_tests!(ExecutionPayloadBidHeze); + } } diff --git a/consensus/types/src/execution/signed_execution_payload_bid.rs b/consensus/types/src/execution/signed_execution_payload_bid.rs index b2c18e948f..1da2c8d354 100644 --- a/consensus/types/src/execution/signed_execution_payload_bid.rs +++ b/consensus/types/src/execution/signed_execution_payload_bid.rs @@ -1,5 +1,5 @@ use crate::execution::{ - ExecutionPayloadBid, ExecutionPayloadBidGloas, ExecutionPayloadBidHeze, ExecutionPayloadBidRef, + ExecutionPayloadBidGloas, ExecutionPayloadBidHeze, ExecutionPayloadBidRef, }; use crate::state::BeaconStateError; use crate::test_utils::TestRandom; @@ -118,6 +118,12 @@ mod tests { use super::*; use crate::MainnetEthSpec; - ssz_and_tree_hash_tests!(SignedExecutionPayloadBidGloas); - ssz_and_tree_hash_tests!(SignedExecutionPayloadBidHeze); + mod gloas { + use super::*; + ssz_and_tree_hash_tests!(SignedExecutionPayloadBidGloas); + } + mod heze { + use super::*; + ssz_and_tree_hash_tests!(SignedExecutionPayloadBidHeze); + } } diff --git a/consensus/types/src/fork/fork_macros.rs b/consensus/types/src/fork/fork_macros.rs index 3fa8bcf1fb..3f1d12f0a1 100644 --- a/consensus/types/src/fork/fork_macros.rs +++ b/consensus/types/src/fork/fork_macros.rs @@ -51,10 +51,6 @@ macro_rules! map_fork_name_with { let (value, extra_data) = $body; ($t::Fulu(value), extra_data) } - $crate::fork::ForkName::Heze => { - let (value, extra_data) = $body; - ($t::Heze(value), extra_data) - } $crate::fork::ForkName::Gloas => { let (value, extra_data) = $body; ($t::Gloas(value), extra_data) diff --git a/consensus/types/src/light_client/light_client_bootstrap.rs b/consensus/types/src/light_client/light_client_bootstrap.rs index f0b6b3f7a9..aa840da5e9 100644 --- a/consensus/types/src/light_client/light_client_bootstrap.rs +++ b/consensus/types/src/light_client/light_client_bootstrap.rs @@ -120,7 +120,7 @@ impl LightClientBootstrap { } ForkName::Fulu => Self::Fulu(LightClientBootstrapFulu::from_ssz_bytes(bytes)?), // TODO(gloas): implement Gloas light client - ForkName::Base | ForkName::Gloas | ForkName::Heze => { + ForkName::Base | ForkName::Gloas => { return Err(ssz::DecodeError::BytesInvalid(format!( "LightClientBootstrap decoding for {fork_name} not implemented" ))); @@ -144,7 +144,7 @@ impl LightClientBootstrap { } ForkName::Fulu => as Encode>::ssz_fixed_len(), // TODO(gloas): implement Gloas light client - ForkName::Gloas | ForkName::Heze => { + ForkName::Gloas => { as Encode>::ssz_fixed_len() } }; @@ -199,7 +199,6 @@ impl LightClientBootstrap { }), // TODO(gloas): implement Gloas light client ForkName::Gloas => return Err(LightClientError::GloasNotImplemented), - ForkName::Heze => return Err(LightClientError::HezeNotImplemented), }; Ok(light_client_bootstrap) @@ -255,7 +254,6 @@ impl LightClientBootstrap { }), // TODO(gloas): implement Gloas light client ForkName::Gloas => return Err(LightClientError::GloasNotImplemented), - ForkName::Heze => return Err(LightClientError::HezeNotImplemented), }; Ok(light_client_bootstrap) @@ -295,7 +293,7 @@ impl<'de, E: EthSpec> ContextDeserialize<'de, ForkName> for LightClientBootstrap ForkName::Fulu => { Self::Fulu(Deserialize::deserialize(deserializer).map_err(convert_err)?) } - ForkName::Gloas | ForkName::Heze => { + ForkName::Gloas => { // TODO(EIP-7732): check if this is correct return Err(serde::de::Error::custom(format!( "LightClientBootstrap failed to deserialize: unsupported fork '{}'", diff --git a/consensus/types/src/light_client/light_client_finality_update.rs b/consensus/types/src/light_client/light_client_finality_update.rs index 2a17def874..50a38b8d90 100644 --- a/consensus/types/src/light_client/light_client_finality_update.rs +++ b/consensus/types/src/light_client/light_client_finality_update.rs @@ -177,9 +177,7 @@ impl LightClientFinalityUpdate { sync_aggregate, signature_slot, }), - ForkName::Heze => return Err(LightClientError::GloasNotImplemented), - ForkName::Gloas => return Err(LightClientError::GloasNotImplemented), - ForkName::Heze => return Err(LightClientError::HezeNotImplemented), + ForkName::Gloas | ForkName::Heze => return Err(LightClientError::GloasNotImplemented), ForkName::Base => return Err(LightClientError::AltairForkNotActive), }; @@ -234,7 +232,7 @@ impl LightClientFinalityUpdate { } ForkName::Fulu => Self::Fulu(LightClientFinalityUpdateFulu::from_ssz_bytes(bytes)?), // TODO(gloas): implement Gloas light client - ForkName::Base | ForkName::Gloas | ForkName::Heze => { + ForkName::Base | ForkName::Gloas => { return Err(ssz::DecodeError::BytesInvalid(format!( "LightClientFinalityUpdate decoding for {fork_name} not implemented" ))); @@ -258,7 +256,7 @@ impl LightClientFinalityUpdate { } ForkName::Fulu => as Encode>::ssz_fixed_len(), // TODO(gloas): implement Gloas light client - ForkName::Gloas | ForkName::Heze => 0, + ForkName::Gloas => 0, }; // `2 *` because there are two headers in the update fixed_size + 2 * LightClientHeader::::ssz_max_var_len_for_fork(fork_name) @@ -311,7 +309,7 @@ impl<'de, E: EthSpec> ContextDeserialize<'de, ForkName> for LightClientFinalityU ForkName::Fulu => { Self::Fulu(Deserialize::deserialize(deserializer).map_err(convert_err)?) } - ForkName::Gloas | ForkName::Heze => { + ForkName::Gloas => { // TODO(EIP-7732): check if this is correct return Err(serde::de::Error::custom(format!( "LightClientBootstrap failed to deserialize: unsupported fork '{}'", diff --git a/consensus/types/src/light_client/light_client_header.rs b/consensus/types/src/light_client/light_client_header.rs index 72283766e2..25191e1f66 100644 --- a/consensus/types/src/light_client/light_client_header.rs +++ b/consensus/types/src/light_client/light_client_header.rs @@ -111,7 +111,6 @@ impl LightClientHeader { } // TODO(gloas): implement Gloas light client ForkName::Gloas => return Err(LightClientError::GloasNotImplemented), - ForkName::Heze => return Err(LightClientError::HezeNotImplemented), }; Ok(header) } @@ -134,7 +133,7 @@ impl LightClientHeader { LightClientHeader::Fulu(LightClientHeaderFulu::from_ssz_bytes(bytes)?) } // TODO(gloas): implement Gloas light client - ForkName::Base | ForkName::Gloas | ForkName::Heze => { + ForkName::Base | ForkName::Gloas => { return Err(ssz::DecodeError::BytesInvalid(format!( "LightClientHeader decoding for {fork_name} not implemented" ))); @@ -365,7 +364,7 @@ impl<'de, E: EthSpec> ContextDeserialize<'de, ForkName> for LightClientHeader }; Ok(match context { // TODO(gloas): implement Gloas light client - ForkName::Base | ForkName::Gloas | ForkName::Heze => { + ForkName::Base | ForkName::Gloas => { return Err(serde::de::Error::custom(format!( "LightClientFinalityUpdate failed to deserialize: unsupported fork '{}'", context diff --git a/consensus/types/src/light_client/light_client_optimistic_update.rs b/consensus/types/src/light_client/light_client_optimistic_update.rs index f92d4f640b..1459759f81 100644 --- a/consensus/types/src/light_client/light_client_optimistic_update.rs +++ b/consensus/types/src/light_client/light_client_optimistic_update.rs @@ -126,7 +126,6 @@ impl LightClientOptimisticUpdate { signature_slot, }), ForkName::Gloas => return Err(LightClientError::GloasNotImplemented), - ForkName::Heze => return Err(LightClientError::HezeNotImplemented), ForkName::Base => return Err(LightClientError::AltairForkNotActive), }; @@ -183,7 +182,7 @@ impl LightClientOptimisticUpdate { } ForkName::Fulu => Self::Fulu(LightClientOptimisticUpdateFulu::from_ssz_bytes(bytes)?), // TODO(gloas): implement Gloas light client - ForkName::Base | ForkName::Gloas | ForkName::Heze => { + ForkName::Base | ForkName::Gloas => { return Err(ssz::DecodeError::BytesInvalid(format!( "LightClientOptimisticUpdate decoding for {fork_name} not implemented" ))); @@ -207,7 +206,7 @@ impl LightClientOptimisticUpdate { } ForkName::Fulu => as Encode>::ssz_fixed_len(), // TODO(gloas): implement Gloas light client - ForkName::Gloas | ForkName::Heze => 0, + ForkName::Gloas => 0, }; fixed_len + LightClientHeader::::ssz_max_var_len_for_fork(fork_name) } @@ -259,7 +258,7 @@ impl<'de, E: EthSpec> ContextDeserialize<'de, ForkName> for LightClientOptimisti ForkName::Fulu => { Self::Fulu(Deserialize::deserialize(deserializer).map_err(convert_err)?) } - ForkName::Gloas | ForkName::Heze => { + ForkName::Gloas => { // TODO(EIP-7732): check if this is correct return Err(serde::de::Error::custom(format!( "LightClientBootstrap failed to deserialize: unsupported fork '{}'", diff --git a/consensus/types/src/light_client/light_client_update.rs b/consensus/types/src/light_client/light_client_update.rs index 6498d9bbf8..2b2b1c1896 100644 --- a/consensus/types/src/light_client/light_client_update.rs +++ b/consensus/types/src/light_client/light_client_update.rs @@ -141,7 +141,7 @@ impl<'de, E: EthSpec> ContextDeserialize<'de, ForkName> for LightClientUpdate }; Ok(match context { // TODO(gloas): implement Gloas light client - ForkName::Base | ForkName::Gloas | ForkName::Heze => { + ForkName::Base | ForkName::Gloas => { return Err(serde::de::Error::custom(format!( "LightClientUpdate failed to deserialize: unsupported fork '{}'", context @@ -328,7 +328,6 @@ impl LightClientUpdate { // if you need to test or support lightclient usages // TODO(gloas): implement Gloas light client ForkName::Gloas => return Err(LightClientError::GloasNotImplemented), - ForkName::Heze => return Err(LightClientError::HezeNotImplemented), }; Ok(light_client_update) @@ -346,7 +345,7 @@ impl LightClientUpdate { } ForkName::Fulu => Self::Fulu(LightClientUpdateFulu::from_ssz_bytes(bytes)?), // TODO(gloas): implement Gloas light client - ForkName::Base | ForkName::Gloas | ForkName::Heze => { + ForkName::Base | ForkName::Gloas => { return Err(ssz::DecodeError::BytesInvalid(format!( "LightClientUpdate decoding for {fork_name} not implemented" ))); @@ -505,7 +504,7 @@ impl LightClientUpdate { } ForkName::Fulu => as Encode>::ssz_fixed_len(), // TODO(gloas): implement Gloas light client - ForkName::Gloas | ForkName::Heze => 0, + ForkName::Gloas => 0, }; fixed_len + 2 * LightClientHeader::::ssz_max_var_len_for_fork(fork_name) } diff --git a/consensus/types/src/state/beacon_state.rs b/consensus/types/src/state/beacon_state.rs index 8ce6fc4b0a..9da9c563eb 100644 --- a/consensus/types/src/state/beacon_state.rs +++ b/consensus/types/src/state/beacon_state.rs @@ -37,7 +37,7 @@ use crate::{ deposit::PendingDeposit, execution::{ Eth1Data, ExecutionPayloadHeaderBellatrix, ExecutionPayloadHeaderCapella, - ExecutionPayloadHeaderDeneb, ExecutionPayloadHeaderHeze, ExecutionPayloadHeaderElectra, + ExecutionPayloadHeaderDeneb, ExecutionPayloadHeaderElectra, ExecutionPayloadHeaderFulu, ExecutionPayloadHeaderRef, ExecutionPayloadHeaderRefMut, InclusionListCommittee, InclusionListDuty, }, @@ -836,7 +836,6 @@ impl BeaconState { BeaconState::Deneb { .. } => ForkName::Deneb, BeaconState::Electra { .. } => ForkName::Electra, BeaconState::Fulu { .. } => ForkName::Fulu, - BeaconState::Heze { .. } => ForkName::Heze, BeaconState::Gloas { .. } => ForkName::Gloas, BeaconState::Heze { .. } => ForkName::Heze, } @@ -1983,16 +1982,6 @@ impl BeaconState { &mut state.exit_cache, &mut state.epoch_cache, )), - BeaconState::Heze(state) => Ok(( - &mut state.validators, - &mut state.balances, - &state.previous_epoch_participation, - &state.current_epoch_participation, - &mut state.inactivity_scores, - &mut state.progressive_balances_cache, - &mut state.exit_cache, - &mut state.epoch_cache, - )), BeaconState::Fulu(state) => Ok(( &mut state.validators, &mut state.balances, @@ -2459,7 +2448,6 @@ impl BeaconState { BeaconState::Deneb(state) => Ok(&mut state.current_epoch_participation), BeaconState::Electra(state) => Ok(&mut state.current_epoch_participation), BeaconState::Fulu(state) => Ok(&mut state.current_epoch_participation), - BeaconState::Heze(state) => Ok(&mut state.current_epoch_participation), BeaconState::Gloas(state) => Ok(&mut state.current_epoch_participation), BeaconState::Heze(state) => Ok(&mut state.current_epoch_participation), } @@ -2472,7 +2460,6 @@ impl BeaconState { BeaconState::Deneb(state) => Ok(&mut state.previous_epoch_participation), BeaconState::Electra(state) => Ok(&mut state.previous_epoch_participation), BeaconState::Fulu(state) => Ok(&mut state.previous_epoch_participation), - BeaconState::Heze(state) => Ok(&mut state.previous_epoch_participation), BeaconState::Gloas(state) => Ok(&mut state.previous_epoch_participation), BeaconState::Heze(state) => Ok(&mut state.previous_epoch_participation), } @@ -2787,14 +2774,6 @@ impl BeaconState { } ); } - Self::Heze(self_inner) => { - map_beacon_state_heze_tree_list_fields_immutable!( - self_inner, - |_, self_field| { - any_pending_mutations |= self_field.has_pending_updates(); - } - ); - } Self::Fulu(self_inner) => { map_beacon_state_fulu_tree_list_fields_immutable!(self_inner, |_, self_field| { any_pending_mutations |= self_field.has_pending_updates(); @@ -2806,9 +2785,12 @@ impl BeaconState { }); } Self::Heze(self_inner) => { - map_beacon_state_heze_tree_list_fields_immutable!(self_inner, |_, self_field| { - any_pending_mutations |= self_field.has_pending_updates(); - }); + map_beacon_state_heze_tree_list_fields_immutable!( + self_inner, + |_, self_field| { + any_pending_mutations |= self_field.has_pending_updates(); + } + ); } }; any_pending_mutations @@ -3229,14 +3211,6 @@ impl BeaconState { ); } (Self::Fulu(_), _) => (), - (Self::Heze(self_inner), Self::Heze(base_inner)) => { - bimap_beacon_state_heze_tree_list_fields!( - self_inner, - base_inner, - |_, self_field, base_field| { self_field.rebase_on(base_field) } - ); - } - (Self::Heze(_), _) => (), (Self::Gloas(self_inner), Self::Gloas(base_inner)) => { bimap_beacon_state_gloas_tree_list_fields!( self_inner, @@ -3575,7 +3549,6 @@ impl BeaconState { ForkName::Fulu => BeaconStateFulu::::NUM_FIELDS.next_power_of_two(), ForkName::Heze => BeaconStateHeze::::NUM_FIELDS.next_power_of_two(), ForkName::Gloas => BeaconStateGloas::::NUM_FIELDS.next_power_of_two(), - ForkName::Heze => BeaconStateHeze::::NUM_FIELDS.next_power_of_two(), } } @@ -3623,9 +3596,6 @@ impl BeaconState { Self::Electra(inner) => { map_beacon_state_electra_tree_list_fields!(inner, |_, x| { x.apply_updates() }) } - Self::Heze(inner) => { - map_beacon_state_heze_tree_list_fields!(inner, |_, x| { x.apply_updates() }) - } Self::Fulu(inner) => { map_beacon_state_fulu_tree_list_fields!(inner, |_, x| { x.apply_updates() }) } @@ -3742,11 +3712,6 @@ impl BeaconState { leaves.push(field.tree_hash_root()); }); } - BeaconState::Heze(state) => { - map_beacon_state_heze_fields!(state, |_, field| { - leaves.push(field.tree_hash_root()); - }); - } BeaconState::Fulu(state) => { map_beacon_state_fulu_fields!(state, |_, field| { leaves.push(field.tree_hash_root()); @@ -3822,7 +3787,6 @@ impl CompareFields for BeaconState { (BeaconState::Heze(x), BeaconState::Heze(y)) => x.compare_fields(y), (BeaconState::Fulu(x), BeaconState::Fulu(y)) => x.compare_fields(y), (BeaconState::Gloas(x), BeaconState::Gloas(y)) => x.compare_fields(y), - (BeaconState::Heze(x), BeaconState::Heze(y)) => x.compare_fields(y), _ => panic!("compare_fields: mismatched state variants",), } } diff --git a/testing/ef_tests/src/cases/fork.rs b/testing/ef_tests/src/cases/fork.rs index a425e662d9..ba5dce04c9 100644 --- a/testing/ef_tests/src/cases/fork.rs +++ b/testing/ef_tests/src/cases/fork.rs @@ -71,7 +71,6 @@ impl Case for ForkTest { ForkName::Capella => upgrade_to_capella(&mut result_state, spec).map(|_| result_state), ForkName::Deneb => upgrade_to_deneb(&mut result_state, spec).map(|_| result_state), ForkName::Electra => upgrade_to_electra(&mut result_state, spec).map(|_| result_state), - ForkName::Heze => upgrade_to_heze(&mut result_state, spec).map(|_| result_state), ForkName::Fulu => upgrade_to_fulu(&mut result_state, spec).map(|_| result_state), ForkName::Gloas => upgrade_to_gloas(&mut result_state, spec).map(|_| result_state), ForkName::Heze => upgrade_to_heze(&mut result_state, spec).map(|_| result_state), diff --git a/testing/ef_tests/src/cases/merkle_proof_validity.rs b/testing/ef_tests/src/cases/merkle_proof_validity.rs index 819d704ce6..587673ddcb 100644 --- a/testing/ef_tests/src/cases/merkle_proof_validity.rs +++ b/testing/ef_tests/src/cases/merkle_proof_validity.rs @@ -172,10 +172,6 @@ impl LoadCase for KzgInclusionMerkleProofValidity { ssz_decode_file::>(&path.join("object.ssz_snappy"))? .into() } - ForkName::Heze => { - ssz_decode_file::>(&path.join("object.ssz_snappy"))? - .into() - } ForkName::Fulu => { ssz_decode_file::>(&path.join("object.ssz_snappy"))?.into() } @@ -300,10 +296,6 @@ impl LoadCase for BeaconBlockBodyMerkleProofValidity { ssz_decode_file::>(&path.join("object.ssz_snappy"))? .into() } - ForkName::Heze => { - ssz_decode_file::>(&path.join("object.ssz_snappy"))? - .into() - } ForkName::Fulu => { ssz_decode_file::>(&path.join("object.ssz_snappy"))?.into() } diff --git a/testing/ef_tests/src/cases/transition.rs b/testing/ef_tests/src/cases/transition.rs index 6b400a35f1..2e7c5b6b72 100644 --- a/testing/ef_tests/src/cases/transition.rs +++ b/testing/ef_tests/src/cases/transition.rs @@ -60,14 +60,6 @@ impl LoadCase for TransitionTest { spec.deneb_fork_epoch = Some(Epoch::new(0)); spec.electra_fork_epoch = Some(metadata.fork_epoch); } - ForkName::Heze => { - 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.heze_fork_epoch = Some(metadata.fork_epoch); - } ForkName::Fulu => { spec.altair_fork_epoch = Some(Epoch::new(0)); spec.bellatrix_fork_epoch = Some(Epoch::new(0)); diff --git a/validator_client/signing_method/src/web3signer.rs b/validator_client/signing_method/src/web3signer.rs index 6dc19417b1..98d39e25ca 100644 --- a/validator_client/signing_method/src/web3signer.rs +++ b/validator_client/signing_method/src/web3signer.rs @@ -118,11 +118,6 @@ impl<'a, E: EthSpec, Payload: AbstractExecPayload> Web3SignerObject<'a, E, Pa block: None, block_header: Some(block.block_header()), }), - BeaconBlock::Heze(_) => Ok(Web3SignerObject::BeaconBlock { - version: ForkName::Heze, - block: None, - block_header: Some(block.block_header()), - }), BeaconBlock::Fulu(_) => Ok(Web3SignerObject::BeaconBlock { version: ForkName::Fulu, block: None, diff --git a/validator_client/validator_services/src/duties_service.rs b/validator_client/validator_services/src/duties_service.rs index 5aa2c5b3ae..662dd75303 100644 --- a/validator_client/validator_services/src/duties_service.rs +++ b/validator_client/validator_services/src/duties_service.rs @@ -565,8 +565,8 @@ impl DutiesService { self.inclusion_list_duties .read() - .iter() - .filter_map(|(_, map)| map.get(&epoch)) + .values() + .filter_map(|map| map.get(&epoch)) .map(|(_, duty)| duty) .filter(|duty| duty.slot == slot && signing_pubkeys.contains(&duty.pubkey)) .cloned()