Revert "chore: Smaller Nits"

bin/reth/Cargo.toml

@@ -121,6 +121,7 @@ min-debug-logs = ["tracing/release_max_level_debug"]
 min-trace-logs = ["tracing/release_max_level_trace"]
 optimism = [
   "reth-primitives/optimism",
+  "reth-primitives/value-256",
   "reth-revm/optimism",
   "reth-interfaces/optimism",
   "reth-rpc/optimism",

bin/reth/src/args/payload_builder_args.rs

@@ -98,7 +98,7 @@ impl TypedValueParser for ExtradataValueParser {
                 format!(
                     "Payload builder extradata size exceeds {MAXIMUM_EXTRA_DATA_SIZE}bytes limit"
                 ),
-            ))
+            ));
         }
         Ok(val.to_string())
     }

bin/reth/src/debug_cmd/build_block.rs

@@ -246,8 +246,11 @@ impl Command {
             // TODO: add support for withdrawals
             withdrawals: None,
             #[cfg(feature = "optimism")]
-            optimism_payload_attributes: reth_rpc_types::engine::OptimismPayloadAttributes::default(
-            ),
+            optimism_payload_attributes: reth_rpc_types::engine::OptimismPayloadAttributes {
+                transactions: None,
+                no_tx_pool: None,
+                gas_limit: None,
+            },
         };
         let payload_config = PayloadConfig::new(
             Arc::clone(&best_block),

bin/reth/src/lib.rs

@@ -39,6 +39,7 @@ pub mod dirs;
 pub mod init;
 pub mod node;
 pub mod p2p;
+pub mod precaution;
 pub mod prometheus_exporter;
 pub mod recover;
 pub mod runner;

bin/reth/src/main.rs

@@ -4,6 +4,10 @@
 static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;
 
 fn main() {
+    // Ensure feature flags are set correctly for different chains
+    reth::precaution::ensure_ethereum!();
+    reth::precaution::ensure_optimism!();
+
     if let Err(err) = reth::cli::run() {
         eprintln!("Error: {err:?}");
         std::process::exit(1);

bin/reth/src/node/mod.rs

@@ -87,6 +87,11 @@ use std::{
 use tokio::sync::{mpsc::unbounded_channel, oneshot, watch};
 use tracing::*;
 
+#[cfg(feature = "optimism")]
+use reth_rpc_api::EngineApiClient;
+#[cfg(feature = "optimism")]
+use reth_rpc_types::engine::ForkchoiceState;
+
 pub mod cl_events;
 pub mod events;
 
@@ -558,9 +563,9 @@ impl<Ext: RethCliExt> NodeCommand<Ext> {
         #[cfg(feature = "optimism")]
         if self.chain.optimism && !self.rollup.enable_genesis_walkback {
             let client = _rpc_server_handles.auth.http_client();
-            reth_rpc_api::EngineApiClient::fork_choice_updated_v2(
+            EngineApiClient::fork_choice_updated_v2(
                 &client,
-                reth_rpc_types::engine::ForkchoiceState {
+                ForkchoiceState {
                     head_block_hash: head.hash,
                     safe_block_hash: head.hash,
                     finalized_block_hash: head.hash,
@@ -789,15 +794,15 @@ impl<Ext: RethCliExt> NodeCommand<Ext> {
         // try to look up the header in the database
         if let Some(header) = header {
             info!(target: "reth::cli", ?tip, "Successfully looked up tip block in the database");
-            return Ok(header.seal_slow())
+            return Ok(header.seal_slow());
         }
 
         info!(target: "reth::cli", ?tip, "Fetching tip block from the network.");
         loop {
             match get_single_header(&client, tip).await {
                 Ok(tip_header) => {
                     info!(target: "reth::cli", ?tip, "Successfully fetched tip");
-                    return Ok(tip_header)
+                    return Ok(tip_header);
                 }
                 Err(error) => {
                     error!(target: "reth::cli", %error, "Failed to fetch the tip. Retrying...");

bin/reth/src/precaution.rs

@@ -0,0 +1,24 @@
+//! Helpers to ensure certain features are enabled or disabled.
+//!
+//! The motivation for this is to prevent that a binary is accidentally built with a feature that is
+//! not intended to be used.
+//!
+//! Currently conflicting features are: `value-u256` which is required by optimism.
+
+/// A macro to ensure that the crate's features are compatible with ethereum
+#[macro_export]
+macro_rules! ensure_ethereum {
+    () => {
+        #[cfg(feature = "value-256")]
+        compile_error!("The `value-256` feature is enabled but for `ethereum` it must be disabled: https://github.com/paradigmxyz/reth/issues/4891");
+    };
+}
+
+/// A macro to ensure that the crate's features are compatible with optimism
+#[macro_export]
+macro_rules! ensure_optimism {
+    () => {
+        #[cfg(not(feature = "value-256"))]
+        compile_error!("The `value-256` feature is disabled but for `optimism` it must be enabled: https://github.com/paradigmxyz/reth/issues/4891");
+    };
+}