Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

fix(katana-cli): ensure compilation without server feature #2896

Merged
merged 1 commit into from
Jan 11, 2025
Merged

fix(katana-cli): ensure compilation without server feature #2896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 23 additions & 19 deletions crates/katana/cli/src/args.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ use std::path::PathBuf;
use std::sync::Arc;

use alloy_primitives::U256;
use anyhow::{bail, Context, Result};
#[cfg(feature = "server")]
use anyhow::bail;
use anyhow::{Context, Result};
use clap::Parser;
use katana_core::constants::DEFAULT_SEQUENCER_ADDRESS;
use katana_core::service::messaging::MessagingConfig;
Expand All @@ -13,7 +15,9 @@ use katana_node::config::dev::{DevConfig, FixedL1GasPriceConfig};
use katana_node::config::execution::ExecutionConfig;
use katana_node::config::fork::ForkingConfig;
use katana_node::config::metrics::MetricsConfig;
use katana_node::config::rpc::{RpcConfig, RpcModuleKind, RpcModulesList};
use katana_node::config::rpc::RpcConfig;
#[cfg(feature = "server")]
use katana_node::config::rpc::{RpcModuleKind, RpcModulesList};
use katana_node::config::{Config, SequencingConfig};
use katana_primitives::chain_spec::{self, ChainSpec};
use katana_primitives::genesis::allocation::DevAllocationsGenerator;
Expand Down Expand Up @@ -197,24 +201,24 @@ impl NodeArgs {
}

fn rpc_config(&self) -> Result<RpcConfig> {
let modules = if let Some(modules) = &self.server.http_modules {
// TODO: This check should be handled in the `katana-node` level. Right now if you
// instantiate katana programmatically, you can still add the dev module without
// enabling dev mode.
//
// We only allow the `dev` module in dev mode (ie `--dev` flag)
if !self.development.dev && modules.contains(&RpcModuleKind::Dev) {
bail!("The `dev` module can only be enabled in dev mode (ie `--dev` flag)")
}

modules.clone()
} else {
// Expose the default modules if none is specified.
RpcModulesList::default()
};

#[cfg(feature = "server")]
{
let modules = if let Some(modules) = &self.server.http_modules {
// TODO: This check should be handled in the `katana-node` level. Right now if you
// instantiate katana programmatically, you can still add the dev module without
// enabling dev mode.
//
// We only allow the `dev` module in dev mode (ie `--dev` flag)
if !self.development.dev && modules.contains(&RpcModuleKind::Dev) {
bail!("The `dev` module can only be enabled in dev mode (ie `--dev` flag)")
}

modules.clone()
} else {
// Expose the default modules if none is specified.
RpcModulesList::default()
};

Ok(RpcConfig {
apis: modules,
port: self.server.http_port,
Expand All @@ -228,7 +232,7 @@ impl NodeArgs {

#[cfg(not(feature = "server"))]
{
Ok(RpcConfig { apis, ..Default::default() })
Ok(RpcConfig::default())
}
}

Expand Down
11 changes: 7 additions & 4 deletions crates/katana/cli/src/options.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,14 @@
//!
//! Currently, the merge is made at the top level of the commands.

#[cfg(feature = "server")]
use std::net::IpAddr;

use clap::Args;
use katana_node::config::execution::{DEFAULT_INVOCATION_MAX_STEPS, DEFAULT_VALIDATION_MAX_STEPS};
#[cfg(feature = "server")]
use katana_node::config::metrics::{DEFAULT_METRICS_ADDR, DEFAULT_METRICS_PORT};
#[cfg(feature = "server")]
use katana_node::config::rpc::{RpcModulesList, DEFAULT_RPC_MAX_PROOF_KEYS};
#[cfg(feature = "server")]
use katana_node::config::rpc::{
Expand All @@ -21,14 +24,14 @@ use katana_node::config::rpc::{
use katana_primitives::block::BlockHashOrNumber;
use katana_primitives::chain::ChainId;
use katana_primitives::genesis::Genesis;
#[cfg(feature = "server")]
use katana_rpc::cors::HeaderValue;
use serde::{Deserialize, Serialize};
use url::Url;

use crate::utils::{
deserialize_cors_origins, parse_block_hash_or_number, parse_genesis, serialize_cors_origins,
LogFormat,
};
#[cfg(feature = "server")]
use crate::utils::{deserialize_cors_origins, serialize_cors_origins};
use crate::utils::{parse_block_hash_or_number, parse_genesis, LogFormat};

const DEFAULT_DEV_SEED: &str = "0";
const DEFAULT_DEV_ACCOUNTS: u16 = 10;
Expand Down
Loading