hive: engine-cancun: fix issue erigontech#9407

racytech · Feb 9, 2024 · c96022b · c96022b
1 parent a19ae55
commit c96022b
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/turbo/engineapi/engine_server.go b/turbo/engineapi/engine_server.go
@@ -450,6 +450,11 @@ func (s *EngineServer) forkchoiceUpdated(ctx context.Context, forkchoiceState *e
 		}
 	}
 
+	// No need for payload building
+	if payloadAttributes == nil || status.Status != engine_types.ValidStatus {
+		return &engine_types.ForkChoiceUpdatedResponse{PayloadStatus: status}, nil
+	}
+
 	if payloadAttributes != nil {
 		if version < clparams.DenebVersion && payloadAttributes.ParentBeaconBlockRoot != nil {
 			return nil, &engine_helpers.InvalidPayloadAttributesErr // Unexpected Beacon Root
@@ -467,11 +472,6 @@ func (s *EngineServer) forkchoiceUpdated(ctx context.Context, forkchoiceState *e
 		}
 	}
 
-	// No need for payload building
-	if payloadAttributes == nil || status.Status != engine_types.ValidStatus {
-		return &engine_types.ForkChoiceUpdatedResponse{PayloadStatus: status}, nil
-	}
-
 	if !s.proposing {
 		return nil, fmt.Errorf("execution layer not running as a proposer. enable proposer by taking out the --proposer.disable flag on startup")
 	}