Skip to content

Commit c70b0a9

Browse files
beacon/engine/types: remove PayloadV4 (ethereum#30415)
h/t @MariusVanDerWijden for finding and fixing this on devnet 3. I made the mistake of thinking `PayloadVersion` was correlated with the `GetPayloadVX` method, but it actually tracks which version of `PayloadAttributes` were passed to `forkchoiceUpdated`. So far, Prague does not necessitate a new version of fcu, so there is no need for `PayloadV4`. Co-authored-by: Marius van der Wijden <[email protected]>
1 parent d718312 commit c70b0a9

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

beacon/engine/types.go

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ var (
3636
PayloadV1 PayloadVersion = 0x1
3737
PayloadV2 PayloadVersion = 0x2
3838
PayloadV3 PayloadVersion = 0x3
39-
PayloadV4 PayloadVersion = 0x4
4039
)
4140

4241
//go:generate go run github.com/fjl/gencodec -type PayloadAttributes -field-override payloadAttributesMarshaling -out gen_blockparams.go

eth/catalyst/api.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ func (api *ConsensusAPI) GetPayloadV3(payloadID engine.PayloadID) (*engine.Execu
449449

450450
// GetPayloadV4 returns a cached payload by id.
451451
func (api *ConsensusAPI) GetPayloadV4(payloadID engine.PayloadID) (*engine.ExecutionPayloadEnvelope, error) {
452-
if !payloadID.Is(engine.PayloadV4) {
452+
if !payloadID.Is(engine.PayloadV3) {
453453
return nil, engine.UnsupportedFork
454454
}
455455
return api.getPayload(payloadID, false)

0 commit comments

Comments
 (0)