diff --git a/crates/consensus/beacon/Cargo.toml b/crates/consensus/beacon/Cargo.toml index 7693890cc..3f617d1d0 100644 --- a/crates/consensus/beacon/Cargo.toml +++ b/crates/consensus/beacon/Cargo.toml @@ -76,6 +76,5 @@ optimism = [ "reth-primitives/optimism", "reth-provider/optimism", "reth-blockchain-tree/optimism", - "reth-ethereum-consensus/optimism", "reth-rpc/optimism", ] diff --git a/crates/ethereum/consensus/Cargo.toml b/crates/ethereum/consensus/Cargo.toml index f1ee25085..3eae6aaa7 100644 --- a/crates/ethereum/consensus/Cargo.toml +++ b/crates/ethereum/consensus/Cargo.toml @@ -17,6 +17,3 @@ reth-primitives.workspace = true reth-consensus.workspace = true tracing.workspace = true - -[features] -optimism = ["reth-primitives/optimism"] diff --git a/crates/ethereum/consensus/src/lib.rs b/crates/ethereum/consensus/src/lib.rs index cbef399cc..2772bd8f0 100644 --- a/crates/ethereum/consensus/src/lib.rs +++ b/crates/ethereum/consensus/src/lib.rs @@ -52,27 +52,18 @@ impl Consensus for EthBeaconConsensus { Ok(()) } - #[allow(unused_assignments)] - #[allow(unused_mut)] fn validate_header_with_total_difficulty( &self, header: &Header, total_difficulty: U256, ) -> Result<(), ConsensusError> { - let mut is_post_merge = self + let is_post_merge = self .chain_spec .fork(Hardfork::Paris) .active_at_ttd(total_difficulty, header.difficulty); - #[cfg(feature = "optimism")] - { - // If OP-Stack then bedrock activation number determines when TTD (eth Merge) has been - // reached. - is_post_merge = self.chain_spec.is_bedrock_active_at_block(header.number); - } - if is_post_merge { - if !self.chain_spec.is_optimism() && !header.is_zero_difficulty() { + if !header.is_zero_difficulty() { return Err(ConsensusError::TheMergeDifficultyIsNotZero) }