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

Fix issues with per_epoch block_root calls

Browse Source 
They were being called with the wrong slot.
This commit is contained in:
Paul Hauner 2019-01-31 18:28:54 +11:00
parent 5c44f97fba
commit 3f13c25c05
No known key found for this signature in database
GPG Key ID: D362883A9218FCC6
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
beacon_node/beacon_chain/src/attestation_production.rs
View File

@ -30,8 +30,9 @@ where
.ok_or_else(|| Error::SlotTooOld)?; .ok_or_else(|| Error::SlotTooOld)?;
let head_slot = self.head().beacon_block.slot; let head_slot = self.head().beacon_block.slot;
let previous_epoch_start_slot = head_slot - (head_slot % self.spec.epoch_length);
let epoch_boundary_root = *state let epoch_boundary_root = *state
.get_block_root(head_slot % self.spec.epoch_length, &self.spec) .get_block_root(previous_epoch_start_slot, &self.spec)
.ok_or_else(|| Error::SlotTooOld)?; .ok_or_else(|| Error::SlotTooOld)?;
Ok(AttestationData { Ok(AttestationData {

8
eth2/types/src/beacon_state/committees.rs
View File

@ -27,6 +27,14 @@ impl BeaconState {
self.current_epoch(spec).saturating_sub(1) self.current_epoch(spec).saturating_sub(1)
} }
pub fn current_epoch_start_slot(&self, spec: &ChainSpec) -> u64 {
self.current_epoch(spec) * spec.epoch_length
}
pub fn previous_epoch_start_slot(&self, spec: &ChainSpec) -> u64 {
self.previous_epoch(spec) * spec.epoch_length
}
/// Returns the number of committees per slot. /// Returns the number of committees per slot.
/// ///
/// Note: this is _not_ the committee size. /// Note: this is _not_ the committee size.

10
eth2/types/src/beacon_state/epoch_processing.rs
View File

@ -71,8 +71,7 @@ impl BeaconState {
current_epoch_attestations current_epoch_attestations
.iter() .iter()
.filter(|a| { .filter(|a| {
// TODO: ensure this saturating sub is correct. match self.get_block_root(self.current_epoch_start_slot(spec), spec) {
match self.get_block_root(self.slot.saturating_sub(spec.epoch_length), spec) {
Some(block_root) => { Some(block_root) => {
(a.data.epoch_boundary_root == *block_root) (a.data.epoch_boundary_root == *block_root)
&& (a.data.justified_slot == self.justified_slot) && (a.data.justified_slot == self.justified_slot)
@ -142,9 +141,7 @@ impl BeaconState {
previous_epoch_justified_attestations previous_epoch_justified_attestations
.iter() .iter()
.filter(|a| { .filter(|a| {
// TODO: ensure this saturating sub is correct. match self.get_block_root(self.previous_epoch_start_slot(spec), spec) {
match self.get_block_root(self.slot.saturating_sub(2 * spec.epoch_length), spec)
{
Some(block_root) => a.data.epoch_boundary_root == *block_root, Some(block_root) => a.data.epoch_boundary_root == *block_root,
// Protected by a check that latest_block_roots isn't empty. // Protected by a check that latest_block_roots isn't empty.
// //
@ -167,8 +164,7 @@ impl BeaconState {
previous_epoch_attestations previous_epoch_attestations
.iter() .iter()
.filter(|a| { .filter(|a| {
match self.get_block_root(self.slot.saturating_sub(2 * spec.epoch_length), spec) match self.get_block_root(a.data.slot, spec) {
{
Some(block_root) => a.data.beacon_block_root == *block_root, Some(block_root) => a.data.beacon_block_root == *block_root,
// Protected by a check that latest_block_roots isn't empty. // Protected by a check that latest_block_roots isn't empty.
// //