fix: move and fix execution engine state update checks for online state

ChainSafe · Aug 8, 2023 · 15c041b · 15c041b
1 parent df2f4d3
commit 15c041b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/packages/beacon-node/src/execution/engine/http.ts b/packages/beacon-node/src/execution/engine/http.ts
@@ -421,6 +421,14 @@ export class ExecutionEngineHttp implements IExecutionEngine {
 
     if (oldState === newState) return;
 
+    // The ONLINE is initial state and can reached from offline or auth failed error
+    if (
+      newState === ExecutionEngineState.ONLINE &&
+      !(oldState === ExecutionEngineState.OFFLINE || oldState === ExecutionEngineState.AUTH_FAILED)
+    ) {
+      return;
+    }
+
     switch (newState) {
       case ExecutionEngineState.ONLINE:
         this.logger.info("Execution client became online", {oldState, newState});

diff --git a/packages/beacon-node/src/execution/engine/utils.ts b/packages/beacon-node/src/execution/engine/utils.ts
@@ -94,15 +94,5 @@ export function getExecutionEngineState<S extends ExecutionPayloadStatus | undef
       ? getExecutionEngineStateForPayloadError(payloadError, oldState)
       : getExecutionEngineStateForPayloadStatus(payloadStatus);
 
-  if (newState === oldState) return oldState;
-
-  // The ONLINE is initial state and can reached from offline or auth failed error
-  if (
-    newState === ExecutionEngineState.ONLINE &&
-    !(oldState === ExecutionEngineState.OFFLINE || oldState === ExecutionEngineState.AUTH_FAILED)
-  ) {
-    return oldState;
-  }
-
   return newState;
 }