renamed references from unified to nimbus

Author: pmmiranda

Makefile

@@ -104,7 +104,6 @@ VERIF_PROXY_OUT_PATH ?= build/libverifproxy/
 	update \
 	nimbus \
 	nimbus_execution_client \
-	nimbus_unified \
 	fluffy \
 	nimbus_verified_proxy \
 	libverifproxy \
@@ -214,9 +213,6 @@ nimbus_execution_client: | build deps rocksdb
 	echo -e $(BUILD_MSG) "build/nimbus_execution_client" && \
 		$(ENV_SCRIPT) nim c $(NIM_PARAMS) -d:chronicles_log_level=TRACE -o:build/nimbus_execution_client "execution_chain/nimbus_execution_client.nim"
 
-nimbus: nimbus_execution_client
-	echo "The nimbus target is deprecated and will soon change meaning, use 'nimbus_execution_client' instead"
-
 # symlink
 nimbus.nims:
 	ln -s nimbus.nimble $@
@@ -364,23 +360,21 @@ libnimbusevm: | build deps
 
 # usual cleaning
 clean: | clean-common
-	rm -rf build/{nimbus_unified,nimbus,nimbus_execution_client,fluffy,libverifproxy,nimbus_verified_proxy,$(TOOLS_CSV),$(FLUFFY_TOOLS_CSV),all_tests,test_kvstore_rocksdb,test_rpc,all_fluffy_tests,all_history_network_custom_chain_tests,test_portal_testnet,utp_test_app,utp_test,nimbus_unified_test,*.dSYM}
+	rm -rf build/{nimbus,nimbus_execution_client,fluffy,libverifproxy,nimbus_verified_proxy,$(TOOLS_CSV),$(FLUFFY_TOOLS_CSV),all_tests,test_kvstore_rocksdb,test_rpc,all_fluffy_tests,all_history_network_custom_chain_tests,test_portal_testnet,utp_test_app,utp_test,*.dSYM}
 	rm -rf tools/t8n/{t8n,t8n_test}
 	rm -rf tools/evmstate/{evmstate,evmstate_test}
 ifneq ($(USE_LIBBACKTRACE), 0)
 	+ $(MAKE) -C vendor/nim-libbacktrace clean $(HANDLE_OUTPUT)
 endif
 
-# Nimbus unified related targets
-
-# builds the unified client
-nimbus_unified: | build deps
+# Nimbus
+nimbus: | build deps rocksdb
 	echo -e $(BUILD_MSG) "build/$@" && \
-		$(ENV_SCRIPT) nim c $(NIM_PARAMS) -d:release --parallelBuild:1 -d:libp2p_pki_schemes=secp256k1 -u:metrics -o:build/$@ "nimbus_unified/$@.nim"
+		$(ENV_SCRIPT) nim c $(NIM_PARAMS) -d:release --parallelBuild:1 -d:libp2p_pki_schemes=secp256k1 -u:metrics -o:build/nimbus "nimbus/nimbus.nim"
 
-all_tests_unified: | build deps
+all_tests_nimbus: | build deps
 	echo -e $(BUILD_MSG) "build/$@" && \
-	$(ENV_SCRIPT) nim c -r $(NIM_PARAMS) --threads:on -d:chronicles_log_level=ERROR -o:build/$@ "nimbus_unified/tests/$@.nim"
+	$(ENV_SCRIPT) nim c -r $(NIM_PARAMS) --threads:on -d:chronicles_log_level=ERROR -o:build/$@ "nimbus/tests/$@.nim"
 
 # Note about building Nimbus as a library:
 #

nimbus.nimble

@@ -130,10 +130,10 @@ task nimbus_verified_proxy, "Build Nimbus verified proxy":
 task nimbus_verified_proxy_test, "Run Nimbus verified proxy tests":
   test "nimbus_verified_proxy/tests", "test_proof_validation", "-d:chronicles_log_level=ERROR -d:nimbus_db_backend=sqlite"
 
-## nimbus unified tasks
+## nimbus tasks
 
-task nimbus_unified, "Build Nimbus":
-  buildBinary "nimbus_unified", "nimbus_unified/", "-d:chronicles_log_level=TRACE"
+task nimbus, "Build Nimbus":
+  buildBinary "nimbus", "nimbus/", "-d:chronicles_log_level=TRACE"
 
-task nimbus_unified_test, "Run Nimbus tests":
-  test "nimbus_unified/tests/","all_tests_unified", "-d:chronicles_log_level=ERROR"
+task nimbus_test, "Run Nimbus tests":
+  test "nimbus/tests/","all_tests", "-d:chronicles_log_level=ERROR"

nimbus/README.md

