status-im · tersec · Feb 11, 2025 · Feb 6, 2025 · Feb 6, 2025 · Feb 7, 2025
diff --git a/.github/workflows/fluffy.yml b/.github/workflows/fluffy.yml
@@ -13,9 +13,9 @@ on:
       - 'fluffy/**'
       - '!fluffy/**.md'
       - '!fluffy/docs/**'
-      - 'nimbus/rpc/hexstrings.nim'
-      - 'nimbus/rpc/rpc_*.nim'
-      - 'nimbus/db/**'
+      - 'execution_chain/rpc/hexstrings.nim'
+      - 'execution_chain/rpc/rpc_*.nim'
+      - 'execution_chain/db/**'
       - 'vendor/**'
       - 'Makefile'
       - 'nimbus.nimble'
@@ -26,9 +26,9 @@ on:
       - 'fluffy/**'
       - '!fluffy/**.md'
       - '!fluffy/docs/**'
-      - 'nimbus/rpc/hexstrings.nim'
-      - 'nimbus/rpc/rpc_*.nim'
-      - 'nimbus/db/**'
+      - 'execution_chain/rpc/hexstrings.nim'
+      - 'execution_chain/rpc/rpc_*.nim'
+      - 'execution_chain/db/**'
       - 'vendor/**'
       - 'Makefile'
       - 'nimbus.nimble'

diff --git a/.github/workflows/nimbus_verified_proxy.yml b/.github/workflows/nimbus_verified_proxy.yml
@@ -16,7 +16,7 @@ on:
       - 'nimbus_verified_proxy/**'
       - '!nimbus_verified_proxy/**.md'
       - '!nimbus_verified_proxy/docs/**'
-      - 'nimbus/db/**'
+      - 'execution_chain/db/**'
       - 'vendor/**'
       - 'Makefile'
       - 'nimbus.nimble'
@@ -27,7 +27,7 @@ on:
       - 'nimbus_verified_proxy/**'
       - '!nimbus_verified_proxy/**.md'
       - '!nimbus_verified_proxy/docs/**'
-      - 'nimbus/db/**'
+      - 'execution_chain/db/**'
       - 'vendor/**'
       - 'Makefile'
       - 'nimbus.nimble'

diff --git a/.gitignore b/.gitignore
@@ -22,7 +22,7 @@
 
 # Ignore generated C and doc files
 nimcache
-/nimbus/docs
+/execution_chain/docs
 
 /debug*.json
 /block*.json

diff --git a/Makefile b/Makefile
@@ -190,7 +190,7 @@ ifneq ($(ENABLE_EVMC), 0)
   T8N_PARAMS := -d:chronicles_enabled=off
 endif
 
-# eth protocol settings, rules from "nimbus/sync/protocol/eth/variables.mk"
+# eth protocol settings, rules from "execution_chain/sync/protocol/eth/variables.mk"
 NIM_PARAMS := $(NIM_PARAMS) $(NIM_ETH_PARAMS)
 
 #- deletes and recreates "nimbus.nims" which on Windows is a copy instead of a proper symlink
@@ -211,7 +211,7 @@ $(TOOLS): | build deps rocksdb
 
 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 "nimbus/nimbus_execution_client.nim"
