[Merged by Bors] - Ensure doppelganger detects attestations in blocks #2495
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
paulhauner
added
work-in-progress
paulhauner
changed the title
realbigsean
reviewed
Aug 4, 2021
| @@ -2305,6 +2311,23 @@ impl<T: BeaconChainTypes> BeaconChain<T> { | |||
| Err(e) => Err(BlockError::BeaconChainError(e.into())), | |||
| }?; | |||
|
|
|||
| if attestation_target_epoch + OBSERVED_ATTESTERS_MAX_CAPACITY >= current_epoch { | |||
There was a problem hiding this comment.
I think OBSERVED_ATTESTERS_EPOCH_CAPACITY would be a little clearer, to distinguish this from the total number of attesters in the cache
There was a problem hiding this comment.
Also the cache's lowest_permissible_epoch (which it prunes based on) is based off of the target_epoch - (MAX_CAPACITY - 1) so this check might have too wide a range.
| { | ||
| debug!( | ||
| self.log, | ||
| "Failed register observed block attester"; |
There was a problem hiding this comment.
Suggested change
| "Failed register observed block attester"; | |
| "Failed to register observed block attester"; |
|
All comments addressed, thanks for the review @realbigsean. I'll wait for your approval before merging this one :) |
paulhauner
added
ready-for-review
paulhauner
added a commit
that referenced
this pull request
Aug 6, 2021
commit db48997 Author: Paul Hauner <[email protected]> Date: Wed Aug 4 14:21:39 2021 +1000 Add observed_block_attesters commit a8da027 Author: Paul Hauner <[email protected]> Date: Wed Aug 4 14:03:49 2021 +1000 Rename observed_attesters to observed_gossip_attesters
|
bors r+ |
bors bot
pushed a commit
that referenced
this pull request
Aug 9, 2021
## Issue Addressed NA ## Proposed Changes When testing our (not-yet-released) Doppelganger implementation, I noticed that we aren't detecting attestations included in blocks (only those on the gossip network). This is because during [block processing](https://github.com/sigp/lighthouse/blob/e8c0d1f19b2736efb83c67a247e0022da5eaa7bb/beacon_node/beacon_chain/src/beacon_chain.rs#L2168) we only update the `observed_attestations` cache with each attestation, but not the `observed_attesters` cache. This is the correct behaviour when we consider the [p2p spec](https://github.com/ethereum/eth2.0-specs/blob/v1.0.1/specs/phase0/p2p-interface.md): > [IGNORE] There has been no other valid attestation seen on an attestation subnet that has an identical attestation.data.target.epoch and participating validator index. We're doing the right thing here and still allowing attestations on gossip that we've seen in a block. However, this doesn't work so nicely for Doppelganger. To resolve this, I've taken the following steps: - Add a `observed_block_attesters` cache. - Rename `observed_attesters` to `observed_gossip_attesters`. ## TODO - [x] Add a test to ensure a validator that's been seen in a block attestation (but not a gossip attestation) returns `true` for `BeaconChain::validator_seen_at_epoch`. - [x] Add a test to ensure `observed_block_attesters` isn't polluted via gossip attestations and vice versa. Co-authored-by: realbigsean <[email protected]>
paulhauner
added
ready-for-merge
|
Pull request successfully merged into unstable. Build succeeded: |
bors
bot
changed the title
pawanjay176
pushed a commit
to pawanjay176/lighthouse
that referenced
this pull request
Aug 27, 2021
## Issue Addressed NA ## Proposed Changes When testing our (not-yet-released) Doppelganger implementation, I noticed that we aren't detecting attestations included in blocks (only those on the gossip network). This is because during [block processing](https://github.com/sigp/lighthouse/blob/e8c0d1f19b2736efb83c67a247e0022da5eaa7bb/beacon_node/beacon_chain/src/beacon_chain.rs#L2168) we only update the `observed_attestations` cache with each attestation, but not the `observed_attesters` cache. This is the correct behaviour when we consider the [p2p spec](https://github.com/ethereum/eth2.0-specs/blob/v1.0.1/specs/phase0/p2p-interface.md): > [IGNORE] There has been no other valid attestation seen on an attestation subnet that has an identical attestation.data.target.epoch and participating validator index. We're doing the right thing here and still allowing attestations on gossip that we've seen in a block. However, this doesn't work so nicely for Doppelganger. To resolve this, I've taken the following steps: - Add a `observed_block_attesters` cache. - Rename `observed_attesters` to `observed_gossip_attesters`. ## TODO - [x] Add a test to ensure a validator that's been seen in a block attestation (but not a gossip attestation) returns `true` for `BeaconChain::validator_seen_at_epoch`. - [x] Add a test to ensure `observed_block_attesters` isn't polluted via gossip attestations and vice versa. Co-authored-by: realbigsean <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue Addressed
NA
Proposed Changes
When testing our (not-yet-released) Doppelganger implementation, I noticed that we aren't detecting attestations included in blocks (only those on the gossip network).
This is because during block processing we only update the
observed_attestationscache with each attestation, but not theobserved_attesterscache. This is the correct behaviour when we consider the p2p spec:We're doing the right thing here and still allowing attestations on gossip that we've seen in a block. However, this doesn't work so nicely for Doppelganger.
To resolve this, I've taken the following steps:
observed_block_attesterscache.observed_attesterstoobserved_gossip_attesters.TODO
trueforBeaconChain::validator_seen_at_epoch.observed_block_attestersisn't polluted via gossip attestations and vice versa.