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

Use ForkName Ord in BeaconBlockBody

Browse Source
This commit is contained in:
dapplion
2024-06-17 19:18:54 +02:00
parent 960f8c5c48
commit 1d0e3f4d30
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
consensus/types/src/beacon_block_body.rs
View File

@@ -820,6 +820,11 @@ impl<E: EthSpec> From<BeaconBlockBody<E, FullPayload<E>>>
} }
impl<E: EthSpec> BeaconBlockBody<E> { impl<E: EthSpec> BeaconBlockBody<E> {
/// Returns the name of the fork pertaining to `self`.
pub fn fork_name(&self) -> ForkName {
self.to_ref().fork_name()
}
pub fn block_body_merkle_proof(&self, generalized_index: usize) -> Result<Vec<Hash256>, Error> { pub fn block_body_merkle_proof(&self, generalized_index: usize) -> Result<Vec<Hash256>, Error> {
let field_index = match generalized_index { let field_index = match generalized_index {
light_client_update::EXECUTION_PAYLOAD_INDEX => { light_client_update::EXECUTION_PAYLOAD_INDEX => {
@@ -834,22 +839,16 @@ impl<E: EthSpec> BeaconBlockBody<E> {
_ => return Err(Error::IndexNotSupported(generalized_index)), _ => return Err(Error::IndexNotSupported(generalized_index)),
}; };
let attestations_root = match self { let attestations_root = if self.fork_name() > ForkName::Electra {
BeaconBlockBody::Base(_) self.attestations_electra()?.tree_hash_root()
| BeaconBlockBody::Altair(_) } else {
| BeaconBlockBody::Bellatrix(_) self.attestations_base()?.tree_hash_root()
| BeaconBlockBody::Capella(_)
| BeaconBlockBody::Deneb(_) => self.attestations_base()?.tree_hash_root(),
BeaconBlockBody::Electra(_) => self.attestations_electra()?.tree_hash_root(),
}; };
let attester_slashings_root = match self { let attester_slashings_root = if self.fork_name() > ForkName::Electra {
BeaconBlockBody::Base(_) self.attester_slashings_electra()?.tree_hash_root()
| BeaconBlockBody::Altair(_) } else {
| BeaconBlockBody::Bellatrix(_) self.attester_slashings_base()?.tree_hash_root()
| BeaconBlockBody::Capella(_)
| BeaconBlockBody::Deneb(_) => self.attester_slashings_base()?.tree_hash_root(),
BeaconBlockBody::Electra(_) => self.attester_slashings_electra()?.tree_hash_root(),
}; };
let mut leaves = vec![ let mut leaves = vec![