cl+el poc[WiP]

.gitmodules

@@ -171,7 +171,7 @@
 [submodule "vendor/nimbus-eth2"]
 	path = vendor/nimbus-eth2
 	url = https://github.com/status-im/nimbus-eth2.git
-	branch = unstable
+	branch = dev/pedro/unified_changes
 [submodule "vendor/nim-taskpools"]
 	path = vendor/nim-taskpools
 	url = https://github.com/status-im/nim-taskpools.git
@@ -241,3 +241,23 @@
 	path = vendor/nim-minilru
 	url = https://github.com/status-im/nim-minilru.git
 	branch = master
+[submodule "vendor/mainnet"]
+	path = vendor/mainnet
+	url = https://github.com/eth-clients/mainnet.git
+	ignore = untracked
+	branch = master
+[submodule "vendor/holesky"]
+	path = vendor/holesky
+	url = https://github.com/eth-clients/holesky.git
+	ignore = untracked
+	branch = master
+[submodule "vendor/sepolia"]
+	path = vendor/sepolia
+	url = https://github.com/eth-clients/sepolia.git
+	ignore = untracked
+	branch = master
+[submodule "vendor/gnosis-chain-configs"]
+	path = vendor/gnosis-chain-configs
+	url = https://github.com/gnosischain/configs.git
+	ignore = untracked
+	branch = master

Makefile

@@ -104,6 +104,7 @@ VERIF_PROXY_OUT_PATH ?= build/libverifproxy/
 	update \
 	nimbus \
 	nimbus_execution_client \
+	nimbus_unified \
 	fluffy \
 	nimbus_verified_proxy \
 	libverifproxy \
@@ -359,13 +360,20 @@ txparse: | build deps
 
 # usual cleaning
 clean: | clean-common
-	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 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,*.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
+NIM_PARAMS := -d:release --parallelBuild:1 -d:libp2p_agents_metrics -d:KnownLibP2PAgents=nimbus,lighthouse,lodestar,prysm,teku,grandine $(NIM_PARAMS)
+nimbus_unified: | build deps
+	echo -e $(BUILD_MSG) "build/$@" && \
+		$(ENV_SCRIPT) nim c $(NIM_PARAMS) -d:disable_libbacktrace -d:libp2p_pki_schemes=secp256k1 -u:metrics -o:build/$@ "nimbus_unified/[email protected]"
 # Note about building Nimbus as a library:
 #
 # There were `wrappers`, `wrappers-static`, `libnimbus.so` and `libnimbus.a`

config.nims

@@ -130,7 +130,9 @@ if not defined(windows):
 --opt:speed
 --excessiveStackTrace:on
 # enable metric collection
---define:metrics
+when not defined(unified):
+  --define:metrics
+
 # for heap-usage-by-instance-type metrics and object base-type strings
 --define:nimTypeNames
 --styleCheck:usages

nimbus.nimble

@@ -31,7 +31,8 @@ requires "nim >= 1.6.0",
   "blscurve",
   "evmc",
   "web3",
-  "minilru"
+  "minilru",
+  "secp256k1"
 
 binDir = "build"
 
@@ -40,6 +41,7 @@ when declared(namedBin):
     "nimbus/nimbus_execution_client": "nimbus_execution_client",
     "fluffy/fluffy": "fluffy",
     "nimbus_verified_proxy/nimbus_verified_proxy": "nimbus_verified_proxy",
+    "nimbus_unified":"nimbus_unified"
   }.toTable()
 
 import std/os
@@ -129,3 +131,9 @@ 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
+
+task nimbus_unified, "Build nimbus unified":
+  buildBinary "nimbus_unified", "nimbus_unified/", "-d:chronicles_log_level=TRACE"

nimbus/nimbus_execution_client.nim

@@ -173,35 +173,33 @@ proc preventLoadingDataDirForTheWrongNetwork(db: CoreDbRef; conf: NimbusConf) =
       expected=calculatedId
     quit(QuitFailure)
 
-proc run(nimbus: NimbusNode, conf: NimbusConf) =
-  ## logging
-  setLogLevel(conf.logLevel)
-  if conf.logFile.isSome:
-    let logFile = string conf.logFile.get()
-    defaultChroniclesStream.output.outFile = nil # to avoid closing stdout
-    discard defaultChroniclesStream.output.open(logFile, fmAppend)
+proc run*(nimbus: NimbusNode, conf: NimbusConf) =
+  # ## logging
+  # setLogLevel(conf.logLevel)
+  # if conf.logFile.isSome:
+  #   let logFile = string conf.logFile.get()
+  #   defaultChroniclesStream.output.outFile = nil # to avoid closing stdout
+  #   discard defaultChroniclesStream.output.open(logFile, fmAppend)
 
-  setupFileLimits()
+  # setupFileLimits()
 
-  info "Launching execution client",
-      version = FullVersionStr,
-      conf
+  # info "Launching execution client", version = FullVersionStr, conf
 
   when defined(evmc_enabled):
     evmcSetLibraryPath(conf.evm)
 
   # Trusted setup is needed for processing Cancun+ blocks
-  if conf.trustedSetupFile.isSome:
-    let fileName = conf.trustedSetupFile.get()
-    let res = loadTrustedSetup(fileName, 0)
-    if res.isErr:
-      fatal "Cannot load Kzg trusted setup from file", msg=res.error
-      quit(QuitFailure)
-  else:
-    let res = loadKzgTrustedSetup()
-    if res.isErr:
-      fatal "Cannot load baked in Kzg trusted setup", msg=res.error
-      quit(QuitFailure)
+  # if conf.trustedSetupFile.isSome:
+  #   let fileName = conf.trustedSetupFile.get()
+  #   let res = loadTrustedSetup(fileName, 0)
+  #   if res.isErr:
+  #     fatal "Cannot load Kzg trusted setup from file", msg=res.error
+  #     quit(QuitFailure)
+  # else:
+  #   let res = loadKzgTrustedSetup()
+  #   if res.isErr:
+  #     fatal "Cannot load baked in Kzg trusted setup", msg=res.error
+  #     quit(QuitFailure)
 
   createDir(string conf.dataDir)
   let coreDB =

nimbus_unified/README.md

