engineapi: Fix req list check (#11191)

erigontech · Jul 17, 2024 · febcfc1 · febcfc1
1 parent ba07b2a
commit febcfc1
Showing 1 changed file with 15 additions and 9 deletions.
diff --git a/turbo/engineapi/engine_server.go b/turbo/engineapi/engine_server.go
@@ -140,12 +140,16 @@ func (s *EngineServer) checkWithdrawalsPresence(time uint64, withdrawals types.W
 	return nil
 }
 
-func (s *EngineServer) checkRequestsPresence(time uint64, requests types.Requests) error {
-	if !s.config.IsPrague(time) && requests != nil {
-		return &rpc.InvalidParamsError{Message: "requests before Prague"}
+func (s *EngineServer) checkRequestsPresence(time uint64, payload *engine_types.ExecutionPayload) error {
+	if !s.config.IsPrague(time) {
+		if payload.DepositRequests != nil || payload.WithdrawalRequests != nil || payload.ConsolidationRequests != nil {
+			return &rpc.InvalidParamsError{Message: "requests before Prague"}
+		}
 	}
-	if s.config.IsPrague(time) && requests == nil {
-		return &rpc.InvalidParamsError{Message: "missing requests list"}
+	if s.config.IsPrague(time) {
+		if payload.DepositRequests == nil || payload.WithdrawalRequests == nil || payload.ConsolidationRequests == nil {
+			return &rpc.InvalidParamsError{Message: "missing requests list"}
+		}
 	}
 	return nil
 }
@@ -202,14 +206,16 @@ func (s *EngineServer) newPayload(ctx context.Context, req *engine_types.Executi
 	}
 
 	var requests types.Requests
-	if version >= clparams.ElectraVersion && req.DepositRequests != nil {
+	if err := s.checkRequestsPresence(header.Time, req); err != nil {
+		return nil, err
+	}
+	if version >= clparams.ElectraVersion {
+		requests = make(types.Requests, 0)
 		requests = append(requests, req.DepositRequests.Requests()...)
 		requests = append(requests, req.WithdrawalRequests.Requests()...)
 		requests = append(requests, req.ConsolidationRequests.Requests()...)
 	}
-	if err := s.checkRequestsPresence(header.Time, requests); err != nil {
-		return nil, err
-	}
+
 	if requests != nil {
 		rh := types.DeriveSha(requests)
 		header.RequestsRoot = &rh