Resolve unconditional sn2-relay connection for non-mainnet validators (#433)

Author: HudsonGraeme

crates/sn2-validator/src/config.rs

@@ -18,6 +18,7 @@ pub struct ValidatorConfig {
     pub user_uid: u16,
     pub relay_enabled: bool,
     pub relay_url: String,
+    pub relay_url_override: bool,
     pub api_miners_pct: u32,
     pub disable_benchmark: bool,
     pub metrics_port: u16,
@@ -80,6 +81,7 @@ impl ValidatorConfig {
             user_uid,
             relay_enabled: !cli.no_relay,
             relay_url,
+            relay_url_override: cli.relay_url.is_some(),
             api_miners_pct: cli.api_miners_pct,
             disable_benchmark: cli.disable_benchmark,
             metrics_port: cli.metrics_port,
@@ -144,6 +146,7 @@ impl ValidatorConfig {
             user_uid: 1,
             relay_enabled: false,
             relay_url: String::new(),
+            relay_url_override: false,
             api_miners_pct: 0,
             disable_benchmark: cli.disable_benchmark,
             metrics_port: cli.metrics_port,

crates/sn2-validator/src/validator_loop/mod.rs

@@ -209,25 +209,42 @@ impl ValidatorLoop {
                 .clone()
                 .ok_or_else(|| anyhow::anyhow!("wallet required in production mode"))?;
             let client = MinerQueryClient::new(wallet.clone())?;
-            let relay = RelayManager::new(
-                config.relay_url.clone(),
-                wallet.clone(),
-                config.relay_enabled,
-                dsperse_tx.clone(),
-                rwr_tx.clone(),
-            );
+            let is_mainnet_validator = config.netuid == DEFAULT_NETUID
+                && config
+                    .metagraph
+                    .get_neuron(config.user_uid)
+                    .is_some_and(|n| n.validator_permit);
+            let relay_reporting_enabled =
+                (IS_RELEASE_BUILD || config.relay_url_override) && is_mainnet_validator;
+            let relay = if relay_reporting_enabled {
+                Some(RelayManager::new(
+                    config.relay_url.clone(),
+                    wallet.clone(),
+                    config.relay_enabled,
+                    dsperse_tx.clone(),
+                    rwr_tx.clone(),
+                ))
+            } else {
+                if !is_mainnet_validator {
+                    info!(
+                        netuid = config.netuid,
+                        "sn2-relay disabled for non-mainnet validator"
+                    );
+                } else {
+                    info!(
+                        version = SOFTWARE_VERSION,
+                        "sn2-relay disabled for non-release build"
+                    );
+                }
+                None
+            };
             let api_reporting_enabled = IS_RELEASE_BUILD || config.proof_api_url.is_some();
             if !api_reporting_enabled {
                 info!(
                     version = SOFTWARE_VERSION,
                     "sn2-api reporting disabled for non-release build"
                 );
             }
-            let is_mainnet_validator = config.netuid == DEFAULT_NETUID
-                && config
-                    .metagraph
-                    .get_neuron(config.user_uid)
-                    .is_some_and(|n| n.validator_permit);
             let stats_enabled =
                 api_reporting_enabled && !config.disable_metric_logging && is_mainnet_validator;
             if api_reporting_enabled && !is_mainnet_validator {
@@ -265,7 +282,7 @@ impl ValidatorLoop {
             };
             (
                 Arc::new(RwLock::new(client)),
-                Some(relay),
+                relay,
                 uploader,
                 reporter,
                 events,