Compare commits

...
4 Commits
Author SHA1 Message Date
noahandClaude Opus 4.8 fadd851e04 asic-rs telemetry T3-fan: miner-level fan duty cycle (fan speed %)
Round 19 #10 / #8 telemetry extension. Adds the fan duty cycle as a miner-level
percentage -- the normalized fan-load indicator the GUI wanted alongside per-fan
RPMs. No firmware exposes a maximum fan RPM, so a true actual/maximum pair is not
possible; the duty cycle is the closest normalized signal.

Core (asic-rs-core):
- New DataField::FanSpeedPercent; MinerData gains fan_speed_percent (Option<f64>).
- Modeled as a top-level miner-level value (most firmwares report a single duty),
  so FanData is untouched -- no Eq removal / literal churn across its 17 crates.
- Rides the existing GetFans trait via a defaulted parse_fan_speed_percent method
  (no supertrait blast radius); parse_data wires it in.

Backends (read already-fetched commands, no extra round-trips):
- ePIC: summary /Fans/Fans Speed (single %).
- LuxOS: max of FANS[].Speed.
- Braiins v25_07 + v26_04: max of cooling fans[].target_speed_ratio x 100.
- Antminer (pwm via config) and VNish (fan_duty) have no data fixtures -> left for a
  live-verified pass; WhatsMiner is firmware-locked -> None.

GUI: new "Fan %" column (right-aligned, Cooling category, auto-hidden when empty).
MinerRow gains fan_speed_percent; to_row reads it. ALL_COLUMNS 67 -> 68.

Fixture tests: epic, luxminer, braiins v26_04 assert the parsed percentage. Patch 0027.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Djv3oncM4LxTS5tb61Ako6
2026-09-23 16:28:14 -06:00
alkane-ci 24f9d9682d ci: refresh README badges [skip release] 2026-09-23 22:10:04 +00:00
noahandClaude Opus 4.8 3f9fc4a24b asic-rs telemetry T2b: cumulative share stats (difficulty acc/rej, stale, blocks)
Round 19 #10 telemetry extension, tier 2b. Adds the cumulative share statistics
from item #10 end to end: difficulty-weighted accepted/rejected work, raw stale
share count, and blocks found.

Core (asic-rs-core):
- New ShareSummary sub-struct (data/share.rs) with a parse_cgminer_share_summary
  helper reading a cgminer/btminer SUMMARY[0] object.
- New DataField::ShareSummary; MinerData gains share_summary.
- Rides the existing GetBestShare trait via a defaulted parse_share_summary method
  (no new supertrait bound, no per-backend empty impl); parse_data wires it in.

Backends (read the already-fetched SUMMARY, so no extra round-trips; these are
miner-level aggregates -> top-level MinerData fields, not per-pool PoolData):
- Antminer v2020 + v2023_07, LuxOS, WhatsMiner V1 + V2 override parse_share_summary.
- Braiins (no cumulative difficulty), ePIC (current difficulty only), WhatsMiner V3
  and VNish expose none and inherit None -- fixtures confirm.

GUI: four new columns (Diff acc / Diff rej / Stale / Blocks), right-aligned, in the
Pools category, auto-hidden when empty. MinerRow gains the four fields; to_row reads
them from share_summary. ALL_COLUMNS 63 -> 67.

Fixture tests: whatsminer v1 and antminer v2020 assert the parsed values. Patch 0026.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Djv3oncM4LxTS5tb61Ako6
2026-09-23 15:51:57 -06:00
alkane-ci 8ab607de6c ci: refresh README badges [skip release] 2026-09-23 21:30:23 +00:00
25 changed files with 1028 additions and 26 deletions
+9 -9
View File
@@ -1,11 +1,11 @@
{
"bench_parse_line_near_max_addrs": 8789980.0,
"bench_parse_targets_many_ranges_near_cap": 167614817.0,
"bench_render_cells": 16546104.0,
"bench_sort_by_each_column": 2415723.0,
"bench_targets_to_cidrs_large_range": 1664048.0,
"bench_upsert_cold_start_population": 46439419.0,
"bench_view_pipeline": 743132.0,
"bench_view_pipeline_default_sort": 1348836.0,
"bench_view_pipeline_with_filter": 897779.0
"bench_parse_line_near_max_addrs": 3356800.0,
"bench_parse_targets_many_ranges_near_cap": 169232137.0,
"bench_render_cells": 15101462.0,
"bench_sort_by_each_column": 2530926.0,
"bench_targets_to_cidrs_large_range": 1971478.0,
"bench_upsert_cold_start_population": 53646037.0,
"bench_view_pipeline": 473927.0,
"bench_view_pipeline_default_sort": 1258383.0,
"bench_view_pipeline_with_filter": 880919.0
}
+4 -4
View File
@@ -1,5 +1,5 @@
<svg xmlns="http://www.w3.org/2000/svg" width="147.5" height="20" role="img" aria-label="bench: -30.5% vs prev">
<title>bench: -30.5% vs prev</title>
<svg xmlns="http://www.w3.org/2000/svg" width="147.5" height="20" role="img" aria-label="bench: -24.4% vs prev">
<title>bench: -24.4% vs prev</title>
<linearGradient id="s" x2="0" y2="100%">
<stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
<stop offset="1" stop-opacity=".1"/>
@@ -13,7 +13,7 @@
<g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" font-size="11">
<text x="22.2" y="15" fill="#010101" fill-opacity=".3">bench</text>
<text x="22.2" y="14">bench</text>
<text x="96.0" y="15" fill="#010101" fill-opacity=".3">-30.5% vs prev</text>
<text x="96.0" y="14">-30.5% vs prev</text>
<text x="96.0" y="15" fill="#010101" fill-opacity=".3">-24.4% vs prev</text>
<text x="96.0" y="14">-24.4% vs prev</text>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 952 B

After

Width:  |  Height:  |  Size: 952 B

+4 -4
View File
@@ -1,5 +1,5 @@
<svg xmlns="http://www.w3.org/2000/svg" width="141.0" height="20" role="img" aria-label="lines of code: 13.3k">
<title>lines of code: 13.3k</title>
<svg xmlns="http://www.w3.org/2000/svg" width="141.0" height="20" role="img" aria-label="lines of code: 13.5k">
<title>lines of code: 13.5k</title>
<linearGradient id="s" x2="0" y2="100%">
<stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
<stop offset="1" stop-opacity=".1"/>
@@ -13,7 +13,7 @@
<g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" font-size="11">
<text x="48.2" y="15" fill="#010101" fill-opacity=".3">lines of code</text>
<text x="48.2" y="14">lines of code</text>
<text x="118.8" y="15" fill="#010101" fill-opacity=".3">13.3k</text>
<text x="118.8" y="14">13.3k</text>
<text x="118.8" y="15" fill="#010101" fill-opacity=".3">13.5k</text>
<text x="118.8" y="14">13.5k</text>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 952 B

After

Width:  |  Height:  |  Size: 952 B

