-
Notifications
You must be signed in to change notification settings - Fork 1.1k
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.
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
Remove Fulu block and state. #14905
Remove Fulu block and state. #14905
Conversation
b037b20
to
7c00886
Compare
0b3075a
to
5c8bcee
Compare
1afc93c
to
f7774b4
Compare
f7774b4
to
a2d3db0
Compare
@@ -636,10 +556,10 @@ func ProtobufBeaconStateElectra(s interface{}) (*ethpb.BeaconStateElectra, error | |||
|
|||
// ProtobufBeaconStateFulu transforms an input into beacon state Fulu in the form of protobuf. | |||
// Error is returned if the input is not type protobuf beacon state. | |||
func ProtobufBeaconStateFulu(s interface{}) (*ethpb.BeaconStateFulu, error) { | |||
pbState, ok := s.(*ethpb.BeaconStateFulu) | |||
func ProtobufBeaconStateFulu(s interface{}) (*ethpb.BeaconStateElectra, error) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this function needed? Can't we alias ProtobufBeaconStateElectra
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed in 60ad5fa.
// Execution requests. | ||
ethereum.engine.v1.ExecutionRequests execution_requests = 13; | ||
} | ||
|
||
message SignedBlindedBeaconBlockFulu { | ||
// The unsigned blinded beacon block itself. | ||
BlindedBeaconBlockFulu message = 1; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I can't find the definition for some reason, but is BlindedBeaconBlockFulu
needed? You did remove the full block
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The definition of BlindedBeaconBlockFulu
is here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
- In
produceBlockV3
, to produce a non blinded block, we need to compare type against*eth.GenericBeaconBlock_Fulu
. *eth.GenericBeaconBlock_Fulu
is created here and is of typeBeaconBlockContentsFulu
(and not of typeBeaconBlockFulu
).
- In
produceBlockV3
, to produce a blinded block, we need to compare type against*eth.GenericBeaconBlock_BlindedFulu
. *eth.GenericBeaconBlock_BlindedFulu
is created here and is of typeBlindedBeaconBlockFulu
.
==> I need both BlindedBeaconBlockFulu
and BeaconBlockContentsFulu
, but I don't need BlindedBeaconBlockFulu
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We do all this to set version.String(version.Fulu))
on Fulu blocks.
(Even if the shape of the struct is exactly the same than Electra block.)
BlobKzgCommitments []string `json:"blob_kzg_commitments"` | ||
ExecutionRequests *ExecutionRequests `json:"execution_requests"` | ||
} | ||
|
||
type BlindedBeaconBlockFulu struct { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this needed? Se comment in proto/prysm/v1alpha1/beacon_block.proto
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
See #14905 (comment)
What type of PR is this?
Other
What does this PR do? Why is it needed?
Remove as much as Fulu proto definitions. (Including Fulu block and state.)
How I realized this PR:
blk.Version
returnedelectra
for a Fulu block.3.
(being able to differentiate versions), I had to re-add some Fulu structs, even if they are the same than the Electra ones. Only the minimal amount of structs have been added.Acknowledgements