Merge branch 'main' into HEAD

Author: jclapis

.gitignore

@@ -16,3 +16,11 @@ targets.json
 .idea/
 logs
 .vscode/
+
+# Nix
+.direnv/
+.devenv/
+devenv.*
+devenv.lock
+.devenv.flake.nix
+.envrc

bin/cli.rs

@@ -1,22 +1,8 @@
 use clap::Parser;
 
-/// Version string with a leading 'v'
-const VERSION: &str = concat!("v", env!("CARGO_PKG_VERSION"));
-
-/// Subcommands and global arguments for the module
-#[derive(Parser, Debug)]
-#[command(name = "Commit-Boost CLI", version = VERSION, about, long_about = None)]
-struct Cli {}
-
-/// Main entry point of the Commit-Boost CLI
 #[tokio::main]
 async fn main() -> eyre::Result<()> {
-    // Parse the CLI arguments (currently only used for version info, more can be
-    // added later)
-    let _cli = Cli::parse();
-
     color_eyre::install()?;
-    // set default backtrace unless provided
 
     let args = cb_cli::Args::parse();
 

bin/pbs.rs

@@ -7,26 +7,14 @@ use clap::Parser;
 use eyre::Result;
 use tracing::{error, info};
 
-/// Version string with a leading 'v'
-const VERSION: &str = concat!("v", env!("CARGO_PKG_VERSION"));
-
-/// Subcommands and global arguments for the module
-#[derive(Parser, Debug)]
-#[command(name = "Commit-Boost PBS Service", version = VERSION, about, long_about = None)]
-struct Cli {}
-
 #[tokio::main]
 async fn main() -> Result<()> {
-    // Parse the CLI arguments (currently only used for version info, more can be
-    // added later)
-    let _cli = Cli::parse();
+    let _args = cb_cli::PbsArgs::parse();
 
     color_eyre::install()?;
 
     let _guard = initialize_tracing_log(PBS_MODULE_NAME, LogsSettings::from_env_config()?);
 
-    let _args = cb_cli::PbsArgs::parse();
-
     let (pbs_config, config_path) = load_pbs_config(None).await?;
 
     PbsService::init_metrics(pbs_config.chain)?;

bin/signer.rs

@@ -7,26 +7,14 @@ use clap::Parser;
 use eyre::Result;
 use tracing::{error, info};
 
-/// Version string with a leading 'v'
-const VERSION: &str = concat!("v", env!("CARGO_PKG_VERSION"));
-
-/// Subcommands and global arguments for the module
-#[derive(Parser, Debug)]
-#[command(name = "Commit-Boost Signer Service", version = VERSION, about, long_about = None)]
-struct Cli {}
-
 #[tokio::main]
 async fn main() -> Result<()> {
-    // Parse the CLI arguments (currently only used for version info, more can be
-    // added later)
-    let _cli = Cli::parse();
+    let _args = cb_cli::SignerArgs::parse();
 
     color_eyre::install()?;
 
     let _guard = initialize_tracing_log(SIGNER_MODULE_NAME, LogsSettings::from_env_config()?);
 
-    let _args = cb_cli::SignerArgs::parse();
-
     let config = StartSignerConfig::load_from_env()?;
     let server = SigningService::run(config);
 

crates/cli/src/lib.rs

@@ -5,8 +5,11 @@ use clap::{Parser, Subcommand};
 
 mod docker_init;
 
+/// Version string with a leading 'v'
+const VERSION: &str = concat!("v", env!("CARGO_PKG_VERSION"));
+
 #[derive(Parser, Debug)]
-#[command(version, about, long_about = LONG_ABOUT, name = "commit-boost-cli")]
+#[command(version = VERSION, about, long_about = LONG_ABOUT, name = "commit-boost-cli")]
 pub struct Args {
     #[command(subcommand)]
     pub cmd: Command,
@@ -41,9 +44,25 @@ impl Args {
 const LONG_ABOUT: &str = "Commit-Boost allows Ethereum validators to safely run MEV-Boost and community-built commitment protocols";
 
 #[derive(Parser, Debug)]
-#[command(version, about, long_about = LONG_ABOUT, name = "commit-boost-pbs")]
+#[command(version = VERSION, about, long_about = LONG_ABOUT, name = "commit-boost-pbs")]
 pub struct PbsArgs;
 
 #[derive(Parser, Debug)]
-#[command(version, about, long_about = LONG_ABOUT, name = "commit-boost-signer")]
+#[command(version = VERSION, about, long_about = LONG_ABOUT, name = "commit-boost-signer")]
 pub struct SignerArgs;
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn version_has_v_prefix() {
+        assert!(VERSION.starts_with('v'), "VERSION should start with 'v', got: {VERSION}");
+    }
+
+    #[test]
+    fn parse_init_subcommand() {
+        Args::try_parse_from(["commit-boost-cli", "init", "--config", "/tmp/config.toml"])
+            .expect("should parse init subcommand");
+    }
+}

tests/tests/pbs_cfg_file_update.rs

@@ -59,7 +59,8 @@ async fn test_cfg_file_update() -> Result<()> {
                                              * or anything close to it */
         extra_validation_enabled: false,
         rpc_url: None,
-        ssv_api_url: Url::parse("http://example.com").unwrap(),
+        ssv_node_api_url: Url::parse("http://example.com").unwrap(),
+        ssv_public_api_url: Url::parse("http://example.com").unwrap(),
         http_timeout_seconds: 10,
         register_validator_retry_limit: 3,
         validator_registration_batch_size: None,

tests/tests/pbs_mux.rs

@@ -345,7 +345,7 @@ async fn test_ssv_multi_with_node() -> Result<()> {
     config.registry_muxes = Some(registry_muxes);
 
     // Run PBS service
-    let state = PbsState::new(config);
+    let state = PbsState::new(config, PathBuf::new());
     let pbs_server = tokio::spawn(PbsService::run::<(), DefaultBuilderApi>(state));
     info!("Started PBS server with pubkey {pubkey}");
 
@@ -441,7 +441,7 @@ async fn test_ssv_multi_with_public() -> Result<()> {
     config.registry_muxes = Some(registry_muxes);
 
     // Run PBS service
-    let state = PbsState::new(config);
+    let state = PbsState::new(config, PathBuf::new());
     let pbs_server = tokio::spawn(PbsService::run::<(), DefaultBuilderApi>(state));
     info!("Started PBS server with pubkey {pubkey}");