Fix REST handlers.

Author: cheatfate

beacon_chain/rpc/rest_node_api.nim

@@ -260,14 +260,17 @@ proc installNodeApiHandlers*(router: var RestRouter, node: BeaconNode) =
   # https://ethereum.github.io/beacon-APIs/#/Node/getSyncingStatus
   router.api2(MethodGet, "/eth/v1/node/syncing") do () -> RestApiResponse:
     let
-      wallSlot = node.currentSlot
       headSlot = node.dag.head.slot
-      distance = wallSlot - headSlot
+      distance =
+        if isNil(node.syncOverseer):
+          0'u64
+        else:
+          node.syncOverseer.syncDistance()
       isSyncing =
-        if isNil(node.syncManager):
+        if isNil(node.syncOverseer):
           false
         else:
-          node.syncManager.inProgress
+          node.syncOverseer.syncInProgress()
       isOptimistic =
         if node.currentSlot().epoch() >= node.dag.cfg.BELLATRIX_FORK_EPOCH:
           Opt.some(not node.dag.head.executionValid)
@@ -290,9 +293,13 @@ proc installNodeApiHandlers*(router: var RestRouter, node: BeaconNode) =
   router.api2(MethodGet, "/eth/v1/node/health") do () -> RestApiResponse:
     # TODO: Add ability to detect node's issues and return 503 error according
     # to specification.
+    if isNil(node.syncOverseer):
+      return RestApiResponse.response(Http200)
+
     let status =
-      if node.syncManager.inProgress:
+      if node.syncOverseer.syncInProgress():
         Http206
       else:
         Http200
+
     RestApiResponse.response(status)

beacon_chain/sync/sync_overseer2.nim

@@ -2693,12 +2693,26 @@ proc stop*(overseer: SyncOverseerRef2) {.async: (raises: []).} =
   if not(overseer.loopFuture.finished()):
     await cancelAndWait(overseer.loopFuture)
 
-proc syncInProgress*(overseer: SyncOverseerRef2): bool =
+proc syncDistance*(overseer: SyncOverseerRef2): uint64 =
   let
-    dag = overseer.consensusManager.dag
     wallSlot = overseer.beaconClock.currentSlot()
-    headSlot = dag.head.slot
-  (wallSlot - headSlot) > 1'u64
+    dag = overseer.consensusManager.dag
+    syncedSlot =
+      if overseer.lastSeenHead.isNone():
+        wallSlot
+      else:
+        overseer.lastSeenHead.get.slot
+
+  if syncedSlot < dag.head.slot:
+    return 0'u64
+
+  if (syncedSlot - dag.head.slot) < SyncDeviationSlotsCount:
+    0'u64
+  else:
+    syncedSlot - dag.head.slot
+
+proc syncInProgress*(overseer: SyncOverseerRef2): bool =
+  overseer.syncDistance() > 0
 
 proc syncStatusMessage*(
     overseer: SyncOverseerRef2,