@@ -0,0 +1,92 @@
+# Nimbus Unified
+
+<!-- [![Github Actions CI](tbd) -->
+[![License: Apache](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
+[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
+
+[![Discord: Nimbus](https://img.shields.io/badge/discord-nimbus-orange.svg)](https://discord.gg/XRxWahP)
+[![Status: #nimbus-general](https://img.shields.io/badge/status-nimbus--general-orange.svg)](https://join.status.im/nimbus-general)
+
+
+# NOTE - whole document to be concluded...
+
+# description
+Nimbus Unified combines Ethereum execution and consensus layer functionalities, featuring a fully integrated beacon node, validator duties, and execution layer support. This setup allows the Nimbus client to handle both Ethereum consensus (Eth2) and execution (Eth1) services within a single package.
+tbd
+# documentation
+For in-depth configuration and functionality of Nimbus Eth1 and Nimbus Eth2, refer to:
+
+- [Nimbus-eth1 - Execution layer client](https://github.com/status-im/nimbus-eth1) Documentation
+- [Nimbus-eth2 - Consensus layer client](https://github.com/status-im/nimbus-eth2) Documentation
+
+--- to be concluded
+# dependencies
+tbd
+# how to
+## configuration
+    todo
+## commands
+    todo
+## build
+Execute the make command on nimbus-eth1 directory
+```
+]$ make -j<#threads> nimbus_unified
+```
+
+### trusted node synchronization
+
+Same options as nimbus-eth2 trusted node synchronization
+```
+]$ nimbus_unified -- trustedNodeSync
+
+```
+
+### known issues
+<b>NOTE</b>
+- theres is an issue with SIGINT handling. if process is hanged after ctrl^c send a SIGQUIT (ctrl+\\)
+
+### run node
+<b>NOTE</b>
+- eth1 is running with default engine-api option
+- current recommended options
+
+```
+    --network
+    --datadir (will be shared with consensus)
+    --tcp-port=9000 (default)
+    --udp-port=9000 (default)
+    --rest
+    --rest-port=5052
+    --metrics
+    --el=http://127.0.0.1:8551  (default)
+    --jwt-secret=
+```
+
+
+1) generate jason web token
+
+
+2) you can use the auxiliary script (do note that this script is temporary and to be removed)
+```
+]$ nimbus_unified/run_nimbus_unified.sh --el=http://127.0.0.1:8551 --jwt-secret="/tmp/jwtsecret" --web3-url=http://127.0.0.1:8551
+```
+
+
+
+## colaborate
+We welcome contributions to Nimbus Unified! Please adhere to the following guidelines:
+
+- Follow the [Nimbus Code of Conduct](https://github.com/status-im/nimbus-eth2/blob/master/CODE_OF_CONDUCT.md).
+- Use the [Nimbus Code Style Guide](https://github.com/status-im/nimbus-eth2/blob/master/docs/code_style.md) 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.
+## License
+
+Licensed and distributed under either of
+
+* MIT license: [LICENSE-MIT](LICENSE-MIT) or https://opensource.org/licenses/MIT
+
+or
+
+* Apache License, Version 2.0: [LICENSE-APACHEv2](LICENSE-APACHEv2) or https://www.apache.org/licenses/LICENSE-2.0
+
+These files may not be copied, modified, or distributed except according to those terms.

nimbus_unified/configs/nimbus_configs.nim

@@ -0,0 +1,68 @@
+# nimbus_unified
+# 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/[os, atomics],
+  #eth2
+  beacon_chain/nimbus_binary_common,
+  #eth1
+  ../../nimbus/nimbus_desc
+
+## Exceptions
+type NimbusServicesListError* = object of CatchableError
+
+## Constants
+## TODO: evaluate the proposed timeouts
+const cNimbusMaxServices* = 5
+const cNimbusServiceTimeoutMs* = 5000
+
+## log
+logScope:
+  topics = "Service manager"
+
+## Nimbus workers arguments (thread arguments)
+type
+  ConfigKind* = enum
+    Execution
+    Consensus
+
+  LayerConfig* = object
+    case kind*: ConfigKind
+    of Consensus:
+      consensusConfig*: BeaconNodeConf
+    of Execution:
+      executionConfig*: NimbusConf
+
+  ServiceParameters* = object
+    name*: string
+    layerConfig*: LayerConfig
+
+## Service and associated service information
+type NimbusService* = ref object #experimentar tipos com ref
+  name*: string
+  timeoutMs*: uint32
+  threadHandler*: Thread[ServiceParameters]
+
+## Service manager
+type NimbusServicesList* = ref object
+  serviceList*: array[cNimbusMaxServices, Option[NimbusService]]
+
+## Service shutdown
+var isShutDownRequired*: Atomic[bool]
+isShutDownRequired.store(false)
+
+# TODO: move this into config.nim file once we have the file in place
+proc defaultDataDir*(): string =
+  let dataDir =
+    when defined(windows):
+      "AppData" / "Roaming" / "Nimbus_unified"
+    elif defined(macosx):
+      "Library" / "Application Support" / "Nimbus_unified"
+    else:
+      ".cache" / "nimbus_unified"
+
+  getHomeDir() / dataDir

nimbus_unified/consensus/consensus_wrapper.nim

@@ -0,0 +1,73 @@
+# nimbus_unified
+# 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,
+  metrics,
+  chronos,
+  chronicles,
+  ../configs/nimbus_configs,
+  #eth2
+  beacon_chain/[beacon_chain_db, beacon_node, nimbus_beacon_node, nimbus_binary_common],
+  beacon_chain/rpc/[rest_beacon_api, rest_api],
+  beacon_chain/networking/[network_metadata, network_metadata_downloads],
+  beacon_chain/validators/[keystore_management]
+
+export nimbus_configs
+
+## log
+logScope:
+  topics = "Consensus layer"
+
+proc checkForConsensusShutdown(config: BeaconNodeConf) {.async.} =
+  while isShutDownRequired.load() == false:
+    await sleepAsync(cNimbusServiceTimeoutMs)
+
+  if isShutDownRequired.load() == true:
+    bnStatus = BeaconNodeStatus.Stopping
+
+# handles option of eth2 beacon node
+proc handleStartingOption(config: var BeaconNodeConf) {.raises: [CatchableError].} =
+  let rng = HmacDrbgContext.new()
+
+  # More options can be added, might be out of scope given that they exist in eth2
+  case config.cmd
+  of BNStartUpCmd.noCommand:
+    doRunBeaconNode(config, rng)
+  of BNStartUpCmd.trustedNodeSync:
+    if config.blockId.isSome():
+      raise newException(
+        ValueError, "--blockId option has been removed - use --state-id instead!"
+      )
+
+    let
+      metadata = loadEth2Network(config)
+      db = BeaconChainDB.new(config.databaseDir, metadata.cfg, inMemory = false)
+      genesisState = waitFor fetchGenesisState(metadata)
+    waitFor db.doRunTrustedNodeSync(
+      metadata, config.databaseDir, config.eraDir, config.trustedNodeUrl,
+      config.stateId, config.lcTrustedBlockRoot, config.backfillBlocks, config.reindex,
+      config.downloadDepositSnapshot, genesisState,
+    )
+    db.close()
+    isShutDownRequired.store(true)
+  else:
+    notice("unknown option")
+    isShutDownRequired.store(true)
+
+proc consensusWrapper*(params: ServiceParameters) {.raises: [CatchableError].} =
+  doAssert params.layerConfig.kind == Consensus
+
+  try:
+    var config = params.layerConfig.consensusConfig
+    discard config.checkForConsensusShutdown()
+    config.handleStartingOption()
+  except CatchableError as e:
+    fatal "error", message = e.msg
+    isShutDownRequired.store(true)
+
+  isShutDownRequired.store(true)
+  warn "\tExiting consensus layer"