From 767801ac69cbbc2c3f994af49062056966c0a59e Mon Sep 17 00:00:00 2001
From: Sina Mahmoodi <itz.s1na@gmail.com>
Date: Wed, 15 Jan 2025 16:32:27 +0100
Subject: [PATCH] fix error code

---
 beacon/engine/types.go | 12 ------------
 eth/catalyst/api.go    | 23 +++++++++++++++++++++++
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/beacon/engine/types.go b/beacon/engine/types.go
index 9fbe7aaa28..984090ef89 100644
--- a/beacon/engine/types.go
+++ b/beacon/engine/types.go
@@ -265,18 +265,6 @@ func ExecutableDataToBlockNoHash(data ExecutableData, versionedHashes []common.H
 
 	var requestsHash *common.Hash
 	if requests != nil {
-		var last byte
-		for _, req := range requests {
-			// No empty requests.
-			if len(req) < 2 {
-				return nil, fmt.Errorf("empty request: %v", req)
-			}
-			// Check that requests are ordered by their type.
-			if req[0] < last {
-				return nil, fmt.Errorf("invalid request order: %v", req)
-			}
-			last = req[0]
-		}
 		h := types.CalcRequestsHash(requests)
 		requestsHash = &h
 	}
diff --git a/eth/catalyst/api.go b/eth/catalyst/api.go
index 3e45ad9e4f..91b6511f71 100644
--- a/eth/catalyst/api.go
+++ b/eth/catalyst/api.go
@@ -638,6 +638,9 @@ func (api *ConsensusAPI) NewPayloadV4(params engine.ExecutableData, versionedHas
 		return engine.PayloadStatusV1{Status: engine.INVALID}, engine.UnsupportedFork.With(errors.New("newPayloadV4 must only be called for prague payloads"))
 	}
 	requests := convertRequests(executionRequests)
+	if err := validateRequests(requests); err != nil {
+		return engine.PayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(err)
+	}
 	return api.newPayload(params, versionedHashes, beaconRoot, requests, false)
 }
 
@@ -727,6 +730,9 @@ func (api *ConsensusAPI) NewPayloadWithWitnessV4(params engine.ExecutableData, v
 		return engine.PayloadStatusV1{Status: engine.INVALID}, engine.UnsupportedFork.With(errors.New("newPayloadWithWitnessV4 must only be called for prague payloads"))
 	}
 	requests := convertRequests(executionRequests)
+	if err := validateRequests(requests); err != nil {
+		return engine.PayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(err)
+	}
 	return api.newPayload(params, versionedHashes, beaconRoot, requests, true)
 }
 
@@ -1287,3 +1293,20 @@ func convertRequests(hex []hexutil.Bytes) [][]byte {
 	}
 	return req
 }
+
+// validateRequests checks that requests are ordered by their type and are not empty.
+func validateRequests(requests [][]byte) error {
+	var last byte
+	for _, req := range requests {
+		// No empty requests.
+		if len(req) < 2 {
+			return fmt.Errorf("empty request: %v", req)
+		}
+		// Check that requests are ordered by their type.
+		if req[0] < last {
+			return fmt.Errorf("invalid request order: %v", req)
+		}
+		last = req[0]
+	}
+	return nil
+}