Ecosystem/gupaxx
1
0
Fork 0
mirror of https://github.com/Cyrix126/gupaxx.git synced 2025-01-09 15:39:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

helper: use current values instead of [selected_*] for p2pool/xmrig

Browse source
This commit is contained in:
hinto-janaiyo 2023-02-06 11:32:38 -05:00
parent 55f8c24cc7
commit a629aa6ffe
No known key found for this signature in database
GPG key ID: B1C5A64B80691E45
3 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -1,6 +1,7 @@
# v1.1.2 # v1.1.2
## Fixes ## Fixes
* * **P2Pool/XMRig:** Fixed parsing of `localhost` into `127.0.0.1`
* **P2Pool/XMRig:** Current (non-saved) text-box values are now used instead of "old" selected values for custom nodes/pools
## Bundled Versions ## Bundled Versions
* [`P2Pool v3.0`](https://github.com/SChernykh/p2pool/releases/tag/v3.0) * [`P2Pool v3.0`](https://github.com/SChernykh/p2pool/releases/tag/v3.0)

12
src/helper.rs
View file

@ -423,11 +423,11 @@ impl Helper {
} }
// Else, build the argument // Else, build the argument
} else { } else {
let ip = if state.selected_ip == "localhost" { "127.0.0.1" } else { &state.selected_ip }; let ip = if state.ip == "localhost" { "127.0.0.1" } else { &state.ip };
args.push("--wallet".to_string()); args.push(state.address.clone()); // Wallet args.push("--wallet".to_string()); args.push(state.address.clone()); // Wallet
args.push("--host".to_string()); args.push(ip.to_string()); // IP args.push("--host".to_string()); args.push(ip.to_string()); // IP
args.push("--rpc-port".to_string()); args.push(state.selected_rpc.to_string()); // RPC args.push("--rpc-port".to_string()); args.push(state.rpc.to_string()); // RPC
args.push("--zmq-port".to_string()); args.push(state.selected_zmq.to_string()); // ZMQ args.push("--zmq-port".to_string()); args.push(state.zmq.to_string()); // ZMQ
args.push("--loglevel".to_string()); args.push(state.log_level.to_string()); // Log Level args.push("--loglevel".to_string()); args.push(state.log_level.to_string()); // Log Level
args.push("--out-peers".to_string()); args.push(state.out_peers.to_string()); // Out Peers args.push("--out-peers".to_string()); args.push(state.out_peers.to_string()); // Out Peers
args.push("--in-peers".to_string()); args.push(state.in_peers.to_string()); // In Peers args.push("--in-peers".to_string()); args.push(state.in_peers.to_string()); // In Peers
@ -800,13 +800,13 @@ impl Helper {
// Else, build the argument // Else, build the argument
} else { } else {
// XMRig doesn't understand [localhost] // XMRig doesn't understand [localhost]
let ip = if state.selected_ip == "localhost" || state.selected_ip.is_empty() { "127.0.0.1" } else { &state.selected_ip }; let ip = if state.ip == "localhost" || state.ip.is_empty() { "127.0.0.1" } else { &state.ip };
api_ip = if state.api_ip == "localhost" || state.api_ip.is_empty() { "127.0.0.1".to_string() } else { state.api_ip.to_string() }; api_ip = if state.api_ip == "localhost" || state.api_ip.is_empty() { "127.0.0.1".to_string() } else { state.api_ip.to_string() };
api_port = if state.api_port.is_empty() { "18088".to_string() } else { state.api_port.to_string() }; api_port = if state.api_port.is_empty() { "18088".to_string() } else { state.api_port.to_string() };
let url = format!("{}:{}", ip, state.selected_port); // Combine IP:Port into one string let url = format!("{}:{}", ip, state.port); // Combine IP:Port into one string
args.push("--user".to_string()); args.push(state.address.clone()); // Wallet args.push("--user".to_string()); args.push(state.address.clone()); // Wallet
args.push("--threads".to_string()); args.push(state.current_threads.to_string()); // Threads args.push("--threads".to_string()); args.push(state.current_threads.to_string()); // Threads
args.push("--rig-id".to_string()); args.push(state.selected_rig.to_string()); // Rig ID args.push("--rig-id".to_string()); args.push(state.rig.to_string()); // Rig ID
args.push("--url".to_string()); args.push(url.clone()); // IP/Port args.push("--url".to_string()); args.push(url.clone()); // IP/Port
args.push("--http-host".to_string()); args.push(api_ip.to_string()); // HTTP API IP args.push("--http-host".to_string()); args.push(api_ip.to_string()); // HTTP API IP
args.push("--http-port".to_string()); args.push(api_port.to_string()); // HTTP API Port args.push("--http-port".to_string()); args.push(api_port.to_string()); // HTTP API Port

2
src/xmr.rs
View file

@ -219,7 +219,7 @@ impl PayoutOrd {
let amount_of_lines = log.lines().count(); let amount_of_lines = log.lines().count();
let mut vec: Vec<(String, AtomicUnit, HumanNumber)> = Vec::with_capacity(70 * amount_of_lines); let mut vec: Vec<(String, AtomicUnit, HumanNumber)> = Vec::with_capacity(70 * amount_of_lines);
for line in log.lines() { for line in log.lines() {
debug!("PayoutOrg | Parsing line: [{}]", line); debug!("PayoutOrd | Parsing line: [{}]", line);
vec.push(Self::parse_formatted_payout_line(line, &regex)); vec.push(Self::parse_formatted_payout_line(line, &regex));
} }
*self = Self(vec); *self = Self(vec);