beacon/engine/types: remove PayloadV4

lightclient · MariusVanDerWijden · lightclient · commit effcd38a6e90 · 2024-09-09T07:55:23.000-06:00
Co-authored-by: Marius van der Wijden &lt;m.vanderwijden@live.de&gt;
Co-authored-by: lightclient &lt;lightclient@protonmail.com&gt;
diff --git a/beacon/engine/types.go b/beacon/engine/types.go
@@ -36,7 +36,6 @@ var (
 	PayloadV1 PayloadVersion = 0x1
 	PayloadV2 PayloadVersion = 0x2
 	PayloadV3 PayloadVersion = 0x3
-	PayloadV4 PayloadVersion = 0x4
 )
 
 //go:generate go run github.com/fjl/gencodec -type PayloadAttributes -field-override payloadAttributesMarshaling -out gen_blockparams.go
diff --git a/eth/catalyst/api.go b/eth/catalyst/api.go
@@ -449,7 +449,7 @@ func (api *ConsensusAPI) GetPayloadV3(payloadID engine.PayloadID) (*engine.Execu
 
 // GetPayloadV4 returns a cached payload by id.
 func (api *ConsensusAPI) GetPayloadV4(payloadID engine.PayloadID) (*engine.ExecutionPayloadEnvelope, error) {
-	if !payloadID.Is(engine.PayloadV4) {
+	if !payloadID.Is(engine.PayloadV3) {
 		return nil, engine.UnsupportedFork
 	}
 	return api.getPayload(payloadID, false)

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,6 @@ var (`
`36`	`36`	`PayloadV1 PayloadVersion = 0x1`
`37`	`37`	`PayloadV2 PayloadVersion = 0x2`
`38`	`38`	`PayloadV3 PayloadVersion = 0x3`
`39`		`- PayloadV4 PayloadVersion = 0x4`
`40`	`39`	`)`
`41`	`40`
`42`	`41`	`//go:generate go run github.com/fjl/gencodec -type PayloadAttributes -field-override payloadAttributesMarshaling -out gen_blockparams.go`
Original file line number	Diff line number	Diff line change
`@@ -449,7 +449,7 @@ func (api ConsensusAPI) GetPayloadV3(payloadID engine.PayloadID) (engine.Execu`
`449`	`449`
`450`	`450`	`// GetPayloadV4 returns a cached payload by id.`
`451`	`451`	`func (api ConsensusAPI) GetPayloadV4(payloadID engine.PayloadID) (engine.ExecutionPayloadEnvelope, error) {`
`452`		`- if !payloadID.Is(engine.PayloadV4) {`
	`452`	`+ if !payloadID.Is(engine.PayloadV3) {`
`453`	`453`	`return nil, engine.UnsupportedFork`
`454`	`454`	`}`
`455`	`455`	`return api.getPayload(payloadID, false)`