From d6f633b69573a62a3f2d3d79789c1c48c6b6cb41 Mon Sep 17 00:00:00 2001
From: Alexey Shekhirin <a.shekhirin@gmail.com>
Date: Mon, 29 Jul 2024 14:27:00 +0100
Subject: [PATCH] fix(node-core): build time cargo features (#9866)

---
 bin/reth/Cargo.toml         | 15 +++++++--------
 crates/node/core/Cargo.toml |  5 +++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bin/reth/Cargo.toml b/bin/reth/Cargo.toml
index 808390967..3623f31db 100644
--- a/bin/reth/Cargo.toml
+++ b/bin/reth/Cargo.toml
@@ -117,15 +117,14 @@ libc = "0.2"
 [dev-dependencies]
 reth-discv4.workspace = true
 
-
 [features]
 default = ["jemalloc"]
 
 dev = ["reth-cli-commands/dev"]
 
-asm-keccak = ["reth-primitives/asm-keccak"]
+asm-keccak = ["reth-node-core/asm-keccak", "reth-primitives/asm-keccak"]
 
-jemalloc = ["dep:tikv-jemallocator", "reth-node-metrics/jemalloc"]
+jemalloc = ["dep:tikv-jemallocator", "reth-node-core/jemalloc", "reth-node-metrics/jemalloc"]
 jemalloc-prof = ["jemalloc", "tikv-jemallocator?/profiling"]
 
 min-error-logs = ["tracing/release_max_level_error"]
@@ -135,15 +134,15 @@ min-debug-logs = ["tracing/release_max_level_debug"]
 min-trace-logs = ["tracing/release_max_level_trace"]
 
 optimism = [
+    "dep:reth-node-optimism",
     "dep:reth-optimism-cli",
-    "reth-optimism-cli?/optimism",
-    "reth-primitives/optimism",
-    "reth-rpc/optimism",
-    "reth-provider/optimism",
     "reth-beacon-consensus/optimism",
     "reth-blockchain-tree/optimism",
-    "dep:reth-node-optimism",
     "reth-node-core/optimism",
+    "reth-optimism-cli?/optimism",
+    "reth-primitives/optimism",
+    "reth-provider/optimism",
+    "reth-rpc/optimism",
 ]
 
 # no-op feature flag for switching between the `optimism` and default functionality in CI matrices
diff --git a/crates/node/core/Cargo.toml b/crates/node/core/Cargo.toml
index b4317c6b1..ef3bdd703 100644
--- a/crates/node/core/Cargo.toml
+++ b/crates/node/core/Cargo.toml
@@ -85,8 +85,9 @@ optimism = [
     "reth-rpc-types-compat/optimism",
     "reth-rpc-eth-api/optimism",
 ]
-
-
+# Features for vergen to generate correct env vars
+jemalloc = []
+asm-keccak = []
 
 [build-dependencies]
 vergen = { version = "8.0.0", features = ["build", "cargo", "git", "gitcl"] }