@@ -1,4 +1,4 @@
-# Nimbus Unified
+# Nimbus
 
 <!-- [![Github Actions CI](tbd) -->
 [![License: Apache](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
@@ -26,9 +26,9 @@ tbd
 tbd
     - mac os, windows, and linux
 
-    ]$ make nimbus_unified
+    ]$ make nimbus
 ## colaborate
-We welcome contributions to Nimbus Unified! Please adhere to the following guidelines:
+We welcome contributions to Nimbus! Please adhere to the following guidelines:
 
 - Use the [Status Nim style guide](https://status-im.github.io/nim-style-guide/) to maintain code consistency.
 - Format your code using the [Nim Pretty Printer (nph)](https://github.com/nim-lang/nimpretty) to ensure consistency across the codebase. Run it as part of your pull request process.

nimbus/configs/nimbus_configs.nim renamed to nimbus/conf.nim

@@ -1,4 +1,4 @@
-# nimbus_unified
+# Nimbus
 # Copyright (c) 2025 Status Research & Development GmbH
 # Licensed and distributed under either of
 #   * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
@@ -12,7 +12,7 @@ import
   #eth2-configs
   beacon_chain/nimbus_binary_common,
   #eth1-configs
-  ../../nimbus/nimbus_desc
+  ../../execution_chain/nimbus_desc
 
 export BeaconNodeConf, NimbusConf
 
@@ -37,22 +37,20 @@ type
   LayerConfig* = object
     case kind*: ConfigKind
     of Consensus:
-      consensusConfig*: BeaconNodeConf
+      consensusConfig*: seq[string]
     of Execution:
-      executionConfig*: NimbusConf
-
-  ServiceParameters* = object
-    name*: string
-    layerConfig*: LayerConfig
+      executionConfig*: seq[string]
 
   NimbusService* = ref object
     name*: string
-    timeoutMs*: uint32
-    serviceHandler*: Thread[ServiceParameters]
+    layerConfig*: LayerConfig
+    serviceHandler*: Thread[ptr Channel[pointer]]
+    serviceChannel: ptr Channel[pointer]
 
   Nimbus* = ref object
-    serviceList*: array[cNimbusMaxServices, Option[NimbusService]]
+    serviceList*: seq[NimbusService]
 
+#replace with cond var
 ## Service shutdown
 var isShutDownRequired*: Atomic[bool]
 isShutDownRequired.store(false)
@@ -61,10 +59,10 @@ isShutDownRequired.store(false)
 proc defaultDataDir*(): string =
   let dataDir =
     when defined(windows):
-      "AppData" / "Roaming" / "Nimbus_unified"
+      "AppData" / "Roaming" / "Nimbus"
     elif defined(macosx):
-      "Library" / "Application Support" / "Nimbus_unified"
+      "Library" / "Application Support" / "Nimbus"
     else:
-      ".cache" / "nimbus_unified"
+      ".cache" / "Nimbus"
 
   getHomeDir() / dataDir

nimbus/consensus/consensus_layer.nim

@@ -1,4 +1,4 @@
-# nimbus_unified
+# Nimbus
 # Copyright (c) 2025 Status Research & Development GmbH
 # Licensed and distributed under either of
 #   * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).

nimbus/execution/execution_layer.nim

@@ -1,4 +1,4 @@
-# nimbus_unified
+# Nimbus
 # Copyright (c) 2025 Status Research & Development GmbH
 # Licensed and distributed under either of
 #   * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).

nimbus/nimbus.cfg

@@ -1,4 +1,4 @@
-# nimbus_unified
+# Nimbus
 # Copyright (c) 2025 Status Research & Development GmbH
 # Licensed and distributed under either of
 #   * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).

nimbus/nimbus.nim

@@ -1,22 +1,21 @@
-# nimbus_unified
+# Nimbus
 # Copyright (c) 2025 Status Research & Development GmbH
 # Licensed and distributed under either of
 #   * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
 #   * 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.
 
 import
-  std/[atomics, os, exitprocs],
+  std/[atomics, os],
   chronicles,
-  stew/io2,
   options,
   consensus/consensus_layer,
   execution/execution_layer,
   configs/nimbus_configs,
   #eth2-configs
   beacon_chain/nimbus_binary_common,
   #eth1-configs
-  ../nimbus/nimbus_desc
+  ../execution_chain/nimbus_desc
 
 # ------------------------------------------------------------------------------
 # Private
@@ -65,7 +64,7 @@ proc addService(
 # Public
 # ------------------------------------------------------------------------------
 
-## Block execution and waits for services to finish
+## Gracefully exits all services
 proc exitServices*(nimbus: Nimbus) =
   for i in 0 .. cNimbusMaxServices - 1:
     if nimbus.serviceList[i].isSome:

nimbus/tests/all_tests_unified.nim renamed to nimbus/tests/all_tests_nimbus.nim

@@ -1,4 +1,4 @@
-# nimbus_unified
+# Nimbus
 # Copyright (c) 2025 Status Research & Development GmbH
 # Licensed and distributed under either of
 #   * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
@@ -8,6 +8,6 @@
 {.warning[UnusedImport]: off.}
 
 import
-  ./test_nimbus_unified,
+  ./test_nimbus,
   ./consensus/test_consensus_layer,
   ./execution/test_execution_layer

nimbus/tests/consensus/test_consensus_layer.nim

@@ -1,4 +1,4 @@
-# nimbus_unified
+# Nimbus
 # Copyright (c) 2025 Status Research & Development GmbH
 # Licensed and distributed under either of
 #   * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).