fix: resolve feature flag conflicts for devnet2 compilation

Cargo.toml

@@ -145,39 +145,39 @@ ream-api-types-common = { path = "crates/common/api_types/common" }
 ream-api-types-lean = { path = "crates/common/api_types/lean" }
 ream-bls = { path = "crates/crypto/bls", features = ["zkcrypto"] } # Default feature is zkcrypto
 ream-chain-beacon = { path = "crates/common/chain/beacon" }
-ream-chain-lean = { path = "crates/common/chain/lean" }
+ream-chain-lean = { path = "crates/common/chain/lean", default-features = false }
 ream-checkpoint-sync = { path = "crates/common/checkpoint_sync" }
 ream-consensus-beacon = { path = "crates/common/consensus/beacon" }
-ream-consensus-lean = { path = "crates/common/consensus/lean" }
+ream-consensus-lean = { path = "crates/common/consensus/lean", default-features = false }
 ream-consensus-misc = { path = "crates/common/consensus/misc" }
 ream-discv5 = { path = "crates/networking/discv5" }
 ream-events-beacon = { path = "crates/common/events/beacon" }
 ream-execution-engine = { path = "crates/common/execution/engine" }
 ream-execution-rpc-types = { path = "crates/common/execution/rpc_types" }
 ream-executor = { path = "crates/common/executor" }
 ream-fork-choice-beacon = { path = "crates/common/fork_choice/beacon" }
-ream-fork-choice-lean = { path = "crates/common/fork_choice/lean" }
+ream-fork-choice-lean = { path = "crates/common/fork_choice/lean", default-features = false }
 ream-keystore = { path = "crates/crypto/keystore" }
 ream-light-client = { path = "crates/common/light_client" }
 ream-merkle = { path = "crates/crypto/merkle" }
 ream-metrics = { path = "crates/common/metrics" }
 ream-network-manager = { path = "crates/networking/manager" }
 ream-network-spec = { path = "crates/common/network_spec" }
-ream-network-state-lean = { path = "crates/networking/network_state/lean" }
+ream-network-state-lean = { path = "crates/networking/network_state/lean", default-features = false }
 ream-node = { path = "crates/common/node" }
 ream-operation-pool = { path = "crates/common/operation_pool" }
-ream-p2p = { path = "crates/networking/p2p" }
+ream-p2p = { path = "crates/networking/p2p", default-features = false }
 ream-peer = { path = "crates/networking/peer" }
 ream-polynomial-commitments = { path = "crates/common/polynomial_commitments" }
 ream-post-quantum-crypto = { path = "crates/crypto/post_quantum" }
 ream-rpc-beacon = { path = "crates/rpc/beacon" }
 ream-rpc-common = { path = "crates/rpc/common" }
-ream-rpc-lean = { path = "crates/rpc/lean" }
+ream-rpc-lean = { path = "crates/rpc/lean", default-features = false }
 ream-storage = { path = "crates/storage" }
 ream-sync = { path = "crates/common/sync" }
 ream-syncer = { path = "crates/networking/syncer" }
 ream-validator-beacon = { path = "crates/common/validator/beacon" }
-ream-validator-lean = { path = "crates/common/validator/lean" }
+ream-validator-lean = { path = "crates/common/validator/lean", default-features = false }
 
 [patch.crates-io]
 ethereum_hashing = { git = "https://github.com/ReamLabs/ethereum_hashing.git", rev = "c14a9ad96436e6b8b631faf49a3666e4558b71ae" }

bin/ream/Cargo.toml

@@ -16,8 +16,22 @@ path = "src/main.rs"
 
 [features]
 default = ["devnet1"]
-devnet1 = ["ream-consensus-lean/devnet1", "ream-p2p/devnet1"]
-devnet2 = ["ream-consensus-lean/devnet2", "ream-p2p/devnet2"]
+devnet1 = [
+    "ream-chain-lean/devnet1",
+    "ream-consensus-lean/devnet1",
+    "ream-fork-choice-lean/devnet1",
+    "ream-p2p/devnet1",
+    "ream-rpc-lean/devnet1",
+    "ream-validator-lean/devnet1",
+]
+devnet2 = [
+    "ream-chain-lean/devnet2",
+    "ream-consensus-lean/devnet2",
+    "ream-fork-choice-lean/devnet2",
+    "ream-p2p/devnet2",
+    "ream-rpc-lean/devnet2",
+    "ream-validator-lean/devnet2",
+]
 
 [dependencies]
 alloy-primitives.workspace = true

crates/common/chain/lean/Cargo.toml

@@ -11,8 +11,8 @@ version.workspace = true
 
 [features]
 default = ["devnet1"]
