Merge branch 'rooch-network:main' into main

.npmrc

@@ -1,3 +1,4 @@
 legacy-peer-deps = false
 auto-install-peers=true
 strict-peer-dependencies=false
+loglevel=error

Cargo.toml

@@ -144,11 +144,11 @@ rooch-nursery = { path = "frameworks/rooch-nursery" }
 # External crate dependencies.
 # Please do not add any test features here: they should be declared by the individual crate.
 again = "0.1.2"
-anyhow = "1.0.87"
+anyhow = "1.0.89"
 async-trait = "0"
 backtrace = "0.3"
 bcs = "0.1.3"
-bytes = "1.7.1"
+bytes = "1.7.2"
 bech32 = "0.11.0"
 better_any = "0.1.1"
 bitcoin = { version = "0.32.2", features = ["rand-std", "bitcoinconsensus"] }
@@ -339,7 +339,7 @@ function_name = { version = "0.3.0" }
 rustc-hash = { version = "2.0.0" }
 xorf = { version = "0.11.0" }
 vergen-git2 = { version = "1.0.0", features = ["build", "cargo", "rustc"] }
-vergen-pretty = "0.3.4"
+vergen-pretty = "0.3.5"
 crossbeam-channel = "0.5.13"
 
 # Note: the BEGIN and END comments below are required for external tooling. Do not remove.

crates/rooch-config/src/lib.rs

@@ -1,6 +1,8 @@
 // Copyright (c) RoochNetwork
 // SPDX-License-Identifier: Apache-2.0
 
+use crate::da_config::DAConfig;
+use crate::store_config::StoreConfig;
 use anyhow::Result;
 use clap::Parser;
 use moveos_config::{temp_dir, DataDirPath};
@@ -9,15 +11,13 @@ use rooch_types::crypto::RoochKeyPair;
 use rooch_types::genesis_config::GenesisConfig;
 use rooch_types::rooch_network::{BuiltinChainID, RoochChainID, RoochNetwork};
 use rooch_types::service_status::ServiceStatus;
+use rooch_types::service_type::ServiceType;
 use serde::{Deserialize, Serialize};
 use std::fs::create_dir_all;
 use std::str::FromStr;
 use std::sync::Arc;
 use std::{fmt::Debug, path::Path, path::PathBuf};
 
-use crate::da_config::DAConfig;
-use crate::store_config::StoreConfig;
-
 pub mod config;
 pub mod da_config;
 pub mod server_config;
@@ -141,6 +141,9 @@ pub struct RoochOpt {
     #[clap(long)]
     pub traffic_per_second: Option<u64>,
 
+    #[clap(long, default_value_t, value_enum)]
+    pub service_type: ServiceType,
+
     #[serde(skip)]
     #[clap(skip)]
     base: Option<Arc<BaseConfig>>,
@@ -177,6 +180,7 @@ impl RoochOpt {
             traffic_per_second: None,
             traffic_burst_size: None,
             base: None,
+            service_type: ServiceType::default(),
         };
         opt.init()?;
         Ok(opt)
@@ -356,9 +360,8 @@ impl ServerOpt {
     }
 
     pub fn get_active_env(&self) -> String {
-        match self.active_env.clone() {
-            Some(env) => env,
-            None => RoochChainID::default().chain_name(),
-        }
+        self.active_env
+            .clone()
+            .unwrap_or_else(|| RoochChainID::default().chain_name())
     }
 }