@@ -215,12 +215,9 @@ func (s *EngineServer) newPayload(ctx context.Context, req *engine_types.Executi
215
215
return nil , err
216
216
}
217
217
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 })
224
221
}
225
222
rh := requests .Hash ()
226
223
header .RequestsHash = rh
@@ -499,16 +496,9 @@ func (s *EngineServer) getPayload(ctx context.Context, payloadId uint64, version
499
496
data := resp .Data
500
497
var executionRequests []hexutility.Bytes
501
498
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 )
512
502
}
513
503
}
514
504
0 commit comments