-devnet1 = []
-devnet2 = []
+devnet1 = ["ream-consensus-lean/devnet1", "ream-fork-choice-lean/devnet1", "ream-network-state-lean/devnet1"]
+devnet2 = ["ream-consensus-lean/devnet2", "ream-fork-choice-lean/devnet2", "ream-network-state-lean/devnet2"]
 
 [dependencies]
 alloy-primitives.workspace = true

crates/common/chain/lean/src/lib.rs

@@ -1,3 +1,9 @@
+#[cfg(all(feature = "devnet1", feature = "devnet2"))]
+compile_error!("Features 'devnet1' and 'devnet2' are mutually exclusive. Use --no-default-features --features devnet2 to build for devnet2.");
+
+#[cfg(not(any(feature = "devnet1", feature = "devnet2")))]
+compile_error!("Either 'devnet1' or 'devnet2' feature must be enabled.");
+
 pub mod clock;
 pub mod messages;
 pub mod p2p_request;

crates/common/consensus/lean/src/lib.rs

@@ -1,3 +1,9 @@
+#[cfg(all(feature = "devnet1", feature = "devnet2"))]
+compile_error!("Features 'devnet1' and 'devnet2' are mutually exclusive. Use --no-default-features --features devnet2 to build for devnet2.");
+
+#[cfg(not(any(feature = "devnet1", feature = "devnet2")))]
+compile_error!("Either 'devnet1' or 'devnet2' feature must be enabled.");
+
 pub mod attestation;
 pub mod block;
 pub mod checkpoint;

crates/common/fork_choice/lean/Cargo.toml

@@ -11,8 +11,8 @@ version.workspace = true
 
 [features]
 default = ["devnet1"]
-devnet1 = []
-devnet2 = []
+devnet1 = ["ream-consensus-lean/devnet1", "ream-network-state-lean/devnet1"]
+devnet2 = ["ream-consensus-lean/devnet2", "ream-network-state-lean/devnet2"]
 
 [dependencies]
 alloy-consensus.workspace = true

crates/common/validator/lean/Cargo.toml

@@ -11,8 +11,8 @@ version.workspace = true
 
 [features]
 default = ["devnet1"]
-devnet1 = []
-devnet2 = []
+devnet1 = ["ream-consensus-lean/devnet1", "ream-chain-lean/devnet1"]
+devnet2 = ["ream-consensus-lean/devnet2", "ream-chain-lean/devnet2"]
 
 [dependencies]
 alloy-primitives.workspace = true

crates/networking/network_state/lean/Cargo.toml

@@ -9,6 +9,11 @@ repository.workspace = true
 rust-version.workspace = true
 version.workspace = true
 
+[features]
+default = ["devnet1"]
+devnet1 = ["ream-consensus-lean/devnet1"]
+devnet2 = ["ream-consensus-lean/devnet2"]
+
 [dependencies]
 libp2p.workspace = true
 parking_lot.workspace = true

crates/networking/p2p/Cargo.toml

@@ -11,8 +11,8 @@ version.workspace = true
 
 [features]
 default = ["devnet1"]
-devnet1 = []
-devnet2 = []
+devnet1 = ["ream-consensus-lean/devnet1", "ream-chain-lean/devnet1", "ream-network-state-lean/devnet1"]
+devnet2 = ["ream-consensus-lean/devnet2", "ream-chain-lean/devnet2", "ream-network-state-lean/devnet2"]
 
 [dependencies]
 alloy-primitives.workspace = true

crates/networking/p2p/src/lib.rs

@@ -1,3 +1,9 @@
+#[cfg(all(feature = "devnet1", feature = "devnet2"))]
+compile_error!("Features 'devnet1' and 'devnet2' are mutually exclusive. Use --no-default-features --features devnet2 to build for devnet2.");
+
+#[cfg(not(any(feature = "devnet1", feature = "devnet2")))]
+compile_error!("Either 'devnet1' or 'devnet2' feature must be enabled.");
+
 pub mod bootnodes;
 pub mod config;
 pub mod constants;

crates/rpc/lean/Cargo.toml

@@ -9,6 +9,11 @@ repository.workspace = true
 rust-version.workspace = true
 version.workspace = true
 
+[features]
+default = ["devnet1"]
+devnet1 = ["ream-consensus-lean/devnet1", "ream-fork-choice-lean/devnet1", "ream-network-state-lean/devnet1"]
+devnet2 = ["ream-consensus-lean/devnet2", "ream-fork-choice-lean/devnet2", "ream-network-state-lean/devnet2"]
+
 [dependencies]
 actix-web.workspace = true
 libp2p.workspace = true