refactor(grpc): add grpc feature flag to CLI options

Gate GrpcOptions and related code under both 'server' and 'grpc'
features in the CLI crate for better feature modularity.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Author: kariy

crates/cli/src/args.rs

@@ -20,6 +20,7 @@ use katana_node::config::execution::ExecutionConfig;
 use katana_node::config::fork::ForkingConfig;
 #[cfg(feature = "server")]
 use katana_node::config::gateway::GatewayConfig;
+#[cfg(all(feature = "server", feature = "grpc"))]
 use katana_node::config::grpc::GrpcConfig;
 use katana_node::config::metrics::MetricsConfig;
 #[cfg(feature = "cartridge")]
@@ -137,7 +138,7 @@ pub struct SequencerNodeArgs {
     #[command(flatten)]
     pub tee: TeeOptions,
 
-    #[cfg(feature = "server")]
+    #[cfg(all(feature = "server", feature = "grpc"))]
     #[command(flatten)]
     pub grpc: GrpcOptions,
 }
@@ -214,6 +215,7 @@ impl SequencerNodeArgs {
         let (chain, cs_messaging) = self.chain_spec()?;
         let metrics = self.metrics_config();
         let gateway = self.gateway_config();
+        #[cfg(all(feature = "server", feature = "grpc"))]
         let grpc = self.grpc_config();
         let forking = self.forking_config()?;
         let execution = self.execution_config();
@@ -228,6 +230,7 @@ impl SequencerNodeArgs {
             db,
             dev,
             rpc,
+            #[cfg(feature = "grpc")]
             grpc,
             chain,
             metrics,
@@ -455,8 +458,8 @@ impl SequencerNodeArgs {
         None
     }
 
+    #[cfg(all(feature = "server", feature = "grpc"))]
     fn grpc_config(&self) -> Option<GrpcConfig> {
-        #[cfg(feature = "server")]
         if self.grpc.grpc_enable {
             use std::time::Duration;
 
@@ -468,9 +471,6 @@ impl SequencerNodeArgs {
         } else {
             None
         }
-
-        #[cfg(not(feature = "server"))]
-        None
     }
 
     #[cfg(feature = "cartridge")]
@@ -531,7 +531,10 @@ impl SequencerNodeArgs {
                     self.metrics = metrics;
                 }
             }
+        }
 
+        #[cfg(all(feature = "server", feature = "grpc"))]
+        {
             self.grpc.merge(config.grpc.as_ref());
         }
 

crates/cli/src/file.rs

@@ -26,7 +26,7 @@ pub struct NodeArgsConfig {
     pub server: Option<ServerOptions>,
     #[cfg(feature = "server")]
     pub metrics: Option<MetricsOptions>,
-    #[cfg(feature = "server")]
+    #[cfg(all(feature = "server", feature = "grpc"))]
     pub grpc: Option<GrpcOptions>,
     #[cfg(feature = "cartridge")]
     pub cartridge: Option<CartridgeOptions>,
@@ -76,6 +76,10 @@ impl TryFrom<SequencerNodeArgs> for NodeArgsConfig {
                 if args.server == ServerOptions::default() { None } else { Some(args.server) };
             node_config.metrics =
                 if args.metrics == MetricsOptions::default() { None } else { Some(args.metrics) };
+        }
+
+        #[cfg(all(feature = "server", feature = "grpc"))]
+        {
             node_config.grpc =
                 if args.grpc == GrpcOptions::default() { None } else { Some(args.grpc) };
         }

crates/cli/src/options.rs

@@ -836,7 +836,7 @@ impl TeeOptions {
     }
 }
 
-#[cfg(feature = "server")]
+#[cfg(all(feature = "server", feature = "grpc"))]
 #[derive(Debug, Args, Clone, Serialize, Deserialize, PartialEq)]
 #[command(next_help_heading = "gRPC server options")]
 pub struct GrpcOptions {
@@ -868,7 +868,7 @@ pub struct GrpcOptions {
     pub grpc_timeout: Option<u64>,
 }
 
-#[cfg(feature = "server")]
+#[cfg(all(feature = "server", feature = "grpc"))]
 impl Default for GrpcOptions {
     fn default() -> Self {
         GrpcOptions {
@@ -880,7 +880,7 @@ impl Default for GrpcOptions {
     }
 }
 
-#[cfg(feature = "server")]
+#[cfg(all(feature = "server", feature = "grpc"))]
 impl GrpcOptions {
     pub fn merge(&mut self, other: Option<&Self>) {
         if let Some(other) = other {
@@ -900,12 +900,12 @@ impl GrpcOptions {
     }
 }
 
-#[cfg(feature = "server")]
+#[cfg(all(feature = "server", feature = "grpc"))]
 fn default_grpc_addr() -> IpAddr {
     katana_node::config::grpc::DEFAULT_GRPC_ADDR
 }
 
-#[cfg(feature = "server")]
+#[cfg(all(feature = "server", feature = "grpc"))]
 fn default_grpc_port() -> u16 {
     katana_node::config::grpc::DEFAULT_GRPC_PORT
 }