Consensus env vars

nodes/nomos-node/src/config.rs

@@ -1,11 +1,13 @@
 use std::{
     net::{IpAddr, SocketAddr},
     path::PathBuf,
+    time::Duration,
 };
 
 use crate::Carnot;
 use clap::{Parser, ValueEnum};
-use color_eyre::eyre::{eyre, Result};
+use color_eyre::eyre::{self, eyre, Result};
+use hex::FromHex;
 #[cfg(feature = "metrics")]
 use metrics::{backend::map::MapMetricsBackend, types::MetricsData, MetricsService};
 use nomos_http::{backends::axum::AxumBackend, http::HttpService};
@@ -81,6 +83,41 @@ pub struct HttpArgs {
     pub cors_origins: Option<Vec<String>>,
 }
 
+#[derive(Parser, Debug, Clone)]
+pub struct ConsensusArgs {
+    #[clap(long = "consensus-priv-key", env = "CONSENSUS_PRIV_KEY")]
+    consensus_priv_key: Option<String>,
+
+    #[clap(long = "consensus-timeout-secs", env = "CONSENSUS_TIMEOUT_SECS")]
+    consensus_timeout_secs: Option<String>,
+}
+
+#[derive(ValueEnum, Clone, Debug, Default)]
+pub enum OverlayType {
+    #[default]
+    Flat,
+    Tree,
+}
+
+#[derive(Parser, Debug, Clone)]
+pub struct OverlayArgs {
+    // TODO: Act on type and support other overlays.
+    #[clap(long = "overlay-type", env = "OVERLAY_TYPE")]
+    pub overlay_type: Option<OverlayType>,
+
+    #[clap(long = "overlay-nodes", env = "OVERLAY_NODES")]
+    pub overlay_nodes: Option<Vec<String>>,
+
+    #[clap(long = "overlay-leader", env = "OVERLAY_LEADER")]
+    pub overlay_leader: Option<usize>,
+
+    #[clap(
+        long = "overlay-leader-super-majority-threshold",
+        env = "OVERLAY_LEADER_SUPER_MAJORITY_THRESHOLD"
+    )]
+    pub overlay_leader_super_majority_threshold: Option<usize>,
+}
+
 #[derive(Deserialize, Debug, Clone, Serialize)]
 pub struct Config {
     pub log: <Logger as ServiceData>::Settings,
@@ -200,11 +237,11 @@ impl Config {
 
     pub fn update_http(mut self, http_args: HttpArgs) -> Result<Self> {
         let HttpArgs {
-            http_addr: addr,
+            http_addr,
             cors_origins,
         } = http_args;
 
-        if let Some(addr) = addr {
+        if let Some(addr) = http_addr {
             self.http.backend.address = addr;
         }
 
@@ -214,4 +251,50 @@ impl Config {
 
         Ok(self)
     }
+
+    pub fn update_consensus(mut self, consensus_args: ConsensusArgs) -> Result<Self> {
+        let ConsensusArgs {
+            consensus_priv_key,
+            consensus_timeout_secs,
+        } = consensus_args;
+
+        if let Some(private_key) = consensus_priv_key {
+            let bytes = <[u8; 32]>::from_hex(private_key)?;
+            self.consensus.private_key = bytes;
+        }
+
+        if let Some(timeout) = consensus_timeout_secs {
+            let secs = timeout.parse::<u64>()?;
+            self.consensus.timeout = Duration::from_secs(secs);
+        }
+
+        Ok(self)
+    }
+
+    pub fn update_overlay(mut self, overlay_args: OverlayArgs) -> Result<Self> {
+        let OverlayArgs {
+            overlay_nodes,
+            overlay_leader_super_majority_threshold,
+            ..
+        } = overlay_args;
+
+        if let Some(nodes) = overlay_nodes {
+            self.consensus.overlay_settings.nodes = nodes
+                .iter()
+                .map(|n| {
+                    <[u8; 32]>::from_hex(n)
+                        .map_err(|e| eyre::eyre!("Failed to decode hex: {}", e))
+                        .map(|b| b.into())
+                })
+                .collect::<Result<Vec<_>, eyre::Report>>()?;
+        }
+
+        if let Some(threshold) = overlay_leader_super_majority_threshold {
+            self.consensus
+                .overlay_settings
+                .leader_super_majority_threshold = Some(threshold.into());
+        }
+
+        Ok(self)
+    }
 }

nodes/nomos-node/src/lib.rs

@@ -30,7 +30,7 @@ use overwatch_derive::*;
 use overwatch_rs::services::handle::ServiceHandle;
 
 use crate::blob::Blob;
-pub use config::{Config, HttpArgs, LogArgs, NetworkArgs};
+pub use config::{Config, ConsensusArgs, HttpArgs, LogArgs, NetworkArgs, OverlayArgs};
 pub use tx::Tx;
 
 #[cfg(all(feature = "waku", feature = "libp2p"))]

nodes/nomos-node/src/main.rs

@@ -1,4 +1,7 @@
-use nomos_node::{Config, HttpArgs, LogArgs, NetworkArgs, Nomos, NomosServiceSettings, Tx};
+use nomos_node::{
+    Config, ConsensusArgs, HttpArgs, LogArgs, NetworkArgs, Nomos, NomosServiceSettings,
+    OverlayArgs, Tx,
+};
 
 mod bridges;
 
@@ -31,6 +34,12 @@ struct Args {
     /// Overrides http config.
     #[clap(flatten)]
     http_args: HttpArgs,
+    /// Overrides consensus config.
+    #[clap(flatten)]
+    consensus_args: ConsensusArgs,
+    /// Overrides overlay config.
+    #[clap(flatten)]
+    overlay_args: OverlayArgs,
 }
 
 fn main() -> Result<()> {
@@ -39,10 +48,14 @@ fn main() -> Result<()> {
         log_args,
         http_args,
         network_args,
+        consensus_args,
+        overlay_args,
     } = Args::parse();
     let config = serde_yaml::from_reader::<_, Config>(std::fs::File::open(config)?)?
         .update_log(log_args)?
         .update_http(http_args)?
+        .update_consensus(consensus_args)?
+        .update_overlay(overlay_args)?
         .update_network(network_args)?;
 
     let bridges: Vec<HttpBridge> = vec![