Ecosystem/gupaxx
1
0
Fork 0
mirror of https://github.com/Cyrix126/gupaxx.git synced 2025-01-19 12:24:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: advanced XvB: manual XvB and P2Pool HR don't use proxy values when possible

Browse source
This commit is contained in:
Cyrix126 2024-11-12 12:09:43 +01:00
parent c80c6f8186
commit 068b11afac
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/app/panels/middle/mod.rs
View file

@ -184,7 +184,7 @@ path_xmr: {:#?}\n
} }
Tab::Xvb => { Tab::Xvb => {
debug!("App | Entering [XvB] Tab"); debug!("App | Entering [XvB] Tab");
crate::disk::state::Xvb::show(&mut self.state.xvb, self.size, &self.state.p2pool.address, ctx, ui, &self.xvb_api, &self.xmrig_api, xvb_is_running); crate::disk::state::Xvb::show(&mut self.state.xvb, self.size, &self.state.p2pool.address, ctx, ui, &self.xvb_api, &self.xmrig_api, &self.xmrig_proxy_api, xvb_is_running);
} }
} }
}); });

8
src/app/panels/middle/xvb.rs
View file

@ -8,6 +8,7 @@ use readable::up::Uptime;
use crate::disk::state::{ManualDonationLevel, ManualDonationMetric, XvbMode}; use crate::disk::state::{ManualDonationLevel, ManualDonationMetric, XvbMode};
use crate::helper::xrig::xmrig::PubXmrigApi; use crate::helper::xrig::xmrig::PubXmrigApi;
use crate::helper::xrig::xmrig_proxy::PubXmrigProxyApi;
use crate::helper::xvb::priv_stats::RuntimeMode; use crate::helper::xvb::priv_stats::RuntimeMode;
use crate::helper::xvb::PubXvbApi; use crate::helper::xvb::PubXvbApi;
use crate::regex::num_lines; use crate::regex::num_lines;
@ -38,6 +39,7 @@ impl crate::disk::state::Xvb {
ui: &mut egui::Ui, ui: &mut egui::Ui,
api: &Arc<Mutex<PubXvbApi>>, api: &Arc<Mutex<PubXvbApi>>,
gui_api_xmrig: &Arc<Mutex<PubXmrigApi>>, gui_api_xmrig: &Arc<Mutex<PubXmrigApi>>,
gui_api_xp: &Arc<Mutex<PubXmrigProxyApi>>,
is_alive: bool, is_alive: bool,
) { ) {
egui::ScrollArea::vertical().show(ui, |ui| { egui::ScrollArea::vertical().show(ui, |ui| {
@ -174,9 +176,11 @@ impl crate::disk::state::Xvb {
ManualDonationMetric::Kilo => 1_000_000.0, ManualDonationMetric::Kilo => 1_000_000.0,
ManualDonationMetric::Mega => 1_000_000_000.0 ManualDonationMetric::Mega => 1_000_000_000.0
}; };
// use proxy HR in priority, or use xmrig or default.
let mut hashrate_xmrig = { let mut hashrate_xmrig = {
if gui_api_xmrig.lock().unwrap().hashrate_raw_15m > 0.0 { if gui_api_xp.lock().unwrap().hashrate_10m > 0.0 {
gui_api_xp.lock().unwrap().hashrate_10m
} else if gui_api_xmrig.lock().unwrap().hashrate_raw_15m > 0.0 {
gui_api_xmrig.lock().unwrap().hashrate_raw_15m gui_api_xmrig.lock().unwrap().hashrate_raw_15m
} else if gui_api_xmrig.lock().unwrap().hashrate_raw_1m > 0.0 { } else if gui_api_xmrig.lock().unwrap().hashrate_raw_1m > 0.0 {
gui_api_xmrig.lock().unwrap().hashrate_raw_1m gui_api_xmrig.lock().unwrap().hashrate_raw_1m