gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-03-22 06:14:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Unimplement TreeHash for BeaconState (#6083)

Browse Source 
* Unimplement `TreeHash` for `BeaconState`
This commit is contained in:
Michael Sproul
2024-07-12 23:06:08 +10:00
committed by GitHub
parent 0c0b56d9e8
commit 2f0af2be89
16 changed files with 117 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
consensus/types/src/beacon_state.rs
View File

@@ -214,6 +214,13 @@ impl From<BeaconStateHash> for Hash256 {
}
/// The state of the `BeaconChain` at some slot.
///
/// Note: `BeaconState` does not implement `TreeHash` on the top-level type in order to
/// encourage use of the `canonical_root`/`update_tree_hash_cache` methods which flush pending
/// updates to the underlying persistent data structures. This is the safest option for now until
/// we add internal mutability to `milhouse::{List, Vector}`. See:
///
/// https://github.com/sigp/milhouse/issues/43
#[superstruct(
variants(Base, Altair, Bellatrix, Capella, Deneb, Electra),
variant_attributes(
@@ -324,13 +331,10 @@ impl From<BeaconStateHash> for Hash256 {
partial_getter_error(ty = "Error", expr = "Error::IncorrectStateVariant"),
map_ref_mut_into(BeaconStateRef)
)]
#[derive(
Debug, PartialEq, Clone, Serialize, Deserialize, Encode, TreeHash, arbitrary::Arbitrary,
)]
#[derive(Debug, PartialEq, Clone, Serialize, Deserialize, Encode, arbitrary::Arbitrary)]
#[serde(untagged)]
#[serde(bound = "E: EthSpec")]
#[arbitrary(bound = "E: EthSpec")]
#[tree_hash(enum_behaviour = "transparent")]
#[ssz(enum_behaviour = "transparent")]
pub struct BeaconState<E>
where
@@ -652,10 +656,8 @@ impl<E: EthSpec> BeaconState<E> {
}
/// Returns the `tree_hash_root` of the state.
///
/// Spec v0.12.1
pub fn canonical_root(&self) -> Hash256 {
Hash256::from_slice(&self.tree_hash_root()[..])
pub fn canonical_root(&mut self) -> Result<Hash256, Error> {
self.update_tree_hash_cache()
}
pub fn historical_batch(&mut self) -> Result<HistoricalBatch<E>, Error> {
@@ -2016,9 +2018,13 @@ impl<E: EthSpec> BeaconState<E> {
/// Compute the tree hash root of the state using the tree hash cache.
///
/// Initialize the tree hash cache if it isn't already initialized.
pub fn update_tree_hash_cache(&mut self) -> Result<Hash256, Error> {
pub fn update_tree_hash_cache<'a>(&'a mut self) -> Result<Hash256, Error> {
self.apply_pending_mutations()?;
Ok(self.tree_hash_root())
map_beacon_state_ref!(&'a _, self.to_ref(), |inner, cons| {
let root = inner.tree_hash_root();
cons(inner);
Ok(root)
})
}
/// Compute the tree hash root of the validators using the tree hash cache.

2
consensus/types/src/light_client_update.rs
View File

@@ -168,7 +168,7 @@ impl<E: EthSpec> LightClientUpdate<E> {
let signature_period = block.epoch().sync_committee_period(chain_spec)?;
// Compute and validate attested header.
let mut attested_header = attested_state.latest_block_header().clone();
attested_header.state_root = attested_state.tree_hash_root();
attested_header.state_root = attested_state.update_tree_hash_cache()?;
let attested_period = attested_header
.slot
.epoch(E::slots_per_epoch())