Proposer head v5 #12075
Merged
Proposer head v5 #12075
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
potuz
added
Blocked
terencechain
reviewed
Mar 3, 2023
| "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" | ||
| ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" | ||
| "github.com/prysmaticlabs/prysm/v3/time/slots" | ||
| "github.com/sirupsen/logrus" | ||
| "go.opencensus.io/trace" | ||
| ) | ||
|
|
||
| // reorgLateBlockCountAttestations is the time until the end of the slot in which we count | ||
| // attestations to see if we will reorg the incoming block | ||
| const reorgLateBlockCountAttestations = 2 * time.Second |
There was a problem hiding this comment.
The naming is a little weird, I also prefer 2 more than 10 than having 12-2...
| log.WithError(err).Error("Could not process attestations and update head") | ||
| } | ||
| // process attestations and update head in forkchoice | ||
| vs.ForkFetcher.ForkChoicer().Lock() |
There was a problem hiding this comment.
Wow. we missed the lock before?
There was a problem hiding this comment.
Yep, I always had it but the locking mechanism moved from within UpdateHead to here
| @@ -182,6 +183,11 @@ func ConfigureBeaconChain(ctx *cli.Context) error { | |||
| logDisabled(disablePeerScorer) | |||
| cfg.EnablePeerScorer = false | |||
| } | |||
| cfg.DisableReorgLateBlocks = true | |||
There was a problem hiding this comment.
Optional, I wish we have EnableReorgLateBlocks instead of DisableReorgLateBlocks. The flag is enable-reorg-late-blocks and it makes everything a bit easier to read
There was a problem hiding this comment.
I want to make this default later, so the permanent config will be Disable, that's why I internally made this so that the changes are minimal when we flip the flag
terencechain
approved these changes
Mar 4, 2023
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.
This PR adds reorg logic when proposing a block via
GetBeaconBlock. It fixes a bug that is introduced in #12034 in which this PR is based.