feat: refactor algorithm

- easier to understand/better separation of logic
- more features available

Author: Cyrix126

Cargo.lock

@@ -99,6 +99,9 @@ listeners = "0.3"
 notify-rust = "4.11"
 ## handle Ctrl+C for daemon mode
 ctrlc = {version="3.5", features=["termination"]}
+
+tokio-stream = {version = "0.1", default-features=false}
+thiserror = "2.0"
 # Unix dependencies
 [target.'cfg(unix)'.dependencies]
 tar = "0.4.44"

Cargo.toml

@@ -46,7 +46,7 @@ use crate::helper::xrig::xmrig::PubXmrigApi;
 use crate::helper::xrig::xmrig_proxy::ImgProxy;
 use crate::helper::xrig::xmrig_proxy::PubXmrigProxyApi;
 use crate::helper::xvb::PubXvbApi;
-use crate::helper::xvb::priv_stats::RuntimeMode;
+use crate::helper::xvb::algorithm::XvbMode;
 use crate::inits::init_text_styles;
 use crate::miscs::cmp_f64;
 use crate::miscs::get_exe;
@@ -712,24 +712,14 @@ impl App {
         // Set saved prefer local node to runtime
         app.p2pool_api.lock().unwrap().prefer_local_node = app.state.p2pool.prefer_local_node;
 
-        // Set saved choice of use of sidechain HR
-        app.xvb_api.lock().unwrap().use_p2pool_sidechain_hr = app.state.xvb.use_p2pool_sidechain_hr;
-
         // Set saved choice for notifications
         app.notifications_api.lock().unwrap().notifications = app.state.gupax.notifications.clone();
 
-        // Set saved Hero mode to runtime.
+        // Set saved XvB settings to XvB API
+        // Need to save to pub as we read it as instant data
         debug!("Setting runtime_mode & runtime_manual_amount");
-        // apply hero if simple mode saved with checkbox true, will let default to auto otherwise
-        if app.state.xvb.simple {
-            if app.state.xvb.simple_hero_mode {
-                app.xvb_api.lock().unwrap().stats_priv.runtime_mode = RuntimeMode::Hero
-            }
-        } else {
-            app.xvb_api.lock().unwrap().stats_priv.runtime_mode = app.state.xvb.mode.clone().into();
-        }
-        app.xvb_api.lock().unwrap().stats_priv.runtime_manual_amount =
-            app.state.xvb.manual_amount_raw;
+        app.xvb_api.lock().unwrap().algo_config = app.state.xvb.algo_config.clone();
+        app.xvb_api.lock().unwrap().runtime_mode = XvbMode::from(&app.state.xvb);
 
         drop(og); // Unlock [og]
 

src/app/mod.rs

@@ -7,6 +7,7 @@ use crate::disk::node::Node;
 use crate::disk::pool::Pool;
 use crate::disk::state::{Gupax, GupaxTheme, State};
 use crate::helper::node::{CheckLocalOutsideNode, spawn_local_outside_checker};
+use crate::helper::xvb::algorithm::XvbMode;
 use crate::helper::{Helper, ProcessName, ProcessSignal, ProcessState};
 use crate::utils::constants::*;
 use crate::utils::errors::{ErrorButtons, ErrorFerris};
@@ -531,7 +532,7 @@ impl crate::app::App {
         );
     }
     fn xvb_submenu(&mut self, ui: &mut Ui) {
-        Self::simple_advanced_submenu(ui, &mut self.state.xvb.simple, (XVB_SIMPLE, XVB_ADVANCED));
+        self.simple_advanced_submenu_xvb(ui, (XVB_SIMPLE, XVB_ADVANCED));
     }
     fn status_submenu(state_submenu: &mut SubmenuStatus, ui: &mut Ui) {
         ui.group(|ui| {
@@ -582,6 +583,38 @@ impl crate::app::App {
         });
     }
 
+    fn simple_advanced_submenu_xvb(&mut self, ui: &mut Ui, hover_text: (&str, &str)) {
+        let spacing = spacing(ui);
+        let width = ((ui.available_width() - spacing) / 4.0).max(0.0);
+
+        ui.group(|ui| {
+            if ui
+                .add_sized(
+                    [width, ui.available_height()],
+                    Button::selectable(self.state.xvb.simple, "Simple"),
+                )
+                // .selectable_label(*value, "Simple")
+                .on_hover_text(hover_text.0)
+                .clicked()
+            {
+                self.state.xvb.simple = true;
+                self.xvb_api.lock().unwrap().runtime_mode = XvbMode::from(&self.state.xvb);
+            }
+            ui.separator();
+            if ui
+                .add_sized(
+                    [width, ui.available_height()],
+                    Button::selectable(!self.state.xvb.simple, "Advanced"),
+                )
+                // .selectable_label(*value, "Advanced")
+                .on_hover_text(hover_text.1)
+                .clicked()
+            {
+                self.state.xvb.simple = false;
+                self.xvb_api.lock().unwrap().runtime_mode = XvbMode::from(&self.state.xvb);
+            }
+        });
+    }
     fn simple_advanced_submenu(ui: &mut Ui, simple: &mut bool, hover_text: (&str, &str)) {
         let spacing = spacing(ui);
         let width = ((ui.available_width() - spacing) / 4.0).max(0.0);

src/app/panels/bottom.rs

@@ -158,8 +158,6 @@ impl crate::app::App {
                         ctx,
                         ui,
                         &self.xvb_api,
-                        &self.xmrig_api,
-                        &self.xmrig_proxy_api,
                         states.is_alive(ProcessName::Xvb),
                     );
                 }