Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Circuit breaker: lower max builder epoch missed slots to 5 #12076

Merged
merged 6 commits into from Mar 5, 2023
Merged

Circuit breaker: lower max builder epoch missed slots to 5 #12076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2824a9e
Circuit breaker: lower max builder epoch missed slots to 5
terencechain Mar 3, 2023
afee6e7
Merge branch 'develop' of github.com:prysmaticlabs/prysm into lower-m…
terencechain Mar 4, 2023
e32a098
Change equality to >=
terencechain Mar 4, 2023
7fb0a8c
Merge refs/heads/develop into lower-max-miss-slots-epoch
prylabs-bulldozer[bot] Mar 4, 2023
c28aaaa
Fix tests
terencechain Mar 5, 2023
a8e8fb8
Merge branch 'lower-max-miss-slots-epoch' of github.com:prysmaticlabs…
terencechain Mar 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions beacon-chain/rpc/prysm/v1alpha1/validator/proposer_builder.go
View file
Open in desktop
Expand Up @@ -56,7 +56,7 @@ func (vs *Server) circuitBreakBuilder(s primitives.Slot) (bool, error) {
return true, err
}

if diff > maxConsecutiveSkipSlotsAllowed {
if diff >= maxConsecutiveSkipSlotsAllowed {
log.WithFields(logrus.Fields{
"currentSlot": s,
"highestReceivedSlot": highestReceivedSlot,
Expand All @@ -80,7 +80,7 @@ func (vs *Server) circuitBreakBuilder(s primitives.Slot) (bool, error) {
if err != nil {
return true, err
}
if diff > maxEpochSkipSlotsAllowed {
if diff >= maxEpochSkipSlotsAllowed {
log.WithFields(logrus.Fields{
"totalMissed": diff,
"maxEpochSkipSlotsAllowed": maxEpochSkipSlotsAllowed,
Expand Down
4 changes: 2 additions & 2 deletions beacon-chain/rpc/prysm/v1alpha1/validator/proposer_builder_test.go
View file
Open in desktop
Expand Up @@ -42,7 +42,7 @@ func TestServer_circuitBreakBuilder(t *testing.T) {
st, blkRoot, err := createState(1, [32]byte{'a'}, [32]byte{}, params.BeaconConfig().ZeroHash, ojc, ofc)
require.NoError(t, err)
require.NoError(t, s.ForkFetcher.ForkChoicer().InsertNode(ctx, st, blkRoot))
b, err = s.circuitBreakBuilder(params.BeaconConfig().MaxBuilderConsecutiveMissedSlots + 1)
b, err = s.circuitBreakBuilder(params.BeaconConfig().MaxBuilderConsecutiveMissedSlots)
require.NoError(t, err)
require.Equal(t, false, b)

Expand Down Expand Up @@ -119,7 +119,7 @@ func TestServer_canUseBuilder(t *testing.T) {
require.NoError(t, proposerServer.BeaconDB.SaveRegistrationsByValidatorIDs(ctx, []primitives.ValidatorIndex{0},
[]*ethpb.ValidatorRegistrationV1{{FeeRecipient: f, Pubkey: p}}))

reg, err = proposerServer.canUseBuilder(ctx, params.BeaconConfig().MaxBuilderConsecutiveMissedSlots, 0)
reg, err = proposerServer.canUseBuilder(ctx, params.BeaconConfig().MaxBuilderConsecutiveMissedSlots-1, 0)
require.NoError(t, err)
require.Equal(t, true, reg)
}
Expand Down
2 changes: 1 addition & 1 deletion config/params/mainnet_config.go
View file
Open in desktop
Expand Up @@ -257,7 +257,7 @@ var mainnetBeaconConfig = &BeaconChainConfig{

// Mevboost circuit breaker
MaxBuilderConsecutiveMissedSlots: 3,
MaxBuilderEpochMissedSlots: 8,
MaxBuilderEpochMissedSlots: 5,

// Execution engine timeout value
ExecutionEngineTimeoutValue: 8, // 8 seconds default based on: https://github.com/ethereum/execution-apis/blob/main/src/engine/specification.md#core
Expand Down