diff --git a/.github/workflows/fluffy.yml b/.github/workflows/fluffy.yml
index 42f3a94836..30dfa91e95 100644
--- 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
index 02bbc488b3..e5624ca0dd 100644
--- 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
index edbbeac7df..3e5f589e10 100644
--- 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
index 9b34960628..41166c2f42 100644
--- 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
index 8fb08f2cf5..71a612671a 100644
--- 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
index eeeafd9b5b..c1ac753a79 100644
--- 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 b/execution_chain/beacon/api_handler.nim
similarity index 100%
rename from nimbus/beacon/api_handler.nim
rename to execution_chain/beacon/api_handler.nim
diff --git a/nimbus/beacon/api_handler/api_exchangeconf.nim b/execution_chain/beacon/api_handler/api_exchangeconf.nim
similarity index 100%
rename from nimbus/beacon/api_handler/api_exchangeconf.nim
rename to execution_chain/beacon/api_handler/api_exchangeconf.nim
diff --git a/nimbus/beacon/api_handler/api_forkchoice.nim b/execution_chain/beacon/api_handler/api_forkchoice.nim
similarity index 100%
rename from nimbus/beacon/api_handler/api_forkchoice.nim
rename to execution_chain/beacon/api_handler/api_forkchoice.nim
diff --git a/nimbus/beacon/api_handler/api_getbodies.nim b/execution_chain/beacon/api_handler/api_getbodies.nim
similarity index 100%
rename from nimbus/beacon/api_handler/api_getbodies.nim
rename to execution_chain/beacon/api_handler/api_getbodies.nim
diff --git a/nimbus/beacon/api_handler/api_getpayload.nim b/execution_chain/beacon/api_handler/api_getpayload.nim
similarity index 100%
rename from nimbus/beacon/api_handler/api_getpayload.nim
rename to execution_chain/beacon/api_handler/api_getpayload.nim
diff --git a/nimbus/beacon/api_handler/api_newpayload.nim b/execution_chain/beacon/api_handler/api_newpayload.nim
similarity index 100%
rename from nimbus/beacon/api_handler/api_newpayload.nim
rename to execution_chain/beacon/api_handler/api_newpayload.nim
diff --git a/nimbus/beacon/api_handler/api_utils.nim b/execution_chain/beacon/api_handler/api_utils.nim
similarity index 100%
rename from nimbus/beacon/api_handler/api_utils.nim
rename to execution_chain/beacon/api_handler/api_utils.nim
diff --git a/nimbus/beacon/beacon_engine.nim b/execution_chain/beacon/beacon_engine.nim
similarity index 100%
rename from nimbus/beacon/beacon_engine.nim
rename to execution_chain/beacon/beacon_engine.nim
diff --git a/nimbus/beacon/payload_conv.nim b/execution_chain/beacon/payload_conv.nim
similarity index 100%
rename from nimbus/beacon/payload_conv.nim
rename to execution_chain/beacon/payload_conv.nim
diff --git a/nimbus/beacon/payload_queue.nim b/execution_chain/beacon/payload_queue.nim
similarity index 100%
rename from nimbus/beacon/payload_queue.nim
rename to execution_chain/beacon/payload_queue.nim
diff --git a/nimbus/beacon/web3_eth_conv.nim b/execution_chain/beacon/web3_eth_conv.nim
similarity index 100%
rename from nimbus/beacon/web3_eth_conv.nim
rename to execution_chain/beacon/web3_eth_conv.nim
diff --git a/nimbus/common.nim b/execution_chain/common.nim
similarity index 100%
rename from nimbus/common.nim
rename to execution_chain/common.nim
diff --git a/nimbus/common/chain_config.nim b/execution_chain/common/chain_config.nim
similarity index 100%
rename from nimbus/common/chain_config.nim
rename to execution_chain/common/chain_config.nim
diff --git a/nimbus/common/chain_config_hash.nim b/execution_chain/common/chain_config_hash.nim
similarity index 100%
rename from nimbus/common/chain_config_hash.nim
rename to execution_chain/common/chain_config_hash.nim
diff --git a/nimbus/common/common.nim b/execution_chain/common/common.nim
similarity index 100%
rename from nimbus/common/common.nim
rename to execution_chain/common/common.nim
diff --git a/nimbus/common/context.nim b/execution_chain/common/context.nim
similarity index 100%
rename from nimbus/common/context.nim
rename to execution_chain/common/context.nim
diff --git a/nimbus/common/evmforks.nim b/execution_chain/common/evmforks.nim
similarity index 100%
rename from nimbus/common/evmforks.nim
rename to execution_chain/common/evmforks.nim
diff --git a/nimbus/common/genesis.nim b/execution_chain/common/genesis.nim
similarity index 100%
rename from nimbus/common/genesis.nim
rename to execution_chain/common/genesis.nim
diff --git a/nimbus/common/genesis_alloc.nim b/execution_chain/common/genesis_alloc.nim
similarity index 100%
rename from nimbus/common/genesis_alloc.nim
rename to execution_chain/common/genesis_alloc.nim
diff --git a/nimbus/common/hardforks.nim b/execution_chain/common/hardforks.nim
similarity index 100%
rename from nimbus/common/hardforks.nim
rename to execution_chain/common/hardforks.nim
diff --git a/nimbus/common/logging.nim b/execution_chain/common/logging.nim
similarity index 100%
rename from nimbus/common/logging.nim
rename to execution_chain/common/logging.nim
diff --git a/nimbus/common/manager.nim b/execution_chain/common/manager.nim
similarity index 100%
rename from nimbus/common/manager.nim
rename to execution_chain/common/manager.nim
diff --git a/nimbus/compile_info.nim b/execution_chain/compile_info.nim
similarity index 100%
rename from nimbus/compile_info.nim
rename to execution_chain/compile_info.nim
diff --git a/nimbus/config.nim b/execution_chain/config.nim
similarity index 99%
rename from nimbus/config.nim
rename to execution_chain/config.nim
index 9b181577d4..55a4c63361 100644
--- a/nimbus/config.nim
+++ b/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 b/execution_chain/constants.nim
similarity index 100%
rename from nimbus/constants.nim
rename to execution_chain/constants.nim
diff --git a/nimbus/core/block_import.nim b/execution_chain/core/block_import.nim
similarity index 100%
rename from nimbus/core/block_import.nim
rename to execution_chain/core/block_import.nim
diff --git a/nimbus/core/chain.nim b/execution_chain/core/chain.nim
similarity index 100%
rename from nimbus/core/chain.nim
rename to execution_chain/core/chain.nim
diff --git a/nimbus/core/chain/chain_desc.nim b/execution_chain/core/chain/chain_desc.nim
similarity index 100%
rename from nimbus/core/chain/chain_desc.nim
rename to execution_chain/core/chain/chain_desc.nim
diff --git a/nimbus/core/chain/forked_chain.nim b/execution_chain/core/chain/forked_chain.nim
similarity index 100%
rename from nimbus/core/chain/forked_chain.nim
rename to execution_chain/core/chain/forked_chain.nim
diff --git a/nimbus/core/chain/forked_chain/chain_branch.nim b/execution_chain/core/chain/forked_chain/chain_branch.nim
similarity index 100%
rename from nimbus/core/chain/forked_chain/chain_branch.nim
rename to execution_chain/core/chain/forked_chain/chain_branch.nim
diff --git a/nimbus/core/chain/forked_chain/chain_desc.nim b/execution_chain/core/chain/forked_chain/chain_desc.nim
similarity index 100%
rename from nimbus/core/chain/forked_chain/chain_desc.nim
rename to execution_chain/core/chain/forked_chain/chain_desc.nim
diff --git a/nimbus/core/chain/forked_chain/chain_kvt.nim b/execution_chain/core/chain/forked_chain/chain_kvt.nim
similarity index 100%
rename from nimbus/core/chain/forked_chain/chain_kvt.nim
rename to execution_chain/core/chain/forked_chain/chain_kvt.nim
diff --git a/nimbus/core/chain/persist_blocks.nim b/execution_chain/core/chain/persist_blocks.nim
similarity index 100%
rename from nimbus/core/chain/persist_blocks.nim
rename to execution_chain/core/chain/persist_blocks.nim
diff --git a/nimbus/core/dao.nim b/execution_chain/core/dao.nim
similarity index 100%
rename from nimbus/core/dao.nim
rename to execution_chain/core/dao.nim
diff --git a/nimbus/core/eip4844.nim b/execution_chain/core/eip4844.nim
similarity index 100%
rename from nimbus/core/eip4844.nim
rename to execution_chain/core/eip4844.nim
diff --git a/nimbus/core/eip6110.nim b/execution_chain/core/eip6110.nim
similarity index 100%
rename from nimbus/core/eip6110.nim
rename to execution_chain/core/eip6110.nim
diff --git a/nimbus/core/eip7691.nim b/execution_chain/core/eip7691.nim
similarity index 100%
rename from nimbus/core/eip7691.nim
rename to execution_chain/core/eip7691.nim
diff --git a/nimbus/core/eip7702.nim b/execution_chain/core/eip7702.nim
similarity index 100%
rename from nimbus/core/eip7702.nim
rename to execution_chain/core/eip7702.nim
diff --git a/nimbus/core/executor.nim b/execution_chain/core/executor.nim
similarity index 100%
rename from nimbus/core/executor.nim
rename to execution_chain/core/executor.nim
diff --git a/nimbus/core/executor/calculate_reward.nim b/execution_chain/core/executor/calculate_reward.nim
similarity index 100%
rename from nimbus/core/executor/calculate_reward.nim
rename to execution_chain/core/executor/calculate_reward.nim
diff --git a/nimbus/core/executor/executor_helpers.nim b/execution_chain/core/executor/executor_helpers.nim
similarity index 100%
rename from nimbus/core/executor/executor_helpers.nim
rename to execution_chain/core/executor/executor_helpers.nim
diff --git a/nimbus/core/executor/process_block.nim b/execution_chain/core/executor/process_block.nim
similarity index 100%
rename from nimbus/core/executor/process_block.nim
rename to execution_chain/core/executor/process_block.nim
diff --git a/nimbus/core/executor/process_transaction.nim b/execution_chain/core/executor/process_transaction.nim
similarity index 100%
rename from nimbus/core/executor/process_transaction.nim
rename to execution_chain/core/executor/process_transaction.nim
diff --git a/nimbus/core/gaslimit.nim b/execution_chain/core/gaslimit.nim
similarity index 100%
rename from nimbus/core/gaslimit.nim
rename to execution_chain/core/gaslimit.nim
diff --git a/nimbus/core/pow/difficulty.nim b/execution_chain/core/pow/difficulty.nim
similarity index 100%
rename from nimbus/core/pow/difficulty.nim
rename to execution_chain/core/pow/difficulty.nim
diff --git a/nimbus/core/pow/header.nim b/execution_chain/core/pow/header.nim
similarity index 100%
rename from nimbus/core/pow/header.nim
rename to execution_chain/core/pow/header.nim
diff --git a/nimbus/core/tx_pool.nim b/execution_chain/core/tx_pool.nim
similarity index 100%
rename from nimbus/core/tx_pool.nim
rename to execution_chain/core/tx_pool.nim
diff --git a/nimbus/core/tx_pool/tx_desc.nim b/execution_chain/core/tx_pool/tx_desc.nim
similarity index 100%
rename from nimbus/core/tx_pool/tx_desc.nim
rename to execution_chain/core/tx_pool/tx_desc.nim
diff --git a/nimbus/core/tx_pool/tx_item.nim b/execution_chain/core/tx_pool/tx_item.nim
similarity index 100%
rename from nimbus/core/tx_pool/tx_item.nim
rename to execution_chain/core/tx_pool/tx_item.nim
diff --git a/nimbus/core/tx_pool/tx_packer.nim b/execution_chain/core/tx_pool/tx_packer.nim
similarity index 100%
rename from nimbus/core/tx_pool/tx_packer.nim
rename to execution_chain/core/tx_pool/tx_packer.nim
diff --git a/nimbus/core/tx_pool/tx_tabs.nim b/execution_chain/core/tx_pool/tx_tabs.nim
similarity index 100%
rename from nimbus/core/tx_pool/tx_tabs.nim
rename to execution_chain/core/tx_pool/tx_tabs.nim
diff --git a/nimbus/core/validate.nim b/execution_chain/core/validate.nim
similarity index 100%
rename from nimbus/core/validate.nim
rename to execution_chain/core/validate.nim
diff --git a/nimbus/core/withdrawals.nim b/execution_chain/core/withdrawals.nim
similarity index 100%
rename from nimbus/core/withdrawals.nim
rename to execution_chain/core/withdrawals.nim
diff --git a/nimbus/db/.gitignore b/execution_chain/db/.gitignore
similarity index 100%
rename from nimbus/db/.gitignore
rename to execution_chain/db/.gitignore
diff --git a/nimbus/db/README.md b/execution_chain/db/README.md
similarity index 91%
rename from nimbus/db/README.md
rename to execution_chain/db/README.md
index 2ff15faf7d..68ab1123f5 100644
--- a/nimbus/db/README.md
+++ b/execution_chain/db/README.md
@@ -84,7 +84,7 @@ locations where to start looking at.
* *Aristo DB (driver)*
+ Sources:
- ./nimbus/db/core_db/backend/aristo_*
+ ./execution_chain/db/core_db/backend/aristo_*
+ Synopsis:
Combines both, the *Kvt* and the *Aristo* driver sub-modules providing an
@@ -92,14 +92,14 @@ locations where to start looking at.
* *Aristo MPT (driver)*
+ Sources:
- ./nimbus/db/aristo*
+ ./execution_chain/db/aristo*
+ Synopsis:
Revamped implementation of a hexary *Merkle Patricia Tree*.
* *Common (concentrator)*
* Sources:
- ./nimbus/common*
+ ./execution_chain/common*
* Synopsis:
Collected information for running block chain execution layer
@@ -107,7 +107,7 @@ locations where to start looking at.
* *Core DB (API)*
* Sources:
- ./nimbus/db/core_db*
+ ./execution_chain/db/core_db*
* Synopsis:
Database abstraction layer. Unless for legacy applications, there should
@@ -115,8 +115,8 @@ locations where to start looking at.
* *EVM (application)*
+ Sources:
- ./nimbus/core/executor/*
- ./nimbus/evm/*
+ ./execution_chain/core/executor/*
+ ./execution_chain/evm/*
+ Synopsis:
An implementation of the *Ethereum Virtual Machine*.
@@ -140,7 +140,7 @@ locations where to start looking at.
* *Kvt (driver)*
+ Sources:
- ./nimbus/db/kvt*
+ ./execution_chain/db/kvt*
+ Synopsis:
Key value table interface for the [Aristo DB (driver)](#add) module.
@@ -149,7 +149,7 @@ locations where to start looking at.
* *Ledger (API)*
+ Sources:
- ./nimbus/db/ledger*
+ ./execution_chain/db/ledger*
+ Synopsis:
Abstraction layer for either the [legacy cache (driver)](#lgcd) accounts
@@ -159,9 +159,9 @@ locations where to start looking at.
* *ledger cache (driver)*
+ Sources:
- ./nimbus/db/ledger/accounts_ledger.nim
- ./nimbus/db/ledger/backend/accounts_ledger*
- ./nimbus/db/ledger/distinct_ledgers.nim
+ ./execution_chain/db/ledger/accounts_ledger.nim
+ ./execution_chain/db/ledger/backend/accounts_ledger*
+ ./execution_chain/db/ledger/distinct_ledgers.nim
+ Synopsis:
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)*
+ Sources:
- ./nimbus/db/core_db/backend/legacy_*
+ ./execution_chain/db/core_db/backend/legacy_*
+ Synopsis:
Legacy database abstraction. It mostly forwards requests directly to the
@@ -186,8 +186,8 @@ locations where to start looking at.
* *State DB (concentrator)*
+ Sources:
- ./nimbus/evm/state.nim
- ./nimbus/evm/types.nim
+ ./execution_chain/evm/state.nim
+ ./execution_chain/evm/types.nim
+ Synopsis:
Integrated collection of modules and methods relevant for the EVM.
diff --git a/nimbus/db/access_list.nim b/execution_chain/db/access_list.nim
similarity index 100%
rename from nimbus/db/access_list.nim
rename to execution_chain/db/access_list.nim
diff --git a/nimbus/db/aristo.nim b/execution_chain/db/aristo.nim
similarity index 100%
rename from nimbus/db/aristo.nim
rename to execution_chain/db/aristo.nim
diff --git a/nimbus/db/aristo/README.md b/execution_chain/db/aristo/README.md
similarity index 100%
rename from nimbus/db/aristo/README.md
rename to execution_chain/db/aristo/README.md
diff --git a/nimbus/db/aristo/TODO.md b/execution_chain/db/aristo/TODO.md
similarity index 100%
rename from nimbus/db/aristo/TODO.md
rename to execution_chain/db/aristo/TODO.md
diff --git a/nimbus/db/aristo/aristo_api.nim b/execution_chain/db/aristo/aristo_api.nim
similarity index 100%
rename from nimbus/db/aristo/aristo_api.nim
rename to execution_chain/db/aristo/aristo_api.nim
diff --git a/nimbus/db/aristo/aristo_blobify.nim b/execution_chain/db/aristo/aristo_blobify.nim
similarity index 100%
rename from nimbus/db/aristo/aristo_blobify.nim
rename to execution_chain/db/aristo/aristo_blobify.nim
diff --git a/nimbus/db/aristo/aristo_check.nim b/execution_chain/db/aristo/aristo_check.nim
similarity index 100%
rename from nimbus/db/aristo/aristo_check.nim
rename to execution_chain/db/aristo/aristo_check.nim
diff --git a/nimbus/db/aristo/aristo_check/check_be.nim b/execution_chain/db/aristo/aristo_check/check_be.nim
similarity index 100%
rename from nimbus/db/aristo/aristo_check/check_be.nim
rename to execution_chain/db/aristo/aristo_check/check_be.nim
diff --git a/nimbus/db/aristo/aristo_check/check_top.nim b/execution_chain/db/aristo/aristo_check/check_top.nim
similarity index 100%
rename from nimbus/db/aristo/aristo_check/check_top.nim
rename to execution_chain/db/aristo/aristo_check/check_top.nim
diff --git a/nimbus/db/aristo/aristo_check/check_twig.nim b/execution_chain/db/aristo/aristo_check/check_twig.nim
similarity index 100%
rename from nimbus/db/aristo/aristo_check/check_twig.nim
rename to execution_chain/db/aristo/aristo_check/check_twig.nim
diff --git a/nimbus/db/aristo/aristo_compute.nim b/execution_chain/db/aristo/aristo_compute.nim
similarity index 100%
rename from nimbus/db/aristo/aristo_compute.nim
rename to execution_chain/db/aristo/aristo_compute.nim
diff --git a/nimbus/db/aristo/aristo_constants.nim b/execution_chain/db/aristo/aristo_constants.nim
similarity index 100%
rename from nimbus/db/aristo/aristo_constants.nim
rename to execution_chain/db/aristo/aristo_constants.nim
diff --git a/nimbus/db/aristo/aristo_debug.nim b/execution_chain/db/aristo/aristo_debug.nim
similarity index 100%
rename from nimbus/db/aristo/aristo_debug.nim
rename to execution_chain/db/aristo/aristo_debug.nim
diff --git a/nimbus/db/aristo/aristo_delete.nim b/execution_chain/db/aristo/aristo_delete.nim
similarity index 100%
rename from nimbus/db/aristo/aristo_delete.nim
rename to execution_chain/db/aristo/aristo_delete.nim
diff --git a/nimbus/db/aristo/aristo_delete/delete_subtree.nim b/execution_chain/db/aristo/aristo_delete/delete_subtree.nim
similarity index 100%
rename from nimbus/db/aristo/aristo_delete/delete_subtree.nim
rename to execution_chain/db/aristo/aristo_delete/delete_subtree.nim
diff --git a/nimbus/db/aristo/aristo_delta.nim b/execution_chain/db/aristo/aristo_delta.nim
similarity index 100%
rename from nimbus/db/aristo/aristo_delta.nim
rename to execution_chain/db/aristo/aristo_delta.nim
diff --git a/nimbus/db/aristo/aristo_desc.nim b/execution_chain/db/aristo/aristo_desc.nim
similarity index 100%
rename from nimbus/db/aristo/aristo_desc.nim
rename to execution_chain/db/aristo/aristo_desc.nim
diff --git a/nimbus/db/aristo/aristo_desc/desc_backend.nim b/execution_chain/db/aristo/aristo_desc/desc_backend.nim
similarity index 100%
rename from nimbus/db/aristo/aristo_desc/desc_backend.nim
rename to execution_chain/db/aristo/aristo_desc/desc_backend.nim
diff --git a/nimbus/db/aristo/aristo_desc/desc_error.nim b/execution_chain/db/aristo/aristo_desc/desc_error.nim
similarity index 100%
rename from nimbus/db/aristo/aristo_desc/desc_error.nim
rename to execution_chain/db/aristo/aristo_desc/desc_error.nim
diff --git a/nimbus/db/aristo/aristo_desc/desc_identifiers.nim b/execution_chain/db/aristo/aristo_desc/desc_identifiers.nim
similarity index 100%
rename from nimbus/db/aristo/aristo_desc/desc_identifiers.nim
rename to execution_chain/db/aristo/aristo_desc/desc_identifiers.nim
diff --git a/nimbus/db/aristo/aristo_desc/desc_nibbles.nim b/execution_chain/db/aristo/aristo_desc/desc_nibbles.nim
similarity index 100%
rename from nimbus/db/aristo/aristo_desc/desc_nibbles.nim
rename to execution_chain/db/aristo/aristo_desc/desc_nibbles.nim
diff --git a/nimbus/db/aristo/aristo_desc/desc_structural.nim b/execution_chain/db/aristo/aristo_desc/desc_structural.nim
similarity index 100%
rename from nimbus/db/aristo/aristo_desc/desc_structural.nim
rename to execution_chain/db/aristo/aristo_desc/desc_structural.nim
diff --git a/nimbus/db/aristo/aristo_fetch.nim b/execution_chain/db/aristo/aristo_fetch.nim
similarity index 100%
rename from nimbus/db/aristo/aristo_fetch.nim
rename to execution_chain/db/aristo/aristo_fetch.nim
diff --git a/nimbus/db/aristo/aristo_get.nim b/execution_chain/db/aristo/aristo_get.nim
similarity index 100%
rename from nimbus/db/aristo/aristo_get.nim
rename to execution_chain/db/aristo/aristo_get.nim
diff --git a/nimbus/db/aristo/aristo_hike.nim b/execution_chain/db/aristo/aristo_hike.nim
similarity index 100%
rename from nimbus/db/aristo/aristo_hike.nim
rename to execution_chain/db/aristo/aristo_hike.nim
diff --git a/nimbus/db/aristo/aristo_init.nim b/execution_chain/db/aristo/aristo_init.nim
similarity index 100%
rename from nimbus/db/aristo/aristo_init.nim
rename to execution_chain/db/aristo/aristo_init.nim
diff --git a/nimbus/db/aristo/aristo_init/init_common.nim b/execution_chain/db/aristo/aristo_init/init_common.nim
similarity index 100%
rename from nimbus/db/aristo/aristo_init/init_common.nim
rename to execution_chain/db/aristo/aristo_init/init_common.nim
diff --git a/nimbus/db/aristo/aristo_init/memory_db.nim b/execution_chain/db/aristo/aristo_init/memory_db.nim
similarity index 100%
rename from nimbus/db/aristo/aristo_init/memory_db.nim
rename to execution_chain/db/aristo/aristo_init/memory_db.nim
diff --git a/nimbus/db/aristo/aristo_init/memory_only.nim b/execution_chain/db/aristo/aristo_init/memory_only.nim
similarity index 100%
rename from nimbus/db/aristo/aristo_init/memory_only.nim
rename to execution_chain/db/aristo/aristo_init/memory_only.nim
diff --git a/nimbus/db/aristo/aristo_init/persistent.nim b/execution_chain/db/aristo/aristo_init/persistent.nim
similarity index 100%
rename from nimbus/db/aristo/aristo_init/persistent.nim
rename to execution_chain/db/aristo/aristo_init/persistent.nim
diff --git a/nimbus/db/aristo/aristo_init/rocks_db.nim b/execution_chain/db/aristo/aristo_init/rocks_db.nim
similarity index 100%
rename from nimbus/db/aristo/aristo_init/rocks_db.nim
rename to execution_chain/db/aristo/aristo_init/rocks_db.nim
diff --git a/nimbus/db/aristo/aristo_init/rocks_db/rdb_desc.nim b/execution_chain/db/aristo/aristo_init/rocks_db/rdb_desc.nim
similarity index 100%
rename from nimbus/db/aristo/aristo_init/rocks_db/rdb_desc.nim
rename to execution_chain/db/aristo/aristo_init/rocks_db/rdb_desc.nim
diff --git a/nimbus/db/aristo/aristo_init/rocks_db/rdb_get.nim b/execution_chain/db/aristo/aristo_init/rocks_db/rdb_get.nim
similarity index 100%
rename from nimbus/db/aristo/aristo_init/rocks_db/rdb_get.nim
rename to execution_chain/db/aristo/aristo_init/rocks_db/rdb_get.nim
diff --git a/nimbus/db/aristo/aristo_init/rocks_db/rdb_init.nim b/execution_chain/db/aristo/aristo_init/rocks_db/rdb_init.nim
similarity index 100%
rename from nimbus/db/aristo/aristo_init/rocks_db/rdb_init.nim
rename to execution_chain/db/aristo/aristo_init/rocks_db/rdb_init.nim
diff --git a/nimbus/db/aristo/aristo_init/rocks_db/rdb_put.nim b/execution_chain/db/aristo/aristo_init/rocks_db/rdb_put.nim
similarity index 100%
rename from nimbus/db/aristo/aristo_init/rocks_db/rdb_put.nim
rename to execution_chain/db/aristo/aristo_init/rocks_db/rdb_put.nim
diff --git a/nimbus/db/aristo/aristo_init/rocks_db/rdb_walk.nim b/execution_chain/db/aristo/aristo_init/rocks_db/rdb_walk.nim
similarity index 100%
rename from nimbus/db/aristo/aristo_init/rocks_db/rdb_walk.nim
rename to execution_chain/db/aristo/aristo_init/rocks_db/rdb_walk.nim
diff --git a/nimbus/db/aristo/aristo_layers.nim b/execution_chain/db/aristo/aristo_layers.nim
similarity index 100%
rename from nimbus/db/aristo/aristo_layers.nim
rename to execution_chain/db/aristo/aristo_layers.nim
diff --git a/nimbus/db/aristo/aristo_merge.nim b/execution_chain/db/aristo/aristo_merge.nim
similarity index 100%
rename from nimbus/db/aristo/aristo_merge.nim
rename to execution_chain/db/aristo/aristo_merge.nim
diff --git a/nimbus/db/aristo/aristo_nearby.nim b/execution_chain/db/aristo/aristo_nearby.nim
similarity index 100%
rename from nimbus/db/aristo/aristo_nearby.nim
rename to execution_chain/db/aristo/aristo_nearby.nim
diff --git a/nimbus/db/aristo/aristo_part.nim b/execution_chain/db/aristo/aristo_part.nim
similarity index 100%
rename from nimbus/db/aristo/aristo_part.nim
rename to execution_chain/db/aristo/aristo_part.nim
diff --git a/nimbus/db/aristo/aristo_part/part_chain_rlp.nim b/execution_chain/db/aristo/aristo_part/part_chain_rlp.nim
similarity index 100%
rename from nimbus/db/aristo/aristo_part/part_chain_rlp.nim
rename to execution_chain/db/aristo/aristo_part/part_chain_rlp.nim
diff --git a/nimbus/db/aristo/aristo_part/part_ctx.nim b/execution_chain/db/aristo/aristo_part/part_ctx.nim
similarity index 100%
rename from nimbus/db/aristo/aristo_part/part_ctx.nim
rename to execution_chain/db/aristo/aristo_part/part_ctx.nim
diff --git a/nimbus/db/aristo/aristo_part/part_debug.nim b/execution_chain/db/aristo/aristo_part/part_debug.nim
similarity index 100%
rename from nimbus/db/aristo/aristo_part/part_debug.nim
rename to execution_chain/db/aristo/aristo_part/part_debug.nim
diff --git a/nimbus/db/aristo/aristo_part/part_desc.nim b/execution_chain/db/aristo/aristo_part/part_desc.nim
similarity index 100%
rename from nimbus/db/aristo/aristo_part/part_desc.nim
rename to execution_chain/db/aristo/aristo_part/part_desc.nim
diff --git a/nimbus/db/aristo/aristo_part/part_helpers.nim b/execution_chain/db/aristo/aristo_part/part_helpers.nim
similarity index 100%
rename from nimbus/db/aristo/aristo_part/part_helpers.nim
rename to execution_chain/db/aristo/aristo_part/part_helpers.nim
diff --git a/nimbus/db/aristo/aristo_path.nim b/execution_chain/db/aristo/aristo_path.nim
similarity index 100%
rename from nimbus/db/aristo/aristo_path.nim
rename to execution_chain/db/aristo/aristo_path.nim
diff --git a/nimbus/db/aristo/aristo_persistent.nim b/execution_chain/db/aristo/aristo_persistent.nim
similarity index 100%
rename from nimbus/db/aristo/aristo_persistent.nim
rename to execution_chain/db/aristo/aristo_persistent.nim
diff --git a/nimbus/db/aristo/aristo_profile.nim b/execution_chain/db/aristo/aristo_profile.nim
similarity index 100%
rename from nimbus/db/aristo/aristo_profile.nim
rename to execution_chain/db/aristo/aristo_profile.nim
diff --git a/nimbus/db/aristo/aristo_serialise.nim b/execution_chain/db/aristo/aristo_serialise.nim
similarity index 100%
rename from nimbus/db/aristo/aristo_serialise.nim
rename to execution_chain/db/aristo/aristo_serialise.nim
diff --git a/nimbus/db/aristo/aristo_tx.nim b/execution_chain/db/aristo/aristo_tx.nim
similarity index 100%
rename from nimbus/db/aristo/aristo_tx.nim
rename to execution_chain/db/aristo/aristo_tx.nim
diff --git a/nimbus/db/aristo/aristo_tx/tx_frame.nim b/execution_chain/db/aristo/aristo_tx/tx_frame.nim
similarity index 100%
rename from nimbus/db/aristo/aristo_tx/tx_frame.nim
rename to execution_chain/db/aristo/aristo_tx/tx_frame.nim
diff --git a/nimbus/db/aristo/aristo_tx/tx_stow.nim b/execution_chain/db/aristo/aristo_tx/tx_stow.nim
similarity index 100%
rename from nimbus/db/aristo/aristo_tx/tx_stow.nim
rename to execution_chain/db/aristo/aristo_tx/tx_stow.nim
diff --git a/nimbus/db/aristo/aristo_utils.nim b/execution_chain/db/aristo/aristo_utils.nim
similarity index 100%
rename from nimbus/db/aristo/aristo_utils.nim
rename to execution_chain/db/aristo/aristo_utils.nim
diff --git a/nimbus/db/aristo/aristo_vid.nim b/execution_chain/db/aristo/aristo_vid.nim
similarity index 100%
rename from nimbus/db/aristo/aristo_vid.nim
rename to execution_chain/db/aristo/aristo_vid.nim
diff --git a/nimbus/db/aristo/aristo_walk/memory_only.nim b/execution_chain/db/aristo/aristo_walk/memory_only.nim
similarity index 100%
rename from nimbus/db/aristo/aristo_walk/memory_only.nim
rename to execution_chain/db/aristo/aristo_walk/memory_only.nim
diff --git a/nimbus/db/aristo/aristo_walk/persistent.nim b/execution_chain/db/aristo/aristo_walk/persistent.nim
similarity index 100%
rename from nimbus/db/aristo/aristo_walk/persistent.nim
rename to execution_chain/db/aristo/aristo_walk/persistent.nim
diff --git a/nimbus/db/aristo/aristo_walk/walk_private.nim b/execution_chain/db/aristo/aristo_walk/walk_private.nim
similarity index 100%
rename from nimbus/db/aristo/aristo_walk/walk_private.nim
rename to execution_chain/db/aristo/aristo_walk/walk_private.nim
diff --git a/nimbus/db/core_db.nim b/execution_chain/db/core_db.nim
similarity index 100%
rename from nimbus/db/core_db.nim
rename to execution_chain/db/core_db.nim
diff --git a/nimbus/db/core_db/README.md b/execution_chain/db/core_db/README.md
similarity index 100%
rename from nimbus/db/core_db/README.md
rename to execution_chain/db/core_db/README.md
diff --git a/nimbus/db/core_db/TODO.md b/execution_chain/db/core_db/TODO.md
similarity index 100%
rename from nimbus/db/core_db/TODO.md
rename to execution_chain/db/core_db/TODO.md
diff --git a/nimbus/db/core_db/backend/aristo_db.nim b/execution_chain/db/core_db/backend/aristo_db.nim
similarity index 100%
rename from nimbus/db/core_db/backend/aristo_db.nim
rename to execution_chain/db/core_db/backend/aristo_db.nim
diff --git a/nimbus/db/core_db/backend/aristo_rocksdb.nim b/execution_chain/db/core_db/backend/aristo_rocksdb.nim
similarity index 100%
rename from nimbus/db/core_db/backend/aristo_rocksdb.nim
rename to execution_chain/db/core_db/backend/aristo_rocksdb.nim
diff --git a/nimbus/db/core_db/backend/aristo_trace.nim b/execution_chain/db/core_db/backend/aristo_trace.nim
similarity index 100%
rename from nimbus/db/core_db/backend/aristo_trace.nim
rename to execution_chain/db/core_db/backend/aristo_trace.nim
diff --git a/nimbus/db/core_db/base.nim b/execution_chain/db/core_db/base.nim
similarity index 100%
rename from nimbus/db/core_db/base.nim
rename to execution_chain/db/core_db/base.nim
diff --git a/nimbus/db/core_db/base/api_tracking.nim b/execution_chain/db/core_db/base/api_tracking.nim
similarity index 100%
rename from nimbus/db/core_db/base/api_tracking.nim
rename to execution_chain/db/core_db/base/api_tracking.nim
diff --git a/nimbus/db/core_db/base/base_config.nim b/execution_chain/db/core_db/base/base_config.nim
similarity index 100%
rename from nimbus/db/core_db/base/base_config.nim
rename to execution_chain/db/core_db/base/base_config.nim
diff --git a/nimbus/db/core_db/base/base_desc.nim b/execution_chain/db/core_db/base/base_desc.nim
similarity index 100%
rename from nimbus/db/core_db/base/base_desc.nim
rename to execution_chain/db/core_db/base/base_desc.nim
diff --git a/nimbus/db/core_db/base/base_helpers.nim b/execution_chain/db/core_db/base/base_helpers.nim
similarity index 100%
rename from nimbus/db/core_db/base/base_helpers.nim
rename to execution_chain/db/core_db/base/base_helpers.nim
diff --git a/nimbus/db/core_db/base/base_validate.nim b/execution_chain/db/core_db/base/base_validate.nim
similarity index 100%
rename from nimbus/db/core_db/base/base_validate.nim
rename to execution_chain/db/core_db/base/base_validate.nim
diff --git a/nimbus/db/core_db/base_iterators.nim b/execution_chain/db/core_db/base_iterators.nim
similarity index 100%
rename from nimbus/db/core_db/base_iterators.nim
rename to execution_chain/db/core_db/base_iterators.nim
diff --git a/nimbus/db/core_db/core_apps.nim b/execution_chain/db/core_db/core_apps.nim
similarity index 100%
rename from nimbus/db/core_db/core_apps.nim
rename to execution_chain/db/core_db/core_apps.nim
diff --git a/nimbus/db/core_db/memory_only.nim b/execution_chain/db/core_db/memory_only.nim
similarity index 100%
rename from nimbus/db/core_db/memory_only.nim
rename to execution_chain/db/core_db/memory_only.nim
diff --git a/nimbus/db/core_db/persistent.nim b/execution_chain/db/core_db/persistent.nim
similarity index 100%
rename from nimbus/db/core_db/persistent.nim
rename to execution_chain/db/core_db/persistent.nim
diff --git a/nimbus/db/era1_db.nim b/execution_chain/db/era1_db.nim
similarity index 100%
rename from nimbus/db/era1_db.nim
rename to execution_chain/db/era1_db.nim
diff --git a/nimbus/db/era1_db/db_desc.nim b/execution_chain/db/era1_db/db_desc.nim
similarity index 100%
rename from nimbus/db/era1_db/db_desc.nim
rename to execution_chain/db/era1_db/db_desc.nim
diff --git a/nimbus/db/kvstore_rocksdb.nim b/execution_chain/db/kvstore_rocksdb.nim
similarity index 100%
rename from nimbus/db/kvstore_rocksdb.nim
rename to execution_chain/db/kvstore_rocksdb.nim
diff --git a/nimbus/db/kvt.nim b/execution_chain/db/kvt.nim
similarity index 100%
rename from nimbus/db/kvt.nim
rename to execution_chain/db/kvt.nim
diff --git a/nimbus/db/kvt/kvt_api.nim b/execution_chain/db/kvt/kvt_api.nim
similarity index 100%
rename from nimbus/db/kvt/kvt_api.nim
rename to execution_chain/db/kvt/kvt_api.nim
diff --git a/nimbus/db/kvt/kvt_constants.nim b/execution_chain/db/kvt/kvt_constants.nim
similarity index 100%
rename from nimbus/db/kvt/kvt_constants.nim
rename to execution_chain/db/kvt/kvt_constants.nim
diff --git a/nimbus/db/kvt/kvt_debug.nim b/execution_chain/db/kvt/kvt_debug.nim
similarity index 100%
rename from nimbus/db/kvt/kvt_debug.nim
rename to execution_chain/db/kvt/kvt_debug.nim
diff --git a/nimbus/db/kvt/kvt_delta.nim b/execution_chain/db/kvt/kvt_delta.nim
similarity index 100%
rename from nimbus/db/kvt/kvt_delta.nim
rename to execution_chain/db/kvt/kvt_delta.nim
diff --git a/nimbus/db/kvt/kvt_desc.nim b/execution_chain/db/kvt/kvt_desc.nim
similarity index 100%
rename from nimbus/db/kvt/kvt_desc.nim
rename to execution_chain/db/kvt/kvt_desc.nim
diff --git a/nimbus/db/kvt/kvt_desc/desc_backend.nim b/execution_chain/db/kvt/kvt_desc/desc_backend.nim
similarity index 100%
rename from nimbus/db/kvt/kvt_desc/desc_backend.nim
rename to execution_chain/db/kvt/kvt_desc/desc_backend.nim
diff --git a/nimbus/db/kvt/kvt_desc/desc_error.nim b/execution_chain/db/kvt/kvt_desc/desc_error.nim
similarity index 100%
rename from nimbus/db/kvt/kvt_desc/desc_error.nim
rename to execution_chain/db/kvt/kvt_desc/desc_error.nim
diff --git a/nimbus/db/kvt/kvt_desc/desc_structural.nim b/execution_chain/db/kvt/kvt_desc/desc_structural.nim
similarity index 100%
rename from nimbus/db/kvt/kvt_desc/desc_structural.nim
rename to execution_chain/db/kvt/kvt_desc/desc_structural.nim
diff --git a/nimbus/db/kvt/kvt_init.nim b/execution_chain/db/kvt/kvt_init.nim
similarity index 100%
rename from nimbus/db/kvt/kvt_init.nim
rename to execution_chain/db/kvt/kvt_init.nim
diff --git a/nimbus/db/kvt/kvt_init/init_common.nim b/execution_chain/db/kvt/kvt_init/init_common.nim
similarity index 100%
rename from nimbus/db/kvt/kvt_init/init_common.nim
rename to execution_chain/db/kvt/kvt_init/init_common.nim
diff --git a/nimbus/db/kvt/kvt_init/memory_db.nim b/execution_chain/db/kvt/kvt_init/memory_db.nim
similarity index 100%
rename from nimbus/db/kvt/kvt_init/memory_db.nim
rename to execution_chain/db/kvt/kvt_init/memory_db.nim
diff --git a/nimbus/db/kvt/kvt_init/memory_only.nim b/execution_chain/db/kvt/kvt_init/memory_only.nim
similarity index 100%
rename from nimbus/db/kvt/kvt_init/memory_only.nim
rename to execution_chain/db/kvt/kvt_init/memory_only.nim
diff --git a/nimbus/db/kvt/kvt_init/persistent.nim b/execution_chain/db/kvt/kvt_init/persistent.nim
similarity index 100%
rename from nimbus/db/kvt/kvt_init/persistent.nim
rename to execution_chain/db/kvt/kvt_init/persistent.nim
diff --git a/nimbus/db/kvt/kvt_init/rocks_db.nim b/execution_chain/db/kvt/kvt_init/rocks_db.nim
similarity index 100%
rename from nimbus/db/kvt/kvt_init/rocks_db.nim
rename to execution_chain/db/kvt/kvt_init/rocks_db.nim
diff --git a/nimbus/db/kvt/kvt_init/rocks_db/rdb_desc.nim b/execution_chain/db/kvt/kvt_init/rocks_db/rdb_desc.nim
similarity index 100%
rename from nimbus/db/kvt/kvt_init/rocks_db/rdb_desc.nim
rename to execution_chain/db/kvt/kvt_init/rocks_db/rdb_desc.nim
diff --git a/nimbus/db/kvt/kvt_init/rocks_db/rdb_get.nim b/execution_chain/db/kvt/kvt_init/rocks_db/rdb_get.nim
similarity index 100%
rename from nimbus/db/kvt/kvt_init/rocks_db/rdb_get.nim
rename to execution_chain/db/kvt/kvt_init/rocks_db/rdb_get.nim
diff --git a/nimbus/db/kvt/kvt_init/rocks_db/rdb_init.nim b/execution_chain/db/kvt/kvt_init/rocks_db/rdb_init.nim
similarity index 100%
rename from nimbus/db/kvt/kvt_init/rocks_db/rdb_init.nim
rename to execution_chain/db/kvt/kvt_init/rocks_db/rdb_init.nim
diff --git a/nimbus/db/kvt/kvt_init/rocks_db/rdb_put.nim b/execution_chain/db/kvt/kvt_init/rocks_db/rdb_put.nim
similarity index 100%
rename from nimbus/db/kvt/kvt_init/rocks_db/rdb_put.nim
rename to execution_chain/db/kvt/kvt_init/rocks_db/rdb_put.nim
diff --git a/nimbus/db/kvt/kvt_init/rocks_db/rdb_walk.nim b/execution_chain/db/kvt/kvt_init/rocks_db/rdb_walk.nim
similarity index 100%
rename from nimbus/db/kvt/kvt_init/rocks_db/rdb_walk.nim
rename to execution_chain/db/kvt/kvt_init/rocks_db/rdb_walk.nim
diff --git a/nimbus/db/kvt/kvt_layers.nim b/execution_chain/db/kvt/kvt_layers.nim
similarity index 100%
rename from nimbus/db/kvt/kvt_layers.nim
rename to execution_chain/db/kvt/kvt_layers.nim
diff --git a/nimbus/db/kvt/kvt_persistent.nim b/execution_chain/db/kvt/kvt_persistent.nim
similarity index 100%
rename from nimbus/db/kvt/kvt_persistent.nim
rename to execution_chain/db/kvt/kvt_persistent.nim
diff --git a/nimbus/db/kvt/kvt_tx.nim b/execution_chain/db/kvt/kvt_tx.nim
similarity index 100%
rename from nimbus/db/kvt/kvt_tx.nim
rename to execution_chain/db/kvt/kvt_tx.nim
diff --git a/nimbus/db/kvt/kvt_tx/tx_frame.nim b/execution_chain/db/kvt/kvt_tx/tx_frame.nim
similarity index 100%
rename from nimbus/db/kvt/kvt_tx/tx_frame.nim
rename to execution_chain/db/kvt/kvt_tx/tx_frame.nim
diff --git a/nimbus/db/kvt/kvt_tx/tx_stow.nim b/execution_chain/db/kvt/kvt_tx/tx_stow.nim
similarity index 100%
rename from nimbus/db/kvt/kvt_tx/tx_stow.nim
rename to execution_chain/db/kvt/kvt_tx/tx_stow.nim
diff --git a/nimbus/db/kvt/kvt_utils.nim b/execution_chain/db/kvt/kvt_utils.nim
similarity index 100%
rename from nimbus/db/kvt/kvt_utils.nim
rename to execution_chain/db/kvt/kvt_utils.nim
diff --git a/nimbus/db/kvt/kvt_walk/memory_only.nim b/execution_chain/db/kvt/kvt_walk/memory_only.nim
similarity index 100%
rename from nimbus/db/kvt/kvt_walk/memory_only.nim
rename to execution_chain/db/kvt/kvt_walk/memory_only.nim
diff --git a/nimbus/db/kvt/kvt_walk/persistent.nim b/execution_chain/db/kvt/kvt_walk/persistent.nim
similarity index 100%
rename from nimbus/db/kvt/kvt_walk/persistent.nim
rename to execution_chain/db/kvt/kvt_walk/persistent.nim
diff --git a/nimbus/db/kvt/kvt_walk/walk_private.nim b/execution_chain/db/kvt/kvt_walk/walk_private.nim
similarity index 100%
rename from nimbus/db/kvt/kvt_walk/walk_private.nim
rename to execution_chain/db/kvt/kvt_walk/walk_private.nim
diff --git a/nimbus/db/ledger.nim b/execution_chain/db/ledger.nim
similarity index 100%
rename from nimbus/db/ledger.nim
rename to execution_chain/db/ledger.nim
diff --git a/nimbus/db/opts.nim b/execution_chain/db/opts.nim
similarity index 100%
rename from nimbus/db/opts.nim
rename to execution_chain/db/opts.nim
diff --git a/nimbus/db/storage_types.nim b/execution_chain/db/storage_types.nim
similarity index 100%
rename from nimbus/db/storage_types.nim
rename to execution_chain/db/storage_types.nim
diff --git a/nimbus/db/transient_storage.nim b/execution_chain/db/transient_storage.nim
similarity index 100%
rename from nimbus/db/transient_storage.nim
rename to execution_chain/db/transient_storage.nim
diff --git a/nimbus/errors.nim b/execution_chain/errors.nim
similarity index 100%
rename from nimbus/errors.nim
rename to execution_chain/errors.nim
diff --git a/nimbus/evm/blake2b_f.nim b/execution_chain/evm/blake2b_f.nim
similarity index 100%
rename from nimbus/evm/blake2b_f.nim
rename to execution_chain/evm/blake2b_f.nim
diff --git a/nimbus/evm/blscurve.nim b/execution_chain/evm/blscurve.nim
similarity index 100%
rename from nimbus/evm/blscurve.nim
rename to execution_chain/evm/blscurve.nim
diff --git a/nimbus/evm/code_bytes.nim b/execution_chain/evm/code_bytes.nim
similarity index 100%
rename from nimbus/evm/code_bytes.nim
rename to execution_chain/evm/code_bytes.nim
diff --git a/nimbus/evm/code_stream.nim b/execution_chain/evm/code_stream.nim
similarity index 100%
rename from nimbus/evm/code_stream.nim
rename to execution_chain/evm/code_stream.nim
diff --git a/nimbus/evm/computation.nim b/execution_chain/evm/computation.nim
similarity index 100%
rename from nimbus/evm/computation.nim
rename to execution_chain/evm/computation.nim
diff --git a/nimbus/evm/evm_errors.nim b/execution_chain/evm/evm_errors.nim
similarity index 100%
rename from nimbus/evm/evm_errors.nim
rename to execution_chain/evm/evm_errors.nim
diff --git a/nimbus/evm/evmc_api.nim b/execution_chain/evm/evmc_api.nim
similarity index 100%
rename from nimbus/evm/evmc_api.nim
rename to execution_chain/evm/evmc_api.nim
diff --git a/nimbus/evm/evmc_helpers.nim b/execution_chain/evm/evmc_helpers.nim
similarity index 100%
rename from nimbus/evm/evmc_helpers.nim
rename to execution_chain/evm/evmc_helpers.nim
diff --git a/nimbus/evm/internals.nim b/execution_chain/evm/internals.nim
similarity index 100%
rename from nimbus/evm/internals.nim
rename to execution_chain/evm/internals.nim
diff --git a/nimbus/evm/interpreter/evmc_gas_costs.nim b/execution_chain/evm/interpreter/evmc_gas_costs.nim
similarity index 100%
rename from nimbus/evm/interpreter/evmc_gas_costs.nim
rename to execution_chain/evm/interpreter/evmc_gas_costs.nim
diff --git a/nimbus/evm/interpreter/forks_list.md b/execution_chain/evm/interpreter/forks_list.md
similarity index 100%
rename from nimbus/evm/interpreter/forks_list.md
rename to execution_chain/evm/interpreter/forks_list.md
diff --git a/nimbus/evm/interpreter/forks_list.png b/execution_chain/evm/interpreter/forks_list.png
similarity index 100%
rename from nimbus/evm/interpreter/forks_list.png
rename to execution_chain/evm/interpreter/forks_list.png
diff --git a/nimbus/evm/interpreter/gas_costs.nim b/execution_chain/evm/interpreter/gas_costs.nim
similarity index 100%
rename from nimbus/evm/interpreter/gas_costs.nim
rename to execution_chain/evm/interpreter/gas_costs.nim
diff --git a/nimbus/evm/interpreter/gas_meter.nim b/execution_chain/evm/interpreter/gas_meter.nim
similarity index 100%
rename from nimbus/evm/interpreter/gas_meter.nim
rename to execution_chain/evm/interpreter/gas_meter.nim
diff --git a/nimbus/evm/interpreter/op_codes.nim b/execution_chain/evm/interpreter/op_codes.nim
similarity index 100%
rename from nimbus/evm/interpreter/op_codes.nim
rename to execution_chain/evm/interpreter/op_codes.nim
diff --git a/nimbus/evm/interpreter/op_dispatcher.nim b/execution_chain/evm/interpreter/op_dispatcher.nim
similarity index 100%
rename from nimbus/evm/interpreter/op_dispatcher.nim
rename to execution_chain/evm/interpreter/op_dispatcher.nim
diff --git a/nimbus/evm/interpreter/op_handlers.nim b/execution_chain/evm/interpreter/op_handlers.nim
similarity index 100%
rename from nimbus/evm/interpreter/op_handlers.nim
rename to execution_chain/evm/interpreter/op_handlers.nim
diff --git a/nimbus/evm/interpreter/op_handlers/oph_arithmetic.nim b/execution_chain/evm/interpreter/op_handlers/oph_arithmetic.nim
similarity index 100%
rename from nimbus/evm/interpreter/op_handlers/oph_arithmetic.nim
rename to execution_chain/evm/interpreter/op_handlers/oph_arithmetic.nim
diff --git a/nimbus/evm/interpreter/op_handlers/oph_blockdata.nim b/execution_chain/evm/interpreter/op_handlers/oph_blockdata.nim
similarity index 100%
rename from nimbus/evm/interpreter/op_handlers/oph_blockdata.nim
rename to execution_chain/evm/interpreter/op_handlers/oph_blockdata.nim
diff --git a/nimbus/evm/interpreter/op_handlers/oph_call.nim b/execution_chain/evm/interpreter/op_handlers/oph_call.nim
similarity index 100%
rename from nimbus/evm/interpreter/op_handlers/oph_call.nim
rename to execution_chain/evm/interpreter/op_handlers/oph_call.nim
diff --git a/nimbus/evm/interpreter/op_handlers/oph_create.nim b/execution_chain/evm/interpreter/op_handlers/oph_create.nim
similarity index 100%
rename from nimbus/evm/interpreter/op_handlers/oph_create.nim
rename to execution_chain/evm/interpreter/op_handlers/oph_create.nim
diff --git a/nimbus/evm/interpreter/op_handlers/oph_defs.nim b/execution_chain/evm/interpreter/op_handlers/oph_defs.nim
similarity index 100%
rename from nimbus/evm/interpreter/op_handlers/oph_defs.nim
rename to execution_chain/evm/interpreter/op_handlers/oph_defs.nim
diff --git a/nimbus/evm/interpreter/op_handlers/oph_dup.nim b/execution_chain/evm/interpreter/op_handlers/oph_dup.nim
similarity index 100%
rename from nimbus/evm/interpreter/op_handlers/oph_dup.nim
rename to execution_chain/evm/interpreter/op_handlers/oph_dup.nim
diff --git a/nimbus/evm/interpreter/op_handlers/oph_envinfo.nim b/execution_chain/evm/interpreter/op_handlers/oph_envinfo.nim
similarity index 100%
rename from nimbus/evm/interpreter/op_handlers/oph_envinfo.nim
rename to execution_chain/evm/interpreter/op_handlers/oph_envinfo.nim
diff --git a/nimbus/evm/interpreter/op_handlers/oph_gen_handlers.nim b/execution_chain/evm/interpreter/op_handlers/oph_gen_handlers.nim
similarity index 100%
rename from nimbus/evm/interpreter/op_handlers/oph_gen_handlers.nim
rename to execution_chain/evm/interpreter/op_handlers/oph_gen_handlers.nim
diff --git a/nimbus/evm/interpreter/op_handlers/oph_hash.nim b/execution_chain/evm/interpreter/op_handlers/oph_hash.nim
similarity index 100%
rename from nimbus/evm/interpreter/op_handlers/oph_hash.nim
rename to execution_chain/evm/interpreter/op_handlers/oph_hash.nim
diff --git a/nimbus/evm/interpreter/op_handlers/oph_helpers.nim b/execution_chain/evm/interpreter/op_handlers/oph_helpers.nim
similarity index 100%
rename from nimbus/evm/interpreter/op_handlers/oph_helpers.nim
rename to execution_chain/evm/interpreter/op_handlers/oph_helpers.nim
diff --git a/nimbus/evm/interpreter/op_handlers/oph_log.nim b/execution_chain/evm/interpreter/op_handlers/oph_log.nim
similarity index 100%
rename from nimbus/evm/interpreter/op_handlers/oph_log.nim
rename to execution_chain/evm/interpreter/op_handlers/oph_log.nim
diff --git a/nimbus/evm/interpreter/op_handlers/oph_memory.nim b/execution_chain/evm/interpreter/op_handlers/oph_memory.nim
similarity index 100%
rename from nimbus/evm/interpreter/op_handlers/oph_memory.nim
rename to execution_chain/evm/interpreter/op_handlers/oph_memory.nim
diff --git a/nimbus/evm/interpreter/op_handlers/oph_push.nim b/execution_chain/evm/interpreter/op_handlers/oph_push.nim
similarity index 100%
rename from nimbus/evm/interpreter/op_handlers/oph_push.nim
rename to execution_chain/evm/interpreter/op_handlers/oph_push.nim
diff --git a/nimbus/evm/interpreter/op_handlers/oph_swap.nim b/execution_chain/evm/interpreter/op_handlers/oph_swap.nim
similarity index 100%
rename from nimbus/evm/interpreter/op_handlers/oph_swap.nim
rename to execution_chain/evm/interpreter/op_handlers/oph_swap.nim
diff --git a/nimbus/evm/interpreter/op_handlers/oph_sysops.nim b/execution_chain/evm/interpreter/op_handlers/oph_sysops.nim
similarity index 100%
rename from nimbus/evm/interpreter/op_handlers/oph_sysops.nim
rename to execution_chain/evm/interpreter/op_handlers/oph_sysops.nim
diff --git a/nimbus/evm/interpreter/utils/macros_gen_opcodes.nim b/execution_chain/evm/interpreter/utils/macros_gen_opcodes.nim
similarity index 100%
rename from nimbus/evm/interpreter/utils/macros_gen_opcodes.nim
rename to execution_chain/evm/interpreter/utils/macros_gen_opcodes.nim
diff --git a/nimbus/evm/interpreter/utils/utils_numeric.nim b/execution_chain/evm/interpreter/utils/utils_numeric.nim
similarity index 98%
rename from nimbus/evm/interpreter/utils/utils_numeric.nim
rename to execution_chain/evm/interpreter/utils/utils_numeric.nim
index 499d43747d..d30f908f6e 100644
--- a/nimbus/evm/interpreter/utils/utils_numeric.nim
+++ b/execution_chain/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 b/execution_chain/evm/interpreter_dispatch.nim
similarity index 100%
rename from nimbus/evm/interpreter_dispatch.nim
rename to execution_chain/evm/interpreter_dispatch.nim
diff --git a/nimbus/evm/memory.nim b/execution_chain/evm/memory.nim
similarity index 100%
rename from nimbus/evm/memory.nim
rename to execution_chain/evm/memory.nim
diff --git a/nimbus/evm/message.nim b/execution_chain/evm/message.nim
similarity index 100%
rename from nimbus/evm/message.nim
rename to execution_chain/evm/message.nim
diff --git a/nimbus/evm/modexp.nim b/execution_chain/evm/modexp.nim
similarity index 100%
rename from nimbus/evm/modexp.nim
rename to execution_chain/evm/modexp.nim
diff --git a/nimbus/evm/nimdoc.cfg b/execution_chain/evm/nimdoc.cfg
similarity index 100%
rename from nimbus/evm/nimdoc.cfg
rename to execution_chain/evm/nimdoc.cfg
diff --git a/nimbus/evm/precompiles.nim b/execution_chain/evm/precompiles.nim
similarity index 100%
rename from nimbus/evm/precompiles.nim
rename to execution_chain/evm/precompiles.nim
diff --git a/nimbus/evm/stack.nim b/execution_chain/evm/stack.nim
similarity index 100%
rename from nimbus/evm/stack.nim
rename to execution_chain/evm/stack.nim
diff --git a/nimbus/evm/state.nim b/execution_chain/evm/state.nim
similarity index 100%
rename from nimbus/evm/state.nim
rename to execution_chain/evm/state.nim
diff --git a/nimbus/evm/tracer/access_list_tracer.nim b/execution_chain/evm/tracer/access_list_tracer.nim
similarity index 100%
rename from nimbus/evm/tracer/access_list_tracer.nim
rename to execution_chain/evm/tracer/access_list_tracer.nim
diff --git a/nimbus/evm/tracer/json_tracer.nim b/execution_chain/evm/tracer/json_tracer.nim
similarity index 100%
rename from nimbus/evm/tracer/json_tracer.nim
rename to execution_chain/evm/tracer/json_tracer.nim
diff --git a/nimbus/evm/tracer/legacy_tracer.nim b/execution_chain/evm/tracer/legacy_tracer.nim
similarity index 100%
rename from nimbus/evm/tracer/legacy_tracer.nim
rename to execution_chain/evm/tracer/legacy_tracer.nim
diff --git a/nimbus/evm/types.nim b/execution_chain/evm/types.nim
similarity index 100%
rename from nimbus/evm/types.nim
rename to execution_chain/evm/types.nim
diff --git a/nimbus/graphql/ethapi.nim b/execution_chain/graphql/ethapi.nim
similarity index 100%
rename from nimbus/graphql/ethapi.nim
rename to execution_chain/graphql/ethapi.nim
diff --git a/nimbus/graphql/ethapi.ql b/execution_chain/graphql/ethapi.ql
similarity index 100%
rename from nimbus/graphql/ethapi.ql
rename to execution_chain/graphql/ethapi.ql
diff --git a/nimbus/makefile b/execution_chain/makefile
similarity index 100%
rename from nimbus/makefile
rename to execution_chain/makefile
diff --git a/nimbus/nim.cfg b/execution_chain/nim.cfg
similarity index 100%
rename from nimbus/nim.cfg
rename to execution_chain/nim.cfg
diff --git a/nimbus/nimbus_desc.nim b/execution_chain/nimbus_desc.nim
similarity index 100%
rename from nimbus/nimbus_desc.nim
rename to execution_chain/nimbus_desc.nim
diff --git a/nimbus/nimbus_execution_client.nim b/execution_chain/nimbus_execution_client.nim
similarity index 99%
rename from nimbus/nimbus_execution_client.nim
rename to execution_chain/nimbus_execution_client.nim
index 86d57cedc7..5e70c0bf4d 100644
--- a/nimbus/nimbus_execution_client.nim
+++ b/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 b/execution_chain/nimbus_execution_client.nim.cfg
similarity index 100%
rename from nimbus/nimbus_execution_client.nim.cfg
rename to execution_chain/nimbus_execution_client.nim.cfg
diff --git a/nimbus/nimbus_import.nim b/execution_chain/nimbus_import.nim
similarity index 100%
rename from nimbus/nimbus_import.nim
rename to execution_chain/nimbus_import.nim
diff --git a/nimbus/rpc.nim b/execution_chain/rpc.nim
similarity index 100%
rename from nimbus/rpc.nim
rename to execution_chain/rpc.nim
diff --git a/nimbus/rpc/common.nim b/execution_chain/rpc/common.nim
similarity index 100%
rename from nimbus/rpc/common.nim
rename to execution_chain/rpc/common.nim
diff --git a/nimbus/rpc/cors.nim b/execution_chain/rpc/cors.nim
similarity index 100%
rename from nimbus/rpc/cors.nim
rename to execution_chain/rpc/cors.nim
diff --git a/nimbus/rpc/debug.nim b/execution_chain/rpc/debug.nim
similarity index 100%
rename from nimbus/rpc/debug.nim
rename to execution_chain/rpc/debug.nim
diff --git a/nimbus/rpc/engine_api.nim b/execution_chain/rpc/engine_api.nim
similarity index 100%
rename from nimbus/rpc/engine_api.nim
rename to execution_chain/rpc/engine_api.nim
diff --git a/nimbus/rpc/filters.nim b/execution_chain/rpc/filters.nim
similarity index 100%
rename from nimbus/rpc/filters.nim
rename to execution_chain/rpc/filters.nim
diff --git a/nimbus/rpc/jwt_auth.nim b/execution_chain/rpc/jwt_auth.nim
similarity index 100%
rename from nimbus/rpc/jwt_auth.nim
rename to execution_chain/rpc/jwt_auth.nim
diff --git a/nimbus/rpc/jwt_auth_helper.nim b/execution_chain/rpc/jwt_auth_helper.nim
similarity index 100%
rename from nimbus/rpc/jwt_auth_helper.nim
rename to execution_chain/rpc/jwt_auth_helper.nim
diff --git a/nimbus/rpc/oracle.nim b/execution_chain/rpc/oracle.nim
similarity index 100%
rename from nimbus/rpc/oracle.nim
rename to execution_chain/rpc/oracle.nim
diff --git a/nimbus/rpc/params.nim b/execution_chain/rpc/params.nim
similarity index 100%
rename from nimbus/rpc/params.nim
rename to execution_chain/rpc/params.nim
diff --git a/nimbus/rpc/rpc_server.nim b/execution_chain/rpc/rpc_server.nim
similarity index 100%
rename from nimbus/rpc/rpc_server.nim
rename to execution_chain/rpc/rpc_server.nim
diff --git a/nimbus/rpc/rpc_types.nim b/execution_chain/rpc/rpc_types.nim
similarity index 100%
rename from nimbus/rpc/rpc_types.nim
rename to execution_chain/rpc/rpc_types.nim
diff --git a/nimbus/rpc/rpc_utils.nim b/execution_chain/rpc/rpc_utils.nim
similarity index 100%
rename from nimbus/rpc/rpc_utils.nim
rename to execution_chain/rpc/rpc_utils.nim
diff --git a/nimbus/rpc/server_api.nim b/execution_chain/rpc/server_api.nim
similarity index 100%
rename from nimbus/rpc/server_api.nim
rename to execution_chain/rpc/server_api.nim
diff --git a/nimbus/stateless/multi_keys.nim b/execution_chain/stateless/multi_keys.nim
similarity index 100%
rename from nimbus/stateless/multi_keys.nim
rename to execution_chain/stateless/multi_keys.nim
diff --git a/nimbus/sync/beacon.nim b/execution_chain/sync/beacon.nim
similarity index 100%
rename from nimbus/sync/beacon.nim
rename to execution_chain/sync/beacon.nim
diff --git a/nimbus/sync/beacon/.gitignore b/execution_chain/sync/beacon/.gitignore
similarity index 100%
rename from nimbus/sync/beacon/.gitignore
rename to execution_chain/sync/beacon/.gitignore
diff --git a/nimbus/sync/beacon/README.md b/execution_chain/sync/beacon/README.md
similarity index 100%
rename from nimbus/sync/beacon/README.md
rename to execution_chain/sync/beacon/README.md
diff --git a/nimbus/sync/beacon/TODO.md b/execution_chain/sync/beacon/TODO.md
similarity index 100%
rename from nimbus/sync/beacon/TODO.md
rename to execution_chain/sync/beacon/TODO.md
diff --git a/nimbus/sync/beacon/worker.nim b/execution_chain/sync/beacon/worker.nim
similarity index 100%
rename from nimbus/sync/beacon/worker.nim
rename to execution_chain/sync/beacon/worker.nim
diff --git a/nimbus/sync/beacon/worker/blocks_staged.nim b/execution_chain/sync/beacon/worker/blocks_staged.nim
similarity index 100%
rename from nimbus/sync/beacon/worker/blocks_staged.nim
rename to execution_chain/sync/beacon/worker/blocks_staged.nim
diff --git a/nimbus/sync/beacon/worker/blocks_staged/bodies.nim b/execution_chain/sync/beacon/worker/blocks_staged/bodies.nim
similarity index 100%
rename from nimbus/sync/beacon/worker/blocks_staged/bodies.nim
rename to execution_chain/sync/beacon/worker/blocks_staged/bodies.nim
diff --git a/nimbus/sync/beacon/worker/blocks_staged/staged_queue.nim b/execution_chain/sync/beacon/worker/blocks_staged/staged_queue.nim
similarity index 100%
rename from nimbus/sync/beacon/worker/blocks_staged/staged_queue.nim
rename to execution_chain/sync/beacon/worker/blocks_staged/staged_queue.nim
diff --git a/nimbus/sync/beacon/worker/blocks_unproc.nim b/execution_chain/sync/beacon/worker/blocks_unproc.nim
similarity index 100%
rename from nimbus/sync/beacon/worker/blocks_unproc.nim
rename to execution_chain/sync/beacon/worker/blocks_unproc.nim
diff --git a/nimbus/sync/beacon/worker/db.nim b/execution_chain/sync/beacon/worker/db.nim
similarity index 100%
rename from nimbus/sync/beacon/worker/db.nim
rename to execution_chain/sync/beacon/worker/db.nim
diff --git a/nimbus/sync/beacon/worker/headers_staged.nim b/execution_chain/sync/beacon/worker/headers_staged.nim
similarity index 100%
rename from nimbus/sync/beacon/worker/headers_staged.nim
rename to execution_chain/sync/beacon/worker/headers_staged.nim
diff --git a/nimbus/sync/beacon/worker/headers_staged/headers.nim b/execution_chain/sync/beacon/worker/headers_staged/headers.nim
similarity index 100%
rename from nimbus/sync/beacon/worker/headers_staged/headers.nim
rename to execution_chain/sync/beacon/worker/headers_staged/headers.nim
diff --git a/nimbus/sync/beacon/worker/headers_staged/linked_hchain.nim b/execution_chain/sync/beacon/worker/headers_staged/linked_hchain.nim
similarity index 100%
rename from nimbus/sync/beacon/worker/headers_staged/linked_hchain.nim
rename to execution_chain/sync/beacon/worker/headers_staged/linked_hchain.nim
diff --git a/nimbus/sync/beacon/worker/headers_staged/staged_queue.nim b/execution_chain/sync/beacon/worker/headers_staged/staged_queue.nim
similarity index 100%
rename from nimbus/sync/beacon/worker/headers_staged/staged_queue.nim
rename to execution_chain/sync/beacon/worker/headers_staged/staged_queue.nim
diff --git a/nimbus/sync/beacon/worker/headers_unproc.nim b/execution_chain/sync/beacon/worker/headers_unproc.nim
similarity index 100%
rename from nimbus/sync/beacon/worker/headers_unproc.nim
rename to execution_chain/sync/beacon/worker/headers_unproc.nim
diff --git a/nimbus/sync/beacon/worker/helpers.nim b/execution_chain/sync/beacon/worker/helpers.nim
similarity index 100%
rename from nimbus/sync/beacon/worker/helpers.nim
rename to execution_chain/sync/beacon/worker/helpers.nim
diff --git a/nimbus/sync/beacon/worker/start_stop.nim b/execution_chain/sync/beacon/worker/start_stop.nim
similarity index 100%
rename from nimbus/sync/beacon/worker/start_stop.nim
rename to execution_chain/sync/beacon/worker/start_stop.nim
diff --git a/nimbus/sync/beacon/worker/update.nim b/execution_chain/sync/beacon/worker/update.nim
similarity index 100%
rename from nimbus/sync/beacon/worker/update.nim
rename to execution_chain/sync/beacon/worker/update.nim
diff --git a/nimbus/sync/beacon/worker/update/metrics.nim b/execution_chain/sync/beacon/worker/update/metrics.nim
similarity index 100%
rename from nimbus/sync/beacon/worker/update/metrics.nim
rename to execution_chain/sync/beacon/worker/update/metrics.nim
diff --git a/nimbus/sync/beacon/worker/update/ticker.nim b/execution_chain/sync/beacon/worker/update/ticker.nim
similarity index 100%
rename from nimbus/sync/beacon/worker/update/ticker.nim
rename to execution_chain/sync/beacon/worker/update/ticker.nim
diff --git a/nimbus/sync/beacon/worker_config.nim b/execution_chain/sync/beacon/worker_config.nim
similarity index 100%
rename from nimbus/sync/beacon/worker_config.nim
rename to execution_chain/sync/beacon/worker_config.nim
diff --git a/nimbus/sync/beacon/worker_desc.nim b/execution_chain/sync/beacon/worker_desc.nim
similarity index 100%
rename from nimbus/sync/beacon/worker_desc.nim
rename to execution_chain/sync/beacon/worker_desc.nim
diff --git a/nimbus/sync/handlers.nim b/execution_chain/sync/handlers.nim
similarity index 100%
rename from nimbus/sync/handlers.nim
rename to execution_chain/sync/handlers.nim
diff --git a/nimbus/sync/handlers/eth.nim b/execution_chain/sync/handlers/eth.nim
similarity index 100%
rename from nimbus/sync/handlers/eth.nim
rename to execution_chain/sync/handlers/eth.nim
diff --git a/nimbus/sync/handlers/setup.nim b/execution_chain/sync/handlers/setup.nim
similarity index 100%
rename from nimbus/sync/handlers/setup.nim
rename to execution_chain/sync/handlers/setup.nim
diff --git a/nimbus/sync/peers.nim b/execution_chain/sync/peers.nim
similarity index 100%
rename from nimbus/sync/peers.nim
rename to execution_chain/sync/peers.nim
diff --git a/nimbus/sync/protocol.nim b/execution_chain/sync/protocol.nim
similarity index 100%
rename from nimbus/sync/protocol.nim
rename to execution_chain/sync/protocol.nim
diff --git a/nimbus/sync/protocol/eth/eth_types.nim b/execution_chain/sync/protocol/eth/eth_types.nim
similarity index 100%
rename from nimbus/sync/protocol/eth/eth_types.nim
rename to execution_chain/sync/protocol/eth/eth_types.nim
diff --git a/nimbus/sync/protocol/eth68.nim b/execution_chain/sync/protocol/eth68.nim
similarity index 100%
rename from nimbus/sync/protocol/eth68.nim
rename to execution_chain/sync/protocol/eth68.nim
diff --git a/nimbus/sync/protocol/snap1.nim b/execution_chain/sync/protocol/snap1.nim
similarity index 100%
rename from nimbus/sync/protocol/snap1.nim
rename to execution_chain/sync/protocol/snap1.nim
diff --git a/nimbus/sync/protocol/trace_config.nim b/execution_chain/sync/protocol/trace_config.nim
similarity index 100%
rename from nimbus/sync/protocol/trace_config.nim
rename to execution_chain/sync/protocol/trace_config.nim
diff --git a/nimbus/sync/sync_desc.nim b/execution_chain/sync/sync_desc.nim
similarity index 100%
rename from nimbus/sync/sync_desc.nim
rename to execution_chain/sync/sync_desc.nim
diff --git a/nimbus/sync/sync_sched.nim b/execution_chain/sync/sync_sched.nim
similarity index 100%
rename from nimbus/sync/sync_sched.nim
rename to execution_chain/sync/sync_sched.nim
diff --git a/nimbus/tracer.nim b/execution_chain/tracer.nim
similarity index 100%
rename from nimbus/tracer.nim
rename to execution_chain/tracer.nim
diff --git a/nimbus/transaction.nim b/execution_chain/transaction.nim
similarity index 100%
rename from nimbus/transaction.nim
rename to execution_chain/transaction.nim
diff --git a/nimbus/transaction/call_common.nim b/execution_chain/transaction/call_common.nim
similarity index 100%
rename from nimbus/transaction/call_common.nim
rename to execution_chain/transaction/call_common.nim
diff --git a/nimbus/transaction/call_evm.nim b/execution_chain/transaction/call_evm.nim
similarity index 100%
rename from nimbus/transaction/call_evm.nim
rename to execution_chain/transaction/call_evm.nim
diff --git a/nimbus/transaction/call_types.nim b/execution_chain/transaction/call_types.nim
similarity index 100%
rename from nimbus/transaction/call_types.nim
rename to execution_chain/transaction/call_types.nim
diff --git a/nimbus/transaction/evmc_dynamic_loader.nim b/execution_chain/transaction/evmc_dynamic_loader.nim
similarity index 100%
rename from nimbus/transaction/evmc_dynamic_loader.nim
rename to execution_chain/transaction/evmc_dynamic_loader.nim
diff --git a/nimbus/transaction/evmc_host_glue.nim b/execution_chain/transaction/evmc_host_glue.nim
similarity index 100%
rename from nimbus/transaction/evmc_host_glue.nim
rename to execution_chain/transaction/evmc_host_glue.nim
diff --git a/nimbus/transaction/evmc_vm_glue.nim b/execution_chain/transaction/evmc_vm_glue.nim
similarity index 100%
rename from nimbus/transaction/evmc_vm_glue.nim
rename to execution_chain/transaction/evmc_vm_glue.nim
diff --git a/nimbus/transaction/host_call_nested.nim b/execution_chain/transaction/host_call_nested.nim
similarity index 100%
rename from nimbus/transaction/host_call_nested.nim
rename to execution_chain/transaction/host_call_nested.nim
diff --git a/nimbus/transaction/host_services.nim b/execution_chain/transaction/host_services.nim
similarity index 100%
rename from nimbus/transaction/host_services.nim
rename to execution_chain/transaction/host_services.nim
diff --git a/nimbus/transaction/host_trace.nim b/execution_chain/transaction/host_trace.nim
similarity index 100%
rename from nimbus/transaction/host_trace.nim
rename to execution_chain/transaction/host_trace.nim
diff --git a/nimbus/transaction/host_types.nim b/execution_chain/transaction/host_types.nim
similarity index 100%
rename from nimbus/transaction/host_types.nim
rename to execution_chain/transaction/host_types.nim
diff --git a/nimbus/utils/debug.nim b/execution_chain/utils/debug.nim
similarity index 100%
rename from nimbus/utils/debug.nim
rename to execution_chain/utils/debug.nim
diff --git a/nimbus/utils/era_helpers.nim b/execution_chain/utils/era_helpers.nim
similarity index 100%
rename from nimbus/utils/era_helpers.nim
rename to execution_chain/utils/era_helpers.nim
diff --git a/nimbus/utils/mergeutils.nim b/execution_chain/utils/mergeutils.nim
similarity index 100%
rename from nimbus/utils/mergeutils.nim
rename to execution_chain/utils/mergeutils.nim
diff --git a/nimbus/utils/prettify.nim b/execution_chain/utils/prettify.nim
similarity index 100%
rename from nimbus/utils/prettify.nim
rename to execution_chain/utils/prettify.nim
diff --git a/nimbus/utils/state_dump.nim b/execution_chain/utils/state_dump.nim
similarity index 100%
rename from nimbus/utils/state_dump.nim
rename to execution_chain/utils/state_dump.nim
diff --git a/nimbus/utils/utils.nim b/execution_chain/utils/utils.nim
similarity index 100%
rename from nimbus/utils/utils.nim
rename to execution_chain/utils/utils.nim
diff --git a/nimbus/version.nim b/execution_chain/version.nim
similarity index 100%
rename from nimbus/version.nim
rename to execution_chain/version.nim
diff --git a/fluffy/eth_data/era1.nim b/fluffy/eth_data/era1.nim
index e6ba70ffa5..e6f4cd4fc6 100644
--- 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
index 2c8020313d..bc33b37f2c 100644
--- 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
index 39519c709d..d3a45182c1 100644
--- 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
index c0caa19a34..9cc81dfe46 100644
--- 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
index 01d76faef9..86e4b28699 100644
--- 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
index 534227b533..ecadc50ce9 100644
--- 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
index 7cfa82ea03..e7269fb9ac 100644
--- 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
index eb7efa196b..42eafe1b6f 100644
--- 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
diff --git a/fluffy/tools/portal_bridge/portal_bridge_history.nim b/fluffy/tools/portal_bridge/portal_bridge_history.nim
index 6c953f6b62..bb3ad92b8f 100644
--- a/fluffy/tools/portal_bridge/portal_bridge_history.nim
+++ b/fluffy/tools/portal_bridge/portal_bridge_history.nim
@@ -17,7 +17,7 @@ import
eth/common/keys,
eth/common/[base, headers_rlp, blocks_rlp, receipts],
eth/p2p/discoveryv5/random2,
- ../../../nimbus/beacon/web3_eth_conv,
+ ../../../execution_chain/beacon/web3_eth_conv,
../../../hive_integration/nodocker/engine/engine_client,
../../rpc/portal_rpc_client,
../../network/history/[history_content, history_type_conversions, history_validation],
diff --git a/fluffy/tools/portal_bridge/portal_bridge_state.nim b/fluffy/tools/portal_bridge/portal_bridge_state.nim
index 4064bdf310..6c238fe4d9 100644
--- a/fluffy/tools/portal_bridge/portal_bridge_state.nim
+++ b/fluffy/tools/portal_bridge/portal_bridge_state.nim
@@ -17,7 +17,7 @@ import
web3/[eth_api, eth_api_types],
results,
eth/common/[addresses_rlp, hashes_rlp],
- ../../../nimbus/common/chain_config,
+ ../../../execution_chain/common/chain_config,
../../rpc/rpc_calls/rpc_trace_calls,
../../rpc/portal_rpc_client,
../../network/state/[state_content, state_gossip],
diff --git a/fluffy/tools/portal_bridge/state_bridge/world_state_helper.nim b/fluffy/tools/portal_bridge/state_bridge/world_state_helper.nim
index c2d490fcbd..623a4a0606 100644
--- a/fluffy/tools/portal_bridge/state_bridge/world_state_helper.nim
+++ b/fluffy/tools/portal_bridge/state_bridge/world_state_helper.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).
@@ -12,10 +12,10 @@ import
stint,
results,
eth/common/addresses,
- ../../../../nimbus/common/chain_config,
+ ../../../../execution_chain/common/chain_config,
./[state_diff, world_state]
-from ../../../../nimbus/core/dao import DAORefundContract, DAODrainList
+from ../../../../execution_chain/core/dao import DAORefundContract, DAODrainList
export chain_config, state_diff, world_state
diff --git a/hive_integration/nodocker/consensus/consensus_sim.nim b/hive_integration/nodocker/consensus/consensus_sim.nim
index 8315936c50..4ecbdfc7b5 100644
--- a/hive_integration/nodocker/consensus/consensus_sim.nim
+++ b/hive_integration/nodocker/consensus/consensus_sim.nim
@@ -11,10 +11,10 @@ import
std/[os, json, strutils, times],
results,
chronicles,
- ../../../nimbus/core/chain,
- ../../../nimbus/core/block_import,
- ../../../nimbus/common,
- ../../../nimbus/core/eip4844,
+ ../../../execution_chain/core/chain,
+ ../../../execution_chain/core/block_import,
+ ../../../execution_chain/common,
+ ../../../execution_chain/core/eip4844,
../sim_utils,
./extract_consensus_data
diff --git a/hive_integration/nodocker/consensus/extract_consensus_data.nim b/hive_integration/nodocker/consensus/extract_consensus_data.nim
index 3ae5ec3015..9c23bbf727 100644
--- a/hive_integration/nodocker/consensus/extract_consensus_data.nim
+++ b/hive_integration/nodocker/consensus/extract_consensus_data.nim
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2021-2024 Status Research & Development GmbH
+# Copyright (c) 2021-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)
@@ -12,7 +12,7 @@ import
std/[json],
stew/byteutils,
../../../tools/common/helpers,
- ../../../nimbus/common/chain_config
+ ../../../execution_chain/common/chain_config
type
Blob = seq[byte]
diff --git a/hive_integration/nodocker/engine/base_spec.nim b/hive_integration/nodocker/engine/base_spec.nim
index b081fa5060..5dd0a26ecd 100644
--- a/hive_integration/nodocker/engine/base_spec.nim
+++ b/hive_integration/nodocker/engine/base_spec.nim
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2023-2024 Status Research & Development GmbH
+# Copyright (c) 2023-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)
@@ -13,7 +13,7 @@ import
./clmock,
./types,
../../../tools/common/helpers,
- ../../../nimbus/common/chain_config
+ ../../../execution_chain/common/chain_config
func getBlockTimeIncrements*(s: BaseSpec): int =
if s.blockTimestampIncrement == 0:
diff --git a/hive_integration/nodocker/engine/cancun/blobs.nim b/hive_integration/nodocker/engine/cancun/blobs.nim
index 09d459534e..c78e620f4c 100644
--- a/hive_integration/nodocker/engine/cancun/blobs.nim
+++ b/hive_integration/nodocker/engine/cancun/blobs.nim
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2023-2024 Status Research & Development GmbH
+# Copyright (c) 2023-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)
@@ -15,7 +15,7 @@ import
stew/endians2,
nimcrypto/sha2,
results,
- ../../../../nimbus/core/eip4844
+ ../../../../execution_chain/core/eip4844
export base, hashes
type
diff --git a/hive_integration/nodocker/engine/cancun/customizer.nim b/hive_integration/nodocker/engine/cancun/customizer.nim
index 3c71218549..5f701b0063 100644
--- a/hive_integration/nodocker/engine/cancun/customizer.nim
+++ b/hive_integration/nodocker/engine/cancun/customizer.nim
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2023-2024 Status Research & Development GmbH
+# Copyright (c) 2023-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)
@@ -14,11 +14,11 @@ import
./blobs,
../types,
../tx_sender,
- ../../../../nimbus/constants,
- ../../../../nimbus/utils/utils,
- ../../../../nimbus/common as nimbus_common,
- ../../../../nimbus/beacon/web3_eth_conv,
- ../../../../nimbus/beacon/payload_conv,
+ ../../../../execution_chain/constants,
+ ../../../../execution_chain/utils/utils,
+ ../../../../execution_chain/common as nimbus_common,
+ ../../../../execution_chain/beacon/web3_eth_conv,
+ ../../../../execution_chain/beacon/payload_conv,
web3/execution_types
type
diff --git a/hive_integration/nodocker/engine/cancun/helpers.nim b/hive_integration/nodocker/engine/cancun/helpers.nim
index 62befc710b..9c94b67b46 100644
--- a/hive_integration/nodocker/engine/cancun/helpers.nim
+++ b/hive_integration/nodocker/engine/cancun/helpers.nim
@@ -18,11 +18,11 @@ import
kzg4844/kzg,
../types,
../engine_client,
- ../../../../nimbus/constants,
- ../../../../nimbus/core/eip4844,
- ../../../../nimbus/rpc/rpc_types,
+ ../../../../execution_chain/constants,
+ ../../../../execution_chain/core/eip4844,
+ ../../../../execution_chain/rpc/rpc_types,
web3/execution_types,
- ../../../../nimbus/beacon/web3_eth_conv,
+ ../../../../execution_chain/beacon/web3_eth_conv,
./blobs
type
diff --git a/hive_integration/nodocker/engine/cancun/step_devp2p_pooledtx.nim b/hive_integration/nodocker/engine/cancun/step_devp2p_pooledtx.nim
index b4832133ec..c95692e56c 100644
--- a/hive_integration/nodocker/engine/cancun/step_devp2p_pooledtx.nim
+++ b/hive_integration/nodocker/engine/cancun/step_devp2p_pooledtx.nim
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2023-2024 Status Research & Development GmbH
+# Copyright (c) 2023-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)
@@ -16,8 +16,8 @@ import
./helpers,
../types,
../test_env,
- ../../../../nimbus/utils/utils,
- ../../../../nimbus/sync/protocol
+ ../../../../execution_chain/utils/utils,
+ ../../../../execution_chain/sync/protocol
# A step that requests a Transaction hash via P2P and expects the correct full blob tx
type
diff --git a/hive_integration/nodocker/engine/cancun/step_newpayloads.nim b/hive_integration/nodocker/engine/cancun/step_newpayloads.nim
index e60b4c191e..be28764fee 100644
--- a/hive_integration/nodocker/engine/cancun/step_newpayloads.nim
+++ b/hive_integration/nodocker/engine/cancun/step_newpayloads.nim
@@ -18,8 +18,8 @@ import
../engine_client,
../test_env,
../types,
- ../../../../nimbus/core/eip4844,
- ../../../../nimbus/common/common
+ ../../../../execution_chain/core/eip4844,
+ ../../../../execution_chain/common/common
type
NewPayloads* = ref object of TestStep
diff --git a/hive_integration/nodocker/engine/cancun/step_sendblobtx.nim b/hive_integration/nodocker/engine/cancun/step_sendblobtx.nim
index dd7b6e790a..336b88a349 100644
--- a/hive_integration/nodocker/engine/cancun/step_sendblobtx.nim
+++ b/hive_integration/nodocker/engine/cancun/step_sendblobtx.nim
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2023-2024 Status Research & Development GmbH
+# Copyright (c) 2023-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)
@@ -18,7 +18,7 @@ import
./blobs,
../test_env,
../tx_sender,
- ../../../../nimbus/utils/utils
+ ../../../../execution_chain/utils/utils
type
# A step that sends multiple new blobs to the client
diff --git a/hive_integration/nodocker/engine/cancun_tests.nim b/hive_integration/nodocker/engine/cancun_tests.nim
index ed03674c2e..5b046b69ff 100644
--- a/hive_integration/nodocker/engine/cancun_tests.nim
+++ b/hive_integration/nodocker/engine/cancun_tests.nim
@@ -24,8 +24,8 @@ import
./cancun/customizer,
./engine_tests,
./engine/engine_spec,
- ../../../nimbus/constants,
- ../../../nimbus/common/chain_config
+ ../../../execution_chain/constants,
+ ../../../execution_chain/common/chain_config
import
./cancun/step_newpayloads,
diff --git a/hive_integration/nodocker/engine/clmock.nim b/hive_integration/nodocker/engine/clmock.nim
index 2567ebcbbd..fd899b0b74 100644
--- a/hive_integration/nodocker/engine/clmock.nim
+++ b/hive_integration/nodocker/engine/clmock.nim
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2023-2024 Status Research & Development GmbH
+# Copyright (c) 2023-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)
@@ -14,10 +14,10 @@ import
eth/common/eth_types_rlp, chronos,
json_rpc/rpcclient,
web3/execution_types,
- ../../../nimbus/beacon/web3_eth_conv,
- ../../../nimbus/beacon/payload_conv,
- ../../../nimbus/[constants],
- ../../../nimbus/common as nimbus_common,
+ ../../../execution_chain/beacon/web3_eth_conv,
+ ../../../execution_chain/beacon/payload_conv,
+ ../../../execution_chain/[constants],
+ ../../../execution_chain/common as nimbus_common,
./client_pool,
./engine_env,
./engine_client,
diff --git a/hive_integration/nodocker/engine/engine/fork_id.nim b/hive_integration/nodocker/engine/engine/fork_id.nim
index c39eefcf04..4c09bdf439 100644
--- a/hive_integration/nodocker/engine/engine/fork_id.nim
+++ b/hive_integration/nodocker/engine/engine/fork_id.nim
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2023-2024 Status Research & Development GmbH
+# Copyright (c) 2023-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)
@@ -11,7 +11,7 @@
import
std/strutils,
./engine_spec,
- ../../../../nimbus/common/hardforks
+ ../../../../execution_chain/common/hardforks
type
ForkIDSpec* = ref object of EngineSpec
diff --git a/hive_integration/nodocker/engine/engine/forkchoice.nim b/hive_integration/nodocker/engine/engine/forkchoice.nim
index 0635fea643..077000073c 100644
--- a/hive_integration/nodocker/engine/engine/forkchoice.nim
+++ b/hive_integration/nodocker/engine/engine/forkchoice.nim
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2023-2024 Status Research & Development GmbH
+# Copyright (c) 2023-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)
@@ -13,7 +13,7 @@ import
chronicles,
./engine_spec,
../cancun/customizer,
- ../../../../nimbus/utils/utils
+ ../../../../execution_chain/utils/utils
type
ForkchoiceStateField* = enum
diff --git a/hive_integration/nodocker/engine/engine/invalid_ancestor.nim b/hive_integration/nodocker/engine/engine/invalid_ancestor.nim
index c41259c4e1..d2faad262d 100644
--- a/hive_integration/nodocker/engine/engine/invalid_ancestor.nim
+++ b/hive_integration/nodocker/engine/engine/invalid_ancestor.nim
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2023-2024 Status Research & Development GmbH
+# Copyright (c) 2023-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)
@@ -15,8 +15,8 @@ import
eth/common/eth_types_rlp,
./engine_spec,
../cancun/customizer,
- ../../../../nimbus/utils/utils,
- ../../../../nimbus/beacon/payload_conv
+ ../../../../execution_chain/utils/utils,
+ ../../../../execution_chain/beacon/payload_conv
# Attempt to re-org to a chain which at some point contains an unknown payload which is also invalid.
# Then reveal the invalid payload and expect that the client rejects it and rejects forkchoice updated calls to this chain.
diff --git a/hive_integration/nodocker/engine/engine/invalid_payload.nim b/hive_integration/nodocker/engine/engine/invalid_payload.nim
index ffa8fab8ca..a3f5e2bc28 100644
--- a/hive_integration/nodocker/engine/engine/invalid_payload.nim
+++ b/hive_integration/nodocker/engine/engine/invalid_payload.nim
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2023-2024 Status Research & Development GmbH
+# Copyright (c) 2023-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)
@@ -13,7 +13,7 @@ import
./engine_spec,
../helper,
../cancun/customizer,
- ../../../../nimbus/common
+ ../../../../execution_chain/common
# Generate test cases for each field of NewPayload, where the payload contains a single invalid field and a valid hash.
type
diff --git a/hive_integration/nodocker/engine/engine/misc.nim b/hive_integration/nodocker/engine/engine/misc.nim
index 2479fee173..cbfd91a6e0 100644
--- a/hive_integration/nodocker/engine/engine/misc.nim
+++ b/hive_integration/nodocker/engine/engine/misc.nim
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2023-2024 Status Research & Development GmbH
+# Copyright (c) 2023-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)
@@ -10,7 +10,7 @@
import
./engine_spec,
- ../../../../nimbus/common/hardforks
+ ../../../../execution_chain/common/hardforks
# Runs a sanity test on a post Merge fork where a previous fork's (London) number is not zero
type
diff --git a/hive_integration/nodocker/engine/engine/suggested_fee_recipient.nim b/hive_integration/nodocker/engine/engine/suggested_fee_recipient.nim
index 853876c65e..32094353b4 100644
--- a/hive_integration/nodocker/engine/engine/suggested_fee_recipient.nim
+++ b/hive_integration/nodocker/engine/engine/suggested_fee_recipient.nim
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2023-2024 Status Research & Development GmbH
+# Copyright (c) 2023-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)
@@ -12,7 +12,7 @@ import
chronicles,
eth/common/eth_types_rlp,
./engine_spec,
- ../../../../nimbus/transaction
+ ../../../../execution_chain/transaction
type
SuggestedFeeRecipientTest* = ref object of EngineSpec
diff --git a/hive_integration/nodocker/engine/engine_client.nim b/hive_integration/nodocker/engine/engine_client.nim
index a0d402faca..944a6e4831 100644
--- a/hive_integration/nodocker/engine/engine_client.nim
+++ b/hive_integration/nodocker/engine/engine_client.nim
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2023-2024 Status Research & Development GmbH
+# Copyright (c) 2023-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)
@@ -16,7 +16,7 @@ import
eth/rlp,
eth/common/eth_types_rlp, chronos,
json_rpc/[rpcclient, errors, jsonmarshal],
- ../../../nimbus/beacon/web3_eth_conv,
+ ../../../execution_chain/beacon/web3_eth_conv,
./types
import
@@ -510,7 +510,7 @@ proc getReceipt*(client: RpcClient, txHash: Hash32): Result[ReceiptObject, strin
if res.isNil:
return err("failed to get receipt: " & txHash.data.toHex)
return ok(res)
-
+
proc txByHash*(client: RpcClient, txHash: Hash32): Result[RPCTx, string] =
wrapTry:
let res = waitFor client.eth_getTransactionByHash(txHash)
diff --git a/hive_integration/nodocker/engine/engine_env.nim b/hive_integration/nodocker/engine/engine_env.nim
index 071dd2af06..5e0996d7c0 100644
--- a/hive_integration/nodocker/engine/engine_env.nim
+++ b/hive_integration/nodocker/engine/engine_env.nim
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2023-2024 Status Research & Development GmbH
+# Copyright (c) 2023-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)
@@ -15,7 +15,7 @@ import
chronos,
json_rpc/[rpcserver, rpcclient],
results,
- ../../../nimbus/[
+ ../../../execution_chain/[
config,
constants,
core/chain,
diff --git a/hive_integration/nodocker/engine/engine_sim.nim b/hive_integration/nodocker/engine/engine_sim.nim
index 4100c8b95f..425d527fc9 100644
--- a/hive_integration/nodocker/engine/engine_sim.nim
+++ b/hive_integration/nodocker/engine/engine_sim.nim
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2023-2024 Status Research & Development GmbH
+# Copyright (c) 2023-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)
@@ -14,7 +14,7 @@ import
results,
./types,
../sim_utils,
- ../../../nimbus/core/eip4844
+ ../../../execution_chain/core/eip4844
import
./engine_tests,
diff --git a/hive_integration/nodocker/engine/engine_tests.nim b/hive_integration/nodocker/engine/engine_tests.nim
index 295ec18cb8..c1f7823384 100644
--- a/hive_integration/nodocker/engine/engine_tests.nim
+++ b/hive_integration/nodocker/engine/engine_tests.nim
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2023-2024 Status Research & Development GmbH
+# Copyright (c) 2023-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)
@@ -15,7 +15,7 @@ import
./test_env,
./base_spec,
./cancun/customizer,
- ../../../nimbus/common/chain_config
+ ../../../execution_chain/common/chain_config
import
./engine/suggested_fee_recipient,
diff --git a/hive_integration/nodocker/engine/exchange_cap_tests.nim b/hive_integration/nodocker/engine/exchange_cap_tests.nim
index c3ac02268b..01fda3e5f7 100644
--- a/hive_integration/nodocker/engine/exchange_cap_tests.nim
+++ b/hive_integration/nodocker/engine/exchange_cap_tests.nim
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2023-2024 Status Research & Development GmbH
+# Copyright (c) 2023-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)
@@ -14,7 +14,7 @@ import
./test_env,
./types,
chronicles,
- ../../../nimbus/common/hardforks
+ ../../../execution_chain/common/hardforks
import ../../../tools/common/helpers except LogLevel
diff --git a/hive_integration/nodocker/engine/helper.nim b/hive_integration/nodocker/engine/helper.nim
index e66369c9d4..ecd2d56d67 100644
--- a/hive_integration/nodocker/engine/helper.nim
+++ b/hive_integration/nodocker/engine/helper.nim
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2023-2024 Status Research & Development GmbH
+# Copyright (c) 2023-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)
@@ -12,7 +12,7 @@ import
eth/[common, rlp],
chronicles,
web3/execution_types,
- ../../../nimbus/beacon/web3_eth_conv,
+ ../../../execution_chain/beacon/web3_eth_conv,
./engine_client,
./types
diff --git a/hive_integration/nodocker/engine/node.nim b/hive_integration/nodocker/engine/node.nim
index 2109ca05df..eb9013cc51 100644
--- a/hive_integration/nodocker/engine/node.nim
+++ b/hive_integration/nodocker/engine/node.nim
@@ -9,7 +9,7 @@
# according to those terms.
import
- ../../../nimbus/[
+ ../../../execution_chain/[
utils/utils,
common/common,
constants,
diff --git a/hive_integration/nodocker/engine/test_env.nim b/hive_integration/nodocker/engine/test_env.nim
index 87965f5318..3a7e6e63cc 100644
--- a/hive_integration/nodocker/engine/test_env.nim
+++ b/hive_integration/nodocker/engine/test_env.nim
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2023-2024 Status Research & Development GmbH
+# Copyright (c) 2023-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)
@@ -13,8 +13,8 @@ import
eth/common/keys,
results,
json_rpc/rpcclient,
- ../../../nimbus/config,
- ../../../nimbus/common,
+ ../../../execution_chain/config,
+ ../../../execution_chain/common,
./clmock,
./engine_client,
./client_pool,
diff --git a/hive_integration/nodocker/engine/tx_sender.nim b/hive_integration/nodocker/engine/tx_sender.nim
index 41128049fd..9b8d715fb5 100644
--- a/hive_integration/nodocker/engine/tx_sender.nim
+++ b/hive_integration/nodocker/engine/tx_sender.nim
@@ -16,9 +16,9 @@ import
chronicles,
./engine_client,
./cancun/blobs,
- ../../../nimbus/transaction,
- ../../../nimbus/common,
- ../../../nimbus/utils/utils
+ ../../../execution_chain/transaction,
+ ../../../execution_chain/common,
+ ../../../execution_chain/utils/utils
from std/sequtils import mapIt
diff --git a/hive_integration/nodocker/engine/types.nim b/hive_integration/nodocker/engine/types.nim
index 8e3403d949..ca3bc0bc8e 100644
--- a/hive_integration/nodocker/engine/types.nim
+++ b/hive_integration/nodocker/engine/types.nim
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2023-2024 Status Research & Development GmbH
+# Copyright (c) 2023-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)
@@ -17,10 +17,10 @@ import
web3/eth_api_types,
web3/engine_api_types,
web3/execution_types,
- ../../../nimbus/beacon/web3_eth_conv,
- ../../../nimbus/utils/utils
+ ../../../execution_chain/beacon/web3_eth_conv,
+ ../../../execution_chain/utils/utils
-from ../../../nimbus/common/chain_config import NetworkParams
+from ../../../execution_chain/common/chain_config import NetworkParams
export
execution_types,
diff --git a/hive_integration/nodocker/engine/withdrawals/wd_base_spec.nim b/hive_integration/nodocker/engine/withdrawals/wd_base_spec.nim
index f097006630..2c7d10e691 100644
--- a/hive_integration/nodocker/engine/withdrawals/wd_base_spec.nim
+++ b/hive_integration/nodocker/engine/withdrawals/wd_base_spec.nim
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2023-2024 Status Research & Development GmbH
+# Copyright (c) 2023-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)
@@ -19,11 +19,11 @@ import
../types,
../base_spec,
../cancun/customizer,
- ../../../../nimbus/common/common,
- ../../../../nimbus/utils/utils,
- ../../../../nimbus/common/chain_config,
+ ../../../../execution_chain/common/common,
+ ../../../../execution_chain/utils/utils,
+ ../../../../execution_chain/common/chain_config,
web3/execution_types,
- ../../../../nimbus/beacon/web3_eth_conv
+ ../../../../execution_chain/beacon/web3_eth_conv
type
WDBaseSpec* = ref object of BaseSpec
diff --git a/hive_integration/nodocker/engine/withdrawals/wd_block_value_spec.nim b/hive_integration/nodocker/engine/withdrawals/wd_block_value_spec.nim
index 333d41edbc..99328c6539 100644
--- a/hive_integration/nodocker/engine/withdrawals/wd_block_value_spec.nim
+++ b/hive_integration/nodocker/engine/withdrawals/wd_block_value_spec.nim
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2023-2024 Status Research & Development GmbH
+# Copyright (c) 2023-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)
@@ -16,7 +16,7 @@ import
../test_env,
../engine_client,
../types,
- ../../../../nimbus/transaction
+ ../../../../execution_chain/transaction
type
BlockValueSpec* = ref object of WDBaseSpec
diff --git a/hive_integration/nodocker/engine/withdrawals/wd_history.nim b/hive_integration/nodocker/engine/withdrawals/wd_history.nim
index d4140edcf6..3554870163 100644
--- a/hive_integration/nodocker/engine/withdrawals/wd_history.nim
+++ b/hive_integration/nodocker/engine/withdrawals/wd_history.nim
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2023-2024 Status Research & Development GmbH
+# Copyright (c) 2023-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)
@@ -14,8 +14,8 @@ import
json_rpc/[rpcclient],
results,
../engine_client,
- ../../../../nimbus/utils/utils,
- ../../../../nimbus/beacon/web3_eth_conv
+ ../../../../execution_chain/utils/utils,
+ ../../../../execution_chain/beacon/web3_eth_conv
type
Withdrawals* = ref object
diff --git a/hive_integration/nodocker/engine/withdrawals/wd_max_init_code_spec.nim b/hive_integration/nodocker/engine/withdrawals/wd_max_init_code_spec.nim
index e133c99b83..ccf4834888 100644
--- a/hive_integration/nodocker/engine/withdrawals/wd_max_init_code_spec.nim
+++ b/hive_integration/nodocker/engine/withdrawals/wd_max_init_code_spec.nim
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2023-2024 Status Research & Development GmbH
+# Copyright (c) 2023-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)
@@ -18,9 +18,9 @@ import
../engine_client,
../types,
../cancun/customizer,
- ../../../../nimbus/constants,
+ ../../../../execution_chain/constants,
web3/execution_types,
- ../../../../nimbus/beacon/web3_eth_conv
+ ../../../../execution_chain/beacon/web3_eth_conv
# EIP-3860 Shanghai Tests:
# Send transactions overflowing the MAX_INITCODE_SIZE
diff --git a/hive_integration/nodocker/engine/withdrawals/wd_reorg_spec.nim b/hive_integration/nodocker/engine/withdrawals/wd_reorg_spec.nim
index 1c719c7f48..726e19c9e8 100644
--- a/hive_integration/nodocker/engine/withdrawals/wd_reorg_spec.nim
+++ b/hive_integration/nodocker/engine/withdrawals/wd_reorg_spec.nim
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2023-2024 Status Research & Development GmbH
+# Copyright (c) 2023-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)
@@ -20,8 +20,8 @@ import
../engine_client,
../types,
../base_spec,
- ../../../../nimbus/beacon/web3_eth_conv,
- ../../../../nimbus/utils/utils
+ ../../../../execution_chain/beacon/web3_eth_conv,
+ ../../../../execution_chain/utils/utils
# Withdrawals re-org spec:
# Specifies a withdrawals test where the withdrawals re-org can happen
diff --git a/hive_integration/nodocker/graphql/graphql_sim.nim b/hive_integration/nodocker/graphql/graphql_sim.nim
index 93e17d3bbb..a29c4d8ffa 100644
--- a/hive_integration/nodocker/graphql/graphql_sim.nim
+++ b/hive_integration/nodocker/graphql/graphql_sim.nim
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2021-2024 Status Research & Development GmbH
+# Copyright (c) 2021-2025 Status Research & Development GmbH
# Licensed under either of
# * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
# * MIT license ([LICENSE-MIT](LICENSE-MIT))
@@ -10,12 +10,12 @@
import
std/[os, json, times],
eth/p2p,
- ../../../nimbus/sync/protocol,
- ../../../nimbus/config,
- ../../../nimbus/graphql/ethapi,
+ ../../../execution_chain/sync/protocol,
+ ../../../execution_chain/config,
+ ../../../execution_chain/graphql/ethapi,
../../../tests/test_helpers,
- ../../../nimbus/core/[tx_pool, block_import],
- ../../../nimbus/common,
+ ../../../execution_chain/core/[tx_pool, block_import],
+ ../../../execution_chain/common,
graphql, ../sim_utils
const
diff --git a/hive_integration/nodocker/pyspec/pyspec_sim.nim b/hive_integration/nodocker/pyspec/pyspec_sim.nim
index 06cb0742d1..90a287b94e 100644
--- a/hive_integration/nodocker/pyspec/pyspec_sim.nim
+++ b/hive_integration/nodocker/pyspec/pyspec_sim.nim
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2023-2024 Status Research & Development GmbH
+# Copyright (c) 2023-2025 Status Research & Development GmbH
# Licensed under either of
# * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
# * MIT license ([LICENSE-MIT](LICENSE-MIT))
@@ -17,9 +17,9 @@ import
../sim_utils,
../../../tools/common/helpers as chp,
../../../tools/evmstate/helpers as ehp,
- ../../../nimbus/beacon/web3_eth_conv,
- ../../../nimbus/beacon/payload_conv,
- ../../../nimbus/core/eip4844,
+ ../../../execution_chain/beacon/web3_eth_conv,
+ ../../../execution_chain/beacon/payload_conv,
+ ../../../execution_chain/core/eip4844,
../engine/engine_client,
../engine/types,
./test_env
diff --git a/hive_integration/nodocker/pyspec/test_env.nim b/hive_integration/nodocker/pyspec/test_env.nim
index fec93d5a62..bc46f3a4c0 100644
--- a/hive_integration/nodocker/pyspec/test_env.nim
+++ b/hive_integration/nodocker/pyspec/test_env.nim
@@ -12,7 +12,7 @@ import
std/[json],
stew/[byteutils],
json_rpc/[rpcserver, rpcclient],
- ../../../nimbus/[
+ ../../../execution_chain/[
constants,
transaction,
db/ledger,
diff --git a/hive_integration/nodocker/rpc/client.nim b/hive_integration/nodocker/rpc/client.nim
index c8bf600dd9..3cc2143744 100644
--- a/hive_integration/nodocker/rpc/client.nim
+++ b/hive_integration/nodocker/rpc/client.nim
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2021-2024 Status Research & Development GmbH
+# Copyright (c) 2021-2025 Status Research & Development GmbH
# Licensed under either of
# * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
# * MIT license ([LICENSE-MIT](LICENSE-MIT))
@@ -12,9 +12,9 @@ import
eth/rlp,
chronos, stint,
json_rpc/[rpcclient],
- ../../../nimbus/transaction,
- ../../../nimbus/utils/utils,
- ../../../nimbus/beacon/web3_eth_conv,
+ ../../../execution_chain/transaction,
+ ../../../execution_chain/utils/utils,
+ ../../../execution_chain/beacon/web3_eth_conv,
web3/eth_api
export eth_api
diff --git a/hive_integration/nodocker/rpc/test_env.nim b/hive_integration/nodocker/rpc/test_env.nim
index da6768aa00..b348d2b67b 100644
--- a/hive_integration/nodocker/rpc/test_env.nim
+++ b/hive_integration/nodocker/rpc/test_env.nim
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2021-2024 Status Research & Development GmbH
+# Copyright (c) 2021-2025 Status Research & Development GmbH
# Licensed under either of
# * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
# * MIT license ([LICENSE-MIT](LICENSE-MIT))
@@ -12,13 +12,13 @@ import
eth/p2p as ethp2p,
results,
chronos, json_rpc/[rpcserver, rpcclient],
- ../../../nimbus/sync/protocol,
- ../../../nimbus/common,
- ../../../nimbus/config,
- ../../../nimbus/rpc,
- ../../../nimbus/rpc/server_api,
- ../../../nimbus/utils/utils,
- ../../../nimbus/core/[chain, tx_pool],
+ ../../../execution_chain/sync/protocol,
+ ../../../execution_chain/common,
+ ../../../execution_chain/config,
+ ../../../execution_chain/rpc,
+ ../../../execution_chain/rpc/server_api,
+ ../../../execution_chain/utils/utils,
+ ../../../execution_chain/core/[chain, tx_pool],
../../../tests/test_helpers,
./vault
diff --git a/hive_integration/nodocker/rpc/vault.nim b/hive_integration/nodocker/rpc/vault.nim
index ba09da2a10..05b88d9a35 100644
--- a/hive_integration/nodocker/rpc/vault.nim
+++ b/hive_integration/nodocker/rpc/vault.nim
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2021-2024 Status Research & Development GmbH
+# Copyright (c) 2021-2025 Status Research & Development GmbH
# Licensed under either of
# * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
# * MIT license ([LICENSE-MIT](LICENSE-MIT))
@@ -13,8 +13,8 @@ import
stew/byteutils,
chronos, stint,
json_rpc/[rpcclient],
- ../../../nimbus/utils/utils,
- ../../../nimbus/transaction,
+ ../../../execution_chain/utils/utils,
+ ../../../execution_chain/transaction,
./client
when false:
diff --git a/hive_integration/nodocker/sim_utils.nim b/hive_integration/nodocker/sim_utils.nim
index 7d77f8cc21..58c3a85233 100644
--- a/hive_integration/nodocker/sim_utils.nim
+++ b/hive_integration/nodocker/sim_utils.nim
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2021 Status Research & Development GmbH
+# Copyright (c) 2021-2025 Status Research & Development GmbH
# Licensed under either of
# * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
# * MIT license ([LICENSE-MIT](LICENSE-MIT))
@@ -9,7 +9,7 @@
import
std/[tables, strutils, times],
- ../../nimbus/utils/utils,
+ ../../execution_chain/utils/utils,
unittest2
export
diff --git a/nimbus.nimble b/nimbus.nimble
index 47408a3bc3..a0eba233c0 100644
--- a/nimbus.nimble
+++ b/nimbus.nimble
@@ -1,5 +1,5 @@
# nimbus
-# Copyright (c) 2018-2024 Status Research & Development GmbH
+# Copyright (c) 2018-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).
@@ -37,7 +37,7 @@ binDir = "build"
when declared(namedBin):
namedBin = {
- "nimbus/nimbus_execution_client": "nimbus_execution_client",
+ "execution_chain/nimbus_execution_client": "nimbus_execution_client",
"fluffy/fluffy": "fluffy",
"nimbus_verified_proxy/nimbus_verified_proxy": "nimbus_verified_proxy",
}.toTable()
diff --git a/nimbus_verified_proxy/nimbus_verified_proxy.nim b/nimbus_verified_proxy/nimbus_verified_proxy.nim
index b4374e0822..203658ff71 100644
--- a/nimbus_verified_proxy/nimbus_verified_proxy.nim
+++ b/nimbus_verified_proxy/nimbus_verified_proxy.nim
@@ -1,5 +1,5 @@
# nimbus_verified_proxy
-# 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).
@@ -21,8 +21,8 @@ import
beacon_chain/spec/beaconstate,
beacon_chain/spec/datatypes/[phase0, altair, bellatrix],
beacon_chain/[light_client, nimbus_binary_common, version],
- ../nimbus/rpc/[cors, rpc_utils],
- ../nimbus/beacon/payload_conv,
+ ../execution_chain/rpc/[cors, rpc_utils],
+ ../execution_chain/beacon/payload_conv,
./rpc/rpc_eth_api,
./nimbus_verified_proxy_conf,
./block_cache
diff --git a/nrpc/config.nim b/nrpc/config.nim
index 18e457f62d..1d9fe3af63 100644
--- a/nrpc/config.nim
+++ b/nrpc/config.nim
@@ -1,4 +1,4 @@
-# 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))
# * MIT license ([LICENSE-MIT](LICENSE-MIT))
@@ -22,9 +22,9 @@ import
confutils/std/net
],
eth/[common, net/nat, p2p/enode, p2p/discoveryv5/enr],
- "../nimbus"/[constants, compile_info],
- ../nimbus/common/chain_config,
- ../nimbus/db/opts
+ ../execution_chain/[constants, compile_info],
+ ../execution_chain/common/chain_config,
+ ../execution_chain/db/opts
export net, defs
@@ -53,7 +53,7 @@ type
NRpcConf* = object of RootObj
## Main NRpc configuration object
-
+
beaconApi* {.
desc: "Beacon API url"
defaultValue: ""
diff --git a/nrpc/nrpc.nim b/nrpc/nrpc.nim
index 82264c44b3..db8a76f795 100644
--- a/nrpc/nrpc.nim
+++ b/nrpc/nrpc.nim
@@ -10,10 +10,10 @@
import
std/sequtils,
chronicles,
- ../nimbus/constants,
- ../nimbus/core/chain,
+ ../execution_chain/constants,
+ ../execution_chain/core/chain,
./config,
- ../nimbus/utils/era_helpers,
+ ../execution_chain/utils/era_helpers,
kzg4844/kzg,
web3,
web3/[engine_api, primitives, conversions],
diff --git a/scripts/print_version.nims b/scripts/print_version.nims
index d9e2dfbd22..25dc96401f 100644
--- a/scripts/print_version.nims
+++ b/scripts/print_version.nims
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2018-2023 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/version
+import ../execution_chain/version
echo NimbusVersion
diff --git a/tests/all_tests_macro.nim b/tests/all_tests_macro.nim
index e22fabded1..9d24da498f 100644
--- a/tests/all_tests_macro.nim
+++ b/tests/all_tests_macro.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)
@@ -8,8 +8,8 @@
import
std/[times, macros, strutils, os, osproc],
unittest2,
- ../nimbus/compile_info,
- ../nimbus/utils/utils
+ ../execution_chain/compile_info,
+ ../execution_chain/utils/utils
export strutils, os, unittest2, osproc
diff --git a/tests/db/test_kvstore_rocksdb.nim b/tests/db/test_kvstore_rocksdb.nim
index 1d4170e32d..0b61ccae0e 100644
--- a/tests/db/test_kvstore_rocksdb.nim
+++ b/tests/db/test_kvstore_rocksdb.nim
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2023-2024 Status Research & Development GmbH
+# Copyright (c) 2023-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)
@@ -15,7 +15,7 @@ import
std/os,
unittest2,
eth/db/kvstore,
- ../../nimbus/db/kvstore_rocksdb,
+ ../../execution_chain/db/kvstore_rocksdb,
eth/../tests/db/test_kvstore
suite "KvStore RocksDb Tests":
diff --git a/tests/macro_assembler.nim b/tests/macro_assembler.nim
index 390f6608dd..477fbef883 100644
--- a/tests/macro_assembler.nim
+++ b/tests/macro_assembler.nim
@@ -17,19 +17,19 @@ import
stew/shims/macros
import
- ../nimbus/db/ledger,
- ../nimbus/evm/types,
- ../nimbus/evm/interpreter/op_codes,
- ../nimbus/evm/internals,
- ../nimbus/transaction/[call_common, call_evm],
- ../nimbus/evm/state,
- ../nimbus/core/pow/difficulty
-
-from ../nimbus/db/aristo
+ ../execution_chain/db/ledger,
+ ../execution_chain/evm/types,
+ ../execution_chain/evm/interpreter/op_codes,
+ ../execution_chain/evm/internals,
+ ../execution_chain/transaction/[call_common, call_evm],
+ ../execution_chain/evm/state,
+ ../execution_chain/core/pow/difficulty
+
+from ../execution_chain/db/aristo
import EmptyBlob
# Ditto, for GasPrice.
-import ../nimbus/transaction except GasPrice
+import ../execution_chain/transaction except GasPrice
import ../tools/common/helpers except LogLevel
export byteutils
diff --git a/tests/replay/pp.nim b/tests/replay/pp.nim
index d498b12d99..72cb406120 100644
--- a/tests/replay/pp.nim
+++ b/tests/replay/pp.nim
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2022-2024 Status Research & Development GmbH
+# Copyright (c) 2022-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)
@@ -15,7 +15,7 @@ import
std/[tables, typetraits],
eth/common,
stew/byteutils,
- ../../nimbus/common/chain_config,
+ ../../execution_chain/common/chain_config,
./pp_light
export
diff --git a/tests/replay/pp_light.nim b/tests/replay/pp_light.nim
index 8c85ac03b5..75491372a8 100644
--- a/tests/replay/pp_light.nim
+++ b/tests/replay/pp_light.nim
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2022-2024 Status Research & Development GmbH
+# Copyright (c) 2022-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)
@@ -17,7 +17,7 @@ import
std/[sequtils, strformat, strutils, tables, times],
eth/common,
stew/byteutils,
- ../../nimbus/constants
+ ../../execution_chain/constants
export
sequtils, strformat, strutils
diff --git a/tests/replay/undump_blocks_era1.nim b/tests/replay/undump_blocks_era1.nim
index c4f36c4029..f205f7f102 100644
--- a/tests/replay/undump_blocks_era1.nim
+++ b/tests/replay/undump_blocks_era1.nim
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2021-2024 Status Research & Development GmbH
+# Copyright (c) 2021-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 results, eth/common, ../../nimbus/db/era1_db
+import results, eth/common, ../../execution_chain/db/era1_db
var noisy* = false
diff --git a/tests/replay/undump_blocks_gz.nim b/tests/replay/undump_blocks_gz.nim
index 495caf901a..4219ce3b06 100644
--- a/tests/replay/undump_blocks_gz.nim
+++ b/tests/replay/undump_blocks_gz.nim
@@ -12,7 +12,7 @@ import
std/[os, sequtils, strformat, strutils],
eth/[common, rlp],
nimcrypto/utils,
- ../../nimbus/db/core_db,
+ ../../execution_chain/db/core_db,
"."/[gunzip, undump_helpers]
# ------------------------------------------------------------------------------
diff --git a/tests/test_aristo.nim b/tests/test_aristo.nim
index 115745fcad..859c623c07 100644
--- a/tests/test_aristo.nim
+++ b/tests/test_aristo.nim
@@ -16,7 +16,7 @@ import
eth/common,
results,
unittest2,
- ../nimbus/db/aristo/aristo_desc,
+ ../execution_chain/db/aristo/aristo_desc,
./replay/pp,
./test_aristo/test_blobify,
./test_aristo/test_merge_proof,
diff --git a/tests/test_aristo/test_blobify.nim b/tests/test_aristo/test_blobify.nim
index d70761443d..014b0f8cd6 100644
--- a/tests/test_aristo/test_blobify.nim
+++ b/tests/test_aristo/test_blobify.nim
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2024 Status Research & Development GmbH
+# Copyright (c) 2024-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)
@@ -10,7 +10,7 @@
{.used.}
-import unittest2, std/sequtils, ../../nimbus/db/aristo/aristo_blobify
+import unittest2, std/sequtils, ../../execution_chain/db/aristo/aristo_blobify
suite "Aristo blobify":
test "VertexRef roundtrip":
diff --git a/tests/test_aristo/test_compute.nim b/tests/test_aristo/test_compute.nim
index c91db8d0d0..98ca95fdfc 100644
--- a/tests/test_aristo/test_compute.nim
+++ b/tests/test_aristo/test_compute.nim
@@ -14,7 +14,7 @@ import
std/[algorithm, sets],
stew/byteutils,
unittest2,
- ../../nimbus/db/aristo/[
+ ../../execution_chain/db/aristo/[
aristo_check,
aristo_compute,
aristo_delete,
diff --git a/tests/test_aristo/test_helpers.nim b/tests/test_aristo/test_helpers.nim
index 603939cb3f..fee668abd4 100644
--- a/tests/test_aristo/test_helpers.nim
+++ b/tests/test_aristo/test_helpers.nim
@@ -12,7 +12,7 @@ import
std/[os, sequtils],
eth/common,
stew/endians2,
- ../../nimbus/db/aristo/[
+ ../../execution_chain/db/aristo/[
aristo_debug, aristo_desc, aristo_hike, aristo_layers,
aristo_tx],
../replay/pp,
diff --git a/tests/test_aristo/test_merge_proof.nim b/tests/test_aristo/test_merge_proof.nim
index 163b5e558a..94948b24a8 100644
--- a/tests/test_aristo/test_merge_proof.nim
+++ b/tests/test_aristo/test_merge_proof.nim
@@ -12,8 +12,8 @@ import
eth/common,
results,
unittest2,
- ../../nimbus/db/opts,
- ../../nimbus/db/aristo/[
+ ../../execution_chain/db/opts,
+ ../../execution_chain/db/aristo/[
aristo_check,
aristo_desc,
aristo_init/persistent,
diff --git a/tests/test_aristo/test_nibbles.nim b/tests/test_aristo/test_nibbles.nim
index f91ed2e163..8017654eb5 100644
--- a/tests/test_aristo/test_nibbles.nim
+++ b/tests/test_aristo/test_nibbles.nim
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2024 Status Research & Development GmbH
+# Copyright (c) 2024-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)
@@ -14,7 +14,7 @@ import
std/[sequtils, strutils],
stew/byteutils,
unittest2,
- ../../nimbus/db/aristo/aristo_desc/desc_nibbles
+ ../../execution_chain/db/aristo/aristo_desc/desc_nibbles
suite "Nibbles":
test "trivial cases":
diff --git a/tests/test_aristo/test_portal_proof.nim b/tests/test_aristo/test_portal_proof.nim
index e184926706..d9f1aaf264 100644
--- a/tests/test_aristo/test_portal_proof.nim
+++ b/tests/test_aristo/test_portal_proof.nim
@@ -17,9 +17,9 @@ import
results,
unittest2,
../test_helpers,
- ../../nimbus/db/aristo,
- ../../nimbus/db/aristo/[aristo_desc, aristo_get, aristo_hike, aristo_part],
- ../../nimbus/db/aristo/aristo_part/part_debug
+ ../../execution_chain/db/aristo,
+ ../../execution_chain/db/aristo/[aristo_desc, aristo_get, aristo_hike, aristo_part],
+ ../../execution_chain/db/aristo/aristo_part/part_debug
type
ProofData = ref object
diff --git a/tests/test_aristo/test_tx.nim b/tests/test_aristo/test_tx.nim
index 25ea6646f0..8086fd45ab 100644
--- a/tests/test_aristo/test_tx.nim
+++ b/tests/test_aristo/test_tx.nim
@@ -16,8 +16,8 @@ import
results,
unittest2,
stew/endians2,
- ../../nimbus/db/opts,
- ../../nimbus/db/aristo/[
+ ../../execution_chain/db/opts,
+ ../../execution_chain/db/aristo/[
aristo_check,
aristo_desc,
aristo_hike,
diff --git a/tests/test_aristo/undump_accounts.nim b/tests/test_aristo/undump_accounts.nim
index 44eda7e7e5..6f28e920b0 100644
--- a/tests/test_aristo/undump_accounts.nim
+++ b/tests/test_aristo/undump_accounts.nim
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2021-2024 Status Research & Development GmbH
+# Copyright (c) 2021-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)
@@ -12,7 +12,7 @@ import
std/[os, strformat, strutils],
eth/common,
stew/byteutils,
- ../../nimbus/sync/protocol,
+ ../../execution_chain/sync/protocol,
../replay/gunzip,
./undump_desc
diff --git a/tests/test_aristo/undump_desc.nim b/tests/test_aristo/undump_desc.nim
index 1f049d504c..70792bf435 100644
--- a/tests/test_aristo/undump_desc.nim
+++ b/tests/test_aristo/undump_desc.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)
@@ -13,7 +13,7 @@
import
eth/common,
stint,
- ../../nimbus/sync/protocol
+ ../../execution_chain/sync/protocol
## Stripped down version of `sync/snap/range_desc` in order to decode the
## snap sync dump samples.
diff --git a/tests/test_aristo/undump_storages.nim b/tests/test_aristo/undump_storages.nim
index 7221653567..7576007d36 100644
--- a/tests/test_aristo/undump_storages.nim
+++ b/tests/test_aristo/undump_storages.nim
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2022-2024 Status Research & Development GmbH
+# Copyright (c) 2022-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)
@@ -12,7 +12,7 @@ import
std/[os, strformat, strutils],
eth/common,
stew/byteutils,
- ../../nimbus/sync/protocol,
+ ../../execution_chain/sync/protocol,
../replay/gunzip,
./undump_desc
diff --git a/tests/test_blockchain_json.nim b/tests/test_blockchain_json.nim
index 59230ca124..36ea0aeaa8 100644
--- a/tests/test_blockchain_json.nim
+++ b/tests/test_blockchain_json.nim
@@ -14,12 +14,12 @@ import
stew/byteutils,
./test_helpers,
./test_allowed_to_fail,
- ../nimbus/db/ledger,
- ../nimbus/core/chain/forked_chain,
+ ../execution_chain/db/ledger,
+ ../execution_chain/core/chain/forked_chain,
../tools/common/helpers as chp,
../tools/evmstate/helpers,
- ../nimbus/common/common,
- ../nimbus/core/eip4844
+ ../execution_chain/common/common,
+ ../execution_chain/core/eip4844
const
debugMode = false
diff --git a/tests/test_configuration.nim b/tests/test_configuration.nim
index d558955c06..21c671ab90 100644
--- a/tests/test_configuration.nim
+++ b/tests/test_configuration.nim
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2019-2024 Status Research & Development GmbH
+# Copyright (c) 2019-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)
@@ -13,8 +13,8 @@ import
pkg/[unittest2],
eth/common/[base, keys],
stew/byteutils,
- ../nimbus/config,
- ../nimbus/common/[chain_config, context, manager],
+ ../execution_chain/config,
+ ../execution_chain/common/[chain_config, context, manager],
./test_helpers
proc configurationMain*() =
diff --git a/tests/test_coredb.nim b/tests/test_coredb.nim
index 57c4b8ec80..439a339dd7 100644
--- a/tests/test_coredb.nim
+++ b/tests/test_coredb.nim
@@ -16,9 +16,9 @@ import
eth/common,
results,
unittest2,
- ../nimbus/db/opts,
- ../nimbus/db/core_db/persistent,
- ../nimbus/core/chain,
+ ../execution_chain/db/opts,
+ ../execution_chain/db/core_db/persistent,
+ ../execution_chain/core/chain,
./replay/pp,
./test_coredb/[
coredb_test_xx, test_chainsync, test_coredb_helpers, test_helpers]
diff --git a/tests/test_coredb/coredb_test_xx.nim b/tests/test_coredb/coredb_test_xx.nim
index c940f9dcdf..1b4f86659f 100644
--- a/tests/test_coredb/coredb_test_xx.nim
+++ b/tests/test_coredb/coredb_test_xx.nim
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2023-2024 Status Research & Development GmbH
+# Copyright (c) 2023-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)
@@ -10,8 +10,8 @@
import
eth/common,
- ../../nimbus/db/core_db,
- ../../nimbus/common/chain_config
+ ../../execution_chain/db/core_db,
+ ../../execution_chain/common/chain_config
type
CaptureSpecs* = object
diff --git a/tests/test_coredb/test_chainsync.nim b/tests/test_coredb/test_chainsync.nim
index 511714c456..0d2abf46d4 100644
--- a/tests/test_coredb/test_chainsync.nim
+++ b/tests/test_coredb/test_chainsync.nim
@@ -14,8 +14,8 @@ import
eth/common,
results,
unittest2,
- ../../nimbus/core/chain,
- ../../nimbus/db/ledger,
+ ../../execution_chain/core/chain,
+ ../../execution_chain/db/ledger,
../replay/[pp, undump_blocks, undump_blocks_era1, xcheck],
./test_helpers
@@ -25,8 +25,8 @@ when CoreDbEnableProfiling:
when CoreDbEnableProfiling:
import
- ../../nimbus/db/aristo/[aristo_api, aristo_profile],
- ../../nimbus/db/kvt/kvt_api
+ ../../execution_chain/db/aristo/[aristo_api, aristo_profile],
+ ../../execution_chain/db/kvt/kvt_api
var
aristoProfData: AristoDbProfListRef
kvtProfData: KvtDbProfListRef
diff --git a/tests/test_coredb/test_coredb_helpers.nim b/tests/test_coredb/test_coredb_helpers.nim
index e26e1f5d3d..f6f473387f 100644
--- a/tests/test_coredb/test_coredb_helpers.nim
+++ b/tests/test_coredb/test_coredb_helpers.nim
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2023-2024 Status Research & Development GmbH
+# Copyright (c) 2023-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)
@@ -12,8 +12,8 @@
import
std/sequtils,
- ../../nimbus/db/core_db/backend/aristo_rocksdb,
- ../../nimbus/db/[core_db, opts]
+ ../../execution_chain/db/core_db/backend/aristo_rocksdb,
+ ../../execution_chain/db/[core_db, opts]
type
CdbTypeEx* = enum
diff --git a/tests/test_coredb/test_helpers.nim b/tests/test_coredb/test_helpers.nim
index 7c66e31b27..b2af08618d 100644
--- a/tests/test_coredb/test_helpers.nim
+++ b/tests/test_coredb/test_helpers.nim
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2023-2024 Status Research & Development GmbH
+# Copyright (c) 2023-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)
@@ -12,8 +12,8 @@ import
std/[algorithm, os, sequtils],
eth/common,
results,
- ../../nimbus/utils/prettify,
- ../../nimbus/db/aristo/aristo_profile,
+ ../../execution_chain/utils/prettify,
+ ../../execution_chain/db/aristo/aristo_profile,
../replay/pp
# ------------------------------------------------------------------------------
diff --git a/tests/test_difficulty.nim b/tests/test_difficulty.nim
index 9ea54667cf..fde2f05fbb 100644
--- a/tests/test_difficulty.nim
+++ b/tests/test_difficulty.nim
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2019-2024 Status Research & Development GmbH
+# Copyright (c) 2019-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)
@@ -12,9 +12,9 @@ import
std/[strutils, tables, os, json],
unittest2,
stew/byteutils,
- ../nimbus/core/pow/difficulty,
- ../nimbus/constants,
- ../nimbus/common/common,
+ ../execution_chain/core/pow/difficulty,
+ ../execution_chain/constants,
+ ../execution_chain/common/common,
./test_helpers
type
diff --git a/tests/test_engine_api.nim b/tests/test_engine_api.nim
index 387f20ebb2..8ed60b9c7b 100644
--- a/tests/test_engine_api.nim
+++ b/tests/test_engine_api.nim
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2024 Status Research & Development GmbH
+# Copyright (c) 2024-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)
@@ -19,12 +19,12 @@ import
unittest2
import
- ../nimbus/rpc,
- ../nimbus/config,
- ../nimbus/core/chain,
- ../nimbus/core/tx_pool,
- ../nimbus/beacon/beacon_engine,
- ../nimbus/beacon/web3_eth_conv,
+ ../execution_chain/rpc,
+ ../execution_chain/config,
+ ../execution_chain/core/chain,
+ ../execution_chain/core/tx_pool,
+ ../execution_chain/beacon/beacon_engine,
+ ../execution_chain/beacon/web3_eth_conv,
../hive_integration/nodocker/engine/engine_client
type
diff --git a/tests/test_evm_support.nim b/tests/test_evm_support.nim
index c36f63aa94..cc4cb54e9d 100644
--- a/tests/test_evm_support.nim
+++ b/tests/test_evm_support.nim
@@ -9,19 +9,19 @@ import
std/[importutils, sequtils],
unittest2,
eth/common/[keys, transaction_utils],
- ../nimbus/common,
- ../nimbus/transaction,
- ../nimbus/evm/types,
- ../nimbus/evm/state,
- ../nimbus/evm/evm_errors,
- ../nimbus/evm/stack,
- ../nimbus/evm/memory,
- ../nimbus/evm/code_stream,
- ../nimbus/evm/internals,
- ../nimbus/constants,
- ../nimbus/core/pow/header,
- ../nimbus/db/ledger,
- ../nimbus/transaction/call_evm
+ ../execution_chain/common,
+ ../execution_chain/transaction,
+ ../execution_chain/evm/types,
+ ../execution_chain/evm/state,
+ ../execution_chain/evm/evm_errors,
+ ../execution_chain/evm/stack,
+ ../execution_chain/evm/memory,
+ ../execution_chain/evm/code_stream,
+ ../execution_chain/evm/internals,
+ ../execution_chain/constants,
+ ../execution_chain/core/pow/header,
+ ../execution_chain/db/ledger,
+ ../execution_chain/transaction/call_evm
template testPush(value: untyped, expected: untyped): untyped =
privateAccess(EvmStack)
diff --git a/tests/test_filters.nim b/tests/test_filters.nim
index a77c1b456f..2e67ea74c0 100644
--- a/tests/test_filters.nim
+++ b/tests/test_filters.nim
@@ -11,8 +11,8 @@ import
std/[options, typetraits],
unittest2,
eth/[common/eth_types],
- ../nimbus/rpc/filters,
- ../nimbus/beacon/web3_eth_conv,
+ ../execution_chain/rpc/filters,
+ ../execution_chain/beacon/web3_eth_conv,
./test_block_fixture
type Address = primitives.Address
diff --git a/tests/test_forked_chain.nim b/tests/test_forked_chain.nim
index 68e3c61364..aba9888401 100644
--- a/tests/test_forked_chain.nim
+++ b/tests/test_forked_chain.nim
@@ -11,11 +11,11 @@
import
pkg/chronicles,
pkg/unittest2,
- ../nimbus/common,
- ../nimbus/config,
- ../nimbus/utils/utils,
- ../nimbus/core/chain/forked_chain,
- ../nimbus/db/ledger,
+ ../execution_chain/common,
+ ../execution_chain/config,
+ ../execution_chain/utils/utils,
+ ../execution_chain/core/chain/forked_chain,
+ ../execution_chain/db/ledger,
./test_forked_chain/chain_debug
const
diff --git a/tests/test_forked_chain/chain_debug.nim b/tests/test_forked_chain/chain_debug.nim
index 6ef5790e8f..29a83f1c54 100644
--- a/tests/test_forked_chain/chain_debug.nim
+++ b/tests/test_forked_chain/chain_debug.nim
@@ -16,10 +16,10 @@ import
std/[sequtils, tables],
pkg/chronicles,
pkg/stew/interval_set,
- ../../nimbus/common,
- ../../nimbus/sync/beacon/worker/helpers,
- ../../nimbus/core/chain/forked_chain/chain_desc,
- ../../nimbus/core/chain/forked_chain/chain_branch
+ ../../execution_chain/common,
+ ../../execution_chain/sync/beacon/worker/helpers,
+ ../../execution_chain/core/chain/forked_chain/chain_desc,
+ ../../execution_chain/core/chain/forked_chain/chain_branch
logScope: topics = "forked-chain"
diff --git a/tests/test_forkid.nim b/tests/test_forkid.nim
index b62f0c4698..d1694b2b45 100644
--- a/tests/test_forkid.nim
+++ b/tests/test_forkid.nim
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2019-2024 Status Research & Development GmbH
+# Copyright (c) 2019-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)
@@ -10,8 +10,8 @@
import
unittest2,
- ../nimbus/common/common,
- ../nimbus/utils/utils
+ ../execution_chain/common/common,
+ ../execution_chain/utils/utils
const
MainNetIDs = [
diff --git a/tests/test_generalstate_json.nim b/tests/test_generalstate_json.nim
index dcd6c34dd5..3492bbb457 100644
--- a/tests/test_generalstate_json.nim
+++ b/tests/test_generalstate_json.nim
@@ -8,14 +8,14 @@
import
std/[strutils, tables, json, os, sets],
./test_helpers, ./test_allowed_to_fail,
- ../nimbus/core/executor, test_config,
- ../nimbus/transaction,
- ../nimbus/[evm/state, evm/types],
- ../nimbus/db/ledger,
- ../nimbus/common/common,
- ../nimbus/utils/[utils, debug],
- ../nimbus/evm/tracer/legacy_tracer,
- ../nimbus/core/eip4844,
+ ../execution_chain/core/executor, test_config,
+ ../execution_chain/transaction,
+ ../execution_chain/[evm/state, evm/types],
+ ../execution_chain/db/ledger,
+ ../execution_chain/common/common,
+ ../execution_chain/utils/[utils, debug],
+ ../execution_chain/evm/tracer/legacy_tracer,
+ ../execution_chain/core/eip4844,
../tools/common/helpers as chp,
../tools/evmstate/helpers,
../tools/common/state_clearing,
@@ -210,7 +210,7 @@ proc generalStateJsonMain*(debugMode = false) =
const
legacyFolder = "eth_tests/LegacyTests/Constantinople/GeneralStateTests"
newFolder = "eth_tests/GeneralStateTests"
-
+
let config = getConfiguration()
if config.testSubject == "" or not debugMode:
# run all test fixtures
diff --git a/tests/test_genesis.nim b/tests/test_genesis.nim
index a57409ec31..1fd8910425 100644
--- a/tests/test_genesis.nim
+++ b/tests/test_genesis.nim
@@ -11,9 +11,9 @@
import
std/[os],
unittest2,
- ../nimbus/config,
- ../nimbus/utils/utils,
- ../nimbus/common/common
+ ../execution_chain/config,
+ ../execution_chain/utils/utils,
+ ../execution_chain/common/common
const
baseDir = [".", "tests", ".."/"tests", $DirSep] # path containg repo
diff --git a/tests/test_getproof_json.nim b/tests/test_getproof_json.nim
index 0c4ebb2c11..dd2757eaa5 100644
--- a/tests/test_getproof_json.nim
+++ b/tests/test_getproof_json.nim
@@ -13,9 +13,9 @@ import
nimcrypto/[keccak, hash],
eth/common/[keys, eth_types_rlp],
eth/[rlp, trie/hexary_proof_verification],
- ../nimbus/db/[ledger, core_db],
- ../nimbus/common/chain_config,
- ../nimbus/rpc/server_api
+ ../execution_chain/db/[ledger, core_db],
+ ../execution_chain/common/chain_config,
+ ../execution_chain/rpc/server_api
type
Hash32 = eth_types.Hash32
diff --git a/tests/test_graphql.nim b/tests/test_graphql.nim
index 7f667ef11d..23b9b94796 100644
--- a/tests/test_graphql.nim
+++ b/tests/test_graphql.nim
@@ -1,5 +1,5 @@
# nim-graphql
-# Copyright (c) 2021-2024 Status Research & Development GmbH
+# Copyright (c) 2021-2025 Status Research & Development GmbH
# Licensed under either of
# * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
# * MIT license ([LICENSE-MIT](LICENSE-MIT))
@@ -11,11 +11,11 @@ import
std/[json],
stew/byteutils,
eth/[p2p, rlp],
- graphql, ../nimbus/graphql/ethapi, graphql/test_common,
- ../nimbus/sync/protocol,
- ../nimbus/config,
- ../nimbus/core/[chain, tx_pool],
- ../nimbus/common/[common, context],
+ graphql, ../execution_chain/graphql/ethapi, graphql/test_common,
+ ../execution_chain/sync/protocol,
+ ../execution_chain/config,
+ ../execution_chain/core/[chain, tx_pool],
+ ../execution_chain/common/[common, context],
./test_helpers
const
diff --git a/tests/test_helpers.nim b/tests/test_helpers.nim
index b77d4eba59..7c184c71d1 100644
--- a/tests/test_helpers.nim
+++ b/tests/test_helpers.nim
@@ -9,9 +9,9 @@ import
std/[os, macros, json, strformat, strutils, tables],
stew/byteutils, net, eth/[common/keys, p2p], unittest2,
testutils/markdown_reports,
- ../nimbus/[constants, config, transaction, errors],
- ../nimbus/db/ledger,
- ../nimbus/common/[context, common]
+ ../execution_chain/[constants, config, transaction, errors],
+ ../execution_chain/db/ledger,
+ ../execution_chain/common/[context, common]
func revTable(list: array[EVMFork, string]): Table[string, EVMFork] =
for k, v in list:
diff --git a/tests/test_jwt_auth.nim b/tests/test_jwt_auth.nim
index cd0b153eff..80d4bab376 100644
--- a/tests/test_jwt_auth.nim
+++ b/tests/test_jwt_auth.nim
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2022-2024 Status Research & Development GmbH
+# Copyright (c) 2022-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)
@@ -13,14 +13,14 @@
import
std/[base64, json, options, os, strutils, times],
- ../nimbus/config,
- ../nimbus/rpc/jwt_auth,
- ../nimbus/rpc {.all.},
+ ../execution_chain/config,
+ ../execution_chain/rpc/jwt_auth,
+ ../execution_chain/rpc {.all.},
./replay/pp,
chronicles,
chronos/apps/http/httpclient as chronoshttpclient,
chronos/apps/http/httptable,
- eth/common/keys,
+ eth/common/keys,
eth/p2p,
nimcrypto/[hmac, sha2, utils],
results,
diff --git a/tests/test_ledger.nim b/tests/test_ledger.nim
index fc8d77a149..7ac83f49c3 100644
--- a/tests/test_ledger.nim
+++ b/tests/test_ledger.nim
@@ -13,14 +13,14 @@ import
eth/common/[keys, transaction_utils],
stew/byteutils,
stew/endians2,
- ../nimbus/config,
- ../nimbus/db/storage_types,
- ../nimbus/common/common,
- ../nimbus/core/chain,
- ../nimbus/core/tx_pool,
- ../nimbus/transaction,
- ../nimbus/constants,
- ../nimbus/db/ledger {.all.}, # import all private symbols
+ ../execution_chain/config,
+ ../execution_chain/db/storage_types,
+ ../execution_chain/common/common,
+ ../execution_chain/core/chain,
+ ../execution_chain/core/tx_pool,
+ ../execution_chain/transaction,
+ ../execution_chain/constants,
+ ../execution_chain/db/ledger {.all.}, # import all private symbols
unittest2
import results
diff --git a/tests/test_multi_keys.nim b/tests/test_multi_keys.nim
index 432fe2e855..dfe6a66fee 100644
--- a/tests/test_multi_keys.nim
+++ b/tests/test_multi_keys.nim
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2020-2024 Status Research & Development GmbH
+# Copyright (c) 2020-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)
@@ -11,7 +11,7 @@
import
random, unittest2, stew/byteutils,
eth/trie/nibbles,
- ../nimbus/stateless/multi_keys
+ ../execution_chain/stateless/multi_keys
proc initMultiKeys(keys: openArray[string], storageMode: bool = false): MultiKeysRef =
result.new
diff --git a/tests/test_op_env.nim b/tests/test_op_env.nim
index 3718144439..66023250be 100644
--- a/tests/test_op_env.nim
+++ b/tests/test_op_env.nim
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2019-2024 Status Research & Development GmbH
+# Copyright (c) 2019-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)
@@ -10,9 +10,9 @@
import
macro_assembler, unittest2,
- stew/byteutils, ../nimbus/common/common,
- ../nimbus/[evm/state, constants],
- ../nimbus/db/ledger
+ stew/byteutils, ../execution_chain/common/common,
+ ../execution_chain/[evm/state, constants],
+ ../execution_chain/db/ledger
proc opEnvMain*() =
suite "Environmental Information Opcodes":
diff --git a/tests/test_precompiles.nim b/tests/test_precompiles.nim
index d0bc10d750..9a9ffb61cb 100644
--- a/tests/test_precompiles.nim
+++ b/tests/test_precompiles.nim
@@ -10,9 +10,9 @@ import
unittest2, stew/byteutils,
eth/[trie],
eth/common/[keys, transaction_utils],
- ../nimbus/common/common,
+ ../execution_chain/common/common,
../tools/common/helpers as chp,
- ../nimbus/[evm/computation,
+ ../execution_chain/[evm/computation,
evm/state,
evm/types,
constants,
diff --git a/tests/test_rpc.nim b/tests/test_rpc.nim
index e64786bb6a..6a2f4d7ab3 100644
--- a/tests/test_rpc.nim
+++ b/tests/test_rpc.nim
@@ -15,14 +15,14 @@ import
eth/[p2p, rlp, trie/hexary_proof_verification],
eth/common/[transaction_utils, addresses],
../hive_integration/nodocker/engine/engine_client,
- ../nimbus/[constants, transaction, config, version],
- ../nimbus/db/[ledger, storage_types],
- ../nimbus/sync/protocol,
- ../nimbus/core/[tx_pool, chain, pow/difficulty],
- ../nimbus/utils/utils,
- ../nimbus/[common, rpc],
- ../nimbus/rpc/rpc_types,
- ../nimbus/beacon/web3_eth_conv,
+ ../execution_chain/[constants, transaction, config, version],
+ ../execution_chain/db/[ledger, storage_types],
+ ../execution_chain/sync/protocol,
+ ../execution_chain/core/[tx_pool, chain, pow/difficulty],
+ ../execution_chain/utils/utils,
+ ../execution_chain/[common, rpc],
+ ../execution_chain/rpc/rpc_types,
+ ../execution_chain/beacon/web3_eth_conv,
./test_helpers,
./macro_assembler,
./test_block_fixture
diff --git a/tests/test_tracer_json.nim b/tests/test_tracer_json.nim
index f061b87b70..2cbb93073a 100644
--- a/tests/test_tracer_json.nim
+++ b/tests/test_tracer_json.nim
@@ -15,12 +15,12 @@ import
unittest2,
results,
./test_helpers,
- ../nimbus/db/aristo,
- ../nimbus/db/aristo/[aristo_desc, aristo_part],
- ../nimbus/db/aristo/aristo_part/part_debug,
- ../nimbus/db/kvt/kvt_utils,
- ../nimbus/[tracer, evm/types],
- ../nimbus/common/common
+ ../execution_chain/db/aristo,
+ ../execution_chain/db/aristo/[aristo_desc, aristo_part],
+ ../execution_chain/db/aristo/aristo_part/part_debug,
+ ../execution_chain/db/kvt/kvt_utils,
+ ../execution_chain/[tracer, evm/types],
+ ../execution_chain/common/common
proc setErrorLevel {.used.} =
when defined(chronicles_runtime_filtering) and loggingEnabled:
diff --git a/tests/test_transaction_json.nim b/tests/test_transaction_json.nim
index 86abd55b55..b0c6c63e7d 100644
--- a/tests/test_transaction_json.nim
+++ b/tests/test_transaction_json.nim
@@ -15,11 +15,11 @@ import
./test_helpers,
eth/common/transaction_utils,
../tools/common/helpers as chp,
- ../nimbus/db/core_db,
- ../nimbus/common/common,
- ../nimbus/transaction,
- ../nimbus/core/validate,
- ../nimbus/utils/utils
+ ../execution_chain/db/core_db,
+ ../execution_chain/common/common,
+ ../execution_chain/transaction,
+ ../execution_chain/core/validate,
+ ../execution_chain/utils/utils
const
FIXTURE_FORK_SKIPS = ["_info", "rlp", "Constantinople"]
diff --git a/tests/test_txpool.nim b/tests/test_txpool.nim
index ae41680851..bfe58dbd90 100644
--- a/tests/test_txpool.nim
+++ b/tests/test_txpool.nim
@@ -15,14 +15,14 @@ import
unittest2,
../hive_integration/nodocker/engine/tx_sender,
../hive_integration/nodocker/engine/cancun/blobs,
- ../nimbus/db/ledger,
- ../nimbus/core/chain,
- ../nimbus/core/eip4844,
- ../nimbus/[config, transaction, constants],
- ../nimbus/core/tx_pool,
- ../nimbus/core/tx_pool/tx_desc,
- ../nimbus/common/common,
- ../nimbus/utils/utils,
+ ../execution_chain/db/ledger,
+ ../execution_chain/core/chain,
+ ../execution_chain/core/eip4844,
+ ../execution_chain/[config, transaction, constants],
+ ../execution_chain/core/tx_pool,
+ ../execution_chain/core/tx_pool/tx_desc,
+ ../execution_chain/common/common,
+ ../execution_chain/utils/utils,
./macro_assembler
const
diff --git a/tests/tracerTestGen.nim b/tests/tracerTestGen.nim
index bbd61e8437..11c7825b5b 100644
--- a/tests/tracerTestGen.nim
+++ b/tests/tracerTestGen.nim
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2019-2024 Status Research & Development GmbH
+# Copyright (c) 2019-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)
@@ -11,10 +11,10 @@
import
std/[json, strutils],
results,
- ../nimbus/common/common, # must be early (compilation annoyance)
- ../nimbus/db/opts,
- ../nimbus/db/core_db/persistent,
- ../nimbus/[config, tracer, evm/types]
+ ../execution_chain/common/common, # must be early (compilation annoyance)
+ ../execution_chain/db/opts,
+ ../execution_chain/db/core_db/persistent,
+ ../execution_chain/[config, tracer, evm/types]
proc dumpTest(com: CommonRef, blockNumber: BlockNumber) =
var
diff --git a/tools/common/helpers.nim b/tools/common/helpers.nim
index 4e6818b227..13e2cbc72b 100644
--- a/tools/common/helpers.nim
+++ b/tools/common/helpers.nim
@@ -9,7 +9,7 @@
# according to those terms.
import
- ../../nimbus/common/common,
+ ../../execution_chain/common/common,
./types
export
diff --git a/tools/common/state_clearing.nim b/tools/common/state_clearing.nim
index 94614c4b77..ab83f7f13d 100644
--- a/tools/common/state_clearing.nim
+++ b/tools/common/state_clearing.nim
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2023-2024 Status Research & Development GmbH
+# Copyright (c) 2023-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)
@@ -9,9 +9,9 @@
# according to those terms.
import
- ../../nimbus/common/common,
- ../../nimbus/[evm/state, evm/types],
- ../../nimbus/db/ledger
+ ../../execution_chain/common/common,
+ ../../execution_chain/[evm/state, evm/types],
+ ../../execution_chain/db/ledger
proc coinbaseStateClearing*(vmState: BaseVMState,
miner: Address,
diff --git a/tools/evmstate/evmstate.nim b/tools/evmstate/evmstate.nim
index 958e0767cf..f0687a4e12 100644
--- a/tools/evmstate/evmstate.nim
+++ b/tools/evmstate/evmstate.nim
@@ -16,14 +16,14 @@ import
stew/byteutils,
results,
stint,
- ../../nimbus/[evm/types, evm/state],
- ../../nimbus/db/ledger,
- ../../nimbus/transaction,
- ../../nimbus/core/executor,
- ../../nimbus/common/common,
- ../../nimbus/evm/tracer/json_tracer,
- ../../nimbus/core/eip4844,
- ../../nimbus/utils/state_dump,
+ ../../execution_chain/[evm/types, evm/state],
+ ../../execution_chain/db/ledger,
+ ../../execution_chain/transaction,
+ ../../execution_chain/core/executor,
+ ../../execution_chain/common/common,
+ ../../execution_chain/evm/tracer/json_tracer,
+ ../../execution_chain/core/eip4844,
+ ../../execution_chain/utils/state_dump,
../common/helpers as chp,
"."/[config, helpers],
../common/state_clearing
diff --git a/tools/evmstate/helpers.nim b/tools/evmstate/helpers.nim
index c168568d3f..f15e3c19ef 100644
--- a/tools/evmstate/helpers.nim
+++ b/tools/evmstate/helpers.nim
@@ -13,9 +13,9 @@ import
eth/common/[base, keys, headers, transactions],
stint,
stew/byteutils,
- ../../nimbus/transaction,
- ../../nimbus/db/ledger,
- ../../nimbus/common/chain_config
+ ../../execution_chain/transaction,
+ ../../execution_chain/db/ledger,
+ ../../execution_chain/common/chain_config
template fromJson(T: type Address, n: JsonNode): Address =
Address.fromHex(n.getStr)
diff --git a/tools/t8n/config.nim b/tools/t8n/config.nim
index 6c87513d36..78e9839f2e 100644
--- a/tools/t8n/config.nim
+++ b/tools/t8n/config.nim
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2022-2024 Status Research & Development GmbH
+# Copyright (c) 2022-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)
@@ -178,7 +178,7 @@ const
# force the compiler to instantiate T8NConf.load
# rather than have to export parseCmdArg
-# because it will use wrong parseCmdArg from nimbus/config.nim
+# because it will use wrong parseCmdArg from execution_chain/config.nim
# when evmc_enabled
proc initT8NConf(cmdLine: openArray[string]): T8NConf =
{.push warning[ProveInit]: off.}
diff --git a/tools/t8n/helpers.nim b/tools/t8n/helpers.nim
index bb77d7ef66..fb81f917cd 100644
--- a/tools/t8n/helpers.nim
+++ b/tools/t8n/helpers.nim
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2022-2024 Status Research & Development GmbH
+# Copyright (c) 2022-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)
@@ -19,8 +19,8 @@ import
eth/common/eth_types_rlp,
eth/common/keys,
eth/common/blocks,
- ../../nimbus/transaction,
- ../../nimbus/common/chain_config,
+ ../../execution_chain/transaction,
+ ../../execution_chain/common/chain_config,
../common/helpers,
./types
diff --git a/tools/t8n/t8n_debug.nim b/tools/t8n/t8n_debug.nim
index 6673d15727..bde72e0e2a 100644
--- a/tools/t8n/t8n_debug.nim
+++ b/tools/t8n/t8n_debug.nim
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2024 Status Research & Development GmbH
+# Copyright (c) 2024-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)
@@ -14,7 +14,7 @@ import
eth/common/eth_types_rlp,
web3/conversions,
web3/engine_api_types,
- ../../nimbus/beacon/web3_eth_conv
+ ../../execution_chain/beacon/web3_eth_conv
const
testFile = "tests/fixtures/eth_tests/BlockchainTests/GeneralStateTests/Pyspecs/cancun/eip4844_blobs/fork_transition_excess_blob_gas.json"
diff --git a/tools/t8n/transition.nim b/tools/t8n/transition.nim
index 03c20272cc..7945923264 100644
--- a/tools/t8n/transition.nim
+++ b/tools/t8n/transition.nim
@@ -15,16 +15,16 @@ import
stint, results,
"."/[config, types, helpers],
../common/state_clearing,
- ../../nimbus/[evm/types, evm/state, transaction],
- ../../nimbus/common/common,
- ../../nimbus/db/ledger,
- ../../nimbus/utils/utils,
- ../../nimbus/core/pow/difficulty,
- ../../nimbus/core/dao,
- ../../nimbus/core/executor/[process_transaction, executor_helpers],
- ../../nimbus/core/eip4844,
- ../../nimbus/core/eip6110,
- ../../nimbus/evm/tracer/json_tracer
+ ../../execution_chain/[evm/types, evm/state, transaction],
+ ../../execution_chain/common/common,
+ ../../execution_chain/db/ledger,
+ ../../execution_chain/utils/utils,
+ ../../execution_chain/core/pow/difficulty,
+ ../../execution_chain/core/dao,
+ ../../execution_chain/core/executor/[process_transaction, executor_helpers],
+ ../../execution_chain/core/eip4844,
+ ../../execution_chain/core/eip6110,
+ ../../execution_chain/evm/tracer/json_tracer
const
wrapExceptionEnabled* {.booldefine.} = true
diff --git a/tools/t8n/types.nim b/tools/t8n/types.nim
index e92f3de489..b38557f755 100644
--- a/tools/t8n/types.nim
+++ b/tools/t8n/types.nim
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2022-2024 Status Research & Development GmbH
+# Copyright (c) 2022-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)
@@ -14,7 +14,7 @@ import
eth/common/receipts,
results,
stint,
- ../../nimbus/common/chain_config,
+ ../../execution_chain/common/chain_config,
../common/types
export
diff --git a/tools/txparse/txparse.nim b/tools/txparse/txparse.nim
index 0325541118..05f523cc33 100644
--- a/tools/txparse/txparse.nim
+++ b/tools/txparse/txparse.nim
@@ -1,5 +1,5 @@
# Nimbus
-# Copyright (c) 2022-2024 Status Research & Development GmbH
+# Copyright (c) 2022-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)
@@ -12,8 +12,8 @@ import
eth/[common, rlp],
stew/byteutils,
eth/common/transaction_utils,
- ../../nimbus/transaction,
- ../../nimbus/common/evmforks
+ ../../execution_chain/transaction,
+ ../../execution_chain/common/evmforks
proc parseTx(hexLine: string) =
try: