feat: Extend support for env-based configuration

BREAKING CHANGE: `Config::from_env` now returns an `eyre::Result`
eigerco · Apr 17, 2024 · c030b7d · c030b7d
1 parent 97cf2f5
commit c030b7d
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 12 deletions.
diff --git a/crates/cli/src/lib.rs b/crates/cli/src/lib.rs
@@ -9,9 +9,9 @@ pub struct Args {
 }
 
 pub fn get_config(args: Args) -> eyre::Result<Config> {
-    Ok(if let Some(path) = args.config.as_ref() {
-        Config::from_file(path)?
+    if let Some(path) = args.config.as_ref() {
+        Config::from_file(path)
     } else {
         Config::from_env()
-    })
+    }
 }
diff --git a/crates/core/src/config.rs b/crates/core/src/config.rs
@@ -4,7 +4,7 @@ use std::path::PathBuf;
 use std::str::FromStr;
 
 use ethers::types::Address;
-use eyre::{eyre, Result};
+use eyre::{eyre, Context, Result};
 use helios::client::{Client, ClientBuilder};
 use helios::config::checkpoints;
 use helios::config::networks::Network;
@@ -84,25 +84,38 @@ impl Default for Config {
 }
 
 impl Config {
-    pub fn from_env() -> Self {
-        Self {
+    pub fn from_env() -> Result<Self> {
+        fn require_env_var(var_key: &'static str) -> Result<String> {
+            std::env::var(var_key).map_err(|_| eyre!("The \"{}\" env var must be set or a configuration file must be specified", var_key))
+        }
+
+        Ok(Self {
             network: Network::from_str(
                 &std::env::var("NETWORK").unwrap_or_default(),
             )
             .unwrap_or(Network::MAINNET),
-            eth_execution_rpc: std::env::var("ETH_EXECUTION_RPC")
-                .unwrap_or_default(),
-            starknet_rpc: std::env::var("STARKNET_RPC").unwrap_or_default(),
+            eth_execution_rpc: require_env_var("ETH_EXECUTION_RPC")?,
+            starknet_rpc: require_env_var("STARKNET_RPC")?,
             data_dir: PathBuf::from(
                 std::env::var("DATA_DIR").unwrap_or_default(),
             ),
             poll_secs: u64::from_str(
                 &std::env::var("POLL_SECS").unwrap_or_default(),
             )
             .unwrap_or(DEFAULT_POLL_SECS),
-            rpc_addr: rpc_addr(),
-            fee_token_addr: fee_token_addr(),
-        }
+            rpc_addr: if let Ok(addr) = std::env::var("RPC_ADDR") {
+                SocketAddr::from_str(&addr)
+                    .context("Invalid value for `RPC_ADDR`")?
+            } else {
+                rpc_addr()
+            },
+            fee_token_addr: if let Ok(addr) = std::env::var("FEE_TOKEN_ADDR") {
+                FieldElement::from_hex_be(&addr)
+                    .context("Invalid value for `FEE_TOKEN_ADDR`")?
+            } else {
+                fee_token_addr()
+            },
+        })
     }
 
     pub fn from_file(path: &str) -> Result<Self> {