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

Optimisations and bug fixes for state advance

Browse Source 
This commit is reasonably performant on Prater!
This commit is contained in:
Michael Sproul
2022-02-17 14:00:57 +11:00
parent f5dae9106e
commit 1db0e32bfb
13 changed files with 171 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1462,6 +1462,15 @@ fn load_parent<T: BeaconChainTypes>(
BeaconChainError::DBInconsistent(format!("Missing state {:?}", parent_state_root))
})?;
if block.slot() != state.slot() {
slog::warn!(
chain.log,
"Parent state is not advanced";
"block_slot" => block.slot(),
"state_slot" => state.slot(),
);
}
let beacon_state_root = if parent_state_root == advanced_state_root {
Some(parent_state_root)
} else {

12
beacon_node/beacon_chain/src/state_advance_timer.rs
View File

@@ -49,8 +49,8 @@ enum Error {
block_root: Hash256,
},
BadStateSlot {
state_slot: Slot,
current_slot: Slot,
_state_slot: Slot,
_current_slot: Slot,
},
}
@@ -215,18 +215,18 @@ fn advance_head<T: BeaconChainTypes>(
.get_advanced_state(head_block_root, current_slot, head_info.state_root)?
.ok_or(Error::HeadMissingFromSnapshotCache(head_block_root))?;
if state.slot() == current_slot {
if state.slot() == current_slot + 1 {
return Err(Error::StateAlreadyAdvanced {
block_root: head_block_root,
});
} else if state.slot() + 1 != current_slot {
} else if state.slot() != current_slot {
// Protect against advancing a state more than a single slot.
//
// Advancing more than one slot without storing the intermediate state would corrupt the
// database. Future works might store temporary, intermediate states inside this function.
return Err(Error::BadStateSlot {
state_slot: state.slot(),
current_slot: current_slot,
_state_slot: state.slot(),
_current_slot: current_slot,
});
}