refactored types

nimbus_unified/configs/nimbus_configs.nim

@@ -20,6 +20,7 @@ type NimbusConfig* = object
 type TaskParameters* = object
   name*: string
   configs*: string
+  beaconNodeConfigs*: BeaconNodeConf
     # TODO: replace this with the extracted configs from NimbusConfig needed by the worker
 
 ## Task shutdown flag

nimbus_unified/nimbus_unified.cfg

@@ -5,6 +5,8 @@
 #   * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
 # at your option. This file may not be copied, modified, or distributed except according to those terms.
 
+-d:"libp2p_pki_schemes=secp256k1"
+
 -d:"chronicles_sinks=textlines[dynamic],json[dynamic]"
 -d:"chronicles_runtime_filtering=on"
 -d:"chronicles_disable_thread_id"
@@ -12,3 +14,4 @@
 @if release:
   -d:"chronicles_line_numbers:0"
 @end
+

nimbus_unified/nimbus_unified.nim

@@ -9,7 +9,9 @@ import
   std/[atomics, os],
   chronicles,
   consensus/consensus_wrapper,
-  execution/execution_wrapper
+  execution/execution_wrapper,
+  beacon_chain/[conf, conf_common],
+  beacon_chain/[beacon_chain_db]
 
 ## Constants
 const cNimbusMaxTasks* = 5
@@ -69,7 +71,6 @@ proc joinTasks(tasks: var NimbusTasks) =
 ## Note that thread handler passed by argument needs to have the signature: proc foobar(NimbusParameters)
 proc addNewTask*(
     tasks: var NimbusTasks,
-    name: string,
     timeout: uint32,
     taskHandler: proc(config: TaskParameters) {.thread.},
     parameters: var TaskParameters,
@@ -79,10 +80,10 @@ proc addNewTask*(
   for i in 0 .. cNimbusMaxTasks - 1:
     if tasks.taskList[i].isNil:
       tasks.taskList[i] = NimbusTask.new
-      tasks.taskList[i].name = name
+      tasks.taskList[i].name = parameters.name
       tasks.taskList[i].timeoutMs = timeout
       currentIndex = i
-      parameters.name = name
+      parameters.name = parameters.name
       break
 
   if currentIndex < 0:
@@ -100,48 +101,61 @@ proc monitor*(tasksList: var NimbusTasks, config: NimbusConfig) =
 
     # -check an atomic (to be created when needed) if it s required to shutdown
     #   this will atomic flag solves:
-          # - non responding thread
+    # - non responding thread
-          # - thread that required shutdown
+    # - thread that required shutdown
 
     sleep(cNimbusTaskTimeoutMs)
 
 ## create running workers
-proc startTasks*(tasksList: var NimbusTasks, configs: NimbusConfig) =
+proc startTasks*(
-  # TODO: extract configs for each task from NimbusConfig
+    tasksList: var NimbusTasks, configs: NimbusConfig, beaconConfigs: var BeaconNodeConf
-  # or extract them somewhere else and passs them here
+) =
-  var
+  let
-    paramsExecution: TaskParameters =
-      TaskParameters(configs: "task configs extracted from NimbusConfig go here")
-    paramsConsensus: TaskParameters =
-      TaskParameters(configs: "task configs extracted from NimbusConfig go here")
 
-  tasksList.addNewTask(
+    # TODO: extract configs for each task from NimbusConfig
-    "Execution Layer", cNimbusTaskTimeoutMs, executionLayerHandler, paramsExecution
+    # or extract them somewhere else and passs them here
-  )
+    execName = "Execution Layer"
-  tasksList.addNewTask(
+    consName = "Consensus Layer"
-    "Consensus Layer", cNimbusTaskTimeoutMs, consensusLayerHandler, paramsConsensus
+  var
-  )
+    paramsExecution: TaskParameters = TaskParameters(
+      name: execName,
+      configs: "task configs extracted from NimbusConfig go here",
+      beaconNodeConfigs: beaconConfigs,
+    )
+    paramsConsensus: TaskParameters = TaskParameters(
+      name: execName,
+      configs: "task configs extracted from NimbusConfig go here",
+      beaconNodeConfigs: beaconConfigs,
+    )
+
+  tasksList.addNewTask(cNimbusTaskTimeoutMs, executionLayerHandler, paramsExecution)
+  tasksList.addNewTask(cNimbusTaskTimeoutMs, consensusLayerHandler, paramsConsensus)
 
 # ------
 
 when isMainModule:
   info "Starting Nimbus"
   ## TODO
-  ## - make banner and config
   ## - file limits
   ## - check if we have permissions to create data folder if needed
   ## - setup logging
-
+  ## - read configuration
-  # TODO - read configuration
+  ## - implement config reader for all components
-  # TODO - implement config reader for all components
   let nimbusConfigs = NimbusConfig()
   var tasksList: NimbusTasks = NimbusTasks.new
 
-  ## this code snippet requires a conf.nim file (eg: beacon_lc_bridge_conf.nim)
+  ##TODO: this is an adapted call os the vars required by makeBannerAndConfig
-  #   var config = makeBannerAndConfig("Nimbus client ", NimbusConfig)
+  ##these values need to be read from some config file
-  #   setupLogging(config.logLevel, config.logStdout, config.logFile)
+  const SPEC_VERSION = "1.5.0-alpha.8"
+  const copyrights = "status"
+  const nimBanner = "nimbus"
+  const clientId = "beacon node"
+  var beaconNodeConfig = makeBannerAndConfig(
+    clientId, copyrights, nimBanner, SPEC_VERSION, [], BeaconNodeConf
+  ).valueOr:
+    quit(0)
 
-  tasksList.startTasks(nimbusConfigs)
+  tasksList.startTasks(nimbusConfigs, beaconNodeConfig)
 
   ## Graceful shutdown by handling of Ctrl+C signal
   proc controlCHandler() {.noconv.} =
@@ -158,6 +172,7 @@ when isMainModule:
     tasksList.joinTasks()
     notice "Shutting down now"
     quit(0)
+
   setControlCHook(controlCHandler)
 
   #start monitoring