eth/catalyst: return null if no payload created

Author: MariusVanDerWijden

eth/catalyst/api.go

@@ -216,7 +216,8 @@ func (api *ConsensusAPI) ForkchoiceUpdatedV1(heads ForkchoiceStateV1, PayloadAtt
 			api.preparedBlocks[id] = data
 			log.Info("Created payload", "payloadid", id)
 			// TODO (MariusVanDerWijden) do something with the payloadID?
-			return ForkChoiceResponse{Status: SUCCESS.Status, PayloadID: hash}, nil
+			hex := hexutil.Bytes(hash)
+			return ForkChoiceResponse{Status: SUCCESS.Status, PayloadID: &hex}, nil
 		}
 	}
 	return ForkChoiceResponse{Status: SUCCESS.Status, PayloadID: nil}, nil

eth/catalyst/api_types.go

@@ -103,8 +103,8 @@ type ConsensusValidatedParams struct {
 }
 
 type ForkChoiceResponse struct {
-	Status    string        `json:"status"`
-	PayloadID hexutil.Bytes `json:"payloadId"`
+	Status    string         `json:"status"`
+	PayloadID *hexutil.Bytes `json:"payloadId"`
 }
 
 type ForkchoiceStateV1 struct {

miner/stress/beacon/main.go

@@ -153,7 +153,7 @@ func (n *ethNode) assembleBlock(parentHash common.Hash, parentTimestamp uint64)
 	if err != nil {
 		return nil, err
 	}
-	return n.api.GetPayloadV1(payload.PayloadID)
+	return n.api.GetPayloadV1(*payload.PayloadID)
 }
 
 func (n *ethNode) insertBlock(eb catalyst.ExecutableDataV1) error {