From 5a7b19aeb6aa61ed35b660d5e2e0e7d9e643cb22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bogdan-=C8=98tefan=20Neac=C5=9Fu?= <bogdan@nymtech.net>
Date: Thu, 21 Jul 2022 17:03:14 +0300
Subject: [PATCH] Nym connect use config from env (mainnet defaulted (#1471)

---
 clients/socks5/src/commands/mod.rs      | 2 +-
 nym-connect/Cargo.lock                  | 1 -
 nym-connect/src-tauri/Cargo.toml        | 2 +-
 nym-connect/src-tauri/src/config/mod.rs | 9 +++++++--
 nym-connect/src-tauri/src/main.rs       | 2 ++
 nym-connect/src-tauri/src/state.rs      | 2 +-
 nym-connect/src-tauri/src/tasks.rs      | 2 +-
 7 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/clients/socks5/src/commands/mod.rs b/clients/socks5/src/commands/mod.rs
index 9ff48199a7..f9df56bc64 100644
--- a/clients/socks5/src/commands/mod.rs
+++ b/clients/socks5/src/commands/mod.rs
@@ -96,7 +96,7 @@ pub(crate) async fn execute(args: &Cli) {
     }
 }
 
-fn parse_validators(raw: &str) -> Vec<Url> {
+pub fn parse_validators(raw: &str) -> Vec<Url> {
     raw.split(',')
         .map(|raw_validator| {
             raw_validator
diff --git a/nym-connect/Cargo.lock b/nym-connect/Cargo.lock
index e63f3b9eea..1725bea89d 100644
--- a/nym-connect/Cargo.lock
+++ b/nym-connect/Cargo.lock
@@ -3199,7 +3199,6 @@ dependencies = [
  "cosmwasm-std",
  "fixed",
  "log",
- "network-defaults",
  "schemars",
  "serde",
  "serde_repr",
diff --git a/nym-connect/src-tauri/Cargo.toml b/nym-connect/src-tauri/Cargo.toml
index 23bfeed153..8166766b8c 100644
--- a/nym-connect/src-tauri/Cargo.toml
+++ b/nym-connect/src-tauri/Cargo.toml
@@ -39,7 +39,7 @@ tokio = { version = "1.19.1", features = ["sync", "time"] }
 url = "2.2"
 
 client-core = { path = "../../clients/client-core" }
-config = { path = "../../common/config" }
+config-common = { path = "../../common/config", package = "config" }
 nym-socks5-client = { path = "../../clients/socks5" }
 topology = { path = "../../common/topology" }
 
diff --git a/nym-connect/src-tauri/src/config/mod.rs b/nym-connect/src-tauri/src/config/mod.rs
index 5f4ce22e21..f1fb18bc5e 100644
--- a/nym-connect/src-tauri/src/config/mod.rs
+++ b/nym-connect/src-tauri/src/config/mod.rs
@@ -6,8 +6,8 @@ use tap::TapFallible;
 use tokio::sync::RwLock;
 
 use client_core::config::Config as BaseConfig;
-use config::NymConfig;
-use nym_socks5::client::config::Config as Socks5Config;
+use config_common::NymConfig;
+use nym_socks5::{client::config::Config as Socks5Config, commands::parse_validators};
 
 use crate::{
     error::{BackendError, Result},
@@ -134,6 +134,11 @@ pub async fn init_socks5_config(provider_address: String, chosen_gateway_id: Str
     config
         .get_base_mut()
         .with_eth_private_key(DEFAULT_ETH_PRIVATE_KEY);
+    if let Ok(raw_validators) = std::env::var(config_common::defaults::var_names::API_VALIDATOR) {
+        config
+            .get_base_mut()
+            .set_custom_validator_apis(parse_validators(&raw_validators));
+    }
 
     let gateway = setup_gateway(
         &id,
diff --git a/nym-connect/src-tauri/src/main.rs b/nym-connect/src-tauri/src/main.rs
index 795533287c..e1117c7516 100644
--- a/nym-connect/src-tauri/src/main.rs
+++ b/nym-connect/src-tauri/src/main.rs
@@ -5,6 +5,7 @@
 
 use std::sync::Arc;
 
+use config_common::defaults::setup_env;
 use tauri::Menu;
 use tokio::sync::RwLock;
 
@@ -24,6 +25,7 @@ mod window;
 
 fn main() {
     setup_logging();
+    setup_env(None);
     println!("Starting up...");
 
     // As per breaking change description here
diff --git a/nym-connect/src-tauri/src/state.rs b/nym-connect/src-tauri/src/state.rs
index d9a14dc9d0..2fce640487 100644
--- a/nym-connect/src-tauri/src/state.rs
+++ b/nym-connect/src-tauri/src/state.rs
@@ -1,6 +1,6 @@
 use std::time::Duration;
 
-use ::config::NymConfig;
+use ::config_common::NymConfig;
 use futures::SinkExt;
 use tap::TapFallible;
 use tauri::Manager;
diff --git a/nym-connect/src-tauri/src/tasks.rs b/nym-connect/src-tauri/src/tasks.rs
index 8e44f1bb40..3729d4b4da 100644
--- a/nym-connect/src-tauri/src/tasks.rs
+++ b/nym-connect/src-tauri/src/tasks.rs
@@ -4,7 +4,7 @@ use std::sync::Arc;
 use tap::TapFallible;
 use tokio::sync::RwLock;
 
-use config::NymConfig;
+use config_common::NymConfig;
 #[cfg(not(feature = "coconut"))]
 use nym_socks5::client::NymClient as Socks5NymClient;
 use nym_socks5::client::{config::Config as Socks5Config, Socks5ControlMessageSender};