From 9a8905c45248522fbfea927f52bfe008f9577069 Mon Sep 17 00:00:00 2001 From: Somnath Banerjee Date: Wed, 5 Feb 2025 16:25:42 +0400 Subject: [PATCH 1/2] Add ascending order check for reqs --- turbo/engineapi/engine_server.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/turbo/engineapi/engine_server.go b/turbo/engineapi/engine_server.go index 82e31a11238..8d161425c00 100644 --- a/turbo/engineapi/engine_server.go +++ b/turbo/engineapi/engine_server.go @@ -220,10 +220,12 @@ func (s *EngineServer) newPayload(ctx context.Context, req *engine_types.Executi } if version >= clparams.ElectraVersion { requests = make(types.FlatRequests, 0) + lastReqType := -1 for i, r := range executionRequests { - if len(r) <= 1 { + if len(r) <= 1 && lastReqType >= 0 && int(r[0]) <= lastReqType { return nil, &rpc.InvalidParamsError{Message: fmt.Sprintf("Invalid Request at index %d", i)} } + lastReqType = int(r[0]) requests = append(requests, types.FlatRequest{Type: r[0], RequestData: r[1:]}) } rh := requests.Hash() From f47e2a4423a566f680f445fe911274a20ad5af9f Mon Sep 17 00:00:00 2001 From: Somnath Banerjee Date: Wed, 5 Feb 2025 16:57:15 +0400 Subject: [PATCH 2/2] Fix condition --- turbo/engineapi/engine_server.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/turbo/engineapi/engine_server.go b/turbo/engineapi/engine_server.go index 8d161425c00..a10013b3dcf 100644 --- a/turbo/engineapi/engine_server.go +++ b/turbo/engineapi/engine_server.go @@ -222,7 +222,7 @@ func (s *EngineServer) newPayload(ctx context.Context, req *engine_types.Executi requests = make(types.FlatRequests, 0) lastReqType := -1 for i, r := range executionRequests { - if len(r) <= 1 && lastReqType >= 0 && int(r[0]) <= lastReqType { + if len(r) <= 1 || lastReqType >= 0 && int(r[0]) <= lastReqType { return nil, &rpc.InvalidParamsError{Message: fmt.Sprintf("Invalid Request at index %d", i)} } lastReqType = int(r[0])