fix worker issue

Author: chirag-parmar

nimbus_verified_proxy/lc/lc_manager.nim

@@ -248,73 +248,48 @@ proc workerTask[E](
 proc query[E](
     self: LightClientManager, e: typedesc[E], key: E.K
 ): Future[bool] {.async: (raises: [CancelledError]).} =
-  const PARALLEL_REQUESTS = 2
-  var workers: array[PARALLEL_REQUESTS, Future[bool]]
+  const NUM_WORKERS = 2
+  var workers: array[NUM_WORKERS, Future[bool]]
 
   let
     progressFut = Future[void].Raising([CancelledError]).init("lcmanProgress")
-    doneFut = Future[void].Raising([CancelledError]).init("lcmanDone")
   var
     numCompleted = 0
+    success = false
     maxCompleted = workers.len
 
   proc handleFinishedWorker(future: pointer) =
     try:
       let didProgress = cast[Future[bool]](future).read()
       if didProgress and not progressFut.finished:
         progressFut.complete()
-    except CancelledError:
-      if not progressFut.finished:
-        progressFut.cancelSoon()
+        success = true
     except CatchableError:
       discard
     finally:
       inc numCompleted
       if numCompleted == maxCompleted:
-        doneFut.complete()
+        progressFut.cancelSoon()
 
-  try:
-    # Start concurrent workers
-    for i in 0 ..< workers.len:
-      try:
-        workers[i] = self.workerTask(e, key)
-        workers[i].addCallback(handleFinishedWorker)
-      except CancelledError as exc:
-        raise exc
-      except CatchableError:
-        workers[i] = newFuture[bool]()
-        workers[i].complete(false)
-
-    # Wait for any worker to report progress, or for all workers to finish
+  # Start concurrent workers
+  for i in 0 ..< workers.len:
     try:
-      discard await race(progressFut, doneFut)
-    except ValueError:
-      raiseAssert "race API invariant"
-  finally:
-    for i in 0 ..< maxCompleted:
-      if workers[i] == nil:
-        maxCompleted = i
-        if numCompleted == maxCompleted:
-          doneFut.complete()
-        break
-      if not workers[i].finished:
-        workers[i].cancelSoon()
-    while true:
-      try:
-        await allFutures(workers[0 ..< maxCompleted])
-        break
-      except CancelledError:
-        continue
-    while true:
-      try:
-        await doneFut
-        break
-      except CancelledError:
-        continue
+      workers[i] = self.workerTask(e, key)
+      workers[i].addCallback(handleFinishedWorker)
+    except CancelledError as exc:
+      raise exc
+    except CatchableError:
+      workers[i] = newFuture[bool]()
+      workers[i].complete(false)
+
+  # Wait for any worker to report progress, or for all workers to finish
+  waitFor progressFut
+
+  # cancel all workers
+  for i in 0 ..< NUM_WORKERS:
+    workers[i].cancelSoon()
 
-  if not progressFut.finished:
-    progressFut.cancelSoon()
-  return progressFut.completed
+  return success
 
 template query[E](
     self: LightClientManager, e: typedesc[E]
@@ -358,7 +333,8 @@ proc loop(self: LightClientManager) {.async: (raises: [CancelledError]).} =
       if not didProgress:
         debug "Re-attempting bootstrap download"
         await sleepAsync(chronos.seconds(2))
-        continue
+
+      continue
 
     # check and download sync committee updates
     if finalizedPeriod == optimisticPeriod and not self.isNextSyncCommitteeKnown():

nimbus_verified_proxy/libverifproxy/verifproxy.nim

@@ -41,7 +41,7 @@ proc runContext(ctx: ptr Context) {.thread.} =
       trustedBlockRoot: Eth2Digest.fromHex(jsonNode["TrustedBlockRoot"].getStr()),
       backendUrl: parseCmdArg(Web3Url, jsonNode["backendUrl"].getStr()),
       frontendUrl: parseCmdArg(Web3Url, jsonNode["frontendUrl"].getStr()),
-      lcEndpoint: jsonNode["lcEndpoint"].getStr(),
+      lcEndpoints: jsonNode["lcEndpoints"].getStr(),
       logLevel: jsonNode["LogLevel"].getStr(),
       logStdout: StdoutLogKind.Auto,
       dataDirFlag: none(OutDir),