Merge branch 'main' into sigp-audit-fixes

Author: jclapis

.gitignore

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

Cargo.lock

@@ -5,7 +5,7 @@ resolver = "2"
 [workspace.package]
 edition = "2024"
 rust-version = "1.89"
-version = "0.9.2"
+version = "0.9.3"
 
 [workspace.dependencies]
 aes = "0.8"
@@ -53,6 +53,7 @@ lazy_static = "1.5.0"
 lh_eth2 = { package = "eth2", git = "https://github.com/sigp/lighthouse", tag = "v8.0.0-rc.0" }
 lh_eth2_keystore = { package = "eth2_keystore", git = "https://github.com/sigp/lighthouse", tag = "v8.0.0-rc.0" }
 lh_types = { package = "types", git = "https://github.com/sigp/lighthouse", tag = "v8.0.0-rc.0" }
+notify = "8.2.0"
 parking_lot = "0.12.3"
 pbkdf2 = "0.12.2"
 prometheus = "0.14.0"

Cargo.toml

@@ -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/cli.rs

@@ -7,30 +7,18 @@ 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 = load_pbs_config().await?;
+    let (pbs_config, config_path) = load_pbs_config(None).await?;
 
     PbsService::init_metrics(pbs_config.chain)?;
-    let state = PbsState::new(pbs_config);
+    let state = PbsState::new(pbs_config, config_path);
     let server = PbsService::run::<_, DefaultBuilderApi>(state);
 
     tokio::select! {

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 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);