Removed the Option from the SSV API URL

Author: jclapis

crates/common/src/config/mux.rs

@@ -211,7 +211,7 @@ impl MuxKeysLoader {
         &self,
         mux_id: &str,
         chain: Chain,
-        ssv_api_url: Option<Url>,
+        ssv_api_url: Url,
         rpc_url: Option<Url>,
         http_timeout: Duration,
     ) -> eyre::Result<Vec<BlsPublicKey>> {
@@ -254,10 +254,6 @@ impl MuxKeysLoader {
                     .await
                 }
                 NORegistry::SSV => {
-                    let Some(ssv_api_url) = ssv_api_url else {
-                        bail!("SSV registry requires SSV API URL to be set in the PBS config");
-                    };
-
                     fetch_ssv_pubkeys(
                         ssv_api_url,
                         chain,

crates/common/src/config/pbs.rs

@@ -125,7 +125,7 @@ pub struct PbsConfig {
     pub rpc_url: Option<Url>,
     /// URL for the SSV network API
     #[serde(default = "default_ssv_api_url")]
-    pub ssv_api_url: Option<Url>,
+    pub ssv_api_url: Url,
     /// Timeout for HTTP requests in seconds
     #[serde(default = "default_u64::<HTTP_TIMEOUT_SECONDS_DEFAULT>")]
     pub http_timeout_seconds: u64,
@@ -398,6 +398,6 @@ pub async fn load_pbs_custom_config<T: DeserializeOwned>() -> Result<(PbsModuleC
 }
 
 /// Default URL for the SSV network API
-fn default_ssv_api_url() -> Option<Url> {
-    Some(Url::parse("https://api.ssv.network/api/v4").expect("default URL is valid"))
+fn default_ssv_api_url() -> Url {
+    Url::parse("https://api.ssv.network/api/v4").expect("default URL is valid")
 }

tests/src/utils.rs

@@ -17,6 +17,7 @@ use cb_common::{
     utils::{bls_pubkey_from_hex, default_host},
 };
 use eyre::Result;
+use url::Url;
 
 pub fn get_local_address(port: u16) -> String {
     format!("http://0.0.0.0:{port}")
@@ -78,7 +79,7 @@ pub fn get_pbs_static_config(port: u16) -> PbsConfig {
         min_bid_wei: U256::ZERO,
         late_in_slot_time_ms: u64::MAX,
         extra_validation_enabled: false,
-        ssv_api_url: None,
+        ssv_api_url: Url::parse("https://example.net").unwrap(),
         rpc_url: None,
         http_timeout_seconds: 10,
         register_validator_retry_limit: u32::MAX,

tests/tests/pbs_mux_refresh.rs

@@ -86,7 +86,7 @@ async fn test_auto_refresh() -> Result<()> {
 
     // Set up the PBS config
     let mut pbs_config = get_pbs_static_config(pbs_port);
-    pbs_config.ssv_api_url = Some(ssv_api_url.clone());
+    pbs_config.ssv_api_url = ssv_api_url.clone();
     pbs_config.mux_registry_refresh_interval_seconds = 1; // Refresh the mux every second
     let (mux_lookup, registry_muxes) = muxes.validate_and_fill(chain, &pbs_config).await?;
     let relays = vec![default_relay.clone()]; // Default relay only