From 0ac4a84a1fdb9e54d27d0814179856a90e0c989f Mon Sep 17 00:00:00 2001
From: rjl493456442 <garyrong0905@gmail.com>
Date: Tue, 29 Apr 2025 19:21:18 +0800
Subject: [PATCH] beacon/engine: omit empty witness in payload response
 (#31739)

Fixes https://github.com/ethereum/go-ethereum/issues/31737
---
 beacon/engine/types.go | 2 +-
 eth/catalyst/api.go    | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/beacon/engine/types.go b/beacon/engine/types.go
index 984090ef89..3e52933a90 100644
--- 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
index e6f29c970b..1e6981a76a 100644
--- 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 {