+		$(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"

diff --git a/README.md b/README.md
@@ -327,7 +327,7 @@ cp -a examples/prometheus.yml ../my_metrics/
 cd ../my_metrics
 prometheus --config.file=prometheus.yml # loads ./prometheus.yml, writes metric data to ./data
 # start a fresh Nimbus sync and export metrics
-rm -rf ~/.cache/nimbus/db; ./build/nimbus_execution_client --prune:archive --metricsServer
+rm -rf ~/.cache/execution_chain/db; ./build/nimbus_execution_client --prune:archive --metricsServer
 ```
 
 Start the Grafana server. On Gentoo it's `/etc/init.d/grafana start`. Go to

diff --git a/examples/decompile_smart_contract.nim b/examples/decompile_smart_contract.nim
@@ -1,5 +1,5 @@
 # Nimbus
-# Copyright (c) 2018-2024 Status Research & Development GmbH
+# Copyright (c) 2018-2025 Status Research & Development GmbH
 # Licensed under either of
 #  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
 #    http://www.apache.org/licenses/LICENSE-2.0)
@@ -8,7 +8,7 @@
 # at your option. This file may not be copied, modified, or distributed except
 # according to those terms.
 
-import ../nimbus/evm/code_stream, strformat
+import ../execution_chain/evm/code_stream, strformat
 
 var c =
   CodeStream.init(CodeBytesRef.fromHex("0x6003600202600055").expect("valid code"))

diff --git a/nimbus/beacon/api_handler.nim → execution_chain/beacon/api_handler.nim b/nimbus/beacon/api_handler.nim → execution_chain/beacon/api_handler.nim
diff --git a/...s/beacon/api_handler/api_exchangeconf.nim → ...n/beacon/api_handler/api_exchangeconf.nim b/...s/beacon/api_handler/api_exchangeconf.nim → ...n/beacon/api_handler/api_exchangeconf.nim
diff --git a/nimbus/beacon/api_handler/api_forkchoice.nim → ...ain/beacon/api_handler/api_forkchoice.nim b/nimbus/beacon/api_handler/api_forkchoice.nim → ...ain/beacon/api_handler/api_forkchoice.nim
diff --git a/nimbus/beacon/api_handler/api_getbodies.nim → ...hain/beacon/api_handler/api_getbodies.nim b/nimbus/beacon/api_handler/api_getbodies.nim → ...hain/beacon/api_handler/api_getbodies.nim
diff --git a/nimbus/beacon/api_handler/api_getpayload.nim → ...ain/beacon/api_handler/api_getpayload.nim b/nimbus/beacon/api_handler/api_getpayload.nim → ...ain/beacon/api_handler/api_getpayload.nim
diff --git a/nimbus/beacon/api_handler/api_newpayload.nim → ...ain/beacon/api_handler/api_newpayload.nim b/nimbus/beacon/api_handler/api_newpayload.nim → ...ain/beacon/api_handler/api_newpayload.nim
diff --git a/nimbus/beacon/api_handler/api_utils.nim → ...on_chain/beacon/api_handler/api_utils.nim b/nimbus/beacon/api_handler/api_utils.nim → ...on_chain/beacon/api_handler/api_utils.nim
diff --git a/nimbus/beacon/beacon_engine.nim → execution_chain/beacon/beacon_engine.nim b/nimbus/beacon/beacon_engine.nim → execution_chain/beacon/beacon_engine.nim
diff --git a/nimbus/beacon/payload_conv.nim → execution_chain/beacon/payload_conv.nim b/nimbus/beacon/payload_conv.nim → execution_chain/beacon/payload_conv.nim
diff --git a/nimbus/beacon/payload_queue.nim → execution_chain/beacon/payload_queue.nim b/nimbus/beacon/payload_queue.nim → execution_chain/beacon/payload_queue.nim
diff --git a/nimbus/beacon/web3_eth_conv.nim → execution_chain/beacon/web3_eth_conv.nim b/nimbus/beacon/web3_eth_conv.nim → execution_chain/beacon/web3_eth_conv.nim
diff --git a/nimbus/common.nim → execution_chain/common.nim b/nimbus/common.nim → execution_chain/common.nim
diff --git a/nimbus/common/chain_config.nim → execution_chain/common/chain_config.nim b/nimbus/common/chain_config.nim → execution_chain/common/chain_config.nim
diff --git a/nimbus/common/chain_config_hash.nim → execution_chain/common/chain_config_hash.nim b/nimbus/common/chain_config_hash.nim → execution_chain/common/chain_config_hash.nim
diff --git a/nimbus/common/common.nim → execution_chain/common/common.nim b/nimbus/common/common.nim → execution_chain/common/common.nim
diff --git a/nimbus/common/context.nim → execution_chain/common/context.nim b/nimbus/common/context.nim → execution_chain/common/context.nim
diff --git a/nimbus/common/evmforks.nim → execution_chain/common/evmforks.nim b/nimbus/common/evmforks.nim → execution_chain/common/evmforks.nim
diff --git a/nimbus/common/genesis.nim → execution_chain/common/genesis.nim b/nimbus/common/genesis.nim → execution_chain/common/genesis.nim
diff --git a/nimbus/common/genesis_alloc.nim → execution_chain/common/genesis_alloc.nim b/nimbus/common/genesis_alloc.nim → execution_chain/common/genesis_alloc.nim
diff --git a/nimbus/common/hardforks.nim → execution_chain/common/hardforks.nim b/nimbus/common/hardforks.nim → execution_chain/common/hardforks.nim
diff --git a/nimbus/common/logging.nim → execution_chain/common/logging.nim b/nimbus/common/logging.nim → execution_chain/common/logging.nim
diff --git a/nimbus/common/manager.nim → execution_chain/common/manager.nim b/nimbus/common/manager.nim → execution_chain/common/manager.nim
diff --git a/nimbus/compile_info.nim → execution_chain/compile_info.nim b/nimbus/compile_info.nim → execution_chain/compile_info.nim
diff --git a/nimbus/config.nim → execution_chain/config.nim b/nimbus/config.nim → execution_chain/config.nim
@@ -40,7 +40,7 @@ const
     " Status Research & Development GmbH"
 
   # e.g.:
-  # nimbus/v0.1.0-abcdef/os-cpu/nim-a.b.c/emvc
+  # nimbus_execution_client/v0.1.0-abcdef/os-cpu/nim-a.b.c/emvc
   # Copyright (c) 2018-2021 Status Research & Development GmbH
   NimbusBuild* = "$#\p$#" % [
     ClientId,

diff --git a/nimbus/constants.nim → execution_chain/constants.nim b/nimbus/constants.nim → execution_chain/constants.nim
diff --git a/nimbus/core/block_import.nim → execution_chain/core/block_import.nim b/nimbus/core/block_import.nim → execution_chain/core/block_import.nim
diff --git a/nimbus/core/chain.nim → execution_chain/core/chain.nim b/nimbus/core/chain.nim → execution_chain/core/chain.nim
diff --git a/nimbus/core/chain/chain_desc.nim → execution_chain/core/chain/chain_desc.nim b/nimbus/core/chain/chain_desc.nim → execution_chain/core/chain/chain_desc.nim
diff --git a/nimbus/core/chain/forked_chain.nim → execution_chain/core/chain/forked_chain.nim b/nimbus/core/chain/forked_chain.nim → execution_chain/core/chain/forked_chain.nim
diff --git a/.../core/chain/forked_chain/chain_branch.nim → .../core/chain/forked_chain/chain_branch.nim b/.../core/chain/forked_chain/chain_branch.nim → .../core/chain/forked_chain/chain_branch.nim
diff --git a/...us/core/chain/forked_chain/chain_desc.nim → ...in/core/chain/forked_chain/chain_desc.nim b/...us/core/chain/forked_chain/chain_desc.nim → ...in/core/chain/forked_chain/chain_desc.nim
diff --git a/nimbus/core/chain/forked_chain/chain_kvt.nim → ...ain/core/chain/forked_chain/chain_kvt.nim b/nimbus/core/chain/forked_chain/chain_kvt.nim → ...ain/core/chain/forked_chain/chain_kvt.nim
diff --git a/nimbus/core/chain/persist_blocks.nim → ...ution_chain/core/chain/persist_blocks.nim b/nimbus/core/chain/persist_blocks.nim → ...ution_chain/core/chain/persist_blocks.nim
diff --git a/nimbus/core/dao.nim → execution_chain/core/dao.nim b/nimbus/core/dao.nim → execution_chain/core/dao.nim
diff --git a/nimbus/core/eip4844.nim → execution_chain/core/eip4844.nim b/nimbus/core/eip4844.nim → execution_chain/core/eip4844.nim
diff --git a/nimbus/core/eip6110.nim → execution_chain/core/eip6110.nim b/nimbus/core/eip6110.nim → execution_chain/core/eip6110.nim
diff --git a/nimbus/core/eip7691.nim → execution_chain/core/eip7691.nim b/nimbus/core/eip7691.nim → execution_chain/core/eip7691.nim
diff --git a/nimbus/core/eip7702.nim → execution_chain/core/eip7702.nim b/nimbus/core/eip7702.nim → execution_chain/core/eip7702.nim
diff --git a/nimbus/core/executor.nim → execution_chain/core/executor.nim b/nimbus/core/executor.nim → execution_chain/core/executor.nim
diff --git a/nimbus/core/executor/calculate_reward.nim → ..._chain/core/executor/calculate_reward.nim b/nimbus/core/executor/calculate_reward.nim → ..._chain/core/executor/calculate_reward.nim
diff --git a/nimbus/core/executor/executor_helpers.nim → ..._chain/core/executor/executor_helpers.nim b/nimbus/core/executor/executor_helpers.nim → ..._chain/core/executor/executor_helpers.nim
diff --git a/nimbus/core/executor/process_block.nim → ...ion_chain/core/executor/process_block.nim b/nimbus/core/executor/process_block.nim → ...ion_chain/core/executor/process_block.nim
diff --git a/nimbus/core/executor/process_transaction.nim → ...ain/core/executor/process_transaction.nim b/nimbus/core/executor/process_transaction.nim → ...ain/core/executor/process_transaction.nim
diff --git a/nimbus/core/gaslimit.nim → execution_chain/core/gaslimit.nim b/nimbus/core/gaslimit.nim → execution_chain/core/gaslimit.nim
diff --git a/nimbus/core/pow/difficulty.nim → execution_chain/core/pow/difficulty.nim b/nimbus/core/pow/difficulty.nim → execution_chain/core/pow/difficulty.nim
diff --git a/nimbus/core/pow/header.nim → execution_chain/core/pow/header.nim b/nimbus/core/pow/header.nim → execution_chain/core/pow/header.nim
diff --git a/nimbus/core/tx_pool.nim → execution_chain/core/tx_pool.nim b/nimbus/core/tx_pool.nim → execution_chain/core/tx_pool.nim
diff --git a/nimbus/core/tx_pool/tx_desc.nim → execution_chain/core/tx_pool/tx_desc.nim b/nimbus/core/tx_pool/tx_desc.nim → execution_chain/core/tx_pool/tx_desc.nim
diff --git a/nimbus/core/tx_pool/tx_item.nim → execution_chain/core/tx_pool/tx_item.nim b/nimbus/core/tx_pool/tx_item.nim → execution_chain/core/tx_pool/tx_item.nim
diff --git a/nimbus/core/tx_pool/tx_packer.nim → execution_chain/core/tx_pool/tx_packer.nim b/nimbus/core/tx_pool/tx_packer.nim → execution_chain/core/tx_pool/tx_packer.nim
diff --git a/nimbus/core/tx_pool/tx_tabs.nim → execution_chain/core/tx_pool/tx_tabs.nim b/nimbus/core/tx_pool/tx_tabs.nim → execution_chain/core/tx_pool/tx_tabs.nim
diff --git a/nimbus/core/validate.nim → execution_chain/core/validate.nim b/nimbus/core/validate.nim → execution_chain/core/validate.nim
diff --git a/nimbus/core/withdrawals.nim → execution_chain/core/withdrawals.nim b/nimbus/core/withdrawals.nim → execution_chain/core/withdrawals.nim
diff --git a/nimbus/db/.gitignore → execution_chain/db/.gitignore b/nimbus/db/.gitignore → execution_chain/db/.gitignore
diff --git a/nimbus/db/README.md → execution_chain/db/README.md b/nimbus/db/README.md → execution_chain/db/README.md
@@ -84,39 +84,39 @@ locations where to start looking at.
 
 * *Aristo DB (driver)*<a name="add"></a>
   + Sources:<br>
-    ./nimbus/db/core_db/backend/aristo_*<br>
+    ./execution_chain/db/core_db/backend/aristo_*<br>
 
   + Synopsis:<br>
     Combines both, the *Kvt* and the *Aristo* driver sub-modules providing an
     interface similar to the [legacy DB (concentrator)](#ldc) module.
 
 * *Aristo MPT (driver)*<a name="amd"></a>
   + Sources:<br>
-    ./nimbus/db/aristo*
+    ./execution_chain/db/aristo*
 
   + Synopsis:<br>
     Revamped implementation of a hexary *Merkle Patricia Tree*.
 
 * *Common (concentrator)*<a name="cc"></a>
     * Sources:<br>
-      ./nimbus/common*<br>
+      ./execution_chain/common*<br>
 
     * Synopsis:<br>
       Collected information for running block chain execution layer
       applications.
 
 * *Core DB (API)*<a name="cda"></a>
   * Sources:<br>
-    ./nimbus/db/core_db*
+    ./execution_chain/db/core_db*
 
   * Synopsis:<br>
     Database abstraction layer. Unless for legacy applications, there should
     be no need to reach out to the layers below.
 
 * *EVM (application)*<a name="ea"></a>
   + Sources:<br>
-    ./nimbus/core/executor/*
-    ./nimbus/evm/*
+    ./execution_chain/core/executor/*
+    ./execution_chain/evm/*
 
   + Synopsis:<br>
     An implementation of the *Ethereum Virtual Machine*.
@@ -140,7 +140,7 @@ locations where to start looking at.
 
 * *Kvt (driver)*<a name="kd"></a>
   + Sources:<br>
-    ./nimbus/db/kvt*
+    ./execution_chain/db/kvt*
 
   + Synopsis:<br>
     Key value table interface for the [Aristo DB (driver)](#add) module.
@@ -149,7 +149,7 @@ locations where to start looking at.
 
 * *Ledger (API)*<a name="la"></a>
   + Sources:<br>
-    ./nimbus/db/ledger*
+    ./execution_chain/db/ledger*
 
   + Synopsis:<br>
     Abstraction layer for either the [legacy cache (driver)](#lgcd) accounts
@@ -159,9 +159,9 @@ locations where to start looking at.
 
 * *ledger cache (driver)*<a name="ldcd"></a>
   + Sources:<br>
-    ./nimbus/db/ledger/accounts_ledger.nim<br>
-    ./nimbus/db/ledger/backend/accounts_ledger*<br>
-    ./nimbus/db/ledger/distinct_ledgers.nim
+    ./execution_chain/db/ledger/accounts_ledger.nim<br>
+    ./execution_chain/db/ledger/backend/accounts_ledger*<br>
+    ./execution_chain/db/ledger/distinct_ledgers.nim
 
   + Synopsis:<br>
     Management of accounts and storage data. This is a re-write of the
@@ -170,7 +170,7 @@ locations where to start looking at.
 
 * *legacy DB (concentrator)*<a name="ldc"></a>
   + Sources:<br>
-    ./nimbus/db/core_db/backend/legacy_*
+    ./execution_chain/db/core_db/backend/legacy_*
 
   + Synopsis:<br>
     Legacy database abstraction. It mostly forwards requests directly to the
@@ -186,8 +186,8 @@ locations where to start looking at.
 
 * *State DB (concentrator)*<a name="sdc"></a>
   + Sources:<br>
-    ./nimbus/evm/state.nim<br>
-    ./nimbus/evm/types.nim
+    ./execution_chain/evm/state.nim<br>
+    ./execution_chain/evm/types.nim
 
   + Synopsis:<br>
     Integrated collection of modules and methods relevant for the EVM.

diff --git a/nimbus/db/access_list.nim → execution_chain/db/access_list.nim b/nimbus/db/access_list.nim → execution_chain/db/access_list.nim
diff --git a/nimbus/db/aristo.nim → execution_chain/db/aristo.nim b/nimbus/db/aristo.nim → execution_chain/db/aristo.nim
diff --git a/nimbus/db/aristo/README.md → execution_chain/db/aristo/README.md b/nimbus/db/aristo/README.md → execution_chain/db/aristo/README.md
diff --git a/nimbus/db/aristo/TODO.md → execution_chain/db/aristo/TODO.md b/nimbus/db/aristo/TODO.md → execution_chain/db/aristo/TODO.md
diff --git a/nimbus/db/aristo/aristo_api.nim → execution_chain/db/aristo/aristo_api.nim b/nimbus/db/aristo/aristo_api.nim → execution_chain/db/aristo/aristo_api.nim
diff --git a/nimbus/db/aristo/aristo_blobify.nim → execution_chain/db/aristo/aristo_blobify.nim b/nimbus/db/aristo/aristo_blobify.nim → execution_chain/db/aristo/aristo_blobify.nim
diff --git a/nimbus/db/aristo/aristo_check.nim → execution_chain/db/aristo/aristo_check.nim b/nimbus/db/aristo/aristo_check.nim → execution_chain/db/aristo/aristo_check.nim
diff --git a/nimbus/db/aristo/aristo_check/check_be.nim → ...chain/db/aristo/aristo_check/check_be.nim b/nimbus/db/aristo/aristo_check/check_be.nim → ...chain/db/aristo/aristo_check/check_be.nim
diff --git a/nimbus/db/aristo/aristo_check/check_top.nim → ...hain/db/aristo/aristo_check/check_top.nim b/nimbus/db/aristo/aristo_check/check_top.nim → ...hain/db/aristo/aristo_check/check_top.nim
diff --git a/nimbus/db/aristo/aristo_check/check_twig.nim → ...ain/db/aristo/aristo_check/check_twig.nim b/nimbus/db/aristo/aristo_check/check_twig.nim → ...ain/db/aristo/aristo_check/check_twig.nim
diff --git a/nimbus/db/aristo/aristo_compute.nim → execution_chain/db/aristo/aristo_compute.nim b/nimbus/db/aristo/aristo_compute.nim → execution_chain/db/aristo/aristo_compute.nim
diff --git a/nimbus/db/aristo/aristo_constants.nim → ...tion_chain/db/aristo/aristo_constants.nim b/nimbus/db/aristo/aristo_constants.nim → ...tion_chain/db/aristo/aristo_constants.nim
diff --git a/nimbus/db/aristo/aristo_debug.nim → execution_chain/db/aristo/aristo_debug.nim b/nimbus/db/aristo/aristo_debug.nim → execution_chain/db/aristo/aristo_debug.nim
diff --git a/nimbus/db/aristo/aristo_delete.nim → execution_chain/db/aristo/aristo_delete.nim b/nimbus/db/aristo/aristo_delete.nim → execution_chain/db/aristo/aristo_delete.nim
diff --git a/...b/aristo/aristo_delete/delete_subtree.nim → ...b/aristo/aristo_delete/delete_subtree.nim b/...b/aristo/aristo_delete/delete_subtree.nim → ...b/aristo/aristo_delete/delete_subtree.nim
diff --git a/nimbus/db/aristo/aristo_delta.nim → execution_chain/db/aristo/aristo_delta.nim b/nimbus/db/aristo/aristo_delta.nim → execution_chain/db/aristo/aristo_delta.nim
diff --git a/nimbus/db/aristo/aristo_desc.nim → execution_chain/db/aristo/aristo_desc.nim b/nimbus/db/aristo/aristo_desc.nim → execution_chain/db/aristo/aristo_desc.nim
diff --git a/...us/db/aristo/aristo_desc/desc_backend.nim → ...in/db/aristo/aristo_desc/desc_backend.nim b/...us/db/aristo/aristo_desc/desc_backend.nim → ...in/db/aristo/aristo_desc/desc_backend.nim
diff --git a/nimbus/db/aristo/aristo_desc/desc_error.nim → ...hain/db/aristo/aristo_desc/desc_error.nim b/nimbus/db/aristo/aristo_desc/desc_error.nim → ...hain/db/aristo/aristo_desc/desc_error.nim
diff --git a/...b/aristo/aristo_desc/desc_identifiers.nim → ...b/aristo/aristo_desc/desc_identifiers.nim b/...b/aristo/aristo_desc/desc_identifiers.nim → ...b/aristo/aristo_desc/desc_identifiers.nim
diff --git a/...us/db/aristo/aristo_desc/desc_nibbles.nim → ...in/db/aristo/aristo_desc/desc_nibbles.nim b/...us/db/aristo/aristo_desc/desc_nibbles.nim → ...in/db/aristo/aristo_desc/desc_nibbles.nim
diff --git a/...db/aristo/aristo_desc/desc_structural.nim → ...db/aristo/aristo_desc/desc_structural.nim b/...db/aristo/aristo_desc/desc_structural.nim → ...db/aristo/aristo_desc/desc_structural.nim
diff --git a/nimbus/db/aristo/aristo_fetch.nim → execution_chain/db/aristo/aristo_fetch.nim b/nimbus/db/aristo/aristo_fetch.nim → execution_chain/db/aristo/aristo_fetch.nim
diff --git a/nimbus/db/aristo/aristo_get.nim → execution_chain/db/aristo/aristo_get.nim b/nimbus/db/aristo/aristo_get.nim → execution_chain/db/aristo/aristo_get.nim
diff --git a/nimbus/db/aristo/aristo_hike.nim → execution_chain/db/aristo/aristo_hike.nim b/nimbus/db/aristo/aristo_hike.nim → execution_chain/db/aristo/aristo_hike.nim
diff --git a/nimbus/db/aristo/aristo_init.nim → execution_chain/db/aristo/aristo_init.nim b/nimbus/db/aristo/aristo_init.nim → execution_chain/db/aristo/aristo_init.nim
diff --git a/nimbus/db/aristo/aristo_init/init_common.nim → ...ain/db/aristo/aristo_init/init_common.nim b/nimbus/db/aristo/aristo_init/init_common.nim → ...ain/db/aristo/aristo_init/init_common.nim
diff --git a/nimbus/db/aristo/aristo_init/memory_db.nim → ...chain/db/aristo/aristo_init/memory_db.nim b/nimbus/db/aristo/aristo_init/memory_db.nim → ...chain/db/aristo/aristo_init/memory_db.nim
diff --git a/nimbus/db/aristo/aristo_init/memory_only.nim → ...ain/db/aristo/aristo_init/memory_only.nim b/nimbus/db/aristo/aristo_init/memory_only.nim → ...ain/db/aristo/aristo_init/memory_only.nim
diff --git a/nimbus/db/aristo/aristo_init/persistent.nim → ...hain/db/aristo/aristo_init/persistent.nim b/nimbus/db/aristo/aristo_init/persistent.nim → ...hain/db/aristo/aristo_init/persistent.nim
diff --git a/nimbus/db/aristo/aristo_init/rocks_db.nim → ..._chain/db/aristo/aristo_init/rocks_db.nim b/nimbus/db/aristo/aristo_init/rocks_db.nim → ..._chain/db/aristo/aristo_init/rocks_db.nim
diff --git a/.../aristo/aristo_init/rocks_db/rdb_desc.nim → .../aristo/aristo_init/rocks_db/rdb_desc.nim b/.../aristo/aristo_init/rocks_db/rdb_desc.nim → .../aristo/aristo_init/rocks_db/rdb_desc.nim
diff --git a/...b/aristo/aristo_init/rocks_db/rdb_get.nim → ...b/aristo/aristo_init/rocks_db/rdb_get.nim b/...b/aristo/aristo_init/rocks_db/rdb_get.nim → ...b/aristo/aristo_init/rocks_db/rdb_get.nim
diff --git a/.../aristo/aristo_init/rocks_db/rdb_init.nim → .../aristo/aristo_init/rocks_db/rdb_init.nim b/.../aristo/aristo_init/rocks_db/rdb_init.nim → .../aristo/aristo_init/rocks_db/rdb_init.nim
diff --git a/...b/aristo/aristo_init/rocks_db/rdb_put.nim → ...b/aristo/aristo_init/rocks_db/rdb_put.nim b/...b/aristo/aristo_init/rocks_db/rdb_put.nim → ...b/aristo/aristo_init/rocks_db/rdb_put.nim
diff --git a/.../aristo/aristo_init/rocks_db/rdb_walk.nim → .../aristo/aristo_init/rocks_db/rdb_walk.nim b/.../aristo/aristo_init/rocks_db/rdb_walk.nim → .../aristo/aristo_init/rocks_db/rdb_walk.nim
diff --git a/nimbus/db/aristo/aristo_layers.nim → execution_chain/db/aristo/aristo_layers.nim b/nimbus/db/aristo/aristo_layers.nim → execution_chain/db/aristo/aristo_layers.nim
diff --git a/nimbus/db/aristo/aristo_merge.nim → execution_chain/db/aristo/aristo_merge.nim b/nimbus/db/aristo/aristo_merge.nim → execution_chain/db/aristo/aristo_merge.nim
diff --git a/nimbus/db/aristo/aristo_nearby.nim → execution_chain/db/aristo/aristo_nearby.nim b/nimbus/db/aristo/aristo_nearby.nim → execution_chain/db/aristo/aristo_nearby.nim
diff --git a/nimbus/db/aristo/aristo_part.nim → execution_chain/db/aristo/aristo_part.nim b/nimbus/db/aristo/aristo_part.nim → execution_chain/db/aristo/aristo_part.nim
diff --git a/.../db/aristo/aristo_part/part_chain_rlp.nim → .../db/aristo/aristo_part/part_chain_rlp.nim b/.../db/aristo/aristo_part/part_chain_rlp.nim → .../db/aristo/aristo_part/part_chain_rlp.nim
diff --git a/nimbus/db/aristo/aristo_part/part_ctx.nim → ..._chain/db/aristo/aristo_part/part_ctx.nim b/nimbus/db/aristo/aristo_part/part_ctx.nim → ..._chain/db/aristo/aristo_part/part_ctx.nim
diff --git a/nimbus/db/aristo/aristo_part/part_debug.nim → ...hain/db/aristo/aristo_part/part_debug.nim b/nimbus/db/aristo/aristo_part/part_debug.nim → ...hain/db/aristo/aristo_part/part_debug.nim
diff --git a/nimbus/db/aristo/aristo_part/part_desc.nim → ...chain/db/aristo/aristo_part/part_desc.nim b/nimbus/db/aristo/aristo_part/part_desc.nim → ...chain/db/aristo/aristo_part/part_desc.nim
diff --git a/...us/db/aristo/aristo_part/part_helpers.nim → ...in/db/aristo/aristo_part/part_helpers.nim b/...us/db/aristo/aristo_part/part_helpers.nim → ...in/db/aristo/aristo_part/part_helpers.nim
diff --git a/nimbus/db/aristo/aristo_path.nim → execution_chain/db/aristo/aristo_path.nim b/nimbus/db/aristo/aristo_path.nim → execution_chain/db/aristo/aristo_path.nim
diff --git a/nimbus/db/aristo/aristo_persistent.nim → ...ion_chain/db/aristo/aristo_persistent.nim b/nimbus/db/aristo/aristo_persistent.nim → ...ion_chain/db/aristo/aristo_persistent.nim
diff --git a/nimbus/db/aristo/aristo_profile.nim → execution_chain/db/aristo/aristo_profile.nim b/nimbus/db/aristo/aristo_profile.nim → execution_chain/db/aristo/aristo_profile.nim
diff --git a/nimbus/db/aristo/aristo_serialise.nim → ...tion_chain/db/aristo/aristo_serialise.nim b/nimbus/db/aristo/aristo_serialise.nim → ...tion_chain/db/aristo/aristo_serialise.nim
diff --git a/nimbus/db/aristo/aristo_tx.nim → execution_chain/db/aristo/aristo_tx.nim b/nimbus/db/aristo/aristo_tx.nim → execution_chain/db/aristo/aristo_tx.nim
diff --git a/nimbus/db/aristo/aristo_tx/tx_frame.nim → ...on_chain/db/aristo/aristo_tx/tx_frame.nim b/nimbus/db/aristo/aristo_tx/tx_frame.nim → ...on_chain/db/aristo/aristo_tx/tx_frame.nim
diff --git a/nimbus/db/aristo/aristo_tx/tx_stow.nim → ...ion_chain/db/aristo/aristo_tx/tx_stow.nim b/nimbus/db/aristo/aristo_tx/tx_stow.nim → ...ion_chain/db/aristo/aristo_tx/tx_stow.nim
diff --git a/nimbus/db/aristo/aristo_utils.nim → execution_chain/db/aristo/aristo_utils.nim b/nimbus/db/aristo/aristo_utils.nim → execution_chain/db/aristo/aristo_utils.nim
diff --git a/nimbus/db/aristo/aristo_vid.nim → execution_chain/db/aristo/aristo_vid.nim b/nimbus/db/aristo/aristo_vid.nim → execution_chain/db/aristo/aristo_vid.nim
diff --git a/nimbus/db/aristo/aristo_walk/memory_only.nim → ...ain/db/aristo/aristo_walk/memory_only.nim b/nimbus/db/aristo/aristo_walk/memory_only.nim → ...ain/db/aristo/aristo_walk/memory_only.nim
diff --git a/nimbus/db/aristo/aristo_walk/persistent.nim → ...hain/db/aristo/aristo_walk/persistent.nim b/nimbus/db/aristo/aristo_walk/persistent.nim → ...hain/db/aristo/aristo_walk/persistent.nim
diff --git a/...us/db/aristo/aristo_walk/walk_private.nim → ...in/db/aristo/aristo_walk/walk_private.nim b/...us/db/aristo/aristo_walk/walk_private.nim → ...in/db/aristo/aristo_walk/walk_private.nim
diff --git a/nimbus/db/core_db.nim → execution_chain/db/core_db.nim b/nimbus/db/core_db.nim → execution_chain/db/core_db.nim
diff --git a/nimbus/db/core_db/README.md → execution_chain/db/core_db/README.md b/nimbus/db/core_db/README.md → execution_chain/db/core_db/README.md
diff --git a/nimbus/db/core_db/TODO.md → execution_chain/db/core_db/TODO.md b/nimbus/db/core_db/TODO.md → execution_chain/db/core_db/TODO.md
diff --git a/nimbus/db/core_db/backend/aristo_db.nim → ...on_chain/db/core_db/backend/aristo_db.nim b/nimbus/db/core_db/backend/aristo_db.nim → ...on_chain/db/core_db/backend/aristo_db.nim
diff --git a/nimbus/db/core_db/backend/aristo_rocksdb.nim → ...ain/db/core_db/backend/aristo_rocksdb.nim b/nimbus/db/core_db/backend/aristo_rocksdb.nim → ...ain/db/core_db/backend/aristo_rocksdb.nim
diff --git a/nimbus/db/core_db/backend/aristo_trace.nim → ...chain/db/core_db/backend/aristo_trace.nim b/nimbus/db/core_db/backend/aristo_trace.nim → ...chain/db/core_db/backend/aristo_trace.nim
diff --git a/nimbus/db/core_db/base.nim → execution_chain/db/core_db/base.nim b/nimbus/db/core_db/base.nim → execution_chain/db/core_db/base.nim
diff --git a/nimbus/db/core_db/base/api_tracking.nim → ...on_chain/db/core_db/base/api_tracking.nim b/nimbus/db/core_db/base/api_tracking.nim → ...on_chain/db/core_db/base/api_tracking.nim
diff --git a/nimbus/db/core_db/base/base_config.nim → ...ion_chain/db/core_db/base/base_config.nim b/nimbus/db/core_db/base/base_config.nim → ...ion_chain/db/core_db/base/base_config.nim
diff --git a/nimbus/db/core_db/base/base_desc.nim → ...ution_chain/db/core_db/base/base_desc.nim b/nimbus/db/core_db/base/base_desc.nim → ...ution_chain/db/core_db/base/base_desc.nim
diff --git a/nimbus/db/core_db/base/base_helpers.nim → ...on_chain/db/core_db/base/base_helpers.nim b/nimbus/db/core_db/base/base_helpers.nim → ...on_chain/db/core_db/base/base_helpers.nim
diff --git a/nimbus/db/core_db/base/base_validate.nim → ...n_chain/db/core_db/base/base_validate.nim b/nimbus/db/core_db/base/base_validate.nim → ...n_chain/db/core_db/base/base_validate.nim
diff --git a/nimbus/db/core_db/base_iterators.nim → ...ution_chain/db/core_db/base_iterators.nim b/nimbus/db/core_db/base_iterators.nim → ...ution_chain/db/core_db/base_iterators.nim
diff --git a/nimbus/db/core_db/core_apps.nim → execution_chain/db/core_db/core_apps.nim b/nimbus/db/core_db/core_apps.nim → execution_chain/db/core_db/core_apps.nim
diff --git a/nimbus/db/core_db/memory_only.nim → execution_chain/db/core_db/memory_only.nim b/nimbus/db/core_db/memory_only.nim → execution_chain/db/core_db/memory_only.nim
diff --git a/nimbus/db/core_db/persistent.nim → execution_chain/db/core_db/persistent.nim b/nimbus/db/core_db/persistent.nim → execution_chain/db/core_db/persistent.nim
diff --git a/nimbus/db/era1_db.nim → execution_chain/db/era1_db.nim b/nimbus/db/era1_db.nim → execution_chain/db/era1_db.nim
diff --git a/nimbus/db/era1_db/db_desc.nim → execution_chain/db/era1_db/db_desc.nim b/nimbus/db/era1_db/db_desc.nim → execution_chain/db/era1_db/db_desc.nim
diff --git a/nimbus/db/kvstore_rocksdb.nim → execution_chain/db/kvstore_rocksdb.nim b/nimbus/db/kvstore_rocksdb.nim → execution_chain/db/kvstore_rocksdb.nim
diff --git a/nimbus/db/kvt.nim → execution_chain/db/kvt.nim b/nimbus/db/kvt.nim → execution_chain/db/kvt.nim
diff --git a/nimbus/db/kvt/kvt_api.nim → execution_chain/db/kvt/kvt_api.nim b/nimbus/db/kvt/kvt_api.nim → execution_chain/db/kvt/kvt_api.nim
diff --git a/nimbus/db/kvt/kvt_constants.nim → execution_chain/db/kvt/kvt_constants.nim b/nimbus/db/kvt/kvt_constants.nim → execution_chain/db/kvt/kvt_constants.nim
diff --git a/nimbus/db/kvt/kvt_debug.nim → execution_chain/db/kvt/kvt_debug.nim b/nimbus/db/kvt/kvt_debug.nim → execution_chain/db/kvt/kvt_debug.nim
diff --git a/nimbus/db/kvt/kvt_delta.nim → execution_chain/db/kvt/kvt_delta.nim b/nimbus/db/kvt/kvt_delta.nim → execution_chain/db/kvt/kvt_delta.nim
diff --git a/nimbus/db/kvt/kvt_desc.nim → execution_chain/db/kvt/kvt_desc.nim b/nimbus/db/kvt/kvt_desc.nim → execution_chain/db/kvt/kvt_desc.nim
diff --git a/nimbus/db/kvt/kvt_desc/desc_backend.nim → ...on_chain/db/kvt/kvt_desc/desc_backend.nim b/nimbus/db/kvt/kvt_desc/desc_backend.nim → ...on_chain/db/kvt/kvt_desc/desc_backend.nim
diff --git a/nimbus/db/kvt/kvt_desc/desc_error.nim → ...tion_chain/db/kvt/kvt_desc/desc_error.nim b/nimbus/db/kvt/kvt_desc/desc_error.nim → ...tion_chain/db/kvt/kvt_desc/desc_error.nim
diff --git a/nimbus/db/kvt/kvt_desc/desc_structural.nim → ...chain/db/kvt/kvt_desc/desc_structural.nim b/nimbus/db/kvt/kvt_desc/desc_structural.nim → ...chain/db/kvt/kvt_desc/desc_structural.nim
diff --git a/nimbus/db/kvt/kvt_init.nim → execution_chain/db/kvt/kvt_init.nim b/nimbus/db/kvt/kvt_init.nim → execution_chain/db/kvt/kvt_init.nim
diff --git a/nimbus/db/kvt/kvt_init/init_common.nim → ...ion_chain/db/kvt/kvt_init/init_common.nim b/nimbus/db/kvt/kvt_init/init_common.nim → ...ion_chain/db/kvt/kvt_init/init_common.nim
diff --git a/nimbus/db/kvt/kvt_init/memory_db.nim → ...ution_chain/db/kvt/kvt_init/memory_db.nim b/nimbus/db/kvt/kvt_init/memory_db.nim → ...ution_chain/db/kvt/kvt_init/memory_db.nim
diff --git a/nimbus/db/kvt/kvt_init/memory_only.nim → ...ion_chain/db/kvt/kvt_init/memory_only.nim b/nimbus/db/kvt/kvt_init/memory_only.nim → ...ion_chain/db/kvt/kvt_init/memory_only.nim
diff --git a/nimbus/db/kvt/kvt_init/persistent.nim → ...tion_chain/db/kvt/kvt_init/persistent.nim b/nimbus/db/kvt/kvt_init/persistent.nim → ...tion_chain/db/kvt/kvt_init/persistent.nim
diff --git a/nimbus/db/kvt/kvt_init/rocks_db.nim → execution_chain/db/kvt/kvt_init/rocks_db.nim b/nimbus/db/kvt/kvt_init/rocks_db.nim → execution_chain/db/kvt/kvt_init/rocks_db.nim
diff --git a/nimbus/db/kvt/kvt_init/rocks_db/rdb_desc.nim → ...ain/db/kvt/kvt_init/rocks_db/rdb_desc.nim b/nimbus/db/kvt/kvt_init/rocks_db/rdb_desc.nim → ...ain/db/kvt/kvt_init/rocks_db/rdb_desc.nim
diff --git a/nimbus/db/kvt/kvt_init/rocks_db/rdb_get.nim → ...hain/db/kvt/kvt_init/rocks_db/rdb_get.nim b/nimbus/db/kvt/kvt_init/rocks_db/rdb_get.nim → ...hain/db/kvt/kvt_init/rocks_db/rdb_get.nim
diff --git a/nimbus/db/kvt/kvt_init/rocks_db/rdb_init.nim → ...ain/db/kvt/kvt_init/rocks_db/rdb_init.nim b/nimbus/db/kvt/kvt_init/rocks_db/rdb_init.nim → ...ain/db/kvt/kvt_init/rocks_db/rdb_init.nim
diff --git a/nimbus/db/kvt/kvt_init/rocks_db/rdb_put.nim → ...hain/db/kvt/kvt_init/rocks_db/rdb_put.nim b/nimbus/db/kvt/kvt_init/rocks_db/rdb_put.nim → ...hain/db/kvt/kvt_init/rocks_db/rdb_put.nim
diff --git a/nimbus/db/kvt/kvt_init/rocks_db/rdb_walk.nim → ...ain/db/kvt/kvt_init/rocks_db/rdb_walk.nim b/nimbus/db/kvt/kvt_init/rocks_db/rdb_walk.nim → ...ain/db/kvt/kvt_init/rocks_db/rdb_walk.nim
diff --git a/nimbus/db/kvt/kvt_layers.nim → execution_chain/db/kvt/kvt_layers.nim b/nimbus/db/kvt/kvt_layers.nim → execution_chain/db/kvt/kvt_layers.nim
diff --git a/nimbus/db/kvt/kvt_persistent.nim → execution_chain/db/kvt/kvt_persistent.nim b/nimbus/db/kvt/kvt_persistent.nim → execution_chain/db/kvt/kvt_persistent.nim
diff --git a/nimbus/db/kvt/kvt_tx.nim → execution_chain/db/kvt/kvt_tx.nim b/nimbus/db/kvt/kvt_tx.nim → execution_chain/db/kvt/kvt_tx.nim
diff --git a/nimbus/db/kvt/kvt_tx/tx_frame.nim → execution_chain/db/kvt/kvt_tx/tx_frame.nim b/nimbus/db/kvt/kvt_tx/tx_frame.nim → execution_chain/db/kvt/kvt_tx/tx_frame.nim
diff --git a/nimbus/db/kvt/kvt_tx/tx_stow.nim → execution_chain/db/kvt/kvt_tx/tx_stow.nim b/nimbus/db/kvt/kvt_tx/tx_stow.nim → execution_chain/db/kvt/kvt_tx/tx_stow.nim
diff --git a/nimbus/db/kvt/kvt_utils.nim → execution_chain/db/kvt/kvt_utils.nim b/nimbus/db/kvt/kvt_utils.nim → execution_chain/db/kvt/kvt_utils.nim
diff --git a/nimbus/db/kvt/kvt_walk/memory_only.nim → ...ion_chain/db/kvt/kvt_walk/memory_only.nim b/nimbus/db/kvt/kvt_walk/memory_only.nim → ...ion_chain/db/kvt/kvt_walk/memory_only.nim
diff --git a/nimbus/db/kvt/kvt_walk/persistent.nim → ...tion_chain/db/kvt/kvt_walk/persistent.nim b/nimbus/db/kvt/kvt_walk/persistent.nim → ...tion_chain/db/kvt/kvt_walk/persistent.nim
diff --git a/nimbus/db/kvt/kvt_walk/walk_private.nim → ...on_chain/db/kvt/kvt_walk/walk_private.nim b/nimbus/db/kvt/kvt_walk/walk_private.nim → ...on_chain/db/kvt/kvt_walk/walk_private.nim
diff --git a/nimbus/db/ledger.nim → execution_chain/db/ledger.nim b/nimbus/db/ledger.nim → execution_chain/db/ledger.nim
diff --git a/nimbus/db/opts.nim → execution_chain/db/opts.nim b/nimbus/db/opts.nim → execution_chain/db/opts.nim
diff --git a/nimbus/db/storage_types.nim → execution_chain/db/storage_types.nim b/nimbus/db/storage_types.nim → execution_chain/db/storage_types.nim
diff --git a/nimbus/db/transient_storage.nim → execution_chain/db/transient_storage.nim b/nimbus/db/transient_storage.nim → execution_chain/db/transient_storage.nim
diff --git a/nimbus/errors.nim → execution_chain/errors.nim b/nimbus/errors.nim → execution_chain/errors.nim
diff --git a/nimbus/evm/blake2b_f.nim → execution_chain/evm/blake2b_f.nim b/nimbus/evm/blake2b_f.nim → execution_chain/evm/blake2b_f.nim
diff --git a/nimbus/evm/blscurve.nim → execution_chain/evm/blscurve.nim b/nimbus/evm/blscurve.nim → execution_chain/evm/blscurve.nim
diff --git a/nimbus/evm/code_bytes.nim → execution_chain/evm/code_bytes.nim b/nimbus/evm/code_bytes.nim → execution_chain/evm/code_bytes.nim
diff --git a/nimbus/evm/code_stream.nim → execution_chain/evm/code_stream.nim b/nimbus/evm/code_stream.nim → execution_chain/evm/code_stream.nim
diff --git a/nimbus/evm/computation.nim → execution_chain/evm/computation.nim b/nimbus/evm/computation.nim → execution_chain/evm/computation.nim
diff --git a/nimbus/evm/evm_errors.nim → execution_chain/evm/evm_errors.nim b/nimbus/evm/evm_errors.nim → execution_chain/evm/evm_errors.nim
diff --git a/nimbus/evm/evmc_api.nim → execution_chain/evm/evmc_api.nim b/nimbus/evm/evmc_api.nim → execution_chain/evm/evmc_api.nim
diff --git a/nimbus/evm/evmc_helpers.nim → execution_chain/evm/evmc_helpers.nim b/nimbus/evm/evmc_helpers.nim → execution_chain/evm/evmc_helpers.nim
diff --git a/nimbus/evm/internals.nim → execution_chain/evm/internals.nim b/nimbus/evm/internals.nim → execution_chain/evm/internals.nim
diff --git a/nimbus/evm/interpreter/evmc_gas_costs.nim → ..._chain/evm/interpreter/evmc_gas_costs.nim b/nimbus/evm/interpreter/evmc_gas_costs.nim → ..._chain/evm/interpreter/evmc_gas_costs.nim
diff --git a/nimbus/evm/interpreter/forks_list.md → ...ution_chain/evm/interpreter/forks_list.md b/nimbus/evm/interpreter/forks_list.md → ...ution_chain/evm/interpreter/forks_list.md
diff --git a/nimbus/evm/interpreter/forks_list.png → ...tion_chain/evm/interpreter/forks_list.png b/nimbus/evm/interpreter/forks_list.png → ...tion_chain/evm/interpreter/forks_list.png
diff --git a/nimbus/evm/interpreter/gas_costs.nim → ...ution_chain/evm/interpreter/gas_costs.nim b/nimbus/evm/interpreter/gas_costs.nim → ...ution_chain/evm/interpreter/gas_costs.nim
diff --git a/nimbus/evm/interpreter/gas_meter.nim → ...ution_chain/evm/interpreter/gas_meter.nim b/nimbus/evm/interpreter/gas_meter.nim → ...ution_chain/evm/interpreter/gas_meter.nim
diff --git a/nimbus/evm/interpreter/op_codes.nim → execution_chain/evm/interpreter/op_codes.nim b/nimbus/evm/interpreter/op_codes.nim → execution_chain/evm/interpreter/op_codes.nim
diff --git a/nimbus/evm/interpreter/op_dispatcher.nim → ...n_chain/evm/interpreter/op_dispatcher.nim b/nimbus/evm/interpreter/op_dispatcher.nim → ...n_chain/evm/interpreter/op_dispatcher.nim
diff --git a/nimbus/evm/interpreter/op_handlers.nim → ...ion_chain/evm/interpreter/op_handlers.nim b/nimbus/evm/interpreter/op_handlers.nim → ...ion_chain/evm/interpreter/op_handlers.nim
diff --git a/...nterpreter/op_handlers/oph_arithmetic.nim → ...nterpreter/op_handlers/oph_arithmetic.nim b/...nterpreter/op_handlers/oph_arithmetic.nim → ...nterpreter/op_handlers/oph_arithmetic.nim
diff --git a/...interpreter/op_handlers/oph_blockdata.nim → ...interpreter/op_handlers/oph_blockdata.nim b/...interpreter/op_handlers/oph_blockdata.nim → ...interpreter/op_handlers/oph_blockdata.nim
diff --git a/.../evm/interpreter/op_handlers/oph_call.nim → .../evm/interpreter/op_handlers/oph_call.nim b/.../evm/interpreter/op_handlers/oph_call.nim → .../evm/interpreter/op_handlers/oph_call.nim
diff --git a/...vm/interpreter/op_handlers/oph_create.nim → ...vm/interpreter/op_handlers/oph_create.nim b/...vm/interpreter/op_handlers/oph_create.nim → ...vm/interpreter/op_handlers/oph_create.nim
diff --git a/.../evm/interpreter/op_handlers/oph_defs.nim → .../evm/interpreter/op_handlers/oph_defs.nim b/.../evm/interpreter/op_handlers/oph_defs.nim → .../evm/interpreter/op_handlers/oph_defs.nim
diff --git a/...s/evm/interpreter/op_handlers/oph_dup.nim → ...n/evm/interpreter/op_handlers/oph_dup.nim b/...s/evm/interpreter/op_handlers/oph_dup.nim → ...n/evm/interpreter/op_handlers/oph_dup.nim
diff --git a/...m/interpreter/op_handlers/oph_envinfo.nim → ...m/interpreter/op_handlers/oph_envinfo.nim b/...m/interpreter/op_handlers/oph_envinfo.nim → ...m/interpreter/op_handlers/oph_envinfo.nim
diff --git a/...erpreter/op_handlers/oph_gen_handlers.nim → ...erpreter/op_handlers/oph_gen_handlers.nim b/...erpreter/op_handlers/oph_gen_handlers.nim → ...erpreter/op_handlers/oph_gen_handlers.nim
diff --git a/.../evm/interpreter/op_handlers/oph_hash.nim → .../evm/interpreter/op_handlers/oph_hash.nim b/.../evm/interpreter/op_handlers/oph_hash.nim → .../evm/interpreter/op_handlers/oph_hash.nim
diff --git a/...m/interpreter/op_handlers/oph_helpers.nim → ...m/interpreter/op_handlers/oph_helpers.nim b/...m/interpreter/op_handlers/oph_helpers.nim → ...m/interpreter/op_handlers/oph_helpers.nim
diff --git a/...s/evm/interpreter/op_handlers/oph_log.nim → ...n/evm/interpreter/op_handlers/oph_log.nim b/...s/evm/interpreter/op_handlers/oph_log.nim → ...n/evm/interpreter/op_handlers/oph_log.nim
diff --git a/...vm/interpreter/op_handlers/oph_memory.nim → ...vm/interpreter/op_handlers/oph_memory.nim b/...vm/interpreter/op_handlers/oph_memory.nim → ...vm/interpreter/op_handlers/oph_memory.nim
diff --git a/.../evm/interpreter/op_handlers/oph_push.nim → .../evm/interpreter/op_handlers/oph_push.nim b/.../evm/interpreter/op_handlers/oph_push.nim → .../evm/interpreter/op_handlers/oph_push.nim
diff --git a/.../evm/interpreter/op_handlers/oph_swap.nim → .../evm/interpreter/op_handlers/oph_swap.nim b/.../evm/interpreter/op_handlers/oph_swap.nim → .../evm/interpreter/op_handlers/oph_swap.nim
diff --git a/...vm/interpreter/op_handlers/oph_sysops.nim → ...vm/interpreter/op_handlers/oph_sysops.nim b/...vm/interpreter/op_handlers/oph_sysops.nim → ...vm/interpreter/op_handlers/oph_sysops.nim
diff --git a/.../interpreter/utils/macros_gen_opcodes.nim → .../interpreter/utils/macros_gen_opcodes.nim b/.../interpreter/utils/macros_gen_opcodes.nim → .../interpreter/utils/macros_gen_opcodes.nim
diff --git a/...s/evm/interpreter/utils/utils_numeric.nim → ...n/evm/interpreter/utils/utils_numeric.nim b/...s/evm/interpreter/utils/utils_numeric.nim → ...n/evm/interpreter/utils/utils_numeric.nim
@@ -1,5 +1,5 @@
 # Nimbus
-# Copyright (c) 2018-2024 Status Research & Development GmbH
+# Copyright (c) 2018-2025 Status Research & Development GmbH
 # Licensed under either of
 #  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
 #  * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)

diff --git a/nimbus/evm/interpreter_dispatch.nim → execution_chain/evm/interpreter_dispatch.nim b/nimbus/evm/interpreter_dispatch.nim → execution_chain/evm/interpreter_dispatch.nim
diff --git a/nimbus/evm/memory.nim → execution_chain/evm/memory.nim b/nimbus/evm/memory.nim → execution_chain/evm/memory.nim
diff --git a/nimbus/evm/message.nim → execution_chain/evm/message.nim b/nimbus/evm/message.nim → execution_chain/evm/message.nim
diff --git a/nimbus/evm/modexp.nim → execution_chain/evm/modexp.nim b/nimbus/evm/modexp.nim → execution_chain/evm/modexp.nim
diff --git a/nimbus/evm/nimdoc.cfg → execution_chain/evm/nimdoc.cfg b/nimbus/evm/nimdoc.cfg → execution_chain/evm/nimdoc.cfg
diff --git a/nimbus/evm/precompiles.nim → execution_chain/evm/precompiles.nim b/nimbus/evm/precompiles.nim → execution_chain/evm/precompiles.nim
diff --git a/nimbus/evm/stack.nim → execution_chain/evm/stack.nim b/nimbus/evm/stack.nim → execution_chain/evm/stack.nim
diff --git a/nimbus/evm/state.nim → execution_chain/evm/state.nim b/nimbus/evm/state.nim → execution_chain/evm/state.nim
diff --git a/nimbus/evm/tracer/access_list_tracer.nim → ...n_chain/evm/tracer/access_list_tracer.nim b/nimbus/evm/tracer/access_list_tracer.nim → ...n_chain/evm/tracer/access_list_tracer.nim
diff --git a/nimbus/evm/tracer/json_tracer.nim → execution_chain/evm/tracer/json_tracer.nim b/nimbus/evm/tracer/json_tracer.nim → execution_chain/evm/tracer/json_tracer.nim
diff --git a/nimbus/evm/tracer/legacy_tracer.nim → execution_chain/evm/tracer/legacy_tracer.nim b/nimbus/evm/tracer/legacy_tracer.nim → execution_chain/evm/tracer/legacy_tracer.nim
diff --git a/nimbus/evm/types.nim → execution_chain/evm/types.nim b/nimbus/evm/types.nim → execution_chain/evm/types.nim
diff --git a/nimbus/graphql/ethapi.nim → execution_chain/graphql/ethapi.nim b/nimbus/graphql/ethapi.nim → execution_chain/graphql/ethapi.nim
diff --git a/nimbus/graphql/ethapi.ql → execution_chain/graphql/ethapi.ql b/nimbus/graphql/ethapi.ql → execution_chain/graphql/ethapi.ql
diff --git a/nimbus/makefile → execution_chain/makefile b/nimbus/makefile → execution_chain/makefile
diff --git a/nimbus/nim.cfg → execution_chain/nim.cfg b/nimbus/nim.cfg → execution_chain/nim.cfg
diff --git a/nimbus/nimbus_desc.nim → execution_chain/nimbus_desc.nim b/nimbus/nimbus_desc.nim → execution_chain/nimbus_desc.nim
diff --git a/nimbus/nimbus_execution_client.nim → execution_chain/nimbus_execution_client.nim b/nimbus/nimbus_execution_client.nim → execution_chain/nimbus_execution_client.nim
@@ -8,7 +8,7 @@
 # those terms.
 
 import
-  ../nimbus/compile_info
+  ../execution_chain/compile_info
 
 import
   std/[os, osproc, strutils, net],

diff --git a/nimbus/nimbus_execution_client.nim.cfg → ...ion_chain/nimbus_execution_client.nim.cfg b/nimbus/nimbus_execution_client.nim.cfg → ...ion_chain/nimbus_execution_client.nim.cfg
diff --git a/nimbus/nimbus_import.nim → execution_chain/nimbus_import.nim b/nimbus/nimbus_import.nim → execution_chain/nimbus_import.nim
diff --git a/nimbus/rpc.nim → execution_chain/rpc.nim b/nimbus/rpc.nim → execution_chain/rpc.nim
diff --git a/nimbus/rpc/common.nim → execution_chain/rpc/common.nim b/nimbus/rpc/common.nim → execution_chain/rpc/common.nim
diff --git a/nimbus/rpc/cors.nim → execution_chain/rpc/cors.nim b/nimbus/rpc/cors.nim → execution_chain/rpc/cors.nim
diff --git a/nimbus/rpc/debug.nim → execution_chain/rpc/debug.nim b/nimbus/rpc/debug.nim → execution_chain/rpc/debug.nim
diff --git a/nimbus/rpc/engine_api.nim → execution_chain/rpc/engine_api.nim b/nimbus/rpc/engine_api.nim → execution_chain/rpc/engine_api.nim
diff --git a/nimbus/rpc/filters.nim → execution_chain/rpc/filters.nim b/nimbus/rpc/filters.nim → execution_chain/rpc/filters.nim
diff --git a/nimbus/rpc/jwt_auth.nim → execution_chain/rpc/jwt_auth.nim b/nimbus/rpc/jwt_auth.nim → execution_chain/rpc/jwt_auth.nim
diff --git a/nimbus/rpc/jwt_auth_helper.nim → execution_chain/rpc/jwt_auth_helper.nim b/nimbus/rpc/jwt_auth_helper.nim → execution_chain/rpc/jwt_auth_helper.nim
diff --git a/nimbus/rpc/oracle.nim → execution_chain/rpc/oracle.nim b/nimbus/rpc/oracle.nim → execution_chain/rpc/oracle.nim
diff --git a/nimbus/rpc/params.nim → execution_chain/rpc/params.nim b/nimbus/rpc/params.nim → execution_chain/rpc/params.nim
diff --git a/nimbus/rpc/rpc_server.nim → execution_chain/rpc/rpc_server.nim b/nimbus/rpc/rpc_server.nim → execution_chain/rpc/rpc_server.nim
diff --git a/nimbus/rpc/rpc_types.nim → execution_chain/rpc/rpc_types.nim b/nimbus/rpc/rpc_types.nim → execution_chain/rpc/rpc_types.nim
diff --git a/nimbus/rpc/rpc_utils.nim → execution_chain/rpc/rpc_utils.nim b/nimbus/rpc/rpc_utils.nim → execution_chain/rpc/rpc_utils.nim
diff --git a/nimbus/rpc/server_api.nim → execution_chain/rpc/server_api.nim b/nimbus/rpc/server_api.nim → execution_chain/rpc/server_api.nim
diff --git a/nimbus/stateless/multi_keys.nim → execution_chain/stateless/multi_keys.nim b/nimbus/stateless/multi_keys.nim → execution_chain/stateless/multi_keys.nim
diff --git a/nimbus/sync/beacon.nim → execution_chain/sync/beacon.nim b/nimbus/sync/beacon.nim → execution_chain/sync/beacon.nim
diff --git a/nimbus/sync/beacon/.gitignore → execution_chain/sync/beacon/.gitignore b/nimbus/sync/beacon/.gitignore → execution_chain/sync/beacon/.gitignore
diff --git a/nimbus/sync/beacon/README.md → execution_chain/sync/beacon/README.md b/nimbus/sync/beacon/README.md → execution_chain/sync/beacon/README.md
diff --git a/nimbus/sync/beacon/TODO.md → execution_chain/sync/beacon/TODO.md b/nimbus/sync/beacon/TODO.md → execution_chain/sync/beacon/TODO.md
diff --git a/nimbus/sync/beacon/worker.nim → execution_chain/sync/beacon/worker.nim b/nimbus/sync/beacon/worker.nim → execution_chain/sync/beacon/worker.nim
diff --git a/nimbus/sync/beacon/worker/blocks_staged.nim → ...hain/sync/beacon/worker/blocks_staged.nim b/nimbus/sync/beacon/worker/blocks_staged.nim → ...hain/sync/beacon/worker/blocks_staged.nim
diff --git a/...nc/beacon/worker/blocks_staged/bodies.nim → ...nc/beacon/worker/blocks_staged/bodies.nim b/...nc/beacon/worker/blocks_staged/bodies.nim → ...nc/beacon/worker/blocks_staged/bodies.nim
diff --git a/...con/worker/blocks_staged/staged_queue.nim → ...con/worker/blocks_staged/staged_queue.nim b/...con/worker/blocks_staged/staged_queue.nim → ...con/worker/blocks_staged/staged_queue.nim
diff --git a/nimbus/sync/beacon/worker/blocks_unproc.nim → ...hain/sync/beacon/worker/blocks_unproc.nim b/nimbus/sync/beacon/worker/blocks_unproc.nim → ...hain/sync/beacon/worker/blocks_unproc.nim
diff --git a/nimbus/sync/beacon/worker/db.nim → execution_chain/sync/beacon/worker/db.nim b/nimbus/sync/beacon/worker/db.nim → execution_chain/sync/beacon/worker/db.nim
diff --git a/nimbus/sync/beacon/worker/headers_staged.nim → ...ain/sync/beacon/worker/headers_staged.nim b/nimbus/sync/beacon/worker/headers_staged.nim → ...ain/sync/beacon/worker/headers_staged.nim
diff --git a/.../beacon/worker/headers_staged/headers.nim → .../beacon/worker/headers_staged/headers.nim b/.../beacon/worker/headers_staged/headers.nim → .../beacon/worker/headers_staged/headers.nim
diff --git a/...n/worker/headers_staged/linked_hchain.nim → ...n/worker/headers_staged/linked_hchain.nim b/...n/worker/headers_staged/linked_hchain.nim → ...n/worker/headers_staged/linked_hchain.nim
diff --git a/...on/worker/headers_staged/staged_queue.nim → ...on/worker/headers_staged/staged_queue.nim b/...on/worker/headers_staged/staged_queue.nim → ...on/worker/headers_staged/staged_queue.nim
diff --git a/nimbus/sync/beacon/worker/headers_unproc.nim → ...ain/sync/beacon/worker/headers_unproc.nim b/nimbus/sync/beacon/worker/headers_unproc.nim → ...ain/sync/beacon/worker/headers_unproc.nim
diff --git a/nimbus/sync/beacon/worker/helpers.nim → ...tion_chain/sync/beacon/worker/helpers.nim b/nimbus/sync/beacon/worker/helpers.nim → ...tion_chain/sync/beacon/worker/helpers.nim
diff --git a/nimbus/sync/beacon/worker/start_stop.nim → ...n_chain/sync/beacon/worker/start_stop.nim b/nimbus/sync/beacon/worker/start_stop.nim → ...n_chain/sync/beacon/worker/start_stop.nim
diff --git a/nimbus/sync/beacon/worker/update.nim → ...ution_chain/sync/beacon/worker/update.nim b/nimbus/sync/beacon/worker/update.nim → ...ution_chain/sync/beacon/worker/update.nim
diff --git a/nimbus/sync/beacon/worker/update/metrics.nim → ...ain/sync/beacon/worker/update/metrics.nim b/nimbus/sync/beacon/worker/update/metrics.nim → ...ain/sync/beacon/worker/update/metrics.nim
diff --git a/nimbus/sync/beacon/worker/update/ticker.nim → ...hain/sync/beacon/worker/update/ticker.nim b/nimbus/sync/beacon/worker/update/ticker.nim → ...hain/sync/beacon/worker/update/ticker.nim
diff --git a/nimbus/sync/beacon/worker_config.nim → ...ution_chain/sync/beacon/worker_config.nim b/nimbus/sync/beacon/worker_config.nim → ...ution_chain/sync/beacon/worker_config.nim
diff --git a/nimbus/sync/beacon/worker_desc.nim → execution_chain/sync/beacon/worker_desc.nim b/nimbus/sync/beacon/worker_desc.nim → execution_chain/sync/beacon/worker_desc.nim
diff --git a/nimbus/sync/handlers.nim → execution_chain/sync/handlers.nim b/nimbus/sync/handlers.nim → execution_chain/sync/handlers.nim
diff --git a/nimbus/sync/handlers/eth.nim → execution_chain/sync/handlers/eth.nim b/nimbus/sync/handlers/eth.nim → execution_chain/sync/handlers/eth.nim
diff --git a/nimbus/sync/handlers/setup.nim → execution_chain/sync/handlers/setup.nim b/nimbus/sync/handlers/setup.nim → execution_chain/sync/handlers/setup.nim
diff --git a/nimbus/sync/peers.nim → execution_chain/sync/peers.nim b/nimbus/sync/peers.nim → execution_chain/sync/peers.nim
diff --git a/nimbus/sync/protocol.nim → execution_chain/sync/protocol.nim b/nimbus/sync/protocol.nim → execution_chain/sync/protocol.nim
diff --git a/nimbus/sync/protocol/eth/eth_types.nim → ...ion_chain/sync/protocol/eth/eth_types.nim b/nimbus/sync/protocol/eth/eth_types.nim → ...ion_chain/sync/protocol/eth/eth_types.nim
diff --git a/nimbus/sync/protocol/eth68.nim → execution_chain/sync/protocol/eth68.nim b/nimbus/sync/protocol/eth68.nim → execution_chain/sync/protocol/eth68.nim
diff --git a/nimbus/sync/protocol/snap1.nim → execution_chain/sync/protocol/snap1.nim b/nimbus/sync/protocol/snap1.nim → execution_chain/sync/protocol/snap1.nim
diff --git a/nimbus/sync/protocol/trace_config.nim → ...tion_chain/sync/protocol/trace_config.nim b/nimbus/sync/protocol/trace_config.nim → ...tion_chain/sync/protocol/trace_config.nim
diff --git a/nimbus/sync/sync_desc.nim → execution_chain/sync/sync_desc.nim b/nimbus/sync/sync_desc.nim → execution_chain/sync/sync_desc.nim
diff --git a/nimbus/sync/sync_sched.nim → execution_chain/sync/sync_sched.nim b/nimbus/sync/sync_sched.nim → execution_chain/sync/sync_sched.nim
diff --git a/nimbus/tracer.nim → execution_chain/tracer.nim b/nimbus/tracer.nim → execution_chain/tracer.nim
diff --git a/nimbus/transaction.nim → execution_chain/transaction.nim b/nimbus/transaction.nim → execution_chain/transaction.nim
diff --git a/nimbus/transaction/call_common.nim → execution_chain/transaction/call_common.nim b/nimbus/transaction/call_common.nim → execution_chain/transaction/call_common.nim
diff --git a/nimbus/transaction/call_evm.nim → execution_chain/transaction/call_evm.nim b/nimbus/transaction/call_evm.nim → execution_chain/transaction/call_evm.nim
diff --git a/nimbus/transaction/call_types.nim → execution_chain/transaction/call_types.nim b/nimbus/transaction/call_types.nim → execution_chain/transaction/call_types.nim
diff --git a/nimbus/transaction/evmc_dynamic_loader.nim → ...chain/transaction/evmc_dynamic_loader.nim b/nimbus/transaction/evmc_dynamic_loader.nim → ...chain/transaction/evmc_dynamic_loader.nim
diff --git a/nimbus/transaction/evmc_host_glue.nim → ...tion_chain/transaction/evmc_host_glue.nim b/nimbus/transaction/evmc_host_glue.nim → ...tion_chain/transaction/evmc_host_glue.nim
diff --git a/nimbus/transaction/evmc_vm_glue.nim → execution_chain/transaction/evmc_vm_glue.nim b/nimbus/transaction/evmc_vm_glue.nim → execution_chain/transaction/evmc_vm_glue.nim
diff --git a/nimbus/transaction/host_call_nested.nim → ...on_chain/transaction/host_call_nested.nim b/nimbus/transaction/host_call_nested.nim → ...on_chain/transaction/host_call_nested.nim
diff --git a/nimbus/transaction/host_services.nim → ...ution_chain/transaction/host_services.nim b/nimbus/transaction/host_services.nim → ...ution_chain/transaction/host_services.nim
diff --git a/nimbus/transaction/host_trace.nim → execution_chain/transaction/host_trace.nim b/nimbus/transaction/host_trace.nim → execution_chain/transaction/host_trace.nim
diff --git a/nimbus/transaction/host_types.nim → execution_chain/transaction/host_types.nim b/nimbus/transaction/host_types.nim → execution_chain/transaction/host_types.nim
diff --git a/nimbus/utils/debug.nim → execution_chain/utils/debug.nim b/nimbus/utils/debug.nim → execution_chain/utils/debug.nim
diff --git a/nimbus/utils/era_helpers.nim → execution_chain/utils/era_helpers.nim b/nimbus/utils/era_helpers.nim → execution_chain/utils/era_helpers.nim
diff --git a/nimbus/utils/mergeutils.nim → execution_chain/utils/mergeutils.nim b/nimbus/utils/mergeutils.nim → execution_chain/utils/mergeutils.nim
diff --git a/nimbus/utils/prettify.nim → execution_chain/utils/prettify.nim b/nimbus/utils/prettify.nim → execution_chain/utils/prettify.nim
diff --git a/nimbus/utils/state_dump.nim → execution_chain/utils/state_dump.nim b/nimbus/utils/state_dump.nim → execution_chain/utils/state_dump.nim
diff --git a/nimbus/utils/utils.nim → execution_chain/utils/utils.nim b/nimbus/utils/utils.nim → execution_chain/utils/utils.nim
diff --git a/nimbus/version.nim → execution_chain/version.nim b/nimbus/version.nim → execution_chain/version.nim
diff --git a/fluffy/eth_data/era1.nim b/fluffy/eth_data/era1.nim
@@ -1,5 +1,5 @@
 # fluffy
-# Copyright (c) 2024 Status Research & Development GmbH
+# Copyright (c) 2024-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).
@@ -21,7 +21,7 @@ import
 
 from eth/common/eth_types_rlp import rlpHash
 from nimcrypto/hash import fromHex
-from ../../nimbus/utils/utils import calcTxRoot, calcReceiptsRoot
+from ../../execution_chain/utils/utils import calcTxRoot, calcReceiptsRoot
 
 export e2store.readRecord
 

diff --git a/fluffy/eth_data/history_data_json_store.nim b/fluffy/eth_data/history_data_json_store.nim
@@ -1,5 +1,5 @@
 # Nimbus - Portal Network
-# Copyright (c) 2022-2024 Status Research & Development GmbH
+# Copyright (c) 2022-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).
@@ -14,7 +14,7 @@ import
   stew/[byteutils, io2],
   chronicles,
   eth/common/[hashes, blocks, receipts, headers_rlp],
-  ../../nimbus/common/[chain_config, genesis],
+  ../../execution_chain/common/[chain_config, genesis],
   ../network/history/[history_content, validation/historical_hashes_accumulator]
 
 from eth/common/eth_types_rlp import rlpHash

diff --git a/fluffy/rpc/rpc_eth_api.nim b/fluffy/rpc/rpc_eth_api.nim
@@ -19,8 +19,8 @@ import
   ../network/beacon/beacon_light_client,
   ../version
 
-from ../../nimbus/errors import ValidationError
-from ../../nimbus/rpc/filters import headerBloomFilter, deriveLogs
+from ../../execution_chain/errors import ValidationError
+from ../../execution_chain/rpc/filters import headerBloomFilter, deriveLogs
 
 from eth/common/eth_types_rlp import rlpHash
 

diff --git a/fluffy/rpc/rpc_portal_nimbus_beacon_api.nim b/fluffy/rpc/rpc_portal_nimbus_beacon_api.nim
@@ -1,5 +1,5 @@
 # nimbus
-# Copyright (c) 2024 Status Research & Development GmbH
+# Copyright (c) 2024-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).
@@ -11,7 +11,7 @@ import json_rpc/rpcserver, ../network/beacon/beacon_network
 
 export rpcserver
 
-# Nimbus/fluffy specific RPC methods for the Portal beacon network.
+# execution_chain/fluffy specific RPC methods for the Portal beacon network.
 proc installPortalNimbusBeaconApiHandlers*(rpcServer: RpcServer, n: BeaconNetwork) =
   rpcServer.rpc("portal_nimbus_beaconSetTrustedBlockRoot") do(blockRoot: string) -> bool:
     let root = Digest.fromHex(blockRoot)

diff --git a/fluffy/tests/state_network_tests/state_test_helpers.nim b/fluffy/tests/state_network_tests/state_test_helpers.nim
@@ -1,5 +1,5 @@
 # Fluffy
-# Copyright (c) 2021-2024 Status Research & Development GmbH
+# Copyright (c) 2021-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).
@@ -15,7 +15,7 @@ import
   eth/p2p/discoveryv5/protocol as discv5_protocol,
   eth/p2p/discoveryv5/routing_table,
   ../../network/wire/[portal_protocol, portal_stream, portal_protocol_config],
-  ../../../nimbus/common/chain_config,
+  ../../../execution_chain/common/chain_config,
   ../../network/history/[history_content, history_network, history_validation],
   ../../network/state/[state_content, state_utils, state_network],
   ../../eth_data/yaml_utils,

diff --git a/fluffy/tests/state_network_tests/test_state_endpoints_genesis.nim b/fluffy/tests/state_network_tests/test_state_endpoints_genesis.nim
@@ -1,5 +1,5 @@
 # Nimbus
-# Copyright (c) 2023-2024 Status Research & Development GmbH
+# Copyright (c) 2023-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).
@@ -12,7 +12,7 @@ import
   results,
   eth/trie,
   eth/common/[addresses, hashes],
-  ../../../nimbus/common/chain_config,
+  ../../../execution_chain/common/chain_config,
   ../../network/wire/[portal_protocol, portal_stream],
   ../../network/state/
     [state_content, state_network, state_gossip, state_endpoints, state_utils],

diff --git a/fluffy/tests/state_network_tests/test_state_gossip_getparent_genesis.nim b/fluffy/tests/state_network_tests/test_state_gossip_getparent_genesis.nim
@@ -1,5 +1,5 @@
 # Nimbus
-# Copyright (c) 2023-2024 Status Research & Development GmbH
+# Copyright (c) 2023-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).
@@ -13,7 +13,7 @@ import
   results,
   eth/[trie, trie/db],
   eth/common/hashes,
-  ../../../nimbus/common/chain_config,
+  ../../../execution_chain/common/chain_config,
   ../../network/state/[state_content, state_validation, state_gossip, state_utils],
   ./state_test_helpers
 

diff --git a/fluffy/tests/state_network_tests/test_state_validation_genesis.nim b/fluffy/tests/state_network_tests/test_state_validation_genesis.nim
@@ -1,5 +1,5 @@
 # Nimbus
-# Copyright (c) 2023-2024 Status Research & Development GmbH
+# Copyright (c) 2023-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).
@@ -13,7 +13,7 @@ import
   results,
   eth/[trie, trie/trie_defs],
   eth/common/[accounts, addresses, hashes],
-  ../../../nimbus/common/chain_config,
+  ../../../execution_chain/common/chain_config,
   ../../network/state/[state_content, state_validation, state_utils],
   ./state_test_helpers