cerc-io/lighthouse
16
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Fix off-by-one error in get_latest_restore_point (#787)

Browse Source 
* Fix off-by-one error in get_latest_restore_point

* Tighten SPRP checks for succinct hot DB change
This commit is contained in:
Michael Sproul 2020-01-09 21:05:56 +11:00 committed by GitHub
parent d9e9c17d3b
commit 95fc840e2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
beacon_node/store/src/hot_cold_store.rs
View File

@ -73,6 +73,7 @@ pub enum HotColdDBError {
InvalidSlotsPerRestorePoint {
slots_per_restore_point: u64,
slots_per_historical_root: u64,
slots_per_epoch: u64,
},
RestorePointBlockHashError(BeaconStateError),
}
@ -551,7 +552,7 @@ impl<E: EthSpec> HotColdDB<E> {
/// Fetch the slot of the most recently stored restore point.
pub fn get_latest_restore_point_slot(&self) -> Slot {
self.get_split_slot() / self.slots_per_restore_point * self.slots_per_restore_point
(self.get_split_slot() - 1) / self.slots_per_restore_point * self.slots_per_restore_point
}
/// Load the split point from disk.
@ -640,19 +641,32 @@ impl<E: EthSpec> HotColdDB<E> {
.map_err(Into::into)
}
/// Check that the restore point frequency is a divisor of the slots per historical root.
/// Check that the restore point frequency is valid.
///
/// This ensures that we have at least one restore point within range of our state
/// Specifically, check that it is:
/// (1) A divisor of the number of slots per historical root, and
/// (2) Divisible by the number of slots per epoch
///
///
/// (1) ensures that we have at least one restore point within range of our state
/// root history when iterating backwards (and allows for more frequent restore points if
/// desired).
///
/// (2) ensures that restore points align with hot state summaries, making it
/// quick to migrate hot to cold.
fn verify_slots_per_restore_point(slots_per_restore_point: u64) -> Result<(), HotColdDBError> {
let slots_per_historical_root = E::SlotsPerHistoricalRoot::to_u64();
if slots_per_restore_point > 0 && slots_per_historical_root % slots_per_restore_point == 0 {
let slots_per_epoch = E::slots_per_epoch();
if slots_per_restore_point > 0
&& slots_per_historical_root % slots_per_restore_point == 0
&& slots_per_restore_point % slots_per_epoch == 0
{
Ok(())
} else {
Err(HotColdDBError::InvalidSlotsPerRestorePoint {
slots_per_restore_point,
slots_per_historical_root,
slots_per_epoch,
})
}
}