beacon/engine: omit empty witness in payload response (ethereum#31739)

rjl493456442 · web-flow · commit 0ac4a84a1fdb · 2025-04-29T13:21:18.000+02:00
Fixes ethereum#31737
diff --git a/beacon/engine/types.go b/beacon/engine/types.go
@@ -131,7 +131,7 @@ type executionPayloadEnvelopeMarshaling struct {
 
 type PayloadStatusV1 struct {
 	Status          string         `json:"status"`
-	Witness         *hexutil.Bytes `json:"witness"`
+	Witness         *hexutil.Bytes `json:"witness,omitempty"`
 	LatestValidHash *common.Hash   `json:"latestValidHash"`
 	ValidationError *string        `json:"validationError"`
 }
diff --git a/eth/catalyst/api.go b/eth/catalyst/api.go
@@ -373,8 +373,11 @@ func (api *ConsensusAPI) forkchoiceUpdated(update engine.ForkchoiceStateV1, payl
 	}
 	valid := func(id *engine.PayloadID) engine.ForkChoiceResponse {
 		return engine.ForkChoiceResponse{
-			PayloadStatus: engine.PayloadStatusV1{Status: engine.VALID, LatestValidHash: &update.HeadBlockHash},
-			PayloadID:     id,
+			PayloadStatus: engine.PayloadStatusV1{
+				Status:          engine.VALID,
+				LatestValidHash: &update.HeadBlockHash,
+			},
+			PayloadID: id,
 		}
 	}
 	if rawdb.ReadCanonicalHash(api.eth.ChainDb(), block.NumberU64()) != update.HeadBlockHash {

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ type executionPayloadEnvelopeMarshaling struct {`
`131`	`131`
`132`	`132`	`type PayloadStatusV1 struct {`
`133`	`133`	Status string `json:"status"`
`134`		- Witness *hexutil.Bytes `json:"witness"`
	`134`	+ Witness *hexutil.Bytes `json:"witness,omitempty"`
`135`	`135`	LatestValidHash *common.Hash `json:"latestValidHash"`
`136`	`136`	ValidationError *string `json:"validationError"`
`137`	`137`	`}`
Original file line number	Diff line number	Diff line change
`@@ -373,8 +373,11 @@ func (api *ConsensusAPI) forkchoiceUpdated(update engine.ForkchoiceStateV1, payl`
`373`	`373`	`}`
`374`	`374`	`valid := func(id *engine.PayloadID) engine.ForkChoiceResponse {`
`375`	`375`	`return engine.ForkChoiceResponse{`
`376`		`- PayloadStatus: engine.PayloadStatusV1{Status: engine.VALID, LatestValidHash: &update.HeadBlockHash},`
`377`		`- PayloadID: id,`
	`376`	`+ PayloadStatus: engine.PayloadStatusV1{`
	`377`	`+ Status: engine.VALID,`
	`378`	`+ LatestValidHash: &update.HeadBlockHash,`
	`379`	`+ },`
	`380`	`+ PayloadID: id,`
`378`	`381`	`}`
`379`	`382`	`}`
`380`	`383`	`if rawdb.ReadCanonicalHash(api.eth.ChainDb(), block.NumberU64()) != update.HeadBlockHash {`