Align to consensus release v1.4.0-beta.2#12908
Closed
terencechain wants to merge 12 commits intodevelopfrom
Closed
Align to consensus release v1.4.0-beta.2#12908terencechain wants to merge 12 commits intodevelopfrom
terencechain wants to merge 12 commits intodevelopfrom
Conversation
terencechain
force-pushed
the
update-max-per-epoch-churn-limit
branch
from
2fd3e4e to
623156b
Compare
terencechain
commented
Sep 19, 2023
| ) | ||
|
|
||
| // churnLimit is normally 4 unless the validator set is extremely large. | ||
| var churnLimit = 4 |
Collaborator
Author
There was a problem hiding this comment.
I am removing this to use the default config
terencechain
added
the
>1-approves-required
terencechain
force-pushed
the
update-max-per-epoch-churn-limit
branch
from
caae3c7 to
9b4d116
Compare
james-prysm
reviewed
Sep 20, 2023
| // Subnet value | ||
| BlobsidecarSubnetCount: 6, | ||
|
|
||
| MaxPerEpochActivationChurnLimit: 8, |
Contributor
There was a problem hiding this comment.
do we not need the min here too?
Collaborator
Author
There was a problem hiding this comment.
there's no change here
james-prysm
reviewed
Sep 20, 2023
| e2eConfig.DenebForkVersion = []byte{4, 0, 0, 254} | ||
|
|
||
| // Deneb changes. | ||
| e2eConfig.MinPerEpochChurnLimit = 2 |
Contributor
There was a problem hiding this comment.
do we not need max here?
Collaborator
Author
There was a problem hiding this comment.
It should just use the default which is 8
james-prysm
reviewed
Sep 20, 2023
| limit = churnLimit | ||
| } | ||
| // Cap churn limit to max per epoch churn limit. New in EIP7514. | ||
| if limit > params.BeaconConfig().MaxPerEpochActivationChurnLimit { |
Contributor
There was a problem hiding this comment.
where is the minimum set for this
Collaborator
Author
There was a problem hiding this comment.
Minimal is used in other places. It's not part of the change besides the value
terencechain
force-pushed
the
update-max-per-epoch-churn-limit
branch
from
430daff to
af124df
Compare
rauljordan
reviewed
Sep 21, 2023
|
|
||
| if deposits != churnLimit { | ||
| return fmt.Errorf("expected %d deposits to be processed in epoch %d, received %d", churnLimit, epoch, deposits) | ||
| if deposits != int(params.BeaconConfig().MinPerEpochChurnLimit) { |
Contributor
There was a problem hiding this comment.
prefer to cast deposits to uint
terencechain
force-pushed
the
update-max-per-epoch-churn-limit
branch
from
ee84348 to
9948ed4
Compare
rauljordan
previously approved these changes
Sep 21, 2023
nisdas
reviewed
Sep 22, 2023
| limit = churnLimit | ||
| } | ||
|
|
||
| if slots.ToEpoch(state.Slot()) >= params.BeaconConfig().DenebForkEpoch { |
Contributor
There was a problem hiding this comment.
wouldn't the state version be better here ? we would only apply this update on deneb states
terencechain
force-pushed
the
update-max-per-epoch-churn-limit
branch
from
ddd1397 to
341a1ac
Compare
terencechain
force-pushed
the
update-max-per-epoch-churn-limit
branch
2 times, most recently
from
63553bf to
41366d8
Compare
terencechain
force-pushed
the
update-max-per-epoch-churn-limit
branch
from
41366d8 to
a87113d
Compare
terencechain
changed the title
v1.4.0-beta.2
terencechain
changed the title
v1.4.0-beta.2
Collaborator
Author
|
superseded by #12959 |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
Todos: