v0.22 fixes (#410)

* save validation error * builder demotion: fix nil pointer when error is reqErr (#409) --------- Co-authored-by: Niclas Blomberg <[email protected]>
flashbots · May 17, 2023 · 837774d · 837774d
1 parent d2df40a
commit 837774d
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/services/api/service.go b/services/api/service.go
@@ -603,8 +603,15 @@ func (api *RelayAPI) processOptimisticBlock(opts blockSimOptions) {
 		opts.builder.status.IsOptimistic = false
 		api.log.WithError(simErr).Warn("block simulation failed in processOptimisticBlock, demoting builder")
 
+		var demotionErr error
+		if reqErr != nil {
+			demotionErr = reqErr
+		} else {
+			demotionErr = simErr
+		}
+
 		// Demote the builder.
-		api.demoteBuilder(builderPubkey, &opts.req.BuilderSubmitBlockRequest, simErr)
+		api.demoteBuilder(builderPubkey, &opts.req.BuilderSubmitBlockRequest, demotionErr)
 	}
 }
 
@@ -1811,23 +1818,23 @@ func (api *RelayAPI) handleSubmitNewBlock(w http.ResponseWriter, req *http.Reque
 		go api.processOptimisticBlock(opts)
 	} else {
 		// Simulate block (synchronously)
-		reqErr, simErr := api.simulateBlock(req.Context(), opts) // success/error logging happens inside
+		requestErr, validationErr = api.simulateBlock(req.Context(), opts) // success/error logging happens inside
 		validationDurationMs := time.Since(timeBeforeValidation).Milliseconds()
 		log = log.WithFields(logrus.Fields{
 			"timestampAfterValidation": time.Now().UTC().UnixMilli(),
 			"validationDurationMs":     validationDurationMs,
 		})
-		if reqErr != nil { // Request error
-			if os.IsTimeout(reqErr) {
+		if requestErr != nil { // Request error
+			if os.IsTimeout(requestErr) {
 				api.RespondError(w, http.StatusGatewayTimeout, "validation request timeout")
 			} else {
-				api.RespondError(w, http.StatusBadRequest, reqErr.Error())
+				api.RespondError(w, http.StatusBadRequest, requestErr.Error())
 			}
 			return
 		} else {
 			wasSimulated = true
-			if simErr != nil {
-				api.RespondError(w, http.StatusBadRequest, simErr.Error())
+			if validationErr != nil {
+				api.RespondError(w, http.StatusBadRequest, validationErr.Error())
 				return
 			}
 		}