Merge 59bbc3f into 4069b41

ChainSafe · Mar 27, 2024 · 9c0cede · 9c0cede
2 parents 4069b41 + 59bbc3f
commit 9c0cede
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/packages/beacon-node/src/api/impl/validator/index.ts b/packages/beacon-node/src/api/impl/validator/index.ts
@@ -591,10 +591,6 @@ export function getValidatorApi({
         throw Error("Builder and engine both failed to produce the block within timeout");
       }
 
-      if (builder.status === "rejected" && engine.status === "rejected") {
-        throw Error("Builder and engine both failed to produce the block");
-      }
-
       if (engine.status === "rejected" && isEngineEnabled) {
         logger.warn(
           "Engine failed to produce the block",
@@ -617,6 +613,12 @@ export function getValidatorApi({
         );
       }
 
+      if (builder.status === "rejected" && engine.status === "rejected") {
+        throw Error(
+          `${isBuilderEnabled && isEngineEnabled ? "Builder and engine both" : isBuilderEnabled ? "Builder" : "Engine"} failed to produce the block`
+        );
+      }
+
       // handle shouldOverrideBuilder separately
       if (engine.status === "fulfilled" && engine.value.shouldOverrideBuilder) {
         logger.info("Selected engine block: censorship suspected in builder blocks", {