From 719c42249184858ac8e895f726fb33de60c3d206 Mon Sep 17 00:00:00 2001
From: creating2morrow <creating_tomorrow@proton.me>
Date: Thu, 9 Nov 2023 09:18:33 -0500
Subject: [PATCH] validated enable multisig and kex one orchestration

---
 neveko-core/src/message.rs    | 12 ++++--------
 neveko-gui/src/apps/market.rs |  9 +++------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/neveko-core/src/message.rs b/neveko-core/src/message.rs
index 147a0a0..ddb4f86 100644
--- a/neveko-core/src/message.rs
+++ b/neveko-core/src/message.rs
@@ -492,8 +492,7 @@ fn is_fts_clear(r: String) -> bool {
 pub async fn send_prepare_info(orid: &String, contact: &String) {
     let s = db::Interface::open();
     let wallet_name = String::from(orid);
-    let wallet_password =
-        std::env::var(crate::MONERO_WALLET_PASSWORD).unwrap_or(String::from("password"));
+    let wallet_password = utils::empty_string();
     monero::open_wallet(&wallet_name, &wallet_password).await;
     let prepare_info = monero::prepare_wallet().await;
     let k = format!("{}-{}", crate::FTS_JWP_DB_KEY, contact);
@@ -519,8 +518,7 @@ pub async fn send_prepare_info(orid: &String, contact: &String) {
 pub async fn send_make_info(orid: &String, contact: &String, info: Vec<String>) {
     let s = db::Interface::open();
     let wallet_name = String::from(orid);
-    let wallet_password =
-        std::env::var(crate::MONERO_WALLET_PASSWORD).unwrap_or(String::from("password"));
+    let wallet_password = utils::empty_string();
     monero::open_wallet(&wallet_name, &wallet_password).await;
     let make_info = monero::make_wallet(info).await;
     let k = format!("{}-{}", crate::FTS_JWP_DB_KEY, contact);
@@ -543,8 +541,7 @@ pub async fn send_make_info(orid: &String, contact: &String, info: Vec<String>)
 pub async fn send_exchange_info(orid: &String, contact: &String, info: Vec<String>, kex_init: bool) {
     let s = db::Interface::open();
     let wallet_name = String::from(orid);
-    let wallet_password =
-        std::env::var(crate::MONERO_WALLET_PASSWORD).unwrap_or(String::from("password"));
+    let wallet_password = utils::empty_string();
     monero::open_wallet(&wallet_name, &wallet_password).await;
     let exchange_info = monero::exchange_multisig_keys(false, info, &wallet_password).await;
     let k = format!("{}-{}", crate::FTS_JWP_DB_KEY, contact);
@@ -576,8 +573,7 @@ pub async fn send_exchange_info(orid: &String, contact: &String, info: Vec<Strin
 pub async fn send_export_info(orid: &String, contact: &String) {
     let s = db::Interface::open();
     let wallet_name = String::from(orid);
-    let wallet_password =
-        std::env::var(crate::MONERO_WALLET_PASSWORD).unwrap_or(String::from("password"));
+    let wallet_password = utils::empty_string();
     monero::open_wallet(&wallet_name, &wallet_password).await;
     let exchange_info = monero::export_multisig_info().await;
     let k = format!("{}-{}", crate::FTS_JWP_DB_KEY, contact);
diff --git a/neveko-gui/src/apps/market.rs b/neveko-gui/src/apps/market.rs
index 4b4c55d..bbf59fb 100644
--- a/neveko-gui/src/apps/market.rs
+++ b/neveko-gui/src/apps/market.rs
@@ -1497,8 +1497,7 @@ fn send_make_info_req(
             utils::search_gui_db(String::from(crate::GUI_JWP_DB_KEY), String::from(&mediator));
         let v_jwp: String =
             utils::search_gui_db(String::from(crate::GUI_JWP_DB_KEY), String::from(&vendor));
-        let wallet_password =
-            std::env::var(neveko_core::MONERO_WALLET_PASSWORD).unwrap_or(String::from("password"));
+        let wallet_password = utils::empty_string();
         let m_wallet = monero::open_wallet(&w_orid, &wallet_password).await;
         if !m_wallet {
             monero::close_wallet(&w_orid, &wallet_password).await;
@@ -1610,8 +1609,7 @@ fn send_kex_initial_req(
             utils::search_gui_db(String::from(crate::GUI_JWP_DB_KEY), String::from(&mediator));
         let v_jwp: String =
             utils::search_gui_db(String::from(crate::GUI_JWP_DB_KEY), String::from(&vendor));
-        let wallet_password =
-            std::env::var(neveko_core::MONERO_WALLET_PASSWORD).unwrap_or(String::from("password"));
+        let wallet_password = utils::empty_string();
         let m_wallet = monero::open_wallet(&w_orid, &wallet_password).await;
         if !m_wallet {
             monero::close_wallet(&w_orid, &wallet_password).await;
@@ -1722,8 +1720,7 @@ fn send_kex_final_req(
             utils::search_gui_db(String::from(crate::GUI_JWP_DB_KEY), String::from(&mediator));
         let v_jwp: String =
             utils::search_gui_db(String::from(crate::GUI_JWP_DB_KEY), String::from(&vendor));
-        let wallet_password =
-            std::env::var(neveko_core::MONERO_WALLET_PASSWORD).unwrap_or(String::from("password"));
+        let wallet_password = utils::empty_string();
         let m_wallet = monero::open_wallet(&w_orid, &wallet_password).await;
         if !m_wallet {
             monero::close_wallet(&w_orid, &wallet_password).await;