Ecosystem/gupaxx
1
0
Fork 0
mirror of https://github.com/Cyrix126/gupaxx.git synced 2025-04-04 05:29:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: log of algo and decision

Browse source
This commit is contained in:
Cyrix126 2024-11-01 10:23:14 +01:00
parent 1ded27995c
commit 20b8944fa5
2 changed files with 15 additions and 7 deletions
src
helper/xvb
algorithm.rs
utils
constants.rs

21
src/helper/xvb/algorithm.rs
View file

@ -3,6 +3,7 @@ use crate::helper::xvb::api_url_xmrig;
use crate::helper::xvb::current_controllable_hr;
use crate::miscs::output_console;
use crate::miscs::output_console_without_time;
use crate::XVB_MIN_TIME_SEND;
use std::{
sync::{Arc, Mutex},
time::Duration,
@ -160,7 +161,7 @@ impl<'a> Algorithm<'a> {
&gui_api_xvb.lock().unwrap().xvb_sent_last_hour_samples,
);
let xvb_external_hashrate = (xvb_1h_avg - xvb_avg_last_hour_hashrate).max(0.0);
info!("xvb external hashrate({xvb_external_hashrate}) = p2ool_total_hashrate({xvb_1h_avg}) - xvb_avg_last_hour_hashrate({xvb_avg_last_hour_hashrate})");
info!("xvb external hashrate({xvb_external_hashrate}) = xvb_1h_avg({xvb_1h_avg}) - xvb_avg_last_hour_hashrate({xvb_avg_last_hour_hashrate})");
let stats = Stats {
share,
hashrate_xmrig,
@ -383,7 +384,7 @@ impl<'a> Algorithm<'a> {
// xvb process watch this algo handle to see if process is finished or not.
info!(
"Algorithm | algo sleep for {} seconds while mining on P2pool",
"Algorithm | algo sleep for {} seconds while mining on XvB",
self.stats.needed_time_xvb
);
sleep(Duration::from_secs(self.stats.needed_time_xvb.into())).await;
@ -556,17 +557,23 @@ impl<'a> Algorithm<'a> {
crate::helper::ProcessName::Xvb,
);
info!("Algorithm | There is a share in p2pool and 24H avg XvB is achieved. Sending {} seconds to XvB!", self.stats.needed_time_xvb);
*self.time_donated.lock().unwrap() = self.stats.needed_time_xvb;
// do not switch pool for a few seconds, let's make 6 seconds minimum.
match self.stats.needed_time_xvb {
x if x <= 6 => {
x if x <= XVB_MIN_TIME_SEND => {
info!("Algorithm | Needed time: {x} to send on XvB is less than minimum time to send, sending all HR to p2pool");
self.send_all_p2pool().await;
}
x if x <= XVB_TIME_ALGO - XVB_MIN_TIME_SEND => {
info!("Algorithm | There is a share in p2pool and 24H avg XvB is achieved. Sending {} seconds to XvB!", self.stats.needed_time_xvb);
self.target_p2pool_node().await;
self.sleep_then_update_node_xmrig().await;
}
x if x <= XVB_TIME_ALGO - 6 => self.send_all_p2pool().await,
x if x >= XVB_TIME_ALGO - 6 => self.send_all_xvb().await,
x if x >= XVB_TIME_ALGO - XVB_MIN_TIME_SEND => {
info!("Algorithm | time : {x} seconds for P2Pool is less than minimum time to send, sending all to XvB");
self.send_all_xvb().await;
}
_ => error!("should not be possible"),
};
}

1
src/utils/constants.rs
View file

@ -515,6 +515,7 @@ pub const XVB_URL_RULES: &str = "https://xmrvsbeast.com/p2pool/rules.html";
// buffer in percentage of HR to have plus the requirement.
pub const XVB_SIDE_MARGIN_1H: f32 = 1.20;
pub const XVB_TIME_ALGO: u32 = 600;
pub const XVB_MIN_TIME_SEND: u32 = (XVB_TIME_ALGO as f32 * 0.01) as u32;
pub const XVB_TOKEN_LEN: usize = 9;
pub const XVB_HERO_SELECT: &str =
"Donate as much as possible while keeping a share on p2pool, increases the odds of your round winning\nWhen modified, the algorithm will use the new choice at the next decision.";