Skip to content

Commit aa0622e

Browse files
committed
Fix nil reqs
1 parent 4528e12 commit aa0622e

File tree

1 file changed

+6
-16
lines changed

1 file changed

+6
-16
lines changed

turbo/engineapi/engine_server.go

+6-16
Original file line numberDiff line numberDiff line change
@@ -215,12 +215,9 @@ func (s *EngineServer) newPayload(ctx context.Context, req *engine_types.Executi
215215
return nil, err
216216
}
217217
if version >= clparams.ElectraVersion {
218-
requests = make(types.FlatRequests, len(types.KnownRequestTypes))
219-
for i, r := range types.KnownRequestTypes {
220-
if len(executionRequests) == i {
221-
executionRequests = append(executionRequests, []byte{})
222-
}
223-
requests[i] = types.FlatRequest{Type: r, RequestData: executionRequests[i]}
218+
requests = make(types.FlatRequests, 0)
219+
for _, r := range executionRequests {
220+
requests = append(requests, types.FlatRequest{Type: r[0], RequestData: r})
224221
}
225222
rh := requests.Hash()
226223
header.RequestsHash = rh
@@ -499,16 +496,9 @@ func (s *EngineServer) getPayload(ctx context.Context, payloadId uint64, version
499496
data := resp.Data
500497
var executionRequests []hexutility.Bytes
501498
if version >= clparams.ElectraVersion {
502-
executionRequests = make([]hexutility.Bytes, len(types.KnownRequestTypes))
503-
if len(data.Requests.Requests) != 3 {
504-
s.logger.Warn("Error in getPayload - data.Requests.Requests len not 3")
505-
}
506-
for i := 0; i < len(types.KnownRequestTypes); i++ {
507-
if len(data.Requests.Requests) < i+1 || data.Requests.Requests[i] == nil {
508-
executionRequests[i] = make(hexutility.Bytes, 0)
509-
} else {
510-
executionRequests[i] = data.Requests.Requests[i]
511-
}
499+
executionRequests = make([]hexutility.Bytes, 0)
500+
for _, r := range data.Requests.Requests {
501+
executionRequests = append(executionRequests, r)
512502
}
513503
}
514504

0 commit comments

Comments
 (0)