beacon/engine: marshall withdrawals even if nil

Author: MariusVanDerWijden

beacon/engine/types.go

@@ -233,5 +233,5 @@ func BlockToExecutableData(block *types.Block, fees *big.Int) *ExecutionPayloadE
 // ExecutionPayloadBodyV1 is used in the response to GetPayloadBodiesByHashV1 and GetPayloadBodiesByRangeV1
 type ExecutionPayloadBodyV1 struct {
 	TransactionData []hexutil.Bytes     `json:"transactions"`
-	Withdrawals     []*types.Withdrawal `json:"withdrawals,omitempty"`
+	Withdrawals     []*types.Withdrawal `json:"withdrawals"`
 }

eth/catalyst/api.go

@@ -825,7 +825,7 @@ func getBody(block *types.Block) *engine.ExecutionPayloadBodyV1 {
 	var (
 		body        = block.Body()
 		txs         = make([]hexutil.Bytes, len(body.Transactions))
-		withdrawals = make([]*types.Withdrawal, 0)
+		withdrawals = body.Withdrawals
 	)
 
 	for j, tx := range body.Transactions {
@@ -834,8 +834,8 @@ func getBody(block *types.Block) *engine.ExecutionPayloadBodyV1 {
 	}
 
 	// Post-shanghai withdrawals MUST be set to empty slice instead of nil
-	if body.Withdrawals != nil {
-		withdrawals = body.Withdrawals
+	if withdrawals == nil && block.Header().WithdrawalsHash != nil {
+		withdrawals = make([]*types.Withdrawal, 0)
 	}
 
 	return &engine.ExecutionPayloadBodyV1{