+60 -3
View File
@@ -566,6 +566,9 @@ pub struct MinerRow {
/// Individual cooling-fan RPMs (empty if unknown). PSU fan is tracked
/// separately below since it is not part of the cooling-fan set.
pub fan_rpms: Vec<f64>,
/// Miner-level fan duty cycle as a percentage (round 19 #10, T3); `None` when
/// the firmware does not report it (no firmware exposes a maximum RPM).
pub fan_speed_percent: Option<f64>,
pub psu_fan_rpm: f64,
pub fan_count: Option<u32>,
pub expected_fans: Option<u32>,
@@ -590,6 +593,13 @@ pub struct MinerRow {
/// (round 19 #10). `None` when the firmware reports neither.
pub accepted_shares: Option<u64>,
pub rejected_shares: Option<u64>,
/// Cumulative share statistics from the miner summary (round 19 #10, T2):
/// difficulty-weighted accepted / rejected work, raw stale count, and blocks
/// found. `None` where the firmware does not report the value.
pub difficulty_accepted: Option<f64>,
pub difficulty_rejected: Option<f64>,
pub stale_shares: Option<u64>,
pub found_blocks: Option<u64>,
// state
pub uptime_secs: u64,
pub light_flashing: Option<bool>,
@@ -1071,6 +1081,10 @@ pub enum Column {
Fan2,
Fan3,
Fan4,
/// Miner-level fan duty cycle % (round 19 #10, T3). No firmware exposes a
/// maximum RPM, so this normalized duty cycle is the fan-load indicator.
/// Populated on ePIC, LuxOS, and Braiins; others leave it empty (auto-hidden).
FanSpeedPercent,
Firmware,
FwVersion,
Worker,
@@ -1130,6 +1144,14 @@ pub enum Column {
Accepted,
Rejected,
RejectRatio,
/// Cumulative share statistics (round 19 #10, T2): difficulty-weighted
/// accepted / rejected work, raw stale count, and blocks found. Populated on
/// the cgminer family (Antminer, LuxOS, WhatsMiner V1/V2); other firmwares
/// leave them empty (auto-hidden).
DiffAccepted,
DiffRejected,
StaleShares,
Blocks,
/// Per-hashboard hashrate / voltage / frequency, slash-joined like Chip temp.
BoardHashrate,
BoardVoltage,
@@ -1145,7 +1167,7 @@ pub enum Column {
/// Every column, in registry order. Ip first, then the default-visible set
/// (UI-SPEC order), then all remaining metrics.
pub const ALL_COLUMNS: [Column; 63] = [
pub const ALL_COLUMNS: [Column; 68] = [
Column::Ip,
Column::Hashrate,
Column::Hashrate1m,
@@ -1159,6 +1181,7 @@ pub const ALL_COLUMNS: [Column; 63] = [
Column::Fan2,
Column::Fan3,
Column::Fan4,
Column::FanSpeedPercent,
Column::Firmware,
Column::FwVersion,
// Pool account (the part before the dot) before Worker (the rig part after
@@ -1201,6 +1224,10 @@ pub const ALL_COLUMNS: [Column; 63] = [
Column::Accepted,
Column::Rejected,
Column::RejectRatio,
Column::DiffAccepted,
Column::DiffRejected,
Column::StaleShares,
Column::Blocks,
Column::BoardHashrate,
Column::BoardVoltage,
Column::BoardFrequency,
@@ -1246,10 +1273,15 @@ impl Column {
Column::Fan2 => "Fan 2 (RPM)",
Column::Fan3 => "Fan 3 (RPM)",
Column::Fan4 => "Fan 4 (RPM)",
Column::FanSpeedPercent => "Fan %",
Column::Target => "Target",
Column::Accepted => "Accepted",
Column::Rejected => "Rejected",
Column::RejectRatio => "Reject %",
Column::DiffAccepted => "Diff acc",
Column::DiffRejected => "Diff rej",
Column::StaleShares => "Stale",
Column::Blocks => "Blocks",
Column::BoardHashrate => "Board HR",
Column::BoardVoltage => "Board V",
Column::BoardFrequency => "Board freq",
@@ -1316,9 +1348,12 @@ impl Column {
Column::Power => 90,
Column::ChipTemp | Column::FluidTemp | Column::EnvTemp | Column::OutletTemp => 95,
Column::Fan1 | Column::Fan2 | Column::Fan3 | Column::Fan4 | Column::PsuFan => 90,
Column::FanSpeedPercent => 80,
Column::Target => 110,
Column::Accepted | Column::Rejected => 100,
Column::RejectRatio => 90,
Column::DiffAccepted | Column::DiffRejected => 110,
Column::StaleShares | Column::Blocks => 80,
Column::BoardHashrate | Column::BoardVoltage | Column::BoardFrequency => 130,
Column::PsuVersion => 100,
Column::PsuSerial => 150,
@@ -1378,9 +1413,14 @@ impl Column {
| Column::Fan2
| Column::Fan3
| Column::Fan4
| Column::FanSpeedPercent
| Column::Accepted
| Column::Rejected
| Column::RejectRatio
| Column::DiffAccepted
| Column::DiffRejected
| Column::StaleShares
| Column::Blocks
| Column::BoardHashrate
| Column::BoardVoltage
| Column::BoardFrequency
@@ -1460,9 +1500,16 @@ impl Column {
Column::Fan2 => SortKey::Num(r.fan_rpms.get(1).copied().unwrap_or(none)),
Column::Fan3 => SortKey::Num(r.fan_rpms.get(2).copied().unwrap_or(none)),
Column::Fan4 => SortKey::Num(r.fan_rpms.get(3).copied().unwrap_or(none)),
Column::FanSpeedPercent => SortKey::Num(r.fan_speed_percent.unwrap_or(none)),
Column::Accepted => SortKey::Num(r.accepted_shares.map(|v| v as f64).unwrap_or(none)),
Column::Rejected => SortKey::Num(r.rejected_shares.map(|v| v as f64).unwrap_or(none)),
Column::RejectRatio => SortKey::Num(r.reject_ratio().unwrap_or(none)),
Column::DiffAccepted => SortKey::Num(r.difficulty_accepted.unwrap_or(none)),
Column::DiffRejected => SortKey::Num(r.difficulty_rejected.unwrap_or(none)),
Column::StaleShares => {
SortKey::Num(r.stale_shares.map(|v| v as f64).unwrap_or(none))
}
Column::Blocks => SortKey::Num(r.found_blocks.map(|v| v as f64).unwrap_or(none)),
Column::BoardHashrate => SortKey::Num(avg_or(&r.board_hashrates, none)),
Column::BoardVoltage => SortKey::Num(avg_positive(&r.board_voltages, none)),
Column::BoardFrequency => SortKey::Num(avg_positive(&r.board_frequencies, none)),
@@ -1555,10 +1602,19 @@ impl Column {
Column::Fan2 => r.fan_rpms.get(1).map(|&v| format_fan_rpm(v)).unwrap_or_default(),
Column::Fan3 => r.fan_rpms.get(2).map(|&v| format_fan_rpm(v)).unwrap_or_default(),
Column::Fan4 => r.fan_rpms.get(3).map(|&v| format_fan_rpm(v)).unwrap_or_default(),
Column::FanSpeedPercent => {
r.fan_speed_percent.map(|v| format!("{v:.0}%")).unwrap_or_default()
}
Column::Target => r.tuning_target_label.clone().unwrap_or_default(),
Column::Accepted => r.accepted_shares.map(|v| v.to_string()).unwrap_or_default(),
Column::Rejected => r.rejected_shares.map(|v| v.to_string()).unwrap_or_default(),
Column::RejectRatio => r.reject_ratio().map(|v| format!("{v:.2}%")).unwrap_or_default(),
// Difficulty-weighted work (SI-formatted like Best share); raw stale /
// block counts as plain integers (round 19 #10, T2).
Column::DiffAccepted => r.difficulty_accepted.map(|v| format_si(v, "")).unwrap_or_default(),
Column::DiffRejected => r.difficulty_rejected.map(|v| format_si(v, "")).unwrap_or_default(),
Column::StaleShares => r.stale_shares.map(|v| v.to_string()).unwrap_or_default(),
Column::Blocks => r.found_blocks.map(|v| v.to_string()).unwrap_or_default(),
// Per-hashboard hashrate / voltage / frequency, slash-joined like Chip
// temp; "-" for a board with no reading, blank when none at all.
Column::BoardHashrate => join_board(&r.board_hashrates, |v| {
@@ -1664,13 +1720,14 @@ impl Column {
(4, "Temperature")
}
Column::Fan1 | Column::Fan2 | Column::Fan3 | Column::Fan4 | Column::PsuFan
| Column::FanCount | Column::ExpectedFans => (5, "Cooling"),
| Column::FanCount | Column::ExpectedFans | Column::FanSpeedPercent => (5, "Cooling"),
Column::TotalChips | Column::PsuVersion | Column::PsuSerial | Column::PsuVMin
| Column::PsuVMax => (6, "Hardware"),
Column::Worker | Column::PoolAccount | Column::PoolUrl | Column::Pool1Url
| Column::Pool1Worker | Column::Pool2Url | Column::Pool2Worker | Column::Pool3Url
| Column::Pool3Worker | Column::Accepted | Column::Rejected
| Column::RejectRatio => (7, "Pools"),
| Column::RejectRatio | Column::DiffAccepted | Column::DiffRejected
| Column::StaleShares | Column::Blocks => (7, "Pools"),
}
}
}
+6
View File
@@ -1152,6 +1152,7 @@ async fn to_row(miner: &dyn Miner) -> MinerRow {
env_temp_c,
outlet_temp_c,
fan_rpms,
fan_speed_percent: data.fan_speed_percent,
psu_fan_rpm,
fan_count: (!data.fans.is_empty()).then_some(data.fans.len() as u32),
expected_fans: data.expected_fans.map(|v| v as u32),
@@ -1189,6 +1190,11 @@ async fn to_row(miner: &dyn Miner) -> MinerRow {
}
any.then_some(total)
},
// Cumulative share stats from the miner summary (round 19 #10, T2).
difficulty_accepted: data.share_summary.as_ref().and_then(|s| s.difficulty_accepted),
difficulty_rejected: data.share_summary.as_ref().and_then(|s| s.difficulty_rejected),
stale_shares: data.share_summary.as_ref().and_then(|s| s.stale_shares),
found_blocks: data.share_summary.as_ref().and_then(|s| s.found_blocks),
uptime_secs: data.uptime.map(|d| d.as_secs()).unwrap_or(0),
light_flashing: data.light_flashing,
operating_state,
@@ -0,0 +1,399 @@
Subject: [PATCH 0026] telemetry: cumulative share stats (difficulty acc/rej, stale, blocks)
Round 19 #10 telemetry extension, tier 2b. Exposes the cumulative share
statistics the GUI wanted: difficulty-weighted accepted/rejected work, raw stale
share count, and blocks found.
- New ShareSummary sub-struct (data/share.rs) + parse_cgminer_share_summary helper
that reads a cgminer/btminer SUMMARY[0] object ("Difficulty Accepted",
"Difficulty Rejected", "Stale", "Found Blocks").
- New DataField::ShareSummary; MinerData gains share_summary.
- Rides the EXISTING GetBestShare trait via a defaulted parse_share_summary method
(default None), so no new supertrait bound and no empty impl per backend; only
the cgminer-family backends override it. parse_data wires it in.
- Backends (each reads the SUMMARY the collector already fetches, so no extra
round-trips): Antminer v2020 + v2023_07, LuxOS, WhatsMiner V1 + V2. These are
miner-level aggregates, not per-pool, so they are top-level MinerData fields (the
per-pool accepted/rejected share counts stay on PoolData). Braiins does not
expose cumulative difficulty; ePIC reports only the current difficulty target;
WhatsMiner V3 and VNish expose none -> all inherit None.
Fixture tests for whatsminer v1 and antminer v2020 assert the parsed values.
diff --git a/vendor/asic-rs-core/src/data/collector.rs b/vendor/asic-rs-core/src/data/collector.rs
index 5899c039..942b39f6 100644
--- a/vendor/asic-rs-core/src/data/collector.rs
+++ b/vendor/asic-rs-core/src/data/collector.rs
@@ -111,6 +111,9 @@ pub enum DataField {
/// Difficulty of the best share found over the miner's lifetime, when reported.
#[cfg_attr(feature = "python", pydantic(value = "BestShare"))]
BestShare,
+ /// Cumulative share statistics (difficulty accepted/rejected, stale, blocks).
+ #[cfg_attr(feature = "python", pydantic(value = "ShareSummary"))]
+ ShareSummary,
/// Difficulty of the best share found since the last boot or hashing start, when reported.
#[cfg_attr(feature = "python", pydantic(value = "SessionBestShare"))]
SessionBestShare,
diff --git a/vendor/asic-rs-core/src/data/miner.rs b/vendor/asic-rs-core/src/data/miner.rs
index 38c7f3be..660850f4 100644
--- a/vendor/asic-rs-core/src/data/miner.rs
+++ b/vendor/asic-rs-core/src/data/miner.rs
@@ -17,6 +17,7 @@ use super::{
operating_state::OperatingState,
pool::PoolGroupData,
psu::PsuInfo,
+ share::ShareSummary,
};
use crate::data::{
deserialize::deserialize_macaddr,
@@ -237,6 +238,9 @@ pub struct MinerData {
/// Difficulty of the best share found since the last boot or hashing start,
/// when the firmware distinguishes session from all-time.
pub session_best_share: Option<f64>,
+ /// Cumulative share statistics (difficulty accepted/rejected, stale, blocks),
+ /// when reported. Miner-level aggregate from the cgminer/btminer summary.
+ pub share_summary: Option<ShareSummary>,
}
#[cfg(feature = "python")]
diff --git a/vendor/asic-rs-core/src/data/share.rs b/vendor/asic-rs-core/src/data/share.rs
index 3cc50651..73b0a0a8 100644
--- a/vendor/asic-rs-core/src/data/share.rs
+++ b/vendor/asic-rs-core/src/data/share.rs
@@ -3,7 +3,61 @@
//! Firmwares report best-share difficulty as a JSON number, a decimal string,
//! or an AxeOS-style suffix string (`"483k"`, `"1.2M"`).
+#[cfg(feature = "python")]
+use pyo3::pyclass;
+use serde::{Deserialize, Serialize};
use serde_json::Value;
+use ts_rs::TS;
+
+/// Cumulative share statistics reported by a miner (round 19 #10, T2).
+///
+/// These are miner-level aggregates from the cgminer/btminer summary. Difficulty
+/// values are difficulty-weighted sums (not raw share counts, which live on
+/// [`PoolData`][`super::pool::PoolData`]). Every field is optional; a backend
+/// fills in only what its firmware exposes.
+#[cfg_attr(feature = "python", pyclass(from_py_object, module = "asic_rs"))]
+#[cfg_attr(feature = "python", asic_rs_pydantic::py_pydantic_model(getters))]
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, Default, TS)]
+pub struct ShareSummary {
+ /// Difficulty-weighted accepted work, when reported.
+ pub difficulty_accepted: Option<f64>,
+ /// Difficulty-weighted rejected work, when reported.
+ pub difficulty_rejected: Option<f64>,
+ /// Raw stale share count, when reported.
+ pub stale_shares: Option<u64>,
+ /// Number of blocks found by this miner, when reported.
+ pub found_blocks: Option<u64>,
+}
+
+impl ShareSummary {
+ /// True when no field is populated.
+ pub fn is_empty(&self) -> bool {
+ self.difficulty_accepted.is_none()
+ && self.difficulty_rejected.is_none()
+ && self.stale_shares.is_none()
+ && self.found_blocks.is_none()
+ }
+}
+
+/// Parse a [`ShareSummary`] from a cgminer/btminer `SUMMARY[0]` object (the value
+/// extracted at `/SUMMARY/0`). Reads "Difficulty Accepted", "Difficulty Rejected",
+/// "Stale", and "Found Blocks". Returns `None` when none are present.
+pub fn parse_cgminer_share_summary(summary: &Value) -> Option<ShareSummary> {
+ let f = |k: &str| {
+ summary
+ .get(k)
+ .and_then(|v| v.as_f64())
+ .filter(|v| v.is_finite() && *v >= 0.0)
+ };
+ let u = |k: &str| summary.get(k).and_then(|v| v.as_u64());
+ let s = ShareSummary {
+ difficulty_accepted: f("Difficulty Accepted"),
+ difficulty_rejected: f("Difficulty Rejected"),
+ stale_shares: u("Stale"),
+ found_blocks: u("Found Blocks"),
+ };
+ (!s.is_empty()).then_some(s)
+}
/// Parse a share difficulty from a JSON value.
///
diff --git a/vendor/asic-rs-core/src/traits/miner.rs b/vendor/asic-rs-core/src/traits/miner.rs
index cfabb624..76344342 100644
--- a/vendor/asic-rs-core/src/traits/miner.rs
+++ b/vendor/asic-rs-core/src/traits/miner.rs
@@ -34,6 +34,7 @@ use crate::{
operating_state::OperatingState,
pool::PoolGroupData,
psu::PsuInfo,
+ share::ShareSummary,
},
traits::firmware::MinerFirmware,
traits::model::MinerModel,
@@ -291,6 +292,7 @@ impl<
let pools = self.parse_pools(&data);
let best_share = self.parse_best_share(&data);
let session_best_share = self.parse_session_best_share(&data);
+ let share_summary = self.parse_share_summary(&data);
let device_info = self.get_device_info();
// computed fields
@@ -388,6 +390,7 @@ impl<
pools,
best_share,
session_best_share,
+ share_summary,
}
}
}
@@ -914,6 +917,18 @@ pub trait GetBestShare: CollectData {
fn parse_best_share(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
None
}
+ #[tracing::instrument(level = "debug")]
+ async fn get_share_summary(&self) -> Option<ShareSummary> {
+ let mut collector = self.get_collector();
+ let data = collector.collect(&[DataField::ShareSummary]).await;
+ self.parse_share_summary(&data)
+ }
+ /// Cumulative share statistics (difficulty accepted/rejected, stale, blocks).
+ /// Backends that expose them override this; others return None.
+ #[allow(unused_variables)]
+ fn parse_share_summary(&self, data: &HashMap<DataField, Value>) -> Option<ShareSummary> {
+ None
+ }
}
// Best share difficulty (this session / since boot)
diff --git a/vendor/asic-rs-firmwares-antminer/src/backends/v2020/mod.rs b/vendor/asic-rs-firmwares-antminer/src/backends/v2020/mod.rs
index 63f819f8..71195737 100644
--- a/vendor/asic-rs-firmwares-antminer/src/backends/v2020/mod.rs
+++ b/vendor/asic-rs-firmwares-antminer/src/backends/v2020/mod.rs
@@ -21,6 +21,7 @@ use asic_rs_core::{
message::{MessageSeverity, MinerMessage},
miner::{MiningMode, TuningTarget},
pool::{PoolData, PoolGroupData, PoolURL},
+ share::{ShareSummary, parse_cgminer_share_summary},
},
traits::{miner::*, model::MinerModel},
};
@@ -509,6 +510,16 @@ impl GetDataLocations for AntMinerV2020 {
tag: None,
},
)],
+ // Cumulative share stats from cgminer summary (round 19 #10, T2);
+ // RPC_SUMMARY already fetched.
+ DataField::ShareSummary => vec![(
+ RPC_SUMMARY,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/SUMMARY/0"),
+ tag: None,
+ },
+ )],
// `total_rateideal`, by contrast, says nothing about its own
// scale, so carry STATS' `rate_unit` alongside it.
DataField::ExpectedHashrate => vec![
@@ -889,6 +900,10 @@ impl GetBestShare for AntMinerV2020 {
// (round 19 #10).
data.extract::<f64>(DataField::BestShare).filter(|&v| v > 0.0)
}
+ fn parse_share_summary(&self, data: &HashMap<DataField, Value>) -> Option<ShareSummary> {
+ data.get(&DataField::ShareSummary)
+ .and_then(parse_cgminer_share_summary)
+ }
}
impl GetSessionBestShare for AntMinerV2020 {}
@@ -1679,6 +1694,12 @@ mod tests {
algo: HashAlgorithm::SHA256,
}
);
+ // Cumulative share stats from cgminer summary (round 19 #10, T2).
+ let shares = miner_data.share_summary.expect("share summary");
+ assert_eq!(shares.difficulty_accepted, Some(1305083904.0));
+ assert_eq!(shares.difficulty_rejected, Some(2490368.0));
+ assert_eq!(shares.stale_shares, Some(1));
+ assert_eq!(shares.found_blocks, Some(0));
}
#[tokio::test]
diff --git a/vendor/asic-rs-firmwares-antminer/src/backends/v2023_07/mod.rs b/vendor/asic-rs-firmwares-antminer/src/backends/v2023_07/mod.rs
index 1ac2bad1..58e8a5c2 100644
--- a/vendor/asic-rs-firmwares-antminer/src/backends/v2023_07/mod.rs
+++ b/vendor/asic-rs-firmwares-antminer/src/backends/v2023_07/mod.rs
@@ -23,6 +23,7 @@ use asic_rs_core::{
message::{MessageSeverity, MinerMessage},
miner::{MiningMode, TuningTarget},
pool::{PoolData, PoolGroupData, PoolURL},
+ share::{ShareSummary, parse_cgminer_share_summary},
},
traits::{miner::*, model::MinerModel},
};
@@ -547,6 +548,16 @@ impl GetDataLocations for AntMinerV202307 {
tag: None,
},
)],
+ // Cumulative share stats from cgminer summary (round 19 #10, T2);
+ // RPC_SUMMARY already fetched.
+ DataField::ShareSummary => vec![(
+ RPC_SUMMARY,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/SUMMARY/0"),
+ tag: None,
+ },
+ )],
DataField::SessionBestShare => vec![(
RPC_SUMMARY,
DataExtractor {
@@ -955,6 +966,10 @@ impl GetBestShare for AntMinerV202307 {
// reports 0 when it has never found a share (round 17 R7).
data.extract::<f64>(DataField::BestShare).filter(|&v| v > 0.0)
}
+ fn parse_share_summary(&self, data: &HashMap<DataField, Value>) -> Option<ShareSummary> {
+ data.get(&DataField::ShareSummary)
+ .and_then(parse_cgminer_share_summary)
+ }
}
impl GetSessionBestShare for AntMinerV202307 {
diff --git a/vendor/asic-rs-firmwares-luxminer/src/backends/v1/mod.rs b/vendor/asic-rs-firmwares-luxminer/src/backends/v1/mod.rs
index a75a3f97..413f237a 100644
--- a/vendor/asic-rs-firmwares-luxminer/src/backends/v1/mod.rs
+++ b/vendor/asic-rs-firmwares-luxminer/src/backends/v1/mod.rs
@@ -20,6 +20,7 @@ use asic_rs_core::{
message::{MessageSeverity, MinerMessage},
miner::TuningTarget,
pool::{PoolData, PoolGroupData, PoolURL},
+ share::{ShareSummary, parse_cgminer_share_summary},
},
traits::{miner::*, model::MinerModel},
};
@@ -455,6 +456,16 @@ impl GetDataLocations for LuxMinerV1 {
tag: None,
},
)],
+ // Cumulative share stats from LuxOS summary (round 19 #10, T2);
+ // RPC_SUMMARY already fetched.
+ DataField::ShareSummary => vec![(
+ RPC_SUMMARY,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/SUMMARY/0"),
+ tag: None,
+ },
+ )],
DataField::SessionBestShare => vec![(
RPC_SUMMARY,
DataExtractor {
@@ -945,6 +956,10 @@ impl GetBestShare for LuxMinerV1 {
// LuxOS summary -> "Best Share" (all-time), round 16 / G9.
data.extract::<f64>(DataField::BestShare)
}
+ fn parse_share_summary(&self, data: &HashMap<DataField, Value>) -> Option<ShareSummary> {
+ data.get(&DataField::ShareSummary)
+ .and_then(parse_cgminer_share_summary)
+ }
}
impl GetSessionBestShare for LuxMinerV1 {
fn parse_session_best_share(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
diff --git a/vendor/asic-rs-firmwares-whatsminer/src/backends/v1/mod.rs b/vendor/asic-rs-firmwares-whatsminer/src/backends/v1/mod.rs
index 584ae8d1..aacd1077 100644
--- a/vendor/asic-rs-firmwares-whatsminer/src/backends/v1/mod.rs
+++ b/vendor/asic-rs-firmwares-whatsminer/src/backends/v1/mod.rs
@@ -19,6 +19,7 @@ use asic_rs_core::{
miner::TuningTarget,
pool::{PoolData, PoolGroupData, PoolURL},
psu::PsuInfo,
+ share::{ShareSummary, parse_cgminer_share_summary},
},
traits::{miner::*, model::MinerModel},
};
@@ -264,6 +265,16 @@ impl GetDataLocations for WhatsMinerV1 {
tag: None,
},
)],
+ // Cumulative share stats from btminer summary (round 19 #10, T2);
+ // RPC_SUMMARY already fetched.
+ DataField::ShareSummary => vec![(
+ RPC_SUMMARY,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/SUMMARY/0"),
+ tag: None,
+ },
+ )],
DataField::ExpectedHashrate => vec![(
RPC_SUMMARY,
DataExtractor {
@@ -597,6 +608,10 @@ impl GetBestShare for WhatsMinerV1 {
fn parse_best_share(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
data.extract::<f64>(DataField::BestShare).filter(|&v| v > 0.0)
}
+ fn parse_share_summary(&self, data: &HashMap<DataField, Value>) -> Option<ShareSummary> {
+ data.get(&DataField::ShareSummary)
+ .and_then(parse_cgminer_share_summary)
+ }
}
impl GetSessionBestShare for WhatsMinerV1 {}
impl GetOperatingState for WhatsMinerV1 {}
@@ -969,6 +984,14 @@ mod integration_tests {
assert_eq!(hr.unit, HashRateUnit::TeraHash);
assert!((hr.value - 67.43935249).abs() < 1e-6);
}
+ // Cumulative share stats from summary (round 19 #10, T2).
+ let shares = miner_data
+ .share_summary
+ .ok_or_else(|| anyhow::anyhow!("v1 should expose share summary"))?;
+ assert_eq!(shares.difficulty_accepted, Some(158334976.0));
+ assert_eq!(shares.difficulty_rejected, Some(0.0));
+ assert_eq!(shares.stale_shares, Some(0));
+ assert_eq!(shares.found_blocks, Some(0));
assert_eq!(miner_data.wattage, Some(Power::from_watts(3417f64)));
assert_eq!(
miner_data.tuning_target,
diff --git a/vendor/asic-rs-firmwares-whatsminer/src/backends/v2/mod.rs b/vendor/asic-rs-firmwares-whatsminer/src/backends/v2/mod.rs
index 5de37579..4cfcee19 100644
--- a/vendor/asic-rs-firmwares-whatsminer/src/backends/v2/mod.rs
+++ b/vendor/asic-rs-firmwares-whatsminer/src/backends/v2/mod.rs
@@ -21,6 +21,7 @@ use asic_rs_core::{
miner::{MiningMode, TuningTarget},
pool::{PoolData, PoolGroupData, PoolURL},
psu::PsuInfo,
+ share::{ShareSummary, parse_cgminer_share_summary},
},
traits::{miner::*, model::MinerModel},
util::is_expected_write_error,
@@ -265,6 +266,16 @@ impl GetDataLocations for WhatsMinerV2 {
tag: None,
},
)],
+ // Cumulative share stats from btminer summary (round 19 #10, T2);
+ // RPC_SUMMARY already fetched.
+ DataField::ShareSummary => vec![(
+ RPC_SUMMARY,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/SUMMARY/0"),
+ tag: None,
+ },
+ )],
DataField::ExpectedHashrate => vec![(
RPC_SUMMARY,
DataExtractor {
@@ -592,6 +603,10 @@ impl GetBestShare for WhatsMinerV2 {
fn parse_best_share(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
data.extract::<f64>(DataField::BestShare).filter(|&v| v > 0.0)
}
+ fn parse_share_summary(&self, data: &HashMap<DataField, Value>) -> Option<ShareSummary> {
+ data.get(&DataField::ShareSummary)
+ .and_then(parse_cgminer_share_summary)
+ }
}
impl GetSessionBestShare for WhatsMinerV2 {}
impl GetOperatingState for WhatsMinerV2 {}
@@ -0,0 +1,267 @@
Subject: [PATCH 0027] telemetry: miner-level fan duty cycle (fan speed %)
Round 19 #10 / #8 telemetry extension, tier 3. Exposes the fan duty cycle as a
miner-level percentage. No firmware exposes a maximum fan RPM, so this normalized
duty cycle is the fan-load indicator the GUI wanted alongside the per-fan RPMs.
- New DataField::FanSpeedPercent; MinerData gains fan_speed_percent (Option<f64>,
0-100). Modeled as a top-level miner-level value (most firmwares report a single
duty), so FanData is untouched (no Eq/literal churn across 17 crates).
- Rides the EXISTING GetFans trait via a defaulted parse_fan_speed_percent method
(default None), so no new supertrait bound; only backends that expose it override.
- Backends (each reads a command the collector already fetches, so no extra
round-trips): ePIC (summary /Fans/Fans Speed, single %), LuxOS (max of FANS[].Speed),
Braiins v25_07 + v26_04 (max of cooling fans[].target_speed_ratio x 100). Antminer
(pwm via config command) and VNish (fan_duty) have no data fixtures and are left
for a live-verified pass; WhatsMiner is fw-locked -> None.
Fixture tests for epic, luxminer, and braiins v26_04 assert the parsed percentage.
diff --git a/vendor/asic-rs-core/src/data/collector.rs b/vendor/asic-rs-core/src/data/collector.rs
index 942b39f6..07d9d571 100644
--- a/vendor/asic-rs-core/src/data/collector.rs
+++ b/vendor/asic-rs-core/src/data/collector.rs
@@ -62,6 +62,9 @@ pub enum DataField {
/// Fan speed or fan configuration.
#[cfg_attr(feature = "python", pydantic(value = "Fans"))]
Fans,
+ /// Miner-level fan duty cycle as a percentage (0-100).
+ #[cfg_attr(feature = "python", pydantic(value = "FanSpeedPercent"))]
+ FanSpeedPercent,
/// PSU fan speed or configuration.
#[cfg_attr(feature = "python", pydantic(value = "PsuFans"))]
PsuFans,
diff --git a/vendor/asic-rs-core/src/data/miner.rs b/vendor/asic-rs-core/src/data/miner.rs
index 660850f4..6dc73d26 100644
--- a/vendor/asic-rs-core/src/data/miner.rs
+++ b/vendor/asic-rs-core/src/data/miner.rs
@@ -178,6 +178,9 @@ pub struct MinerData {
pub expected_fans: Option<u8>,
/// The current fan information for the miner
pub fans: Vec<FanData>,
+ /// Miner-level fan duty cycle as a percentage (0-100), when reported. Firmware
+ /// exposes no maximum RPM, so this duty cycle is the normalized fan indicator.
+ pub fan_speed_percent: Option<f64>,
/// The current PDU fan information for the miner
pub psu_fans: Vec<FanData>,
/// The average temperature across all chips in the miner
diff --git a/vendor/asic-rs-core/src/traits/miner.rs b/vendor/asic-rs-core/src/traits/miner.rs
index 76344342..baac9387 100644
--- a/vendor/asic-rs-core/src/traits/miner.rs
+++ b/vendor/asic-rs-core/src/traits/miner.rs
@@ -283,6 +283,7 @@ impl<
let fluid_temperature = self.parse_fluid_temperature(&data);
let outlet_fluid_temperature = self.parse_outlet_fluid_temperature(&data);
let fans = self.parse_fans(&data);
+ let fan_speed_percent = self.parse_fan_speed_percent(&data);
let psu_fans = self.parse_psu_fans(&data);
let hashboards = self.parse_hashboards(&data);
let light_flashing = self.parse_light_flashing(&data);
@@ -366,6 +367,7 @@ impl<
// Cooling information
expected_fans: device_info.hardware.fans,
fans,
+ fan_speed_percent,
psu_fans,
average_temperature,
fluid_temperature,
@@ -682,6 +684,18 @@ pub trait GetFans: CollectData {
fn parse_fans(&self, data: &HashMap<DataField, Value>) -> Vec<FanData> {
vec![]
}
+ #[tracing::instrument(level = "debug")]
+ async fn get_fan_speed_percent(&self) -> Option<f64> {
+ let mut collector = self.get_collector();
+ let data = collector.collect(&[DataField::FanSpeedPercent]).await;
+ self.parse_fan_speed_percent(&data)
+ }
+ /// Miner-level fan duty cycle as a percentage (0-100). Backends that expose it
+ /// override this; others return None.
+ #[allow(unused_variables)]
+ fn parse_fan_speed_percent(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
+ None
+ }
}
// PSU Fans
diff --git a/vendor/asic-rs-firmwares-braiins/src/backends/v25_07/mod.rs b/vendor/asic-rs-firmwares-braiins/src/backends/v25_07/mod.rs
index 7e07967f..86e84d8c 100644
--- a/vendor/asic-rs-firmwares-braiins/src/backends/v25_07/mod.rs
+++ b/vendor/asic-rs-firmwares-braiins/src/backends/v25_07/mod.rs
@@ -230,6 +230,16 @@ impl GetDataLocations for BraiinsV2507 {
tag: None,
},
)],
+ // Miner-level fan duty cycle (round 19 #10, T3): max target_speed_ratio;
+ // cooling state already fetched.
+ DataField::FanSpeedPercent => vec![(
+ WEB_COOLING_STATE,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/fans"),
+ tag: None,
+ },
+ )],
DataField::Hashboards => vec![(
WEB_HASHBOARDS,
DataExtractor {
@@ -567,6 +577,18 @@ impl GetFans for BraiinsV2507 {
fans
}
+ fn parse_fan_speed_percent(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
+ // Braiins fans[].target_speed_ratio is a 0-1 duty ratio; report the max as
+ // a percentage (round 19 #10, T3).
+ data.get(&DataField::FanSpeedPercent)
+ .and_then(|v| v.as_array())
+ .into_iter()
+ .flatten()
+ .filter_map(|f| f.pointer("/target_speed_ratio").and_then(|v| v.as_f64()))
+ .filter(|v| v.is_finite() && *v >= 0.0)
+ .map(|v| v * 100.0)
+ .max_by(|a, b| a.partial_cmp(b).unwrap_or(std::cmp::Ordering::Equal))
+ }
}
impl GetLightFlashing for BraiinsV2507 {
diff --git a/vendor/asic-rs-firmwares-braiins/src/backends/v26_04/mod.rs b/vendor/asic-rs-firmwares-braiins/src/backends/v26_04/mod.rs
index 2f5be88c..303fca49 100644
--- a/vendor/asic-rs-firmwares-braiins/src/backends/v26_04/mod.rs
+++ b/vendor/asic-rs-firmwares-braiins/src/backends/v26_04/mod.rs
@@ -233,6 +233,16 @@ impl GetDataLocations for BraiinsV2604 {
tag: None,
},
)],
+ // Miner-level fan duty cycle (round 19 #10, T3): max target_speed_ratio;
+ // cooling state already fetched.
+ DataField::FanSpeedPercent => vec![(
+ WEB_COOLING_STATE,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/fans"),
+ tag: None,
+ },
+ )],
DataField::Hashboards => vec![(
WEB_HASHBOARDS,
DataExtractor {
@@ -598,6 +608,18 @@ impl GetFans for BraiinsV2604 {
fans
}
+ fn parse_fan_speed_percent(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
+ // Braiins fans[].target_speed_ratio is a 0-1 duty ratio; report the max as
+ // a percentage (round 19 #10, T3).
+ data.get(&DataField::FanSpeedPercent)
+ .and_then(|v| v.as_array())
+ .into_iter()
+ .flatten()
+ .filter_map(|f| f.pointer("/target_speed_ratio").and_then(|v| v.as_f64()))
+ .filter(|v| v.is_finite() && *v >= 0.0)
+ .map(|v| v * 100.0)
+ .max_by(|a, b| a.partial_cmp(b).unwrap_or(std::cmp::Ordering::Equal))
+ }
}
impl GetLightFlashing for BraiinsV2604 {
@@ -1287,6 +1309,10 @@ mod tests {
assert_eq!(hr.unit, HashRateUnit::TeraHash);
assert!((hr.value - 247.3507543407177).abs() < 1e-3);
}
+ // Miner-level fan duty cycle = max target_speed_ratio (0.92) x 100 (round
+ // 19 #10, T3).
+ let fan_pct = miner_data.fan_speed_percent.expect("braiins fan duty");
+ assert!((fan_pct - 92.0).abs() < 1e-6);
}
#[test]
diff --git a/vendor/asic-rs-firmwares-epic/src/backends/v1/mod.rs b/vendor/asic-rs-firmwares-epic/src/backends/v1/mod.rs
index 2abb0706..16c7872b 100644
--- a/vendor/asic-rs-firmwares-epic/src/backends/v1/mod.rs
+++ b/vendor/asic-rs-firmwares-epic/src/backends/v1/mod.rs
@@ -473,6 +473,15 @@ impl GetDataLocations for PowerPlayV1 {
tag: None,
},
)],
+ // Miner-level fan duty cycle (round 19 #10, T3); summary already fetched.
+ DataField::FanSpeedPercent => vec![(
+ WEB_SUMMARY,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/Fans/Fans Speed"),
+ tag: None,
+ },
+ )],
DataField::Hashboards => vec![
(
WEB_TEMPS,
@@ -1120,6 +1129,11 @@ impl GetFans for PowerPlayV1 {
fans
}
+ fn parse_fan_speed_percent(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
+ // ePIC summary /Fans/Fans Speed is a single miner-level duty % (round 19 #10).
+ data.extract::<f64>(DataField::FanSpeedPercent)
+ .filter(|v| v.is_finite() && *v >= 0.0)
+ }
}
impl GetPsuFans for PowerPlayV1 {}
@@ -2189,6 +2203,8 @@ mod tests {
assert_eq!(miner_data.uptime, Some(Duration::from_secs(23170)));
assert_eq!(miner_data.wattage, Some(Power::from_watts(2166.6174)));
+ // Miner-level fan duty cycle from summary /Fans/Fans Speed (round 19 #10, T3).
+ assert_eq!(miner_data.fan_speed_percent, Some(100.0));
assert_eq!(miner_data.hashboards.len(), 3);
assert_eq!(miner_data.hashboards[0].active, Some(false));
assert_eq!(miner_data.hashboards[1].chips.len(), 110);
diff --git a/vendor/asic-rs-firmwares-luxminer/src/backends/v1/mod.rs b/vendor/asic-rs-firmwares-luxminer/src/backends/v1/mod.rs
index 413f237a..edab7c4c 100644
--- a/vendor/asic-rs-firmwares-luxminer/src/backends/v1/mod.rs
+++ b/vendor/asic-rs-firmwares-luxminer/src/backends/v1/mod.rs
@@ -295,6 +295,16 @@ impl GetDataLocations for LuxMinerV1 {
tag: None,
},
)],
+ // Miner-level fan duty cycle (round 19 #10, T3): max of per-fan Speed;
+ // RPC_FANS already fetched.
+ DataField::FanSpeedPercent => vec![(
+ RPC_FANS,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/FANS"),
+ tag: None,
+ },
+ )],
DataField::ApiVersion => vec![(
RPC_VERSION,
DataExtractor {
@@ -936,6 +946,17 @@ impl GetFans for LuxMinerV1 {
})
.collect()
}
+ fn parse_fan_speed_percent(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
+ // LuxOS FANS[].Speed is per-fan duty %; report the fleet-facing maximum
+ // (round 19 #10, T3).
+ data.get(&DataField::FanSpeedPercent)
+ .and_then(|v| v.as_array())
+ .into_iter()
+ .flatten()
+ .filter_map(|f| f.get("Speed").and_then(|v| v.as_f64()))
+ .filter(|v| v.is_finite() && *v >= 0.0)
+ .max_by(|a, b| a.partial_cmp(b).unwrap_or(std::cmp::Ordering::Equal))
+ }
}
impl GetLightFlashing for LuxMinerV1 {
@@ -1680,6 +1701,9 @@ mod tests {
Some(TuningTarget::Power(Power::from_watts(1188f64)))
);
assert_eq!(miner_data.fans.len(), 4);
+ // Miner-level fan duty cycle = max of per-fan Speed (all 20 here); round 19
+ // #10, T3.
+ assert_eq!(miner_data.fan_speed_percent, Some(20.0));
assert_eq!(miner_data.hashboards[0].chips.len(), 77);
assert_eq!(miner_data.pools.len(), 2);
assert_eq!(miner_data.pools[0].len(), 2);
+1 -1
View File
@@ -1 +1 @@
{"$comment":"This file only protects against accidental modifications. It is not a security mechanism and does not protect against malicious changes.","files":{".cargo_vcs_info.json":"20173e90df24055f67bf03e2b3bb3bc396168f39aa45b36828b1963749d7838a","Cargo.lock":"2f4e619eefd164b57242e6bae57ddf3f73053f6af308a1dea181936d6a41a291","Cargo.toml":"2310d9df1678c138cc82922659ba19d00a92fd2f107a21047890e53fd79c492d","Cargo.toml.orig":"6c6d97588811d1b3b4c0839aa016d6133745b96f7620d390d093d60a8e29d501","src/config/collector.rs":"8c79ac6d3a04f93efc78b176ef7f6b1dc44e50d2bc95d813439b47422d6bb28f","src/config/fan.rs":"80c305261643542f11368342c3dcea29bbd3b016fb6f2962fdad6489dac2734a","src/config/mod.rs":"0d14701319d84ded3cd2f6ba6f92bff18c8e5cff90a2229592d97baae3ed4de3","src/config/pools.rs":"a74ab648053eb51305c4e1bbb6c05db57575ff2542b4fd53d28d33687a62eee3","src/config/preset.rs":"e68d694d3cf537c67ecb3b535a77904e25cc3b206a6ec214fc904011229b8a7c","src/config/scaling.rs":"f402e00c75ef796068765ab1a82ce6a3a0eb88f484c4a67f574ede90a3abaeeb","src/config/temperature.rs":"c6fd6f9cc8e565f27b58fb571fd33b58dcf2112a50b570f6b54a3c11c13d1fbe","src/config/timezone.rs":"4470fd704885e62e3bc8da8087dce6b002dd3fa92cec54d96ce88a06f03e1cbe","src/config/tuning.rs":"31a0826419d4690315f6eecc03250bfb4e5342431ff261015a9f9f3d87e69b6c","src/data/board.rs":"0f2547d5763225a3c5387da695de52b65c38eeb7942d14ecef36a72388c7a451","src/data/capabilities.rs":"29cbab6262fb8888b30b4674a30ef03983e005b4e18eefddfbbf9c568e1e1e17","src/data/collector.rs":"93694fbadbb9e78d55911a266a966bec6da81394330973786dc9531b7b05f9da","src/data/command.rs":"53cd7e5e87888a76ba866b33b6d87400112bc3eeb4b5e331a381dfbb2c04579e","src/data/deserialize.rs":"461a84defd6f2fb53c8b3c059463c2bfcf69df80db0f5aa2d30b47e710163992","src/data/device.rs":"813b0d41834b217da9f2d51fc7d9cb0f12db6aa7501dd43b6c3f992f29e7827f","src/data/fan.rs":"9307626335008c04d5e5c742bdd7ff5c6e9055dbd84d0e7a655e6e656da3df78","src/data/firmware.rs":"648acace3b289f623cf678f36fb854ff5ddafb8e2f651ae4a15128ae719f87ba","src/data/hashrate.rs":"037a4cce611c9dafb03eb18c4d088c42df5a9bf23f376c0436aded7a3d657b0d","src/data/message.rs":"7b399ab1a0b6e43e61a5461d29a2752beed2d1fd7b214eb891572f8994d47c11","src/data/miner.rs":"e8500716a9f311072d3e4889a2219e401116187bec6ceffdd21e34bb9d49f415","src/data/mod.rs":"f63a6bd20fb2389e434257ccfe646321b25449993c937ece0d29850e0ab2279f","src/data/operating_state.rs":"7dccbfcc3eada16d0f890772323d4626fa9f298f7fc1882675ae3672d94f6da3","src/data/pool.rs":"a6bff9e56239915a095c4f99187a2d5f4631c3641332071c5134128cacaecceb","src/data/serialize.rs":"347f8cdf619156ac73aa0d89ed41555bd7332ef60cc92f945bc0f16f4ad29137","src/data/share.rs":"46c927b83eddaec7a01c6e0d8cc3af1d163d724421ecc94d4484db158fa27f4f","src/discovery.rs":"efc236592941e72609bd3be18551834f648b608caaf73b9555f75b9838692f6b","src/errors.rs":"0238c8cb6585d05cdd01aec031895e5240e3883f44f3fa22a7398027a360ef1a","src/lib.rs":"e2c8ecde3cf8edda920470f8b938056b60448184a5c81672f04a8e0235c3cf22","src/test/api.rs":"5defa33709c14cadfa7390981c3c7d3f324ef1878e4ee56c089dbf85665b57ae","src/test/mod.rs":"0b44b178ea8950b75fe09047797085f03e5c0eb17d62ca1f3e62a8f643fda87c","src/test/util.rs":"c6f5a3cccb40f1d6a7c316b52c70c59f8dda24a6ad83cb5aeac0b5d970debd0e","src/traits/auth.rs":"dffa58542ac9e57175f5dcad261f80b3efeba76ef3a039b0d9c6f9eb14a19893","src/traits/discovery.rs":"b232ea113c675178ae62c9f5ee35d0329e3a4465388133992c0db8d697113e34","src/traits/entry.rs":"03cf30045be6ba92a414d36990d316d572be21e6c66039ed8193da9a3c27cf53","src/traits/firmware.rs":"94831620bb8c8c4ce2ad69f8fd7b9679ee1de63b1f99529559e24f2118710638","src/traits/identification.rs":"67866931aa28c2e5b0e07dbacae47c1d82b53addea333f75033c451bbd2c9a77","src/traits/make.rs":"1d099cd51ecb354d20acef4cc1d2b3f75b682b6d6c887553861e185602d465f4","src/traits/miner.rs":"5c17602926ca9971d2529de2dddcef6aa1308a11fc74def1d9f8ccd904405d13","src/traits/mod.rs":"61406c4d2603299e4bad57c6f90115cadf93cee50a857bbfbb00d99f3a6873ac","src/traits/model.rs":"efde2b5cae4c4f018436bb68b236f354b5a733f7dafdeaf3f1c534b469a22d64","src/util.rs":"53255c65e85b97236cb34b452e2cb522edf377f49d2232645e0e0e33c447bb23"},"package":"1f25e625fc4c645ce995c5609a9fdff6f047d6a5e4d6be9dc167999a43197f58"}
{"$comment":"This file only protects against accidental modifications. It is not a security mechanism and does not protect against malicious changes.","files":{".cargo_vcs_info.json":"20173e90df24055f67bf03e2b3bb3bc396168f39aa45b36828b1963749d7838a","Cargo.lock":"2f4e619eefd164b57242e6bae57ddf3f73053f6af308a1dea181936d6a41a291","Cargo.toml":"2310d9df1678c138cc82922659ba19d00a92fd2f107a21047890e53fd79c492d","Cargo.toml.orig":"6c6d97588811d1b3b4c0839aa016d6133745b96f7620d390d093d60a8e29d501","src/config/collector.rs":"8c79ac6d3a04f93efc78b176ef7f6b1dc44e50d2bc95d813439b47422d6bb28f","src/config/fan.rs":"80c305261643542f11368342c3dcea29bbd3b016fb6f2962fdad6489dac2734a","src/config/mod.rs":"0d14701319d84ded3cd2f6ba6f92bff18c8e5cff90a2229592d97baae3ed4de3","src/config/pools.rs":"a74ab648053eb51305c4e1bbb6c05db57575ff2542b4fd53d28d33687a62eee3","src/config/preset.rs":"e68d694d3cf537c67ecb3b535a77904e25cc3b206a6ec214fc904011229b8a7c","src/config/scaling.rs":"f402e00c75ef796068765ab1a82ce6a3a0eb88f484c4a67f574ede90a3abaeeb","src/config/temperature.rs":"c6fd6f9cc8e565f27b58fb571fd33b58dcf2112a50b570f6b54a3c11c13d1fbe","src/config/timezone.rs":"4470fd704885e62e3bc8da8087dce6b002dd3fa92cec54d96ce88a06f03e1cbe","src/config/tuning.rs":"31a0826419d4690315f6eecc03250bfb4e5342431ff261015a9f9f3d87e69b6c","src/data/board.rs":"0f2547d5763225a3c5387da695de52b65c38eeb7942d14ecef36a72388c7a451","src/data/capabilities.rs":"29cbab6262fb8888b30b4674a30ef03983e005b4e18eefddfbbf9c568e1e1e17","src/data/collector.rs":"a13377bd87ed2c634cfcb3a40d4ca8184457bdf73bc8aaf343def42fd850bc37","src/data/command.rs":"53cd7e5e87888a76ba866b33b6d87400112bc3eeb4b5e331a381dfbb2c04579e","src/data/deserialize.rs":"461a84defd6f2fb53c8b3c059463c2bfcf69df80db0f5aa2d30b47e710163992","src/data/device.rs":"813b0d41834b217da9f2d51fc7d9cb0f12db6aa7501dd43b6c3f992f29e7827f","src/data/fan.rs":"9307626335008c04d5e5c742bdd7ff5c6e9055dbd84d0e7a655e6e656da3df78","src/data/firmware.rs":"648acace3b289f623cf678f36fb854ff5ddafb8e2f651ae4a15128ae719f87ba","src/data/hashrate.rs":"037a4cce611c9dafb03eb18c4d088c42df5a9bf23f376c0436aded7a3d657b0d","src/data/message.rs":"7b399ab1a0b6e43e61a5461d29a2752beed2d1fd7b214eb891572f8994d47c11","src/data/miner.rs":"aabe27610a25e5b5db991854d4cf6b7dc1e699828559fd7872ff9f8df2ce0013","src/data/mod.rs":"f63a6bd20fb2389e434257ccfe646321b25449993c937ece0d29850e0ab2279f","src/data/operating_state.rs":"7dccbfcc3eada16d0f890772323d4626fa9f298f7fc1882675ae3672d94f6da3","src/data/pool.rs":"a6bff9e56239915a095c4f99187a2d5f4631c3641332071c5134128cacaecceb","src/data/serialize.rs":"347f8cdf619156ac73aa0d89ed41555bd7332ef60cc92f945bc0f16f4ad29137","src/data/share.rs":"99adfa10cfc59e245f41f77c70951e7aac5b3422e48abd270c56c3db122bbb6d","src/discovery.rs":"efc236592941e72609bd3be18551834f648b608caaf73b9555f75b9838692f6b","src/errors.rs":"0238c8cb6585d05cdd01aec031895e5240e3883f44f3fa22a7398027a360ef1a","src/lib.rs":"e2c8ecde3cf8edda920470f8b938056b60448184a5c81672f04a8e0235c3cf22","src/test/api.rs":"5defa33709c14cadfa7390981c3c7d3f324ef1878e4ee56c089dbf85665b57ae","src/test/mod.rs":"0b44b178ea8950b75fe09047797085f03e5c0eb17d62ca1f3e62a8f643fda87c","src/test/util.rs":"c6f5a3cccb40f1d6a7c316b52c70c59f8dda24a6ad83cb5aeac0b5d970debd0e","src/traits/auth.rs":"dffa58542ac9e57175f5dcad261f80b3efeba76ef3a039b0d9c6f9eb14a19893","src/traits/discovery.rs":"b232ea113c675178ae62c9f5ee35d0329e3a4465388133992c0db8d697113e34","src/traits/entry.rs":"03cf30045be6ba92a414d36990d316d572be21e6c66039ed8193da9a3c27cf53","src/traits/firmware.rs":"94831620bb8c8c4ce2ad69f8fd7b9679ee1de63b1f99529559e24f2118710638","src/traits/identification.rs":"67866931aa28c2e5b0e07dbacae47c1d82b53addea333f75033c451bbd2c9a77","src/traits/make.rs":"1d099cd51ecb354d20acef4cc1d2b3f75b682b6d6c887553861e185602d465f4","src/traits/miner.rs":"efdb1e41334335170d9cec147b3d0db5540f69a58a2ffe3aa78057cce8a4648b","src/traits/mod.rs":"61406c4d2603299e4bad57c6f90115cadf93cee50a857bbfbb00d99f3a6873ac","src/traits/model.rs":"efde2b5cae4c4f018436bb68b236f354b5a733f7dafdeaf3f1c534b469a22d64","src/util.rs":"53255c65e85b97236cb34b452e2cb522edf377f49d2232645e0e0e33c447bb23"},"package":"1f25e625fc4c645ce995c5609a9fdff6f047d6a5e4d6be9dc167999a43197f58"}
+6
View File
@@ -62,6 +62,9 @@ pub enum DataField {
/// Fan speed or fan configuration.
#[cfg_attr(feature = "python", pydantic(value = "Fans"))]
Fans,
/// Miner-level fan duty cycle as a percentage (0-100).
#[cfg_attr(feature = "python", pydantic(value = "FanSpeedPercent"))]
FanSpeedPercent,
/// PSU fan speed or configuration.
#[cfg_attr(feature = "python", pydantic(value = "PsuFans"))]
PsuFans,
@@ -111,6 +114,9 @@ pub enum DataField {
/// Difficulty of the best share found over the miner's lifetime, when reported.
#[cfg_attr(feature = "python", pydantic(value = "BestShare"))]
BestShare,
/// Cumulative share statistics (difficulty accepted/rejected, stale, blocks).
#[cfg_attr(feature = "python", pydantic(value = "ShareSummary"))]
ShareSummary,
/// Difficulty of the best share found since the last boot or hashing start, when reported.
#[cfg_attr(feature = "python", pydantic(value = "SessionBestShare"))]
SessionBestShare,
+7
View File
@@ -17,6 +17,7 @@ use super::{
operating_state::OperatingState,
pool::PoolGroupData,
psu::PsuInfo,
share::ShareSummary,
};
use crate::data::{
deserialize::deserialize_macaddr,
@@ -177,6 +178,9 @@ pub struct MinerData {
pub expected_fans: Option<u8>,
/// The current fan information for the miner
pub fans: Vec<FanData>,
/// Miner-level fan duty cycle as a percentage (0-100), when reported. Firmware
/// exposes no maximum RPM, so this duty cycle is the normalized fan indicator.
pub fan_speed_percent: Option<f64>,
/// The current PDU fan information for the miner
pub psu_fans: Vec<FanData>,
/// The average temperature across all chips in the miner
@@ -237,6 +241,9 @@ pub struct MinerData {
/// Difficulty of the best share found since the last boot or hashing start,
/// when the firmware distinguishes session from all-time.
pub session_best_share: Option<f64>,
/// Cumulative share statistics (difficulty accepted/rejected, stale, blocks),
/// when reported. Miner-level aggregate from the cgminer/btminer summary.
pub share_summary: Option<ShareSummary>,
}
#[cfg(feature = "python")]
+54
View File
@@ -3,7 +3,61 @@
//! Firmwares report best-share difficulty as a JSON number, a decimal string,
//! or an AxeOS-style suffix string (`"483k"`, `"1.2M"`).
#[cfg(feature = "python")]
use pyo3::pyclass;
use serde::{Deserialize, Serialize};
use serde_json::Value;
use ts_rs::TS;
/// Cumulative share statistics reported by a miner (round 19 #10, T2).
///
/// These are miner-level aggregates from the cgminer/btminer summary. Difficulty
/// values are difficulty-weighted sums (not raw share counts, which live on
/// [`PoolData`][`super::pool::PoolData`]). Every field is optional; a backend
/// fills in only what its firmware exposes.
#[cfg_attr(feature = "python", pyclass(from_py_object, module = "asic_rs"))]
#[cfg_attr(feature = "python", asic_rs_pydantic::py_pydantic_model(getters))]
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, Default, TS)]
pub struct ShareSummary {
/// Difficulty-weighted accepted work, when reported.
pub difficulty_accepted: Option<f64>,
/// Difficulty-weighted rejected work, when reported.
pub difficulty_rejected: Option<f64>,
/// Raw stale share count, when reported.
pub stale_shares: Option<u64>,
/// Number of blocks found by this miner, when reported.
pub found_blocks: Option<u64>,
}
impl ShareSummary {
/// True when no field is populated.
pub fn is_empty(&self) -> bool {
self.difficulty_accepted.is_none()
&& self.difficulty_rejected.is_none()
&& self.stale_shares.is_none()
&& self.found_blocks.is_none()
}
}
/// Parse a [`ShareSummary`] from a cgminer/btminer `SUMMARY[0]` object (the value
/// extracted at `/SUMMARY/0`). Reads "Difficulty Accepted", "Difficulty Rejected",
/// "Stale", and "Found Blocks". Returns `None` when none are present.
pub fn parse_cgminer_share_summary(summary: &Value) -> Option<ShareSummary> {
let f = |k: &str| {
summary
.get(k)
.and_then(|v| v.as_f64())
.filter(|v| v.is_finite() && *v >= 0.0)
};
let u = |k: &str| summary.get(k).and_then(|v| v.as_u64());
let s = ShareSummary {
difficulty_accepted: f("Difficulty Accepted"),
difficulty_rejected: f("Difficulty Rejected"),
stale_shares: u("Stale"),
found_blocks: u("Found Blocks"),
};
(!s.is_empty()).then_some(s)
}
/// Parse a share difficulty from a JSON value.
///
+29
View File
@@ -34,6 +34,7 @@ use crate::{
operating_state::OperatingState,
pool::PoolGroupData,
psu::PsuInfo,
share::ShareSummary,
},
traits::firmware::MinerFirmware,
traits::model::MinerModel,
@@ -282,6 +283,7 @@ impl<
let fluid_temperature = self.parse_fluid_temperature(&data);
let outlet_fluid_temperature = self.parse_outlet_fluid_temperature(&data);
let fans = self.parse_fans(&data);
let fan_speed_percent = self.parse_fan_speed_percent(&data);
let psu_fans = self.parse_psu_fans(&data);
let hashboards = self.parse_hashboards(&data);
let light_flashing = self.parse_light_flashing(&data);
@@ -291,6 +293,7 @@ impl<
let pools = self.parse_pools(&data);
let best_share = self.parse_best_share(&data);
let session_best_share = self.parse_session_best_share(&data);
let share_summary = self.parse_share_summary(&data);
let device_info = self.get_device_info();
// computed fields
@@ -364,6 +367,7 @@ impl<
// Cooling information
expected_fans: device_info.hardware.fans,
fans,
fan_speed_percent,
psu_fans,
average_temperature,
fluid_temperature,
@@ -388,6 +392,7 @@ impl<
pools,
best_share,
session_best_share,
share_summary,
}
}
}
@@ -679,6 +684,18 @@ pub trait GetFans: CollectData {
fn parse_fans(&self, data: &HashMap<DataField, Value>) -> Vec<FanData> {
vec![]
}
#[tracing::instrument(level = "debug")]
async fn get_fan_speed_percent(&self) -> Option<f64> {
let mut collector = self.get_collector();
let data = collector.collect(&[DataField::FanSpeedPercent]).await;
self.parse_fan_speed_percent(&data)
}
/// Miner-level fan duty cycle as a percentage (0-100). Backends that expose it
/// override this; others return None.
#[allow(unused_variables)]
fn parse_fan_speed_percent(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
None
}
}
// PSU Fans
@@ -914,6 +931,18 @@ pub trait GetBestShare: CollectData {
fn parse_best_share(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
None
}
#[tracing::instrument(level = "debug")]
async fn get_share_summary(&self) -> Option<ShareSummary> {
let mut collector = self.get_collector();
let data = collector.collect(&[DataField::ShareSummary]).await;
self.parse_share_summary(&data)
}
/// Cumulative share statistics (difficulty accepted/rejected, stale, blocks).
/// Backends that expose them override this; others return None.
#[allow(unused_variables)]
fn parse_share_summary(&self, data: &HashMap<DataField, Value>) -> Option<ShareSummary> {
None
}
}
// Best share difficulty (this session / since boot)
+1 -1
View File
@@ -1 +1 @@
{"$comment":"This file only protects against accidental modifications. It is not a security mechanism and does not protect against malicious changes.","files":{".cargo_vcs_info.json":"6e42d50107b1a43fd7cf4a4c4f538468a337ed219ad8d6b23bd9abdabd123bd5","Cargo.lock":"7f984c7231c91f2def8f3e2e923a85c2e0b3239492f5ce23400881ea4de1aa16","Cargo.toml":"8a447efc18cd97d019a9771fb258b06f694499500561564eec75480e46bcc554","Cargo.toml.orig":"6c9e7b86804255debe03545c6358eb975d3d470810a19e6c40c680299a686b1f","src/backends/mod.rs":"65cdc60cdf38968f5a7e197338f4cf6173406ce69a4f0aaa96a9e29f4f581b6e","src/backends/v2020/firmware.rs":"5a41bfb8f42f17523e68f8702e87d75bcdb268bd4950bb66227f6966ef3576a9","src/backends/v2020/mod.rs":"63872e035c349d10a5377a8992d635bd053911970e29e4bc46b0c6d239994cec","src/backends/v2020/rpc.rs":"b517f88b9125fe1d8a20d5167f5d0d105b1339fce3d1a9fad5592e00470f46fb","src/backends/v2020/web.rs":"a6a3ad3eb77551b098b0092553b02cee43d165476d8c92164e12a1e765753b0d","src/backends/v2023_07/firmware.rs":"c07668e351d48dab3e24511b1aa9ab5e408bbcb5a438fdb0542a1377f94b9bbb","src/backends/v2023_07/mod.rs":"0c294d8515c56149571d2a504d68352bdaa206d0b996056f560c2ec60d9927f4","src/backends/v2023_07/rpc.rs":"2b24bbb432b302dd15f7a354054fc96c6a75cac2c8e75b8bcc11da37255a05a3","src/backends/v2023_07/web.rs":"d39b67ed83781b2c4fa84a445b9ffe785ae3001941f800ad9860e050c61c6506","src/firmware.rs":"e75c21d63218204b61bfab067599402e5c0b20452beaf0b16bfa79bf8afb6b35","src/lib.rs":"53f7acddeff8f7d82f80d09e0a9f91962011f9ccf2e441c4ca05cd7fc4eb292e","src/test/json/mod.rs":"a3ef4d6805bb4f8ea087e3a9b875e5a1664580e1ff3e3cd2015bb0c5c18ae7bb","src/test/json/v2020/devs.json":"df17cdfc9522e23450702b93f70ff701892db54c6ce6d986300453ad5e0d22db","src/test/json/v2020/mod.rs":"4c2512d36af834d400a865a94c2e8b1919f9d8dcbf54ab2530c73861c51af67d","src/test/json/v2020/pools.json":"4c4d19ad3ef0de84bfb18daaa48428b5f7917d23287c0196eacf3a6e389e7634","src/test/json/v2020/stats.json":"6d3cb463abb7539ae77aa44ef38e62a5dc0db54670aeacf3bbd01e83f49aa1fd","src/test/json/v2020/summary.json":"2f18c81f989b7c5f70dcb0ddac0520e56ec98b6da25c24e59354a6126c965dae","src/test/json/v2020/system_info.json":"51d1ce922e39a254518a24be56ca86ef1b5843582fb26c1ff0ec4ff6f8f91ccf","src/test/json/v2020/version.json":"ae898c4c9ea3462c3e79f9de755f1fccb4ef122b94a4a512e61aa74491c1a8e9","src/test/json/v2023_07/l11_stats.json":"2eab324f253ced9a0ea4e46466691e0e71fc6fde7558fec86bd5acf6bb9c717d","src/test/json/v2023_07/l11_summary.json":"1e0fdb61b968005d0ec5393d9dc889b09efb1398ffa427629bcc0a98d1b67c22","src/test/json/v2023_07/l11_version.json":"d116921a71731c6e492aed109731c39561e34a24c7df2a88d11ac52b80f6100a","src/test/json/v2023_07/l9_stats.json":"731ee545f16dafd356d22703248b91a37f74585ad73cc27441eb3461ce53dca0","src/test/json/v2023_07/l9_summary.json":"b32b5131ad46859b270d2dbb6bdba3c4e5d7301298daee4ce56332c98faaf81d","src/test/json/v2023_07/l9_version.json":"82f03ca6ea8873f12c4d9455f21b98c547801b58fbff1dcd83c837c0f337a129","src/test/json/v2023_07/mod.rs":"1360a8b155b120f2e755ede0736bcc0d76a9d1d693b984a1b51a16e6c0413791","src/test/mod.rs":"ed52c3d613eabc4a0346bb38bcfdf7a94933d61e368d3c9094821edeab92f81b"},"package":"0c06e3ecbf95ae3fe5e30aacae55cf6e7ad3d965f4a93b2f85c7b64f61fc75e2"}
{"$comment":"This file only protects against accidental modifications. It is not a security mechanism and does not protect against malicious changes.","files":{".cargo_vcs_info.json":"6e42d50107b1a43fd7cf4a4c4f538468a337ed219ad8d6b23bd9abdabd123bd5","Cargo.lock":"7f984c7231c91f2def8f3e2e923a85c2e0b3239492f5ce23400881ea4de1aa16","Cargo.toml":"8a447efc18cd97d019a9771fb258b06f694499500561564eec75480e46bcc554","Cargo.toml.orig":"6c9e7b86804255debe03545c6358eb975d3d470810a19e6c40c680299a686b1f","src/backends/mod.rs":"65cdc60cdf38968f5a7e197338f4cf6173406ce69a4f0aaa96a9e29f4f581b6e","src/backends/v2020/firmware.rs":"5a41bfb8f42f17523e68f8702e87d75bcdb268bd4950bb66227f6966ef3576a9","src/backends/v2020/mod.rs":"b2dbba5377a739bc8be3380cfbd09aa80893841c15c305bfd25f900ba7b6a0c9","src/backends/v2020/rpc.rs":"b517f88b9125fe1d8a20d5167f5d0d105b1339fce3d1a9fad5592e00470f46fb","src/backends/v2020/web.rs":"a6a3ad3eb77551b098b0092553b02cee43d165476d8c92164e12a1e765753b0d","src/backends/v2023_07/firmware.rs":"c07668e351d48dab3e24511b1aa9ab5e408bbcb5a438fdb0542a1377f94b9bbb","src/backends/v2023_07/mod.rs":"0906bff13eb51bd47fb0e06cc2c1955fe459c601cb467efc917801ead825dd61","src/backends/v2023_07/rpc.rs":"2b24bbb432b302dd15f7a354054fc96c6a75cac2c8e75b8bcc11da37255a05a3","src/backends/v2023_07/web.rs":"d39b67ed83781b2c4fa84a445b9ffe785ae3001941f800ad9860e050c61c6506","src/firmware.rs":"e75c21d63218204b61bfab067599402e5c0b20452beaf0b16bfa79bf8afb6b35","src/lib.rs":"53f7acddeff8f7d82f80d09e0a9f91962011f9ccf2e441c4ca05cd7fc4eb292e","src/test/json/mod.rs":"a3ef4d6805bb4f8ea087e3a9b875e5a1664580e1ff3e3cd2015bb0c5c18ae7bb","src/test/json/v2020/devs.json":"df17cdfc9522e23450702b93f70ff701892db54c6ce6d986300453ad5e0d22db","src/test/json/v2020/mod.rs":"4c2512d36af834d400a865a94c2e8b1919f9d8dcbf54ab2530c73861c51af67d","src/test/json/v2020/pools.json":"4c4d19ad3ef0de84bfb18daaa48428b5f7917d23287c0196eacf3a6e389e7634","src/test/json/v2020/stats.json":"6d3cb463abb7539ae77aa44ef38e62a5dc0db54670aeacf3bbd01e83f49aa1fd","src/test/json/v2020/summary.json":"2f18c81f989b7c5f70dcb0ddac0520e56ec98b6da25c24e59354a6126c965dae","src/test/json/v2020/system_info.json":"51d1ce922e39a254518a24be56ca86ef1b5843582fb26c1ff0ec4ff6f8f91ccf","src/test/json/v2020/version.json":"ae898c4c9ea3462c3e79f9de755f1fccb4ef122b94a4a512e61aa74491c1a8e9","src/test/json/v2023_07/l11_stats.json":"2eab324f253ced9a0ea4e46466691e0e71fc6fde7558fec86bd5acf6bb9c717d","src/test/json/v2023_07/l11_summary.json":"1e0fdb61b968005d0ec5393d9dc889b09efb1398ffa427629bcc0a98d1b67c22","src/test/json/v2023_07/l11_version.json":"d116921a71731c6e492aed109731c39561e34a24c7df2a88d11ac52b80f6100a","src/test/json/v2023_07/l9_stats.json":"731ee545f16dafd356d22703248b91a37f74585ad73cc27441eb3461ce53dca0","src/test/json/v2023_07/l9_summary.json":"b32b5131ad46859b270d2dbb6bdba3c4e5d7301298daee4ce56332c98faaf81d","src/test/json/v2023_07/l9_version.json":"82f03ca6ea8873f12c4d9455f21b98c547801b58fbff1dcd83c837c0f337a129","src/test/json/v2023_07/mod.rs":"1360a8b155b120f2e755ede0736bcc0d76a9d1d693b984a1b51a16e6c0413791","src/test/mod.rs":"ed52c3d613eabc4a0346bb38bcfdf7a94933d61e368d3c9094821edeab92f81b"},"package":"0c06e3ecbf95ae3fe5e30aacae55cf6e7ad3d965f4a93b2f85c7b64f61fc75e2"}
@@ -21,6 +21,7 @@ use asic_rs_core::{
message::{MessageSeverity, MinerMessage},
miner::{MiningMode, TuningTarget},
pool::{PoolData, PoolGroupData, PoolURL},
share::{ShareSummary, parse_cgminer_share_summary},
},
traits::{miner::*, model::MinerModel},
};
@@ -509,6 +510,16 @@ impl GetDataLocations for AntMinerV2020 {
tag: None,
},
)],
// Cumulative share stats from cgminer summary (round 19 #10, T2);
// RPC_SUMMARY already fetched.
DataField::ShareSummary => vec![(
RPC_SUMMARY,
DataExtractor {
func: get_by_pointer,
key: Some("/SUMMARY/0"),
tag: None,
},
)],
// `total_rateideal`, by contrast, says nothing about its own
// scale, so carry STATS' `rate_unit` alongside it.
DataField::ExpectedHashrate => vec![
@@ -889,6 +900,10 @@ impl GetBestShare for AntMinerV2020 {
// (round 19 #10).
data.extract::<f64>(DataField::BestShare).filter(|&v| v > 0.0)
}
fn parse_share_summary(&self, data: &HashMap<DataField, Value>) -> Option<ShareSummary> {
data.get(&DataField::ShareSummary)
.and_then(parse_cgminer_share_summary)
}
}
impl GetSessionBestShare for AntMinerV2020 {}
@@ -1679,6 +1694,12 @@ mod tests {
algo: HashAlgorithm::SHA256,
}
);
// Cumulative share stats from cgminer summary (round 19 #10, T2).
let shares = miner_data.share_summary.expect("share summary");
assert_eq!(shares.difficulty_accepted, Some(1305083904.0));
assert_eq!(shares.difficulty_rejected, Some(2490368.0));
assert_eq!(shares.stale_shares, Some(1));
assert_eq!(shares.found_blocks, Some(0));
}
#[tokio::test]
@@ -23,6 +23,7 @@ use asic_rs_core::{
message::{MessageSeverity, MinerMessage},
miner::{MiningMode, TuningTarget},
pool::{PoolData, PoolGroupData, PoolURL},
share::{ShareSummary, parse_cgminer_share_summary},
},
traits::{miner::*, model::MinerModel},
};
@@ -547,6 +548,16 @@ impl GetDataLocations for AntMinerV202307 {
tag: None,
},
)],
// Cumulative share stats from cgminer summary (round 19 #10, T2);
// RPC_SUMMARY already fetched.
DataField::ShareSummary => vec![(
RPC_SUMMARY,
DataExtractor {
func: get_by_pointer,
key: Some("/SUMMARY/0"),
tag: None,
},
)],
DataField::SessionBestShare => vec![(
RPC_SUMMARY,
DataExtractor {
@@ -955,6 +966,10 @@ impl GetBestShare for AntMinerV202307 {
// reports 0 when it has never found a share (round 17 R7).
data.extract::<f64>(DataField::BestShare).filter(|&v| v > 0.0)
}
fn parse_share_summary(&self, data: &HashMap<DataField, Value>) -> Option<ShareSummary> {
data.get(&DataField::ShareSummary)
.and_then(parse_cgminer_share_summary)
}
}
impl GetSessionBestShare for AntMinerV202307 {
File diff suppressed because one or more lines are too long
@@ -230,6 +230,16 @@ impl GetDataLocations for BraiinsV2507 {
tag: None,
},
)],
// Miner-level fan duty cycle (round 19 #10, T3): max target_speed_ratio;
// cooling state already fetched.
DataField::FanSpeedPercent => vec![(
WEB_COOLING_STATE,
DataExtractor {
func: get_by_pointer,
key: Some("/fans"),
tag: None,
},
)],
DataField::Hashboards => vec![(
WEB_HASHBOARDS,
DataExtractor {
@@ -567,6 +577,18 @@ impl GetFans for BraiinsV2507 {
fans
}
fn parse_fan_speed_percent(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
// Braiins fans[].target_speed_ratio is a 0-1 duty ratio; report the max as
// a percentage (round 19 #10, T3).
data.get(&DataField::FanSpeedPercent)
.and_then(|v| v.as_array())
.into_iter()
.flatten()
.filter_map(|f| f.pointer("/target_speed_ratio").and_then(|v| v.as_f64()))
.filter(|v| v.is_finite() && *v >= 0.0)
.map(|v| v * 100.0)
.max_by(|a, b| a.partial_cmp(b).unwrap_or(std::cmp::Ordering::Equal))
}
}
impl GetLightFlashing for BraiinsV2507 {
@@ -233,6 +233,16 @@ impl GetDataLocations for BraiinsV2604 {
tag: None,
},
)],
// Miner-level fan duty cycle (round 19 #10, T3): max target_speed_ratio;
// cooling state already fetched.
DataField::FanSpeedPercent => vec![(
WEB_COOLING_STATE,
DataExtractor {
func: get_by_pointer,
key: Some("/fans"),
tag: None,
},
)],
DataField::Hashboards => vec![(
WEB_HASHBOARDS,
DataExtractor {
@@ -598,6 +608,18 @@ impl GetFans for BraiinsV2604 {
fans
}
fn parse_fan_speed_percent(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
// Braiins fans[].target_speed_ratio is a 0-1 duty ratio; report the max as
// a percentage (round 19 #10, T3).
data.get(&DataField::FanSpeedPercent)
.and_then(|v| v.as_array())
.into_iter()
.flatten()
.filter_map(|f| f.pointer("/target_speed_ratio").and_then(|v| v.as_f64()))
.filter(|v| v.is_finite() && *v >= 0.0)
.map(|v| v * 100.0)
.max_by(|a, b| a.partial_cmp(b).unwrap_or(std::cmp::Ordering::Equal))
}
}
impl GetLightFlashing for BraiinsV2604 {
@@ -1287,6 +1309,10 @@ mod tests {
assert_eq!(hr.unit, HashRateUnit::TeraHash);
assert!((hr.value - 247.3507543407177).abs() < 1e-3);
}
// Miner-level fan duty cycle = max target_speed_ratio (0.92) x 100 (round
// 19 #10, T3).
let fan_pct = miner_data.fan_speed_percent.expect("braiins fan duty");
assert!((fan_pct - 92.0).abs() < 1e-6);
}
#[test]
+1 -1
View File
@@ -1 +1 @@
{"$comment":"This file only protects against accidental modifications. It is not a security mechanism and does not protect against malicious changes.","files":{".cargo_vcs_info.json":"4c9489c1f9b5f16e3fd8ab777da35bb120ccd0ca05f780cf94853c89fb5c8946","Cargo.lock":"69db8793725d6071e21b4353fb89537912096d7eccebd6ee597367330141f613","Cargo.toml":"df82261a9c3187bee15a7d6092d54ad2e9c7e4d1f127cd577c457d913f6881cf","Cargo.toml.orig":"e7c4ef90bc86763dad35d1a4da1c17c7e2f59eaac79e2f011647ae31c43d5e2b","src/backends/mod.rs":"1362c4d3805dccb7a78ef6b45d6a81b8f63b2be75fcf80329b6c2b0dd9e2d5c5","src/backends/v1/mod.rs":"b272ad45e4e44a56718596485aa6c3f9f3b28516a6d80d329a1f1594ccc3de95","src/backends/v1/web.rs":"3a567a4f581baa5d9d2d4e59d8acc754eec51d49b0a4f5434d87614b037a4a55","src/firmware.rs":"fb88124a51089756cc3271f3d4a234d73add61ab919c4710ef26a52dc8b5ef80","src/lib.rs":"53f7acddeff8f7d82f80d09e0a9f91962011f9ccf2e441c4ca05cd7fc4eb292e","src/test/json/mod.rs":"24191681066d5cf6a3022ad59c1baa92b57e3ce7717bb78d6a682af9e19a38c4","src/test/json/v1/capabilities.json":"d2b3dae7aa2a1e2977e0ddf62cf2d730de64cf12bf62388c12fd23dc5278bbcb","src/test/json/v1/chip_clocks.json":"d1f46d3aad6ad55ec1c02d0b26aa4c5034c1ccaefb130d7b0e46efe48bb122a0","src/test/json/v1/chip_hashrates.json":"9601a1289f93fe4e27c722d51b3a31daa71aec71f2c29e71f6d1eefe01edf7f2","src/test/json/v1/chip_temps.json":"cb7390e424af57f55f0c974ddfe0c98c4d5b4dbcd85887e38ff8caf7b19f62fe","src/test/json/v1/chip_voltages.json":"cb7390e424af57f55f0c974ddfe0c98c4d5b4dbcd85887e38ff8caf7b19f62fe","src/test/json/v1/mod.rs":"5671105221b84b0b6edb2df34b25bfc9e33459da285d4316be0db23ddb630e8d","src/test/json/v1/network.json":"3374b419fa2f0bc19544c670e08118bbc45bd4d121a577c5a6403c8c8100f628","src/test/json/v1/summary.json":"ac8ac018da9d619b5884f283b730bad2bf0a7e8f2032a7119193c9e5d87d6a7c","src/test/json/v1/temps.json":"794edf870985ed4398ead96670b8f5d01deb4d825fb14a8325087a29cd939fa8","src/test/mod.rs":"ed52c3d613eabc4a0346bb38bcfdf7a94933d61e368d3c9094821edeab92f81b"},"package":"268dc7c8b3289fccd3230ff87f7bfc727a3e7e2f6f72ae56ab9d27c63eabc5cf"}
{"$comment":"This file only protects against accidental modifications. It is not a security mechanism and does not protect against malicious changes.","files":{".cargo_vcs_info.json":"4c9489c1f9b5f16e3fd8ab777da35bb120ccd0ca05f780cf94853c89fb5c8946","Cargo.lock":"69db8793725d6071e21b4353fb89537912096d7eccebd6ee597367330141f613","Cargo.toml":"df82261a9c3187bee15a7d6092d54ad2e9c7e4d1f127cd577c457d913f6881cf","Cargo.toml.orig":"e7c4ef90bc86763dad35d1a4da1c17c7e2f59eaac79e2f011647ae31c43d5e2b","src/backends/mod.rs":"1362c4d3805dccb7a78ef6b45d6a81b8f63b2be75fcf80329b6c2b0dd9e2d5c5","src/backends/v1/mod.rs":"16625602cfff61557b0f4b9eaefdba193f629eca94a964302b5f5cf881af1120","src/backends/v1/web.rs":"3a567a4f581baa5d9d2d4e59d8acc754eec51d49b0a4f5434d87614b037a4a55","src/firmware.rs":"fb88124a51089756cc3271f3d4a234d73add61ab919c4710ef26a52dc8b5ef80","src/lib.rs":"53f7acddeff8f7d82f80d09e0a9f91962011f9ccf2e441c4ca05cd7fc4eb292e","src/test/json/mod.rs":"24191681066d5cf6a3022ad59c1baa92b57e3ce7717bb78d6a682af9e19a38c4","src/test/json/v1/capabilities.json":"d2b3dae7aa2a1e2977e0ddf62cf2d730de64cf12bf62388c12fd23dc5278bbcb","src/test/json/v1/chip_clocks.json":"d1f46d3aad6ad55ec1c02d0b26aa4c5034c1ccaefb130d7b0e46efe48bb122a0","src/test/json/v1/chip_hashrates.json":"9601a1289f93fe4e27c722d51b3a31daa71aec71f2c29e71f6d1eefe01edf7f2","src/test/json/v1/chip_temps.json":"cb7390e424af57f55f0c974ddfe0c98c4d5b4dbcd85887e38ff8caf7b19f62fe","src/test/json/v1/chip_voltages.json":"cb7390e424af57f55f0c974ddfe0c98c4d5b4dbcd85887e38ff8caf7b19f62fe","src/test/json/v1/mod.rs":"5671105221b84b0b6edb2df34b25bfc9e33459da285d4316be0db23ddb630e8d","src/test/json/v1/network.json":"3374b419fa2f0bc19544c670e08118bbc45bd4d121a577c5a6403c8c8100f628","src/test/json/v1/summary.json":"ac8ac018da9d619b5884f283b730bad2bf0a7e8f2032a7119193c9e5d87d6a7c","src/test/json/v1/temps.json":"794edf870985ed4398ead96670b8f5d01deb4d825fb14a8325087a29cd939fa8","src/test/mod.rs":"ed52c3d613eabc4a0346bb38bcfdf7a94933d61e368d3c9094821edeab92f81b"},"package":"268dc7c8b3289fccd3230ff87f7bfc727a3e7e2f6f72ae56ab9d27c63eabc5cf"}
+16
View File
@@ -473,6 +473,15 @@ impl GetDataLocations for PowerPlayV1 {
tag: None,
},
)],
// Miner-level fan duty cycle (round 19 #10, T3); summary already fetched.
DataField::FanSpeedPercent => vec![(
WEB_SUMMARY,
DataExtractor {
func: get_by_pointer,
key: Some("/Fans/Fans Speed"),
tag: None,
},
)],
DataField::Hashboards => vec![
(
WEB_TEMPS,
@@ -1120,6 +1129,11 @@ impl GetFans for PowerPlayV1 {
fans
}
fn parse_fan_speed_percent(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
// ePIC summary /Fans/Fans Speed is a single miner-level duty % (round 19 #10).
data.extract::<f64>(DataField::FanSpeedPercent)
.filter(|v| v.is_finite() && *v >= 0.0)
}
}
impl GetPsuFans for PowerPlayV1 {}
@@ -2189,6 +2203,8 @@ mod tests {
assert_eq!(miner_data.uptime, Some(Duration::from_secs(23170)));
assert_eq!(miner_data.wattage, Some(Power::from_watts(2166.6174)));
// Miner-level fan duty cycle from summary /Fans/Fans Speed (round 19 #10, T3).
assert_eq!(miner_data.fan_speed_percent, Some(100.0));
assert_eq!(miner_data.hashboards.len(), 3);
assert_eq!(miner_data.hashboards[0].active, Some(false));
assert_eq!(miner_data.hashboards[1].chips.len(), 110);
+1 -1
View File
@@ -1 +1 @@
{"$comment":"This file only protects against accidental modifications. It is not a security mechanism and does not protect against malicious changes.","files":{".cargo_vcs_info.json":"fe8effe2bfdda5d4c390656c016729f531a2b1c60033228557659c0befdde9f2","Cargo.lock":"a2b2cb45bb8b574e4f29ffdcdb5ebafd1dd87a0e6e11b47383973a99be367784","Cargo.toml":"503efa00123f8567f5fe40bf6a93e9e453d13094df0e0e1b7e98bdacdfbd2595","Cargo.toml.orig":"1c4ba0315fb491c086fc22a5c9bafaf7288c6b1fd48679c3d03dbd9df156a8b5","src/backends/mod.rs":"548d988b877410e330a55e275f64b2adad95ca5f1a0f085fe144957c96b8906f","src/backends/v1/mod.rs":"df4c8e3baad0cbc4ec490f095751211f31839b1b4d2929c1928e3bc54333f1d5","src/backends/v1/rpc.rs":"25b0b9d56fbf113d5b8c3d3bc8eb7a0d67967b1f90f6d855da0b9f6ff24ae335","src/firmware.rs":"d95345295ae5043dfc357e69ae56c564b261fdb3b19b5c0ad1765267ff05ab3f","src/lib.rs":"53f7acddeff8f7d82f80d09e0a9f91962011f9ccf2e441c4ca05cd7fc4eb292e","src/test/json/mod.rs":"24191681066d5cf6a3022ad59c1baa92b57e3ce7717bb78d6a682af9e19a38c4","src/test/json/v1/config.json":"6ca9e6217d853d4bf1e75d69159630e9c9184ede96751706b88dfb699b5d59ad","src/test/json/v1/devs.json":"8f746dc6a02953eee5ee96dcf53be8dc7880a8ffc2c6e303f0284bcf6a97f42d","src/test/json/v1/events.json":"913683ff97af3333018807e1cc6e43467ea8a55925e5964dc402616615e2a5e3","src/test/json/v1/fans.json":"f8a9a1234d651055c80f4ebb1380bbb4e6d19eb33012902c55fff1385e592447","src/test/json/v1/healthchipget_0.json":"10619460049333ca016b2beec59ecc514ed9077fb19bdf7d0ed697201f8cb96c","src/test/json/v1/healthchipget_1.json":"80927fb1480c95be7f3a4e155d63f68f97720530ff7cf5d5ade06f2a3e810bf0","src/test/json/v1/healthchipget_2.json":"1e93ee2ab472ee7af58add08b4251e3ce0ad4f986d4325abbf43fd4c9b3dd28f","src/test/json/v1/mod.rs":"5a050f07455e622e35ad79ab1c8a6daf2ea38c4198472e49c6bbfe80538a9e48","src/test/json/v1/pools.json":"0068745327e31853fec051172abb7337f18a4cf9972c51967113d63f4f31f504","src/test/json/v1/power.json":"80534bb4581de7c8b747bf33b5d629b909c6e16a531d18ecb4afd7ffad3f014f","src/test/json/v1/profiles.json":"1f00429036e270daa08f12cd2d7357135070c57acd7a899a3c0af6167fe82abb","src/test/json/v1/stats.json":"2b105f0eb927046c9d2389bde978a43e3d54d12a420dfbe400786bb2f0ae31ca","src/test/json/v1/summary.json":"aaea3378eb7040952037e2f1ef7bd5f20a1b242bf93d4ba0501c46104b0b31a0","src/test/json/v1/temps.json":"1ee781cd2be3ed6a6a07e23be930248735fb51348c160453ba10f6ef71fcb7f1","src/test/json/v1/version.json":"4beb6ca5c0ebf359cee0434fdcc4d0a1a0607436634e46be3fd951e2256595df","src/test/json/v1/voltageget_0.json":"c445fa8674c2542b2d296fbafdd3166c53008dfbd9da8095327217989d37f1da","src/test/json/v1/voltageget_1.json":"96b91c3447dd66e7f1f575ed3b99611062e8b1d516d31422b74e425c46b2f49c","src/test/json/v1/voltageget_2.json":"7d40544021b2e32401135ae333067b770d2d736ada9e60deaca8fd8f5a79a1e3","src/test/mod.rs":"ed52c3d613eabc4a0346bb38bcfdf7a94933d61e368d3c9094821edeab92f81b"},"package":"513792d93a2a21d5258d9e6ac0e6dc9e0a6365118934514b4e656792add78066"}
{"$comment":"This file only protects against accidental modifications. It is not a security mechanism and does not protect against malicious changes.","files":{".cargo_vcs_info.json":"fe8effe2bfdda5d4c390656c016729f531a2b1c60033228557659c0befdde9f2","Cargo.lock":"a2b2cb45bb8b574e4f29ffdcdb5ebafd1dd87a0e6e11b47383973a99be367784","Cargo.toml":"503efa00123f8567f5fe40bf6a93e9e453d13094df0e0e1b7e98bdacdfbd2595","Cargo.toml.orig":"1c4ba0315fb491c086fc22a5c9bafaf7288c6b1fd48679c3d03dbd9df156a8b5","src/backends/mod.rs":"548d988b877410e330a55e275f64b2adad95ca5f1a0f085fe144957c96b8906f","src/backends/v1/mod.rs":"2c04560cd60492adf42bc33549247f70601056a0355aebbf8b5638be881b5627","src/backends/v1/rpc.rs":"25b0b9d56fbf113d5b8c3d3bc8eb7a0d67967b1f90f6d855da0b9f6ff24ae335","src/firmware.rs":"d95345295ae5043dfc357e69ae56c564b261fdb3b19b5c0ad1765267ff05ab3f","src/lib.rs":"53f7acddeff8f7d82f80d09e0a9f91962011f9ccf2e441c4ca05cd7fc4eb292e","src/test/json/mod.rs":"24191681066d5cf6a3022ad59c1baa92b57e3ce7717bb78d6a682af9e19a38c4","src/test/json/v1/config.json":"6ca9e6217d853d4bf1e75d69159630e9c9184ede96751706b88dfb699b5d59ad","src/test/json/v1/devs.json":"8f746dc6a02953eee5ee96dcf53be8dc7880a8ffc2c6e303f0284bcf6a97f42d","src/test/json/v1/events.json":"913683ff97af3333018807e1cc6e43467ea8a55925e5964dc402616615e2a5e3","src/test/json/v1/fans.json":"f8a9a1234d651055c80f4ebb1380bbb4e6d19eb33012902c55fff1385e592447","src/test/json/v1/healthchipget_0.json":"10619460049333ca016b2beec59ecc514ed9077fb19bdf7d0ed697201f8cb96c","src/test/json/v1/healthchipget_1.json":"80927fb1480c95be7f3a4e155d63f68f97720530ff7cf5d5ade06f2a3e810bf0","src/test/json/v1/healthchipget_2.json":"1e93ee2ab472ee7af58add08b4251e3ce0ad4f986d4325abbf43fd4c9b3dd28f","src/test/json/v1/mod.rs":"5a050f07455e622e35ad79ab1c8a6daf2ea38c4198472e49c6bbfe80538a9e48","src/test/json/v1/pools.json":"0068745327e31853fec051172abb7337f18a4cf9972c51967113d63f4f31f504","src/test/json/v1/power.json":"80534bb4581de7c8b747bf33b5d629b909c6e16a531d18ecb4afd7ffad3f014f","src/test/json/v1/profiles.json":"1f00429036e270daa08f12cd2d7357135070c57acd7a899a3c0af6167fe82abb","src/test/json/v1/stats.json":"2b105f0eb927046c9d2389bde978a43e3d54d12a420dfbe400786bb2f0ae31ca","src/test/json/v1/summary.json":"aaea3378eb7040952037e2f1ef7bd5f20a1b242bf93d4ba0501c46104b0b31a0","src/test/json/v1/temps.json":"1ee781cd2be3ed6a6a07e23be930248735fb51348c160453ba10f6ef71fcb7f1","src/test/json/v1/version.json":"4beb6ca5c0ebf359cee0434fdcc4d0a1a0607436634e46be3fd951e2256595df","src/test/json/v1/voltageget_0.json":"c445fa8674c2542b2d296fbafdd3166c53008dfbd9da8095327217989d37f1da","src/test/json/v1/voltageget_1.json":"96b91c3447dd66e7f1f575ed3b99611062e8b1d516d31422b74e425c46b2f49c","src/test/json/v1/voltageget_2.json":"7d40544021b2e32401135ae333067b770d2d736ada9e60deaca8fd8f5a79a1e3","src/test/mod.rs":"ed52c3d613eabc4a0346bb38bcfdf7a94933d61e368d3c9094821edeab92f81b"},"package":"513792d93a2a21d5258d9e6ac0e6dc9e0a6365118934514b4e656792add78066"}
@@ -20,6 +20,7 @@ use asic_rs_core::{
message::{MessageSeverity, MinerMessage},
miner::TuningTarget,
pool::{PoolData, PoolGroupData, PoolURL},
share::{ShareSummary, parse_cgminer_share_summary},
},
traits::{miner::*, model::MinerModel},
};
@@ -294,6 +295,16 @@ impl GetDataLocations for LuxMinerV1 {
tag: None,
},
)],
// Miner-level fan duty cycle (round 19 #10, T3): max of per-fan Speed;
// RPC_FANS already fetched.
DataField::FanSpeedPercent => vec![(
RPC_FANS,
DataExtractor {
func: get_by_pointer,
key: Some("/FANS"),
tag: None,
},
)],
DataField::ApiVersion => vec![(
RPC_VERSION,
DataExtractor {
@@ -455,6 +466,16 @@ impl GetDataLocations for LuxMinerV1 {
tag: None,
},
)],
// Cumulative share stats from LuxOS summary (round 19 #10, T2);
// RPC_SUMMARY already fetched.
DataField::ShareSummary => vec![(
RPC_SUMMARY,
DataExtractor {
func: get_by_pointer,
key: Some("/SUMMARY/0"),
tag: None,
},
)],
DataField::SessionBestShare => vec![(
RPC_SUMMARY,
DataExtractor {
@@ -925,6 +946,17 @@ impl GetFans for LuxMinerV1 {
})
.collect()
}
fn parse_fan_speed_percent(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
// LuxOS FANS[].Speed is per-fan duty %; report the fleet-facing maximum
// (round 19 #10, T3).
data.get(&DataField::FanSpeedPercent)
.and_then(|v| v.as_array())
.into_iter()
.flatten()
.filter_map(|f| f.get("Speed").and_then(|v| v.as_f64()))
.filter(|v| v.is_finite() && *v >= 0.0)
.max_by(|a, b| a.partial_cmp(b).unwrap_or(std::cmp::Ordering::Equal))
}
}
impl GetLightFlashing for LuxMinerV1 {
@@ -945,6 +977,10 @@ impl GetBestShare for LuxMinerV1 {
// LuxOS summary -> "Best Share" (all-time), round 16 / G9.
data.extract::<f64>(DataField::BestShare)
}
fn parse_share_summary(&self, data: &HashMap<DataField, Value>) -> Option<ShareSummary> {
data.get(&DataField::ShareSummary)
.and_then(parse_cgminer_share_summary)
}
}
impl GetSessionBestShare for LuxMinerV1 {
fn parse_session_best_share(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
@@ -1665,6 +1701,9 @@ mod tests {
Some(TuningTarget::Power(Power::from_watts(1188f64)))
);
assert_eq!(miner_data.fans.len(), 4);
// Miner-level fan duty cycle = max of per-fan Speed (all 20 here); round 19
// #10, T3.
assert_eq!(miner_data.fan_speed_percent, Some(20.0));
assert_eq!(miner_data.hashboards[0].chips.len(), 77);
assert_eq!(miner_data.pools.len(), 2);
assert_eq!(miner_data.pools[0].len(), 2);
+1 -1
View File
@@ -1 +1 @@
{"$comment":"This file only protects against accidental modifications. It is not a security mechanism and does not protect against malicious changes.","files":{".cargo_vcs_info.json":"30f09ad063df45fdf223aff235fe2da15cb1a7e79e86d7012074153b91662fc4","Cargo.lock":"9d0886791db53421d3218ab72d964145b86cfbe9738eaf09aac5d3c89a1c0190","Cargo.toml":"8c2e9938436850f2e250e8268ed7b385fce903e2077923b207a0560ca3e3242c","Cargo.toml.orig":"891fcfa45e79d6bc4d838c4f3075618f791bd013c99231da48e752b987f409d5","src/backends/mod.rs":"0f5a0ae31d5443d0d0f41a2540def806196238c92d22761b3ad9843cb2e77f45","src/backends/v1/mod.rs":"ba440ed8b997847a79117f143f162b1c5d8484e15a5bee3dcfc6a6b5de622743","src/backends/v1/rpc.rs":"72f9b67c2389ab6e9968e0eb340bd2b6aad9aaf059f4429eb31398863bb87f42","src/backends/v2/mod.rs":"18932153a8214bb6588e753a6242a9e729a24a9ae9a9bf30772e87477505c4f0","src/backends/v2/rpc.rs":"52f8d504c236009b020bf33b5550236e36d07b2c73a15bdcfcafa5188e4e1cb6","src/backends/v3/mod.rs":"2cf0311d1dba5d175ad7501917e7b9b3abdc3f1f5ef8993d9d3f453cecd3c09f","src/backends/v3/rpc.rs":"7a5f80aec4af1bcaa0d36e67345aa9acbbd8ead73c0be474f06305358b38e81b","src/error_codes.rs":"b2af610880fb400a9e6297662371a6b3b55077b72cf11115b77fd4d2df44e6a1","src/firmware.rs":"6d002e481ce0a897c0485b9393b0382fcb25811164e893eb8eb67b2ff392ca0d","src/lib.rs":"710b46c9d934f26f900e1366ca1df5f872896e7d8da03569c0f159859e899cc9","src/test/json/mod.rs":"99760925ccfefc40d2455d3567fb1ecfc99e9e55e70478190ef372a954825909","src/test/json/v1/devs.json":"b4fd010f0bae3584efde93387cf2dab5933b499cc30a2dd7635fdc994b56c3b8","src/test/json/v1/get_psu.json":"8c11b6495e0bd5da496dd5c10ca53ec53b2d8fe9a3737f470ec9ce2c1aaf9d99","src/test/json/v1/get_version.json":"c43e947e654792ab191210d50c6f793ee0dd7af41e8cb59f0722b70f32a203bc","src/test/json/v1/mod.rs":"a12ec375a02238d5e26b64e2f7aeb0fc336747d86ae012dc154265ee5afaabbf","src/test/json/v1/pools.json":"b570808a3428a0773d7d2ee322150d8fd0794a33804af970300a7fef128a8a01","src/test/json/v1/status.json":"00ec38dd9f980b7ac0ffd6f815374afdbbed98d601bd8ef18bcf0f76ae0aa853","src/test/json/v1/summary.json":"d6e3e75654eb4019e1f479b3d9cf3097130f1afb85dd3338682c094fd4ab498a","src/test/json/v1/summary_with_errors.json":"1ba682f6ad5c43e41ae22a4069d0f52f04da3f07a18031bf4c07e07b3c59cc97","src/test/json/v2/devs.json":"2d203e41ef6ef337c0c81456b73d08730882c3167403c557c3c9776022a972d1","src/test/json/v2/get_error_code.json":"e90b702fd97bceb4f62dcb8228f75ff5ce930290355dca94eefd7192f7f57009","src/test/json/v2/get_error_code_with_errors.json":"6cb6038366eb3835684421c41be0b2b30ae8ce79a7ed51a85f4f52f70da9df16","src/test/json/v2/get_miner_info.json":"55d2af984833a692f502188ae4df4e41bdc10386b47f921c896a452ef1de9062","src/test/json/v2/get_psu.json":"b43086b65897061521d1f6611e200ef372a1724f9ea1876e347c03d5fb19b8f2","src/test/json/v2/get_version.json":"b17e3a81603b43186b2e15745e6822b6c82b3c6f5928b22f84e683d7728dbfcd","src/test/json/v2/mod.rs":"c847205d076323bbd9698e393d241b08f3cf75d32aae86f7058cf8748266b935","src/test/json/v2/pools.json":"926d34e8dae774473ebfec83d4a38e77ca73231708f07683763e212be7af0580","src/test/json/v2/status.json":"fc268cd23864ef99e84813dbf8eb916b2e6f339351a0ee5dab217cbe02569fc3","src/test/json/v2/summary.json":"4e4c01b986e2960893f58d0f1ea4dce23b8ef88db4985348f7f0183eb4818478","src/test/json/v3/get_device_info.json":"83ac22ea9a11adbceb4c963db80aa62d9a2aa50d019a372394dece817d924cda","src/test/json/v3/get_device_info_with_errors.json":"24cee4b7840e87e12147cbfddf6c361f3b378a15bb85330b339d3be9e17cdbd5","src/test/json/v3/get_miner_status_edevs.json":"2d831c06113f555e0988df994c2e602a053a4aea603dded0db8f0f80e191ca5a","src/test/json/v3/get_miner_status_pools.json":"cd65c2efd3a5ce80b57aae46c420298a34ca06df7ac7f8c36fd556217703d242","src/test/json/v3/get_miner_status_summary.json":"799a94ba13ef54aed0f81a3d041d6c1fa263d4183754b384c69ca12d85a8d3ba","src/test/json/v3/mod.rs":"7ea3a8ff1b81c7a5b0f44f7c12dda880a9aeac5b0e6b56ac4fff4f4a7cbfe451","src/test/mod.rs":"ed52c3d613eabc4a0346bb38bcfdf7a94933d61e368d3c9094821edeab92f81b"},"package":"c85da6325b62f061327dc5f7605dd3721c823a9e8a2cfd6a356363dfbc84d66e"}
{"$comment":"This file only protects against accidental modifications. It is not a security mechanism and does not protect against malicious changes.","files":{".cargo_vcs_info.json":"30f09ad063df45fdf223aff235fe2da15cb1a7e79e86d7012074153b91662fc4","Cargo.lock":"9d0886791db53421d3218ab72d964145b86cfbe9738eaf09aac5d3c89a1c0190","Cargo.toml":"8c2e9938436850f2e250e8268ed7b385fce903e2077923b207a0560ca3e3242c","Cargo.toml.orig":"891fcfa45e79d6bc4d838c4f3075618f791bd013c99231da48e752b987f409d5","src/backends/mod.rs":"0f5a0ae31d5443d0d0f41a2540def806196238c92d22761b3ad9843cb2e77f45","src/backends/v1/mod.rs":"2622d7b51dab7f749d20fc04dda371320271b8078fed0c352515becc7daebc47","src/backends/v1/rpc.rs":"72f9b67c2389ab6e9968e0eb340bd2b6aad9aaf059f4429eb31398863bb87f42","src/backends/v2/mod.rs":"9bab68108a178f6a1e2c32481c94e0dcd38c3123e633bf89773b62a9c529290b","src/backends/v2/rpc.rs":"52f8d504c236009b020bf33b5550236e36d07b2c73a15bdcfcafa5188e4e1cb6","src/backends/v3/mod.rs":"2cf0311d1dba5d175ad7501917e7b9b3abdc3f1f5ef8993d9d3f453cecd3c09f","src/backends/v3/rpc.rs":"7a5f80aec4af1bcaa0d36e67345aa9acbbd8ead73c0be474f06305358b38e81b","src/error_codes.rs":"b2af610880fb400a9e6297662371a6b3b55077b72cf11115b77fd4d2df44e6a1","src/firmware.rs":"6d002e481ce0a897c0485b9393b0382fcb25811164e893eb8eb67b2ff392ca0d","src/lib.rs":"710b46c9d934f26f900e1366ca1df5f872896e7d8da03569c0f159859e899cc9","src/test/json/mod.rs":"99760925ccfefc40d2455d3567fb1ecfc99e9e55e70478190ef372a954825909","src/test/json/v1/devs.json":"b4fd010f0bae3584efde93387cf2dab5933b499cc30a2dd7635fdc994b56c3b8","src/test/json/v1/get_psu.json":"8c11b6495e0bd5da496dd5c10ca53ec53b2d8fe9a3737f470ec9ce2c1aaf9d99","src/test/json/v1/get_version.json":"c43e947e654792ab191210d50c6f793ee0dd7af41e8cb59f0722b70f32a203bc","src/test/json/v1/mod.rs":"a12ec375a02238d5e26b64e2f7aeb0fc336747d86ae012dc154265ee5afaabbf","src/test/json/v1/pools.json":"b570808a3428a0773d7d2ee322150d8fd0794a33804af970300a7fef128a8a01","src/test/json/v1/status.json":"00ec38dd9f980b7ac0ffd6f815374afdbbed98d601bd8ef18bcf0f76ae0aa853","src/test/json/v1/summary.json":"d6e3e75654eb4019e1f479b3d9cf3097130f1afb85dd3338682c094fd4ab498a","src/test/json/v1/summary_with_errors.json":"1ba682f6ad5c43e41ae22a4069d0f52f04da3f07a18031bf4c07e07b3c59cc97","src/test/json/v2/devs.json":"2d203e41ef6ef337c0c81456b73d08730882c3167403c557c3c9776022a972d1","src/test/json/v2/get_error_code.json":"e90b702fd97bceb4f62dcb8228f75ff5ce930290355dca94eefd7192f7f57009","src/test/json/v2/get_error_code_with_errors.json":"6cb6038366eb3835684421c41be0b2b30ae8ce79a7ed51a85f4f52f70da9df16","src/test/json/v2/get_miner_info.json":"55d2af984833a692f502188ae4df4e41bdc10386b47f921c896a452ef1de9062","src/test/json/v2/get_psu.json":"b43086b65897061521d1f6611e200ef372a1724f9ea1876e347c03d5fb19b8f2","src/test/json/v2/get_version.json":"b17e3a81603b43186b2e15745e6822b6c82b3c6f5928b22f84e683d7728dbfcd","src/test/json/v2/mod.rs":"c847205d076323bbd9698e393d241b08f3cf75d32aae86f7058cf8748266b935","src/test/json/v2/pools.json":"926d34e8dae774473ebfec83d4a38e77ca73231708f07683763e212be7af0580","src/test/json/v2/status.json":"fc268cd23864ef99e84813dbf8eb916b2e6f339351a0ee5dab217cbe02569fc3","src/test/json/v2/summary.json":"4e4c01b986e2960893f58d0f1ea4dce23b8ef88db4985348f7f0183eb4818478","src/test/json/v3/get_device_info.json":"83ac22ea9a11adbceb4c963db80aa62d9a2aa50d019a372394dece817d924cda","src/test/json/v3/get_device_info_with_errors.json":"24cee4b7840e87e12147cbfddf6c361f3b378a15bb85330b339d3be9e17cdbd5","src/test/json/v3/get_miner_status_edevs.json":"2d831c06113f555e0988df994c2e602a053a4aea603dded0db8f0f80e191ca5a","src/test/json/v3/get_miner_status_pools.json":"cd65c2efd3a5ce80b57aae46c420298a34ca06df7ac7f8c36fd556217703d242","src/test/json/v3/get_miner_status_summary.json":"799a94ba13ef54aed0f81a3d041d6c1fa263d4183754b384c69ca12d85a8d3ba","src/test/json/v3/mod.rs":"7ea3a8ff1b81c7a5b0f44f7c12dda880a9aeac5b0e6b56ac4fff4f4a7cbfe451","src/test/mod.rs":"ed52c3d613eabc4a0346bb38bcfdf7a94933d61e368d3c9094821edeab92f81b"},"package":"c85da6325b62f061327dc5f7605dd3721c823a9e8a2cfd6a356363dfbc84d66e"}
@@ -19,6 +19,7 @@ use asic_rs_core::{
miner::TuningTarget,
pool::{PoolData, PoolGroupData, PoolURL},
psu::PsuInfo,
share::{ShareSummary, parse_cgminer_share_summary},
},
traits::{miner::*, model::MinerModel},
};
@@ -264,6 +265,16 @@ impl GetDataLocations for WhatsMinerV1 {
tag: None,
},
)],
// Cumulative share stats from btminer summary (round 19 #10, T2);
// RPC_SUMMARY already fetched.
DataField::ShareSummary => vec![(
RPC_SUMMARY,
DataExtractor {
func: get_by_pointer,
key: Some("/SUMMARY/0"),
tag: None,
},
)],
DataField::ExpectedHashrate => vec![(
RPC_SUMMARY,
DataExtractor {
@@ -597,6 +608,10 @@ impl GetBestShare for WhatsMinerV1 {
fn parse_best_share(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
data.extract::<f64>(DataField::BestShare).filter(|&v| v > 0.0)
}
fn parse_share_summary(&self, data: &HashMap<DataField, Value>) -> Option<ShareSummary> {
data.get(&DataField::ShareSummary)
.and_then(parse_cgminer_share_summary)
}
}
impl GetSessionBestShare for WhatsMinerV1 {}
impl GetOperatingState for WhatsMinerV1 {}
@@ -969,6 +984,14 @@ mod integration_tests {
assert_eq!(hr.unit, HashRateUnit::TeraHash);
assert!((hr.value - 67.43935249).abs() < 1e-6);
}
// Cumulative share stats from summary (round 19 #10, T2).
let shares = miner_data
.share_summary
.ok_or_else(|| anyhow::anyhow!("v1 should expose share summary"))?;
assert_eq!(shares.difficulty_accepted, Some(158334976.0));
assert_eq!(shares.difficulty_rejected, Some(0.0));
assert_eq!(shares.stale_shares, Some(0));
assert_eq!(shares.found_blocks, Some(0));
assert_eq!(miner_data.wattage, Some(Power::from_watts(3417f64)));
assert_eq!(
miner_data.tuning_target,
@@ -21,6 +21,7 @@ use asic_rs_core::{
miner::{MiningMode, TuningTarget},
pool::{PoolData, PoolGroupData, PoolURL},
psu::PsuInfo,
share::{ShareSummary, parse_cgminer_share_summary},
},
traits::{miner::*, model::MinerModel},
util::is_expected_write_error,
@@ -265,6 +266,16 @@ impl GetDataLocations for WhatsMinerV2 {
tag: None,
},
)],
// Cumulative share stats from btminer summary (round 19 #10, T2);
// RPC_SUMMARY already fetched.
DataField::ShareSummary => vec![(
RPC_SUMMARY,
DataExtractor {
func: get_by_pointer,
key: Some("/SUMMARY/0"),
tag: None,
},
)],
DataField::ExpectedHashrate => vec![(
RPC_SUMMARY,
DataExtractor {
@@ -592,6 +603,10 @@ impl GetBestShare for WhatsMinerV2 {
fn parse_best_share(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
data.extract::<f64>(DataField::BestShare).filter(|&v| v > 0.0)
}
fn parse_share_summary(&self, data: &HashMap<DataField, Value>) -> Option<ShareSummary> {
data.get(&DataField::ShareSummary)
.and_then(parse_cgminer_share_summary)
}
}
impl GetSessionBestShare for WhatsMinerV2 {}
impl GetOperatingState for WhatsMinerV2 {}