Compare commits

...
65 Commits
Author SHA1 Message Date
noah 8ab83edc73 Derive toolkit quality grade from measured coverage 2026-10-15 03:34:11 -06:00
noah 601da0548b Revalidate artifacts and guard complete flash streams 2026-10-14 20:54:29 -06:00
noah 4592b927ad Use Gitea-compatible pinned artifact upload 2026-10-14 20:51:23 -06:00
noah 5e347315e2 Publish measured toolkit badges from main CI 2026-10-14 20:44:35 -06:00
noah 603c49a395 Guard verified artifact writes with recovery checks 2026-10-14 20:40:22 -06:00
noah bc8e0535d1 Verify toolkit firmware artifacts before install 2026-10-14 20:31:04 -06:00
noah cf1eaebae1 Record private toolkit benchmark history 2026-10-14 20:21:19 -06:00
noah f89f220f3e Standardize toolkit CI badges and scoped release auth 2026-10-14 20:05:49 -06:00
alkane-ci c18a37eebc ci: refresh README badges [skip release] 2026-10-13 23:27:22 +00:00
noah d3a06d682f Read benchmark coverage from release objects 2026-10-13 12:09:59 -06:00
noah 4d530721dc Trim CI script trailing blank lines 2026-10-13 11:54:00 -06:00
noah 0b691ca943 Add next release candidates and main branch gates 2026-10-13 11:53:22 -06:00
alkane-ci ed0f781851 ci: refresh README badges [skip release] 2026-10-02 16:16:14 +00:00
noahandClaude Opus 4.8 613132035a feat(gui,asic-rs): hashboard yellow-not-red, power-limit column, chip/HB/PSU-serial coverage
Round 21 (three reported items).

1. A hashboard that is still mining near full hashrate but has some failed chips
   now shows yellow (degraded), not red. VNish emits per-board chip failures as
   Warning while the board is mining (Error only when the board is not mining),
   and board_healths() renders a warning-only board as Degraded instead of Down.
   Verified live on 10.4.0.193 (mining ~83%, dead chips -> yellow).

2. New "Power limit" column: the configured power-target setpoint in watts
   (MinerRow.power_limit_w, from a Power tuning target). WhatsMiner shows its
   "Power Limit" (e.g. 2500 W); the value was already scanned but had no dedicated
   column. Numeric (sortable/filterable), Performance category, opt-in.

3. Chip + hashboard model coverage:
   - VNish hashboard model scanned from factory-info board_model (A3HB70601,
     BHB42603, ...) -- 147-unit fleet gains HB model. Both VNish backends.
   - WhatsMiner v1/v2 PSU serial scanned from get_psu serial_no (was hardcoded
     None). 48-unit fleet gains PSU serial.
   - Chip type derived from the detected model for Antminer hardware (VNish/stock/
     LuxOS/Braiins/UMC never report a chip string on the wire), in naming.rs:
     S21Pro->BM1370, S19jPro->BM1362, S19KPro->BM1366, S19/T19->BM1398, etc.
     Only high-confidence mappings; WhatsMiner and unknown models stay blank.
   PSU Vmin/Vmax remain Braiins/ePIC-only (not on the wire for WhatsMiner/VNish/
   Antminer -- confirmed live).

asic-rs patch 0033. 95 unit tests pass.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Djv3oncM4LxTS5tb61Ako6
2026-10-02 10:09:07 -06:00
alkane-ci b3dc5a336e ci: refresh README badges [skip release] 2026-09-24 21:33:46 +00:00
noahandClaude Opus 4.8 a4d0cb65f0 fix(gui,vnish): hashrate 0-vs-dash, paused health colours, VNish per-hashboard faults
- Hashrate cell: a readable 0 hashrate now shows "0.00T" instead of a dash. The
  dash is reserved for an unreadable/absent hashrate. New MinerRow.hashrate_known
  records whether the miner reported a value; combined_si/num_value key off it,
  and scan/fixtures set it from data.hashrate.is_some().
- Paused-miner Health icons: the control board (brain) and PSU keep their true
  health (green when fine) instead of turning blue; fans turn blue only when
  actually stopped (0 RPM) and stay green while spinning; hashboards stay blue
  while paused (idle is the expected state).
- VNish per-hashboard faults: DataField::Messages now also reads the summary
  chains (chip_statuses red/orange + per-chain state) and emits one message per
  faulted board, attributed to MinerComponent::HashBoard{idx}, so the Health
  column reds the specific board and its tooltip carries the fault instead of it
  landing on the brain. Applied to v1_2_0 and v1_3_0. patch 0032.

Verified live: VNish 10.7.1.25 -> "Hashboard 2: 1 degraded chip(s)" on board idx
1; healthy 10.7.1.122 -> no messages. 93 unit tests pass.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Djv3oncM4LxTS5tb61Ako6
2026-09-24 15:14:20 -06:00
alkane-ci 29b9b17c67 ci: refresh README badges [skip release] 2026-09-24 19:32:29 +00:00
noahandClaude Opus 4.8 8deecf3558 fix(gui): paused/stopped miners shown as broken (red) instead of paused (blue)
A miner an operator has stopped (e.g. 10.4.1.122, VNish miner_state "stopped" ->
OperatingState::Stopped) was read as broken: red hashboards and counted under "not
hashing" instead of "Paused".

Two causes:
1. is_paused() only matched the literal "pause" substring, so "Stopped"/"Stopping"/
   "Suspended" -- every other firmware's word for an intentional, resumable halt --
   fell through to not-paused. Now matches pause/stop/suspend (Error stays broken).
2. encode_component_health applied the paused-blue treatment to hashboards only
   (round 19 #19), so a paused miner's idle fans/power still rendered red. A stopped
   miner's off components are expected, not faults: colour every reported component
   blue when paused (an undetected/Unreachable one still stays grey -- "not present"
   is not "paused").

Verified live against 10.4.1.122 on a headless build: the row now shows all-blue
health (power grey, honestly unreachable) and counts under the Paused KPI, where it
previously showed red boards + "not hashing".

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Djv3oncM4LxTS5tb61Ako6
2026-09-24 13:08:18 -06:00
alkane-ci 3a6a190ce1 ci: refresh README badges [skip release] 2026-09-24 16:25:36 +00:00
noahandClaude Opus 4.8 1f0a4cbe76 fix(gui): health icon tooltips never showed -- tip area used wrong coordinates
Round 19 #2. The health-icon hover tooltips never appeared because the GTK
query-tooltip handler built the per-icon "tip area" from gtk_tree_view_get_cell_area
(BIN-WINDOW coordinates) and passed it to gtk_tooltip_set_tip_area, which expects
WIDGET coordinates. The area was offset upward by the column-header height, so it
did not contain the pointer, and GTK suppresses any tooltip whose tip area excludes
the cursor -- so nothing showed. The Errors column worked because it sets no tip
area. Prior fixes (rounds 15/18/19) only tuned the icon slot math, which was already
correct; the coordinate-system mismatch was the actual cause.

Convert the slot rectangle from bin-window to widget coordinates with
gtk_tree_view_convert_bin_window_to_widget_coords before gtk_tooltip_set_tip_area.
The slot hit-test (block_left/adv, in bin-window coords) is unchanged and still
matches DrawShape's uniform health-icon advance. wx-rs patch 0005.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Djv3oncM4LxTS5tb61Ako6
2026-09-24 10:03:58 -06:00
alkane-ci fbc43216fb ci: refresh README badges [skip release] 2026-09-24 00:27:48 +00:00
noahandClaude Opus 4.8 a4fcb6e763 asic-rs telemetry: VNish fan%/temps, WhatsMiner chip type, and auto-tuner status
Round 19 #10 telemetry extension, live-verified. Two logical changes (patches 0030
and 0031) shipped together; they populate existing GUI columns plus one new "Tuner"
column.

VNish + WhatsMiner (patch 0030, no core/GUI change):
- VNish v1_2_0 + v1_3_0: fan duty % (summary /miner/cooling/fan_duty) and board temp
  thresholds (settings restart_temp -> dangerous, auto cooling param -> target).
  Live-verified 10.4.1.50 (81 / 90 / 65). No PSU serial exposed -> stays None.
- WhatsMiner chip type (per user, do not drop): v1/v2 summary "Chip Data" merged
  into hashboards -> BoardData.chip_type (first token); v3 chipdataN -> chip_type and
  hash-board ("K40") -> hashboard_model.

Auto-tuner status (patch 0031):
- New DataField::TunerStatus + MinerData.tuner_status (Option<String>), riding the
  existing GetOperatingState trait via a defaulted parse_tuner_status.
- Braiins: performance/tuner-state overall_tuner_state via the BOS+ TunerState enum
  (Disabled/Stable/Tuning/Error/Continuous/Preheat) -- mapping from the bos-plus-api
  proto. ePIC: PerpetualTune -> Off/Optimized/Tuning. Others -> None.
- GUI: new "Tuner" column (Health & status category, auto-hidden when empty).

All values live-verified against the corpus miners (ePIC 10.4.1.6, LuxOS 10.4.1.60,
Braiins 10.4.1.83, VNish 10.4.1.50). Fixture tests assert every parsed value.
ALL_COLUMNS 71 -> 72.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Djv3oncM4LxTS5tb61Ako6
2026-09-23 18:10:57 -06:00
alkane-ci 76409b0d3b ci: refresh README badges [skip release] 2026-09-23 23:57:28 +00:00
noahandClaude Opus 4.8 4aec6d40ad asic-rs telemetry: board temp thresholds -> target/hot/dangerous (LuxOS, Braiins; remap ePIC)
Round 19 #10 telemetry extension. Live-verified against the corpus miners, this
remodels the board temperature thresholds to item #10's target/hot/dangerous scheme
and adds the LuxOS and Braiins backends. Supersedes the ePIC-only critical/shutdown
model shipped in v0.72.0.

Core (asic-rs-core):
- MinerData: temp_critical/temp_shutdown -> temp_target/temp_hot/temp_dangerous.
- parse_temperature_limits (defaulted on the existing GetFluidTemperature trait)
  now returns (target, hot, dangerous); parse_data wires all three fields.

Backends (each reads an already-fetched or single command; live-verified):
- LuxOS: new tempctrl RPC; ChipTarget/ChipHot/ChipDangerous (live 10.4.1.60 = 83/93/100).
- Braiins v25_07 + v26_04: configuration/constraints cooling_constraints defaults
  (live 10.4.1.83 = 60/80/90); WEB_CONSTRAINTS already fetched for tuning caps.
- ePIC remap: Shutdown Temp -> hot, Critical Temp -> dangerous, no target.
- VNish (settings restart_temp/param) handled in a follow-up (needs settings auth);
  Antminer/WhatsMiner expose no thresholds -> (None,None,None).

GUI: the two temp columns (Critical/Shutdown) become three (Target/Hot/Dangerous),
right-aligned, Temperature category, auto-hidden when empty. MinerRow gains
temp_target_c/temp_hot_c/temp_dangerous_c; to_row reads them. ALL_COLUMNS 70 -> 71.

Fixtures captured from live: luxminer tempctrl.json, braiins configuration_constraints.json.
Fixture tests for epic, luxminer, braiins v26_04 assert the parsed thresholds. Patch 0029.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Djv3oncM4LxTS5tb61Ako6
2026-09-23 17:40:33 -06:00
alkane-ci 33a116d9fd ci: refresh README badges [skip release] 2026-09-23 23:10:06 +00:00
noahandClaude Opus 4.8 45d9632590 asic-rs telemetry T3-temps: board temperature thresholds (critical / shutdown)
Round 19 #10 telemetry extension. Adds the board temperature safety thresholds
("board dangerous temp" from item #10).

Core (asic-rs-core):
- New DataField::TemperatureLimits; MinerData gains temp_critical and temp_shutdown
  (Celsius).
- Rides the existing GetFluidTemperature trait via a defaulted parse_temperature_limits
  method returning (critical, shutdown) -- no supertrait blast radius; parse_data
  wires both fields in.

Backend:
- ePIC: summary /Misc Critical Temp + Shutdown Temp (already-fetched summary).
- Antminer/WhatsMiner expose no thresholds; LuxOS needs an unwired tempctrl command
  (no fixture) and VNish/Braiins need live verification -> left for a live-verified
  pass, all inherit (None, None).

GUI: two new columns (Critical temp / Shutdown temp), right-aligned, Temperature
category, auto-hidden when empty. MinerRow gains temp_critical_c / temp_shutdown_c;
to_row reads them. ALL_COLUMNS 68 -> 70.

Fixture test for epic asserts the parsed thresholds. Patch 0028.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Djv3oncM4LxTS5tb61Ako6
2026-09-23 16:53:57 -06:00
alkane-ci 0265370be2 ci: refresh README badges [skip release] 2026-09-23 22:43:35 +00:00
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
noahandClaude Opus 4.8 a60bb34e64 asic-rs telemetry T2a: rolling average hashrate windows (1m/5m/15m/24h)
Round 19 #10 telemetry extension, tier 2. Adds the rolling average hashrate
windows the GUI asked for (1M/5M/15M/24H) end to end.

Core (asic-rs-core):
- New HashrateAverages sub-struct (data/hashrate.rs): avg_1m/5m/15m/24h, each an
  Option<HashRate> carrying the same unit and algorithm as the current hashrate.
- New DataField::HashrateAverages; MinerData gains hashrate_averages.
- The windows ride the EXISTING GetHashrate trait via a new defaulted
  parse_hashrate_averages method (default None), so no new supertrait bound and no
  empty impl in every backend -- only the backends that expose the data override
  it. parse_data wires it in.

Backends (all read a command the collector already fetches -> no extra round-trips;
each window is filtered to > 0 and the whole struct is dropped when every window is
absent, so a firmware that reports nothing keeps hashrate_averages = None):
- WhatsMiner V1: btminer summary MHS 1m/5m/15m (MegaHash); no 24h.
- WhatsMiner V3: get.miner.status summary hash-1min / hash-15min (TeraHash) only.
- LuxOS: summary GHS 1m/5m/15m/24h (GigaHash) -- full window set.
- Braiins v25_07 + v26_04: miner_stats real_hashrate last_1m/5m/15m/24h (GigaHash).
- Antminer (5s/30m/av only), WhatsMiner V2 (av only), ePIC/VNish (session average
  only), sealminer: no standard 1/5/15 window -> inherit None. This is honest: the
  fixtures confirm those firmwares do not expose the standard windows.

GUI: four new columns (HR 1m/5m/15m/24h), single TH/s value each, right-aligned,
blank when the window is not reported, auto-hidden when empty across the fleet.
MinerRow gains the four ths fields; to_row populates them from hashrate_averages.

Fixture tests: whatsminer v1 and braiins v26_04 gain assertions on the parsed
windows (value, unit, and the expected present/absent pattern). Patch 0025.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Djv3oncM4LxTS5tb61Ako6
2026-09-23 15:08:27 -06:00
alkane-ci c944897807 ci: refresh README badges [skip release] 2026-09-23 20:45:46 +00:00
noahandClaude Opus 4.8 a6e22581d7 asic-rs telemetry T1b: WhatsMiner V3 PSU serial + ePIC chip/HB type
Round 19 #10 telemetry extension, tier 1 sub-batch B. Both ride existing
DataFields (Psu/Hashboards) on already-fetched commands (no extra round-trips)
and reuse the PsuInfo.serial / BoardData.chip_type+hashboard_model fields added
in T1a, so no core or GUI change -- the existing columns just populate for more
firmwares. Patch 0024; fixture tests pass.

- WhatsMiner V3: add a DataField::Psu location (get.device.info /msg/power) and a
  parse_psu that reads model/type, sw/hwversion, and the serial (sn). V3 had no
  PSU parse at all (default None) despite the data being fetched for PsuFans.
- ePIC: parse_hashboards now reads capabilities "Chip Type" (e.g. "BM1366") and
  "Model Subtype" (e.g. "BHB56801"), applied to every board (capabilities reports
  them miner-wide). The capabilities command is already fetched for Hashboards.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Djv3oncM4LxTS5tb61Ako6
2026-09-23 14:31:36 -06:00
alkane-ci b15de7f747 ci: refresh README badges [skip release] 2026-09-23 20:18:33 +00:00
noahandClaude Opus 4.8 f887affd6d asic-rs telemetry T1a: PSU serial + chip/HB type + best-share
Extend vendored asic-rs to scan more per-firmware telemetry (round 19 #10
follow-up, tier 1 sub-batch A). All new values ride on existing DataFields
(Psu/Hashboards/BestShare) and commands already fetched, so no new core
DataField plumbing and no extra network round-trips. Patch 0023.

Vendored (asic-rs):
- PsuInfo gains `serial`. Braiins v26_04 parse_psu corrected to read model_name
  + fw_version (it used the numeric type code as the model and dropped the fw
  version) and to capture serial_number. ePIC / WhatsMiner v1/v2 report no serial.
- BoardData gains `chip_type` (e.g. "BM1370") + `hashboard_model` (e.g.
  "A3HB70601"); Braiins miner/hw/hashboards populates both.
- best_share (all-time) wired for Antminer v2020 and WhatsMiner v1/v2 from the
  already-fetched summary "Best Share" (those backends had the empty default).
- refresh-checksums --all; existing braiins/antminer/whatsminer fixture tests pass.

GUI:
- MinerRow gains chip_type, hashboard_model, psu_serial; populated in to_row.
- New columns: Chip, HB model, PSU serial. Best share now populates for Antminer
  and WhatsMiner (column already existed).

Feasibility analysis (5-agent, all firmwares) recorded in memory; further tiers
(fan %, rolling hashrate averages, difficulty/shares, temp thresholds, WhatsMiner
V3 / VNish PSU serial) follow. Confirmed genuinely-unavailable: fan max RPM,
WhatsMiner/LuxOS real logs, chip type on Antminer/LuxOS.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Djv3oncM4LxTS5tb61Ako6
2026-09-23 14:01:33 -06:00
alkane-ci e5e6b0f1e1 ci: refresh README badges [skip release] 2026-09-23 18:40:11 +00:00
noahandClaude Opus 4.8 ad28dab542 round 19 review fixes + Health-column alignment + badge-push fix
Health column (operator-reported): give every component-health icon a UNIFORM
fixed-width slot in the SegmentRenderer (GetSize + DrawShape), so power/control/
fan/board icons line up in fixed columns across rows regardless of glyph aspect,
and left-align the icon columns (Health/Access/Light) so the block anchors at a
consistent left edge. The per-icon tooltip hit-test uses the same uniform slot.

Code-review-harness fixes:
- High: isolate per-miner telemetry with catch_unwind so one miner's get_data
  panic can't abort the whole scan (and strand the fast-path partial rows).
- Medium: fill the zebra stripe across the full cell for right-aligned colored
  columns (was anchored at the content's left edge, leaving the left unstriped).
- Medium: lower the scan-concurrency ceiling 512 -> 256 (128 is fully reliable,
  192 already dropped responders on the live fleet).
- Medium: board voltage/frequency sort key skips placeholder-zero boards
  (avg_positive), matching how the cell renders them as "-".
- Low: saturating_add for accepted/rejected share sums; moved an orphaned doc
  comment; corrected a stale comment.

CI: fix the README-badge push-back -- `git push -c http.extraheader` is invalid
(`-c` must precede the subcommand), so the badge/coverage/bench-baseline commit
never actually reached main; now `git -c http.extraheader=... push`. This also
lets the bench-delta baseline persist so the delta can compute.

Demo: the offline-demo paused miner now has detected (idle) hashboards so the
paused-blue Health icons (round 19 #19) are exercised.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Djv3oncM4LxTS5tb61Ako6
2026-09-23 12:21:03 -06:00
noahandClaude Opus 4.8 42e3bf8f5b round 19: columns, scan speed, per-firmware logs, more scanned fields
Table/columns:
- Fix the "columns shrink to tiny" bug on language change / add / hide (#3, #24):
  the rebuild-time capped autosize read column widths before GTK's measurement
  landed. Columns keep their default widths; autosize is on-demand only.
- Right-align every column except IP (#21): new alignment param on the bridge
  append calls; the SegmentRenderer and the tooltip hit-test honour it.
- "Auto-size all columns" header menu item; Ctrl+A selects all rows (#4).
- Remove the Boards (dots) column (#7).
- Split the slash-joined Fan column into per-fan columns Fan 1-4 (#8).
- Efficiency: unit moved into the value and made algorithm-aware (J/TH for
  SHA256 families, J/kSol for Equihash), fixing the blank/garbage figure on
  non-SHA256 miners (#9, #23).
- Pool account column before Worker by default (#22).

Scan:
- Fast scan (#18): emit a lightweight identity row the instant a miner is
  identified, then upsert the full telemetry row when get_data completes.
- User-adjustable scan concurrency with a bounded max (#25).
- Surface more scanned values as columns (#10): current tuning target, accepted
  / rejected shares + reject %, and per-hashboard hashrate / voltage / frequency.

Logs (#11-16): fetch the miner log through asic-rs's per-backend read_logs()
instead of the narrow curl paths, fixing Braiins / LuxOS / Z15 / BixBit / stock
Antminer; WhatsMiner keeps the fault-code fallback (no API log). Removed the
summary tidbits from the log viewer (#13).

Misc: fix per-icon health tooltips (advance math matched to the renderer) (#2);
paused miners show blue hashboard icons, healthy stays green (#19); state-aware
Pause/Resume in the right-click menu (#20); export opens a column-picker dialog
(#6) and the default filename carries a UTC timestamp (#5); the scan status bar
says "Scan Paused" / "Scan Stopped" and no longer overwrites Stop with paused
(#17); the bench badge shows the weighted-average microbench delta vs the
previous release (#1).

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Djv3oncM4LxTS5tb61Ako6
2026-09-23 11:40:21 -06:00
noahandClaude Opus 4.8 4154a50ed0 ci: measure coverage in the release job and auto-update the badge
Add a best-effort Coverage step to release.yml: it adds the llvm-tools-preview
rustup component, fetches cargo-llvm-cov as a prebuilt binary (the vendored
.cargo/config blocks `cargo install` from crates.io), runs ci/coverage.sh to
merge unit-test and headless self-test line coverage, and feeds the TOTAL
line-coverage percent to the badge refresh so badges/coverage.svg tracks the
real number on every release. The step is gated on a release and marked
continue-on-error, so coverage tooling can never block a release.

coverage.sh now runs its instrumented builds --offline by default (the
dependency tree is fully vendored), overridable via CARGO_LLVM_COV_FLAGS.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Djv3oncM4LxTS5tb61Ako6
2026-09-23 09:32:41 -06:00
noahandClaude Opus 4.8 0ab822940e coverage: count the headless self-test, reporting ~46% (was ~35%)
The self-test builds the real wxWidgets table and renders every fixture through
the real widgets, exercising ~27% of ui.rs (up from ~4%) -- but it runs as a
separate binary, so a plain `cargo llvm-cov` (which only runs the #[test]s) never
counted it, understating coverage. New ci/coverage.sh runs both the unit tests and
the self-test under one instrumentation pass and merges them, excluding the
vendored asic-rs / patched wx-rs from the report.

Our-source line coverage is now ~46% (model 81%, naming 95%, fixtures 100%,
credentials 92%); the remainder is click-driven dialogs and live-miner network
I/O, which unit tests can't reach without hardware or heavy mocks. Badge, report,
and README dev section updated.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Djv3oncM4LxTS5tb61Ako6
2026-09-23 08:09:02 -06:00
noahandClaude Opus 4.8 c1aa6db834 license: unify under MIT
Collapse the dual MIT OR Apache-2.0 licensing to MIT only (operator's choice):
set the workspace `license` field to "MIT" (all crates inherit it), replace
LICENSE-MIT + LICENSE-APACHE with a single LICENSE file, and update the README
license section and the license badge. deny.toml keeps its permissive allow-list
(that governs dependency licenses, which remain a mix of MIT/Apache-2.0/BSD/etc.);
only its project-license comment changed.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Djv3oncM4LxTS5tb61Ako6
2026-09-23 08:05:11 -06:00
noahandClaude Opus 4.8 7feab6117b item 12 finale: shrink the release binary + code-review report
[profile.release] opt-level="s" + fat LTO + one codegen unit + strip cuts the
Linux binary from ~38M to ~19M (50%). panic stays "unwind" deliberately: the scan
runs many miners on tokio tasks and the wx dispatch relies on unwinding, so one
miner's panic must never abort the whole app. Verified: stripped binary, SELFTEST
PASS, 99 tests, clippy clean.

Adds code-review-report.md: the ship verdict and a full accounting of the five
recursive review rounds (all confirmed critical/high fixed; remaining items are
documented perf/dev-CLI tradeoffs). Badges refreshed (tests 99, coverage ~35%).

This completes the round-18 marathon: all 12 queued items plus Round C G3 (LuxOS
named presets) and G7 (per-board V/F read side), CI hardening (verify/release
split, clippy gate, audit, badges), README + docs, and the recursive multi-agent
code review.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Djv3oncM4LxTS5tb61Ako6
2026-09-22 21:02:09 -06:00
noahandClaude Opus 4.8 808fd4de1d review wave 7: fifth-round findings (creds, scan race, refill throttle)
Fifth (final) review round; this clears its functional findings:

- HIGH config actions / pool writes could run concurrently with a live scan
  (start_action / apply_pools guarded flash + restore but not scanning); added
  the self.scanning guard, and begin_scan now defers while an action/restore runs,
  closing the race symmetrically.
- HIGH blanking a per-firmware credential row saved a live ("","") override that
  then broke that firmware's auth fleet-wide; a fully-blank row now clears the
  override (use the shipped default).
- HIGH a ChangePassword action never updated the toolkit's own saved credentials,
  so after a fleet-wide change it locked itself out; on full success it now updates
  the saved global password (and on a partial change logs a reconcile note rather
  than guessing).
- HIGH/perf fill_rows re-rated: a scan's streaming rows triggered a whole-table
  refill on every fast tick. New rows_dirty latch flushes the refill at most once
  per second during a scan (immediately once it ends).
- MED an indeterminate access-probe result no longer blanks a miner's already-known
  locked/unlocked state.
- LOW compute-version.sh header doc corrected to match the broadened rule;
  release.yml sets WX_RS_WXCONFIG once at job level instead of per step.

Accepted (documented) perf items that remain: per-render health recompute and
per-column cell-string allocation (small, fleet-scale), the linear upsert scan,
and synchronous scan-range parsing (bounded by the range caps).

99 tests + clippy-clean + selftest green. This was review round 5 (the harness's
iteration cap); every confirmed critical/high across all five rounds is fixed.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Djv3oncM4LxTS5tb61Ako6
2026-09-22 20:59:03 -06:00
noahandClaude Opus 4.8 63ada5bb99 review wave 6: fourth-round findings (masked prompt, board grey, timeouts)
Fourth review round found further issues, two being gaps in earlier fixes; this
clears the actionable ones:

- HIGH board_healths() painted a genuinely-undetected board RED when a fault text
  also named it (e.g. "chain 2 not found" -> Board(2)); an undetected board now
  stays grey, matching the documented grey-vs-red invariant. Regression-tested.
- HIGH the Change-password prompt used an unmasked field (the Credentials dialog
  was masked in wave 1 but this prompt was missed) -> masked for PromptKind::Password.
- MED the WhatsMiner access probe aborted all remaining password candidates on one
  transient error -> transient errors now skip to the next candidate and never
  report a confident "locked" when the answer was really indeterminate.
- MED config actions / refresh / pools / flash ignored the operator's configured
  scan timeout (used asic-rs's 10s default) -> configured_factory now applies it,
  so a slow-link action reaches the same miners a longer-timeout scan found.
- MED the auto-rescan loop set a bogus "scanning..." status even when the scan was
  deferred (mid-flash) -> begin_scan reports whether it started.
- LOW is_aml_140mm matched every S21, not just the S21 Pro its doc names -> fixed.
- Offline fixtures now reuse scan::infer_pic instead of a diverging copy.

Accepted (documented) from this round: miner_probe's argv secrets (diagnostic CLI),
the rebuild_table/update_headers sort-marker duplication, the LuxOS substring
success check (command-specific reply), restore/flash target snapshot (dialogs are
modal), non-cancellable restore/probe batches, Braiins host-key (LAN reflash), and
the perf items (per-tick refill, health recompute, linear upsert, cell formatting).

99 tests + clippy-clean + selftest green.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Djv3oncM4LxTS5tb61Ako6
2026-09-22 20:29:52 -06:00
noahandClaude Opus 4.8 52b7c3f2a1 review wave 5: third-round findings (unreachable column, races, panics, DoS)
Third review round (over the wave 3/4 fixes) surfaced further findings, mostly in
new code paths; this clears them:

- HIGH the fully-built "Boards" column (Column::Hashboards: renderer, sort/filter
  logic, tests, a self-test check) was missing from ALL_COLUMNS, so it was
  unreachable in the UI and its self-test check was dead. Added to ALL_COLUMNS
  (opt-in; Health still shows composite board health by default) and the self-test
  now makes it visible -- the dot-sentinel check is live again.
- HIGH apply_pools() could start a pool write during a restore-to-stock (it sets
  self.action directly, bypassing start_action's guard) -> same restore guard.
- HIGH superseding an in-flight action/pools job left the old miners' Health cells
  frozen on the "…ing" label forever (the replaced handle's drain never runs) ->
  clear the superseded action's op-status.
- HIGH clean_antminer() byte-sliced a miner-supplied model string without a
  char-boundary check (panic DoS) -> use get(..9).
- MED access-probe errors were silently discarded -> surfaced in the indicator.
- MED the pool-password file was briefly world-readable before chmod -> created
  0600 from the start (OpenOptions mode).
- MED a miner-controlled log response was buffered unbounded (OOM DoS) -> capped.
- MED the language-menu id range was hardcoded (and 790-794 collided with the
  pool-preset / fw-preset dialog ids!) -> derived from Lang::all() and moved the
  dialog ids to a clear block.
- LOW restore_vnish now sends the unlock body via stdin (password off argv), and
  the LuxOS restore treats a reboot-dropped/empty reply as success.

Remaining round-3 findings are the previously-accepted perf tradeoffs (bulk-serial
writes, per-tick refill, per-render health recompute, linear upsert), documented
in code and in code-review-report.md.

99 tests + clippy-clean + selftest green (Boards-column check now live).

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Djv3oncM4LxTS5tb61Ako6
2026-09-22 19:53:56 -06:00
noahandClaude Opus 4.8 571c2305aa review wave 4: remaining round-2 findings (filters, creds, restore, panics)
Clears the rest of the second review round's confirmed findings:

- HIGH the Boards numeric filter compared the composite sort score (online*100+
  total) instead of the board count, so a filter like "Boards <= 3" matched
  nothing on healthy 3-board miners. num_value now returns the detected count;
  regression-tested with per-board health present (the path the old test missed).
- HIGH the WhatsMiner access probe ignored the operator's saved scan password
  (tried only admin/super), mis-reporting writable miners as locked. It now tries
  the caller's password first.
- HIGH firmware flash and config actions were not blocked during a restore-to-
  stock; start_action and both flash guards now refuse while a restore runs.
- MED log tail() could panic slicing at a non-UTF8 char boundary -> nudge to a
  boundary first (regression-tested).
- MED board_index_from_text grabbed an unrelated number far past the keyword
  (e.g. a temperature) -> only accept a number immediately after the keyword.
- MED a restore worker-thread spawn failure wedged the restore subsystem forever
  -> emit Done on spawn failure and treat a disconnected channel as done.
- MED LuxOS restore reported failure when the miner rebooted mid-reply -> an empty
  reply or dropped connection after a successful logon is the expected reboot.
- MED two tests raced on the process-global $HOME -> a shared serialization lock.
- LOW CSV export now neutralizes spreadsheet formula-injection prefixes on
  miner-supplied fields.
- Made miner_probe's global-only credential resolution explicit (it can't share
  the GUI's per-firmware configured_factory across the bin boundary).

99 tests (+3 regression tests) + clippy-clean + selftest green.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Djv3oncM4LxTS5tb61Ako6
2026-09-22 19:30:29 -06:00
noahandClaude Opus 4.8 79ecc100d3 review wave 3: log-fetch credential leak + JSON escaping + column-scan cost
Second review round (over the wave 1/2 fixes) surfaced further, mostly new-path
findings; this clears the substantive ones:

- HIGH log_scan.rs passed miner admin credentials on the curl command line (same
  class as the access-probe leak fixed in wave 1). Its curl() now takes optional
  stdin: the Antminer digest login goes through a curl config on stdin (-K -),
  the VNish unlock password through the POST body on stdin (-d @-), and the
  timeout path reaps the child so it no longer leaks a zombie.
- MEDIUM JSON injection/breakage: the VNish unlock body and the LuxOS
  uninstall command spliced a password / miner-supplied SessionID into JSON with
  format!. Both now build the JSON with serde_json, which escapes correctly.
- MEDIUM column scan cost: fill_rows computed table_columns() twice (my wave-2
  built_columns check added one), and with auto-hide-empty on that scans every
  cell of every row each time. It is now computed once and reused.

Accepted, documented tradeoffs from this round: miner_probe's setpools takes the
pool password as a CLI arg (inherent to a diagnostic CLI; it is the low-sensitivity
mining worker password), MinerRow::upsert_into's linear scan is fine at the tool's
fleet scale (hundreds), and bulk config-action writes stay serial deliberately.

96 tests + clippy-clean + selftest green.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Djv3oncM4LxTS5tb61Ako6
2026-09-22 19:18:27 -06:00
noahandClaude Opus 4.8 51b4eb2556 review wave 2: scan concurrency, table-column lockstep, background log fetch
Continuing the recursive review's confirmed findings:

- HIGH scan telemetry was serial: the consumer awaited each responder's to_row
  (get_data + presets, several REST calls) inline in the identification stream
  loop, so telemetry ran one miner at a time. Now buffer_unordered runs it
  concurrently up to SCAN_CONCURRENCY_LIMIT; identification (which buffers
  internally) is unaffected, and telemetry only hits live responders.
- HIGH table columns diverged from the built widget with auto-hide-empty on:
  (1) drag-reorder was silently rejected because column_reordered fed
  table_columns() (empty-filtered) to apply_visible_reorder, which compared it to
  display_columns() (unfiltered) -- apply_visible_reorder now reorders the shown
  subset in place; (2) a column flipping non-empty mid-scan left the widget stale,
  so fill_rows now rebuilds when the shown set no longer matches built_columns.
  Both covered by a new unit test.
- HIGH viewing a miner's log blocked the wx UI thread for up to ~20s. The fetch
  now runs on a background thread; the viewer opens from the tick drain when the
  result lands (tick returns the dialog for dispatch to show modally).
- LOW start_pools_action's fake branch now honours the cancel flag like its
  siblings.
- Documented the intentional tradeoffs the review flagged: scan-restart uses
  cooperative cancellation (a hard join would freeze the UI), and the aftermarket
  re-probe stays per-scan for freshness (firmware can change between scans).

96 tests (+subset-reorder) + clippy-clean + selftest green.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Djv3oncM4LxTS5tb61Ako6
2026-09-22 19:02:39 -06:00
noahandClaude Opus 4.8 3b18219e4e review wave 1: fix the critical restore false-success + security/correctness findings
From the recursive multi-agent review (18 confirmed findings). This wave clears
the critical, four highs, and several mediums/lows:

- CRITICAL restore.rs: a Braiins SSH restore reported SUCCESS on a wrong password
  or unreachable miner. run_with_timeout now captures the exit code and drains
  stderr on its own thread (also fixing the medium stderr-pipe stall), and a new
  testable classify_braiins() treats an ssh auth/connection failure (stderr
  diagnostic, empty stdout, non-zero exit) as failure while still reading a
  dropped connection / timeout as the expected reboot. Unit-tested.
- HIGH restore exclusivity: apply_restore_confirm now refuses when a scan/refresh/
  action/flash or another restore is in flight, so this destructive action never
  overlaps or orphans a running restore handle.
- HIGH secrets off the command line: Braiins SSH uses `sshpass -e` (env, not -p),
  and the access-probe curl passes credentials through a config on stdin (-K -)
  instead of `-u user:pass`; both were visible in the process list. New masked
  password field (wxTE_PASSWORD bridge) so the Credentials dialog no longer
  renders saved passwords in the clear.
- MEDIUM correctness: per-board Chip-temp readings are now index-aligned with the
  boards (a missing middle board shows "-" instead of shifting later boards left).
- MEDIUM: saved pool lists (which can hold a pool password) are chmod 0600.
- LOW: access-probe curl timeout now reaps the child (no zombie).

95 tests (+classify_braiins) + clippy-clean + selftest green.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Djv3oncM4LxTS5tb61Ako6
2026-09-22 18:45:56 -06:00
noahandClaude Opus 4.8 bcc0ba38b6 ci: install clippy component before the gate; classify all GUI src as backend
Run 82 failed because the alkane-ci image ships no clippy component
("cargo-clippy is not installed for the toolchain"). Both workflows now
`rustup component add clippy` before the gate.

Also broadened compute-version.sh: any crates/alkane-gui/src/* file is backend
logic (previously only scan.rs/model.rs/main.rs were, so a fix confined to
naming.rs / pool_prefs.rs / restore.rs / access_probe.rs / credentials.rs would
never cut a release). ui.rs/fixtures.rs/bin still match the UI arm first. All 9
compute-version tests pass.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Djv3oncM4LxTS5tb61Ako6
2026-09-22 18:22:32 -06:00
noahandClaude Opus 4.8 749cdc4eed item 12: CI verify/release split, dependency audit, README + badges
CI is now two workflows: verify.yml (pull requests + non-main pushes) runs the
clippy gate, build, unit tests, microbenchmarks, the headless self-test, and a
best-effort dependency audit; release.yml (main) repeats the clippy gate + audit
before its existing build/test/selftest/package/release, then refreshes the
committed README badges and pushes any change back (best-effort, and a badges-
only push does not bump the version, so it does not loop).

Security: cargo audit found a build-time-only advisory (h2 0.3 in the wx-rs
build script's reqwest 0.11 subtree, never linked into the runtime binary and
never executed on Linux). The vendored/offline tree can't upgrade it without
re-vendoring, so it is documented and accepted in .cargo/audit.toml (mirrored in
deny.toml with the project's permissive-license policy).

Badges: ci/gen-badges.py emits self-contained shields-style SVGs into badges/
(tests, coverage 36%, bench, LOC 12.5k, clippy clean, dependencies, license) --
committed and referenced by relative path so a self-hosted Gitea renders them
with no external service. README rewritten around what the toolkit actually does
today (discover / monitor / operate / install), with build, CLI, dev, and
architecture sections and the dual-license note.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Djv3oncM4LxTS5tb61Ako6
2026-09-22 18:17:31 -06:00
noahandClaude Opus 4.8 19e469ebc4 item 12: clippy-clean our crate + add LICENSE files
Cleared all clippy findings in alkane-gui (cargo clippy --no-deps): mechanical
fixes via clippy --fix (redundant imports, useless format!, manual_contains,
manual_is_multiple_of, unnecessary_map_or, unused parens) plus manual fixes:

- type_complexity: factored the segment tuple into model::{Rgb, Segment} aliases.
- large_enum_variant: #[allow] on ScanMsg/RefreshMsg with a note -- Row is the
  common variant, so boxing it to shrink the rare Started/Done would add an
  allocation per miner on the hot path.
- dead code: removed unused SHAPE_PULSE_DOT, ColorKind::Accent, clear_op_status,
  and RestoreMsg's unread `total`; kept the restore/access-probe cancel handles
  (workers honour cancellation; UI stop control pending) under #[allow].
- question_mark, needless_range_loop, drop_non_drop, doc_lazy_continuation fixes.

Only vendored wx-rs warnings remain (out of scope). Added LICENSE-MIT and
LICENSE-APACHE (Cargo.toml already declares MIT OR Apache-2.0). 94 tests +
selftest green.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Djv3oncM4LxTS5tb61Ako6
2026-09-22 18:01:49 -06:00
noahandClaude Opus 4.8 6cd732dec5 Round C G7 (read side): per-board voltage/frequency in the board tooltip
Surfaces the per-hashboard configured voltage (V) and frequency (MHz) that
asic-rs already reads into BoardData but the toolkit dropped. Added
MinerRow.board_voltages / board_frequencies (index-aligned with the boards,
0.0 where unreported), populated at scan time, and appended to the per-board
Health tooltip as extra middot segments after actual/expected hashrate.

Verified live on LuxOS S19j Pro (10.4.1.60): boards report 12.73 V (frequency
is None in LuxOS's live stats path -- a pre-existing backend gap; the tooltip
omits absent values). miner_probe `msgs` now prints board freq/volt too.

The G7 WRITE path (per-board V/F override) stays deferred: no firmware accepts
Manual targets today and a bad voltage can damage a board, so per the parity
roadmap it is bench-only and not shipped.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Djv3oncM4LxTS5tb61Ako6
2026-09-22 17:40:32 -06:00
noahandClaude Opus 4.8 95b8428c12 Round C G3: named firmware presets (LuxOS) end to end
The flagship structured-tuning parity item: list and select a firmware's named
profiles/presets, not just map a watts number onto one.

Backend (vendored asic-rs, patch 0022): LuxOS now implements SupportsPresets
(get_presets reads the live `profiles` RPC) and a real SupportsTuningConfig
(set_tuning_config routes Preset(name) -> profileset, Power -> set_power_limit).
Unit-tested (parse_profiles_to_presets); verified live-read on two production
LuxOS S19j Pro (10.4.1.60/.67). VNish already exposed presets.

GUI: MinerCaps.supports_presets + MinerRow.presets (read live at scan time for
preset-capable miners; ~1 RPC per such miner per 300 s rescan). New "Set
profile..." right-click item opens a selector populated from the profiles
common to the whole selection (so the chosen name is valid on every target),
applied via the new ConfigAction::Preset. Offline fixtures seed demo presets.

CLI: `miner_probe presets <ip>` (list) and `setpreset <ip> <name>` (select).

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Djv3oncM4LxTS5tb61Ako6
2026-09-22 17:34:26 -06:00
noahandClaude Opus 4.8 a7ed34b8e4 gui: pool "+" "Add new..." opens a preset manager window (round 18 #8b)
The pool-field "+" menu previously offered a one-shot "Add new" (append
the current box value) plus a "Remove saved value" submenu. Both are now
replaced by "Add new...", which opens a small manager window: a multiline
editable list of all saved values for that field, seeded with the current
box value as the last line. Save rewrites the whole saved list at once.

- pool_prefs: new save_all() rewrites a field's saved list; the trim /
  drop-empties / drop-presets / de-dup step is factored into a pure
  dedupe_saved() with unit tests. Removed the now-unused add_saved /
  remove_saved.
- ui: build_pool_presets_dialog + apply_pool_presets, wired to
  ID_POOL_PRESETS_SAVE/CANCEL; "+" menu shows "Add new..." and no longer
  builds the remove submenu; ID_POOL_MENU_REMOVE_BASE dropped.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Djv3oncM4LxTS5tb61Ako6
2026-09-22 17:10:45 -06:00
noahandClaude Opus 4.8 b839e9012d gui: default column widths fit contents, capped (round 18 #10)
Columns previously always opened at generous fixed defaults, wasting
horizontal space. Now, the first time the table is populated after a
(re)build, each column is sized to the smaller of its content-fit width
(wxCOL_WIDTH_AUTOSIZE, floored at 24px) and its configured default (the
cap). Done once per rebuild via a new columns_autosized latch, so a
user's later manual resize is preserved -- scan-update refills skip it.

New bridge: wxbr_dvlc_autosize_col_capped (SetWidth AUTOSIZE, read back,
floor, clamp to cap, SetWidth) + Widget::dvlc_autosize_col_capped.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Djv3oncM4LxTS5tb61Ako6
2026-09-22 17:01:25 -06:00
noahandClaude Opus 4.8 d378a484d6 ui: attribute hashboard faults + pools dialog + widths (round 18 #5/#8a/#8c)
- #5 Antminer-hardware firmwares (stock/VNish/Braiins/LuxOS) report faults with no
  component, so a real per-board fault landed on the control-board tooltip instead
  of the board it names. messages_to_faults now recovers the board index from the
  self-describing message text ("Chain 2 ...", "hashboard 0 ...", "Slot 1 ...") so
  the issue shows on the right hashboard's tooltip. WhatsMiner (which does attribute
  HashBoard{idx}) is unchanged.
- #8a The pools dialog is widened so the rightmost "+" preset buttons (Password
  column) are no longer clipped off a too-narrow dialog.
- #8c The pool column headers now span field-width + the 34px "+" button, so the
  "Address/Account/Worker/Password" titles line up with the boxes below them.

board_index unit test + SELFTEST pass.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Djv3oncM4LxTS5tb61Ako6
2026-09-22 16:52:24 -06:00
noahandClaude Opus 4.8 64e084ddee ui: per-icon tooltip repositioning + Zcash units/expected (round 18 #4a/#6/#7)
- #4a Health-column tooltips now reposition per icon: the query-tooltip handler
  scopes GTK's tip area to the hovered icon's slot, so moving across icons hides
  the old tooltip and shows a fresh one at the new position (was stuck in place).
- #6 Plain Antminer Z15 firmware omits the expected hashrate (the Z15j reports it),
  so it's filled from the model nameplate (420 KSol/s) -- the actual/expected
  column + colour now work for Z15 like every other miner.
- #7 Equihash hashrate now shows correct units: Sol/s (not TH/s). The stored value
  is Sol/s/1e12, so ths*1e12 recovers the Sol/s count; the per-board tooltip and
  the hashrate KPI card now label Equihash as Sol/s with an SI prefix.

Unit tests (equihash_hashrate_units) + health tests pass; SELFTEST PASS.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Djv3oncM4LxTS5tb61Ako6
2026-09-22 16:45:45 -06:00
noahandClaude Opus 4.8 93bd528430 health: PSU-fault colour rules + per-board actual/expected tooltip (round 18 #2/#3/#4b)
- #2 A PSU fault while the miner is mining is now a warning (yellow) not a failure
  (red); a fault on a non-mining miner stays red. Fixes WhatsMiners flagged red
  while running fine.
- #4b A PSU fault no longer greys the hashboards. Board colour reflects the board's
  own state: running -> green, faulted (e.g. WhatsMiner 540/560) -> red, and grey
  ONLY when the board is genuinely not detected. Stall-reddened boards the fault
  codes don't name are still exonerated to green; undetected boards stay grey.
- #3 The per-board tooltip shows actual / expected hashrate (e.g. "2  .  33.5 / 35.0
  TH/s"); a not-detected board shows "not detected". Adds MinerRow.board_expected_
  hashrates (from BoardData.expected_hashrate) + an algorithm-aware hashrate unit
  (Equihash -> Sol/s, groundwork for #7).

Health tests updated + pass; SELFTEST PASS.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Djv3oncM4LxTS5tb61Ako6
2026-09-22 16:36:00 -06:00
noahandClaude Opus 4.8 e45e6eaf91 ui: shrink brain icon, light toggle, blank all unknown-PIC (round 18 #1/#9/#11)
- #1 The control-board (brain) Health icon is drawn at 82% in its full slot, like
  the fan, so it no longer reads oversized (slot advance + tooltip hit-test unchanged).
- #9 The right-click menu now shows a single state-based light toggle: "Stop
  flashing lights" when any selected miner's locate light is on, else "Flash lights".
- #11 The PIC column is blank for every unknown case (non-Antminer makes and
  unclassifiable Antminer models) -- no more "?".

SELFTEST PASS; pic test updated.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Djv3oncM4LxTS5tb61Ako6
2026-09-22 16:28:26 -06:00
noahandClaude Opus 4.8 e5a6cc2b5e psu: extend PSU-info scan to Braiins + WhatsMiner (R5/G15)
Round 17 R5/G15. The PSU version/Vmin/Vmax columns + tooltip now populate for
Braiins and WhatsMiner, not just ePIC.

- Braiins (patch 0020): miner/details -> psu_info gives the PSU type (117, the
  same APW12 ePIC reports) + rated voltage min/max. Verified live on 10.4.1.83/.27:
  model 117, Vmin 11.96 V, Vmax 15.2 V.
- WhatsMiner v1/v2 (patch 0021): get_psu -> model + hw/sw version (no DC output or
  rated envelope exposed). Verified live on 10.8.1.214 (v2): model P221C, version
  H20201205. v3 uses a different response shape and no v3 unit was available, so
  it's left as a follow-up.
- Also fixes a pre-existing broken test (test_whatsminer_v1_parse_messages never
  mocked get_error_code -> always returned 0 messages; CI runs only the GUI
  selftest so it was never caught). whatsminer backend tests now 41/41.

SELFTEST PASS; braiins + whatsminer backend suites green.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Djv3oncM4LxTS5tb61Ako6
2026-09-22 16:07:53 -06:00
noahandClaude Opus 4.8 6fb73c9746 firmware: detect + label Bixbit and Hiveon (own colours)
Bixbit and Hiveon keep the stock Antminer web API, so asic-rs identifies them as
"AntMiner Stock". Distinguish them at scan time from the cgminer `version` reply:
Bixbit tags it with BixFirmware/BixMiner/BixAPIVersion (definitive; verified live on
a Bixbit S19j Pro at 10.4.1.70); Hiveon carries a "hiveon" marker (best-effort --
no live Hiveon unit to confirm the exact signature yet). A real stock miner (no
marker) stays "Stock".

Firmware column colours: Bixbit -> pinkish-red (223,62,102, their logo); Hiveon ->
darker logo orange (228,112,24), with "hiveon" added to the existing hive/hiveos
alias. The probe is a short, timeout-bounded cgminer query run only for Antminer
miners that first identified as stock.

SELFTEST PASS. Hiveon detection to be re-verified once a Hiveon miner is available.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Djv3oncM4LxTS5tb61Ako6
2026-09-22 14:15:43 -06:00
noahandClaude Opus 4.8 49985631d4 antminer: read best-share fleet-wide + Bixbit "Power Estimated" wattage (R7)
Round 17 R7. Flashing Bixbit onto fleet units surfaced two Antminer scan gaps
(patch 0019): the stock v2023_07 backend never fetched best-share at all
(DataField::BestShare had no source), so it was blank for every stock/Bixbit
Antminer; and it read wattage only from the cgminer stats, which Bixbit-based
firmware leaves at 0 (real draw is in the summary as "Power Estimated").

Now maps BestShare/SessionBestShare to the cgminer summary and adds a
"Power Estimated" wattage fallback (stock power still wins when present).

Verified live: Bixbit S19j Pro (10.4.1.70) now reads 2615 W + best-share
178930671; stock S21 Pro (10.4.1.90) now reads best-share 299464394 -- both were
blank before. 36 antminer backend tests + SELFTEST pass, no wattage regression.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Djv3oncM4LxTS5tb61Ako6
2026-09-22 13:34:01 -06:00
noahandClaude Opus 4.8 8fe61ec427 psu: PSU info scan + version/Vmin/Vmax columns + tooltip V/A (R5/G15)
Round 17 R5/G15. asic-rs had no PSU telemetry. Adds an optional PsuInfo to
MinerData (model, version, rated voltage min/max, live output voltage/current),
a DataField::Psu, and a default parse_psu backends override (patch 0018). ePIC
populates it by merging the summary "Power Supply Stats" with the capabilities
"Psu Info".

GUI: three new columns -- "PSU version", "PSU Vmin", "PSU Vmax" (Hardware group in
the picker) -- and the R2 power tooltip now shows the PSU output voltage (and
amperage when the firmware reports a non-zero current; ePIC leaves current 0, so
it shows just the voltage).

Verified live on ePIC S19j Pro (10.4.1.6/.10): model 117, fw 22, Vmin 11.877 V,
Vmax 15.182 V, output ~13.2 V. 8 model tests + 18 ePIC backend tests + SELFTEST
pass. Non-ePIC firmware leave the PSU fields blank until they add parse_psu.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Djv3oncM4LxTS5tb61Ako6
2026-09-22 12:24:26 -06:00
107 changed files with 10830 additions and 958 deletions
+20
View File
@@ -0,0 +1,20 @@
# cargo-audit configuration (read by `cargo audit` from the project root).
#
# The two entries below are accepted, documented exceptions -- both live only in
# the wx-rs BUILD-dependency tree (reqwest 0.11, used by wx-rs's build.rs to
# download the wxWidgets source on Windows/macOS). On Linux download_dist()
# returns before ever constructing an HTTP client, and none of this is linked
# into the runtime binary, which talks to miners over asic-rs's reqwest 0.13
# (hyper 1.x / h2 0.4). The build tree is fully vendored and offline, so these
# cannot be upgraded without re-vendoring a newer reqwest.
#
# Re-review whenever the vendored dependency set is refreshed.
[advisories]
ignore = [
# h2 0.3 unbounded empty DATA frames (DoS). Build-time only; our build-time
# HTTP client only fetches a fixed HTTPS URL, and only on Windows/macOS.
"RUSTSEC-2026-0258",
# rustls-pemfile 1.0.4 unmaintained. Same build-only reqwest 0.11 subtree.
"RUSTSEC-2025-0134",
]
+19
View File
@@ -0,0 +1,19 @@
name: completed-ci-badge
on:
workflow_run:
workflows: [build-test-release, next-build]
types: [completed]
jobs:
publish:
runs-on: alkane-ci
permissions:
actions: read
contents: write
steps:
- uses: actions/checkout@v4
- name: Publish last completed attempt
env:
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
run: python3 ci/last-attempt-badge.py
+48
View File
@@ -0,0 +1,48 @@
name: next-build
on:
push:
branches: [next]
permissions:
contents: write
jobs:
candidate:
runs-on: alkane-ci
env:
WX_PREFIX: /root/.cache/wx-3.3.3-linux
WX_RS_WXCONFIG: /root/.cache/wx-3.3.3-linux/bin/wx-config
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Install build dependencies
run: |
apt-get update -qq
apt-get install -y -qq --no-install-recommends libssl-dev pkg-config ca-certificates
- uses: actions/cache@v4
with:
path: /root/.cache/wx-3.3.3-linux
key: wx-3.3.3-${{ runner.os }}-${{ hashFiles('thirdparty/wx-rs/VERSION') }}
- name: Build wxWidgets
run: |
if [ ! -x "$WX_PREFIX/bin/wx-config" ]; then
bash scripts/build-wx-linux.sh
fi
- name: Build release candidate
run: cargo build --release -p alkane-gui -p alkane-artifacts -p alkane-flash -p alkane-cli --offline
- name: Select candidate version
id: version
run: bash ci/compute-rc-version.sh >> "$GITHUB_OUTPUT"
- name: Package candidate
if: steps.version.outputs.release == 'true'
run: |
mkdir -p dist
cp target/release/alkane-toolkit dist/
tar -C dist -czf "dist/alkane-toolkit-${{ steps.version.outputs.version }}-linux-x86_64.tar.gz" alkane-toolkit
- name: Create private prerelease
if: steps.version.outputs.release == 'true'
env:
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
run: python3 ci/release-rc.py "${{ steps.version.outputs.tag }}" true "dist/alkane-toolkit-${{ steps.version.outputs.version }}-linux-x86_64.tar.gz"
+107 -28
View File
@@ -6,11 +6,18 @@ on:
push:
branches: [main]
permissions:
contents: write
actions: write
jobs:
release:
runs-on: alkane-ci
env:
WX_PREFIX: /root/.cache/wx-3.3.3-linux
# Set once for the whole job so build/clippy/test/bench steps don't each
# re-export it (round 18 #12).
WX_RS_WXCONFIG: /root/.cache/wx-3.3.3-linux/bin/wx-config
steps:
- name: Checkout (full history for tags)
uses: actions/checkout@v4
@@ -22,11 +29,15 @@ jobs:
run: bash ci/compute-version.sh | tee -a "$GITHUB_OUTPUT"
- name: Test version logic
if: steps.ver.outputs.release == 'true'
run: bash ci/test-compute-version.sh
- name: Last-attempt badge checks
run: python3 ci/test-last-attempt-badge.py
- name: Benchmark history checks
run: python3 ci/test-bench-history.py
- name: Install build dependencies
if: steps.ver.outputs.release == 'true'
run: |
apt-get update -qq
apt-get install -y -qq --no-install-recommends \
@@ -34,14 +45,12 @@ jobs:
echo "libssl-dev + pkg-config installed (openssl-sys needs them)"
- name: Cache vendored wxWidgets build
if: steps.ver.outputs.release == 'true'
uses: actions/cache@v4
with:
path: /root/.cache/wx-3.3.3-linux
key: wx-3.3.3-${{ runner.os }}-${{ hashFiles('thirdparty/wx-rs/VERSION') }}
- name: Build wxWidgets (once, then cached)
if: steps.ver.outputs.release == 'true'
run: |
if [ ! -x "$WX_PREFIX/bin/wx-config" ]; then
bash scripts/build-wx-linux.sh
@@ -49,6 +58,12 @@ jobs:
echo "wx prefix restored from cache"
fi
- name: Clippy (our crate, warnings are errors)
run: |
rustup component add clippy >/dev/null 2>&1 || true
cargo clippy -p alkane-gui --no-deps --release --bins --offline -- -D warnings
cargo clippy -p alkane-artifacts -p alkane-flash -p alkane-cli --all-targets --offline -- -D warnings
- name: Set crate version to ${{ steps.ver.outputs.version }}
if: steps.ver.outputs.release == 'true'
run: |
@@ -56,31 +71,108 @@ jobs:
grep -m1 '^version' Cargo.toml
- name: Build release
if: steps.ver.outputs.release == 'true'
run: |
export WX_RS_WXCONFIG="$WX_PREFIX/bin/wx-config"
cargo build --release -p alkane-gui --offline
- name: Unit tests
if: steps.ver.outputs.release == 'true'
run: |
export WX_RS_WXCONFIG="$WX_PREFIX/bin/wx-config"
cargo test -p alkane-gui --offline
set -o pipefail
cargo test -p alkane-gui --offline 2>&1 | tee tests-gui.txt
cargo test -p alkane-artifacts -p alkane-flash -p alkane-cli --offline 2>&1 | tee tests-core.txt
cat tests-gui.txt tests-core.txt > tests-current.txt
- name: Load previous main benchmark measurement
env:
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
run: python3 ci/bench_history.py prepare
- name: Microbenchmarks
if: steps.ver.outputs.release == 'true'
run: |
export WX_RS_WXCONFIG="$WX_PREFIX/bin/wx-config"
cargo test -p alkane-gui --release --offline -- --ignored --nocapture bench_
# Capture the bench stdout for the weighted-average delta badge (round 19
# #1) while keeping the step a hard gate: pipefail preserves cargo's exit
# code (each bench asserts its own absolute ceiling) even through tee.
set -o pipefail
cargo test -p alkane-gui -p alkane-artifacts --release --offline -- --ignored --nocapture bench_ \
| tee bench-current.txt
- name: Record private benchmark history
env:
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
run: python3 ci/bench_history.py publish
- uses: https://github.com/ChristopherHX/gitea-upload-artifact@81f940d004763f986ba3582c007fd842dd5cb0d7
with:
name: alkane-toolkit-benchmark-site-preview
path: bench-site/index.html
- name: Headless UI self-test
if: steps.ver.outputs.release == 'true'
run: |
apt-get update -qq && apt-get install -y -qq --no-install-recommends \
xvfb xauth dbus-x11 fonts-dejavu-core >/dev/null
BIN=target/release/alkane-toolkit
xvfb-run -a env GDK_BACKEND=x11 ALKANE_SELFTEST=1 "$BIN"
- name: Dependency audit (best-effort)
continue-on-error: true
run: |
if command -v cargo-audit >/dev/null 2>&1; then
cargo audit || echo "cargo audit reported findings (accepted ones in .cargo/audit.toml)"
else
echo "cargo-audit not installed on this runner; skipping"
fi
# Merge coverage from unit tests and the headless UI self-test. A failed
# measurement must not publish a stale badge or create a release.
- name: Coverage
id: cov
run: |
set -euo pipefail
rustup component add llvm-tools-preview >/dev/null 2>&1 || true
if ! command -v cargo-llvm-cov >/dev/null 2>&1; then
V=0.8.7
URL="https://github.com/taiki-e/cargo-llvm-cov/releases/download/v${V}/cargo-llvm-cov-x86_64-unknown-linux-gnu.tar.gz"
DEST="${CARGO_HOME:-$HOME/.cargo}/bin"
mkdir -p "$DEST"
curl -fsSL "$URL" | tar -xz -C "$DEST"
export PATH="$DEST:$PATH"
fi
command -v cargo-llvm-cov >/dev/null
PCT=$(bash ci/coverage.sh --summary-only \
| awk '/^TOTAL/{gsub(/%/,"",$10); print $10}')
[ -n "$PCT" ] || { echo "coverage report produced no TOTAL line" >&2; exit 1; }
echo "pct=${PCT}" >> "$GITHUB_OUTPUT"
echo "line coverage (tests + self-test): ${PCT}%"
- name: Microbenchmark coverage
id: benchcov
run: |
set -euo pipefail
command -v cargo-llvm-cov >/dev/null
PCT=$(bash ci/bench-coverage.sh --summary-only \
| awk '/^TOTAL/{gsub(/%/,"",$10); print $10}')
[ -n "$PCT" ] || { echo "microbenchmark coverage unavailable" >&2; exit 1; }
echo "pct=${PCT}" >> "$GITHUB_OUTPUT"
echo "microbenchmark line coverage: ${PCT}%"
- name: Generate measured badges
run: |
set -euo pipefail
PASS=$(grep -E '^test result: ' tests-current.txt \
| grep -oE '[0-9]+ passed' | grep -oE '[0-9]+' \
| awk '{s+=$1} END{print s+0}')
[ "$PASS" -gt 0 ] || { echo "no passing tests counted" >&2; exit 1; }
BENCH_DELTA=$(python3 ci/bench-badge.py --current bench-current.txt \
--baseline badges/bench-baseline.json --no-write)
python3 ci/gen-badges.py --tests "$PASS" \
--coverage "${{ steps.cov.outputs.pct }}" \
--bench-coverage "${{ steps.benchcov.outputs.pct }}" \
--bench-delta "$BENCH_DELTA"
- name: Publish measured badges
env:
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
run: python3 ci/publish-metrics.py
- name: Package artifact
if: steps.ver.outputs.release == 'true'
id: pkg
@@ -105,21 +197,8 @@ jobs:
- name: Create Gitea release + upload artifact
if: steps.ver.outputs.release == 'true'
env:
TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
TAG="${{ steps.ver.outputs.tag }}"
API="${GITHUB_API_URL:-https://gitea.bluefla.re/api/v1}"
REPO="${GITHUB_REPOSITORY}"
body="Automated ${{ steps.ver.outputs.bump }} release from ${GITHUB_SHA}."
rel=$(curl -sS -X POST -H "Authorization: token ${TOKEN}" -H "Content-Type: application/json" \
"${API}/repos/${REPO}/releases" \
-d "{\"tag_name\":\"${TAG}\",\"target_commitish\":\"${GITHUB_SHA}\",\"name\":\"${TAG}\",\"body\":\"${body}\"}")
id=$(echo "$rel" | grep -oE '"id":[0-9]+' | head -1 | cut -d: -f2)
if [ -z "$id" ]; then echo "release create failed: $rel"; exit 1; fi
curl -sS -X POST -H "Authorization: token ${TOKEN}" -H "Content-Type: application/gzip" \
"${API}/repos/${REPO}/releases/${id}/assets?name=${{ steps.pkg.outputs.assetname }}" \
--data-binary @"${{ steps.pkg.outputs.asset }}" | grep -oE '"browser_download_url":"[^"]+"' || true
echo "Released ${TAG}"
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
run: python3 ci/release-rc.py "${{ steps.ver.outputs.tag }}" false "${{ steps.pkg.outputs.asset }}"
- name: No release needed
if: steps.ver.outputs.release != 'true'
+78
View File
@@ -0,0 +1,78 @@
name: verify
# Pre-merge quality gate: clippy + build + tests + microbenchmarks + the headless
# UI self-test, plus a best-effort dependency audit. Runs on pull requests and on
# pushes to any branch EXCEPT main (main is gated by release.yml, which repeats
# these checks before it cuts a release -- so no work is duplicated on main).
on:
pull_request:
branches-ignore: [next]
push:
branches-ignore: [main, next]
jobs:
verify:
runs-on: alkane-ci
env:
WX_PREFIX: /root/.cache/wx-3.3.3-linux
WX_RS_WXCONFIG: /root/.cache/wx-3.3.3-linux/bin/wx-config
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Install build dependencies
run: |
apt-get update -qq
apt-get install -y -qq --no-install-recommends \
libssl-dev pkg-config ca-certificates >/dev/null
- name: Cache vendored wxWidgets build
uses: actions/cache@v4
with:
path: /root/.cache/wx-3.3.3-linux
key: wx-3.3.3-${{ runner.os }}-${{ hashFiles('thirdparty/wx-rs/VERSION') }}
- name: Build wxWidgets (once, then cached)
run: |
if [ ! -x "$WX_PREFIX/bin/wx-config" ]; then
bash scripts/build-wx-linux.sh
else
echo "wx prefix restored from cache"
fi
- name: Clippy (our crate, warnings are errors)
run: |
rustup component add clippy >/dev/null 2>&1 || true
cargo clippy -p alkane-gui --no-deps --release --bins --offline -- -D warnings
cargo clippy -p alkane-artifacts -p alkane-flash -p alkane-cli --all-targets --offline -- -D warnings
- name: Build
run: cargo build --release -p alkane-gui --offline
- name: Unit tests
run: |
cargo test -p alkane-gui --offline
cargo test -p alkane-artifacts -p alkane-flash -p alkane-cli --offline
- name: Microbenchmarks
run: cargo test -p alkane-gui -p alkane-artifacts --release --offline -- --ignored --nocapture bench_
- name: Headless UI self-test
run: |
apt-get update -qq && apt-get install -y -qq --no-install-recommends \
xvfb xauth dbus-x11 fonts-dejavu-core >/dev/null
BIN=target/release/alkane-toolkit
xvfb-run -a env GDK_BACKEND=x11 ALKANE_SELFTEST=1 "$BIN"
# Advisory audit is best-effort: it needs the RustSec DB over the network,
# which the vendored/offline build otherwise never touches, so a locked-down
# runner must not fail the gate on it. Accepted advisories live in
# .cargo/audit.toml.
- name: Dependency audit (best-effort)
continue-on-error: true
run: |
if command -v cargo-audit >/dev/null 2>&1; then
cargo audit || echo "cargo audit reported findings (see .cargo/audit.toml for accepted ones)"
else
echo "cargo-audit not installed on this runner; skipping"
fi
+1
View File
@@ -1,3 +1,4 @@
/target
**/target
.claude/
__pycache__/
Generated
+6
View File
@@ -40,12 +40,15 @@ name = "alkane-artifacts"
version = "0.1.0"
dependencies = [
"alkane-core",
"sha2",
"thiserror",
]
[[package]]
name = "alkane-cli"
version = "0.1.0"
dependencies = [
"alkane-artifacts",
"alkane-core",
]
@@ -69,7 +72,10 @@ dependencies = [
name = "alkane-flash"
version = "0.1.0"
dependencies = [
"alkane-artifacts",
"alkane-core",
"sha2",
"thiserror",
]
[[package]]
+13 -1
View File
@@ -13,9 +13,21 @@ members = [
[workspace.package]
version = "0.1.0"
edition = "2021"
license = "MIT OR Apache-2.0"
license = "MIT"
[workspace.dependencies]
thiserror = "2"
serde = { version = "1", features = ["derive"] }
sha2 = "0.10"
# Release binary: small, self-contained, and fast enough for a fleet GUI whose
# hot path is network I/O, not CPU (round 18 #12). opt-level "s" + fat LTO +
# one codegen unit + symbol stripping cut the binary substantially. panic stays
# "unwind" on purpose: the scan runs many miners on tokio tasks and the wx event
# dispatch relies on unwinding so one miner's panic never aborts the whole app.
[profile.release]
opt-level = "s"
lto = "fat"
codegen-units = 1
strip = true
+21
View File
@@ -0,0 +1,21 @@
MIT License
Copyright (c) 2026 Blueflare
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
+107 -21
View File
@@ -1,38 +1,124 @@
# alkane-toolkit
Cross-platform desktop toolkit (Rust core, native GUI) to install **stock** or
**alkaneOS** firmware on ASIC miner control boards, whatever they currently run
(stock, Vnish/AnthillOS, Braiins OS+, LuxOS, ePIC, BixBit, WardenOS).
[![CI](https://gitea.bluefla.re/blueflare/alkane-toolkit/raw/branch/ci-badges/main.svg)](https://gitea.bluefla.re/blueflare/alkane-toolkit/actions)
![tests](https://gitea.bluefla.re/blueflare/alkane-toolkit/raw/branch/ci-badges/badges/tests.svg)
![coverage](https://gitea.bluefla.re/blueflare/alkane-toolkit/raw/branch/ci-badges/badges/coverage.svg)
![bench](https://gitea.bluefla.re/blueflare/alkane-toolkit/raw/branch/ci-badges/badges/bench.svg)
![bench coverage](https://gitea.bluefla.re/blueflare/alkane-toolkit/raw/branch/ci-badges/badges/bench-coverage.svg)
![lines of code](https://gitea.bluefla.re/blueflare/alkane-toolkit/raw/branch/ci-badges/badges/loc.svg)
![code quality](https://gitea.bluefla.re/blueflare/alkane-toolkit/raw/branch/ci-badges/badges/quality.svg)
![dependencies](https://gitea.bluefla.re/blueflare/alkane-toolkit/raw/branch/ci-badges/badges/dependencies.svg)
![license](https://gitea.bluefla.re/blueflare/alkane-toolkit/raw/branch/ci-badges/badges/license.svg)
Sibling to [alkane-sdk](https://gitea.bluefla.re/blueflare/alkane-sdk): the SDK
owns board knowledge and build outputs; this toolkit is the orchestration
engine and operator UI that executes its install recipes safely.
The CI badge shows the last completed attempt for this branch while newer
runs are queued. Badge SVGs are stored in a private, machine-maintained branch.
The code-quality letter requires warnings-denied Clippy and measured test plus
UI self-test line coverage: A at 90%, B at 80%, C at 70%, D at 60%, and F
below 60%. A missing coverage measurement displays pending.
## Status
A cross-platform desktop toolkit for discovering, monitoring, and re-flashing
ASIC miners. It scans a fleet over the network, shows live health and hashrate
in a sortable table. The install path is under development for **stock** and
**alkaneOS** firmware on boards running stock, VNish/AnthillOS, Braiins OS+,
LuxOS, ePIC, HiveOn, BixBit, WardenOS).
M1 primary view ships: discovery (vendored asic-rs 0.8.1) + the UI-SPEC
table (6 KPIs, sortable/drag-reorderable columns, row checkboxes, scan-range
editor, Excel-style filter, columns panel). Pure-Rust GUI on wxWidgets via
vendored + patched wx-rs (docs/adr/0002, 0003).
The core and UI are pure Rust; the native window is wxWidgets driven through a
vendored, patched [wx-rs](thirdparty/wx-rs) bridge, so there is no Electron,
no web view, and a single self-contained binary per platform.
## Build + run (Debian)
## What it does
- **Discover** a fleet by CIDR or IP range and identify each miner's make,
model, control board, and firmware (via a vendored [asic-rs](vendor/asic-rs)).
- **Monitor** hashrate vs. expected, per-board health, chip temperatures, fans,
PSU state, and pool workers, with an Excel-style filter and drag-reorderable
columns.
- **Operate** miners from a right-click menu: flash the locate light, pause /
resume, restart, set a power or hashrate target, select a firmware profile
(LuxOS/VNish presets), configure pools, set the timezone, and change the
password -- each action offered only when every selected miner supports it.
- **Install firmware**: push stock or aftermarket images, or revert an
aftermarket miner to stock, behind a typed confirmation.
Discovery and telemetry are read-only and safe to run against any fleet; every
mutating action is capability-gated and, where destructive, confirmed.
## Build and run (Debian/Ubuntu)
```sh
scripts/build-wx-linux.sh # once: builds vendored wx 3.3.3 to ~/.cache
scripts/build-wx-linux.sh # once: builds the vendored wxWidgets 3.3.3 into ~/.cache
scripts/build-gui-linux.sh # cargo build --release -p alkane-gui
~/.cache/alkane-tk-target/release/alkane-toolkit
```
Windows/macOS: `scripts/build-gui-windows.sh` (needs a Windows/msys2
toolchain) and `scripts/build-gui-macos.sh` (needs a Mac) - the GUI code is
shared; only the C++ bridge + wx differ per platform.
Runtime needs GTK 3: `sudo apt install libgtk-3-0`. To explore the UI with no
hardware, run the offline demo fleet:
See `docs/IMPLEMENTATION-PLAN.md` for the roadmap.
```sh
ALKANE_FAKE_SCAN=1 alkane-toolkit
```
## Hard rules (from alkane-sdk `docs/install-methods.md`, encoded in code)
Windows and macOS share all GUI code; only the C++ bridge and wx build differ
(`scripts/build-gui-windows.sh` needs an msys2 toolchain, `-macos.sh` needs a
Mac).
1. Never write the bootloader/secure region.
## Command-line probe
`miner_probe` is a headless companion for hardware checks that should not go
through the window event loop -- discovery, telemetry, and each write action:
```sh
miner_probe scan 10.0.0.0/24 # discover + telemetry (TSV)
miner_probe presets 10.0.0.5 # list a firmware's selectable profiles
miner_probe setpreset 10.0.0.5 540MHz
```
Run `miner_probe` with no arguments for the full verb list.
## Development
```sh
export WX_RS_WXCONFIG="$HOME/.cache/wx-3.3.3-linux/bin/wx-config"
export CARGO_TARGET_DIR="$HOME/.cache/alkane-tk-target" # keep the target tree off the source share
cargo test -p alkane-gui # unit tests
cargo test -p alkane-gui --release -- --ignored bench_ # microbenchmarks
cargo clippy -p alkane-gui --no-deps --bins -- -D warnings # lint gate
xvfb-run -a env ALKANE_SELFTEST=1 \
"$CARGO_TARGET_DIR/release/alkane-toolkit" # headless UI self-test
ci/coverage.sh --summary-only # coverage (tests + self-test)
```
CI mirrors these: `verify.yml` runs lint, tests, benchmarks, the self-test, and
a dependency audit on development branches. `release.yml` runs the full gate
on every `main` push and cuts an `X.Y.Z` release when the change warrants it.
`next.yml` builds release candidates with little testing and publishes `-rc`
releases. Dependencies are vendored under `vendor/`, so builds never touch the
network.
## Architecture
- `crates/alkane-gui` -- the application: scan engine, data model, wxWidgets UI,
and the `miner_probe` CLI (the other `crates/alkane-*` are early scaffolding).
- `vendor/asic-rs` -- the miner-discovery and control library, vendored and
extended through numbered patches under `thirdparty/asic-rs/patches`.
- `thirdparty/wx-rs` -- the patched wxWidgets bridge (see `docs/adr/0002`,
`0003`).
See [`docs/IMPLEMENTATION-PLAN.md`](docs/IMPLEMENTATION-PLAN.md) for the roadmap
and [`docs/aftermarket-parity-roadmap.md`](docs/aftermarket-parity-roadmap.md)
for the firmware config/scan parity work.
## Firmware safety rules
Encoded in code, from alkane-sdk `docs/install-methods.md`:
1. Never write the bootloader or secure region.
2. Verify on a channel the installer does not control.
3. Reboot is root-only; a dropped SSH connection can be success.
4. A packer is per board; never reuse across boards.
3. Reboot is root-only; a dropped SSH connection can still be success.
4. A packer is per board; never reuse one across boards.
5. Boot-switch handling is an explicit, verified step.
## License
Licensed under the [MIT license](LICENSE).
+11
View File
@@ -0,0 +1,11 @@
{
"bench_parse_line_near_max_addrs": 807160.0,
"bench_parse_targets_many_ranges_near_cap": 54465485.0,
"bench_render_cells": 3503112.0,
"bench_sort_by_each_column": 486975.0,
"bench_targets_to_cidrs_large_range": 482167.0,
"bench_upsert_cold_start_population": 8315814.0,
"bench_view_pipeline": 191794.0,
"bench_view_pipeline_default_sort": 193214.0,
"bench_view_pipeline_with_filter": 253085.0
}
+19
View File
@@ -0,0 +1,19 @@
<svg xmlns="http://www.w3.org/2000/svg" width="128.0" height="20" role="img" aria-label="bench coverage: 7%">
<title>bench coverage: 7%</title>
<linearGradient id="s" x2="0" y2="100%">
<stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
<stop offset="1" stop-opacity=".1"/>
</linearGradient>
<clipPath id="r"><rect width="128.0" height="20" rx="3" fill="#fff"/></clipPath>
<g clip-path="url(#r)">
<rect width="103.0" height="20" fill="#555"/>
<rect x="103.0" width="25.0" height="20" fill="#e05d44"/>
<rect width="128.0" height="20" fill="url(#s)"/>
</g>
<g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" font-size="11">
<text x="51.5" y="15" fill="#010101" fill-opacity=".3">bench coverage</text>
<text x="51.5" y="14">bench coverage</text>
<text x="115.5" y="15" fill="#010101" fill-opacity=".3">7%</text>
<text x="115.5" y="14">7%</text>
</g>
</svg>

After

Width:  |  Height:  |  Size: 946 B

+19
View File
@@ -0,0 +1,19 @@
<svg xmlns="http://www.w3.org/2000/svg" width="141.0" height="20" role="img" aria-label="bench: +7.4% vs prev">
<title>bench: +7.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"/>
</linearGradient>
<clipPath id="r"><rect width="141.0" height="20" rx="3" fill="#fff"/></clipPath>
<g clip-path="url(#r)">
<rect width="44.5" height="20" fill="#555"/>
<rect x="44.5" width="96.5" height="20" fill="#dfb317"/>
<rect width="141.0" height="20" fill="url(#s)"/>
</g>
<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="92.8" y="15" fill="#010101" fill-opacity=".3">+7.4% vs prev</text>
<text x="92.8" y="14">+7.4% vs prev</text>
</g>
</svg>

After

Width:  |  Height:  |  Size: 950 B

+19
View File
@@ -0,0 +1,19 @@
<svg xmlns="http://www.w3.org/2000/svg" width="95.5" height="20" role="img" aria-label="coverage: 44%">
<title>coverage: 44%</title>
<linearGradient id="s" x2="0" y2="100%">
<stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
<stop offset="1" stop-opacity=".1"/>
</linearGradient>
<clipPath id="r"><rect width="95.5" height="20" rx="3" fill="#fff"/></clipPath>
<g clip-path="url(#r)">
<rect width="64.0" height="20" fill="#555"/>
<rect x="64.0" width="31.5" height="20" fill="#dfb317"/>
<rect width="95.5" height="20" fill="url(#s)"/>
</g>
<g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" font-size="11">
<text x="32.0" y="15" fill="#010101" fill-opacity=".3">coverage</text>
<text x="32.0" y="14">coverage</text>
<text x="79.8" y="15" fill="#010101" fill-opacity=".3">44%</text>
<text x="79.8" y="14">44%</text>
</g>
</svg>

After

Width:  |  Height:  |  Size: 919 B

+19
View File
@@ -0,0 +1,19 @@
<svg xmlns="http://www.w3.org/2000/svg" width="121.5" height="20" role="img" aria-label="dependencies: 349">
<title>dependencies: 349</title>
<linearGradient id="s" x2="0" y2="100%">
<stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
<stop offset="1" stop-opacity=".1"/>
</linearGradient>
<clipPath id="r"><rect width="121.5" height="20" rx="3" fill="#fff"/></clipPath>
<g clip-path="url(#r)">
<rect width="90.0" height="20" fill="#555"/>
<rect x="90.0" width="31.5" height="20" fill="#007ec6"/>
<rect width="121.5" height="20" fill="url(#s)"/>
</g>
<g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" font-size="11">
<text x="45.0" y="15" fill="#010101" fill-opacity=".3">dependencies</text>
<text x="45.0" y="14">dependencies</text>
<text x="105.8" y="15" fill="#010101" fill-opacity=".3">349</text>
<text x="105.8" y="14">349</text>
</g>
</svg>

After

Width:  |  Height:  |  Size: 940 B

+19
View File
@@ -0,0 +1,19 @@
<svg xmlns="http://www.w3.org/2000/svg" width="89.0" height="20" role="img" aria-label="license: MIT">
<title>license: MIT</title>
<linearGradient id="s" x2="0" y2="100%">
<stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
<stop offset="1" stop-opacity=".1"/>
</linearGradient>
<clipPath id="r"><rect width="89.0" height="20" rx="3" fill="#fff"/></clipPath>
<g clip-path="url(#r)">
<rect width="57.5" height="20" fill="#555"/>
<rect x="57.5" width="31.5" height="20" fill="#007ec6"/>
<rect width="89.0" height="20" fill="url(#s)"/>
</g>
<g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" font-size="11">
<text x="28.8" y="15" fill="#010101" fill-opacity=".3">license</text>
<text x="28.8" y="14">license</text>
<text x="73.2" y="15" fill="#010101" fill-opacity=".3">MIT</text>
<text x="73.2" y="14">MIT</text>
</g>
</svg>

After

Width:  |  Height:  |  Size: 915 B

+19
View File
@@ -0,0 +1,19 @@
<svg xmlns="http://www.w3.org/2000/svg" width="141.0" height="20" role="img" aria-label="lines of code: 13.7K">
<title>lines of code: 13.7K</title>
<linearGradient id="s" x2="0" y2="100%">
<stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
<stop offset="1" stop-opacity=".1"/>
</linearGradient>
<clipPath id="r"><rect width="141.0" height="20" rx="3" fill="#fff"/></clipPath>
<g clip-path="url(#r)">
<rect width="96.5" height="20" fill="#555"/>
<rect x="96.5" width="44.5" height="20" fill="#007ec6"/>
<rect width="141.0" height="20" fill="url(#s)"/>
</g>
<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.7K</text>
<text x="118.8" y="14">13.7K</text>
</g>
</svg>

After

Width:  |  Height:  |  Size: 952 B

+19
View File
@@ -0,0 +1,19 @@
<svg xmlns="http://www.w3.org/2000/svg" width="108.5" height="20" role="img" aria-label="code quality: A">
<title>code quality: A</title>
<linearGradient id="s" x2="0" y2="100%">
<stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
<stop offset="1" stop-opacity=".1"/>
</linearGradient>
<clipPath id="r"><rect width="108.5" height="20" rx="3" fill="#fff"/></clipPath>
<g clip-path="url(#r)">
<rect width="90.0" height="20" fill="#555"/>
<rect x="90.0" width="18.5" height="20" fill="#4c1"/>
<rect width="108.5" height="20" fill="url(#s)"/>
</g>
<g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" font-size="11">
<text x="45.0" y="15" fill="#010101" fill-opacity=".3">code quality</text>
<text x="45.0" y="14">code quality</text>
<text x="99.2" y="15" fill="#010101" fill-opacity=".3">A</text>
<text x="99.2" y="14">A</text>
</g>
</svg>

After

Width:  |  Height:  |  Size: 927 B

+19
View File
@@ -0,0 +1,19 @@
<svg xmlns="http://www.w3.org/2000/svg" width="121.5" height="20" role="img" aria-label="tests: 95 passing">
<title>tests: 95 passing</title>
<linearGradient id="s" x2="0" y2="100%">
<stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
<stop offset="1" stop-opacity=".1"/>
</linearGradient>
<clipPath id="r"><rect width="121.5" height="20" rx="3" fill="#fff"/></clipPath>
<g clip-path="url(#r)">
<rect width="44.5" height="20" fill="#555"/>
<rect x="44.5" width="77.0" height="20" fill="#4c1"/>
<rect width="121.5" height="20" fill="url(#s)"/>
</g>
<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">tests</text>
<text x="22.2" y="14">tests</text>
<text x="83.0" y="15" fill="#010101" fill-opacity=".3">95 passing</text>
<text x="83.0" y="14">95 passing</text>
</g>
</svg>

After

Width:  |  Height:  |  Size: 935 B

+54
View File
@@ -0,0 +1,54 @@
# SPDX-License-Identifier: MIT
"""Write small badge artifacts to the private Gitea CI badge branch."""
import base64
import json
from urllib.error import HTTPError
from urllib.parse import quote
from urllib.request import Request, urlopen
BADGE_BRANCH = "ci-badges"
def request_json(url: str, token: str, method: str = "GET",
payload: dict | None = None) -> dict:
body = None if payload is None else json.dumps(payload).encode()
request = Request(url, data=body, method=method,
headers={"Authorization": f"token {token}",
"Content-Type": "application/json"})
with urlopen(request, timeout=20) as response:
return json.load(response)
def publish_file(api: str, repo: str, filename: str, data: bytes,
token: str, message: str, max_bytes: int = 65_536) -> None:
if not filename or filename.startswith("/") or any(
part in ("", ".", "..") for part in filename.split("/")):
raise ValueError("invalid badge path")
if len(data) > max_bytes:
raise ValueError("artifact exceeds size limit")
path = f"{api}/repos/{repo}/contents/{quote(filename, safe='/')}"
encoded = base64.b64encode(data).decode("ascii")
for attempt in range(3):
try:
current = request_json(path + "?ref=" + BADGE_BRANCH, token)
if base64.b64decode(current["content"]) == data:
return
sha = current["sha"]
method = "PUT"
except HTTPError as error:
if error.code != 404:
raise
sha = None
method = "POST"
payload = {"branch": BADGE_BRANCH, "content": encoded,
"message": message + " [skip ci]"}
if sha is not None:
payload["sha"] = sha
try:
request_json(path, token, method, payload)
return
except HTTPError as error:
if error.code not in (409, 422) or attempt == 2:
raise
raise RuntimeError("badge write did not complete")
+98
View File
@@ -0,0 +1,98 @@
#!/usr/bin/env python3
"""Compute the weighted-average microbenchmark delta versus the previous release.
Reads the captured stdout of `cargo test ... --ignored --nocapture bench_` (whose
timings are Rust `Duration` Debug strings: "12.3ms", "512us"/"512µs", "840ns",
"1.2s"), compares each bench to a committed baseline of the previous release's
numbers, and prints the time-weighted average change as a signed percentage:
(sum(current) / sum(baseline) - 1) * 100 over benches present in both
Weighting by duration means the slow benches dominate, so the number tracks
overall wall-time change rather than giving a tiny bench equal say. Then the
baseline is rewritten with the current numbers, so the next release compares
against this one ("the previous commit").
Usage:
bench-badge.py --current bench-current.txt --baseline badges/bench-baseline.json
Prints the delta as a plain number (e.g. "-3.2", or "NEW" when there is no
usable baseline) to stdout. The baseline JSON lives under badges/ so committing
it back does not trip compute-version.sh's path-based release bump.
"""
import argparse
import json
import os
import re
import sys
# A Duration Debug token: a number immediately followed by a time unit, with the
# multi-char units listed before the bare "s" so alternation prefers them. The
# trailing (?![a-zA-Z]) stops "s" in words like "rows"/"cidrs" from matching.
_DUR = re.compile(r"([0-9]+(?:\.[0-9]+)?)\s*(ns|µs|us|ms|s)(?![a-zA-Z])")
_UNIT_NS = {"ns": 1.0, "us": 1e3, "µs": 1e3, "ms": 1e6, "s": 1e9}
_NAME = re.compile(r"^(bench_[A-Za-z0-9_]+)\s*:")
def parse_bench(text: str) -> dict:
"""Map each bench name to its timing in nanoseconds (the last Duration on the
line, since every bench prints its timing last)."""
out = {}
for line in text.splitlines():
m = _NAME.match(line.strip())
if not m:
continue
durs = _DUR.findall(line)
if not durs:
continue
val, unit = durs[-1]
out[m.group(1)] = float(val) * _UNIT_NS[unit]
return out
def main() -> int:
ap = argparse.ArgumentParser()
ap.add_argument("--current", required=True, help="captured bench stdout")
ap.add_argument("--baseline", required=True, help="baseline JSON (read + rewrite)")
ap.add_argument("--no-write", action="store_true", help="do not update the baseline")
args = ap.parse_args()
try:
with open(args.current, encoding="utf-8") as fh:
current = parse_bench(fh.read())
except OSError as e:
print(f"bench-badge: cannot read current results: {e}", file=sys.stderr)
print("NEW")
return 0
if not current:
print("bench-badge: no bench lines parsed from current results", file=sys.stderr)
print("NEW")
return 0
baseline = {}
try:
with open(args.baseline, encoding="utf-8") as fh:
baseline = {k: float(v) for k, v in json.load(fh).items()}
except (OSError, ValueError):
baseline = {}
common = [k for k in current if k in baseline and baseline[k] > 0]
if common:
sum_new = sum(current[k] for k in common)
sum_old = sum(baseline[k] for k in common)
delta = (sum_new / sum_old - 1.0) * 100.0 if sum_old > 0 else 0.0
print(f"{delta:.1f}")
else:
print("NEW")
if not args.no_write:
os.makedirs(os.path.dirname(args.baseline) or ".", exist_ok=True)
with open(args.baseline, "w", encoding="utf-8") as fh:
json.dump({k: round(v, 1) for k, v in sorted(current.items())}, fh, indent=2)
fh.write("\n")
return 0
if __name__ == "__main__":
sys.exit(main())
+8
View File
@@ -0,0 +1,8 @@
#!/usr/bin/env bash
# Measure only instrumented microbenchmarks, excluding unit and UI tests.
set -euo pipefail
export WX_RS_WXCONFIG="${WX_RS_WXCONFIG:-$HOME/.cache/wx-3.3.3-linux/bin/wx-config}"
cargo llvm-cov clean --workspace
cargo llvm-cov --no-report --offline --release -p alkane-gui -p alkane-artifacts -- \
--ignored --nocapture bench_
cargo llvm-cov report --release --ignore-filename-regex '(thirdparty|vendor)/' "$@"
+153
View File
@@ -0,0 +1,153 @@
#!/usr/bin/env python3
# SPDX-License-Identifier: MIT
"""Keep measured main-branch benchmarks in the private CI artifact branch."""
import argparse
import base64
from datetime import datetime, timezone
import html
import json
import math
import os
from pathlib import Path
import re
import subprocess
import importlib.util
from urllib.error import HTTPError
from urllib.parse import quote
from badge_store import BADGE_BRANCH, publish_file, request_json
bench_spec = importlib.util.spec_from_file_location(
"bench_badge", Path(__file__).with_name("bench-badge.py"))
bench_badge = importlib.util.module_from_spec(bench_spec)
bench_spec.loader.exec_module(bench_badge)
INDEX = "history/index.json"
MAX_INDEX_ENTRIES = 50
def read_artifact(api: str, repo: str, token: str, filename: str):
url = f"{api}/repos/{repo}/contents/{quote(filename, safe='/')}?ref={BADGE_BRANCH}"
try:
value = request_json(url, token)
except HTTPError as error:
if error.code == 404:
return None
raise
return json.loads(base64.b64decode(value["content"]))
def valid_benches(metrics: dict) -> dict[str, float]:
values = metrics.get("bench_ns_per_op")
if not isinstance(values, dict) or not values:
raise ValueError("benchmark measurements are missing")
if any(not isinstance(key, str) or not re.fullmatch(r"[A-Za-z0-9_]+", key)
or not isinstance(value, (float, int)) or isinstance(value, bool)
or not math.isfinite(value) or value <= 0 for key, value in values.items()):
raise ValueError("benchmark measurements are invalid")
return values
def git_distance(ancestor: str, sha: str) -> int | None:
result = subprocess.run(("git", "rev-list", "--count", f"{ancestor}..{sha}"),
capture_output=True, text=True, check=False)
if result.returncode != 0:
return None
ancestor_check = subprocess.run(("git", "merge-base", "--is-ancestor", ancestor, sha),
capture_output=True, check=False)
return int(result.stdout.strip()) if ancestor_check.returncode == 0 else None
def previous_measurement(index: dict, sha: str, distance=None) -> dict:
distance = distance or git_distance
choices = []
for entry in index.get("entries", []):
ancestor = entry.get("sha")
if ancestor == sha or not isinstance(ancestor, str):
continue
gap = distance(ancestor, sha)
if gap is not None and gap > 0:
choices.append((gap, entry))
if not choices:
return {}
return valid_benches(min(choices, key=lambda item: item[0])[1]["metrics"])
def updated_index(index: dict, sha: str, metrics: dict, timestamp: str) -> dict:
if not re.fullmatch(r"[0-9a-f]{40}", sha):
raise ValueError("invalid commit SHA")
valid_benches(metrics)
entries = [entry for entry in index.get("entries", []) if entry.get("sha") != sha]
entries.append({"sha": sha, "timestamp": timestamp, "metrics": metrics})
return {"schema": 1, "entries": entries[-MAX_INDEX_ENTRIES:]}
def render_html(index: dict) -> str:
entries = list(reversed(index.get("entries", [])))
names = sorted({name for entry in entries
for name in valid_benches(entry["metrics"])})
rows = []
for entry in entries:
sha = entry["sha"]
if not re.fullmatch(r"[0-9a-f]{40}", sha):
raise ValueError("invalid commit SHA in history")
cells = [f'<td><a href="https://gitea.bluefla.re/blueflare/alkane-toolkit/commit/{sha}">{sha[:10]}</a></td>',
f'<td>{html.escape(entry["timestamp"])}</td>']
values = valid_benches(entry["metrics"])
cells += [f'<td>{values[name]:.3f}</td>' if name in values else '<td>new</td>'
for name in names]
rows.append("<tr>" + "".join(cells) + "</tr>")
headings = "".join(f"<th scope=\"col\">{html.escape(name)} (ns/op)</th>" for name in names)
return ("<!doctype html>\n<html lang=\"en\"><head><meta charset=\"utf-8\">"
"<meta name=\"viewport\" content=\"width=device-width, initial-scale=1\">"
"<title>Alkane Toolkit benchmarks</title><style>"
"body{font:16px system-ui,sans-serif;max-width:1100px;margin:2rem auto;padding:0 1rem;color:#17212b}"
"h1{font-size:2rem}p{max-width:70ch;line-height:1.5}"
"table{border-collapse:collapse;min-width:100%}th,td{padding:.5rem;border-bottom:1px solid #ccd3da;text-align:right}"
"th:first-child,td:first-child{text-align:left}th:nth-child(2),td:nth-child(2){text-align:left}"
"th{background:#edf2f6;position:sticky;top:0}a{color:#145a9a}"
".scroll{overflow-x:auto}small{color:#55616d}</style></head><body>"
"<h1>Alkane Toolkit microbenchmarks</h1>"
"<p>Measured on main CI. Lower ns/op is faster. Results depend on runner load and are "
"not board performance. A new benchmark has no earlier comparison.</p>"
f"<p><small>Most recent {len(entries)} measured commits. Full per-commit JSON is retained "
"in the private ci-badges branch.</small></p>"
f"<div class=\"scroll\"><table><thead><tr><th scope=\"col\">Commit</th>"
f"<th scope=\"col\">UTC</th>{headings}</tr></thead><tbody>{''.join(rows)}"
"</tbody></table></div></body></html>\n")
def main() -> None:
parser = argparse.ArgumentParser()
parser.add_argument("action", choices=("prepare", "publish"))
args = parser.parse_args()
api = os.environ["GITHUB_API_URL"].rstrip("/")
repo = os.environ["GITHUB_REPOSITORY"]
token = os.environ["GITEA_TOKEN"]
sha = os.environ["GITHUB_SHA"]
index = read_artifact(api, repo, token, INDEX) or {"schema": 1, "entries": []}
if index.get("schema") != 1 or not isinstance(index.get("entries"), list):
raise ValueError("unsupported benchmark history index")
if args.action == "prepare":
baseline = previous_measurement(index, sha)
Path("badges").mkdir(exist_ok=True)
Path("badges/bench-baseline.json").write_text(json.dumps(baseline) + "\n")
print(f"Loaded {len(baseline)} prior benchmark measurements")
return
metrics = {"bench_ns_per_op": bench_badge.parse_bench(
Path("bench-current.txt").read_text())}
timestamp = datetime.now(timezone.utc).isoformat(timespec="seconds")
index = updated_index(index, sha, metrics, timestamp)
record = json.dumps(index["entries"][-1], indent=2).encode() + b"\n"
publish_file(api, repo, f"history/{sha}.json", record, token,
"Record Alkane Toolkit benchmarks", max_bytes=1_048_576)
publish_file(api, repo, INDEX, json.dumps(index, indent=2).encode() + b"\n",
token, "Update Alkane Toolkit benchmark index", max_bytes=1_048_576)
Path("bench-site").mkdir(exist_ok=True)
Path("bench-site/index.html").write_text(render_html(index))
print(f"Recorded benchmarks for {sha[:10]}")
if __name__ == "__main__":
main()
+15
View File
@@ -0,0 +1,15 @@
#!/usr/bin/env bash
# Convert the next final version into a monotonically numbered prerelease.
set -euo pipefail
result="$(bash ci/compute-version.sh)"
release="$(printf '%s\n' "$result" | sed -n 's/^release=//p')"
if [ "$release" != true ]; then
echo "release=false"
exit 0
fi
version="$(printf '%s\n' "$result" | sed -n 's/^version=//p')"
last="$(git tag -l "v${version}-rc.*" | sed -n "s/^v${version//./\.}-rc\.\([0-9][0-9]*\)$/\1/p" | sort -n | tail -1)"
next=$(( ${last:-0} + 1 ))
echo "release=true"
echo "version=${version}-rc.${next}"
echo "tag=v${version}-rc.${next}"
+9 -6
View File
@@ -2,9 +2,10 @@
# Compute the next release version for alkane-toolkit from the latest release
# tag and the paths changed since it. Version scheme X.Y.Z:
# X - major, bumped manually (ci/version-x.txt); a bump resets Y.Z to 0.0
# Y - backend-logic changes (core/discovery/access/flash/artifacts/cli,
# scan+model+main in the GUI crate, build/CI config); resets Z to 0
# Z - UI changes (the GUI view + fixtures + the wx-rs widget bridge)
# Y - backend-logic changes (the alkane-* crates and any GUI crate source
# other than the view files below, plus vendored deps and build/CI config);
# resets Z to 0
# Z - UI changes (the GUI view: ui.rs + fixtures.rs + bin/ + the wx-rs bridge)
# When both backend and UI changed, backend wins (bump Y). Docs-only changes
# produce no release.
#
@@ -17,7 +18,7 @@ X=0
[ -f "$x_file" ] && X=$(tr -dc '0-9' < "$x_file")
X=${X:-0}
last=$(git tag -l 'v*.*.*' | sort -V | tail -1 || true)
last=$(git tag -l 'v*.*.*' | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$' | sort -V | tail -1 || true)
if [ -n "$last" ]; then
v=${last#v}; lx=${v%%.*}; rest=${v#*.}; ly=${rest%%.*}; lz=${rest##*.}
changed=$(git diff --name-only "$last"..HEAD)
@@ -35,9 +36,11 @@ crates/alkane-gui/src/bin/*)
ui=true ;;
crates/alkane-core/*|crates/alkane-discovery/*|crates/alkane-access/*|\
crates/alkane-flash/*|crates/alkane-artifacts/*|crates/alkane-cli/*|\
crates/alkane-gui/src/scan.rs|crates/alkane-gui/src/model.rs|\
crates/alkane-gui/src/main.rs|Cargo.toml|Cargo.lock|.gitea/*|ci/*|scripts/*|\
crates/alkane-gui/src/*|Cargo.toml|Cargo.lock|.gitea/*|ci/*|scripts/*|\
vendor/*|thirdparty/asic-rs/*)
# Any other GUI source file (naming, scan, model, pool_prefs, restore,
# access_probe, credentials, ...) is backend logic. ui.rs/fixtures.rs/bin
# match the UI arm above first, so they still bump Z, not Y.
backend=true ;;
*) : ;; # docs, HANDOFF, README, thirdparty/wxwidgets tree: no bump
esac
+39
View File
@@ -0,0 +1,39 @@
#!/usr/bin/env bash
# Measure line coverage from BOTH the unit tests AND the headless UI self-test.
#
# The self-test (ALKANE_SELFTEST=1) builds the real wxWidgets table, renders every
# fixture through the real widgets, and checks each cell against the model -- it
# exercises most of ui.rs. Because it runs as a separate binary invocation, a plain
# `cargo llvm-cov` (which only runs the #[test]s) never counts it, so ui.rs shows
# ~4% even though it is integration-tested. This combines both runs' coverage.
#
# Usage: ci/coverage.sh [extra `cargo llvm-cov report` args, e.g. --summary-only]
set -euo pipefail
export WX_RS_WXCONFIG="${WX_RS_WXCONFIG:-$HOME/.cache/wx-3.3.3-linux/bin/wx-config}"
# The dependency tree is fully vendored, so the instrumented builds run offline by
# default; override with CARGO_LLVM_COV_FLAGS if you need something else.
read -ra CARGO_FLAGS <<<"${CARGO_LLVM_COV_FLAGS:---offline}"
# A display for the self-test's real widgets.
need_xvfb() { command -v xvfb-run >/dev/null 2>&1; }
cargo llvm-cov clean --workspace
# 1. Unit tests for the GUI and the artifact/flash/CLI crates.
cargo llvm-cov --no-report "${CARGO_FLAGS[@]}" -p alkane-gui --bin alkane-toolkit
cargo llvm-cov --no-report "${CARGO_FLAGS[@]}" \
-p alkane-artifacts -p alkane-flash -p alkane-cli
# 2. Headless UI self-test, under the same instrumentation, its coverage appended.
if need_xvfb; then
xvfb-run -a env GDK_BACKEND=x11 ALKANE_SELFTEST=1 \
cargo llvm-cov run --no-report "${CARGO_FLAGS[@]}" --bin alkane-toolkit
else
echo "coverage.sh: xvfb-run not found; skipping the self-test run (unit tests only)" >&2
fi
# 3. Merged report, our source only (vendored asic-rs + the patched wx-rs bridge
# are out of scope).
cargo llvm-cov report --ignore-filename-regex '(thirdparty|vendor)/' "$@"
+225
View File
@@ -0,0 +1,225 @@
#!/usr/bin/env python3
"""Generate self-contained shields-style SVG badges into badges/.
Main CI regenerates SVGs from measured metrics and publishes them to the
private ci-badges branch. The README loads those authenticated raw artifacts.
Usage:
gen-badges.py --tests N --coverage PCT --bench "label" [--out badges]
Metrics not passed on the command line are computed here (LOC from the source
tree, dependency count from Cargo.lock, license from Cargo.toml).
"""
import argparse
import math
import os
import re
import sys
# Approximate per-character width at 11px DejaVu Sans, in 1/10 px, matching the
# shields "flat" look closely enough for a fixed-width monospace-ish render.
CHAR_W = 6.5
PAD = 6.0
COLORS = {
"green": "#4c1",
"brightgreen": "#4c1",
"yellowgreen": "#a4a61d",
"yellow": "#dfb317",
"orange": "#fe7d37",
"red": "#e05d44",
"blue": "#007ec6",
"lightgrey": "#9f9f9f",
"grey": "#555",
}
def text_width(s: str) -> float:
return len(s) * CHAR_W + 2 * PAD
def badge_svg(label: str, message: str, color: str) -> str:
color = COLORS.get(color, color)
lw = round(text_width(label), 1)
mw = round(text_width(message), 1)
total = round(lw + mw, 1)
lx = round(lw / 2, 1)
mx = round(lw + mw / 2, 1)
# Text is drawn twice (a dark shadow then the light glyphs) for the shields look.
return f'''<svg xmlns="http://www.w3.org/2000/svg" width="{total}" height="20" role="img" aria-label="{label}: {message}">
<title>{label}: {message}</title>
<linearGradient id="s" x2="0" y2="100%">
<stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
<stop offset="1" stop-opacity=".1"/>
</linearGradient>
<clipPath id="r"><rect width="{total}" height="20" rx="3" fill="#fff"/></clipPath>
<g clip-path="url(#r)">
<rect width="{lw}" height="20" fill="#555"/>
<rect x="{lw}" width="{mw}" height="20" fill="{color}"/>
<rect width="{total}" height="20" fill="url(#s)"/>
</g>
<g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" font-size="11">
<text x="{lx}" y="15" fill="#010101" fill-opacity=".3">{label}</text>
<text x="{lx}" y="14">{label}</text>
<text x="{mx}" y="15" fill="#010101" fill-opacity=".3">{message}</text>
<text x="{mx}" y="14">{message}</text>
</g>
</svg>
'''
def count_loc(root: str) -> int:
total = 0
for base in ("crates",):
for dirpath, _dirs, files in os.walk(os.path.join(root, base)):
for f in files:
if f.endswith(".rs"):
try:
with open(os.path.join(dirpath, f), encoding="utf-8", errors="ignore") as fh:
total += sum(1 for _ in fh)
except OSError:
pass
return total
def count_deps(root: str) -> int:
lock = os.path.join(root, "Cargo.lock")
try:
with open(lock, encoding="utf-8") as fh:
return sum(1 for line in fh if line.startswith("name = "))
except OSError:
return 0
def read_license(root: str) -> str:
try:
with open(os.path.join(root, "Cargo.toml"), encoding="utf-8") as fh:
for line in fh:
m = re.match(r'\s*license\s*=\s*"([^"]+)"', line)
if m:
return m.group(1)
except OSError:
pass
return "unknown"
def loc_color(n: int) -> str:
return "blue"
def bench_color(delta_pct: float) -> str:
# Negative delta = faster than the previous release. A +/-2% dead band absorbs
# the run-to-run jitter of microbenchmarks on a shared CI runner.
if delta_pct <= -2.0:
return "brightgreen"
if delta_pct < 2.0:
return "blue"
if delta_pct < 10.0:
return "yellow"
return "orange"
def cov_color(pct: float) -> str:
if pct >= 80:
return "brightgreen"
if pct >= 60:
return "yellowgreen"
if pct >= 40:
return "yellow"
if pct >= 20:
return "orange"
return "red"
def quality_grade(clippy: str, coverage: float | None) -> str:
if clippy != "clean":
return "F"
if coverage is None:
return "pending"
for minimum, grade in ((90, "A"), (80, "B"), (70, "C"), (60, "D")):
if coverage >= minimum:
return grade
return "F"
def human(n: int) -> str:
suffixes = ("", "K", "M", "G")
value = float(n)
index = 0
while value >= 999.5 and index < len(suffixes) - 1:
value /= 1000
index += 1
if value >= 100:
number = f"{value:.0f}"
elif value >= 10:
number = f"{value:.1f}".rstrip("0").rstrip(".")
else:
number = f"{value:.2f}".rstrip("0").rstrip(".")
return number + suffixes[index]
def main() -> int:
ap = argparse.ArgumentParser()
ap.add_argument("--out", default="badges")
ap.add_argument("--root", default=".")
ap.add_argument("--tests", type=int, default=None)
ap.add_argument("--coverage", type=float, default=None)
ap.add_argument("--bench-coverage", type=float, default=None)
ap.add_argument("--bench", default=None)
# Weighted-average microbench delta vs the previous release, as a signed
# percentage string (e.g. "-3.2"), or "NEW"/"" when there is no baseline yet
# (round 19 #1). Takes precedence over --bench for the bench badge.
ap.add_argument("--bench-delta", default=None)
ap.add_argument("--clippy", default="clean")
args = ap.parse_args()
for value in (args.coverage, args.bench_coverage):
if value is not None and (not math.isfinite(value) or not 0 <= value <= 100):
ap.error("coverage must be a finite percentage between 0 and 100")
os.makedirs(os.path.join(args.root, args.out), exist_ok=True)
def write(name, label, message, color):
path = os.path.join(args.root, args.out, name + ".svg")
with open(path, "w", encoding="utf-8") as fh:
fh.write(badge_svg(label, message, color))
print(f"wrote {path}: {label}={message}")
loc = count_loc(args.root)
deps = count_deps(args.root)
lic = read_license(args.root)
write("loc", "lines of code", human(loc), loc_color(loc))
write("license", "license", lic, "blue")
write("dependencies", "dependencies", str(deps), "blue")
grade = quality_grade(args.clippy, args.coverage)
write("quality", "code quality", grade,
{"A": "brightgreen", "B": "yellowgreen", "C": "yellow",
"D": "orange", "F": "red", "pending": "lightgrey"}[grade])
if args.tests is not None:
write("tests", "tests", f"{args.tests} passing", "brightgreen")
if args.coverage is not None:
write("coverage", "coverage", f"{args.coverage:.0f}%", cov_color(args.coverage))
write("bench-coverage", "bench coverage",
f"{args.bench_coverage:.0f}%" if args.bench_coverage is not None else "pending",
cov_color(args.bench_coverage) if args.bench_coverage is not None else "lightgrey")
# Bench badge: prefer the weighted-average delta vs the previous release; fall
# back to the static label (first run, or when the delta could not be computed).
delta = None
if args.bench_delta not in (None, "", "NEW"):
try:
delta = float(args.bench_delta)
except ValueError:
delta = None
if delta is not None:
# Negative = faster than the previous release (good).
msg = f"{'+' if delta > 0 else ''}{delta:.1f}% vs prev"
write("bench", "bench", msg, bench_color(delta))
elif args.bench_delta == "NEW":
write("bench", "bench", "baseline set", "blue")
elif args.bench is not None:
write("bench", "bench", args.bench, "blue")
return 0
if __name__ == "__main__":
sys.exit(main())
+115
View File
@@ -0,0 +1,115 @@
#!/usr/bin/env python3
# SPDX-License-Identifier: MIT
"""Publish the last completed main/next CI result to a private badge branch."""
import base64
import json
import os
from pathlib import Path
from urllib.error import HTTPError
from urllib.parse import quote, urlencode
from urllib.request import Request, urlopen
WORKFLOWS = {"release.yml": "main", "next.yml": "next"}
BADGE_BRANCH = "ci-badges"
def badge(branch: str, conclusion: str, run_id: int) -> bytes:
passed = conclusion == "success"
word = "pass" if passed else "fail"
color = "#2ea043" if passed else "#d1242f"
title = f"CI {branch}: last completed attempt {word} (run {run_id})"
return (f'<svg xmlns="http://www.w3.org/2000/svg" width="102" height="20" '
f'role="img" aria-label="{title}"><title>{title}</title>'
'<rect width="102" height="20" rx="3" fill="#555"/>'
f'<path d="M39 0h60a3 3 0 0 1 3 3v14a3 3 0 0 1-3 3H39z" fill="{color}"/>'
'<text x="20" y="14" fill="#fff" text-anchor="middle" '
'font-family="sans-serif" font-size="11">CI</text>'
f'<text x="70" y="14" fill="#fff" text-anchor="middle" '
f'font-family="sans-serif" font-size="11">{word}</text></svg>\n').encode()
def request_json(url: str, token: str, method: str = "GET",
payload: dict | None = None) -> dict:
body = None if payload is None else json.dumps(payload).encode()
request = Request(url, data=body, method=method,
headers={"Authorization": f"token {token}",
"Content-Type": "application/json"})
with urlopen(request, timeout=20) as response:
return json.load(response)
def latest_completed(api: str, repo: str, workflow: str, branch: str,
token: str) -> tuple[int, str]:
path = quote(workflow, safe="")
latest = None
for page in range(1, 21):
query = urlencode({"branch": branch, "limit": 50, "page": page})
url = f"{api}/repos/{repo}/actions/workflows/{path}/runs?{query}"
runs = request_json(url, token).get("workflow_runs", [])
for run in runs:
if run.get("head_branch") != branch or run.get("status") != "completed":
continue
if run.get("conclusion") not in ("success", "failure"):
continue
candidate = (int(run["id"]), run["conclusion"])
if latest is None or candidate[0] > latest[0]:
latest = candidate
if len(runs) < 50:
break
if latest is None:
raise RuntimeError(f"no completed {branch} run found for {workflow}")
return latest
def publish(api: str, repo: str, branch: str, data: bytes, token: str) -> None:
path = f"{api}/repos/{repo}/contents/{branch}.svg"
encoded = base64.b64encode(data).decode("ascii")
for attempt in range(3):
try:
current = request_json(path + "?ref=" + BADGE_BRANCH, token)
current_data = base64.b64decode(current["content"])
if current_data == data:
return
sha = current["sha"]
method = "PUT"
except HTTPError as error:
if error.code != 404:
raise
sha = None
method = "POST"
payload = {"branch": BADGE_BRANCH, "content": encoded,
"message": f"Record completed {branch} CI attempt"}
if sha is not None:
payload["sha"] = sha
try:
request_json(path, token, method, payload)
return
except HTTPError as error:
if error.code not in (409, 422) or attempt == 2:
raise
raise RuntimeError("badge write did not complete")
def main() -> None:
event = json.loads(Path(os.environ["GITHUB_EVENT_PATH"]).read_text())
if event.get("action") != "completed":
raise RuntimeError("expected a completed workflow_run event")
run = event["workflow_run"]
workflow = run["path"].split("@", 1)[0].rsplit("/", 1)[-1]
expected_branch = WORKFLOWS.get(workflow)
if expected_branch is None or run.get("head_branch") != expected_branch:
raise RuntimeError("unexpected workflow or branch")
repo = os.environ["GITHUB_REPOSITORY"]
if event["repository"]["full_name"] != repo:
raise RuntimeError("repository mismatch")
api = os.environ["GITHUB_API_URL"].rstrip("/")
token = os.environ["GITEA_TOKEN"]
run_id, conclusion = latest_completed(api, repo, workflow, expected_branch, token)
publish(api, repo, expected_branch, badge(expected_branch, conclusion, run_id), token)
print(f"{expected_branch} badge records completed run {run_id}: {conclusion}")
if __name__ == "__main__":
main()
+29
View File
@@ -0,0 +1,29 @@
#!/usr/bin/env python3
# SPDX-License-Identifier: MIT
"""Publish measured toolkit badges to the private Gitea badge branch."""
import os
from pathlib import Path
from badge_store import publish_file
ROOT = Path(__file__).resolve().parents[1]
NAMES = ("tests", "coverage", "bench", "bench-coverage", "loc",
"dependencies", "quality", "license")
def main() -> None:
api = os.environ["GITHUB_API_URL"].rstrip("/")
repo = os.environ["GITHUB_REPOSITORY"]
token = os.environ["GITEA_TOKEN"]
for name in NAMES:
data = (ROOT / "badges" / f"{name}.svg").read_bytes()
if not data.lstrip().startswith(b"<svg"):
raise ValueError(f"invalid {name} SVG")
publish_file(api, repo, f"badges/{name}.svg", data, token,
f"Update measured {name} badge")
print(f"Published {len(NAMES)} measured badge SVGs")
if __name__ == "__main__":
main()
+56
View File
@@ -0,0 +1,56 @@
#!/usr/bin/env python3
# SPDX-License-Identifier: MIT
"""Create one Gitea release and attach files using the runner's scoped token."""
import json
import os
import pathlib
import sys
import urllib.error
import urllib.parse
import urllib.request
def request(url, payload, content_type):
headers = {
"Authorization": "token " + os.environ["GITEA_TOKEN"],
"Content-Type": content_type,
}
req = urllib.request.Request(url, data=payload, headers=headers, method="POST")
with urllib.request.urlopen(req, timeout=60) as response:
return json.load(response)
def main():
if len(sys.argv) < 4:
sys.exit("usage: release.py TAG PRERELEASE FILE [FILE ...]")
tag, prerelease, *files = sys.argv[1:]
api = os.environ.get("GITHUB_API_URL", "https://gitea.bluefla.re/api/v1").rstrip("/")
repo = os.environ["GITHUB_REPOSITORY"]
sha = os.environ["GITHUB_SHA"]
body = f"Automated Alkane toolkit build from {sha}."
metadata = {
"tag_name": tag,
"target_commitish": sha,
"name": tag,
"body": body,
"prerelease": prerelease.lower() == "true",
}
try:
release = request(f"{api}/repos/{repo}/releases", json.dumps(metadata).encode(), "application/json")
except urllib.error.HTTPError as exc:
sys.exit(f"release creation failed: HTTP {exc.code}")
release_id = release["id"]
for name in files:
path = pathlib.Path(name)
query = urllib.parse.urlencode({"name": path.name})
try:
request(f"{api}/repos/{repo}/releases/{release_id}/assets?{query}",
path.read_bytes(), "application/octet-stream")
except urllib.error.HTTPError as exc:
sys.exit(f"asset upload failed for {path.name}: HTTP {exc.code}")
print(f"Created {tag} with {len(files)} assets")
if __name__ == "__main__":
main()
+46
View File
@@ -0,0 +1,46 @@
#!/usr/bin/env python3
# SPDX-License-Identifier: MIT
"""Exercise benchmark history selection and safe site rendering."""
import sys
from pathlib import Path
import unittest
sys.path.insert(0, str(Path(__file__).resolve().parent))
from bench_history import previous_measurement, render_html, updated_index
class HistoryTests(unittest.TestCase):
def test_retry_uses_previous_commit(self):
first = "a" * 40
second = "b" * 40
index = {"schema": 1, "entries": [
{"sha": first, "timestamp": "2026-01-01T00:00:00+00:00",
"metrics": {"bench_ns_per_op": {"hash": 10.0}}},
{"sha": second, "timestamp": "2026-01-02T00:00:00+00:00",
"metrics": {"bench_ns_per_op": {"hash": 8.0}}}]}
self.assertEqual(previous_measurement(index, second,
lambda ancestor, sha: 1 if ancestor == first else None),
{"hash": 10.0})
updated = updated_index(index, second, {"bench_ns_per_op": {"hash": 7.5}},
"2026-01-03T00:00:00+00:00")
self.assertEqual(len(updated["entries"]), 2)
self.assertEqual(updated["entries"][-1]["metrics"]["bench_ns_per_op"]["hash"], 7.5)
def test_invalid_measurement_and_sha_rejected(self):
with self.assertRaises(ValueError):
updated_index({}, "bad", {"bench_ns_per_op": {"hash": 1}}, "now")
with self.assertRaises(ValueError):
updated_index({}, "a" * 40, {"bench_ns_per_op": {"hash": -1}}, "now")
def test_site_escapes_history_content(self):
entry = {"sha": "a" * 40, "timestamp": "<script>alert(1)</script>",
"metrics": {"bench_ns_per_op": {"hash": 10.0}}}
page = render_html({"entries": [entry]})
self.assertIn("&lt;script&gt;", page)
self.assertNotIn("<script>", page)
self.assertIn("10.000", page)
if __name__ == "__main__":
unittest.main()
+35
View File
@@ -0,0 +1,35 @@
#!/usr/bin/env python3
# SPDX-License-Identifier: MIT
"""Check that queued CI runs do not displace the last completed result."""
import importlib.util
from pathlib import Path
from unittest.mock import patch
import xml.etree.ElementTree as ET
path = Path(__file__).with_name("last-attempt-badge.py")
spec = importlib.util.spec_from_file_location("last_attempt_badge", path)
module = importlib.util.module_from_spec(spec)
spec.loader.exec_module(module)
def runs(_url, _token):
return {"workflow_runs": [
{"id": 105, "head_branch": "main", "status": "completed", "conclusion": "cancelled"},
{"id": 104, "head_branch": "main", "status": "queued", "conclusion": None},
{"id": 103, "head_branch": "main", "status": "completed", "conclusion": "failure"},
{"id": 102, "head_branch": "main", "status": "completed", "conclusion": "success"},
]}
with patch.object(module, "request_json", runs):
assert module.latest_completed("https://example.invalid/api/v1", "owner/repo",
"release.yml", "main", "token") == (103, "failure")
svg = module.badge("main", "failure", 103)
root = ET.fromstring(svg)
assert root.attrib["aria-label"] == "CI main: last completed attempt fail (run 103)"
assert b">fail</text>" in svg
assert b"#d1242f" in svg
assert b">pass</text>" in module.badge("next", "success", 108)
print("last completed CI badge: queued run ignored, pass/fail SVGs valid")
+2
View File
@@ -6,3 +6,5 @@ license.workspace = true
[dependencies]
alkane-core = { path = "../alkane-core" }
sha2.workspace = true
thiserror.workspace = true
+257 -1
View File
@@ -1 +1,257 @@
// alkane-artifacts
// SPDX-License-Identifier: MIT
//! Verify local firmware artifacts before an install path consumes them.
use sha2::{Digest, Sha256};
use std::collections::HashSet;
use std::fs::File;
use std::io::{Read, Seek, SeekFrom};
use std::path::{Component, Path, PathBuf};
use thiserror::Error;
const SEED: &str = include_str!("../data/manifest-seed.csv");
const HEADER: &str = "sha256,size_bytes,path,family,format,applicability";
#[derive(Clone, Debug, Eq, PartialEq)]
pub struct ArtifactRecord {
pub sha256: String,
pub size_bytes: u64,
pub path: PathBuf,
pub family: String,
pub format: String,
pub applicability: String,
}
#[derive(Debug, Error)]
pub enum VerifyError {
#[error("artifact I/O: {0}")]
Io(#[from] std::io::Error),
#[error("manifest line {0} is invalid")]
Manifest(usize),
#[error("artifact size differs from manifest")]
Size,
#[error("artifact signature does not match its declared format")]
Signature,
#[error("artifact SHA-256 differs from manifest")]
Digest,
#[error("artifact format is not recognized")]
UnsupportedFormat,
}
/// A verified, rewound descriptor. Consumers should read this descriptor
/// directly instead of reopening the path after verification.
pub struct VerifiedArtifact {
file: File,
record: ArtifactRecord,
}
impl VerifiedArtifact {
pub fn record(&self) -> &ArtifactRecord {
&self.record
}
pub fn reader(&mut self) -> &mut File {
&mut self.file
}
/// Recheck the same descriptor immediately before a guarded write.
pub fn revalidate(&mut self) -> Result<(), VerifyError> {
verify_open_file(&mut self.file, &self.record)
}
}
pub fn seed_manifest() -> Result<Vec<ArtifactRecord>, VerifyError> {
parse_manifest(SEED)
}
pub fn parse_manifest(text: &str) -> Result<Vec<ArtifactRecord>, VerifyError> {
let mut lines = text.lines();
if lines.next() != Some(HEADER) {
return Err(VerifyError::Manifest(1));
}
let mut paths = HashSet::new();
let mut records = Vec::new();
for (line_number, line) in lines.enumerate() {
let line_number = line_number + 2;
let parts: Vec<_> = line.splitn(6, ',').collect();
if parts.len() != 6 || parts.iter().any(|part| part.trim().is_empty()) {
return Err(VerifyError::Manifest(line_number));
}
let digest = parts[0];
let path = PathBuf::from(parts[2]);
if digest.len() != 64
|| !digest.bytes().all(|byte| byte.is_ascii_hexdigit())
|| !path
.components()
.all(|part| matches!(part, Component::Normal(_)))
|| !paths.insert(path.clone())
{
return Err(VerifyError::Manifest(line_number));
}
let size_bytes = parts[1]
.parse::<u64>()
.map_err(|_| VerifyError::Manifest(line_number))?;
if size_bytes == 0 {
return Err(VerifyError::Manifest(line_number));
}
records.push(ArtifactRecord {
sha256: digest.to_ascii_lowercase(),
size_bytes,
path,
family: parts[3].to_owned(),
format: parts[4].to_owned(),
applicability: parts[5].to_owned(),
});
}
if records.is_empty() {
return Err(VerifyError::Manifest(1));
}
Ok(records)
}
fn signature_matches(format: &str, first: &[u8]) -> Result<bool, VerifyError> {
let prefix: &[u8] = match format {
"IMAGEWTY-SD" | "update-zip" | "zip-installer" => b"PK\x03\x04",
"ubifs" => b"\x31\x18\x10\x06",
"swu" => b"070702",
"wm-package-0x9a5ba57c" => b"\x7c\xa5\x5b\x9a",
"bmu" => b"\x26\x01",
"bin-AES-container" => b"\x3f\x0a\x64\xae",
_ => return Err(VerifyError::UnsupportedFormat),
};
Ok(first.starts_with(prefix))
}
pub fn verify_file(path: &Path, record: &ArtifactRecord) -> Result<VerifiedArtifact, VerifyError> {
let mut file = File::open(path)?;
verify_open_file(&mut file, record)?;
Ok(VerifiedArtifact {
file,
record: record.clone(),
})
}
fn verify_open_file(file: &mut File, record: &ArtifactRecord) -> Result<(), VerifyError> {
if file.metadata()?.len() != record.size_bytes {
return Err(VerifyError::Size);
}
file.seek(SeekFrom::Start(0))?;
let mut first = [0_u8; 16];
let length = file.read(&mut first)?;
if !signature_matches(&record.format, &first[..length])? {
return Err(VerifyError::Signature);
}
file.seek(SeekFrom::Start(0))?;
let mut hasher = Sha256::new();
let mut buffer = [0_u8; 64 * 1024];
let mut read_bytes = 0_u64;
loop {
let length = file.read(&mut buffer)?;
if length == 0 {
break;
}
read_bytes += length as u64;
hasher.update(&buffer[..length]);
}
if read_bytes != record.size_bytes {
return Err(VerifyError::Size);
}
let digest = hasher.finalize();
let actual: String = digest.iter().map(|byte| format!("{byte:02x}")).collect();
if actual != record.sha256 {
return Err(VerifyError::Digest);
}
file.seek(SeekFrom::Start(0))?;
Ok(())
}
#[cfg(test)]
mod tests {
use super::*;
use std::io::Write;
#[test]
fn manifest_has_unique_safe_records() {
let records = seed_manifest().unwrap();
assert_eq!(records.len(), 14);
let traversal = format!("{HEADER}\n{},12,../escape,bin,bmu,all\n", "0".repeat(64));
assert!(matches!(
parse_manifest(&traversal),
Err(VerifyError::Manifest(2))
));
}
#[test]
fn checks_size_signature_and_digest_before_consumption() {
let path =
std::env::temp_dir().join(format!("alkane-artifact-test-{}", std::process::id()));
let bytes = b"PK\x03\x04example";
let mut file = File::create(&path).unwrap();
file.write_all(bytes).unwrap();
drop(file);
let mut record = ArtifactRecord {
sha256: Sha256::digest(bytes)
.iter()
.map(|byte| format!("{byte:02x}"))
.collect(),
size_bytes: bytes.len() as u64,
path: PathBuf::from("fixture.zip"),
family: "test".to_owned(),
format: "update-zip".to_owned(),
applicability: "test".to_owned(),
};
let mut verified = verify_file(&path, &record).unwrap();
verified.revalidate().unwrap();
let mut replay = Vec::new();
verified.reader().read_to_end(&mut replay).unwrap();
assert_eq!(replay, bytes);
std::fs::write(&path, b"PK\x03\x04changed").unwrap();
assert!(matches!(verified.revalidate(), Err(VerifyError::Digest)));
std::fs::write(&path, bytes).unwrap();
verified.revalidate().unwrap();
record.size_bytes += 1;
assert!(matches!(
verify_file(&path, &record),
Err(VerifyError::Size)
));
record.size_bytes -= 1;
record.format = "ubifs".to_owned();
assert!(matches!(
verify_file(&path, &record),
Err(VerifyError::Signature)
));
record.format = "update-zip".to_owned();
record.sha256 = "0".repeat(64);
assert!(matches!(
verify_file(&path, &record),
Err(VerifyError::Digest)
));
std::fs::remove_file(path).unwrap();
}
#[test]
#[ignore = "microbenchmark"]
fn bench_verify_artifact() {
let path =
std::env::temp_dir().join(format!("alkane-artifact-bench-{}", std::process::id()));
let mut bytes = vec![0x42_u8; 65_536];
bytes[..4].copy_from_slice(b"PK\x03\x04");
std::fs::write(&path, &bytes).unwrap();
let record = ArtifactRecord {
sha256: Sha256::digest(&bytes)
.iter()
.map(|byte| format!("{byte:02x}"))
.collect(),
size_bytes: bytes.len() as u64,
path: PathBuf::from("bench.zip"),
family: "test".to_owned(),
format: "update-zip".to_owned(),
applicability: "test".to_owned(),
};
let started = std::time::Instant::now();
for _ in 0..100 {
std::hint::black_box(verify_file(&path, &record).unwrap());
}
println!("bench_verify_artifact: {:?}", started.elapsed() / 100);
std::fs::remove_file(path).unwrap();
}
}
+1
View File
@@ -6,3 +6,4 @@ license.workspace = true
[dependencies]
alkane-core = { path = "../alkane-core" }
alkane-artifacts = { path = "../alkane-artifacts" }
+29 -2
View File
@@ -1,4 +1,31 @@
//! Headless driver over the same engine the GUI uses.
// SPDX-License-Identifier: MIT
//! Headless entry point for read-only artifact verification.
use alkane_artifacts::{seed_manifest, verify_file};
use std::path::Path;
fn run() -> Result<(), Box<dyn std::error::Error>> {
let args: Vec<_> = std::env::args().collect();
if args.len() != 4 || args[1] != "verify-artifact" {
return Err("usage: alkane-cli verify-artifact <manifest-path> <local-file>".into());
}
let record = seed_manifest()?
.into_iter()
.find(|item| item.path == Path::new(&args[2]))
.ok_or("artifact path is absent from the seed manifest")?;
let verified = verify_file(Path::new(&args[3]), &record)?;
println!(
"verified {} {} {} bytes",
verified.record().family,
verified.record().format,
verified.record().size_bytes
);
Ok(())
}
fn main() {
println!("alkane-toolkit-cli: scaffold");
if let Err(error) = run() {
eprintln!("artifact verification failed: {error}");
std::process::exit(1);
}
}
+3
View File
@@ -6,3 +6,6 @@ license.workspace = true
[dependencies]
alkane-core = { path = "../alkane-core" }
alkane-artifacts = { path = "../alkane-artifacts" }
sha2.workspace = true
thiserror.workspace = true
+398 -1
View File
@@ -1 +1,398 @@
// alkane-flash
// SPDX-License-Identifier: MIT
//! Guarded write sequence for a verified artifact and an SDK partition plan.
//! Board transport adapters must supply serial, recovery and readback evidence.
use alkane_artifacts::VerifiedArtifact;
use sha2::{Digest, Sha256};
use std::io::{Read, Seek, SeekFrom};
use thiserror::Error;
pub struct PartitionSpec {
pub name: String,
pub capacity_bytes: u64,
pub secure: bool,
pub boot_critical: bool,
}
pub struct BackupEvidence {
pub location: String,
pub bytes: u64,
pub sha256: [u8; 32],
}
pub struct WriteReceipt {
pub partition: String,
pub backup: BackupEvidence,
pub image_sha256: [u8; 32],
}
pub trait Writer {
type Error: std::fmt::Display;
fn channel_id(&self) -> &str;
fn serial_console_attached(&mut self) -> Result<bool, Self::Error>;
fn recovery_image_ready(&mut self, partition: &PartitionSpec) -> Result<bool, Self::Error>;
fn backup(&mut self, partition: &PartitionSpec) -> Result<BackupEvidence, Self::Error>;
fn write(
&mut self,
partition: &PartitionSpec,
image: &mut dyn Read,
image_size: u64,
) -> Result<(), Self::Error>;
}
pub trait IndependentReadback {
type Error: std::fmt::Display;
fn channel_id(&self) -> &str;
fn sha256(&mut self, partition: &PartitionSpec, length: u64) -> Result<[u8; 32], Self::Error>;
}
#[derive(Debug, Error, Eq, PartialEq)]
pub enum FlashError {
#[error("secure partition write refused")]
SecurePartition,
#[error("image exceeds partition capacity")]
ImageTooLarge,
#[error("boot-critical write requires an attached serial console")]
SerialRequired,
#[error("boot-critical write requires verified recovery media")]
RecoveryRequired,
#[error("readback must use an independent channel")]
SameChannel,
#[error("complete backup evidence is missing")]
BackupIncomplete,
#[error("post-write readback differs from the image")]
ReadbackMismatch,
#[error("verified image has an invalid digest")]
InvalidDigest,
#[error("image changed since verification")]
ArtifactChanged,
#[error("writer did not consume the complete image")]
IncompleteWrite,
#[error("write transport: {0}")]
Write(String),
#[error("readback transport: {0}")]
Readback(String),
#[error("artifact I/O: {0}")]
ArtifactIo(String),
}
fn digest_bytes(hex: &str) -> Result<[u8; 32], FlashError> {
if hex.len() != 64 {
return Err(FlashError::InvalidDigest);
}
let mut result = [0_u8; 32];
for (index, pair) in hex.as_bytes().chunks_exact(2).enumerate() {
let text = std::str::from_utf8(pair).map_err(|_| FlashError::InvalidDigest)?;
result[index] = u8::from_str_radix(text, 16).map_err(|_| FlashError::InvalidDigest)?;
}
Ok(result)
}
struct DigestReader<'a> {
inner: &'a mut dyn Read,
remaining: u64,
digest: Sha256,
}
impl Read for DigestReader<'_> {
fn read(&mut self, buffer: &mut [u8]) -> std::io::Result<usize> {
let limit = buffer
.len()
.min(usize::try_from(self.remaining).unwrap_or(usize::MAX));
let length = self.inner.read(&mut buffer[..limit])?;
self.remaining -= length as u64;
self.digest.update(&buffer[..length]);
Ok(length)
}
}
/// Stop before reboot. The caller must still prove live boot and persistence.
pub fn write_verified<W: Writer, R: IndependentReadback>(
partition: &PartitionSpec,
artifact: &mut VerifiedArtifact,
writer: &mut W,
readback: &mut R,
) -> Result<WriteReceipt, FlashError> {
if partition.secure {
return Err(FlashError::SecurePartition);
}
let size = artifact.record().size_bytes;
if size == 0 || partition.capacity_bytes == 0 || size > partition.capacity_bytes {
return Err(FlashError::ImageTooLarge);
}
if writer.channel_id().is_empty()
|| readback.channel_id().is_empty()
|| writer.channel_id() == readback.channel_id()
{
return Err(FlashError::SameChannel);
}
if partition.boot_critical {
if !writer
.serial_console_attached()
.map_err(|e| FlashError::Write(e.to_string()))?
{
return Err(FlashError::SerialRequired);
}
if !writer
.recovery_image_ready(partition)
.map_err(|e| FlashError::Write(e.to_string()))?
{
return Err(FlashError::RecoveryRequired);
}
}
artifact
.revalidate()
.map_err(|_| FlashError::ArtifactChanged)?;
let backup = writer
.backup(partition)
.map_err(|e| FlashError::Write(e.to_string()))?;
if backup.location.is_empty()
|| backup.bytes != partition.capacity_bytes
|| backup.sha256 == [0; 32]
{
return Err(FlashError::BackupIncomplete);
}
let expected = digest_bytes(&artifact.record().sha256)?;
artifact
.reader()
.seek(SeekFrom::Start(0))
.map_err(|e| FlashError::ArtifactIo(e.to_string()))?;
let mut stream = DigestReader {
inner: artifact.reader(),
remaining: size,
digest: Sha256::new(),
};
writer
.write(partition, &mut stream, size)
.map_err(|e| FlashError::Write(e.to_string()))?;
if stream.remaining != 0 {
return Err(FlashError::IncompleteWrite);
}
let written_digest: [u8; 32] = stream.digest.finalize().into();
if written_digest != expected {
return Err(FlashError::ArtifactChanged);
}
let actual = readback
.sha256(partition, size)
.map_err(|e| FlashError::Readback(e.to_string()))?;
if actual != expected {
return Err(FlashError::ReadbackMismatch);
}
Ok(WriteReceipt {
partition: partition.name.clone(),
backup,
image_sha256: expected,
})
}
#[cfg(test)]
mod tests {
use super::*;
use alkane_artifacts::{verify_file, ArtifactRecord};
use std::path::PathBuf;
const SHA: &str = "bf7d458495ed067341c7148cd3d30e6d383a2113b2cfb37de12959e057a52528";
const IMAGE: &[u8] = b"PK\x03\x04payload";
struct MockWriter {
serial: bool,
recovery: bool,
backup_bytes: u64,
max_read: Option<u64>,
writes: usize,
contents: Vec<u8>,
}
impl Writer for MockWriter {
type Error = &'static str;
fn channel_id(&self) -> &str {
"ssh"
}
fn serial_console_attached(&mut self) -> Result<bool, Self::Error> {
Ok(self.serial)
}
fn recovery_image_ready(&mut self, _: &PartitionSpec) -> Result<bool, Self::Error> {
Ok(self.recovery)
}
fn backup(&mut self, _: &PartitionSpec) -> Result<BackupEvidence, Self::Error> {
Ok(BackupEvidence {
location: "recovery/partition.img".to_owned(),
bytes: self.backup_bytes,
sha256: [1; 32],
})
}
fn write(
&mut self,
_: &PartitionSpec,
image: &mut dyn Read,
_: u64,
) -> Result<(), Self::Error> {
self.writes += 1;
if let Some(limit) = self.max_read {
image
.take(limit)
.read_to_end(&mut self.contents)
.map_err(|_| "read failed")?;
} else {
image
.read_to_end(&mut self.contents)
.map_err(|_| "read failed")?;
}
Ok(())
}
}
struct MockReadback {
channel: &'static str,
digest: [u8; 32],
}
impl IndependentReadback for MockReadback {
type Error = &'static str;
fn channel_id(&self) -> &str {
self.channel
}
fn sha256(&mut self, _: &PartitionSpec, _: u64) -> Result<[u8; 32], Self::Error> {
Ok(self.digest)
}
}
fn artifact(suffix: &str) -> (PathBuf, VerifiedArtifact) {
let path =
std::env::temp_dir().join(format!("alkane-flash-test-{}-{suffix}", std::process::id()));
std::fs::write(&path, IMAGE).unwrap();
let record = ArtifactRecord {
sha256: SHA.to_owned(),
size_bytes: IMAGE.len() as u64,
path: PathBuf::from("fixture.zip"),
family: "test".to_owned(),
format: "update-zip".to_owned(),
applicability: "test".to_owned(),
};
let verified = verify_file(&path, &record).unwrap();
(path, verified)
}
fn writer() -> MockWriter {
MockWriter {
serial: true,
recovery: true,
backup_bytes: 4096,
max_read: None,
writes: 0,
contents: Vec::new(),
}
}
fn partition() -> PartitionSpec {
PartitionSpec {
name: "rootfs".to_owned(),
capacity_bytes: 4096,
secure: false,
boot_critical: true,
}
}
#[test]
fn refuses_secure_and_unrecoverable_writes_before_device_mutation() {
let (path, mut image) = artifact("refusals");
let mut target = partition();
let mut writer = writer();
let mut readback = MockReadback {
channel: "serial",
digest: digest_bytes(SHA).unwrap(),
};
target.secure = true;
assert!(matches!(
write_verified(&target, &mut image, &mut writer, &mut readback),
Err(FlashError::SecurePartition)
));
target.secure = false;
target.capacity_bytes = 1;
assert!(matches!(
write_verified(&target, &mut image, &mut writer, &mut readback),
Err(FlashError::ImageTooLarge)
));
target.capacity_bytes = 4096;
writer.serial = false;
assert!(matches!(
write_verified(&target, &mut image, &mut writer, &mut readback),
Err(FlashError::SerialRequired)
));
writer.serial = true;
writer.recovery = false;
assert!(matches!(
write_verified(&target, &mut image, &mut writer, &mut readback),
Err(FlashError::RecoveryRequired)
));
writer.recovery = true;
writer.backup_bytes = 1;
assert!(matches!(
write_verified(&target, &mut image, &mut writer, &mut readback),
Err(FlashError::BackupIncomplete)
));
assert_eq!(writer.writes, 0);
std::fs::remove_file(path).unwrap();
}
#[test]
fn requires_independent_matching_readback() {
let (path, mut image) = artifact("readback");
let target = partition();
let mut writer = writer();
let mut readback = MockReadback {
channel: "ssh",
digest: [0; 32],
};
assert!(matches!(
write_verified(&target, &mut image, &mut writer, &mut readback),
Err(FlashError::SameChannel)
));
assert_eq!(writer.writes, 0);
readback.channel = "serial";
assert!(matches!(
write_verified(&target, &mut image, &mut writer, &mut readback),
Err(FlashError::ReadbackMismatch)
));
assert_eq!(writer.writes, 1);
assert_eq!(writer.contents, IMAGE);
writer.contents.clear();
readback.digest = digest_bytes(SHA).unwrap();
let receipt = write_verified(&target, &mut image, &mut writer, &mut readback).unwrap();
assert_eq!(receipt.image_sha256, readback.digest);
assert_eq!(receipt.backup.bytes, 4096);
assert_eq!(writer.writes, 2);
assert_eq!(writer.contents, IMAGE);
std::fs::remove_file(path).unwrap();
}
#[test]
fn refuses_changed_or_partially_consumed_artifacts() {
let (path, mut image) = artifact("changed");
let target = partition();
let mut writer = writer();
let mut readback = MockReadback {
channel: "serial",
digest: digest_bytes(SHA).unwrap(),
};
std::fs::write(&path, b"PK\x03\x04changed").unwrap();
assert!(matches!(
write_verified(&target, &mut image, &mut writer, &mut readback),
Err(FlashError::ArtifactChanged)
));
assert_eq!(writer.writes, 0);
std::fs::write(&path, IMAGE).unwrap();
writer.max_read = Some(4);
assert!(matches!(
write_verified(&target, &mut image, &mut writer, &mut readback),
Err(FlashError::IncompleteWrite)
));
assert_eq!(writer.writes, 1);
std::fs::remove_file(path).unwrap();
}
}
+75 -20
View File
@@ -61,10 +61,22 @@ fn endpoint(_firmware: &str) -> &'static str {
/// could not run at all.
pub fn probe_access(ip: &str, make: &str, user: &str, pass: &str) -> Result<Option<bool>, String> {
if make.eq_ignore_ascii_case("whatsminer") {
return Ok(probe_whatsminer_access(ip, &whatsminer_password_candidates()));
// Try the caller's saved scan password first (round 18 #12: it was being
// ignored for WhatsMiner, so a miner opened with the operator's real
// password was mis-reported as locked), then the per-firmware override and
// factory defaults. All attempts are non-mutating.
let mut candidates = Vec::new();
if !pass.is_empty() {
candidates.push(pass.to_string());
}
for c in whatsminer_password_candidates() {
if !candidates.contains(&c) {
candidates.push(c);
}
}
return Ok(probe_whatsminer_access(ip, &candidates));
}
let url = format!("http://{ip}{}", endpoint(make));
let userpass = format!("{user}:{pass}");
let mut cmd = Command::new("curl");
cmd.args([
"-s",
@@ -73,15 +85,18 @@ pub fn probe_access(ip: &str, make: &str, user: &str, pass: &str) -> Result<Opti
"-w",
"%{http_code}",
"--digest",
"-u",
&userpass,
"--connect-timeout",
"5",
"--max-time",
"9",
"-K",
"-", // read the rest of the config (the credentials) from stdin
&url,
]);
let out = wait_with_timeout(cmd, Duration::from_secs(12))?;
// The user:pass goes through a curl config on stdin, never argv, so it can't
// be read from the process list (round 18 #12).
let config = format!("user = \"{}\"\n", curl_config_quote(&format!("{user}:{pass}")));
let out = wait_with_timeout(cmd, Duration::from_secs(12), Some(config.as_bytes()))?;
// curl prints the status code to stdout regardless of exit status (000 on a
// connection failure), so classify the code rather than the exit status.
let code = String::from_utf8_lossy(&out.stdout);
@@ -89,11 +104,25 @@ pub fn probe_access(ip: &str, make: &str, user: &str, pass: &str) -> Result<Opti
}
/// Run a command with a wall-clock timeout (curl can hang past --max-time on a
/// black-holed host).
fn wait_with_timeout(mut cmd: Command, timeout: Duration) -> Result<std::process::Output, String> {
use std::io::Read;
/// black-holed host). `stdin_data`, when set, is written to the child's stdin and
/// the pipe closed -- used to feed a curl config (with the credentials) instead
/// of putting them on the command line (round 18 #12).
fn wait_with_timeout(
mut cmd: Command,
timeout: Duration,
stdin_data: Option<&[u8]>,
) -> Result<std::process::Output, String> {
use std::io::{Read, Write};
cmd.stdout(std::process::Stdio::piped()).stderr(std::process::Stdio::piped());
if stdin_data.is_some() {
cmd.stdin(std::process::Stdio::piped());
}
let mut child = cmd.spawn().map_err(|e| format!("spawn curl: {e}"))?;
if let Some(data) = stdin_data {
if let Some(mut si) = child.stdin.take() {
let _ = si.write_all(data);
} // dropping `si` closes the pipe so curl stops reading the config
}
let start = std::time::Instant::now();
loop {
match child.try_wait().map_err(|e| e.to_string())? {
@@ -111,6 +140,7 @@ fn wait_with_timeout(mut cmd: Command, timeout: Duration) -> Result<std::process
None => {
if start.elapsed() >= timeout {
let _ = child.kill();
let _ = child.wait(); // reap so we never leave a zombie (round 18 #12)
return Err("curl timed out".into());
}
std::thread::sleep(Duration::from_millis(100));
@@ -119,6 +149,11 @@ fn wait_with_timeout(mut cmd: Command, timeout: Duration) -> Result<std::process
}
}
/// Escape a value for a curl `--config` file (double-quoted string).
fn curl_config_quote(s: &str) -> String {
s.replace('\\', "\\\\").replace('"', "\\\"")
}
/// Passwords to try for a WhatsMiner access check: a user-set per-firmware
/// override (round 12 #13) wins; otherwise the two factory defaults ("admin" for
/// V1/V2, "super" for V3). All attempts are non-mutating, so trying both is safe.
@@ -205,23 +240,39 @@ fn wm_aes_ecb_enc(pwd_md5: &str, data: &str) -> Option<String> {
fn probe_whatsminer_access(ip: &str, passwords: &[String]) -> Option<bool> {
let timeout = Duration::from_secs(6);
let mut reachable = false;
// A transient error on one candidate must not abandon the others (round 18 #12):
// skip to the next candidate, but remember it happened so we never report a
// confident "locked" when the answer was really indeterminate.
let mut errored = false;
for pass in passwords {
// 1. get_token (no auth) -> salt / newsalt / time.
let tok_resp = match wm_rpc(ip, "{\"command\":\"get_token\"}", timeout) {
Ok(s) => s,
Err(_) => return None,
Err(_) => {
errored = true;
continue;
}
};
let v: serde_json::Value = match serde_json::from_str(&tok_resp) {
Ok(v) => v,
Err(_) => return None,
Err(_) => {
errored = true;
continue;
}
};
let Some(msg) = v.get("Msg") else { return None };
let (Some(salt), Some(newsalt), Some(time)) = (
msg.get("salt").and_then(|s| s.as_str()),
msg.get("newsalt").and_then(|s| s.as_str()),
msg.get("time").and_then(|s| s.as_str()),
) else {
return None;
let (Some(salt), Some(newsalt), Some(time)) = v
.get("Msg")
.map(|msg| {
(
msg.get("salt").and_then(|s| s.as_str()),
msg.get("newsalt").and_then(|s| s.as_str()),
msg.get("time").and_then(|s| s.as_str()),
)
})
.unwrap_or((None, None, None))
else {
errored = true;
continue;
};
reachable = true;
// 2. Derive the md5crypt password hash + write-token from the password.
@@ -239,15 +290,19 @@ fn probe_whatsminer_access(ip: &str, passwords: &[String]) -> Option<bool> {
let payload = format!("{{\"enc\":1,\"data\":\"{enc}\"}}");
let resp = match wm_rpc(ip, &payload, timeout) {
Ok(s) => s,
Err(_) => return None,
Err(_) => {
errored = true;
continue;
}
};
if resp.contains("\"enc\"") {
return Some(false); // accepted -> unlocked/writable
}
// rejected -> try the next candidate password
}
// Reached the miner and every candidate password was rejected -> locked.
if reachable { Some(true) } else { None }
// Only report "locked" when we cleanly reached the miner and every candidate
// was rejected with no transient errors; otherwise the result is indeterminate.
if reachable && !errored { Some(true) } else { None }
}
#[cfg(test)]
+88 -3
View File
@@ -1,6 +1,6 @@
//! miner_probe -- a read-only (by default) asic-rs diagnostic for live-hardware
//! verification of the round-9 power-limit work. It reuses the same MinerFactory
//! + saved-credential setup the GUI uses (see crate::credentials), but as a
//! and saved-credential setup the GUI uses (see crate::credentials), but as a
//! standalone CLI so hardware checks don't go through the wx event loop.
//!
//! Usage:
@@ -39,12 +39,17 @@ fn load_creds() -> Option<(String, String)> {
}
fn factory() -> MinerFactory {
// This diagnostic CLI is a separate binary from the GUI, so it cannot share
// the GUI's credentials::configured_factory. It applies only the global scan
// credentials to every firmware; the GUI's per-firmware credential overrides
// are NOT read here (round 18 #12), which the message below makes explicit so a
// probe result is never mistaken for what the GUI (with overrides) would see.
let mut f = MinerFactory::new();
if let Some((u, pw)) = load_creds() {
for fw in asic_rs::factory::default_firmware_registry() {
f = f.with_firmware_discovery_auth(fw.as_ref(), MinerAuth::new(u.clone(), pw.clone()));
}
eprintln!("(using saved scan credentials for discovery auth)");
eprintln!("(using the global scan credentials; per-firmware overrides are not applied)");
} else {
eprintln!("(no saved credentials -- backends use their default auth)");
}
@@ -300,13 +305,17 @@ async fn msgs(ip_s: &str) {
println!(" fans(rpm)={fans:?} psu_fans={}", d.psu_fans.len());
for b in d.hashboards.iter() {
println!(
" board pos={} hr={:?}TH chips={:?}/{:?} board_temp={:?} outlet_temp={:?}",
" board pos={} hr={:?}TH chips={:?}/{:?} board_temp={:?} outlet_temp={:?} freq={:?}MHz volt={:?}V chip_type={:?} hb_model={:?}",
b.position,
th(&b.hashrate),
b.working_chips,
b.expected_chips,
b.board_temperature.as_ref().map(|t| t.as_celsius()),
b.outlet_chip_temperature.as_ref().map(|t| t.as_celsius()),
b.frequency.as_ref().map(|f| f.as_megahertz()),
b.voltage.as_ref().map(|v| v.as_volts()),
b.chip_type,
b.hashboard_model,
);
}
if d.messages.is_empty() {
@@ -492,6 +501,7 @@ async fn tune(ip_s: &str) {
m.supports_set_tuning_percent(),
m.supports_tuning_config(),
);
println!(" psu={:?}", data.psu);
println!(" tuning_percent={:?}", data.tuning_percent);
println!(" tuning_target={:?}", data.tuning_target);
match &data.tuning_capabilities {
@@ -597,6 +607,77 @@ async fn settune(ip_s: &str, kind: &str, value: f64) {
}
}
/// READ: list the firmware's selectable profiles/presets (roadmap G3).
async fn presets(ip_s: &str) {
let ip: std::net::IpAddr = match ip_s.parse() {
Ok(ip) => ip,
Err(e) => {
eprintln!("bad ip {ip_s}: {e}");
return;
}
};
let f = factory();
match f.scan_miner(ip).await {
Ok(Some(m)) => {
if !m.supports_presets() {
println!("{ip}: firmware does not expose named presets");
return;
}
let list = m.get_presets().await;
if list.is_empty() {
println!("{ip}: no presets reported");
return;
}
for p in list {
match (p.pretty, p.status) {
(Some(pretty), Some(status)) => println!("{}\t{pretty}\t[{status}]", p.name),
(Some(pretty), None) => println!("{}\t{pretty}", p.name),
(None, _) => println!("{}", p.name),
}
}
}
Ok(None) => eprintln!("no miner at {ip}"),
Err(e) => eprintln!("scan_miner {ip}: {e}"),
}
}
/// WRITE (reversible): select a named firmware profile/preset (roadmap G3).
/// `setpreset <ip> <name>`. Prints the prior target so it can be restored.
async fn setpreset(ip_s: &str, name: &str) {
use asic_rs::core::config::tuning::TuningConfig;
use asic_rs::core::data::miner::TuningTarget;
let ip: std::net::IpAddr = match ip_s.parse() {
Ok(ip) => ip,
Err(e) => {
eprintln!("bad ip {ip_s}: {e}");
return;
}
};
let f = factory();
match f.scan_miner(ip).await {
Ok(Some(m)) => {
let before = m.get_data().await;
eprintln!(
"target {ip}: {} {} {} (supports_presets={}); prior target = {:?}",
before.device_info.make,
before.device_info.firmware,
before.device_info.model,
m.supports_presets(),
before.tuning_target,
);
let cfg = TuningConfig::new(TuningTarget::Preset(name.to_string()));
match m.set_tuning_config(cfg, None).await {
Ok(v) => println!("set_tuning_config(preset {name}) -> Ok({v})"),
Err(e) => println!("set_tuning_config(preset {name}) -> Err: {e:#}"),
}
let after = m.get_data().await;
println!(" target now = {:?}", after.tuning_target);
}
Ok(None) => eprintln!("no miner at {ip}"),
Err(e) => eprintln!("scan_miner {ip}: {e}"),
}
}
fn main() {
let args: Vec<String> = std::env::args().collect();
let rt = match tokio::runtime::Builder::new_current_thread().enable_all().build() {
@@ -629,6 +710,8 @@ fn main() {
}
Some("msgs") if args.len() == 3 => rt.block_on(msgs(&args[2])),
Some("tune") if args.len() == 3 => rt.block_on(tune(&args[2])),
Some("presets") if args.len() == 3 => rt.block_on(presets(&args[2])),
Some("setpreset") if args.len() == 4 => rt.block_on(setpreset(&args[2], &args[3])),
Some("settune") if args.len() == 5 && matches!(args[3].as_str(), "power" | "hashrate") => {
let value: f64 = args[4].parse().unwrap_or(-1.0);
if value <= 0.0 {
@@ -650,6 +733,7 @@ fn main() {
\x20 hashrate <cidr> [<cidr>...] raw hashrate/algo dump\n\
\x20 msgs <ip> structured faults + per-board data\n\
\x20 tune <ip> structured-tuning support + capability envelope\n\
\x20 presets <ip> list selectable firmware profiles/presets\n\
\n\
WRITE (MUTATES the miner -- use the test-bed miners, not production):\n\
\x20 light <ip> <on|off> set the locate light\n\
@@ -659,6 +743,7 @@ fn main() {
\x20 restart <ip> restart/reboot\n\
\x20 setpl <ip> <watts> set power limit\n\
\x20 settune <ip> <power|hashrate> <v> set a structured tuning target (prints prior)\n\
\x20 setpreset <ip> <name> select a named firmware profile/preset (prints prior)\n\
\x20 setpools <ip> <url> <user> <pass> set the default pool group\n\
\x20 timezone <ip> [<IANA>] read (no arg) or set the timezone\n\
\x20 passwd <ip> <newpass> change the web/API password (DANGEROUS)\n\
+9 -3
View File
@@ -191,7 +191,12 @@ pub fn clear_firmware_credentials() -> std::io::Result<()> {
/// otherwise the backend falls back to its own default auth. With nothing saved
/// this is plain `MinerFactory::new()`.
pub fn configured_factory() -> MinerFactory {
let mut factory = MinerFactory::new();
// Apply the operator's configured identification timeout to every factory
// (round 18 #12: config actions / refresh / pools / flash previously used
// asic-rs's 10s default, so on a slow link they could fail to reach miners a
// longer-timeout scan had found). start_scan may still override it explicitly.
let mut factory =
MinerFactory::new().with_identification_timeout_secs(crate::scan::load_scan_timeout().max(1));
let global = load_credentials();
let per_fw = load_firmware_credentials();
if global.is_none() && per_fw.is_empty() {
@@ -216,8 +221,9 @@ mod tests {
#[test]
fn credentials_round_trip_and_file_perms() {
// config_path() reads $HOME; point it at a private temp dir. HOME is
// process-global, so this stays one test and restores HOME afterward
// (matching the pattern used by scan::tests::auto_secs_round_trip_and_defaults).
// process-global, so serialise against other HOME-mutating tests via the
// shared lock and restore HOME afterward (round 18 #12).
let _home = crate::model::HOME_TEST_LOCK.lock().unwrap_or_else(|e| e.into_inner());
let prev = std::env::var_os("HOME");
let dir = std::env::temp_dir().join(format!("alkane-cred-test-{}", std::process::id()));
let _ = std::fs::remove_dir_all(&dir);
+73 -14
View File
@@ -9,13 +9,43 @@
use crate::model::{BoardHealth, MinerRow};
/// Escape one CSV field: quote it when it contains a comma, quote, CR or LF, and
/// double any embedded quotes.
/// A compact UTC timestamp "YYYYMMDD-HHMMSS" for a default export filename
/// (round 19 #5). UTC keeps this dependency-free (no chrono) and unambiguous.
pub fn timestamp_utc() -> String {
let secs = std::time::SystemTime::now()
.duration_since(std::time::UNIX_EPOCH)
.map(|d| d.as_secs())
.unwrap_or(0);
let sod = secs % 86_400;
let (h, mi, s) = (sod / 3600, (sod % 3600) / 60, sod % 60);
// Civil date from days since 1970-01-01 (Howard Hinnant's civil_from_days).
let z = (secs / 86_400) as i64 + 719_468;
let era = if z >= 0 { z } else { z - 146_096 } / 146_097;
let doe = z - era * 146_097; // [0, 146096]
let yoe = (doe - doe / 1460 + doe / 36_524 - doe / 146_096) / 365; // [0, 399]
let doy = doe - (365 * yoe + yoe / 4 - yoe / 100); // [0, 365]
let mp = (5 * doy + 2) / 153; // [0, 11]
let d = doy - (153 * mp + 2) / 5 + 1; // [1, 31]
let m = if mp < 10 { mp + 3 } else { mp - 9 }; // [1, 12]
let y = yoe + era * 400 + i64::from(m <= 2);
format!("{y:04}{m:02}{d:02}-{h:02}{mi:02}{s:02}")
}
/// Escape one CSV field: neutralise spreadsheet formula injection, then quote it
/// when it contains a comma, quote, CR or LF (doubling any embedded quotes).
///
/// Miner-supplied fields (hostname, worker, serial, ...) can start with a formula
/// trigger; prefixing a single quote makes Excel/Sheets treat the cell as text so
/// opening the export can't execute an injected formula (round 18 #12).
fn esc(s: &str) -> String {
if s.contains([',', '"', '\n', '\r']) {
format!("\"{}\"", s.replace('"', "\"\""))
let mut val = s.to_string();
if val.starts_with(['=', '+', '-', '@', '\t', '\r']) {
val.insert(0, '\'');
}
if val.contains([',', '"', '\n', '\r']) {
format!("\"{}\"", val.replace('"', "\"\""))
} else {
s.to_string()
val
}
}
@@ -97,14 +127,42 @@ fn scalar_columns() -> Vec<Col> {
]
}
/// Build the full CSV for `rows`. Empty rows still emit a header line.
pub fn rows_to_csv(rows: &[MinerRow]) -> String {
let cols = scalar_columns();
// Widest variable-length fields across the set.
let max_board_temps = rows.iter().map(|r| r.board_temps.len()).max().unwrap_or(0);
let max_fans = rows.iter().map(|r| r.fan_rpms.len()).max().unwrap_or(0);
let max_boards = rows.iter().map(|r| r.board_status.len()).max().unwrap_or(0);
let max_pools = rows.iter().map(|r| r.pools.len()).max().unwrap_or(0);
// Group keys for the four variable-length field families (each expands to
// per-index columns). Shown as single checkboxes in the export picker (round 19 #6).
pub const GROUP_BOARD_TEMPS: &str = "board temps";
pub const GROUP_FANS: &str = "fan rpms";
pub const GROUP_BOARD_STATUS: &str = "board status";
pub const GROUP_POOLS: &str = "pools";
/// Every selectable export field, in output order: each scalar column header,
/// then the four variable-length group keys.
pub fn export_field_names() -> Vec<String> {
let mut v: Vec<String> = scalar_columns().iter().map(|(h, _)| (*h).to_string()).collect();
v.push(GROUP_BOARD_TEMPS.to_string());
v.push(GROUP_FANS.to_string());
v.push(GROUP_BOARD_STATUS.to_string());
v.push(GROUP_POOLS.to_string());
v
}
/// Build the CSV for `rows` including only the selected fields (scalar column
/// headers and/or the group keys above), in the fixed output order (round 19 #6).
/// Empty rows still emit a header line.
pub fn rows_to_csv_selected(
rows: &[MinerRow],
selected: &std::collections::HashSet<String>,
) -> String {
let cols: Vec<Col> =
scalar_columns().into_iter().filter(|(h, _)| selected.contains(*h)).collect();
// A group's columns appear only when it is selected; an unselected group's
// width stays 0, so the header/value loops below emit nothing for it.
let width = |want: bool, f: &dyn Fn(&MinerRow) -> usize| -> usize {
if want { rows.iter().map(f).max().unwrap_or(0) } else { 0 }
};
let max_board_temps = width(selected.contains(GROUP_BOARD_TEMPS), &|r| r.board_temps.len());
let max_fans = width(selected.contains(GROUP_FANS), &|r| r.fan_rpms.len());
let max_boards = width(selected.contains(GROUP_BOARD_STATUS), &|r| r.board_status.len());
let max_pools = width(selected.contains(GROUP_POOLS), &|r| r.pools.len());
// Header.
let mut headers: Vec<String> = cols.iter().map(|(h, _)| (*h).to_string()).collect();
@@ -166,7 +224,8 @@ mod tests {
},
MinerRow { ip: "10.0.0.2".into(), model: "M30S".into(), ..Default::default() },
];
let csv = rows_to_csv(&rows);
let all: std::collections::HashSet<String> = export_field_names().into_iter().collect();
let csv = rows_to_csv_selected(&rows, &all);
let lines: Vec<&str> = csv.lines().collect();
assert_eq!(lines.len(), 3, "header + 2 rows");
assert!(lines[0].starts_with("ip,model,brand,"));
+43 -9
View File
@@ -67,6 +67,12 @@ impl Board {
} else {
vec![]
};
// Per-board configured frequency/voltage for the G7 read-side tooltip demo.
let (board_frequencies, board_voltages) = if self.mining {
(vec![590.0, 590.0, 565.0], vec![13.50, 13.50, 13.35])
} else {
(vec![], vec![])
};
// Air-cooled WhatsMiners report an ambient reading (asic-rs surfaces it in
// its fluid_temperature field); the scan routes it to env_temp for
// air-cooled models, so the demo mirrors that (round 11 #17).
@@ -86,6 +92,11 @@ impl Board {
"10.255.1.166" => vec![Ok, Ok, Missing],
_ => vec![Ok, Ok, Ok],
}
} else if self.paused {
// A paused miner's boards are physically present but idle (asic-rs
// reports active=false -> Fault), so the Health column shows them blue
// rather than red (round 19 #19); the offline demo mirrors that.
vec![Fault, Fault, Fault]
} else {
vec![]
};
@@ -104,6 +115,8 @@ impl Board {
let control_board = crate::naming::control_board_code(self.make, self.board, &model);
let cpu = crate::naming::control_board_cpu(self.make, self.board, &model);
let board_code = crate::naming::control_board_board(self.make, self.board, &model);
// Computed before `model` is moved into the struct literal below.
let pic_present = crate::scan::infer_pic(&model);
MinerRow {
ip: self.ip.to_string(),
selected: false,
@@ -115,8 +128,14 @@ impl Board {
cpu,
board_code,
hashrate_ths: self.hashrate,
// A miner that is mining or paused reported a current hashrate (a paused
// one reports 0 -> "0.00T"); the blank stock demo miner reports none, so
// it keeps the "-" dash (round 19 follow-up).
hashrate_known: self.mining || self.paused,
expected_ths: self.expected,
board_hashrates,
board_voltages,
board_frequencies,
efficiency,
power_w: self.power,
chip_temp_c: self.temp,
@@ -135,6 +154,13 @@ impl Board {
board_status,
total_chips: chips,
psu_fan_rpm: if self.mining { self.fan * 0.9 } else { 0.0 },
// PSU info demo (round 17 R5): mining units show a version + rated
// envelope + live output, so the columns and the R2 PSU tooltip render.
psu_version: if self.mining { "22 (117)".to_string() } else { String::new() },
psu_voltage_min_v: self.mining.then_some(11.88),
psu_voltage_max_v: self.mining.then_some(15.18),
psu_out_voltage_v: self.mining.then_some(13.2),
psu_out_current_a: self.mining.then_some(210.0),
uptime_secs: if self.mining { 3600 * 24 * 2 + 3600 * 5 } else { 0 },
// One unit is "being located" so the Light column's yellow dot is
// demonstrable offline (round 11 #10).
@@ -166,6 +192,7 @@ impl Board {
power_limit: self.mining,
tuning: self.mining,
hashrate_target: self.mining,
supports_presets: self.mining,
firmware_flash,
pools: true,
timezone: self.mining,
@@ -176,13 +203,9 @@ impl Board {
// show variety offline). control_board is derived above via naming.
algorithm: "SHA256".to_string(),
control_board,
pic_present: if self.model_id.contains("S21") {
Some(false) // noPIC example
} else if self.make.eq_ignore_ascii_case("antminer") {
Some(true)
} else {
None // WhatsMiner: unknown over the network
},
// Use the same PIC inference the live scan uses (round 18 #12: the demo
// previously reimplemented a simplified version that disagreed with it).
pic_present,
// Access: idle/view-only units (no worker) shown locked; the rest
// unlocked. (Live rows infer this from control capabilities.)
write_locked: Some(self.worker.is_empty()),
@@ -196,6 +219,17 @@ impl Board {
} else {
Vec::new()
},
// Demo firmware presets (round 18 / G3) so the "Set profile..." dialog
// is exercisable offline on units that advertise preset support.
presets: if self.mining {
vec![
crate::model::MinerPreset { name: "default".into(), pretty: Some("2794 W ~ 121.8 TH @ 590 MHz".into()) },
crate::model::MinerPreset { name: "540MHz".into(), pretty: Some("2485 W ~ 111.5 TH @ 540 MHz".into()) },
crate::model::MinerPreset { name: "490MHz".into(), pretty: Some("2192 W ~ 101.1 TH @ 490 MHz".into()) },
]
} else {
Vec::new()
},
..Default::default()
}
}
@@ -231,10 +265,10 @@ pub fn bench_fleet() -> Vec<MinerRow> {
Board { ip: "10.255.1.126", make: "Whatsminer", model_id: "M30SVE40", board: "H3", firmware: "Stock", fw_version: "H3.0.1",
hashrate: 92.0, expected: 96.0, power: 3400.0, temp: 70.0, fan: 4800.0,
worker: "blueflare.h3", mining: true, paused: false },
Board { ip: "10.255.1.131", make: "Whatsminer", model_id: "M30SPlusVE40", board: "H616", firmware: "Hive", fw_version: "1.0",
Board { ip: "10.255.1.131", make: "Whatsminer", model_id: "M30SPlusVE40", board: "H616", firmware: "Hiveon", fw_version: "1.05",
hashrate: 100.0, expected: 100.0, power: 3450.0, temp: 71.0, fan: 4900.0,
worker: "blueflare.h616", mining: true, paused: false },
Board { ip: "10.255.1.148", make: "Whatsminer", model_id: "M50VH50", board: "H6", firmware: "BixBit", fw_version: "2.1",
Board { ip: "10.255.1.148", make: "Whatsminer", model_id: "M50VH50", board: "H6", firmware: "Bixbit", fw_version: "0.9.9.4",
hashrate: 118.0, expected: 122.0, power: 3300.0, temp: 66.0, fan: 4600.0,
worker: "blueflare.m50", mining: true, paused: false },
// Rebucketed from idle/not-hashing to paused so the "paused"
+48 -229
View File
@@ -1,58 +1,44 @@
//! Fetch a miner's log over its firmware API and regex-scan it for useful
//! signals (round 12 #12). This is the "logs through API" path the operator
//! asked for: where a firmware exposes its log we can read board/PIC lines and
//! other metrics without SSH.
//! Fetch a miner's log for the "View log (API)" viewer (round 12 #12, reworked
//! round 19 #11-16).
//!
//! Per firmware:
//! - VNish (aftermarket Antminer): POST /api/v1/unlock to get a bearer token,
//! then GET /api/v1/logs/miner -- the full miner log (PSU init, per-chain
//! chip detection, tuning, errors).
//! - Stock Antminer: GET /cgi-bin/log.cgi behind digest auth (older models
//! such as the Z15 do not serve it -> reported as unavailable).
//! - WhatsMiner: the btminer log is not exposed on :4028, but get_error_code
//! (unauthenticated) returns the active fault codes, which we format as the
//! log view.
//! The log is fetched through asic-rs's per-backend `read_logs()` API, which
//! knows each firmware's real transport (Antminer/Z15 + BixBit stock web,
//! Braiins gRPC/journal, VNish and ePIC HTTP, ...). This replaced the GUI's
//! narrow three-way curl fetch, whose stock `/cgi-bin/log.cgi` `else` branch
//! failed on every firmware that does not serve that CGI (Braiins, LuxOS, Z15,
//! BixBit).
//!
//! We shell out to `curl` (already a dependency of the access probe) so the
//! offline/vendored build gains no new crate, and cap the fetched text so a huge
//! log never bloats the viewer.
//! WhatsMiner is the exception: its btminer log is not exposed over the API, and
//! asic-rs has no `read_logs` for it, so the viewer falls back to the active
//! fault codes (get_error_code on :4028, unauthenticated). LuxOS likewise has no
//! asic-rs log API and reports the log as unavailable.
use std::process::Command;
use std::time::Duration;
/// Cap on the log text we keep for display (bytes); the regex summary is still
/// computed over everything fetched.
/// Cap on the log text we keep for display (bytes); a miner's freshest lines are
/// at the tail, so we keep the tail.
const MAX_LOG_BYTES: usize = 256 * 1024;
/// A fetched log plus the signals a regex pass pulled out of it.
/// A fetched log for the viewer.
pub struct LogScan {
/// The (possibly tail-trimmed) log text for the viewer.
/// The (possibly tail-trimmed) log text.
pub text: String,
/// One-line-per-finding summary shown above the log.
pub summary: Vec<String>,
}
/// Fetch and scan one miner's log. `brand` is the make ("Antminer"/"Whatsminer"),
/// `firmware` the family ("VNish"/"Stock"/...). `vnish_pass`/`wm` creds are used
/// where that firmware needs auth. Returns `Err` only when no log could be read.
pub fn scan_log(
ip: &str,
brand: &str,
firmware: &str,
vnish_pass: &str,
antminer_user: &str,
antminer_pass: &str,
) -> Result<LogScan, String> {
let raw = if firmware.eq_ignore_ascii_case("vnish") {
fetch_vnish_log(ip, vnish_pass)?
} else if brand.eq_ignore_ascii_case("whatsminer") {
fetch_whatsminer_errors(ip)?
} else {
// Stock / other Antminer-family web firmware.
fetch_antminer_log(ip, antminer_user, antminer_pass)?
};
let summary = summarize_log(&raw);
Ok(LogScan { text: tail(&raw, MAX_LOG_BYTES), summary })
/// Fetch one miner's log. `brand` is the make ("Antminer"/"Whatsminer"/...);
/// `timeout_secs` is the per-miner identification timeout. Returns `Err` only
/// when no log could be read.
pub fn scan_log(ip: &str, brand: &str, timeout_secs: u64) -> Result<LogScan, String> {
// WhatsMiner's real log is not exposed over its API and asic-rs has no
// read_logs for it, so show the active fault codes instead of failing.
if brand.eq_ignore_ascii_case("whatsminer") {
let resp = crate::access_probe::whatsminer_get_error_code(ip)
.ok_or_else(|| "WhatsMiner did not answer get_error_code on :4028".to_string())?;
return Ok(LogScan { text: tail(&resp, MAX_LOG_BYTES) });
}
let text = crate::scan::fetch_log(ip, timeout_secs)?;
if text.trim().is_empty() {
return Err("the miner returned an empty log".to_string());
}
Ok(LogScan { text: tail(&text, MAX_LOG_BYTES) })
}
/// Keep the last `max` bytes of `s` (a log's tail is the freshest), on a line
@@ -61,197 +47,30 @@ fn tail(s: &str, max: usize) -> String {
if s.len() <= max {
return s.to_string();
}
let start = s.len() - max;
// advance to the next line boundary so we don't cut a line in half
let start = s[start..]
.find('\n')
.map(|i| start + i + 1)
.unwrap_or(start);
// Nudge the cut forward to a UTF-8 char boundary first: a raw byte offset can
// land inside a multi-byte character and slicing there would panic (round 18
// #12; miner logs are not guaranteed pure ASCII).
let mut start = s.len() - max;
while start < s.len() && !s.is_char_boundary(start) {
start += 1;
}
// then advance to the next line boundary so we don't cut a line in half
let start = s[start..].find('\n').map(|i| start + i + 1).unwrap_or(start);
format!("[... earlier log trimmed ...]\n{}", &s[start..])
}
/// Regex-free scan for the high-value signals in a miner log: PIC / hashboard
/// firmware lines, per-chain chip detection, and the most recent errors.
fn summarize_log(log: &str) -> Vec<String> {
let mut out = Vec::new();
let lc_has = |line: &str, needle: &str| line.to_ascii_lowercase().contains(needle);
// PIC / hashboard-controller status from the log. Aftermarket firmwares state
// it explicitly ("no-PIC miner"); stock boot logs print a PIC version. This
// is the log-regex PIC scan the operator asked for (round 12 #12).
let pic_lines: Vec<&str> = log.lines().filter(|l| lc_has(l, "pic")).collect();
if pic_lines.iter().any(|l| lc_has(l, "no-pic") || lc_has(l, "no pic")) {
out.push("PIC: not present (log reports a no-PIC miner)".to_string());
} else if let Some(l) = pic_lines
.iter()
.find(|l| lc_has(l, "version") || lc_has(l, "fw") || lc_has(l, "found"))
{
out.push(format!("PIC: present -- {}", l.trim()));
} else if !pic_lines.is_empty() {
out.push(format!("PIC: {} log line(s) mention PIC", pic_lines.len()));
for l in pic_lines.iter().take(3) {
out.push(format!(" {}", l.trim()));
}
} else {
out.push("PIC: no PIC lines in the log".to_string());
}
// Latest per-chain chip-detection line (the most recent board bring-up).
if let Some(l) = log.lines().rev().find(|l| lc_has(l, "chips detected")) {
out.push(format!("Chains: {}", l.trim()));
}
// Recent errors (log history, beyond asic-rs's current-message snapshot).
// Skip the get_error_code header line (it contains "error" but is not one).
let errors: Vec<&str> = log
.lines()
.rev()
.filter(|l| (lc_has(l, "error") || lc_has(l, "fail")) && !lc_has(l, "get_error_code"))
.take(3)
.collect();
if errors.is_empty() {
out.push("Errors: none in the log".to_string());
} else {
out.push(format!("Errors: {} recent", errors.len()));
for l in errors {
out.push(format!(" {}", l.trim()));
}
}
out
}
/// VNish: unlock -> bearer -> the full miner log.
fn fetch_vnish_log(ip: &str, pass: &str) -> Result<String, String> {
let unlock = curl(&[
"-s",
"--connect-timeout",
"5",
"--max-time",
"9",
"-X",
"POST",
"-H",
"Content-Type: application/json",
"-d",
&format!("{{\"pw\":\"{pass}\"}}"),
&format!("http://{ip}/api/v1/unlock"),
])?;
let token = serde_json::from_str::<serde_json::Value>(&unlock)
.ok()
.and_then(|v| v.get("token").and_then(|t| t.as_str()).map(str::to_string))
.filter(|t| !t.is_empty())
.ok_or_else(|| "VNish unlock rejected (check the VNish password in scan credentials)".to_string())?;
let log = curl(&[
"-s",
"--connect-timeout",
"5",
"--max-time",
"12",
"-H",
&format!("Authorization: Bearer {token}"),
&format!("http://{ip}/api/v1/logs/miner"),
])?;
if log.trim().is_empty() {
return Err("VNish returned an empty log".to_string());
}
Ok(log)
}
/// Stock Antminer web log (digest auth). Absent on older models (404).
fn fetch_antminer_log(ip: &str, user: &str, pass: &str) -> Result<String, String> {
let body = curl(&[
"-s",
"--digest",
"-u",
&format!("{user}:{pass}"),
"--connect-timeout",
"5",
"--max-time",
"12",
&format!("http://{ip}/cgi-bin/log.cgi"),
])?;
if body.contains("404 - Not Found") || body.trim().is_empty() {
return Err("this firmware does not expose a log over its web API".to_string());
}
Ok(body)
}
/// WhatsMiner: format the active error codes (get_error_code, unauthenticated).
fn fetch_whatsminer_errors(ip: &str) -> Result<String, String> {
let resp = crate::access_probe::whatsminer_get_error_code(ip)
.ok_or_else(|| "WhatsMiner did not answer get_error_code on :4028".to_string())?;
Ok(resp)
}
/// Run curl and return stdout, with a hard wall-clock cap. stdout is drained on a
/// separate thread so a large log (hundreds of KB) never deadlocks on a full pipe
/// -- the reason a naive "wait then read" times out on the VNish log.
fn curl(args: &[&str]) -> Result<String, String> {
use std::io::Read;
let mut cmd = Command::new("curl");
cmd.args(args);
cmd.stdout(std::process::Stdio::piped());
cmd.stderr(std::process::Stdio::null());
let mut child = cmd.spawn().map_err(|e| format!("spawn curl: {e}"))?;
let mut stdout = child.stdout.take().ok_or("no curl stdout")?;
let reader = std::thread::spawn(move || {
let mut buf = Vec::new();
let _ = stdout.read_to_end(&mut buf);
buf
});
let timeout = Duration::from_secs(20);
let start = std::time::Instant::now();
let mut timed_out = false;
loop {
match child.try_wait().map_err(|e| e.to_string())? {
Some(_) => break,
None => {
if start.elapsed() >= timeout {
let _ = child.kill();
timed_out = true;
break;
}
std::thread::sleep(Duration::from_millis(50));
}
}
}
let buf = reader.join().unwrap_or_default();
if timed_out && buf.is_empty() {
return Err("log fetch timed out".into());
}
Ok(String::from_utf8_lossy(&buf).into_owned())
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn summarize_finds_pic_chains_and_errors() {
let log = "\
[t] INFO: Initializing PSU
[t] INFO: chain#1 - 126 chips detected
[t] INFO: check PIC on chain 1: version 0x03
[t] ERROR: Failed load miner config
[t] INFO: chain#2 - 126 chips detected";
let s = summarize_log(log);
assert!(s.iter().any(|l| l.contains("PIC: present")), "PIC present: {s:?}");
assert!(s.iter().any(|l| l.contains("chips detected")), "chains: {s:?}");
assert!(s.iter().any(|l| l.contains("Errors: 1")), "errors: {s:?}");
}
#[test]
fn summarize_detects_no_pic_miner() {
let log = "[t] ERROR: This is a no-PIC miner, so all connected chains ...\n[t] INFO: mining";
let s = summarize_log(log);
assert!(s.iter().any(|l| l.contains("PIC: not present")), "{s:?}");
}
#[test]
fn summarize_handles_no_pic_lines() {
let log = "[t] INFO: chain#1 - 126 chips detected\n[t] INFO: mining";
let s = summarize_log(log);
assert!(s.iter().any(|l| l.contains("no PIC lines")), "{s:?}");
fn tail_does_not_panic_mid_multibyte_char() {
// A byte-offset cut can land inside a multi-byte character; tail must nudge
// to a char boundary rather than panic (round 18 #12).
let s = "\u{00e9}".repeat(200); // 400 bytes of 2-byte chars, no newlines
let out = tail(&s, 101); // cut at an odd offset -> inside a char
assert!(out.starts_with("[... earlier log trimmed ...]"));
assert!(out.len() < s.len());
}
#[test]
+6 -17
View File
@@ -16,7 +16,6 @@ mod restore;
mod scan;
mod ui;
use wx_rs;
fn main() {
// Headless workflow self-test: render the bench-fleet fixtures through the
@@ -44,27 +43,17 @@ fn main() {
std::process::exit(0);
}
// Headless log-scan check: `ALKANE_LOG_SCAN="<ip> <brand> <firmware>"` fetches
// the miner's log over its firmware API and prints the regex summary (round
// 12 #12), so the VNish/Antminer/WhatsMiner log paths can be verified without
// the GUI.
// Headless log-scan check: `ALKANE_LOG_SCAN="<ip> <brand>"` fetches the miner's
// log through asic-rs's per-backend read_logs() (round 19 #11-16), so the log
// paths can be verified without the GUI. WhatsMiner falls back to fault codes.
if let Some(spec) = std::env::var_os("ALKANE_LOG_SCAN") {
let spec = spec.to_string_lossy();
let mut it = spec.split_whitespace();
let ip = it.next().unwrap_or("");
let brand = it.next().unwrap_or("");
let firmware = it.next().unwrap_or("");
let (au, ap) = credentials::load_credentials().unwrap_or_else(|| ("root".into(), "root".into()));
let vp = credentials::firmware_default_for("VNish").1;
let vp = if vp.is_empty() { "admin".to_string() } else { vp };
match log_scan::scan_log(ip, brand, firmware, &vp, &au, &ap) {
Ok(s) => {
println!("LOGSCAN {ip} ({brand}/{firmware}): {} log bytes", s.text.len());
for line in &s.summary {
println!(" {line}");
}
}
Err(e) => println!("LOGSCAN {ip} ({brand}/{firmware}): ERROR {e}"),
match log_scan::scan_log(ip, brand, scan::load_scan_timeout()) {
Ok(s) => println!("LOGSCAN {ip} ({brand}): {} log bytes", s.text.len()),
Err(e) => println!("LOGSCAN {ip} ({brand}): ERROR {e}"),
}
std::process::exit(0);
}
File diff suppressed because it is too large Load Diff
+82 -5
View File
@@ -95,6 +95,44 @@ pub fn clean_model(make: &str, model_id: &str) -> String {
}
}
/// Best-effort ASIC chip model for a miner, used ONLY as a fallback when the
/// firmware did not report a chip type on the wire (round 21 #3). Most firmwares
/// on Antminer hardware (stock Antminer, VNish, LuxOS, Braiins, UMC) never put the
/// chip string in their API, but the chip is a fixed per-model hardware fact, so
/// it can be derived from the detected model. Only high-confidence, widely
/// documented Antminer mappings are returned; everything else (and WhatsMiner,
/// whose chips are not cleanly named) returns None so the column stays blank
/// rather than show a guess. `model_id` is the raw asic-rs model id.
pub fn chip_type_for_model(make: &str, model_id: &str) -> Option<&'static str> {
if !is_antminer(make) {
return None;
}
// Normalize: drop a leading "ANTMINER ", cut any trailing parenthetical
// ("S19 (88)" -> "S19"), uppercase, and strip every non-alphanumeric char.
let base = model_id.trim();
let base = base
.strip_prefix("ANTMINER ")
.or_else(|| base.strip_prefix("Antminer "))
.unwrap_or(base);
let base = base.split('(').next().unwrap_or(base);
let key: String = base
.chars()
.filter(|c| c.is_ascii_alphanumeric())
.map(|c| c.to_ascii_uppercase())
.collect();
// Bitmain chip per model (SHA-256 air/hydro). Sources: Bitmain shop specs +
// repair-guide chip markings. Keep conservative -- omit uncertain variants.
let chip = match key.as_str() {
"S19" | "S19PRO" | "S19A" | "S19APRO" | "T19" => "BM1398",
"S19PROPLUSHYD" | "S19PROPLUSHYDRO" | "S19PROHYD" | "S19PROHYDRO" => "BM1398",
"S19J" | "S19JPRO" | "S19JPROPLUS" | "S19JPRONOPIC" => "BM1362",
"S19XP" | "S19XPHYD" | "S19XPHYDRO" | "S19KPRO" | "S19KPRONOPIC" => "BM1366",
"S21" | "S21PRO" | "S21PLUS" | "S21HYD" | "S21HYDRO" | "T21" => "BM1370",
_ => return None,
};
Some(chip)
}
/// The Submodel column value. WhatsMiner: the version block ("VE40"). Antminer:
/// empty -- the hashboard type is not reported over the network by asic-rs.
pub fn submodel(make: &str, model_id: &str) -> String {
@@ -135,10 +173,13 @@ fn clean_antminer(id: &str) -> String {
// asic-rs "Unknown" models pass the raw vendor string through with the brand
// still in it (e.g. "ANTMINER S19 (88)", a NoPIC S19); drop a redundant
// leading brand word so the Model column never repeats the Brand column.
let id = if id.len() >= 9 && id[..9].eq_ignore_ascii_case("ANTMINER ") {
id[9..].trim_start()
} else {
id
// `get(..9)` returns None (rather than panicking) when byte 9 is not a UTF-8
// char boundary, so a multibyte miner-supplied model string can't crash here
// (round 18 #12). The prefix is 9 ASCII bytes, so a real match implies a
// boundary at 9 and the following `id[9..]` is safe.
let id = match id.get(..9) {
Some(p) if p.eq_ignore_ascii_case("ANTMINER ") => id[9..].trim_start(),
_ => id,
};
let bytes = id.as_bytes();
// Base = leading letters then digits ("S19", "KS5", "L3", "Z15"). Without a
@@ -200,6 +241,7 @@ fn compact_upper(s: &str) -> String {
/// model era/class (best-effort, since the network data can't distinguish them):
/// - Xilinx: S17/T17-era -> C49, otherwise (S19-era) -> C55.
/// - AMLogic: XP-class / S19k (140mm fans) -> CBE, otherwise (120mm) -> C76.
///
/// `clean_model` is the already-cleaned model name (used for the era/class test).
pub fn control_board_code(make: &str, board_name: &str, clean_model: &str) -> String {
let (cpu, code) = control_board_split(make, board_name, clean_model);
@@ -283,14 +325,49 @@ fn is_s17_era(clean_model: &str) -> bool {
/// S19k Pro, and the S21 Pro; everything else AMLogic is the 120mm C76. asic-rs
/// cannot tell these apart, so this is a model-family heuristic, not a read.
fn is_aml_140mm(clean_model: &str) -> bool {
// Per the doc above: XP-class, the S19k Pro, and the S21 Pro -- NOT every S21
// (plain S21 / S21+ / S21e are the 120mm C76 board) (round 18 #12).
let m = clean_model.trim_start();
m.contains("XP") || m.starts_with("S19k") || m.starts_with("S21")
m.contains("XP") || m.starts_with("S19k") || m.contains("S21 Pro")
}
/// Nameplate expected hashrate in Sol/s for an Equihash (Zcash) miner model, when
/// the firmware itself does not report an expected hashrate (round 18 #6). Plain
/// Antminer Z15 firmware omits the cgminer `total_rateideal` field (the Z15j does
/// report it), so its actual-vs-expected column and colour would otherwise be
/// blank. The Z15 nameplate is 420 KSol/s. Returns `None` for models with no known
/// nameplate (the caller then leaves expected unknown).
pub fn equihash_expected_sols(clean_model: &str) -> Option<f64> {
let m = clean_model.to_ascii_lowercase();
// Match the Z15 family (z15, z15j); both share the 420 KSol/s nameplate.
if m.contains("z15") {
Some(420_000.0)
} else {
None
}
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn chip_type_derivation() {
// Fleet models (round 21 #3): derived from the detected model for Antminer
// hardware where the firmware does not report a chip string on the wire.
assert_eq!(chip_type_for_model("Antminer", "S21Pro"), Some("BM1370"));
assert_eq!(chip_type_for_model("Antminer", "S19jPro"), Some("BM1362"));
assert_eq!(chip_type_for_model("Antminer", "S19KPro"), Some("BM1366"));
assert_eq!(chip_type_for_model("Antminer", "S19"), Some("BM1398"));
assert_eq!(chip_type_for_model("Antminer", "T19"), Some("BM1398"));
// Raw "Unknown" passthrough with brand + parenthetical normalizes to S19.
assert_eq!(chip_type_for_model("Antminer", "ANTMINER S19 (88)"), Some("BM1398"));
// WhatsMiner chips are not cleanly named -> never derived.
assert_eq!(chip_type_for_model("Whatsminer", "M30S+VE40"), None);
// Unknown Antminer model -> None (no guess).
assert_eq!(chip_type_for_model("Antminer", "L7"), None);
}
#[test]
fn brand_normalises_case() {
assert_eq!(brand("Antminer"), "Antminer");
+69 -31
View File
@@ -1,8 +1,8 @@
//! Dropdown presets + user-saved values for the Configure-pools dialog (round 15
//! #1). Each pool field (address / account / worker / password) has a "+" menu
//! offering built-in presets (pool stratums, worker placeholders) plus values the
//! user has saved, and the user can add the current box value to the saved list.
//! Saved lists persist one-per-line under the config dir.
//! user has saved. "Add new..." opens a manager window that edits the whole saved
//! list at once (round 18 #8b). Saved lists persist one-per-line under the config dir.
use std::path::PathBuf;
@@ -72,42 +72,58 @@ pub fn load_saved(field: PoolField) -> Vec<String> {
.unwrap_or_default()
}
/// Add `value` to `field`'s saved list (deduplicated, no-op if empty/already
/// present or already a preset). Returns true if it was newly added.
pub fn add_saved(field: PoolField, value: &str) -> bool {
let value = value.trim();
if value.is_empty() {
return false;
}
if field.presets().iter().any(|p| *p == value) {
return false;
}
let mut saved = load_saved(field);
if saved.iter().any(|s| s == value) {
return false;
}
saved.push(value.to_string());
/// Replace `field`'s entire saved list with `values` (round 18 #8b: the preset
/// manager edits the whole list at once). Each value is trimmed; empties, exact
/// duplicates, and any value that is already a built-in preset are dropped.
/// Returns the number of values actually written.
pub fn save_all(field: PoolField, values: &[String]) -> std::io::Result<usize> {
let out = dedupe_saved(&field.presets(), values);
let p = config_path(field.saved_file());
if let Some(dir) = p.parent() {
let _ = std::fs::create_dir_all(dir);
}
let _ = std::fs::write(p, saved.join("\n"));
true
// The password list can hold a pool password, so write it owner-only from the
// moment it is created -- never briefly world-readable (round 18 #12).
write_private(&p, out.join("\n").as_bytes())?;
Ok(out.len())
}
/// Remove `value` from `field`'s saved list (round 16 #5). Returns true if it was
/// present and removed. Presets cannot be removed (they are not in the saved file).
pub fn remove_saved(field: PoolField, value: &str) -> bool {
let value = value.trim();
let mut saved = load_saved(field);
let before = saved.len();
saved.retain(|s| s != value);
if saved.len() == before {
return false;
/// Write `data` to `path` with owner-only (0600) permissions from creation on
/// Unix, so a secret is never momentarily world-readable between write and chmod.
/// `mode()` only takes effect when the file is created, so an already-existing
/// file is also re-tightened; elsewhere this is a plain write.
fn write_private(path: &std::path::Path, data: &[u8]) -> std::io::Result<()> {
#[cfg(unix)]
{
use std::io::Write;
use std::os::unix::fs::{OpenOptionsExt, PermissionsExt};
let mut f = std::fs::OpenOptions::new()
.write(true)
.create(true)
.truncate(true)
.mode(0o600)
.open(path)?;
let _ = std::fs::set_permissions(path, std::fs::Permissions::from_mode(0o600));
f.write_all(data)
}
let p = config_path(field.saved_file());
let _ = std::fs::write(p, saved.join("\n"));
true
#[cfg(not(unix))]
{
std::fs::write(path, data)
}
}
/// Trim every value, then drop empties, values equal to a built-in preset, and
/// later exact duplicates (first occurrence wins). Order is otherwise preserved.
fn dedupe_saved(presets: &[&str], values: &[String]) -> Vec<String> {
let mut out: Vec<String> = Vec::new();
for v in values {
let v = v.trim();
if v.is_empty() || presets.contains(&v) || out.iter().any(|s| s == v) {
continue;
}
out.push(v.to_string());
}
out
}
/// The full dropdown list for a field: presets first, then the user's saved
@@ -129,3 +145,25 @@ pub fn dropdown_entries(field: PoolField) -> Vec<(String, String)> {
}
out
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn dedupe_saved_trims_drops_empties_presets_and_dupes() {
let presets = ["x", "{ip1}"];
let vals: Vec<String> = [" ", "myworker", "myworker", "x", " keep ", "{ip1}", "keep"]
.iter()
.map(|s| s.to_string())
.collect();
// " " (empty), the second "myworker", "x"/"{ip1}" (presets) and the second
// "keep" all drop; " keep " is trimmed and kept.
assert_eq!(dedupe_saved(&presets, &vals), vec!["myworker".to_string(), "keep".to_string()]);
}
#[test]
fn dedupe_saved_empty_input_is_empty() {
assert!(dedupe_saved(&[], &[]).is_empty());
}
}
+1 -2
View File
@@ -133,10 +133,9 @@ mod tests {
assert!(view.visible.contains(&Column::Locked));
// The Health column (round 13 #3) replaced these in the default profile.
assert!(!view.visible.contains(&Column::Error));
assert!(!view.visible.contains(&Column::Hashboards));
// Columns dropped from the default profile in round 11.
assert!(!view.visible.contains(&Column::BoardCode), "not in the default profile");
assert!(!view.visible.contains(&Column::Cooling), "not in the default profile");
assert!(!view.visible.contains(&Column::Fan1), "not in the default profile");
// to_view covers every column in `order`.
assert_eq!(view.order.len(), ALL_COLUMNS.len());
// Round-trip a snapshot back out.
+194 -51
View File
@@ -4,7 +4,7 @@
//! (the stock image is retained on-device at install time; no image is uploaded):
//! - VNish: POST /api/v1/unlock -> bearer -> POST /api/v1/firmware/remove
//! - LuxOS: luxminer :4028 {"command":"logon"} -> SessionID ->
//! {"command":"uninstallluxos","parameter":"<SessionID>"}
//! {"command":"uninstallluxos","parameter":"<SessionID>"}
//! - Braiins: SSH `uninstall.sh` (re-flashes the on-NAND stock backup)
//!
//! DESTRUCTIVE: this removes the running aftermarket firmware and reboots the
@@ -24,17 +24,21 @@ use std::time::Duration;
use crate::scan::fake_scan_enabled;
pub enum RestoreMsg {
Started { total: usize },
Started,
Result { ip: String, ok: bool, detail: String },
Done { total: usize },
Done,
}
pub struct RestoreHandle {
pub rx: Receiver<RestoreMsg>,
// The worker honours cancellation between miners (see `tc` below); a UI stop
// control is not wired yet, so the handle-side trigger is kept for when it is.
#[allow(dead_code)]
cancel: Arc<AtomicBool>,
}
impl RestoreHandle {
#[allow(dead_code)]
pub fn stop(&self) {
self.cancel.store(true, Ordering::Relaxed);
}
@@ -57,11 +61,10 @@ pub fn start_restore(
) -> RestoreHandle {
let (tx, rx) = channel();
let cancel = Arc::new(AtomicBool::new(false));
let total = targets.len();
if fake_scan_enabled() {
// Offline demo: report each target as restored without touching anything.
let _ = tx.send(RestoreMsg::Started { total });
let _ = tx.send(RestoreMsg::Started);
for t in targets {
let _ = tx.send(RestoreMsg::Result {
ip: t.ip,
@@ -69,15 +72,16 @@ pub fn start_restore(
detail: "restored to stock (demo)".into(),
});
}
let _ = tx.send(RestoreMsg::Done { total });
let _ = tx.send(RestoreMsg::Done);
return RestoreHandle { rx, cancel };
}
let tc = cancel.clone();
let _ = std::thread::Builder::new()
let err_tx = tx.clone();
let spawned = std::thread::Builder::new()
.name("restore-stock".into())
.spawn(move || {
let _ = tx.send(RestoreMsg::Started { total });
let _ = tx.send(RestoreMsg::Started);
for t in targets {
if tc.load(Ordering::Relaxed) {
break;
@@ -87,8 +91,18 @@ pub fn start_restore(
return;
}
}
let _ = tx.send(RestoreMsg::Done { total });
let _ = tx.send(RestoreMsg::Done);
});
if spawned.is_err() {
// Never leave the restore subsystem wedged (round 18 #12): if the worker
// thread can't start, emit a failure + Done so the drain clears the handle.
let _ = err_tx.send(RestoreMsg::Result {
ip: String::new(),
ok: false,
detail: "could not start the restore worker thread".into(),
});
let _ = err_tx.send(RestoreMsg::Done);
}
RestoreHandle { rx, cancel }
}
@@ -107,12 +121,19 @@ fn restore_one(t: &RestoreTarget, vnish_pass: &str, ssh_user: &str, ssh_pass: &s
/// VNish: unlock -> bearer -> firmware/remove (self-restores + reboots ~3 s).
fn restore_vnish(ip: &str, pass: &str) -> (bool, String) {
let unlock = match curl(&[
"-s", "--connect-timeout", "5", "--max-time", "9",
"-X", "POST", "-H", "Content-Type: application/json",
"-d", &format!("{{\"pw\":\"{pass}\"}}"),
&format!("http://{ip}/api/v1/unlock"),
]) {
// serde-encode the body so a password with a quote/backslash can't break the
// JSON, and send it via stdin (-d @-) so the password never appears on curl's
// argv / the process list (round 18 #12).
let body = serde_json::json!({ "pw": pass }).to_string();
let unlock = match curl(
&[
"-s", "--connect-timeout", "5", "--max-time", "9",
"-X", "POST", "-H", "Content-Type: application/json",
"-d", "@-",
&format!("http://{ip}/api/v1/unlock"),
],
Some(body.as_bytes()),
) {
Ok(s) => s,
Err(e) => return (false, format!("unlock request failed: {e}")),
};
@@ -123,11 +144,14 @@ fn restore_vnish(ip: &str, pass: &str) -> (bool, String) {
let Some(token) = token else {
return (false, "VNish unlock rejected (wrong web password?)".into());
};
match curl(&[
"-s", "--connect-timeout", "5", "--max-time", "12",
"-X", "POST", "-H", &format!("Authorization: Bearer {token}"),
&format!("http://{ip}/api/v1/firmware/remove"),
]) {
match curl(
&[
"-s", "--connect-timeout", "5", "--max-time", "12",
"-X", "POST", "-H", &format!("Authorization: Bearer {token}"),
&format!("http://{ip}/api/v1/firmware/remove"),
],
None,
) {
// The miner reverts + reboots after ~3 s; the response is {"after":N}.
Ok(resp) if resp.contains("after") => (true, "reverting to stock (~3 s)".into()),
Ok(resp) => (false, format!("firmware/remove returned: {}", resp.trim())),
@@ -152,13 +176,29 @@ fn restore_luxos(ip: &str) -> (bool, String) {
let Some(session) = session.filter(|s| !s.is_empty()) else {
return (false, format!("no SessionID in logon response: {}", logon.trim()));
};
let cmd = format!("{{\"command\":\"uninstallluxos\",\"parameter\":\"{session}\"}}");
// serde-encode so the miner-supplied SessionID can't break or inject into the
// JSON-RPC command (round 18 #12).
let cmd = serde_json::json!({ "command": "uninstallluxos", "parameter": session }).to_string();
match lux_rpc(ip, &cmd) {
// Code 350 "Uninstalling LuxOS"; the miner reboots + reverts in background.
Ok(resp) if resp.contains("350") || resp.to_lowercase().contains("uninstall") => {
(true, "uninstalling LuxOS (reboots to stock)".into())
}
// The miner reboots as it reverts, so the reply is often dropped/empty
// after the command is accepted. The logon above already proved the miner
// was reachable, so an empty reply or a dropped connection here is the
// expected reboot, not a failure (round 18 #12).
Ok(resp) if resp.trim().is_empty() => {
(true, "uninstall accepted (miner rebooting to stock)".into())
}
Ok(resp) => (false, format!("uninstallluxos returned: {}", resp.trim())),
Err(e)
if ["closed", "reset", "timed out", "broken pipe", "eof"]
.iter()
.any(|m| e.to_lowercase().contains(m)) =>
{
(true, "RPC dropped (miner rebooting to stock)".into())
}
Err(e) => (false, format!("uninstallluxos failed: {e}")),
}
}
@@ -169,28 +209,30 @@ fn restore_braiins(ip: &str, user: &str, pass: &str) -> (bool, String) {
return (false, "Braiins restore needs an SSH password (set the SSH login)".into());
}
let target = format!("{user}@{ip}");
// uninstall.sh is on Braiins OS+'s PATH; run it non-interactively.
// sshpass reads the password from $SSHPASS (-e) rather than argv (-p), so it
// never shows up in the process list (round 18 #12). Host-key checking is
// deliberately disabled: these are LAN miners whose SSH host key changes on
// every reflash, so pinning it would break the very revert this performs.
// BatchMode stops any interactive prompt from hanging out the 60 s cap.
let mut cmd = Command::new("sshpass");
cmd.arg("-p").arg(pass).arg("ssh");
cmd.env("SSHPASS", pass);
cmd.arg("-e").arg("ssh");
cmd.args([
"-o", "StrictHostKeyChecking=no",
"-o", "UserKnownHostsFile=/dev/null",
"-o", "BatchMode=yes",
"-o", "ConnectTimeout=8",
&target,
"uninstall.sh || /sbin/uninstall.sh",
]);
match run_with_timeout(cmd, Duration::from_secs(60)) {
Ok(out) => {
let s = String::from_utf8_lossy(&out).to_lowercase();
if s.contains("not found") || s.contains("no such") {
(false, "uninstall.sh not found on the miner".into())
} else {
(true, "ran uninstall.sh (reverts to stock + reboots)".into())
}
}
match run_with_timeout(cmd, Duration::from_secs(60), None) {
Ok(out) => classify_braiins(
&String::from_utf8_lossy(&out.stdout),
&String::from_utf8_lossy(&out.stderr),
out.code,
out.timed_out,
),
Err(e) => {
// A reboot mid-command commonly drops the SSH connection; treat a
// connection-closed error after the command as likely success.
if e.contains("closed") || e.contains("reset") || e.contains("timed out") {
(true, "SSH dropped (miner likely rebooting to stock)".into())
} else {
@@ -200,6 +242,42 @@ fn restore_braiins(ip: &str, user: &str, pass: &str) -> (bool, String) {
}
}
/// Decide a Braiins `uninstall.sh` outcome from its captured output. The critical
/// rule (round 18 #12): an SSH auth/connection failure -- which writes its
/// diagnostic to stderr, leaves stdout empty, and exits non-zero -- must be
/// reported as a FAILURE, never a false success. A dropped connection or a
/// timeout after the command started is the expected signature of the reboot.
fn classify_braiins(stdout: &str, stderr: &str, code: Option<i32>, timed_out: bool) -> (bool, String) {
let err = stderr.to_lowercase();
// ssh's own connection/auth failures (exit 255) never reach the remote command.
let conn_fail = [
"permission denied",
"connection refused",
"could not resolve",
"no route to host",
"connection timed out",
"operation timed out",
"host key verification failed",
"before authentication",
]
.iter()
.any(|m| err.contains(m));
if conn_fail {
let why = stderr.lines().map(str::trim).rfind(|l| !l.is_empty());
return (false, format!("SSH failed: {}", why.unwrap_or("connection/auth error")));
}
let out = stdout.to_lowercase();
if out.contains("not found") || out.contains("no such") || err.contains("not found") {
return (false, "uninstall.sh not found on the miner".into());
}
match code {
Some(0) => (true, "ran uninstall.sh (reverts to stock + reboots)".into()),
None => (true, "SSH dropped (miner likely rebooting to stock)".into()),
_ if timed_out => (true, "SSH timed out (miner likely rebooting to stock)".into()),
Some(c) => (false, format!("uninstall.sh exited {c}: {}", stderr.trim())),
}
}
/// One luxminer :4028 request/response (line-framed, socket closes after reply).
fn lux_rpc(ip: &str, payload: &str) -> Result<String, String> {
let addr: SocketAddr = format!("{ip}:4028").parse().map_err(|e| format!("bad addr: {e}"))?;
@@ -225,50 +303,115 @@ fn lux_rpc(ip: &str, payload: &str) -> Result<String, String> {
Ok(String::from_utf8_lossy(&buf).trim_matches('\u{0}').to_string())
}
/// curl with a wall-clock cap (small responses; no pipe-drain thread needed).
fn curl(args: &[&str]) -> Result<String, String> {
let mut cmd = Command::new("curl");
cmd.args(args);
run_with_timeout(cmd, Duration::from_secs(15)).map(|o| String::from_utf8_lossy(&o).into_owned())
/// The captured result of a timed subprocess run.
struct CmdOutput {
/// The process exit code, or `None` if it was killed / dropped / timed out.
code: Option<i32>,
stdout: Vec<u8>,
stderr: Vec<u8>,
timed_out: bool,
}
/// Run a command, capture stdout, with a hard wall-clock timeout.
fn run_with_timeout(mut cmd: Command, timeout: Duration) -> Result<Vec<u8>, String> {
/// curl with a wall-clock cap. Errors only when the run produced no output and
/// timed out (a black-holed host); otherwise returns stdout even on a non-zero
/// exit (curl prints useful bodies/status on failures).
fn curl(args: &[&str], stdin_data: Option<&[u8]>) -> Result<String, String> {
let mut cmd = Command::new("curl");
cmd.args(args);
let out = run_with_timeout(cmd, Duration::from_secs(15), stdin_data)?;
if out.timed_out && out.stdout.is_empty() {
return Err("timed out".into());
}
Ok(String::from_utf8_lossy(&out.stdout).into_owned())
}
/// Run a command with a hard wall-clock timeout, capturing stdout, stderr, and
/// the exit code. Both pipes are drained on their own threads so a child that
/// writes a lot to stderr can never deadlock against a full pipe (round 18 #12).
/// `stdin_data`, when set, is written to the child's stdin and the pipe closed
/// (used to feed a request body without putting a secret on argv).
fn run_with_timeout(
mut cmd: Command,
timeout: Duration,
stdin_data: Option<&[u8]>,
) -> Result<CmdOutput, String> {
cmd.stdout(std::process::Stdio::piped());
cmd.stderr(std::process::Stdio::piped());
if stdin_data.is_some() {
cmd.stdin(std::process::Stdio::piped());
}
let mut child = cmd.spawn().map_err(|e| format!("spawn: {e}"))?;
if let Some(data) = stdin_data {
if let Some(mut si) = child.stdin.take() {
let _ = si.write_all(data);
} // dropping `si` closes the pipe
}
let mut stdout = child.stdout.take().ok_or("no stdout")?;
let reader = std::thread::spawn(move || {
let mut stderr = child.stderr.take().ok_or("no stderr")?;
let out_reader = std::thread::spawn(move || {
let mut b = Vec::new();
let _ = stdout.read_to_end(&mut b);
b
});
let err_reader = std::thread::spawn(move || {
let mut b = Vec::new();
let _ = stderr.read_to_end(&mut b);
b
});
let start = std::time::Instant::now();
let mut timed_out = false;
loop {
let status = loop {
match child.try_wait().map_err(|e| e.to_string())? {
Some(_) => break,
Some(s) => break Some(s),
None => {
if start.elapsed() >= timeout {
let _ = child.kill();
let _ = child.wait(); // reap so we never leave a zombie
timed_out = true;
break;
break None;
}
std::thread::sleep(Duration::from_millis(50));
}
}
}
let out = reader.join().unwrap_or_default();
if timed_out && out.is_empty() {
return Err("timed out".into());
}
Ok(out)
};
Ok(CmdOutput {
code: status.and_then(|s| s.code()),
stdout: out_reader.join().unwrap_or_default(),
stderr: err_reader.join().unwrap_or_default(),
timed_out,
})
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn braiins_auth_or_connection_failure_is_not_a_false_success() {
// The critical regression guard (round 18 #12): a wrong password or an
// unreachable miner writes to stderr, leaves stdout empty, and exits
// non-zero -- it must report failure, never "restored".
let (ok, msg) = classify_braiins("", "Permission denied, please try again.", Some(255), false);
assert!(!ok, "wrong password must not report success");
assert!(msg.to_lowercase().contains("ssh failed"), "{msg}");
let (ok, _) = classify_braiins("", "ssh: connect to host 10.0.0.9 port 22: Connection refused", Some(255), false);
assert!(!ok, "unreachable miner must not report success");
let (ok, _) = classify_braiins("", "ssh: Could not resolve hostname miner: Name or service not known", Some(255), false);
assert!(!ok, "unresolvable host must not report success");
// Genuine outcomes.
let (ok, _) = classify_braiins("uninstalling...\n", "", Some(0), false);
assert!(ok, "clean exit 0 is success");
let (ok, _) = classify_braiins("", "Connection to 10.0.0.5 closed by remote host.", None, false);
assert!(ok, "connection dropped mid-command (reboot) is success");
let (ok, _) = classify_braiins("", "", None, true);
assert!(ok, "timeout after the command started (reboot) is success");
let (ok, _) = classify_braiins("bash: uninstall.sh: command not found\n", "", Some(127), false);
assert!(!ok, "missing uninstall.sh is a failure");
}
#[test]
fn firmware_selects_the_right_flow() {
// The dispatcher only recognises the three revertible aftermarket
+474 -40
View File
@@ -4,7 +4,7 @@
use crate::model::{MinerCaps, MinerRow};
use asic_rs::core::data::firmware::FirmwareImage;
use asic_rs::core::traits::miner::Miner;
use futures_util::StreamExt;
use futures_util::{FutureExt, StreamExt};
use measurements::Power;
use std::collections::HashSet;
use std::net::Ipv4Addr;
@@ -13,6 +13,11 @@ use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::mpsc::{channel, Receiver};
use std::sync::Arc;
// `Row` is the common variant (one per miner) while `Started`/`Done` are sent
// once each, so boxing the large row to shrink the rare variants would add an
// allocation on the hot path for no real gain -- the message is moved straight
// through an mpsc channel and dropped.
#[allow(clippy::large_enum_variant)]
pub enum ScanMsg {
/// A new scan started: `total` addresses to probe, and the exact set of
/// target IPs (as strings) so the UI can drop miners no longer in range.
@@ -34,11 +39,43 @@ pub const AUTO_FILE: &str = "auto-rescan-secs.txt";
pub const SCAN_TIMEOUT_FILE: &str = "scan-timeout-secs.txt";
/// Default per-miner scan timeout (matches asic-rs' identification timeout).
pub const DEFAULT_SCAN_TIMEOUT_SECS: u64 = 10;
/// Maximum in-flight address probes during a scan. asic-rs would otherwise use
/// Default in-flight address probes during a scan. asic-rs would otherwise use
/// 1000 for any range up to /22, saturating a real link and starving the
/// per-responder get_data (Braiins miners drop most values under that burst).
/// 128 was the highest cap that stayed fully reliable on the live fleet.
/// 128 was the highest cap that stayed fully reliable on the live fleet; it is
/// now the default of a user-adjustable setting (round 19 #25).
pub const SCAN_CONCURRENCY_LIMIT: usize = 128;
/// The user-configurable scan concurrency is clamped to this range: a floor so a
/// scan is never effectively serial, and a ceiling so a large range can't open
/// hundreds of connections and saturate the network (round 19 #25). Higher
/// values scan faster but can starve per-responder telemetry (see above).
pub const MIN_SCAN_CONCURRENCY: usize = 8;
// Ceiling kept at 256: the code below documents that 128 is fully reliable and 192
// already dropped responders, and identification + telemetry run concurrently so
// the peak socket count is ~2x this. 256 gives headroom for a fast sweep without
// inviting the mass value-drops (which read as phantom faults) that higher caps
// caused on the live fleet (round 19 review).
pub const MAX_SCAN_CONCURRENCY: usize = 256;
pub const SCAN_CONCURRENCY_FILE: &str = "scan-concurrency.txt";
/// Load the saved scan concurrency (in-flight probes), clamped to
/// [MIN_SCAN_CONCURRENCY, MAX_SCAN_CONCURRENCY].
pub fn load_scan_concurrency() -> usize {
std::fs::read_to_string(config_path(SCAN_CONCURRENCY_FILE))
.ok()
.and_then(|s| s.trim().parse::<usize>().ok())
.map(|n| n.clamp(MIN_SCAN_CONCURRENCY, MAX_SCAN_CONCURRENCY))
.unwrap_or(SCAN_CONCURRENCY_LIMIT)
}
/// Save the scan concurrency, clamped to the allowed range.
pub fn save_scan_concurrency(n: usize) -> std::io::Result<()> {
let p = config_path(SCAN_CONCURRENCY_FILE);
if let Some(dir) = p.parent() {
std::fs::create_dir_all(dir)?;
}
std::fs::write(p, n.clamp(MIN_SCAN_CONCURRENCY, MAX_SCAN_CONCURRENCY).to_string())
}
pub const DEFAULT_RANGE: &str = "10.255.1.0/24";
/// Default seconds between automatic rescans.
pub const DEFAULT_AUTO_SECS: u64 = 300;
@@ -156,7 +193,7 @@ pub fn parse_line(line: &str) -> Result<Vec<Ipv4Addr>, String> {
if parts.len() == 4 && parts.iter().all(|p| is_octet_spec(p)) {
let r: Vec<(u8, u8)> =
parts.iter().map(|p| parse_octet_spec(p)).collect::<Result<_, String>>()?;
let count: u64 = r.iter().map(|(lo, hi)| (*hi as u64 - *lo as u64 + 1)).product();
let count: u64 = r.iter().map(|(lo, hi)| *hi as u64 - *lo as u64 + 1).product();
if count > MAX_ADDRS {
return Err(format!("range too large (> {MAX_ADDRS} addresses): {line}"));
}
@@ -369,6 +406,8 @@ pub fn start_scan(lines: Vec<String>, timeout_secs: u64) -> ScanHandle {
let target_set: HashSet<String> = targets.iter().map(|ip| ip.to_string()).collect();
let _ = tx.send(ScanMsg::Started { total, targets: target_set });
let cidrs = targets_to_cidrs(&targets);
// User-adjustable in-flight probe cap (round 19 #25).
let concurrency = load_scan_concurrency();
let thread_cancel = cancel.clone();
let err_tx = tx.clone();
@@ -393,7 +432,8 @@ pub fn start_scan(lines: Vec<String>, timeout_secs: u64) -> ScanHandle {
// 128 is the highest cap that stayed fully reliable on the live
// fleet (192 already dropped responders); a /24 still finishes in
// ~35s. Larger ranges just take proportionally longer, still correct.
.with_concurrent_limit(SCAN_CONCURRENCY_LIMIT);
// The cap is now user-adjustable (round 19 #25); the default is 128.
.with_concurrent_limit(concurrency);
for (ip, prefix) in &cidrs {
factory = match factory.with_subnet(&format!("{ip}/{prefix}")) {
Ok(f) => f,
@@ -403,31 +443,65 @@ pub fn start_scan(lines: Vec<String>, timeout_secs: u64) -> ScanHandle {
}
};
}
// scan_stream_with_ip yields one item per probed address, so we
// get accurate progress plus the responders.
let mut stream = factory.scan_stream_with_ip();
// scan_stream_with_ip yields one item per probed address (identification
// is already concurrent up to SCAN_CONCURRENCY_LIMIT). Each responder's
// telemetry (to_row -> get_data + presets: several REST calls) is then
// run concurrently via buffer_unordered instead of awaited one at a time
// -- otherwise the telemetry serialises and dominates the scan wall-clock
// (round 18 #12). buffer_unordered polls the underlying stream on its own,
// so identification concurrency is unaffected, and telemetry only ever
// targets responders (live miners), so the same cap is safe.
let mut done = 0usize;
// Emit progress per address for a smoothly-climbing counter; only a
// very large scan (> 5000 addresses) is throttled, to bound channel
// traffic. The UI coalesces these to one gauge update per refresh.
let step = (total / 5000).max(1);
while let Some((ip, miner)) = stream.next().await {
let ptx = tx.clone();
let mut results = factory
.scan_stream_with_ip()
.map(|(ip, miner)| {
let ptx = ptx.clone();
async move {
match miner {
// Only surface a row for an address that actually has a
// miner behind it; a non-responding address is never a
// phantom row.
Some(m) => {
// Fast path (round 19 #18): emit a lightweight identity
// row from identification alone the instant the miner
// is found, so it shows immediately; the full telemetry
// row (get_data) upserts over it when it completes. The
// ordering holds because the partial is sent before this
// future awaits get_data and returns the full row.
let _ = ptx.send(ScanMsg::Row(partial_row(&*m, ip)));
// Isolate one miner's telemetry: asic-rs backends
// parse miner-controlled data, so a panic (a stray
// unwrap/index on a malformed field) must not unwind
// the whole sweep and abort every other miner (round
// 19 review). On panic the miner keeps its partial
// identity row and the scan continues.
let row = std::panic::AssertUnwindSafe(to_row(&*m))
.catch_unwind()
.await
.ok();
(ip, row)
}
None => (ip, None),
}
}
})
.buffer_unordered(concurrency);
while let Some((ip, row)) = results.next().await {
if thread_cancel.load(Ordering::Relaxed) {
return; // Stop / re-scan requested
}
done += 1;
// Only surface a row for an address that actually has a miner
// behind it. A non-responding address is not shown -- we never
// fabricate a phantom "offline" row for an empty IP; a miner is
// reported as "not hashing" only when it responds and we can see
// it is not mining.
if let Some(m) = miner {
let row = to_row(&*m).await;
if let Some(row) = row {
if tx.send(ScanMsg::Row(row)).is_err() {
return; // UI gone
}
}
if done % step == 0 || done == total {
if done.is_multiple_of(step) || done == total {
let _ = tx.send(ScanMsg::Progress { done, total, ip: ip.to_string() });
}
}
@@ -478,6 +552,37 @@ fn summarize_messages(messages: &[asic_rs::core::data::message::MinerMessage]) -
/// component (round 16 #1/#2/#3), so the Health column can colour and describe
/// each icon from the actual per-component faults. Info-severity messages are
/// dropped; Error and Warning are kept (only Error drives colour).
/// Best-effort hashboard index from a fault message that names a board (round 18
/// #5). Only WhatsMiner's asic-rs backends attribute a message to a specific
/// `HashBoard { idx }`; every Antminer-hardware firmware (stock, VNish, Braiins,
/// LuxOS) builds messages with no component, so a real per-board fault would
/// otherwise land on the control-board (brain) tooltip instead of the board it
/// names. The message text is self-describing (e.g. "Chain 2 ... temperature"),
/// so pull the first integer after a board keyword and attribute the fault to that
/// board. Returns None when no board keyword is present.
fn board_index_from_text(text: &str) -> Option<usize> {
let lower = text.to_ascii_lowercase();
// Longest/most-specific keywords first so "hashboard" wins over "board".
for kw in ["hashboard", "hash board", "chain", "slot", "board"] {
let mut from = 0;
while let Some(rel) = lower[from..].find(kw) {
let after = &lower[from + rel + kw.len()..];
// The number must IMMEDIATELY follow the keyword (after only separators
// like " #-:._="), so "Chain 2 ..." -> 2 but "hashboard error, temp 65"
// does not grab the temperature 65 far past the keyword (round 18 #12).
let rest = after.trim_start_matches(|c: char| {
c.is_whitespace() || matches!(c, ':' | '#' | '-' | '_' | '.' | '=' | '(')
});
let digits: String = rest.chars().take_while(|c| c.is_ascii_digit()).collect();
if let Ok(n) = digits.parse::<usize>() {
return Some(n);
}
from += rel + kw.len();
}
}
None
}
fn messages_to_faults(
messages: &[asic_rs::core::data::message::MinerMessage],
) -> Vec<crate::model::Fault> {
@@ -500,7 +605,12 @@ fn messages_to_faults(
Some(MinerComponent::ControlBoard {}) => FaultComponent::Control,
Some(MinerComponent::Fan { idx }) => FaultComponent::Fan(*idx as usize),
Some(MinerComponent::HashBoard { idx, .. }) => FaultComponent::Board(*idx as usize),
None => FaultComponent::Other,
// Unattributed (every Antminer-hardware firmware): recover a board
// index from the message text so hashboard faults show on the board
// they name, not the control-board tooltip (round 18 #5).
None => board_index_from_text(text)
.map(FaultComponent::Board)
.unwrap_or(FaultComponent::Other),
};
Some(Fault {
component,
@@ -512,6 +622,31 @@ fn messages_to_faults(
.collect()
}
#[cfg(test)]
mod board_index_tests {
use super::board_index_from_text;
#[test]
fn extracts_board_index_from_common_fault_texts() {
assert_eq!(board_index_from_text("Chain 2 temperature sensor error"), Some(2));
assert_eq!(board_index_from_text("hashboard 0 loss of balance"), Some(0));
assert_eq!(board_index_from_text("Slot 1 error reading chip id."), Some(1));
assert_eq!(board_index_from_text("Board #3 not responding"), Some(3));
// No board keyword -> not attributed to a board.
assert_eq!(board_index_from_text("Environment temperature is too high."), None);
assert_eq!(board_index_from_text("Power current error."), None);
}
#[test]
fn does_not_grab_an_unrelated_number_far_past_the_keyword() {
// The number must immediately follow the keyword: a later temperature/count
// must not be mistaken for the board index (round 18 #12).
assert_eq!(board_index_from_text("hashboard error, chip temp 65C"), None);
assert_eq!(board_index_from_text("board voltage low, 12 chips offline"), None);
// A real "board <n>" still resolves even with trailing numbers.
assert_eq!(board_index_from_text("Chain 2 has 3 dead chips"), Some(2));
}
}
/// Infer whether an Antminer's hashboards carry a per-board PIC MCU from the
/// model string (round 14 #2). No firmware (stock cgminer, Vnish, LuxOS, Braiins)
/// exposes a PIC flag over the network; PIC-vs-noPIC is fixed by the hashboard
@@ -520,9 +655,10 @@ fn messages_to_faults(
/// generation (S21 family, T21), where Bitmain dropped the per-board PIC.
/// - PIC: the rest of the S19 line (BM1362/BM1366, PIC16F1704/1542).
/// - unknown: everything else (older Antminers, non-Antminer makes).
///
/// The one genuinely ambiguous model is the plain "S19j Pro" (both PIC and noPIC
/// revisions exist); it is assumed PIC unless the model string says noPIC.
fn infer_pic(model: &str) -> Option<bool> {
pub(crate) fn infer_pic(model: &str) -> Option<bool> {
let m = model.to_lowercase();
if m.contains("nopic") {
return Some(false);
@@ -539,14 +675,108 @@ fn infer_pic(model: &str) -> Option<bool> {
None
}
/// Bixbit and Hiveon are aftermarket firmwares that keep the stock Antminer web
/// API, so asic-rs identifies them as "AntMiner Stock". Distinguish them from real
/// stock via the cgminer `version` reply (port 4028): Bixbit tags it with
/// `BixFirmware`/`BixMiner`; Hiveon carries a "hiveon" marker. Returns the display
/// family to relabel with, or None (round 17). Best-effort + fast: a short probe
/// only run for Antminer miners that first identified as stock.
async fn detect_aftermarket_antminer(ip: std::net::IpAddr) -> Option<&'static str> {
use tokio::io::{AsyncReadExt, AsyncWriteExt};
let connect = tokio::net::TcpStream::connect((ip, 4028));
let mut stream = tokio::time::timeout(std::time::Duration::from_secs(3), connect)
.await
.ok()?
.ok()?;
stream.write_all(b"{\"command\":\"version\"}").await.ok()?;
let mut buf = Vec::new();
let _ = tokio::time::timeout(std::time::Duration::from_secs(3), stream.read_to_end(&mut buf)).await;
let text = String::from_utf8_lossy(&buf);
if text.contains("BixFirmware") || text.contains("BixMiner") || text.contains("BixAPIVersion") {
Some("Bixbit")
} else if text.to_ascii_lowercase().contains("hiveon") {
Some("Hiveon")
} else {
None
}
}
/// A lightweight row built from identification alone (no `get_data`), emitted the
/// instant a miner is identified so it appears in the fleet immediately; the full
/// telemetry row upserts over it when `get_data` completes (round 19 #18). Only
/// the cheap, synchronous identity + capability accessors are read here -- no
/// network I/O beyond what identification already did.
fn partial_row(miner: &dyn Miner, ip: std::net::IpAddr) -> MinerRow {
let di = miner.get_device_info();
let (firmware, _fw_vendor) = crate::naming::firmware_family(&di.firmware);
let brand = crate::naming::brand(&di.make);
let model = crate::naming::clean_model(&di.make, &di.model);
let submodel = crate::naming::submodel(&di.make, &di.model);
// Same VNish power-limit masking as the full row (round 9 #3).
let power_limit =
miner.supports_set_power_limit() && !di.firmware.eq_ignore_ascii_case("VNish");
let caps = MinerCaps {
fault_light: miner.supports_set_fault_light(),
restart: miner.supports_restart(),
pause: miner.supports_pause(),
resume: miner.supports_resume(),
power_limit,
tuning: miner.supports_set_tuning_percent(),
// hashrate_target needs the tuning envelope from get_data; the full row
// fills it in a moment later.
hashrate_target: false,
supports_presets: miner.supports_presets(),
firmware_flash: miner.supports_upgrade_firmware(),
pools: miner.supports_pools_config(),
timezone: miner.supports_timezone_config(),
change_password: miner.supports_change_password(),
factory_reset: miner.supports_factory_reset(),
};
MinerRow {
ip: ip.to_string(),
brand,
model,
submodel,
firmware,
algorithm: di.algo.to_string(),
write_locked: Some(!caps.any_control()),
caps,
..Default::default()
}
}
async fn to_row(miner: &dyn Miner) -> MinerRow {
let data = miner.get_data().await;
// Whether the firmware reported a current hashrate at all: a reported 0 renders
// "0.00T", an absent one the "-" dash (round 19 follow-up).
let hashrate_known = data.hashrate.is_some();
let hashrate_ths = data
.hashrate
.as_ref()
.map(|h| h.clone().as_unit(asic_rs::core::data::hashrate::HashRateUnit::TeraHash).value)
.unwrap_or(0.0);
let expected_ths = data
// Rolling average windows in TH/s (round 19 #10, T2); 0.0 = window not reported.
let (hashrate_1m_ths, hashrate_5m_ths, hashrate_15m_ths, hashrate_24h_ths) = {
let to_ths = |h: &Option<asic_rs::core::data::hashrate::HashRate>| {
h.as_ref()
.map(|h| {
h.clone()
.as_unit(asic_rs::core::data::hashrate::HashRateUnit::TeraHash)
.value
})
.unwrap_or(0.0)
};
match data.hashrate_averages.as_ref() {
Some(a) => (
to_ths(&a.avg_1m),
to_ths(&a.avg_5m),
to_ths(&a.avg_15m),
to_ths(&a.avg_24h),
),
None => (0.0, 0.0, 0.0, 0.0),
}
};
let mut expected_ths = data
.expected_hashrate
.as_ref()
.map(|h| h.clone().as_unit(asic_rs::core::data::hashrate::HashRateUnit::TeraHash).value)
@@ -563,17 +793,26 @@ async fn to_row(miner: &dyn Miner) -> MinerRow {
// alarmingly high and didn't match the temperature the miner itself reports;
// the board temperature (~60-79C) is the figure the miner's own UI shows
// (round 12 #3). Falls back to the chip temp when no board temp is reported.
let board_temps: Vec<f64> = data
.hashboards
.iter()
.filter_map(|b| {
b.board_temperature
.as_ref()
.or(b.outlet_chip_temperature.as_ref())
.map(|t| t.as_celsius())
})
.filter(|&t| t > 0.0)
.collect();
// Index-aligned with the hashboards (index i == board i): a board with no
// reading is 0.0, NOT dropped, so a missing middle board can't shift the
// others left in the "77 / - / 74" Chip-temp cell (round 18 #12). Collapsed
// to empty when NO board reports a temperature, so the cell falls back to the
// fleet average instead of showing "- / - / -".
let board_temps: Vec<f64> = {
let v: Vec<f64> = data
.hashboards
.iter()
.map(|b| {
b.board_temperature
.as_ref()
.or(b.outlet_chip_temperature.as_ref())
.map(|t| t.as_celsius())
.filter(|&t| t > 0.0)
.unwrap_or(0.0)
})
.collect();
if v.iter().all(|&t| t <= 0.0) { Vec::new() } else { v }
};
// Per-board hashrate (TH/s), index-aligned with the hashboards, for the
// per-board Health tooltip (round 17 R2). Unlike board_temps this is NOT
// filtered/compacted -- index i must stay board i so the tooltip numbering
@@ -588,6 +827,30 @@ async fn to_row(miner: &dyn Miner) -> MinerRow {
.unwrap_or(0.0)
})
.collect();
// Per-board expected hashrate (TH/s), index-aligned, for the actual/expected
// per-board tooltip (round 18 #3).
let board_expected_hashrates: Vec<f64> = data
.hashboards
.iter()
.map(|b| {
b.expected_hashrate
.as_ref()
.map(|h| h.clone().as_unit(asic_rs::core::data::hashrate::HashRateUnit::TeraHash).value)
.unwrap_or(0.0)
})
.collect();
// Per-board configured voltage (V) and frequency (MHz), index-aligned, for the
// per-board tooltip (round 18 / roadmap G7 read side). 0.0 where unreported.
let board_voltages: Vec<f64> = data
.hashboards
.iter()
.map(|b| b.voltage.as_ref().map(|v| v.as_volts()).unwrap_or(0.0))
.collect();
let board_frequencies: Vec<f64> = data
.hashboards
.iter()
.map(|b| b.frequency.as_ref().map(|f| f.as_megahertz()).unwrap_or(0.0))
.collect();
let fan_rpms: Vec<f64> = data
.fans
.iter()
@@ -625,7 +888,19 @@ async fn to_row(miner: &dyn Miner) -> MinerRow {
// Firmware family (coloured column) and version go in separate columns. Strip
// the vendor word asic-rs prepends on stock firmware ("AntMiner Stock" ->
// "Stock") and carry it into the version instead (round 11 #6).
let (firmware, fw_vendor) = crate::naming::firmware_family(&data.device_info.firmware);
let (mut firmware, mut fw_vendor) = crate::naming::firmware_family(&data.device_info.firmware);
// Bixbit/Hiveon masquerade as stock; relabel them from their cgminer signature
// so they get their own family + colour instead of "Stock" (round 17). This
// is one extra TCP probe per stock-labelled Antminer per scan (round 18 #12):
// deliberately re-run each scan rather than cached, because a miner's firmware
// can change under us between scans (a flash/restore), and the detection must
// stay current; it only fires for Antminers that still read as plain "Stock".
if data.device_info.make.eq_ignore_ascii_case("antminer") && firmware.eq_ignore_ascii_case("stock") {
if let Some(fam) = detect_aftermarket_antminer(data.ip).await {
firmware = fam.to_string();
fw_vendor = None; // the aftermarket version stands alone, no "AntMiner" prefix
}
}
let raw_fw_version = data.firmware_version.clone().unwrap_or_default();
let fw_version = match (fw_vendor, raw_fw_version.is_empty()) {
(Some(vendor), false) => format!("{vendor} {raw_fw_version}"),
@@ -665,6 +940,14 @@ async fn to_row(miner: &dyn Miner) -> MinerRow {
.filter_map(|f| f.rpm.as_ref().map(|r| r.as_rpm()))
.fold(0.0f64, f64::max);
let algorithm = data.hashrate.as_ref().map(|h| h.algo.to_string()).unwrap_or_default();
// Equihash (Z15) fallback: plain Z15 firmware omits the expected hashrate, so
// fill it from the model nameplate (Sol/s -> the ths-normalised value) so the
// actual/expected column + colour work like every other miner (round 18 #6).
if expected_ths <= 0.0 && algorithm.eq_ignore_ascii_case("equihash") {
if let Some(sols) = crate::naming::equihash_expected_sols(&model) {
expected_ths = sols / 1e12;
}
}
let is_mining = data.is_mining;
let slow = crate::model::is_slow(is_mining, hashrate_ths, expected_ths);
let operating_state = data.operating_state.as_ref().map(|s| s.to_string()).unwrap_or_default();
@@ -710,6 +993,10 @@ async fn to_row(miner: &dyn Miner) -> MinerRow {
TuningTarget::Preset(s) => format!("preset {s}"),
TuningTarget::Manual { .. } => "manual".to_string(),
});
// The configured power-limit setpoint in watts, when the target is a power
// target (WhatsMiner "Power Limit", VNish/Braiins power targets). Its own
// numeric column (round 21 #2), distinct from the mixed Target label.
let power_limit_w = data.tuning_target.as_ref().and_then(&target_watts);
// A hashrate target is offerable only where the firmware actively tunes by
// hashrate through set_tuning_config (ePIC); Braiins advertises a hashrate
// envelope but has no set_tuning_config wired, so it is excluded.
@@ -725,12 +1012,26 @@ async fn to_row(miner: &dyn Miner) -> MinerRow {
power_limit,
tuning: miner.supports_set_tuning_percent(),
hashrate_target,
supports_presets: miner.supports_presets(),
firmware_flash: miner.supports_upgrade_firmware(),
pools: miner.supports_pools_config(),
timezone: miner.supports_timezone_config(),
change_password: miner.supports_change_password(),
factory_reset: miner.supports_factory_reset(),
};
// The firmware's selectable named presets/profiles (round 18 / roadmap G3),
// read live only for miners that advertise them (LuxOS/VNish). One extra RPC
// at scan time for those miners; the default 300 s rescan makes it negligible.
let presets: Vec<crate::model::MinerPreset> = if caps.supports_presets {
miner
.get_presets()
.await
.into_iter()
.map(|p| crate::model::MinerPreset { name: p.name, pretty: p.pretty })
.collect()
} else {
Vec::new()
};
// PIC vs noPIC (round 14 #2 rework). No firmware exposes a PIC flag over the
// network -- it's a fixed hardware property of the hashboard type -- so infer
// it from the model, which every API reports. See `infer_pic`.
@@ -775,6 +1076,22 @@ async fn to_row(miner: &dyn Miner) -> MinerRow {
selected: false,
caps,
algorithm,
// ASIC chip type + hashboard model, from the first board that reports them
// (uniform across boards); empty where the firmware doesn't expose them
// (round 19 #10). When no board reports a chip type (VNish/stock
// Antminer/LuxOS never do), fall back to the fixed per-model chip for
// Antminer hardware (round 21 #3).
chip_type: data
.hashboards
.iter()
.find_map(|b| b.chip_type.clone())
.or_else(|| crate::naming::chip_type_for_model(&make, &model_id).map(str::to_string))
.unwrap_or_default(),
hashboard_model: data
.hashboards
.iter()
.find_map(|b| b.hashboard_model.clone())
.unwrap_or_default(),
pic_present,
write_locked,
errors,
@@ -782,6 +1099,7 @@ async fn to_row(miner: &dyn Miner) -> MinerRow {
model,
brand,
submodel,
presets,
mac: data.mac.map(|m| m.to_string()).unwrap_or_default(),
hostname: data.hostname.clone().unwrap_or_default(),
serial: {
@@ -807,15 +1125,38 @@ async fn to_row(miner: &dyn Miner) -> MinerRow {
cpu,
board_code,
hashrate_ths,
hashrate_known,
hashrate_1m_ths,
hashrate_5m_ths,
hashrate_15m_ths,
hashrate_24h_ths,
expected_ths,
board_hashrates,
board_expected_hashrates,
board_voltages,
board_frequencies,
efficiency: data.efficiency.unwrap_or(0.0),
power_w,
// PSU output V/A is not yet exposed by asic-rs (roadmap G15); the tooltip
// falls back to a status string until it is.
psu_out_voltage_v: None,
psu_out_current_a: None,
// PSU info (round 17 R5/G15; ePIC exposes it today). A reported-but-zero
// output current (ePIC leaves it 0) is treated as absent so the R2 tooltip
// shows just the voltage.
psu_out_voltage_v: data.psu.as_ref().and_then(|p| p.output_voltage).filter(|&v| v > 0.0),
psu_out_current_a: data.psu.as_ref().and_then(|p| p.output_current).filter(|&a| a > 0.0),
psu_version: data
.psu
.as_ref()
.map(|p| match (&p.model, &p.version) {
(Some(m), Some(v)) => format!("{v} ({m})"),
(None, Some(v)) => v.clone(),
(Some(m), None) => m.clone(),
(None, None) => String::new(),
})
.unwrap_or_default(),
psu_serial: data.psu.as_ref().and_then(|p| p.serial.clone()).unwrap_or_default(),
psu_voltage_min_v: data.psu.as_ref().and_then(|p| p.voltage_min),
psu_voltage_max_v: data.psu.as_ref().and_then(|p| p.voltage_max),
tuning_target_label,
power_limit_w,
power_target_min_w,
power_target_max_w,
hashrate_target_min_ths,
@@ -826,7 +1167,11 @@ async fn to_row(miner: &dyn Miner) -> MinerRow {
fluid_temp_c,
env_temp_c,
outlet_temp_c,
temp_target_c: data.temp_target,
temp_hot_c: data.temp_hot,
temp_dangerous_c: data.temp_dangerous,
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),
@@ -840,9 +1185,39 @@ async fn to_row(miner: &dyn Miner) -> MinerRow {
pools,
best_share: data.best_share,
session_best_share: data.session_best_share,
// Accepted / rejected shares summed across every configured pool (round 19
// #10); None when no pool reports the count.
accepted_shares: {
let mut total = 0u64;
let mut any = false;
for p in data.pools.iter().flat_map(|g| g.pools.iter()) {
if let Some(v) = p.accepted_shares {
total = total.saturating_add(v);
any = true;
}
}
any.then_some(total)
},
rejected_shares: {
let mut total = 0u64;
let mut any = false;
for p in data.pools.iter().flat_map(|g| g.pools.iter()) {
if let Some(v) = p.rejected_shares {
total = total.saturating_add(v);
any = true;
}
}
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,
tuner_status: data.tuner_status.clone().unwrap_or_default(),
is_mining,
slow,
paused,
@@ -859,6 +1234,7 @@ pub enum ConfigAction {
Resume,
PowerLimit(f64), // watts
HashRateTarget(f64), // TH/s -- structured hashrate target (round 17 C)
Preset(String), // named firmware profile/preset (round 18 / G3)
TuningPercent(u8),
Timezone(String), // IANA zone, e.g. "America/Edmonton" (round 17 B / G10)
ChangePassword(String), // new web/API password (round 17 B / G11)
@@ -876,6 +1252,7 @@ impl ConfigAction {
ConfigAction::Resume => "resume".into(),
ConfigAction::PowerLimit(w) => format!("power target {w:.0} W"),
ConfigAction::HashRateTarget(t) => format!("hashrate target {t:.0} TH/s"),
ConfigAction::Preset(name) => format!("preset {name}"),
ConfigAction::TuningPercent(p) => format!("tuning {p}%"),
ConfigAction::Timezone(tz) => format!("timezone {tz}"),
ConfigAction::ChangePassword(_) => "change password".into(),
@@ -894,6 +1271,7 @@ impl ConfigAction {
ConfigAction::Resume => "resuming…".into(),
ConfigAction::PowerLimit(_) => "setting power…".into(),
ConfigAction::HashRateTarget(_) => "setting hashrate…".into(),
ConfigAction::Preset(_) => "setting preset…".into(),
ConfigAction::TuningPercent(_) => "tuning…".into(),
ConfigAction::Timezone(_) => "setting timezone…".into(),
ConfigAction::ChangePassword(_) => "changing password…".into(),
@@ -950,6 +1328,13 @@ async fn apply_action(miner: &dyn Miner, action: &ConfigAction) -> Result<bool,
let scaling = miner.get_scaling_config().await.ok();
miner.set_tuning_config(cfg, scaling).await
}
ConfigAction::Preset(name) => {
use asic_rs::core::config::tuning::TuningConfig;
use asic_rs::core::data::miner::TuningTarget;
miner
.set_tuning_config(TuningConfig::new(TuningTarget::Preset(name.clone())), None)
.await
}
ConfigAction::TuningPercent(p) => miner.set_tuning_percent(*p).await,
ConfigAction::Timezone(tz) => {
use asic_rs::core::config::timezone::{Tz, TimezoneConfig};
@@ -974,6 +1359,37 @@ async fn apply_action(miner: &dyn Miner, action: &ConfigAction) -> Result<bool,
result.map_err(|e| e.to_string())
}
/// Fetch one miner's log via asic-rs's per-backend `read_logs()` (round 19
/// #11-16). Runs synchronously on the caller's thread in a short-lived
/// current-thread runtime (mirroring `start_config_action`), so the GUI's
/// existing "log-fetch" worker thread can call it directly. `Err` when the IP is
/// unparseable, no miner answers, the backend has no log API (e.g. LuxOS,
/// WhatsMiner), or the fetch fails/times out.
pub fn fetch_log(ip: &str, timeout_secs: u64) -> Result<String, String> {
let addr: std::net::IpAddr = ip.parse().map_err(|_| "bad IP".to_string())?;
let rt = tokio::runtime::Builder::new_current_thread()
.enable_all()
.build()
.map_err(|e| format!("runtime: {e}"))?;
rt.block_on(async move {
let factory =
crate::credentials::configured_factory().with_identification_timeout_secs(timeout_secs.max(1));
let miner = match factory.scan_miner(addr).await {
Ok(Some(m)) => m,
Ok(None) => return Err("no miner answered at this IP".to_string()),
Err(e) => return Err(format!("{e}")),
};
if !miner.supports_read_logs() {
return Err("this firmware's backend does not expose logs over its API".to_string());
}
match tokio::time::timeout(std::time::Duration::from_secs(25), miner.read_logs()).await {
Ok(Ok(text)) => Ok(text),
Ok(Err(e)) => Err(format!("read logs: {e}")),
Err(_) => Err("log fetch timed out".to_string()),
}
})
}
/// Apply `action` to each miner in `ips` on a background thread: re-discover the
/// miner (asic-rs `scan_miner`), run the setter, and report per-IP results. In
/// fake-scan mode it reports simulated successes so the flow works offline.
@@ -1037,7 +1453,7 @@ pub fn start_config_action(ips: Vec<String>, action: ConfigAction) -> ActionHand
match outcome {
Ok(true) => (true, "ok".to_string()),
Ok(false) => (false, "refused".to_string()),
Err(e) => (false, format!("{e}")),
Err(e) => (false, e.to_string()),
}
}
Ok(None) => (false, "no miner at IP".to_string()),
@@ -1089,16 +1505,24 @@ pub fn start_pools_action(targets: Vec<PoolTarget>) -> ActionHandle {
if fake_scan_enabled() {
let err_tx = tx.clone();
let thread_cancel = cancel.clone();
let res = std::thread::Builder::new().name("fake-pools".into()).spawn(move || {
let mut ok = 0usize;
for t in targets {
// Honour cancellation between miners, like every sibling background
// action's fake branch (round 18 #12).
if thread_cancel.load(Ordering::Relaxed) {
break;
}
let first = t.pools.first().map(|p| p.username.clone()).unwrap_or_default();
let _ = tx.send(ActionMsg::Result {
ip: t.ip,
ok: true,
detail: format!("simulated ({} pool(s), {first})", t.pools.len()),
});
ok += 1;
}
let _ = tx.send(ActionMsg::Done { ok: total, total });
let _ = tx.send(ActionMsg::Done { ok, total });
});
if res.is_err() {
let _ = err_tx.send(ActionMsg::Done { ok: 0, total });
@@ -1172,6 +1596,10 @@ pub fn start_pools_action(targets: Vec<PoolTarget>) -> ActionHandle {
/// Progress/results from a background refresh of a specific, already-known
/// set of miners (re-poll on a timer or after a right-click "Refresh" action,
/// as opposed to `start_scan`'s full subnet sweep).
// `Row` is the common variant; boxing it to shrink the rare Started/Done/Failed
// variants would add an allocation per refreshed miner for no real gain (see the
// note on ScanMsg).
#[allow(clippy::large_enum_variant)]
pub enum RefreshMsg {
Started { total: usize },
/// A miner's telemetry was re-read successfully.
@@ -1351,7 +1779,7 @@ pub fn start_firmware_flash_action(ips: Vec<String>, image: FirmwareImage) -> Ac
match flash_one(&*miner, &image).await {
Ok(true) => (true, "ok".to_string()),
Ok(false) => (false, "refused".to_string()),
Err(e) => (false, format!("{e}")),
Err(e) => (false, e.to_string()),
}
}
}
@@ -1387,10 +1815,14 @@ pub enum AccessProbeMsg {
/// A running access probe; `stop` cancels the remaining miners.
pub struct AccessProbeHandle {
pub rx: Receiver<AccessProbeMsg>,
// The worker honours cancellation between miners; a UI stop control is not
// wired yet, so the handle-side trigger is kept for when it is.
#[allow(dead_code)]
cancel: Arc<AtomicBool>,
}
impl AccessProbeHandle {
#[allow(dead_code)]
pub fn stop(&self) {
self.cancel.store(true, Ordering::Relaxed);
}
@@ -1632,7 +2064,9 @@ mod tests {
#[test]
fn auto_secs_round_trip_and_defaults() {
// config_path() reads $HOME; point it at a private temp dir. HOME is
// process-global, so this stays one test and restores HOME afterward.
// process-global, so serialise against other HOME-mutating tests and
// restore HOME afterward (round 18 #12).
let _home = crate::model::HOME_TEST_LOCK.lock().unwrap_or_else(|e| e.into_inner());
let prev = std::env::var_os("HOME");
let dir = std::env::temp_dir().join(format!("alkane-test-{}", std::process::id()));
let _ = std::fs::remove_dir_all(&dir);
File diff suppressed because it is too large Load Diff
+43
View File
@@ -0,0 +1,43 @@
# cargo-deny configuration (https://embarkstudios.github.io/cargo-deny/).
#
# Run locally with `cargo deny check`. CI's security gate is cargo-audit (lighter,
# already wired); this file documents the dependency policy and lets anyone run a
# fuller license/advisory/source check. The whole dependency set is vendored under
# ./vendor and resolved offline (see .cargo/config.toml).
[advisories]
version = 2
# Accepted, documented advisories (build-time-only reqwest 0.11 subtree of the
# wx-rs build script -- never linked into the runtime binary). Mirrors
# .cargo/audit.toml; re-review when the vendored dependency set is refreshed.
ignore = [
"RUSTSEC-2026-0258", # h2 0.3 DATA-frame DoS (build-time HTTP client only)
"RUSTSEC-2025-0134", # rustls-pemfile 1.0.4 unmaintained (same subtree)
]
[licenses]
version = 2
# The project is MIT; only permissive licenses are allowed in the
# dependency tree.
allow = [
"MIT",
"Apache-2.0",
"Apache-2.0 WITH LLVM-exception",
"BSD-2-Clause",
"BSD-3-Clause",
"ISC",
"Zlib",
"Unicode-3.0",
"Unicode-DFS-2016",
"MPL-2.0",
"CC0-1.0",
]
confidence-threshold = 0.9
[bans]
multiple-versions = "warn"
wildcards = "allow"
[sources]
unknown-registry = "warn"
unknown-git = "warn"
+202
View File
@@ -0,0 +1,202 @@
Subject: [PATCH 0018] core + epic: PSU info scan (identity, rated envelope, output V/A)
Round 17 R5/G15. asic-rs had no PSU telemetry. Adds a PsuInfo type (model,
version, rated voltage min/max, live output voltage/current) as an optional
MinerData.psu field, a DataField::Psu, and a default parse_psu(&data) -> None
that backends override.
ePIC (PowerPlay v1) populates it: DataField::Psu merges the summary "Power Supply
Stats" (tag "stats") and the capabilities "Psu Info" (tag "info"); parse_psu reads
model/FW + Min/Max Vout (millivolts -> volts) + live Output Voltage/Current.
Verified live on ePIC S19j Pro (10.4.1.6/.10): model 117, fw 22, Vmin 11.877 V,
Vmax 15.182 V, output ~13.2-13.4 V. Feeds the new PSU version/Vmin/Vmax columns
and the R2 power tooltip (output V/A). Other backends leave psu None until they
add their own parse_psu.
diff --git a/vendor/asic-rs-core/src/data/collector.rs b/vendor/asic-rs-core/src/data/collector.rs
index 93a0111a..d1456548 100644
--- a/vendor/asic-rs-core/src/data/collector.rs
+++ b/vendor/asic-rs-core/src/data/collector.rs
@@ -74,6 +74,9 @@ pub enum DataField {
/// Current power consumption in watts.
#[cfg_attr(feature = "python", pydantic(value = "Wattage"))]
Wattage,
+ /// Power-supply info (identity, rated voltage envelope, live output V/A).
+ #[cfg_attr(feature = "python", pydantic(value = "Psu"))]
+ Psu,
/// manual tuning percent of full power (100 = unthrottled).
#[cfg_attr(feature = "python", pydantic(value = "TuningPercent"))]
TuningPercent,
diff --git a/vendor/asic-rs-core/src/data/miner.rs b/vendor/asic-rs-core/src/data/miner.rs
index be6f4c8f..b2b8a578 100644
--- a/vendor/asic-rs-core/src/data/miner.rs
+++ b/vendor/asic-rs-core/src/data/miner.rs
@@ -16,6 +16,7 @@ use super::{
message::MinerMessage,
operating_state::OperatingState,
pool::PoolGroupData,
+ psu::PsuInfo,
};
use crate::data::{
deserialize::deserialize_macaddr,
@@ -192,6 +193,9 @@ pub struct MinerData {
#[serde(serialize_with = "serialize_power")]
#[ts(type = "number | null")]
pub wattage: Option<Power>,
+ /// Power-supply info (identity, rated voltage envelope, live output V/A),
+ /// when the firmware reports it.
+ pub psu: Option<PsuInfo>,
/// The current manual tuning percent of full power (100 = unthrottled), where supported
pub tuning_percent: Option<u8>,
/// The current tuning target of the miner, such as power target or hashrate target
diff --git a/vendor/asic-rs-core/src/data/mod.rs b/vendor/asic-rs-core/src/data/mod.rs
index c69c43eb..3b7f98c0 100644
--- a/vendor/asic-rs-core/src/data/mod.rs
+++ b/vendor/asic-rs-core/src/data/mod.rs
@@ -15,5 +15,6 @@ pub mod message;
pub mod miner;
pub mod operating_state;
pub mod pool;
+pub mod psu;
pub(crate) mod serialize;
pub mod share;
diff --git a/vendor/asic-rs-core/src/data/psu.rs b/vendor/asic-rs-core/src/data/psu.rs
new file mode 100644
index 00000000..810ba47c
--- /dev/null
+++ b/vendor/asic-rs-core/src/data/psu.rs
@@ -0,0 +1,30 @@
+//! Power-supply (PSU) information reported by a miner's firmware.
+//!
+//! A backend fills in only what its firmware actually exposes; every field is
+//! optional. Some firmware reports the PSU's identity and rated voltage envelope
+//! (min/max output voltage), others also report the live output voltage and
+//! current. Voltages are in volts and currents in amps.
+
+#[cfg(feature = "python")]
+use pyo3::pyclass;
+use serde::{Deserialize, Serialize};
+use ts_rs::TS;
+
+/// Power-supply identity and voltage telemetry for one miner.
+#[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 PsuInfo {
+ /// PSU model / type identifier, when reported.
+ pub model: Option<String>,
+ /// PSU firmware/hardware version, when reported.
+ pub version: Option<String>,
+ /// Minimum rated output voltage in volts, when reported.
+ pub voltage_min: Option<f64>,
+ /// Maximum rated output voltage in volts, when reported.
+ pub voltage_max: Option<f64>,
+ /// Live output voltage in volts, when reported.
+ pub output_voltage: Option<f64>,
+ /// Live output current in amps, when reported.
+ pub output_current: Option<f64>,
+}
diff --git a/vendor/asic-rs-core/src/traits/miner.rs b/vendor/asic-rs-core/src/traits/miner.rs
index d08b1b5a..db1ba653 100644
--- a/vendor/asic-rs-core/src/traits/miner.rs
+++ b/vendor/asic-rs-core/src/traits/miner.rs
@@ -33,6 +33,7 @@ use crate::{
miner::{MinerData, TuningTarget},
operating_state::OperatingState,
pool::PoolGroupData,
+ psu::PsuInfo,
},
traits::firmware::MinerFirmware,
traits::model::MinerModel,
@@ -272,6 +273,7 @@ impl<
let hashrate = self.parse_hashrate(&data);
let expected_hashrate = self.parse_expected_hashrate(&data);
let wattage = self.parse_wattage(&data);
+ let psu = self.parse_psu(&data);
let tuning_percent = self.parse_tuning_percent(&data);
let tuning_target = self.parse_tuning_target(&data);
let scaled_tuning_target = self.parse_scaled_tuning_target(&data);
@@ -367,6 +369,7 @@ impl<
// Power information
wattage,
+ psu,
tuning_percent,
tuning_target,
scaled_tuning_target,
@@ -720,6 +723,10 @@ pub trait GetWattage: CollectData {
fn parse_wattage(&self, data: &HashMap<DataField, Value>) -> Option<Power> {
None
}
+ #[allow(unused_variables)]
+ fn parse_psu(&self, data: &HashMap<DataField, Value>) -> Option<PsuInfo> {
+ None
+ }
}
// Tuning Percent
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 c21e05b1..3365824d 100644
--- a/vendor/asic-rs-firmwares-epic/src/backends/v1/mod.rs
+++ b/vendor/asic-rs-firmwares-epic/src/backends/v1/mod.rs
@@ -24,6 +24,7 @@ use asic_rs_core::{
miner::TuningTarget,
operating_state::OperatingState,
pool::{PoolData, PoolGroupData, PoolURL},
+ psu::PsuInfo,
},
traits::{miner::*, model::MinerModel},
util::unix_timestamp_secs,
@@ -436,6 +437,26 @@ impl GetDataLocations for PowerPlayV1 {
tag: None,
},
)],
+ // PSU: live stats from summary + rated envelope/identity from
+ // capabilities, tagged so parse_psu can read both (round 17 R5/G15).
+ DataField::Psu => vec![
+ (
+ WEB_SUMMARY,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/Power Supply Stats"),
+ tag: Some("stats"),
+ },
+ ),
+ (
+ WEB_CAPABILITIES,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/Psu Info"),
+ tag: Some("info"),
+ },
+ ),
+ ],
DataField::TuningTarget => vec![(
WEB_SUMMARY,
DataExtractor {
@@ -1095,6 +1116,25 @@ impl GetWattage for PowerPlayV1 {
fn parse_wattage(&self, data: &HashMap<DataField, Value>) -> Option<Power> {
data.extract_map::<f64, _>(DataField::Wattage, Power::from_watts)
}
+
+ fn parse_psu(&self, data: &HashMap<DataField, Value>) -> Option<PsuInfo> {
+ // DataField::Psu is the merged {stats: Power Supply Stats, info: Psu Info}
+ // (see get_locations). capabilities Vout + summary Target Voltage are in
+ // millivolts; summary Output Voltage/Current are already volts/amps.
+ let d = data.get(&DataField::Psu)?;
+ let stats = d.pointer("/stats");
+ let info = d.pointer("/info");
+ let f = |v: Option<&Value>, key: &str| v.and_then(|o| o.pointer(key)).and_then(tuning_value_as_f64);
+ let psu = PsuInfo {
+ model: f(info, "/PSU Type").map(|n| format!("{n:.0}")),
+ version: f(info, "/FW").map(|n| format!("{n:.0}")),
+ voltage_min: f(info, "/Min Vout").map(|mv| mv / 1000.0),
+ voltage_max: f(info, "/Max Vout").map(|mv| mv / 1000.0),
+ output_voltage: f(stats, "/Output Voltage"),
+ output_current: f(stats, "/Output Current"),
+ };
+ (psu != PsuInfo::default()).then_some(psu)
+ }
}
fn tuning_value_as_f64(value: &Value) -> Option<f64> {
@@ -0,0 +1,128 @@
Subject: [PATCH 0019] antminer v2023_07: best-share + Bixbit "Power Estimated" wattage
Round 17 R7 (found by flashing Bixbit onto fleet units). The v2023_07 stock
backend scanned hashrate/boards/temps/fans fine but reported no best-share for the
WHOLE Antminer fleet (DataField::BestShare had no get_locations entry, so it was
never fetched) and no wattage for Bixbit-based firmware (it reads the cgminer
stats power, which Bixbit leaves 0, putting the real figure in the summary as
"Power Estimated").
- Map DataField::BestShare / SessionBestShare to the cgminer summary
("Best Share" / "Best Session Share") and implement GetBestShare /
GetSessionBestShare (guard 0 -> None).
- Add the summary to DataField::Wattage under a "summary" tag and fall back to
"Power Estimated" in parse_wattage when the stats power is 0/absent. Stock
behaviour is preserved (a non-zero stats power still wins; a present-but-zero
power still reads 0 W).
Verified live: Bixbit S19j Pro (10.4.1.70) now reads wattage 2615 W + best-share
178930671 (was both blank); stock S21 Pro (10.4.1.90) now reads best-share
299464394 (was blank). 36 antminer backend tests pass; no wattage regression.
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 6d6dc593..1ac2bad1 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
@@ -521,8 +521,40 @@ impl GetDataLocations for AntMinerV202307 {
tag: None,
},
),
+ // Bixbit-based firmware reports Power=0 in stats but the real
+ // figure as "Power Estimated" in the cgminer summary; carry it
+ // under a "summary" tag so parse_wattage can fall back to it
+ // without colliding with the stats keys (round 17 R7).
+ (
+ RPC_SUMMARY,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/SUMMARY/0"),
+ tag: Some("summary"),
+ },
+ ),
]
}
+ // Best share (all-time / session) from the cgminer summary. Antminer
+ // stock, Bixbit, and other cgminer-based firmware all report it here;
+ // it was previously unmapped, so best-share was blank fleet-wide
+ // (round 17 R7).
+ DataField::BestShare => vec![(
+ RPC_SUMMARY,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/SUMMARY/0/Best Share"),
+ tag: None,
+ },
+ )],
+ DataField::SessionBestShare => vec![(
+ RPC_SUMMARY,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/SUMMARY/0/Best Session Share"),
+ tag: None,
+ },
+ )],
DataField::SerialNumber => vec![
(
WEB_SYSTEM_INFO,
@@ -778,8 +810,6 @@ impl GetUptime for AntMinerV202307 {
}
}
-impl GetBestShare for AntMinerV202307 {}
-impl GetSessionBestShare for AntMinerV202307 {}
impl GetOperatingState for AntMinerV202307 {}
@@ -888,14 +918,30 @@ impl GetWattage for AntMinerV202307 {
}
}
- if let Some(power) = stats_data
+ let primary = stats_data
.get("power")
.or_else(|| stats_data.get("Power"))
// Same firmware version spells this differently per model: the
// L9 reports `power`, the L11 `watt`.
.or_else(|| stats_data.get("watt"))
+ .and_then(|v| v.as_f64());
+ if let Some(power) = primary
+ && power > 0.0
+ {
+ return Some(Power::from_watts(power));
+ }
+ // Bixbit-based firmware leaves the stats power at 0 and reports the
+ // real draw as "Power Estimated" in the summary (round 17 R7).
+ if let Some(est) = stats_data
+ .pointer("/summary/Power Estimated")
.and_then(|v| v.as_f64())
+ && est > 0.0
{
+ return Some(Power::from_watts(est));
+ }
+ // Preserve the prior behaviour: a present-but-zero stats power still
+ // reads as 0 W rather than blank.
+ if let Some(power) = primary {
return Some(Power::from_watts(power));
}
}
@@ -903,6 +949,21 @@ impl GetWattage for AntMinerV202307 {
}
}
+impl GetBestShare for AntMinerV202307 {
+ fn parse_best_share(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
+ // cgminer summary "Best Share" (all-time). Guard against a firmware that
+ // reports 0 when it has never found a share (round 17 R7).
+ data.extract::<f64>(DataField::BestShare).filter(|&v| v > 0.0)
+ }
+}
+
+impl GetSessionBestShare for AntMinerV202307 {
+ fn parse_session_best_share(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
+ data.extract::<f64>(DataField::SessionBestShare)
+ .filter(|&v| v > 0.0)
+ }
+}
+
impl GetTuningTarget for AntMinerV202307 {
fn parse_tuning_target(&self, data: &HashMap<DataField, Value>) -> Option<TuningTarget> {
data.get(&DataField::TuningTarget)
+59
View File
@@ -0,0 +1,59 @@
Subject: [PATCH 0020] braiins v26_04: PSU info (type + rated voltage envelope)
Round 17 R5/G15 extension. BOS reports PSU info at miner/details -> psu_info
{version, min_voltage.volt, max_voltage.volt}. Map DataField::Psu to it and parse
model (the "version" type code, 117 = the same APW12 ePIC reports) + voltage
min/max. Verified live on Braiins S19j Pro (10.4.1.83/.27): model 117, Vmin
11.96 V, Vmax 15.2 V.
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 e65fb201..9b72ed94 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
@@ -22,6 +22,7 @@ use asic_rs_core::{
miner::TuningTarget,
operating_state::OperatingState,
pool::{PoolData, PoolGroupData, PoolURL},
+ psu::PsuInfo,
},
traits::{miner::*, model::MinerModel},
};
@@ -294,6 +295,16 @@ impl GetDataLocations for BraiinsV2604 {
tag: None,
},
)],
+ // PSU identity + rated voltage envelope (round 17 R5/G15). BOS reports
+ // it at miner/details -> psu_info {version, min_voltage, max_voltage}.
+ DataField::Psu => vec![(
+ WEB_MINER_DETAILS,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/psu_info"),
+ tag: None,
+ },
+ )],
DataField::TuningTarget => vec![
(
WEB_MINER_CONFIGURATION,
@@ -663,6 +674,22 @@ impl GetWattage for BraiinsV2604 {
fn parse_wattage(&self, data: &HashMap<DataField, Value>) -> Option<Power> {
data.extract_map::<i64, _>(DataField::Wattage, |w| Power::from_watts(w as f64))
}
+
+ fn parse_psu(&self, data: &HashMap<DataField, Value>) -> Option<PsuInfo> {
+ // BOS miner/details -> psu_info {version, min_voltage.volt, max_voltage.volt}.
+ // "version" is the PSU type code (117 = the APW12 ePIC also reports as model
+ // 117), so expose it as the model for consistency across firmwares.
+ let d = data.get(&DataField::Psu)?;
+ let psu = PsuInfo {
+ model: d.pointer("/version").and_then(|v| v.as_i64()).map(|n| n.to_string()),
+ version: None,
+ voltage_min: d.pointer("/min_voltage/volt").and_then(|v| v.as_f64()),
+ voltage_max: d.pointer("/max_voltage/volt").and_then(|v| v.as_f64()),
+ output_voltage: None,
+ output_current: None,
+ };
+ (psu != PsuInfo::default()).then_some(psu)
+ }
}
impl GetTuningTarget for BraiinsV2604 {
@@ -0,0 +1,173 @@
Subject: [PATCH 0021] whatsminer v1/v2: PSU info + fix pre-existing parse_messages test
Round 17 R5/G15 extension. get_psu /Msg exposes the PSU model + hw/sw version
(no DC output voltage or rated envelope). Map DataField::Psu to it in v1 and v2
and parse model + version. Verified live on a WhatsMiner M30S+ (10.8.1.214, v2):
model P221C, version H20201205. (v3 uses a different /msg/power shape and no v3
unit was available to verify, so it is left for a follow-up.)
Also fixes a pre-existing test bug: test_whatsminer_v1_parse_messages asserted 2
messages but never mocked get_error_code (its only source since patch 0012), so it
returned 0 and failed whenever the vendored backend tests were run (CI runs only
the GUI selftest, so it went unnoticed). Adds a get_error_code.json mock. v1 tests
now 41/41.
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 67907049..3c8512ad 100644
--- a/vendor/asic-rs-firmwares-whatsminer/src/backends/v1/mod.rs
+++ b/vendor/asic-rs-firmwares-whatsminer/src/backends/v1/mod.rs
@@ -18,6 +18,7 @@ use asic_rs_core::{
message::{MessageSeverity, MinerMessage},
miner::TuningTarget,
pool::{PoolData, PoolGroupData, PoolURL},
+ psu::PsuInfo,
},
traits::{miner::*, model::MinerModel},
};
@@ -193,6 +194,16 @@ impl GetDataLocations for WhatsMinerV1 {
tag: None,
},
)],
+ // PSU identity from get_psu (round 17 R5/G15). WhatsMiner exposes the
+ // model + hw/sw version but not a DC output voltage or rated envelope.
+ DataField::Psu => vec![(
+ RPC_GET_PSU,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/Msg"),
+ tag: None,
+ },
+ )],
DataField::Hashboards => vec![(
RPC_DEVS,
DataExtractor {
@@ -463,6 +474,22 @@ impl GetWattage for WhatsMinerV1 {
fn parse_wattage(&self, data: &HashMap<DataField, Value>) -> Option<Power> {
data.extract_map::<f64, _>(DataField::Wattage, Power::from_watts)
}
+
+ fn parse_psu(&self, data: &HashMap<DataField, Value>) -> Option<PsuInfo> {
+ // get_psu /Msg -> {model, hw_version, sw_version, ...} (values are strings).
+ // No DC output voltage or rated envelope is exposed, so only identity is set.
+ let d = data.get(&DataField::Psu)?;
+ let s = |k: &str| d.pointer(k).and_then(|v| v.as_str()).filter(|s| !s.is_empty()).map(str::to_string);
+ let psu = PsuInfo {
+ model: s("/model").or_else(|| s("/name")),
+ version: s("/hw_version").or_else(|| s("/sw_version")),
+ voltage_min: None,
+ voltage_max: None,
+ output_voltage: None,
+ output_current: None,
+ };
+ (psu != PsuInfo::default()).then_some(psu)
+ }
}
impl GetTuningTarget for WhatsMinerV1 {
fn parse_tuning_target(&self, data: &HashMap<DataField, Value>) -> Option<TuningTarget> {
@@ -805,8 +832,8 @@ mod integration_tests {
use super::*;
use crate::test::json::v1::{
- DEVS_COMMAND, GET_PSU_COMMAND, GET_VERSION_COMMAND, POOLS_COMMAND, STATUS_COMMAND,
- SUMMARY_COMMAND, SUMMARY_WITH_ERRORS_COMMAND,
+ DEVS_COMMAND, GET_ERROR_CODE_COMMAND, GET_PSU_COMMAND, GET_VERSION_COMMAND, POOLS_COMMAND,
+ STATUS_COMMAND, SUMMARY_COMMAND, SUMMARY_WITH_ERRORS_COMMAND,
};
#[tokio::test]
@@ -943,6 +970,13 @@ mod integration_tests {
},
Value::from_str(GET_PSU_COMMAND)?,
);
+ results.insert(
+ MinerCommand::RPC {
+ command: "get_error_code",
+ parameters: None,
+ },
+ Value::from_str(GET_ERROR_CODE_COMMAND)?,
+ );
let mock_api = MockAPIClient::new(results);
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 096b2fcb..de36a126 100644
--- a/vendor/asic-rs-firmwares-whatsminer/src/backends/v2/mod.rs
+++ b/vendor/asic-rs-firmwares-whatsminer/src/backends/v2/mod.rs
@@ -20,6 +20,7 @@ use asic_rs_core::{
message::{MessageSeverity, MinerMessage},
miner::{MiningMode, TuningTarget},
pool::{PoolData, PoolGroupData, PoolURL},
+ psu::PsuInfo,
},
traits::{miner::*, model::MinerModel},
util::is_expected_write_error,
@@ -205,6 +206,15 @@ impl GetDataLocations for WhatsMinerV2 {
tag: None,
},
)],
+ // PSU identity from get_psu (round 17 R5/G15): model + hw/sw version.
+ DataField::Psu => vec![(
+ RPC_GET_PSU,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/Msg"),
+ tag: None,
+ },
+ )],
DataField::Hashboards => vec![(
RPC_DEVS,
DataExtractor {
@@ -471,6 +481,22 @@ impl GetWattage for WhatsMinerV2 {
fn parse_wattage(&self, data: &HashMap<DataField, Value>) -> Option<Power> {
data.extract_map::<f64, _>(DataField::Wattage, Power::from_watts)
}
+
+ fn parse_psu(&self, data: &HashMap<DataField, Value>) -> Option<PsuInfo> {
+ // get_psu /Msg -> {model, hw_version, sw_version} (string values). No DC
+ // output voltage or rated envelope is exposed, so only identity is set.
+ let d = data.get(&DataField::Psu)?;
+ let s = |k: &str| d.pointer(k).and_then(|v| v.as_str()).filter(|s| !s.is_empty()).map(str::to_string);
+ let psu = PsuInfo {
+ model: s("/model").or_else(|| s("/name")),
+ version: s("/hw_version").or_else(|| s("/sw_version")),
+ voltage_min: None,
+ voltage_max: None,
+ output_voltage: None,
+ output_current: None,
+ };
+ (psu != PsuInfo::default()).then_some(psu)
+ }
}
/// Parses tuning target from V2 summary data.
/// Low/High → MiningMode, Normal/unknown/empty → Power(limit).
diff --git a/vendor/asic-rs-firmwares-whatsminer/src/test/json/v1/get_error_code.json b/vendor/asic-rs-firmwares-whatsminer/src/test/json/v1/get_error_code.json
new file mode 100644
index 00000000..1d87b18b
--- /dev/null
+++ b/vendor/asic-rs-firmwares-whatsminer/src/test/json/v1/get_error_code.json
@@ -0,0 +1,16 @@
+{
+ "Code": 131,
+ "Description": "",
+ "Msg": {
+ "error_code": [
+ {
+ "110": "2024-06-15 09:15:00"
+ },
+ {
+ "600": "2024-06-15 10:30:00"
+ }
+ ]
+ },
+ "STATUS": "S",
+ "When": 1773871985
+}
diff --git a/vendor/asic-rs-firmwares-whatsminer/src/test/json/v1/mod.rs b/vendor/asic-rs-firmwares-whatsminer/src/test/json/v1/mod.rs
index 0b3442db..c94c354f 100644
--- a/vendor/asic-rs-firmwares-whatsminer/src/test/json/v1/mod.rs
+++ b/vendor/asic-rs-firmwares-whatsminer/src/test/json/v1/mod.rs
@@ -6,4 +6,5 @@ pub(crate) const POOLS_COMMAND: &str = include_str!("pools.json");
pub(crate) const DEVS_COMMAND: &str = include_str!("devs.json");
pub(crate) const GET_VERSION_COMMAND: &str = include_str!("get_version.json");
pub(crate) const GET_PSU_COMMAND: &str = include_str!("get_psu.json");
+pub(crate) const GET_ERROR_CODE_COMMAND: &str = include_str!("get_error_code.json");
pub(crate) const SUMMARY_WITH_ERRORS_COMMAND: &str = include_str!("summary_with_errors.json");
@@ -0,0 +1,159 @@
Subject: [PATCH 0022] luxminer: named presets + set_tuning_config (roadmap G3)
LuxOS tunes by discrete named profiles. This exposes them as first-class
presets and wires the structured tuning-config setter, so the toolkit can list
and select a profile (not only map a watts number onto one via SetPowerLimit).
- SupportsPresets: supports_presets()=true and get_presets() reads the live
`profiles` RPC into PresetInfo{name, pretty="<W> W ~ <TH> TH @ <MHz> MHz",
status=IsTuned?tuned:untuned}. Never hardcoded -- the step list varies by
model and tune state. New helper parse_profiles_to_presets + unit test.
- SupportsTuningConfig: supports_tuning_config()=true and set_tuning_config
handles Preset(name) -> profileset(name) (the same privileged RPC set_power_limit
already uses, proven in patch 0017) and Power(w) -> set_power_limit; hashrate /
mining-mode / manual targets are refused with clear messages.
Verified live (read) on two production LuxOS S19j Pro (10.4.1.60 / .67): the
profile ladders and supports_tuning_config=true are reported correctly. The
write path reuses the already-proven profileset(name) call; per the parity
roadmap, LuxOS profile writes are bench-only (never on the .60/.67 production
units), so the setter is not exercised against them here.
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 a4db1e03..b5a5a73c 100644
--- a/vendor/asic-rs-firmwares-luxminer/src/backends/v1/mod.rs
+++ b/vendor/asic-rs-firmwares-luxminer/src/backends/v1/mod.rs
@@ -5,6 +5,8 @@ use asic_rs_core::{
config::{
collector::{ConfigCollector, ConfigExtractor, ConfigField, ConfigLocation},
pools::{PoolConfig, PoolGroupConfig},
+ preset::PresetInfo,
+ tuning::TuningConfig,
},
data::{
board::{BoardData, ChipData, MinerControlBoard},
@@ -1102,6 +1104,38 @@ fn parse_profile_watts(profiles: &Value) -> Vec<(String, f64)> {
.unwrap_or_default()
}
+/// Parse a LuxOS `profiles` RPC reply into the firmware's tunable presets, one
+/// per dynamic profile (round 18 / roadmap G3). The `Profile Name` is the
+/// identifier `profileset` expects; the pretty string summarises the profile's
+/// watt / hashrate / frequency operating point, and `status` reflects `IsTuned`.
+fn parse_profiles_to_presets(profiles: &Value) -> Vec<PresetInfo> {
+ profiles
+ .get("PROFILES")
+ .and_then(Value::as_array)
+ .map(|arr| {
+ arr.iter()
+ .filter_map(|p| {
+ let name = p.get("Profile Name").and_then(Value::as_str)?.to_string();
+ let watts = p.get("Watts").and_then(Value::as_f64);
+ let hashrate = p.get("Hashrate").and_then(Value::as_f64);
+ let freq = p.get("Frequency").and_then(Value::as_f64);
+ let pretty = match (watts, hashrate, freq) {
+ (Some(w), Some(h), Some(f)) => Some(format!("{w:.0} W ~ {h:.1} TH @ {f:.0} MHz")),
+ (Some(w), Some(h), None) => Some(format!("{w:.0} W ~ {h:.1} TH")),
+ (Some(w), None, _) => Some(format!("{w:.0} W")),
+ _ => None,
+ };
+ let status = p
+ .get("IsTuned")
+ .and_then(Value::as_bool)
+ .map(|t| if t { "tuned" } else { "untuned" }.to_string());
+ Some(PresetInfo { name, pretty, status })
+ })
+ .collect()
+ })
+ .unwrap_or_default()
+}
+
/// Choose the LuxOS profile name to satisfy a watts power limit: the highest-watt
/// profile that does not exceed `target_w`, or -- when the target is below every
/// profile -- the lowest-watt profile. Returns None only when there are no
@@ -1284,7 +1318,38 @@ impl Validate for LuxMinerV1 {
#[async_trait]
impl SupportsTuningConfig for LuxMinerV1 {
fn supports_tuning_config(&self) -> bool {
- false
+ true
+ }
+
+ /// LuxOS tunes by named profile (roadmap G3). A `Preset` target is applied
+ /// straight through `profileset`; a `Power` target reuses the watts->profile
+ /// mapping in `set_power_limit`. LuxOS has no hashrate/mining-mode targets and
+ /// per-board manual tuning is not wired, so those targets are refused.
+ async fn set_tuning_config(
+ &self,
+ config: TuningConfig,
+ _scaling_config: Option<asic_rs_core::config::scaling::ScalingConfig>,
+ ) -> anyhow::Result<bool> {
+ match config.target {
+ TuningTarget::Preset(name) => {
+ let resp = self.rpc.profileset(&name).await?;
+ Ok(resp
+ .pointer("/STATUS/0/STATUS")
+ .and_then(Value::as_str)
+ .map(|s| matches!(s, "S" | "I"))
+ .unwrap_or(true))
+ }
+ TuningTarget::Power(p) => self.set_power_limit(p).await,
+ TuningTarget::HashRate(_) => {
+ anyhow::bail!("LuxOS does not tune by hashrate target; select a named profile")
+ }
+ TuningTarget::MiningMode(_) => {
+ anyhow::bail!("LuxOS has no mining modes; select a named profile")
+ }
+ TuningTarget::Manual { .. } => {
+ anyhow::bail!("Per-board manual tuning is not wired for LuxOS")
+ }
+ }
}
}
@@ -1299,7 +1364,21 @@ impl SupportsTemperatureConfig for LuxMinerV1 {}
impl GetTuningPercent for LuxMinerV1 {}
impl SetTuningPercent for LuxMinerV1 {}
-impl SupportsPresets for LuxMinerV1 {}
+#[async_trait]
+impl SupportsPresets for LuxMinerV1 {
+ fn supports_presets(&self) -> bool {
+ true
+ }
+
+ /// The firmware's tunable profiles, read live from the `profiles` RPC (roadmap
+ /// G3). Never hardcoded -- the step list varies by model and tune state.
+ async fn get_presets(&self) -> Vec<PresetInfo> {
+ match self.rpc.profiles().await {
+ Ok(profiles) => parse_profiles_to_presets(&profiles),
+ Err(_) => Vec::new(),
+ }
+ }
+}
#[cfg(test)]
mod tests {
use std::sync::{Arc, Mutex};
@@ -1361,6 +1440,22 @@ mod tests {
assert!(select_profile_at_or_below(&parsed, 2500.0).is_some());
}
+ #[test]
+ fn profiles_parse_to_presets() {
+ // The `profiles` reply becomes one PresetInfo per profile (roadmap G3).
+ let profiles: Value = serde_json::from_str(PROFILES).unwrap();
+ let presets = parse_profiles_to_presets(&profiles);
+ assert_eq!(presets.len(), 25, "one preset per fixture profile");
+ // The factory point is named "default"; its pretty string carries the
+ // watt / hashrate / frequency operating point.
+ let default = presets.iter().find(|p| p.name == "default").unwrap();
+ assert_eq!(default.pretty.as_deref(), Some("2794 W ~ 121.8 TH @ 590 MHz"));
+ // IsTuned maps to the status string.
+ let tuned = presets.iter().find(|p| p.name == "290MHz").unwrap();
+ assert_eq!(tuned.status.as_deref(), Some("tuned"));
+ assert_eq!(default.status.as_deref(), Some("untuned"));
+ }
+
#[tokio::test]
async fn test_luxminer_v1() -> anyhow::Result<()> {
@@ -0,0 +1,233 @@
Subject: [PATCH 0023] telemetry: PSU serial + chip/hashboard type + best-share
Round 19 #10 telemetry extension (tier 1 -- struct-only, no new DataField, and
every command read is already fetched so there are no extra round-trips):
- PsuInfo gains a `serial` field. Braiins v26_04 parse_psu is corrected to read
the human model_name and the firmware fw_version (it had used the numeric type
code as the model and dropped fw_version entirely) and to capture serial_number.
ePIC and WhatsMiner v1/v2 report no PSU serial (left None).
- BoardData gains `chip_type` (ASIC model, e.g. "BM1370") and `hashboard_model`
(e.g. "A3HB70601"). Braiins miner/hw/hashboards populates both.
- best_share (all-time) wired for Antminer v2020 and WhatsMiner v1/v2 from the
already-fetched cgminer/btminer `summary` "Best Share"; those backends had the
empty default GetBestShare (v2023_07 already had it).
Existing fixture tests for braiins/antminer/whatsminer pass unchanged.
diff --git a/vendor/asic-rs-core/src/data/board.rs b/vendor/asic-rs-core/src/data/board.rs
index 1a2c5ead..32ce4e6a 100644
--- a/vendor/asic-rs-core/src/data/board.rs
+++ b/vendor/asic-rs-core/src/data/board.rs
@@ -90,6 +90,12 @@ pub struct BoardData {
pub tuned: Option<bool>,
/// Whether this board is enabled and actively mining
pub active: Option<bool>,
+ /// The ASIC chip type/model on this board (e.g. "BM1370"), when reported.
+ /// Not exposed by Antminer/LuxOS (their network API reports only the control
+ /// board type).
+ pub chip_type: Option<String>,
+ /// The hashboard model / part identifier (e.g. "A3HB70601"), when reported.
+ pub hashboard_model: Option<String>,
}
impl BoardData {
diff --git a/vendor/asic-rs-core/src/data/psu.rs b/vendor/asic-rs-core/src/data/psu.rs
index 810ba47c..cb73b23e 100644
--- a/vendor/asic-rs-core/src/data/psu.rs
+++ b/vendor/asic-rs-core/src/data/psu.rs
@@ -19,6 +19,8 @@ pub struct PsuInfo {
pub model: Option<String>,
/// PSU firmware/hardware version, when reported.
pub version: Option<String>,
+ /// PSU serial number, when reported (Braiins, WhatsMiner V3, VNish).
+ pub serial: Option<String>,
/// Minimum rated output voltage in volts, when reported.
pub voltage_min: Option<f64>,
/// Maximum rated output voltage in volts, when reported.
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 bd8662b1..63f819f8 100644
--- a/vendor/asic-rs-firmwares-antminer/src/backends/v2020/mod.rs
+++ b/vendor/asic-rs-firmwares-antminer/src/backends/v2020/mod.rs
@@ -499,6 +499,16 @@ impl GetDataLocations for AntMinerV2020 {
tag: None,
},
)],
+ // cgminer summary "Best Share" (all-time). RPC_SUMMARY is already
+ // fetched, so this adds no round-trip (round 19 #10).
+ DataField::BestShare => vec![(
+ RPC_SUMMARY,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/SUMMARY/0/Best Share"),
+ tag: None,
+ },
+ )],
// `total_rateideal`, by contrast, says nothing about its own
// scale, so carry STATS' `rate_unit` alongside it.
DataField::ExpectedHashrate => vec![
@@ -873,7 +883,13 @@ impl GetUptime for AntMinerV2020 {
}
}
-impl GetBestShare for AntMinerV2020 {}
+impl GetBestShare for AntMinerV2020 {
+ fn parse_best_share(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
+ // cgminer summary "Best Share" (all-time); guard against a 0 placeholder
+ // (round 19 #10).
+ data.extract::<f64>(DataField::BestShare).filter(|&v| v > 0.0)
+ }
+}
impl GetSessionBestShare for AntMinerV2020 {}
impl GetOperatingState for AntMinerV2020 {}
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 9b72ed94..22e34b0b 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
@@ -498,6 +498,16 @@ impl GetHashboards for BraiinsV2604 {
.and_then(|v| v.as_f64())
.map(Frequency::from_hertz);
board.active = chain.pointer("/enabled").and_then(|v| v.as_bool());
+ // ASIC chip model + hashboard model/part (round 19 #10 telemetry
+ // extension). BOS+ miner/hw/hashboards reports chip_type ("BM1370")
+ // and model ("A3HB70601"); board_name is the human label if present.
+ board.chip_type =
+ chain.pointer("/chip_type").and_then(|v| v.as_str()).map(str::to_string);
+ board.hashboard_model = chain
+ .pointer("/model")
+ .or_else(|| chain.pointer("/board_name"))
+ .and_then(|v| v.as_str())
+ .map(str::to_string);
}
hashboards
@@ -676,13 +686,15 @@ impl GetWattage for BraiinsV2604 {
}
fn parse_psu(&self, data: &HashMap<DataField, Value>) -> Option<PsuInfo> {
- // BOS miner/details -> psu_info {version, min_voltage.volt, max_voltage.volt}.
- // "version" is the PSU type code (117 = the APW12 ePIC also reports as model
- // 117), so expose it as the model for consistency across firmwares.
+ // BOS miner/details -> psu_info { model_name, fw_version, serial_number,
+ // version (numeric type code), min_voltage.volt, max_voltage.volt }. Read
+ // the human model_name and the firmware version (the old code used the
+ // numeric "version" type code as the model and dropped fw_version entirely).
let d = data.get(&DataField::Psu)?;
let psu = PsuInfo {
- model: d.pointer("/version").and_then(|v| v.as_i64()).map(|n| n.to_string()),
- version: None,
+ model: d.pointer("/model_name").and_then(|v| v.as_str()).map(str::to_string),
+ version: d.pointer("/fw_version").and_then(|v| v.as_i64()).map(|n| n.to_string()),
+ serial: d.pointer("/serial_number").and_then(|v| v.as_str()).map(str::to_string),
voltage_min: d.pointer("/min_voltage/volt").and_then(|v| v.as_f64()),
voltage_max: d.pointer("/max_voltage/volt").and_then(|v| v.as_f64()),
output_voltage: None,
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 3365824d..7238dc27 100644
--- a/vendor/asic-rs-firmwares-epic/src/backends/v1/mod.rs
+++ b/vendor/asic-rs-firmwares-epic/src/backends/v1/mod.rs
@@ -1128,6 +1128,7 @@ impl GetWattage for PowerPlayV1 {
let psu = PsuInfo {
model: f(info, "/PSU Type").map(|n| format!("{n:.0}")),
version: f(info, "/FW").map(|n| format!("{n:.0}")),
+ serial: None, // ePIC capabilities does not report a PSU serial
voltage_min: f(info, "/Min Vout").map(|mv| mv / 1000.0),
voltage_max: f(info, "/Max Vout").map(|mv| mv / 1000.0),
output_voltage: f(stats, "/Output Voltage"),
diff --git a/vendor/asic-rs-firmwares-sealminer/src/backends/v2025/mod.rs b/vendor/asic-rs-firmwares-sealminer/src/backends/v2025/mod.rs
index 9617da70..f71750e1 100644
--- a/vendor/asic-rs-firmwares-sealminer/src/backends/v2025/mod.rs
+++ b/vendor/asic-rs-firmwares-sealminer/src/backends/v2025/mod.rs
@@ -474,6 +474,7 @@ impl GetHashboards for SealMinerV2025 {
frequency: freq,
tuned,
active: Some(online),
+ ..Default::default()
}
})
.collect()
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 3c8512ad..eb2bdad8 100644
--- a/vendor/asic-rs-firmwares-whatsminer/src/backends/v1/mod.rs
+++ b/vendor/asic-rs-firmwares-whatsminer/src/backends/v1/mod.rs
@@ -244,6 +244,16 @@ impl GetDataLocations for WhatsMinerV1 {
tag: None,
},
)],
+ // btminer summary "Best Share" (all-time); RPC_SUMMARY already fetched
+ // (round 19 #10).
+ DataField::BestShare => vec![(
+ RPC_SUMMARY,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/SUMMARY/0/Best Share"),
+ tag: None,
+ },
+ )],
DataField::ExpectedHashrate => vec![(
RPC_SUMMARY,
DataExtractor {
@@ -483,6 +493,7 @@ impl GetWattage for WhatsMinerV1 {
let psu = PsuInfo {
model: s("/model").or_else(|| s("/name")),
version: s("/hw_version").or_else(|| s("/sw_version")),
+ serial: None, // v1/v2 get_psu does not report a serial (V3 does)
voltage_min: None,
voltage_max: None,
output_voltage: None,
@@ -548,7 +559,11 @@ impl GetUptime for WhatsMinerV1 {
}
}
-impl GetBestShare for WhatsMinerV1 {}
+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)
+ }
+}
impl GetSessionBestShare for WhatsMinerV1 {}
impl GetOperatingState for WhatsMinerV1 {}
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 de36a126..5de37579 100644
--- a/vendor/asic-rs-firmwares-whatsminer/src/backends/v2/mod.rs
+++ b/vendor/asic-rs-firmwares-whatsminer/src/backends/v2/mod.rs
@@ -255,6 +255,16 @@ impl GetDataLocations for WhatsMinerV2 {
tag: None,
},
)],
+ // btminer summary "Best Share" (all-time); RPC_SUMMARY already fetched
+ // (round 19 #10).
+ DataField::BestShare => vec![(
+ RPC_SUMMARY,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/SUMMARY/0/Best Share"),
+ tag: None,
+ },
+ )],
DataField::ExpectedHashrate => vec![(
RPC_SUMMARY,
DataExtractor {
@@ -490,6 +500,7 @@ impl GetWattage for WhatsMinerV2 {
let psu = PsuInfo {
model: s("/model").or_else(|| s("/name")),
version: s("/hw_version").or_else(|| s("/sw_version")),
+ serial: None, // v1/v2 get_psu does not report a serial (V3 does)
voltage_min: None,
voltage_max: None,
output_voltage: None,
@@ -577,7 +588,11 @@ impl GetUptime for WhatsMinerV2 {
}
}
-impl GetBestShare for WhatsMinerV2 {}
+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)
+ }
+}
impl GetSessionBestShare for WhatsMinerV2 {}
impl GetOperatingState for WhatsMinerV2 {}
@@ -0,0 +1,93 @@
Subject: [PATCH 0024] whatsminer v3 PSU serial + epic chip/hashboard type
Round 19 #10 telemetry extension, tier 1 sub-batch B. Both fields ride existing
DataFields (Psu / Hashboards) on commands the collector already fetches, so there
are no extra round-trips, and both reuse the PsuInfo.serial and
BoardData.chip_type/hashboard_model fields added in patch 0023 -- no core or GUI
change, the existing columns just populate for more firmwares.
- WhatsMiner V3: add a DataField::Psu location (get.device.info /msg/power) and a
parse_psu that reads model/type, sw/hwversion and the serial (sn). V3 carried
no PSU parse at all (default None) even though /msg/power is already fetched for
the PSU fan.
- ePIC: parse_hashboards now reads capabilities "Chip Type" (e.g. "BM1366") and
"Model Subtype" (e.g. "BHB56801") and applies them to every board (capabilities
reports them miner-wide). The capabilities command is already fetched for
hashboards.
Existing fixture tests for whatsminer/epic pass unchanged.
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 7238dc27..2abb0706 100644
--- a/vendor/asic-rs-firmwares-epic/src/backends/v1/mod.rs
+++ b/vendor/asic-rs-firmwares-epic/src/backends/v1/mod.rs
@@ -797,6 +797,21 @@ impl GetHashboards for PowerPlayV1 {
.pointer("/Capabilities/Performance Estimator/Hashes Per Second Per Chip")
.and_then(|v| v.as_f64());
+ // ASIC chip type + hashboard model from capabilities (round 19 #10);
+ // capabilities reports them miner-wide, so apply to every board.
+ let chip_type =
+ api_data.pointer("/Capabilities/Chip Type").and_then(|v| v.as_str()).map(str::to_string);
+ let hashboard_model = api_data
+ .pointer("/Capabilities/Model Subtype")
+ .and_then(|v| v.as_str())
+ .map(str::to_string);
+ if chip_type.is_some() || hashboard_model.is_some() {
+ for board in &mut hashboards {
+ board.chip_type = chip_type.clone();
+ board.hashboard_model = hashboard_model.clone();
+ }
+ }
+
// Active status
if let Some(boards) = api_data
.pointer("/Summary/HBStatus")
diff --git a/vendor/asic-rs-firmwares-whatsminer/src/backends/v3/mod.rs b/vendor/asic-rs-firmwares-whatsminer/src/backends/v3/mod.rs
index c00c6d44..930abe38 100644
--- a/vendor/asic-rs-firmwares-whatsminer/src/backends/v3/mod.rs
+++ b/vendor/asic-rs-firmwares-whatsminer/src/backends/v3/mod.rs
@@ -21,6 +21,7 @@ use asic_rs_core::{
message::{MessageSeverity, MinerMessage},
miner::{MiningMode, TuningTarget},
pool::{PoolData, PoolGroupData, PoolURL},
+ psu::PsuInfo,
},
traits::{miner::*, model::MinerModel},
util::is_expected_write_error,
@@ -235,6 +236,16 @@ impl GetDataLocations for WhatsMinerV3 {
tag: None,
},
)],
+ // PSU identity block (round 19 #10): get.device.info /msg/power carries
+ // model/type, sw/hwversion and the serial (sn). Already fetched.
+ DataField::Psu => vec![(
+ RPC_GET_DEVICE_INFO,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/msg/power"),
+ tag: None,
+ },
+ )],
DataField::Hashboards => vec![
(
RPC_GET_DEVICE_INFO,
@@ -509,6 +520,18 @@ impl GetWattage for WhatsMinerV3 {
fn parse_wattage(&self, data: &HashMap<DataField, Value>) -> Option<Power> {
data.extract_map::<f64, _>(DataField::Wattage, Power::from_watts)
}
+ fn parse_psu(&self, data: &HashMap<DataField, Value>) -> Option<PsuInfo> {
+ // get.device.info /msg/power: model/type, sw/hwversion, sn (round 19 #10).
+ let d = data.get(&DataField::Psu)?;
+ let s = |k: &str| d.pointer(k).and_then(|v| v.as_str()).filter(|s| !s.is_empty()).map(str::to_string);
+ let psu = PsuInfo {
+ model: s("/model").or_else(|| s("/type")),
+ version: s("/swversion").or_else(|| s("/hwversion")),
+ serial: s("/sn"),
+ ..Default::default()
+ };
+ (psu != PsuInfo::default()).then_some(psu)
+ }
}
/// Parses tuning target from V3 tagged data (mode from get.device.info, limit from summary).
/// Mode "0" (Low) / "2" (High) → MiningMode, "1" (Normal) / unknown → Power(limit).
@@ -0,0 +1,491 @@
Subject: [PATCH 0025] telemetry: rolling average hashrate windows (1m/5m/15m/24h)
Round 19 #10 telemetry extension, tier 2. Exposes the rolling average hashrate
windows the GUI wanted (1m/5m/15m/24h).
- New HashrateAverages sub-struct (data/hashrate.rs): avg_1m/5m/15m/24h, each an
Option<HashRate> carrying the same unit and algorithm as the current hashrate.
- New DataField::HashrateAverages; MinerData gains hashrate_averages.
- The windows ride the EXISTING GetHashrate trait via a defaulted
parse_hashrate_averages method (default None), so no new supertrait bound and no
empty impl per backend; only backends that expose the data override it, and
parse_data wires it in.
- Backends (each reads a command the collector already fetches, so no extra
round-trips; each window is filtered to > 0 and the struct is dropped when every
window is absent):
- WhatsMiner V1: btminer summary MHS 1m/5m/15m (MegaHash); no 24h.
- WhatsMiner V3: get.miner.status summary hash-1min / hash-15min (TeraHash).
- LuxOS: summary GHS 1m/5m/15m/24h (GigaHash) -- full window set.
- Braiins v25_07 + v26_04: miner_stats real_hashrate last_1m/5m/15m/24h.
- Antminer, WhatsMiner V2, ePIC, VNish, sealminer expose no standard 1/5/15
window (fixtures confirm) and inherit None.
Fixture tests for whatsminer v1 and braiins v26_04 assert the parsed windows.
diff --git a/vendor/asic-rs-core/src/data/collector.rs b/vendor/asic-rs-core/src/data/collector.rs
index d1456548..5899c039 100644
--- a/vendor/asic-rs-core/src/data/collector.rs
+++ b/vendor/asic-rs-core/src/data/collector.rs
@@ -56,6 +56,9 @@ pub enum DataField {
/// Expected hashrate for the miner.
#[cfg_attr(feature = "python", pydantic(value = "ExpectedHashrate"))]
ExpectedHashrate,
+ /// Rolling average hashrate windows (1m/5m/15m/24h) reported by the miner.
+ #[cfg_attr(feature = "python", pydantic(value = "HashrateAverages"))]
+ HashrateAverages,
/// Fan speed or fan configuration.
#[cfg_attr(feature = "python", pydantic(value = "Fans"))]
Fans,
diff --git a/vendor/asic-rs-core/src/data/hashrate.rs b/vendor/asic-rs-core/src/data/hashrate.rs
index 3e3ff9ab..6107745d 100644
--- a/vendor/asic-rs-core/src/data/hashrate.rs
+++ b/vendor/asic-rs-core/src/data/hashrate.rs
@@ -318,3 +318,32 @@ impl Div<HashRate> for Power {
self.as_watts() / hash_rate.value
}
}
+
+/// Rolling average hashrate over standard time windows, as reported by firmware.
+///
+/// Each window is optional; a backend fills in only the windows its firmware
+/// exposes. The 24h window is reported by Braiins only. Every value carries the
+/// same unit and mining algorithm as the miner's current hashrate.
+#[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 HashrateAverages {
+ /// Average hashrate over the last minute, when reported.
+ pub avg_1m: Option<HashRate>,
+ /// Average hashrate over the last 5 minutes, when reported.
+ pub avg_5m: Option<HashRate>,
+ /// Average hashrate over the last 15 minutes, when reported.
+ pub avg_15m: Option<HashRate>,
+ /// Average hashrate over the last 24 hours, when reported (Braiins only).
+ pub avg_24h: Option<HashRate>,
+}
+
+impl HashrateAverages {
+ /// True when no window is populated.
+ pub fn is_empty(&self) -> bool {
+ self.avg_1m.is_none()
+ && self.avg_5m.is_none()
+ && self.avg_15m.is_none()
+ && self.avg_24h.is_none()
+ }
+}
diff --git a/vendor/asic-rs-core/src/data/miner.rs b/vendor/asic-rs-core/src/data/miner.rs
index b2b8a578..38c7f3be 100644
--- a/vendor/asic-rs-core/src/data/miner.rs
+++ b/vendor/asic-rs-core/src/data/miner.rs
@@ -12,7 +12,7 @@ use super::{
capabilities::TuningCapabilities,
device::DeviceInfo,
fan::FanData,
- hashrate::HashRate,
+ hashrate::{HashRate, HashrateAverages},
message::MinerMessage,
operating_state::OperatingState,
pool::PoolGroupData,
@@ -165,6 +165,8 @@ pub struct MinerData {
pub hashboards: Vec<BoardData>,
/// The current hashrate of the miner
pub hashrate: Option<HashRate>,
+ /// Rolling average hashrate windows (1m/5m/15m/24h), when reported
+ pub hashrate_averages: Option<HashrateAverages>,
/// The expected hashrate of the miner
pub expected_hashrate: Option<HashRate>,
/// The total expected number of chips across all boards on this miner
diff --git a/vendor/asic-rs-core/src/traits/miner.rs b/vendor/asic-rs-core/src/traits/miner.rs
index db1ba653..cfabb624 100644
--- a/vendor/asic-rs-core/src/traits/miner.rs
+++ b/vendor/asic-rs-core/src/traits/miner.rs
@@ -28,7 +28,7 @@ use crate::{
device::DeviceInfo,
fan::FanData,
firmware::{FirmwareImage, FirmwareStats},
- hashrate::{HashRate, HashRateUnit},
+ hashrate::{HashRate, HashRateUnit, HashrateAverages},
message::MinerMessage,
miner::{MinerData, TuningTarget},
operating_state::OperatingState,
@@ -271,6 +271,7 @@ impl<
let control_board_version = self.parse_control_board_version(&data);
let uptime = self.parse_uptime(&data);
let hashrate = self.parse_hashrate(&data);
+ let hashrate_averages = self.parse_hashrate_averages(&data);
let expected_hashrate = self.parse_expected_hashrate(&data);
let wattage = self.parse_wattage(&data);
let psu = self.parse_psu(&data);
@@ -353,6 +354,7 @@ impl<
expected_hashboards: device_info.hardware.board_count(),
hashboards,
hashrate,
+ hashrate_averages,
expected_hashrate,
// Chip information
@@ -632,6 +634,20 @@ pub trait GetHashrate: CollectData {
fn parse_hashrate(&self, data: &HashMap<DataField, Value>) -> Option<HashRate> {
None
}
+ #[tracing::instrument(level = "debug")]
+ async fn get_hashrate_averages(&self) -> Option<HashrateAverages> {
+ let mut collector = self.get_collector();
+ let data = collector
+ .collect(&[DataField::HashrateAverages, DataField::Hashrate])
+ .await;
+ self.parse_hashrate_averages(&data)
+ }
+ /// Rolling average hashrate windows. Backends that expose them override this;
+ /// the values carry the same unit and algorithm as the current hashrate.
+ #[allow(unused_variables)]
+ fn parse_hashrate_averages(&self, data: &HashMap<DataField, Value>) -> Option<HashrateAverages> {
+ None
+ }
}
// Expected Hashrate
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 57c0c2c7..7e07967f 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
@@ -16,7 +16,7 @@ use asic_rs_core::{
command::MinerCommand,
device::{DeviceInfo, HashAlgorithm},
fan::FanData,
- hashrate::{HashRate, HashRateUnit},
+ hashrate::{HashRate, HashRateUnit, HashrateAverages},
message::{MessageSeverity, MinerMessage},
miner::TuningTarget,
operating_state::OperatingState,
@@ -204,6 +204,16 @@ impl GetDataLocations for BraiinsV2507 {
tag: None,
},
)],
+ // Rolling averages from miner_stats real_hashrate (round 19 #10, T2);
+ // command already fetched. Braiins reports the full 1m/5m/15m/24h set.
+ DataField::HashrateAverages => vec![(
+ WEB_MINER_STATS,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/miner_stats/real_hashrate"),
+ tag: None,
+ },
+ )],
DataField::ExpectedHashrate => vec![(
WEB_MINER_DETAILS,
DataExtractor {
@@ -494,6 +504,31 @@ impl GetHashrate for BraiinsV2507 {
.as_unit(HashRateUnit::default())
})
}
+ fn parse_hashrate_averages(&self, data: &HashMap<DataField, Value>) -> Option<HashrateAverages> {
+ // miner_stats real_hashrate last_1m/5m/15m/24h (GigaHash); full window set
+ // (round 19 #10).
+ let d = data.get(&DataField::HashrateAverages)?;
+ let ghs = |k: &str| {
+ d.pointer(&format!("/{k}/gigahash_per_second"))
+ .and_then(|v| v.as_f64())
+ .filter(|&f| f > 0.0)
+ .map(|f| {
+ HashRate {
+ value: f,
+ unit: HashRateUnit::GigaHash,
+ algo: self.device_info.algo,
+ }
+ .as_unit(HashRateUnit::default())
+ })
+ };
+ let avgs = HashrateAverages {
+ avg_1m: ghs("last_1m"),
+ avg_5m: ghs("last_5m"),
+ avg_15m: ghs("last_15m"),
+ avg_24h: ghs("last_24h"),
+ };
+ (!avgs.is_empty()).then_some(avgs)
+ }
}
impl GetExpectedHashrate 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 22e34b0b..2f5be88c 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
@@ -17,7 +17,7 @@ use asic_rs_core::{
device::{DeviceInfo, HashAlgorithm},
fan::FanData,
firmware::{FirmwareStats, FirmwareUpdate},
- hashrate::{HashRate, HashRateUnit},
+ hashrate::{HashRate, HashRateUnit, HashrateAverages},
message::{MessageSeverity, MinerMessage},
miner::TuningTarget,
operating_state::OperatingState,
@@ -207,6 +207,16 @@ impl GetDataLocations for BraiinsV2604 {
tag: None,
},
)],
+ // Rolling averages from miner_stats real_hashrate (round 19 #10, T2);
+ // command already fetched. Braiins reports the full 1m/5m/15m/24h set.
+ DataField::HashrateAverages => vec![(
+ WEB_MINER_STATS,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/miner_stats/real_hashrate"),
+ tag: None,
+ },
+ )],
DataField::ExpectedHashrate => vec![(
WEB_MINER_DETAILS,
DataExtractor {
@@ -525,6 +535,31 @@ impl GetHashrate for BraiinsV2604 {
.as_unit(HashRateUnit::default())
})
}
+ fn parse_hashrate_averages(&self, data: &HashMap<DataField, Value>) -> Option<HashrateAverages> {
+ // miner_stats real_hashrate last_1m/5m/15m/24h (GigaHash); full window set
+ // (round 19 #10).
+ let d = data.get(&DataField::HashrateAverages)?;
+ let ghs = |k: &str| {
+ d.pointer(&format!("/{k}/gigahash_per_second"))
+ .and_then(|v| v.as_f64())
+ .filter(|&f| f > 0.0)
+ .map(|f| {
+ HashRate {
+ value: f,
+ unit: HashRateUnit::GigaHash,
+ algo: self.device_info.algo,
+ }
+ .as_unit(HashRateUnit::default())
+ })
+ };
+ let avgs = HashrateAverages {
+ avg_1m: ghs("last_1m"),
+ avg_5m: ghs("last_5m"),
+ avg_15m: ghs("last_15m"),
+ avg_24h: ghs("last_24h"),
+ };
+ (!avgs.is_empty()).then_some(avgs)
+ }
}
impl GetExpectedHashrate for BraiinsV2604 {
@@ -1241,6 +1276,17 @@ mod tests {
assert_eq!(miner_data.pools[0].len(), 2);
assert!(miner_data.hashrate.is_some());
assert!(miner_data.expected_hashrate.is_some());
+ // Rolling averages: miner_stats real_hashrate last_1m/5m/15m/24h (GigaHash);
+ // Braiins reports the full window set (round 19 #10, T2).
+ let avgs = miner_data
+ .hashrate_averages
+ .expect("braiins exposes rolling averages");
+ assert!(avgs.avg_1m.is_some() && avgs.avg_5m.is_some());
+ assert!(avgs.avg_15m.is_some() && avgs.avg_24h.is_some());
+ if let Some(hr) = &avgs.avg_1m {
+ assert_eq!(hr.unit, HashRateUnit::TeraHash);
+ assert!((hr.value - 247.3507543407177).abs() < 1e-3);
+ }
}
#[test]
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 b5a5a73c..a75a3f97 100644
--- a/vendor/asic-rs-firmwares-luxminer/src/backends/v1/mod.rs
+++ b/vendor/asic-rs-firmwares-luxminer/src/backends/v1/mod.rs
@@ -16,7 +16,7 @@ use asic_rs_core::{
command::MinerCommand,
device::{DeviceInfo, HashAlgorithm},
fan::FanData,
- hashrate::{HashRate, HashRateUnit},
+ hashrate::{HashRate, HashRateUnit, HashrateAverages},
message::{MessageSeverity, MinerMessage},
miner::TuningTarget,
pool::{PoolData, PoolGroupData, PoolURL},
@@ -537,6 +537,16 @@ impl GetDataLocations for LuxMinerV1 {
tag: None,
},
)],
+ // LuxOS summary exposes full rolling windows GHS 1m/5m/15m/24h
+ // (GigaHash); RPC_SUMMARY is already fetched (round 19 #10, T2).
+ DataField::HashrateAverages => vec![(
+ RPC_SUMMARY,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/SUMMARY/0"),
+ tag: None,
+ },
+ )],
DataField::ExpectedHashrate => vec![(
RPC_DEVS,
DataExtractor {
@@ -843,6 +853,30 @@ impl GetHashrate for LuxMinerV1 {
.as_unit(HashRateUnit::default())
})
}
+ fn parse_hashrate_averages(&self, data: &HashMap<DataField, Value>) -> Option<HashrateAverages> {
+ // LuxOS summary GHS 1m/5m/15m/24h (GigaHash); full window set (round 19 #10).
+ let d = data.get(&DataField::HashrateAverages)?;
+ let ghs = |k: &str| {
+ d.pointer(k)
+ .and_then(|v| v.as_f64())
+ .filter(|&f| f > 0.0)
+ .map(|f| {
+ HashRate {
+ value: f,
+ unit: HashRateUnit::GigaHash,
+ algo: self.device_info.algo,
+ }
+ .as_unit(HashRateUnit::default())
+ })
+ };
+ let avgs = HashrateAverages {
+ avg_1m: ghs("/GHS 1m"),
+ avg_5m: ghs("/GHS 5m"),
+ avg_15m: ghs("/GHS 15m"),
+ avg_24h: ghs("/GHS 24h"),
+ };
+ (!avgs.is_empty()).then_some(avgs)
+ }
}
impl GetExpectedHashrate for LuxMinerV1 {
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 eb2bdad8..584ae8d1 100644
--- a/vendor/asic-rs-firmwares-whatsminer/src/backends/v1/mod.rs
+++ b/vendor/asic-rs-firmwares-whatsminer/src/backends/v1/mod.rs
@@ -14,7 +14,7 @@ use asic_rs_core::{
command::MinerCommand,
device::{DeviceInfo, HashAlgorithm},
fan::FanData,
- hashrate::{HashRate, HashRateUnit},
+ hashrate::{HashRate, HashRateUnit, HashrateAverages},
message::{MessageSeverity, MinerMessage},
miner::TuningTarget,
pool::{PoolData, PoolGroupData, PoolURL},
@@ -244,6 +244,16 @@ impl GetDataLocations for WhatsMinerV1 {
tag: None,
},
)],
+ // Rolling average windows from btminer summary (round 19 #10, T2);
+ // RPC_SUMMARY is already fetched.
+ DataField::HashrateAverages => vec![(
+ RPC_SUMMARY,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/SUMMARY/0"),
+ tag: None,
+ },
+ )],
// btminer summary "Best Share" (all-time); RPC_SUMMARY already fetched
// (round 19 #10).
DataField::BestShare => vec![(
@@ -429,6 +439,30 @@ impl GetHashrate for WhatsMinerV1 {
.as_unit(HashRateUnit::default())
})
}
+ fn parse_hashrate_averages(&self, data: &HashMap<DataField, Value>) -> Option<HashrateAverages> {
+ // btminer summary MHS 1m/5m/15m (MegaHash); no 24h window (round 19 #10).
+ let d = data.get(&DataField::HashrateAverages)?;
+ let mhs = |k: &str| {
+ d.pointer(k)
+ .and_then(|v| v.as_f64())
+ .filter(|&f| f > 0.0)
+ .map(|f| {
+ HashRate {
+ value: f,
+ unit: HashRateUnit::MegaHash,
+ algo: self.device_info.algo,
+ }
+ .as_unit(HashRateUnit::default())
+ })
+ };
+ let avgs = HashrateAverages {
+ avg_1m: mhs("/MHS 1m"),
+ avg_5m: mhs("/MHS 5m"),
+ avg_15m: mhs("/MHS 15m"),
+ avg_24h: None,
+ };
+ (!avgs.is_empty()).then_some(avgs)
+ }
}
impl GetExpectedHashrate for WhatsMinerV1 {
fn parse_expected_hashrate(&self, data: &HashMap<DataField, Value>) -> Option<HashRate> {
@@ -924,6 +958,17 @@ mod integration_tests {
algo: HashAlgorithm::SHA256,
})
);
+ // Rolling averages: btminer summary MHS 1m/5m/15m (MegaHash), no 24h window
+ // (round 19 #10, T2).
+ let avgs = miner_data
+ .hashrate_averages
+ .ok_or_else(|| anyhow::anyhow!("v1 should expose rolling averages"))?;
+ assert!(avgs.avg_1m.is_some() && avgs.avg_5m.is_some() && avgs.avg_15m.is_some());
+ assert!(avgs.avg_24h.is_none());
+ if let Some(hr) = &avgs.avg_1m {
+ assert_eq!(hr.unit, HashRateUnit::TeraHash);
+ assert!((hr.value - 67.43935249).abs() < 1e-6);
+ }
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/v3/mod.rs b/vendor/asic-rs-firmwares-whatsminer/src/backends/v3/mod.rs
index 930abe38..04608936 100644
--- a/vendor/asic-rs-firmwares-whatsminer/src/backends/v3/mod.rs
+++ b/vendor/asic-rs-firmwares-whatsminer/src/backends/v3/mod.rs
@@ -17,7 +17,7 @@ use asic_rs_core::{
command::MinerCommand,
device::{DeviceInfo, HashAlgorithm},
fan::FanData,
- hashrate::{HashRate, HashRateUnit},
+ hashrate::{HashRate, HashRateUnit, HashrateAverages},
message::{MessageSeverity, MinerMessage},
miner::{MiningMode, TuningTarget},
pool::{PoolData, PoolGroupData, PoolURL},
@@ -296,6 +296,16 @@ impl GetDataLocations for WhatsMinerV3 {
tag: None,
},
)],
+ // Rolling averages from get.miner.status summary (round 19 #10, T2);
+ // command already fetched. V3 exposes 1min and 15min only.
+ DataField::HashrateAverages => vec![(
+ rpc_get_miner_status_summary,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/msg/summary"),
+ tag: None,
+ },
+ )],
DataField::ExpectedHashrate => vec![(
rpc_get_miner_status_summary,
DataExtractor {
@@ -465,6 +475,31 @@ impl GetHashrate for WhatsMinerV3 {
.as_unit(HashRateUnit::default())
})
}
+ fn parse_hashrate_averages(&self, data: &HashMap<DataField, Value>) -> Option<HashrateAverages> {
+ // get.miner.status summary hash-1min / hash-15min (TeraHash); V3 reports
+ // no 5m or 24h window (round 19 #10).
+ let d = data.get(&DataField::HashrateAverages)?;
+ let ths = |k: &str| {
+ d.pointer(k)
+ .and_then(|v| v.as_f64())
+ .filter(|&f| f > 0.0)
+ .map(|f| {
+ HashRate {
+ value: f,
+ unit: HashRateUnit::TeraHash,
+ algo: self.device_info.algo,
+ }
+ .as_unit(HashRateUnit::default())
+ })
+ };
+ let avgs = HashrateAverages {
+ avg_1m: ths("/hash-1min"),
+ avg_5m: None,
+ avg_15m: ths("/hash-15min"),
+ avg_24h: None,
+ };
+ (!avgs.is_empty()).then_some(avgs)
+ }
}
impl GetExpectedHashrate for WhatsMinerV3 {
fn parse_expected_hashrate(&self, data: &HashMap<DataField, Value>) -> Option<HashRate> {
@@ -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);
@@ -0,0 +1,136 @@
Subject: [PATCH 0028] telemetry: board temperature thresholds (critical / shutdown)
Round 19 #10 telemetry extension, tier 3. Exposes the board temperature safety
thresholds ("board dangerous temp" from item #10).
- New DataField::TemperatureLimits; MinerData gains temp_critical and temp_shutdown
(Celsius). Rides the EXISTING GetFluidTemperature trait via a defaulted
parse_temperature_limits method returning (critical, shutdown), so no new
supertrait bound; only backends that expose the thresholds override it.
- ePIC: summary /Misc Critical Temp + Shutdown Temp (already-fetched summary).
Antminer/WhatsMiner do not expose thresholds; LuxOS needs an unwired tempctrl
command (no fixture) and VNish/Braiins need live verification -> left for a
live-verified pass, all inherit (None, None).
Fixture test for epic asserts the parsed thresholds.
diff --git a/vendor/asic-rs-core/src/data/collector.rs b/vendor/asic-rs-core/src/data/collector.rs
index 07d9d571..1e6e7e9d 100644
--- a/vendor/asic-rs-core/src/data/collector.rs
+++ b/vendor/asic-rs-core/src/data/collector.rs
@@ -65,6 +65,9 @@ pub enum DataField {
/// Miner-level fan duty cycle as a percentage (0-100).
#[cfg_attr(feature = "python", pydantic(value = "FanSpeedPercent"))]
FanSpeedPercent,
+ /// Board temperature safety thresholds (critical / shutdown), in Celsius.
+ #[cfg_attr(feature = "python", pydantic(value = "TemperatureLimits"))]
+ TemperatureLimits,
/// 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 6dc73d26..08782856 100644
--- a/vendor/asic-rs-core/src/data/miner.rs
+++ b/vendor/asic-rs-core/src/data/miner.rs
@@ -181,6 +181,10 @@ pub struct MinerData {
/// 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>,
+ /// Board critical temperature threshold in Celsius, when reported (round 19 #10).
+ pub temp_critical: Option<f64>,
+ /// Board shutdown temperature threshold in Celsius, when reported (round 19 #10).
+ pub temp_shutdown: 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 baac9387..9de51761 100644
--- a/vendor/asic-rs-core/src/traits/miner.rs
+++ b/vendor/asic-rs-core/src/traits/miner.rs
@@ -282,6 +282,7 @@ impl<
let tuning_capabilities = self.parse_tuning_capabilities(&data);
let fluid_temperature = self.parse_fluid_temperature(&data);
let outlet_fluid_temperature = self.parse_outlet_fluid_temperature(&data);
+ let (temp_critical, temp_shutdown) = self.parse_temperature_limits(&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);
@@ -368,6 +369,8 @@ impl<
expected_fans: device_info.hardware.fans,
fans,
fan_speed_percent,
+ temp_critical,
+ temp_shutdown,
psu_fans,
average_temperature,
fluid_temperature,
@@ -741,6 +744,15 @@ pub trait GetFluidTemperature: CollectData {
) -> Option<Temperature> {
None
}
+ /// Board temperature safety thresholds as (critical, shutdown) in Celsius.
+ /// Backends that expose them override this; others return (None, None).
+ #[allow(unused_variables)]
+ fn parse_temperature_limits(
+ &self,
+ data: &HashMap<DataField, Value>,
+ ) -> (Option<f64>, Option<f64>) {
+ (None, None)
+ }
}
// Wattage
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 16c7872b..0c9a851b 100644
--- a/vendor/asic-rs-firmwares-epic/src/backends/v1/mod.rs
+++ b/vendor/asic-rs-firmwares-epic/src/backends/v1/mod.rs
@@ -482,6 +482,16 @@ impl GetDataLocations for PowerPlayV1 {
tag: None,
},
)],
+ // Board temperature thresholds (round 19 #10, T3); summary /Misc carries
+ // Critical Temp and Shutdown Temp. Already fetched.
+ DataField::TemperatureLimits => vec![(
+ WEB_SUMMARY,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/Misc"),
+ tag: None,
+ },
+ )],
DataField::Hashboards => vec![
(
WEB_TEMPS,
@@ -1139,7 +1149,21 @@ impl GetFans for PowerPlayV1 {
impl GetPsuFans for PowerPlayV1 {}
impl GetTuningCapabilities for PowerPlayV1 {}
-impl GetFluidTemperature for PowerPlayV1 {}
+impl GetFluidTemperature for PowerPlayV1 {
+ fn parse_temperature_limits(
+ &self,
+ data: &HashMap<DataField, Value>,
+ ) -> (Option<f64>, Option<f64>) {
+ // ePIC summary /Misc: Critical Temp + Shutdown Temp (round 19 #10, T3).
+ let d = data.get(&DataField::TemperatureLimits);
+ let f = |k: &str| {
+ d.and_then(|v| v.pointer(k))
+ .and_then(|v| v.as_f64())
+ .filter(|v| v.is_finite() && *v > 0.0)
+ };
+ (f("/Critical Temp"), f("/Shutdown Temp"))
+ }
+}
impl GetWattage for PowerPlayV1 {
fn parse_wattage(&self, data: &HashMap<DataField, Value>) -> Option<Power> {
@@ -2205,6 +2229,9 @@ mod tests {
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));
+ // Board temp thresholds from summary /Misc (round 19 #10, T3).
+ assert_eq!(miner_data.temp_critical, Some(100.0));
+ assert_eq!(miner_data.temp_shutdown, Some(85.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);
@@ -0,0 +1,378 @@
Subject: [PATCH 0029] telemetry: board temp thresholds -> target/hot/dangerous (LuxOS, Braiins; remap ePIC)
Round 19 #10, tier 3. Remodels the board temperature thresholds to the
target/hot/dangerous scheme from item #10 and adds the LuxOS and Braiins backends.
Supersedes the ePIC-only critical/shutdown model from patch 0028.
- MinerData: temp_critical/temp_shutdown -> temp_target/temp_hot/temp_dangerous.
parse_temperature_limits (on the existing GetFluidTemperature trait) now returns
(target, hot, dangerous).
- LuxOS: new tempctrl RPC command; ChipTarget/ChipHot/ChipDangerous
(live-verified 83/93/100, fixture tempctrl.json).
- Braiins v25_07 + v26_04: configuration/constraints cooling_constraints defaults
target/hot/dangerous (live-verified 60/80/90, fixture configuration_constraints.json;
WEB_CONSTRAINTS already fetched).
- ePIC remap: Shutdown Temp -> hot, Critical Temp -> dangerous, no target.
- Antminer/WhatsMiner expose no thresholds; VNish handled separately (settings auth).
Fixture tests for epic, luxminer, braiins v26_04 assert the parsed thresholds.
diff --git a/vendor/asic-rs-core/src/data/miner.rs b/vendor/asic-rs-core/src/data/miner.rs
index 08782856..9f74fc43 100644
--- a/vendor/asic-rs-core/src/data/miner.rs
+++ b/vendor/asic-rs-core/src/data/miner.rs
@@ -181,10 +181,12 @@ pub struct MinerData {
/// 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>,
- /// Board critical temperature threshold in Celsius, when reported (round 19 #10).
- pub temp_critical: Option<f64>,
- /// Board shutdown temperature threshold in Celsius, when reported (round 19 #10).
- pub temp_shutdown: Option<f64>,
+ /// Board target temperature threshold in Celsius, when reported (round 19 #10).
+ pub temp_target: Option<f64>,
+ /// Board hot temperature threshold in Celsius, when reported (round 19 #10).
+ pub temp_hot: Option<f64>,
+ /// Board dangerous temperature threshold in Celsius, when reported (round 19 #10).
+ pub temp_dangerous: 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 9de51761..25ea6168 100644
--- a/vendor/asic-rs-core/src/traits/miner.rs
+++ b/vendor/asic-rs-core/src/traits/miner.rs
@@ -282,7 +282,7 @@ impl<
let tuning_capabilities = self.parse_tuning_capabilities(&data);
let fluid_temperature = self.parse_fluid_temperature(&data);
let outlet_fluid_temperature = self.parse_outlet_fluid_temperature(&data);
- let (temp_critical, temp_shutdown) = self.parse_temperature_limits(&data);
+ let (temp_target, temp_hot, temp_dangerous) = self.parse_temperature_limits(&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);
@@ -369,8 +369,9 @@ impl<
expected_fans: device_info.hardware.fans,
fans,
fan_speed_percent,
- temp_critical,
- temp_shutdown,
+ temp_target,
+ temp_hot,
+ temp_dangerous,
psu_fans,
average_temperature,
fluid_temperature,
@@ -744,14 +745,14 @@ pub trait GetFluidTemperature: CollectData {
) -> Option<Temperature> {
None
}
- /// Board temperature safety thresholds as (critical, shutdown) in Celsius.
- /// Backends that expose them override this; others return (None, None).
+ /// Board temperature safety thresholds as (target, hot, dangerous) in Celsius.
+ /// Backends that expose them override this; others return (None, None, None).
#[allow(unused_variables)]
fn parse_temperature_limits(
&self,
data: &HashMap<DataField, Value>,
- ) -> (Option<f64>, Option<f64>) {
- (None, None)
+ ) -> (Option<f64>, Option<f64>, Option<f64>) {
+ (None, None, None)
}
}
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 86e84d8c..0dec8d38 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
@@ -372,6 +372,16 @@ impl GetDataLocations for BraiinsV2507 {
tag: None,
},
)],
+ // Board temp thresholds (round 19 #10, T3): cooling_constraints defaults
+ // (target/hot/dangerous); WEB_CONSTRAINTS already fetched.
+ DataField::TemperatureLimits => vec![(
+ WEB_CONSTRAINTS,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/cooling_constraints"),
+ tag: None,
+ },
+ )],
_ => vec![],
}
}
@@ -725,7 +735,26 @@ impl GetScaledTuningTarget for BraiinsV2507 {
}
}
-impl GetFluidTemperature for BraiinsV2507 {}
+impl GetFluidTemperature for BraiinsV2507 {
+ fn parse_temperature_limits(
+ &self,
+ data: &HashMap<DataField, Value>,
+ ) -> (Option<f64>, Option<f64>, Option<f64>) {
+ // Braiins cooling_constraints target/hot/dangerous default thresholds in
+ // degree_c (round 19 #10, T3).
+ let d = data.get(&DataField::TemperatureLimits);
+ let f = |k: &str| {
+ d.and_then(|v| v.pointer(&format!("/{k}/default/degree_c")))
+ .and_then(|v| v.as_f64())
+ .filter(|v| v.is_finite() && *v > 0.0)
+ };
+ (
+ f("target_temperature"),
+ f("hot_temperature"),
+ f("dangerous_temperature"),
+ )
+ }
+}
impl GetTuningCapabilities for BraiinsV2507 {
fn parse_tuning_capabilities(
&self,
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 303fca49..4e423e5b 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
@@ -393,6 +393,16 @@ impl GetDataLocations for BraiinsV2604 {
tag: None,
},
)],
+ // Board temp thresholds (round 19 #10, T3): cooling_constraints defaults
+ // (target/hot/dangerous); WEB_CONSTRAINTS already fetched.
+ DataField::TemperatureLimits => vec![(
+ WEB_CONSTRAINTS,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/cooling_constraints"),
+ tag: None,
+ },
+ )],
_ => vec![],
}
}
@@ -775,7 +785,26 @@ impl GetScaledTuningTarget for BraiinsV2604 {
}
}
-impl GetFluidTemperature for BraiinsV2604 {}
+impl GetFluidTemperature for BraiinsV2604 {
+ fn parse_temperature_limits(
+ &self,
+ data: &HashMap<DataField, Value>,
+ ) -> (Option<f64>, Option<f64>, Option<f64>) {
+ // Braiins cooling_constraints target/hot/dangerous default thresholds in
+ // degree_c (round 19 #10, T3).
+ let d = data.get(&DataField::TemperatureLimits);
+ let f = |k: &str| {
+ d.and_then(|v| v.pointer(&format!("/{k}/default/degree_c")))
+ .and_then(|v| v.as_f64())
+ .filter(|v| v.is_finite() && *v > 0.0)
+ };
+ (
+ f("target_temperature"),
+ f("hot_temperature"),
+ f("dangerous_temperature"),
+ )
+ }
+}
impl GetTuningCapabilities for BraiinsV2604 {
fn parse_tuning_capabilities(
&self,
@@ -1167,10 +1196,10 @@ mod tests {
use super::*;
use crate::test::json::v26_04::{
- WEB_COOLING_STATE_COMMAND, WEB_HASHBOARDS_COMMAND, WEB_LOCATE_COMMAND,
- WEB_MINER_CONFIGURATION_COMMAND, WEB_MINER_DETAILS_COMMAND, WEB_MINER_STATS_COMMAND,
- WEB_NETWORK_COMMAND, WEB_PERFORMANCE_TUNER_STATE_COMMAND, WEB_POOLS_COMMAND,
- WEB_VERSION_COMMAND,
+ WEB_CONSTRAINTS_COMMAND, WEB_COOLING_STATE_COMMAND, WEB_HASHBOARDS_COMMAND,
+ WEB_LOCATE_COMMAND, WEB_MINER_CONFIGURATION_COMMAND, WEB_MINER_DETAILS_COMMAND,
+ WEB_MINER_STATS_COMMAND, WEB_NETWORK_COMMAND, WEB_PERFORMANCE_TUNER_STATE_COMMAND,
+ WEB_POOLS_COMMAND, WEB_VERSION_COMMAND,
};
#[tokio::test]
@@ -1251,6 +1280,13 @@ mod tests {
},
Value::from_str(WEB_HASHBOARDS_COMMAND).unwrap(),
);
+ results.insert(
+ MinerCommand::WebAPI {
+ command: "configuration/constraints",
+ parameters: None,
+ },
+ Value::from_str(WEB_CONSTRAINTS_COMMAND).unwrap(),
+ );
results.insert(
MinerCommand::WebAPI {
command: "actions/locate",
@@ -1313,6 +1349,10 @@ mod tests {
// 19 #10, T3).
let fan_pct = miner_data.fan_speed_percent.expect("braiins fan duty");
assert!((fan_pct - 92.0).abs() < 1e-6);
+ // Board temp thresholds from cooling_constraints defaults (round 19 #10, T3).
+ assert_eq!(miner_data.temp_target, Some(60.0));
+ assert_eq!(miner_data.temp_hot, Some(80.0));
+ assert_eq!(miner_data.temp_dangerous, Some(90.0));
}
#[test]
diff --git a/vendor/asic-rs-firmwares-braiins/src/test/json/v26_04/mod.rs b/vendor/asic-rs-firmwares-braiins/src/test/json/v26_04/mod.rs
index 06b35fef..3904b012 100644
--- a/vendor/asic-rs-firmwares-braiins/src/test/json/v26_04/mod.rs
+++ b/vendor/asic-rs-firmwares-braiins/src/test/json/v26_04/mod.rs
@@ -12,3 +12,4 @@ pub(crate) const WEB_POOLS_COMMAND: &str = include_str!("pools.json");
pub(crate) const WEB_COOLING_STATE_COMMAND: &str = include_str!("cooling_state.json");
pub(crate) const WEB_HASHBOARDS_COMMAND: &str = include_str!("miner_hw_hashboards.json");
pub(crate) const WEB_LOCATE_COMMAND: &str = include_str!("actions_locate.json");
+pub(crate) const WEB_CONSTRAINTS_COMMAND: &str = include_str!("configuration_constraints.json");
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 0c9a851b..2e12e07a 100644
--- a/vendor/asic-rs-firmwares-epic/src/backends/v1/mod.rs
+++ b/vendor/asic-rs-firmwares-epic/src/backends/v1/mod.rs
@@ -1153,15 +1153,16 @@ impl GetFluidTemperature for PowerPlayV1 {
fn parse_temperature_limits(
&self,
data: &HashMap<DataField, Value>,
- ) -> (Option<f64>, Option<f64>) {
- // ePIC summary /Misc: Critical Temp + Shutdown Temp (round 19 #10, T3).
+ ) -> (Option<f64>, Option<f64>, Option<f64>) {
+ // ePIC summary /Misc: Shutdown Temp (hot) + Critical Temp (dangerous); no
+ // target threshold reported (round 19 #10, T3).
let d = data.get(&DataField::TemperatureLimits);
let f = |k: &str| {
d.and_then(|v| v.pointer(k))
.and_then(|v| v.as_f64())
.filter(|v| v.is_finite() && *v > 0.0)
};
- (f("/Critical Temp"), f("/Shutdown Temp"))
+ (None, f("/Shutdown Temp"), f("/Critical Temp"))
}
}
@@ -2229,9 +2230,11 @@ mod tests {
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));
- // Board temp thresholds from summary /Misc (round 19 #10, T3).
- assert_eq!(miner_data.temp_critical, Some(100.0));
- assert_eq!(miner_data.temp_shutdown, Some(85.0));
+ // Board temp thresholds from summary /Misc (round 19 #10, T3): Shutdown->hot,
+ // Critical->dangerous, no target.
+ assert_eq!(miner_data.temp_target, None);
+ assert_eq!(miner_data.temp_hot, Some(85.0));
+ assert_eq!(miner_data.temp_dangerous, 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 edab7c4c..de9c2d35 100644
--- a/vendor/asic-rs-firmwares-luxminer/src/backends/v1/mod.rs
+++ b/vendor/asic-rs-firmwares-luxminer/src/backends/v1/mod.rs
@@ -278,6 +278,11 @@ impl GetDataLocations for LuxMinerV1 {
parameters: None,
};
+ const RPC_TEMPCTRL: MinerCommand = MinerCommand::RPC {
+ command: "tempctrl",
+ parameters: None,
+ };
+
match data_field {
DataField::Mac => vec![(
RPC_CONFIG,
@@ -305,6 +310,16 @@ impl GetDataLocations for LuxMinerV1 {
tag: None,
},
)],
+ // Board temp thresholds (round 19 #10, T3): LuxOS tempctrl reports
+ // ChipTarget / ChipHot / ChipDangerous.
+ DataField::TemperatureLimits => vec![(
+ RPC_TEMPCTRL,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/TEMPCTRL/0"),
+ tag: None,
+ },
+ )],
DataField::ApiVersion => vec![(
RPC_VERSION,
DataExtractor {
@@ -690,6 +705,20 @@ impl GetFluidTemperature for LuxMinerV1 {
(None, None) => None,
}
}
+ fn parse_temperature_limits(
+ &self,
+ data: &HashMap<DataField, Value>,
+ ) -> (Option<f64>, Option<f64>, Option<f64>) {
+ // LuxOS tempctrl chip thresholds ChipTarget / ChipHot / ChipDangerous
+ // (round 19 #10, T3).
+ let d = data.get(&DataField::TemperatureLimits);
+ let f = |k: &str| {
+ d.and_then(|v| v.get(k))
+ .and_then(|v| v.as_f64())
+ .filter(|v| v.is_finite() && *v > 0.0)
+ };
+ (f("ChipTarget"), f("ChipHot"), f("ChipDangerous"))
+ }
}
impl GetFirmwareVersion for LuxMinerV1 {
@@ -1465,7 +1494,8 @@ mod tests {
use super::*;
use crate::test::json::v1::{
CONFIG, DEVS, EVENTS, FANS, HEALTHCHIPGET_0, HEALTHCHIPGET_1, HEALTHCHIPGET_2, POOLS,
- POWER, PROFILES, STATS, SUMMARY, TEMPS, VERSION, VOLTAGEGET_0, VOLTAGEGET_1, VOLTAGEGET_2,
+ POWER, PROFILES, STATS, SUMMARY, TEMPCTRL, TEMPS, VERSION, VOLTAGEGET_0, VOLTAGEGET_1,
+ VOLTAGEGET_2,
};
#[test]
@@ -1582,6 +1612,11 @@ mod tests {
parameters: None,
};
+ let tempctrl_cmd = MinerCommand::RPC {
+ command: "tempctrl",
+ parameters: None,
+ };
+
results.insert(version_cmd, Value::from_str(VERSION)?);
results.insert(stats_cmd, Value::from_str(STATS)?);
results.insert(summary_cmd, Value::from_str(SUMMARY)?);
@@ -1591,6 +1626,7 @@ mod tests {
results.insert(power_cmd, Value::from_str(POWER)?);
results.insert(profiles_cmd, Value::from_str(PROFILES)?);
results.insert(temps_cmd, Value::from_str(TEMPS)?);
+ results.insert(tempctrl_cmd, Value::from_str(TEMPCTRL)?);
results.insert(devs_cmd, Value::from_str(DEVS)?);
results.insert(
MinerCommand::RPC {
@@ -1704,6 +1740,11 @@ mod tests {
// 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));
+ // Board temp thresholds from tempctrl ChipTarget/ChipHot/ChipDangerous
+ // (round 19 #10, T3).
+ assert_eq!(miner_data.temp_target, Some(83.0));
+ assert_eq!(miner_data.temp_hot, Some(93.0));
+ assert_eq!(miner_data.temp_dangerous, Some(100.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);
diff --git a/vendor/asic-rs-firmwares-luxminer/src/test/json/v1/mod.rs b/vendor/asic-rs-firmwares-luxminer/src/test/json/v1/mod.rs
index 7f328a47..02500ccb 100644
--- a/vendor/asic-rs-firmwares-luxminer/src/test/json/v1/mod.rs
+++ b/vendor/asic-rs-firmwares-luxminer/src/test/json/v1/mod.rs
@@ -10,6 +10,7 @@ pub(crate) const PROFILES: &str = include_str!("profiles.json");
pub(crate) const STATS: &str = include_str!("stats.json");
pub(crate) const SUMMARY: &str = include_str!("summary.json");
pub(crate) const TEMPS: &str = include_str!("temps.json");
+pub(crate) const TEMPCTRL: &str = include_str!("tempctrl.json");
pub(crate) const VERSION: &str = include_str!("version.json");
pub(crate) const EVENTS: &str = include_str!("events.json");
@@ -0,0 +1,364 @@
Subject: [PATCH 0030] telemetry: VNish fan% + temp thresholds; WhatsMiner chip type
Round 19 #10, tier 3 live-verified follow-up. Populates existing columns for more
firmwares; no core or GUI change.
- VNish (v1_2_0 + v1_3_0): fan duty % from summary /miner/cooling/fan_duty; board
temp thresholds from settings (restart_temp -> dangerous, auto cooling mode param
-> target; no hot). Both commands already fetched. Live-verified on 10.4.1.50
(fan_duty 81, restart_temp 90, auto param 65). VNish exposes no PSU serial
(factory-info absent) so it stays None.
- WhatsMiner chip type (per noah, do not drop): v1/v2 summary "Chip Data" merged
into the hashboards data -> BoardData.chip_type (first token, e.g. "HP5A01-19101436");
v3 get.device.info chipdataN -> chip_type and hash-board ("K40") -> hashboard_model.
Live WhatsMiner summaries often omit "Chip Data" (populates where present); v3
chip data is live on newer units.
Fixture tests: whatsminer v1/v3 assert chip_type/hashboard_model; vnish asserts the
parsed fan % and temp thresholds.
diff --git a/vendor/asic-rs-firmwares-vnish/src/backends/v1_2_0/mod.rs b/vendor/asic-rs-firmwares-vnish/src/backends/v1_2_0/mod.rs
index e734a03e..ad2779b6 100644
--- a/vendor/asic-rs-firmwares-vnish/src/backends/v1_2_0/mod.rs
+++ b/vendor/asic-rs-firmwares-vnish/src/backends/v1_2_0/mod.rs
@@ -369,6 +369,25 @@ impl GetDataLocations for VnishV120 {
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("/miner/cooling/fan_duty"),
+ tag: None,
+ },
+ )],
+ // Board temp thresholds (round 19 #10, T3): settings restart_temp
+ // (dangerous) + auto cooling target. Settings already fetched.
+ DataField::TemperatureLimits => vec![(
+ WEB_SETTINGS,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/miner"),
+ tag: None,
+ },
+ )],
_ => vec![],
}
}
@@ -678,6 +697,12 @@ impl GetFans for VnishV120 {
fans
}
+ fn parse_fan_speed_percent(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
+ // VNish summary /miner/cooling/fan_duty is a miner-level duty % (round 19 #10).
+ data.get(&DataField::FanSpeedPercent)
+ .and_then(|v| v.as_f64())
+ .filter(|v| v.is_finite() && *v >= 0.0)
+ }
}
impl GetPsuFans for VnishV120 {}
@@ -766,6 +791,26 @@ impl GetFluidTemperature for VnishV120 {
.max()
.map(|t| Temperature::from_celsius(t as f64))
}
+ fn parse_temperature_limits(
+ &self,
+ data: &HashMap<DataField, Value>,
+ ) -> (Option<f64>, Option<f64>, Option<f64>) {
+ // VNish settings: restart_temp is the dangerous threshold; the auto cooling
+ // mode "param" is the target temperature. No hot threshold (round 19 #10, T3).
+ let m = data.get(&DataField::TemperatureLimits);
+ let dangerous = m
+ .and_then(|v| v.pointer("/misc/restart_temp"))
+ .and_then(|v| v.as_f64())
+ .filter(|v| v.is_finite() && *v > 0.0);
+ let target = m
+ .filter(|v| {
+ v.pointer("/cooling/settings/mode/name").and_then(|n| n.as_str()) == Some("auto")
+ })
+ .and_then(|v| v.pointer("/cooling/settings/mode/param"))
+ .and_then(|v| v.as_f64())
+ .filter(|v| v.is_finite() && *v > 0.0);
+ (target, None, dangerous)
+ }
}
impl GetWattage for VnishV120 {
diff --git a/vendor/asic-rs-firmwares-vnish/src/backends/v1_3_0/mod.rs b/vendor/asic-rs-firmwares-vnish/src/backends/v1_3_0/mod.rs
index 0a5d694e..4f0453a1 100644
--- a/vendor/asic-rs-firmwares-vnish/src/backends/v1_3_0/mod.rs
+++ b/vendor/asic-rs-firmwares-vnish/src/backends/v1_3_0/mod.rs
@@ -375,6 +375,26 @@ impl GetDataLocations for VnishV130 {
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("/miner/cooling/fan_duty"),
+ tag: None,
+ },
+ )],
+ // Board temp thresholds (round 19 #10, T3): settings /miner/misc/restart_temp
+ // (dangerous) + auto cooling target (/miner/cooling/settings/mode/param).
+ // Settings already fetched for the tuning preset.
+ DataField::TemperatureLimits => vec![(
+ WEB_SETTINGS,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/miner"),
+ tag: None,
+ },
+ )],
_ => vec![],
}
}
@@ -683,6 +703,12 @@ impl GetFans for VnishV130 {
fans
}
+ fn parse_fan_speed_percent(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
+ // VNish summary /miner/cooling/fan_duty is a miner-level duty % (round 19 #10).
+ data.get(&DataField::FanSpeedPercent)
+ .and_then(|v| v.as_f64())
+ .filter(|v| v.is_finite() && *v >= 0.0)
+ }
}
impl GetPsuFans for VnishV130 {}
@@ -716,6 +742,26 @@ impl GetFluidTemperature for VnishV130 {
.max()
.map(|t| Temperature::from_celsius(t as f64))
}
+ fn parse_temperature_limits(
+ &self,
+ data: &HashMap<DataField, Value>,
+ ) -> (Option<f64>, Option<f64>, Option<f64>) {
+ // VNish settings: restart_temp is the dangerous threshold; the auto cooling
+ // mode "param" is the target temperature. No hot threshold (round 19 #10, T3).
+ let m = data.get(&DataField::TemperatureLimits);
+ let dangerous = m
+ .and_then(|v| v.pointer("/misc/restart_temp"))
+ .and_then(|v| v.as_f64())
+ .filter(|v| v.is_finite() && *v > 0.0);
+ let target = m
+ .filter(|v| {
+ v.pointer("/cooling/settings/mode/name").and_then(|n| n.as_str()) == Some("auto")
+ })
+ .and_then(|v| v.pointer("/cooling/settings/mode/param"))
+ .and_then(|v| v.as_f64())
+ .filter(|v| v.is_finite() && *v > 0.0);
+ (target, None, dangerous)
+ }
}
impl GetWattage for VnishV130 {
@@ -1354,6 +1400,28 @@ mod tests {
);
}
+ /// Fan duty cycle (summary /miner/cooling/fan_duty) and board temp thresholds
+ /// (settings restart_temp -> dangerous, auto cooling param -> target); round 19
+ /// #10, T3. Values match the live 10.4.1.50 fleet unit.
+ #[test]
+ fn fan_duty_and_temp_thresholds() {
+ let miner = VnishV130::new(IpAddr::from([127, 0, 0, 1]), AntMinerModel::S19jPro);
+ let mut data: HashMap<DataField, Value> = HashMap::new();
+ data.insert(DataField::FanSpeedPercent, json!(81));
+ data.insert(
+ DataField::TemperatureLimits,
+ json!({
+ "misc": { "restart_temp": 90 },
+ "cooling": { "settings": { "mode": { "name": "auto", "param": 65 } } }
+ }),
+ );
+ assert_eq!(miner.parse_fan_speed_percent(&data), Some(81.0));
+ assert_eq!(
+ miner.parse_temperature_limits(&data),
+ (Some(65.0), None, Some(90.0))
+ );
+ }
+
/// An L9 is a Scrypt miner and VNish says so in `/info`, both in
/// `algorithm` and by reporting `hr_measure: MH/s`. Before this was wired
/// up it came back as a SHA-256 miner and every figure was read as GH/s,
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 aacd1077..4025a931 100644
--- a/vendor/asic-rs-firmwares-whatsminer/src/backends/v1/mod.rs
+++ b/vendor/asic-rs-firmwares-whatsminer/src/backends/v1/mod.rs
@@ -205,14 +205,26 @@ impl GetDataLocations for WhatsMinerV1 {
tag: None,
},
)],
- DataField::Hashboards => vec![(
- RPC_DEVS,
- DataExtractor {
- func: get_by_pointer,
- key: Some(""),
- tag: None,
- },
- )],
+ DataField::Hashboards => vec![
+ (
+ RPC_DEVS,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some(""),
+ tag: None,
+ },
+ ),
+ // Merge in summary so "Chip Data" (miner-wide chip marking) is
+ // available per board (round 19 #10); RPC_SUMMARY already fetched.
+ (
+ RPC_SUMMARY,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/SUMMARY/0"),
+ tag: None,
+ },
+ ),
+ ],
DataField::Pools => vec![(
RPC_POOLS,
DataExtractor {
@@ -436,6 +448,20 @@ impl GetHashboards for WhatsMinerV1 {
);
}
+ // Chip marking from the merged summary "Chip Data" (miner-wide, first
+ // token), applied to every board (round 19 #10).
+ let chip_type = hashboard_data
+ .pointer("/Chip Data")
+ .and_then(|v| v.as_str())
+ .and_then(|s| s.split_whitespace().next())
+ .filter(|s| !s.is_empty())
+ .map(str::to_string);
+ if chip_type.is_some() {
+ for board in hashboards.iter_mut() {
+ board.chip_type = chip_type.clone();
+ }
+ }
+
hashboards
}
}
@@ -992,6 +1018,12 @@ mod integration_tests {
assert_eq!(shares.difficulty_rejected, Some(0.0));
assert_eq!(shares.stale_shares, Some(0));
assert_eq!(shares.found_blocks, Some(0));
+ // Chip marking from summary "Chip Data" first token (round 19 #10).
+ assert!(!miner_data.hashboards.is_empty());
+ assert_eq!(
+ miner_data.hashboards[0].chip_type.as_deref(),
+ Some("HP5A01-19101436")
+ );
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 4cfcee19..2b340e28 100644
--- a/vendor/asic-rs-firmwares-whatsminer/src/backends/v2/mod.rs
+++ b/vendor/asic-rs-firmwares-whatsminer/src/backends/v2/mod.rs
@@ -216,14 +216,26 @@ impl GetDataLocations for WhatsMinerV2 {
tag: None,
},
)],
- DataField::Hashboards => vec![(
- RPC_DEVS,
- DataExtractor {
- func: get_by_pointer,
- key: Some(""),
- tag: None,
- },
- )],
+ DataField::Hashboards => vec![
+ (
+ RPC_DEVS,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some(""),
+ tag: None,
+ },
+ ),
+ // Merge in summary so "Chip Data" (miner-wide chip marking) is
+ // available per board (round 19 #10); RPC_SUMMARY already fetched.
+ (
+ RPC_SUMMARY,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/SUMMARY/0"),
+ tag: None,
+ },
+ ),
+ ],
DataField::Pools => vec![(
RPC_POOLS,
DataExtractor {
@@ -433,6 +445,20 @@ impl GetHashboards for WhatsMinerV2 {
);
}
+ // Chip marking from the merged summary "Chip Data" (miner-wide, first
+ // token), applied to every board (round 19 #10).
+ let chip_type = hashboard_data
+ .pointer("/Chip Data")
+ .and_then(|v| v.as_str())
+ .and_then(|s| s.split_whitespace().next())
+ .filter(|s| !s.is_empty())
+ .map(str::to_string);
+ if chip_type.is_some() {
+ for board in hashboards.iter_mut() {
+ board.chip_type = chip_type.clone();
+ }
+ }
+
hashboards
}
}
diff --git a/vendor/asic-rs-firmwares-whatsminer/src/backends/v3/mod.rs b/vendor/asic-rs-firmwares-whatsminer/src/backends/v3/mod.rs
index 04608936..77a1c6ec 100644
--- a/vendor/asic-rs-firmwares-whatsminer/src/backends/v3/mod.rs
+++ b/vendor/asic-rs-firmwares-whatsminer/src/backends/v3/mod.rs
@@ -459,6 +459,19 @@ impl GetHashboards for WhatsMinerV3 {
.map(|h| h.value > 0.0)
.unwrap_or(false),
);
+ // Chip marking (per-board chipdataN, first token) + hashboard model
+ // (miner-wide hash-board, e.g. "K40") from get.device.info (round 19 #10).
+ board.chip_type = hashboard_data
+ .pointer(&format!("/chipdata{idx}"))
+ .and_then(|v| v.as_str())
+ .and_then(|s| s.split_whitespace().next())
+ .filter(|s| !s.is_empty())
+ .map(str::to_string);
+ board.hashboard_model = hashboard_data
+ .pointer("/hash-board")
+ .and_then(|v| v.as_str())
+ .filter(|s| !s.is_empty())
+ .map(str::to_string);
}
hashboards
@@ -1241,6 +1254,17 @@ mod integration_tests {
assert!(miner_data.is_mining);
assert_eq!(miner_data.fans.len(), 2);
assert_eq!(miner_data.pools[0].len(), 3);
+ // Chip marking (chipdataN first token) + hashboard model (hash-board);
+ // round 19 #10.
+ assert!(!miner_data.hashboards.is_empty());
+ assert_eq!(
+ miner_data.hashboards[0].chip_type.as_deref(),
+ Some("K8EC374-2426")
+ );
+ assert_eq!(
+ miner_data.hashboards[0].hashboard_model.as_deref(),
+ Some("K40")
+ );
Ok(())
}
@@ -0,0 +1,237 @@
Subject: [PATCH 0031] telemetry: auto-tuner status (Braiins, ePIC)
Round 19 #10, tier 3. Exposes the auto-tuner status as a human-readable label.
- New DataField::TunerStatus; MinerData gains tuner_status (Option<String>).
Rides the existing GetOperatingState trait via a defaulted parse_tuner_status
method (no supertrait bound); parse_data wires it in.
- Braiins v25_07 + v26_04: performance/tuner-state overall_tuner_state, mapped
through the BOS+ TunerState enum (bos-plus-api performance.proto: 1 Disabled,
2 Stable, 3 Tuning, 4 Error, 5 Continuous, 6 Preheat). Command already fetched.
- ePIC: summary PerpetualTune -> "Off" (not running), "Optimized" (settled) or
"Tuning" (running, not yet optimized). Summary already fetched.
- WhatsMiner/Antminer/LuxOS/VNish report no distinct tuner status -> None.
Fixture tests: braiins v26_04 asserts "Continuous" (state 5), epic asserts "Tuning".
diff --git a/vendor/asic-rs-core/src/data/collector.rs b/vendor/asic-rs-core/src/data/collector.rs
index 1e6e7e9d..8f9b4c9c 100644
--- a/vendor/asic-rs-core/src/data/collector.rs
+++ b/vendor/asic-rs-core/src/data/collector.rs
@@ -68,6 +68,9 @@ pub enum DataField {
/// Board temperature safety thresholds (critical / shutdown), in Celsius.
#[cfg_attr(feature = "python", pydantic(value = "TemperatureLimits"))]
TemperatureLimits,
+ /// Auto-tuner status (a human-readable label, e.g. "Stable", "Tuning").
+ #[cfg_attr(feature = "python", pydantic(value = "TunerStatus"))]
+ TunerStatus,
/// 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 9f74fc43..8832a049 100644
--- a/vendor/asic-rs-core/src/data/miner.rs
+++ b/vendor/asic-rs-core/src/data/miner.rs
@@ -236,6 +236,9 @@ pub struct MinerData {
#[serde(default)]
#[cfg_attr(feature = "python", pydantic(default = None))]
pub operating_state: Option<OperatingState>,
+ /// Auto-tuner status as a human-readable label (round 19 #10), when reported:
+ /// e.g. "Stable"/"Tuning" (Braiins), "Optimized"/"Tuning"/"Off" (ePIC).
+ pub tuner_status: Option<String>,
/// The current pools configured on the miner
pub pools: Vec<PoolGroupData>,
/// Difficulty of the best share found over the miner's lifetime, when reported.
diff --git a/vendor/asic-rs-core/src/traits/miner.rs b/vendor/asic-rs-core/src/traits/miner.rs
index 25ea6168..397b2e8c 100644
--- a/vendor/asic-rs-core/src/traits/miner.rs
+++ b/vendor/asic-rs-core/src/traits/miner.rs
@@ -290,6 +290,7 @@ impl<
let light_flashing = self.parse_light_flashing(&data);
let is_mining = self.parse_is_mining(&data);
let operating_state = self.parse_operating_state(&data);
+ let tuner_status = self.parse_tuner_status(&data);
let messages = self.parse_messages(&data);
let pools = self.parse_pools(&data);
let best_share = self.parse_best_share(&data);
@@ -392,6 +393,7 @@ impl<
uptime,
is_mining,
operating_state,
+ tuner_status,
pools,
best_share,
@@ -914,6 +916,18 @@ pub trait GetOperatingState: CollectData {
fn parse_operating_state(&self, data: &HashMap<DataField, Value>) -> Option<OperatingState> {
None
}
+ #[tracing::instrument(level = "debug")]
+ async fn get_tuner_status(&self) -> Option<String> {
+ let mut collector = self.get_collector();
+ let data = collector.collect(&[DataField::TunerStatus]).await;
+ self.parse_tuner_status(&data)
+ }
+ /// Auto-tuner status as a human-readable label. Backends that expose it override
+ /// this; others return None.
+ #[allow(unused_variables)]
+ fn parse_tuner_status(&self, data: &HashMap<DataField, Value>) -> Option<String> {
+ None
+ }
}
// Pools
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 0dec8d38..f5937521 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
@@ -272,6 +272,16 @@ impl GetDataLocations for BraiinsV2507 {
tag: None,
},
)],
+ // Auto-tuner status (round 19 #10, T3): performance/tuner-state
+ // overall_tuner_state enum; command already fetched.
+ DataField::TunerStatus => vec![(
+ WEB_PERFORMANCE_TUNER_STATE,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/overall_tuner_state"),
+ tag: None,
+ },
+ )],
DataField::Uptime => vec![(
WEB_MINER_DETAILS,
DataExtractor {
@@ -630,6 +640,21 @@ impl GetOperatingState for BraiinsV2507 {
},
})
}
+ fn parse_tuner_status(&self, data: &HashMap<DataField, Value>) -> Option<String> {
+ // BOS+ TunerState enum (bos-plus-api performance.proto): 1 Disabled,
+ // 2 Stable, 3 Tuning, 4 Error, 5 Continuous, 6 Preheat (round 19 #10, T3).
+ Some(match data.get(&DataField::TunerStatus)?.as_u64()? {
+ 0 => return None,
+ 1 => "Disabled",
+ 2 => "Stable",
+ 3 => "Tuning",
+ 4 => "Error",
+ 5 => "Continuous",
+ 6 => "Preheat",
+ _ => return None,
+ })
+ .map(str::to_string)
+ }
}
impl GetIsMining 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 4e423e5b..07afc871 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
@@ -275,6 +275,16 @@ impl GetDataLocations for BraiinsV2604 {
tag: None,
},
)],
+ // Auto-tuner status (round 19 #10, T3): performance/tuner-state
+ // overall_tuner_state enum; command already fetched.
+ DataField::TunerStatus => vec![(
+ WEB_PERFORMANCE_TUNER_STATE,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/overall_tuner_state"),
+ tag: None,
+ },
+ )],
DataField::Uptime => vec![(
WEB_MINER_DETAILS,
DataExtractor {
@@ -667,6 +677,21 @@ impl GetOperatingState for BraiinsV2604 {
},
})
}
+ fn parse_tuner_status(&self, data: &HashMap<DataField, Value>) -> Option<String> {
+ // BOS+ TunerState enum (bos-plus-api performance.proto): 1 Disabled,
+ // 2 Stable, 3 Tuning, 4 Error, 5 Continuous, 6 Preheat (round 19 #10, T3).
+ Some(match data.get(&DataField::TunerStatus)?.as_u64()? {
+ 0 => return None,
+ 1 => "Disabled",
+ 2 => "Stable",
+ 3 => "Tuning",
+ 4 => "Error",
+ 5 => "Continuous",
+ 6 => "Preheat",
+ _ => return None,
+ })
+ .map(str::to_string)
+ }
}
impl GetIsMining for BraiinsV2604 {
@@ -1353,6 +1378,8 @@ mod tests {
assert_eq!(miner_data.temp_target, Some(60.0));
assert_eq!(miner_data.temp_hot, Some(80.0));
assert_eq!(miner_data.temp_dangerous, Some(90.0));
+ // Auto-tuner status: overall_tuner_state 5 -> Continuous (round 19 #10, T3).
+ assert_eq!(miner_data.tuner_status.as_deref(), Some("Continuous"));
}
#[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 2e12e07a..e0df43e3 100644
--- a/vendor/asic-rs-firmwares-epic/src/backends/v1/mod.rs
+++ b/vendor/asic-rs-firmwares-epic/src/backends/v1/mod.rs
@@ -594,6 +594,16 @@ impl GetDataLocations for PowerPlayV1 {
tag: None,
},
)],
+ // Auto-tuner status (round 19 #10, T3): PowerPlay PerpetualTune; summary
+ // already fetched.
+ DataField::TunerStatus => vec![(
+ WEB_SUMMARY,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/PerpetualTune"),
+ tag: None,
+ },
+ )],
DataField::LightFlashing => vec![(
WEB_SUMMARY,
DataExtractor {
@@ -1408,6 +1418,28 @@ impl GetOperatingState for PowerPlayV1 {
.and_then(Value::as_str)
.and_then(OperatingState::from_label)
}
+ fn parse_tuner_status(&self, data: &HashMap<DataField, Value>) -> Option<String> {
+ // ePIC PerpetualTune: Running gates it; the per-algorithm Optimized flag
+ // distinguishes a settled tune from an in-progress one (round 19 #10, T3).
+ let pt = data.get(&DataField::TunerStatus)?;
+ if !pt.pointer("/Running").and_then(|v| v.as_bool()).unwrap_or(false) {
+ return Some("Off".to_string());
+ }
+ let optimized = pt
+ .pointer("/Algorithm")
+ .and_then(|v| v.as_object())
+ .and_then(|algos| {
+ algos
+ .values()
+ .filter_map(|a| a.pointer("/Optimized").and_then(|v| v.as_bool()))
+ .next()
+ });
+ Some(match optimized {
+ Some(true) => "Optimized",
+ _ => "Tuning",
+ })
+ .map(str::to_string)
+ }
}
impl GetIsMining for PowerPlayV1 {
@@ -2235,6 +2267,8 @@ mod tests {
assert_eq!(miner_data.temp_target, None);
assert_eq!(miner_data.temp_hot, Some(85.0));
assert_eq!(miner_data.temp_dangerous, Some(100.0));
+ // Auto-tuner: PerpetualTune Running=true, Optimized=false -> Tuning (T3).
+ assert_eq!(miner_data.tuner_status.as_deref(), Some("Tuning"));
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);
@@ -0,0 +1,283 @@
Subject: [PATCH 0032] telemetry: vnish per-hashboard fault messages
Round 20 #1. VNish previously surfaced only a single miner-level state message
(board 0, no component), so per-hashboard faults landed on the control-board
(brain) tooltip instead of the board they name, and the Health column could not
red the specific faulted hashboard.
- DataField::Messages now also collects /miner/chains from the summary (tagged),
alongside /miner/miner_status (now tagged "miner_status"). The summary chains
carry per-chain diagnostics the /chains endpoint omits: chip_statuses
{red,orange,grey} and status.state.
- parse_messages emits one MinerMessage per faulted board, attributed to
MinerComponent::HashBoard { idx } (chain ids are 1-based; board positions
0-based): red chip(s) -> Error, a non-normal chain state with no failed chips
-> Error (state text), orange chip(s) -> Warning. Healthy boards (all grey,
state "mining") produce no message, so no false faults on good miners.
- Applied to both v1_3_0 and v1_2_0 backends. Verified live against healthy
WildRose/VNish S21 miners (10.7.1.x): all chains grey/mining -> zero messages.
diff --git a/vendor/asic-rs-firmwares-vnish/src/backends/v1_2_0/mod.rs b/vendor/asic-rs-firmwares-vnish/src/backends/v1_2_0/mod.rs
index ad2779b6..85011853 100644
--- a/vendor/asic-rs-firmwares-vnish/src/backends/v1_2_0/mod.rs
+++ b/vendor/asic-rs-firmwares-vnish/src/backends/v1_2_0/mod.rs
@@ -20,7 +20,7 @@ use asic_rs_core::{
device::DeviceInfo,
fan::FanData,
hashrate::{HashRate, HashRateUnit},
- message::{MessageSeverity, MinerMessage},
+ message::{MessageSeverity, MinerComponent, MinerMessage},
miner::TuningTarget,
operating_state::OperatingState,
pool::{PoolData, PoolGroupData, PoolURL},
@@ -353,14 +353,26 @@ impl GetDataLocations for VnishV120 {
tag: None,
},
)],
- DataField::Messages => vec![(
- WEB_SUMMARY,
- DataExtractor {
- func: get_by_pointer,
- key: Some("/miner/miner_status"),
- tag: None,
- },
- )],
+ DataField::Messages => vec![
+ (
+ WEB_SUMMARY,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/miner/miner_status"),
+ tag: Some("miner_status"),
+ },
+ ),
+ // Per-hashboard diagnostics (chip status buckets + per-chain state)
+ // for per-board fault messages in parse_messages.
+ (
+ WEB_SUMMARY,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/miner/chains"),
+ tag: Some("chains"),
+ },
+ ),
+ ],
DataField::TuningTarget => vec![(
WEB_SETTINGS,
DataExtractor {
@@ -850,9 +862,12 @@ impl GetMessages for VnishV120 {
/// reported here rather than computed from invented thresholds.
fn parse_messages(&self, data: &HashMap<DataField, Value>) -> Vec<MinerMessage> {
let mut messages = Vec::new();
+ let msg = data.get(&DataField::Messages);
- if let Some(status) = data.get(&DataField::Messages)
- && let Some(state) = status.pointer("/miner_state").and_then(|v| v.as_str())
+ // Miner-level state verdict (now under the "miner_status" tag).
+ if let Some(state) = msg
+ .and_then(|v| v.pointer("/miner_status/miner_state"))
+ .and_then(|v| v.as_str())
{
let normal = matches!(
state.to_lowercase().as_str(),
@@ -872,6 +887,68 @@ impl GetMessages for VnishV120 {
}
}
+ // Per-hashboard faults from the summary chains (round 20 #1). VNish reports
+ // per-chip status buckets (`red` = failed, `orange` = degraded, `grey` =
+ // healthy) and a per-chain state; attribute each fault to its own board so
+ // the Health column reds the right hashboard icon and that icon's tooltip
+ // carries the specific fault, instead of everything landing on the miner-
+ // level (brain) message. Chain ids are 1-based; board positions are 0-based.
+ if let Some(chains) = msg
+ .and_then(|v| v.pointer("/chains"))
+ .and_then(|v| v.as_array())
+ {
+ for chain in chains {
+ let Some(id) = chain.pointer("/id").and_then(|v| v.as_u64()) else {
+ continue;
+ };
+ let idx = id.saturating_sub(1) as u16;
+ let red = chain
+ .pointer("/chip_statuses/red")
+ .and_then(|v| v.as_u64())
+ .unwrap_or(0);
+ let orange = chain
+ .pointer("/chip_statuses/orange")
+ .and_then(|v| v.as_u64())
+ .unwrap_or(0);
+ let state = chain
+ .pointer("/status/state")
+ .and_then(|v| v.as_str())
+ .unwrap_or("");
+ let state_ok = matches!(
+ state.to_lowercase().as_str(),
+ "" | "mining" | "auto-tuning" | "auto_tuning" | "tuning"
+ );
+
+ if red > 0 {
+ messages.push(MinerMessage::with_component(
+ 0,
+ 0,
+ format!("Hashboard {id}: {red} failed chip(s)"),
+ MessageSeverity::Error,
+ Some(MinerComponent::hashboard(idx)),
+ ));
+ } else if !state_ok {
+ // A board not in a normal state but with no failed chips: report
+ // the state itself (e.g. "initializing", "disabled", "stopped").
+ messages.push(MinerMessage::with_component(
+ 0,
+ 0,
+ format!("Hashboard {id}: {state}"),
+ MessageSeverity::Error,
+ Some(MinerComponent::hashboard(idx)),
+ ));
+ } else if orange > 0 {
+ messages.push(MinerMessage::with_component(
+ 0,
+ 0,
+ format!("Hashboard {id}: {orange} degraded chip(s)"),
+ MessageSeverity::Warning,
+ Some(MinerComponent::hashboard(idx)),
+ ));
+ }
+ }
+ }
+
messages
}
}
diff --git a/vendor/asic-rs-firmwares-vnish/src/backends/v1_3_0/mod.rs b/vendor/asic-rs-firmwares-vnish/src/backends/v1_3_0/mod.rs
index 4f0453a1..1301a657 100644
--- a/vendor/asic-rs-firmwares-vnish/src/backends/v1_3_0/mod.rs
+++ b/vendor/asic-rs-firmwares-vnish/src/backends/v1_3_0/mod.rs
@@ -20,7 +20,7 @@ use asic_rs_core::{
device::DeviceInfo,
fan::FanData,
hashrate::{HashRate, HashRateUnit},
- message::{MessageSeverity, MinerMessage},
+ message::{MessageSeverity, MinerComponent, MinerMessage},
miner::TuningTarget,
operating_state::OperatingState,
pool::{PoolData, PoolGroupData, PoolURL},
@@ -351,14 +351,26 @@ impl GetDataLocations for VnishV130 {
tag: None,
},
)],
- DataField::Messages => vec![(
- WEB_SUMMARY,
- DataExtractor {
- func: get_by_pointer,
- key: Some("/miner/miner_status"),
- tag: None,
- },
- )],
+ DataField::Messages => vec![
+ (
+ WEB_SUMMARY,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/miner/miner_status"),
+ tag: Some("miner_status"),
+ },
+ ),
+ // Per-hashboard diagnostics (chip status buckets + per-chain state)
+ // for per-board fault messages in parse_messages.
+ (
+ WEB_SUMMARY,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/miner/chains"),
+ tag: Some("chains"),
+ },
+ ),
+ ],
DataField::TuningPercent => vec![(
WEB_SUMMARY,
DataExtractor {
@@ -805,9 +817,12 @@ impl GetMessages for VnishV130 {
/// reported here rather than computed from invented thresholds.
fn parse_messages(&self, data: &HashMap<DataField, Value>) -> Vec<MinerMessage> {
let mut messages = Vec::new();
+ let msg = data.get(&DataField::Messages);
- if let Some(status) = data.get(&DataField::Messages)
- && let Some(state) = status.pointer("/miner_state").and_then(|v| v.as_str())
+ // Miner-level state verdict (now under the "miner_status" tag).
+ if let Some(state) = msg
+ .and_then(|v| v.pointer("/miner_status/miner_state"))
+ .and_then(|v| v.as_str())
{
let normal = matches!(
state.to_lowercase().as_str(),
@@ -827,6 +842,68 @@ impl GetMessages for VnishV130 {
}
}
+ // Per-hashboard faults from the summary chains (round 20 #1). VNish reports
+ // per-chip status buckets (`red` = failed, `orange` = degraded, `grey` =
+ // healthy) and a per-chain state; attribute each fault to its own board so
+ // the Health column reds the right hashboard icon and that icon's tooltip
+ // carries the specific fault, instead of everything landing on the miner-
+ // level (brain) message. Chain ids are 1-based; board positions are 0-based.
+ if let Some(chains) = msg
+ .and_then(|v| v.pointer("/chains"))
+ .and_then(|v| v.as_array())
+ {
+ for chain in chains {
+ let Some(id) = chain.pointer("/id").and_then(|v| v.as_u64()) else {
+ continue;
+ };
+ let idx = id.saturating_sub(1) as u16;
+ let red = chain
+ .pointer("/chip_statuses/red")
+ .and_then(|v| v.as_u64())
+ .unwrap_or(0);
+ let orange = chain
+ .pointer("/chip_statuses/orange")
+ .and_then(|v| v.as_u64())
+ .unwrap_or(0);
+ let state = chain
+ .pointer("/status/state")
+ .and_then(|v| v.as_str())
+ .unwrap_or("");
+ let state_ok = matches!(
+ state.to_lowercase().as_str(),
+ "" | "mining" | "auto-tuning" | "auto_tuning" | "tuning"
+ );
+
+ if red > 0 {
+ messages.push(MinerMessage::with_component(
+ 0,
+ 0,
+ format!("Hashboard {id}: {red} failed chip(s)"),
+ MessageSeverity::Error,
+ Some(MinerComponent::hashboard(idx)),
+ ));
+ } else if !state_ok {
+ // A board not in a normal state but with no failed chips: report
+ // the state itself (e.g. "initializing", "disabled", "stopped").
+ messages.push(MinerMessage::with_component(
+ 0,
+ 0,
+ format!("Hashboard {id}: {state}"),
+ MessageSeverity::Error,
+ Some(MinerComponent::hashboard(idx)),
+ ));
+ } else if orange > 0 {
+ messages.push(MinerMessage::with_component(
+ 0,
+ 0,
+ format!("Hashboard {id}: {orange} degraded chip(s)"),
+ MessageSeverity::Warning,
+ Some(MinerComponent::hashboard(idx)),
+ ));
+ }
+ }
+ }
+
messages
}
}
@@ -0,0 +1,243 @@
Subject: [PATCH 0033] vnish hashboard model + chip-fail severity; whatsminer PSU serial
Round 21 #1 + #3.
- VNish per-board chip failures while the board is still MINING are now Warning
(yellow), not Error (red): dead/degraded chips on a board that keeps hashing
near its target are wear, not a down board. A board NOT in a normal mining
state stays Error (red). Both v1_2_0 and v1_3_0. (The GUI renders a warning-only
board as Degraded/yellow.)
- VNish hashboard model: parse_hashboards now reads the factory-info
/chains[]/board_model (e.g. "A3HB70601" on S21 Pro, "BHB42603" on S19j Pro),
keyed by chain id, into BoardData.hashboard_model. The factory-info endpoint is
already fetched for the PSU serial; neither the live /chains nor /summary carry
board_model. Both backends. Verified live (10.4.0.193, 10.4.1.218).
- WhatsMiner v1/v2 PSU serial: get_psu /Msg exposes serial_no (e.g.
"1355A2129604289"); parse_psu now reads it (it was hardcoded None with an
incorrect "v1/v2 does not report a serial" comment). Verified live (10.8.1.145).
diff --git a/vendor/asic-rs-firmwares-vnish/src/backends/v1_2_0/mod.rs b/vendor/asic-rs-firmwares-vnish/src/backends/v1_2_0/mod.rs
index 85011853..2c14f217 100644
--- a/vendor/asic-rs-firmwares-vnish/src/backends/v1_2_0/mod.rs
+++ b/vendor/asic-rs-firmwares-vnish/src/backends/v1_2_0/mod.rs
@@ -296,6 +296,16 @@ impl GetDataLocations for VnishV120 {
tag: Some("unit"),
},
),
+ // Per-board hashboard model ("board_model") from factory-info, which
+ // the live /chains + /summary do not carry. Already fetched for serial.
+ (
+ WEB_FACTORY_INFO,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/chains"),
+ tag: Some("factory"),
+ },
+ ),
],
DataField::Chips => vec![(
WEB_CHAINS,
@@ -493,6 +503,11 @@ impl GetHashboards for VnishV120 {
.unwrap_or(HashRateUnit::GigaHash);
let algo = self.device_info.algo;
let chip_chains = data.get(&DataField::Chips).and_then(|v| v.as_array());
+ // Factory-info chains carry the hashboard model (board_model), keyed by the
+ // same 1-based chain id. Not present on the live /chains or /summary.
+ let factory_chains = hashboards_data
+ .and_then(|v| v.pointer("/factory"))
+ .and_then(|v| v.as_array());
let mut hashboards: Vec<BoardData> =
(0..self.device_info.hardware.board_count().unwrap_or(0) as usize)
@@ -642,6 +657,16 @@ impl GetHashboards for VnishV120 {
.and_then(|v| v.as_str())
.map(|s| s == "mining")
.or_else(|| board.hashrate.as_ref().map(|h| h.value > 0.0));
+ // Hashboard model from factory-info (board_model), matched by chain id.
+ board.hashboard_model = factory_chains.and_then(|chains| {
+ chains
+ .iter()
+ .find(|c| c.pointer("/id").and_then(|v| v.as_u64()) == Some(id))
+ .and_then(|c| c.pointer("/board_model"))
+ .and_then(|v| v.as_str())
+ .filter(|s| !s.is_empty())
+ .map(String::from)
+ });
}
hashboards
@@ -919,22 +944,31 @@ impl GetMessages for VnishV120 {
"" | "mining" | "auto-tuning" | "auto_tuning" | "tuning"
);
- if red > 0 {
+ // Severity reflects whether the board is still doing its job. A board
+ // NOT in a normal mining state is down -> Error (red). A board that is
+ // still mining but has some failed/degraded chips is sub-optimal, not
+ // broken -> Warning (yellow): dead chips while the board keeps hashing
+ // near its target are wear, not a fault (a ~83%-hashrate board must not
+ // read as broken).
+ if !state_ok {
+ let detail = if red > 0 {
+ format!("Hashboard {id}: {state} ({red} failed chip(s))")
+ } else {
+ format!("Hashboard {id}: {state}")
+ };
messages.push(MinerMessage::with_component(
0,
0,
- format!("Hashboard {id}: {red} failed chip(s)"),
+ detail,
MessageSeverity::Error,
Some(MinerComponent::hashboard(idx)),
));
- } else if !state_ok {
- // A board not in a normal state but with no failed chips: report
- // the state itself (e.g. "initializing", "disabled", "stopped").
+ } else if red > 0 {
messages.push(MinerMessage::with_component(
0,
0,
- format!("Hashboard {id}: {state}"),
- MessageSeverity::Error,
+ format!("Hashboard {id}: {red} failed chip(s)"),
+ MessageSeverity::Warning,
Some(MinerComponent::hashboard(idx)),
));
} else if orange > 0 {
diff --git a/vendor/asic-rs-firmwares-vnish/src/backends/v1_3_0/mod.rs b/vendor/asic-rs-firmwares-vnish/src/backends/v1_3_0/mod.rs
index 1301a657..e6247923 100644
--- a/vendor/asic-rs-firmwares-vnish/src/backends/v1_3_0/mod.rs
+++ b/vendor/asic-rs-firmwares-vnish/src/backends/v1_3_0/mod.rs
@@ -294,6 +294,17 @@ impl GetDataLocations for VnishV130 {
tag: Some("unit"),
},
),
+ // Per-board hashboard model ("board_model", e.g. "A3HB70601") from
+ // the factory-info endpoint, which the live /chains + /summary do not
+ // carry. Already fetched for the PSU serial.
+ (
+ WEB_FACTORY_INFO,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/chains"),
+ tag: Some("factory"),
+ },
+ ),
],
DataField::Chips => vec![(
WEB_CHAINS,
@@ -499,6 +510,11 @@ impl GetHashboards for VnishV130 {
.unwrap_or(HashRateUnit::GigaHash);
let algo = self.device_info.algo;
let chip_chains = data.get(&DataField::Chips).and_then(|v| v.as_array());
+ // Factory-info chains carry the hashboard model (board_model), keyed by the
+ // same 1-based chain id. Not present on the live /chains or /summary.
+ let factory_chains = hashboards_data
+ .and_then(|v| v.pointer("/factory"))
+ .and_then(|v| v.as_array());
let mut hashboards: Vec<BoardData> =
(0..self.device_info.hardware.board_count().unwrap_or(0) as usize)
@@ -648,6 +664,16 @@ impl GetHashboards for VnishV130 {
.and_then(|v| v.as_str())
.map(|s| s == "mining")
.or_else(|| board.hashrate.as_ref().map(|h| h.value > 0.0));
+ // Hashboard model from factory-info (board_model), matched by chain id.
+ board.hashboard_model = factory_chains.and_then(|chains| {
+ chains
+ .iter()
+ .find(|c| c.pointer("/id").and_then(|v| v.as_u64()) == Some(id))
+ .and_then(|c| c.pointer("/board_model"))
+ .and_then(|v| v.as_str())
+ .filter(|s| !s.is_empty())
+ .map(String::from)
+ });
}
hashboards
@@ -874,22 +900,31 @@ impl GetMessages for VnishV130 {
"" | "mining" | "auto-tuning" | "auto_tuning" | "tuning"
);
- if red > 0 {
+ // Severity reflects whether the board is still doing its job. A board
+ // NOT in a normal mining state is down -> Error (red). A board that is
+ // still mining but has some failed/degraded chips is sub-optimal, not
+ // broken -> Warning (yellow): dead chips while the board keeps hashing
+ // near its target are wear, not a fault (a ~83%-hashrate board must not
+ // read as broken).
+ if !state_ok {
+ let detail = if red > 0 {
+ format!("Hashboard {id}: {state} ({red} failed chip(s))")
+ } else {
+ format!("Hashboard {id}: {state}")
+ };
messages.push(MinerMessage::with_component(
0,
0,
- format!("Hashboard {id}: {red} failed chip(s)"),
+ detail,
MessageSeverity::Error,
Some(MinerComponent::hashboard(idx)),
));
- } else if !state_ok {
- // A board not in a normal state but with no failed chips: report
- // the state itself (e.g. "initializing", "disabled", "stopped").
+ } else if red > 0 {
messages.push(MinerMessage::with_component(
0,
0,
- format!("Hashboard {id}: {state}"),
- MessageSeverity::Error,
+ format!("Hashboard {id}: {red} failed chip(s)"),
+ MessageSeverity::Warning,
Some(MinerComponent::hashboard(idx)),
));
} else if orange > 0 {
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 4025a931..8d5dad3c 100644
--- a/vendor/asic-rs-firmwares-whatsminer/src/backends/v1/mod.rs
+++ b/vendor/asic-rs-firmwares-whatsminer/src/backends/v1/mod.rs
@@ -557,14 +557,15 @@ impl GetWattage for WhatsMinerV1 {
}
fn parse_psu(&self, data: &HashMap<DataField, Value>) -> Option<PsuInfo> {
- // get_psu /Msg -> {model, hw_version, sw_version, ...} (values are strings).
- // No DC output voltage or rated envelope is exposed, so only identity is set.
+ // get_psu /Msg -> {model, name, hw_version, sw_version, serial_no, ...}
+ // (values are strings). No DC output voltage or rated envelope is exposed, so
+ // only identity (model/version/serial) is set.
let d = data.get(&DataField::Psu)?;
let s = |k: &str| d.pointer(k).and_then(|v| v.as_str()).filter(|s| !s.is_empty()).map(str::to_string);
let psu = PsuInfo {
model: s("/model").or_else(|| s("/name")),
version: s("/hw_version").or_else(|| s("/sw_version")),
- serial: None, // v1/v2 get_psu does not report a serial (V3 does)
+ serial: s("/serial_no"),
voltage_min: None,
voltage_max: None,
output_voltage: None,
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 2b340e28..328fb462 100644
--- a/vendor/asic-rs-firmwares-whatsminer/src/backends/v2/mod.rs
+++ b/vendor/asic-rs-firmwares-whatsminer/src/backends/v2/mod.rs
@@ -530,14 +530,15 @@ impl GetWattage for WhatsMinerV2 {
}
fn parse_psu(&self, data: &HashMap<DataField, Value>) -> Option<PsuInfo> {
- // get_psu /Msg -> {model, hw_version, sw_version} (string values). No DC
- // output voltage or rated envelope is exposed, so only identity is set.
+ // get_psu /Msg -> {model, name, hw_version, sw_version, serial_no} (string
+ // values). No DC output voltage or rated envelope is exposed, so only
+ // identity (model/version/serial) is set.
let d = data.get(&DataField::Psu)?;
let s = |k: &str| d.pointer(k).and_then(|v| v.as_str()).filter(|s| !s.is_empty()).map(str::to_string);
let psu = PsuInfo {
model: s("/model").or_else(|| s("/name")),
version: s("/hw_version").or_else(|| s("/sw_version")),
- serial: None, // v1/v2 get_psu does not report a serial (V3 does)
+ serial: s("/serial_no"),
voltage_min: None,
voltage_max: None,
output_voltage: None,
@@ -0,0 +1,39 @@
Subject: [PATCH 0005] health tooltips: convert tip area to widget coordinates
Round 19 #2 (the real fix). The GtkTreeView "query-tooltip" handler for the Health
column set a per-icon tip area from gtk_tree_view_get_cell_area, whose rectangle is
in BIN-WINDOW coordinates, but gtk_tooltip_set_tip_area expects WIDGET coordinates.
The area was therefore offset upward by the column-header height, so it did not
contain the pointer -- and GTK suppresses a tooltip whose tip area excludes the
cursor. That is why the health icon tooltips never appeared, while the Errors column
(which sets no tip area) worked. Convert the slot rectangle back to widget
coordinates with gtk_tree_view_convert_bin_window_to_widget_coords before setting it.
diff --git a/cpp_src/widgets_bridge.cpp b/cpp_src/widgets_bridge.cpp
index ba9f1c04..6d09ccb7 100644
--- a/cpp_src/widgets_bridge.cpp
+++ b/cpp_src/widgets_bridge.cpp
@@ -1019,9 +1019,21 @@ static gboolean dvlc_query_tooltip(GtkWidget* tv, gint x, gint y, gboolean keybo
// or moves the tooltip as the pointer crosses from one icon to the next -- the
// old tooltip just stays put with stale text. Setting a per-slot area makes GTK
// hide + re-show + reposition the tooltip for each icon.
+ //
+ // CRITICAL (round 19 #2, the reason the health tooltips never showed): the slot
+ // geometry above (block_left, crect) is in BIN-WINDOW coordinates (what
+ // gtk_tree_view_get_cell_area and get_path_at_pos use), but
+ // gtk_tooltip_set_tip_area expects WIDGET coordinates. Feeding it bin-window
+ // coords offsets the area upward by the header height, so it does not contain
+ // the pointer -- and GTK then suppresses the tooltip entirely (it only shows a
+ // tooltip whose tip area contains the cursor). The Errors column worked because
+ // it sets no tip area. Convert the slot rect back to widget coordinates.
+ gint area_wx = 0, area_wy = 0;
+ gtk_tree_view_convert_bin_window_to_widget_coords(
+ GTK_TREE_VIEW(tv), block_left + slot * adv, crect.y, &area_wx, &area_wy);
GdkRectangle area;
- area.x = block_left + slot * adv;
- area.y = crect.y;
+ area.x = area_wx;
+ area.y = area_wy;
area.width = adv;
area.height = crect.height;
gtk_tooltip_set_tip_area(tooltip, &area);
+5
View File
@@ -39,6 +39,11 @@ version = "1.0"
[build-dependencies.embed-resource]
version = "1.3"
# reqwest is only used by build.rs to download the wxWidgets source on
# Windows/macOS; on Linux download_dist() returns before touching it, and it is
# never linked into the runtime binary. Kept at the vendored 0.11 (the build tree
# is fully vendored / offline); the h2 0.3 advisory it pulls is build-time only
# and is documented as accepted in audit.toml (RUSTSEC-2026-0258).
[build-dependencies.reqwest]
version = "0.11"
features = ["blocking"]
@@ -335,14 +335,15 @@ int DrawShape(wxDC* dc, wxUniChar shape, wxCoord x, const wxRect& cell,
if (h < 8) h = 8;
int w = (sv->vbh > 0) ? (int)((double)h * sv->vbw / sv->vbh + 0.5) : h;
if (w < 1) w = 1;
// The Font Awesome fan glyph fills its square box more than the other health
// icons (brain/chip/bolt), so at the shared size it reads as oversized. Draw
// it a bit smaller, centred in its full-size slot, so the slot advance and the
// per-icon tooltip hit-test (both keyed to the full width) are unchanged
// (round 17 R1).
// The Font Awesome fan and brain glyphs fill their square box more than the
// other health icons (chip/bolt), so at the shared size they read as oversized.
// Draw them a bit smaller, centred in their full-size slot, so the slot advance
// and the per-icon tooltip hit-test (both keyed to the full width) are
// unchanged (round 17 R1; round 18 #1 brain).
int dw = w, dh = h;
if (shape == SHAPE_FAN) {
dh = (int)(h * 0.80 + 0.5);
double glyph_scale = (shape == SHAPE_FAN) ? 0.80 : (shape == SHAPE_BRAIN) ? 0.82 : 1.0;
if (glyph_scale < 1.0) {
dh = (int)(h * glyph_scale + 0.5);
if (dh < 8) dh = 8;
dw = (sv->vbh > 0) ? (int)((double)dh * sv->vbw / sv->vbh + 0.5) : dh;
if (dw < 1) dw = 1;
@@ -350,13 +351,16 @@ int DrawShape(wxDC* dc, wxUniChar shape, wxCoord x, const wxRect& cell,
const wxBitmap& bmp = ShapeBitmap(shape, *sv, colour, dw, dh);
if (bmp.IsOk()) {
if (health) {
// Left-align in the full slot (a shrunk fan is centred within it) and
// advance by less than the full icon width so adjacent health icons sit
// close together (the Font Awesome glyphs carry inner margin, so a small
// bounding-box overlap does not visually collide).
dc->DrawBitmap(bmp, x + (w - dw) / 2, cy - dh / 2, true);
int adv = w - 3;
return adv < 1 ? 1 : adv;
// UNIFORM fixed-width slot (round 19): every health icon (and the
// alignment gap) advances by the same amount -- the square (h - 3) -- so
// power/control/fan/board icons line up in fixed columns across rows
// regardless of each glyph's aspect ratio (a narrow bolt or a shrunk fan
// no longer shifts the icons after it). Each glyph is centred in its slot.
// This matches SHAPE_GAP's advance and the per-icon tooltip hit-test.
int adv = h - 3;
if (adv < 1) adv = 1;
dc->DrawBitmap(bmp, x + (adv - dw) / 2, cy - dh / 2, true);
return adv;
}
int slot = (w > SHAPE_ADVANCE) ? w : SHAPE_ADVANCE;
dc->DrawBitmap(bmp, x + (slot - w) / 2, cy - h / 2, true);
@@ -451,7 +455,13 @@ class SegmentRenderer : public wxDataViewCustomRenderer {
wxRect bg = cell;
if (wxDataViewColumn* owner = const_cast<SegmentRenderer*>(this)->GetOwner()) {
int cw = owner->GetWidth();
if (cw > bg.width) bg.width = cw;
// Extend BOTH directions by the column width. For a right-aligned column
// (round 19 #21) wx anchors `cell` at the content's left edge (near the
// column's right side), so extending only rightward left the column's left
// portion unstriped; over-spanning both sides and letting the cell-DC clip
// trim it fills the whole cell regardless of alignment (round 19 review M1).
bg.x -= cw;
bg.width += 2 * cw;
}
bg.y -= 40;
bg.height += 80;
@@ -534,7 +544,10 @@ class SegmentRenderer : public wxDataViewCustomRenderer {
} else if (const ShapeSvg* sv = LookupShapeSvg(shape)) {
int ww = (sv->vbh > 0) ? (int)((double)hh * sv->vbw / sv->vbh + 0.5) : hh;
if (health) {
adv = ww - 3;
// UNIFORM fixed-width slot (round 19), matching DrawShape + the gap, so
// every health icon lines up in fixed columns across rows regardless of
// its glyph aspect. Width is measured square (hh - 3), not per-glyph.
adv = hh - 3;
if (adv < 1) adv = 1;
} else if (ww > adv) {
adv = ww;
@@ -775,6 +788,13 @@ void* wxbr_text_ctrl(void* parent, int multiline) {
wxDefaultPosition, wxSize(-1, -1), style);
}
// A single-line text control that masks its content (wxTE_PASSWORD), for secret
// entry so a saved password is never rendered in the clear (round 18 #12).
void* wxbr_text_ctrl_password(void* parent) {
return (void*)new wxTextCtrl((wxWindow*)parent, wxID_ANY, wxT(""),
wxDefaultPosition, wxSize(-1, -1), wxTE_PASSWORD);
}
int wxbr_text_ctrl_get(void* win, char* buf, int cap) {
wxTextCtrl* t = (wxTextCtrl*)win;
wxString v = t->GetValue();
@@ -967,7 +987,10 @@ static gboolean dvlc_query_tooltip(GtkWidget* tv, gint x, gint y, gboolean keybo
GdkRectangle crect;
gtk_tree_view_get_cell_area(GTK_TREE_VIEW(tv), path, gcol, &crect);
gtk_tree_path_free(path);
// Icon advance matches DrawShape's health-icon width (square icons: h - 3).
// Icon advance must match DrawShape's now-UNIFORM health-icon slot, which is
// (row height - 1, capped at 28*zoom) - 3 for every glyph and gap alike. The
// earlier per-glyph advance (w-3) shifted the hit slots so tooltips landed on
// the wrong icon (round 19 #2); with the uniform slot the hit-test lines up.
int h = crect.height - 1;
int cap = (int)(28 * g_table_zoom + 0.5);
if (cap < 8) cap = 8;
@@ -975,13 +998,45 @@ static gboolean dvlc_query_tooltip(GtkWidget* tv, gint x, gint y, gboolean keybo
if (h < 8) h = 8;
int adv = h - 3;
if (adv < 1) adv = 1;
int off = bx - crect.x;
int n = (int)iit->second.size();
// A right-aligned column (round 19 #21) draws the icon block flush to the
// cell's right edge, so measure the pointer from the block's left, not the
// cell's left.
int block_left = crect.x;
if (wxcol->GetAlignment() == wxALIGN_RIGHT) {
int content_w = n * adv;
if (content_w < crect.width) block_left = crect.x + (crect.width - content_w);
}
int off = bx - block_left;
if (off < 0) off = 0;
int slot = off / adv;
if (slot < 0) slot = 0;
if (slot >= (int)iit->second.size()) slot = (int)iit->second.size() - 1;
if (slot >= n) slot = n - 1;
const wxString& tip = iit->second[(size_t)slot];
if (tip.IsEmpty()) return FALSE;
// Scope the tooltip's "tip area" to just this icon's slot (round 18 #4a).
// Without a tip area GTK defaults it to the whole widget, so it never re-queries
// or moves the tooltip as the pointer crosses from one icon to the next -- the
// old tooltip just stays put with stale text. Setting a per-slot area makes GTK
// hide + re-show + reposition the tooltip for each icon.
//
// CRITICAL (round 19 #2, the reason the health tooltips never showed): the slot
// geometry above (block_left, crect) is in BIN-WINDOW coordinates (what
// gtk_tree_view_get_cell_area and get_path_at_pos use), but
// gtk_tooltip_set_tip_area expects WIDGET coordinates. Feeding it bin-window
// coords offsets the area upward by the header height, so it does not contain
// the pointer -- and GTK then suppresses the tooltip entirely (it only shows a
// tooltip whose tip area contains the cursor). The Errors column worked because
// it sets no tip area. Convert the slot rect back to widget coordinates.
gint area_wx = 0, area_wy = 0;
gtk_tree_view_convert_bin_window_to_widget_coords(
GTK_TREE_VIEW(tv), block_left + slot * adv, crect.y, &area_wx, &area_wy);
GdkRectangle area;
area.x = area_wx;
area.y = area_wy;
area.width = adv;
area.height = crect.height;
gtk_tooltip_set_tip_area(tooltip, &area);
gtk_tooltip_set_text(tooltip, tip.utf8_str());
return TRUE;
}
@@ -1107,14 +1162,23 @@ void* wxbr_dvlc(void* parent) {
return (void*)dv;
}
void wxbr_dvlc_append_text_col(void* win, const char* title, int width, int reorderable) {
// Map the bridge alignment code (0 left, 1 right, 2 centre) to a wxAlignment.
static wxAlignment dvlc_wx_align(int align) {
switch (align) {
case 1: return wxALIGN_RIGHT;
case 2: return wxALIGN_CENTER;
default: return wxALIGN_NOT;
}
}
void wxbr_dvlc_append_text_col(void* win, const char* title, int width, int reorderable, int align) {
wxDataViewCtrl* dv = (wxDataViewCtrl*)win;
int flags = wxDATAVIEW_COL_RESIZABLE;
if (reorderable) flags |= wxDATAVIEW_COL_REORDERABLE;
unsigned col = dv->GetColumnCount(); // next model column index
dvlc_store(win)->AppendColumn("string");
dv->AppendTextColumn(wxString::FromUTF8(title), col, wxDATAVIEW_CELL_INERT,
width, wxALIGN_NOT, flags);
width, dvlc_wx_align(align), flags);
// Record the 100% column width for the zoom (round 14 #3); the first column of
// a (re)built table resets the list.
if (col == 0) g_zoom_base_w.clear();
@@ -1125,15 +1189,17 @@ void wxbr_dvlc_append_text_col(void* win, const char* title, int width, int reor
// SegmentRenderer so its cell values can carry the '\x1f'/'\x1e' colour-run
// encoding produced by alkane_gui::model::encode_segments. An ordinary string
// with no encoding in it still renders fine (single default-coloured run).
void* wxbr_dvlc_append_colored_col(void* win, const char* title, int width, int reorderable) {
void* wxbr_dvlc_append_colored_col(void* win, const char* title, int width, int reorderable, int align) {
wxDataViewCtrl* dv = (wxDataViewCtrl*)win;
int flags = wxDATAVIEW_COL_RESIZABLE;
if (reorderable) flags |= wxDATAVIEW_COL_REORDERABLE;
unsigned col = dv->GetColumnCount(); // next model column index
dvlc_store(win)->AppendColumn("string");
SegmentRenderer* renderer = new SegmentRenderer();
wxAlignment al = dvlc_wx_align(align);
renderer->SetAlignment(al);
wxDataViewColumn* c = new wxDataViewColumn(wxString::FromUTF8(title), renderer, col,
width, wxALIGN_NOT, flags);
width, al, flags);
dv->AppendColumn(c);
// Record the 100% column width for the zoom (round 14 #3).
if (col == 0) g_zoom_base_w.clear();
@@ -1279,6 +1345,23 @@ void wxbr_dvlc_autosize_col(void* win, int pos) {
if (c) c->SetWidth(wxCOL_WIDTH_AUTOSIZE);
}
// Size a column to fit its content + header, then clamp to cap_px so the default
// width is min(reasonable cap, content-fit) -- a short column shrinks to its
// content, a long one is capped at the caller's sensible default (round 18 #10).
// A small floor keeps a column from collapsing to nothing.
void wxbr_dvlc_autosize_col_capped(void* win, int pos, int cap_px) {
wxDataViewCtrl* dv = (wxDataViewCtrl*)win;
if (pos < 0 || (unsigned)pos >= dv->GetColumnCount()) return;
wxDataViewColumn* c = dv->GetColumn((unsigned)pos);
if (!c) return;
c->SetWidth(wxCOL_WIDTH_AUTOSIZE);
int w = c->GetWidth();
const int floor_px = 24;
if (w < floor_px) w = floor_px;
if (cap_px > 0 && w > cap_px) w = cap_px;
c->SetWidth(w);
}
// Update a column's header text in place (creation index) without recreating
// the control -- used to refresh the ASCII sort marker on a sort click.
void wxbr_dvlc_set_col_title(void* win, int col, const char* title) {
+30 -6
View File
@@ -7,6 +7,11 @@
use std::ffi::CString;
use std::os::raw::{c_char, c_int, c_long, c_void};
/// Column alignment for `dvlc_append_text_col` / `dvlc_append_colored_col`.
pub const ALIGN_LEFT: i32 = 0;
pub const ALIGN_RIGHT: i32 = 1;
pub const ALIGN_CENTER: i32 = 2;
mod notsafe {
use std::os::raw::{c_char, c_int, c_long, c_void};
@@ -36,6 +41,7 @@ mod notsafe {
pub fn wxbr_button(parent: *mut c_void, label: *const c_char, id: c_int) -> *mut c_void;
pub fn wxbr_bind_click(win: *mut c_void, id: c_int);
pub fn wxbr_text_ctrl(parent: *mut c_void, multiline: c_int) -> *mut c_void;
pub fn wxbr_text_ctrl_password(parent: *mut c_void) -> *mut c_void;
pub fn wxbr_text_ctrl_get(win: *mut c_void, buf: *mut c_char, cap: c_int) -> c_int;
pub fn wxbr_text_ctrl_set(win: *mut c_void, value: *const c_char);
pub fn wxbr_text_ctrl_write(win: *mut c_void, value: *const c_char);
@@ -55,8 +61,8 @@ mod notsafe {
pub fn wxbr_file_dialog(parent: *mut c_void, title: *const c_char, buf: *mut c_char, cap: c_int) -> c_int;
pub fn wxbr_save_file_dialog(parent: *mut c_void, title: *const c_char, default_name: *const c_char, wildcard: *const c_char, buf: *mut c_char, cap: c_int) -> c_int;
pub fn wxbr_dvlc(parent: *mut c_void) -> *mut c_void;
pub fn wxbr_dvlc_append_text_col(win: *mut c_void, title: *const c_char, width: c_int, reorderable: c_int);
pub fn wxbr_dvlc_append_colored_col(win: *mut c_void, title: *const c_char, width: c_int, reorderable: c_int) -> *mut c_void;
pub fn wxbr_dvlc_append_text_col(win: *mut c_void, title: *const c_char, width: c_int, reorderable: c_int, align: c_int);
pub fn wxbr_dvlc_append_colored_col(win: *mut c_void, title: *const c_char, width: c_int, reorderable: c_int, align: c_int) -> *mut c_void;
pub fn wxbr_dvlc_append_toggle_col(win: *mut c_void, width: c_int);
pub fn wxbr_dvlc_append_row(win: *mut c_void, nvals: c_int, vals: *const *const c_char);
pub fn wxbr_dvlc_delete_row(win: *mut c_void, row: usize);
@@ -68,6 +74,7 @@ mod notsafe {
pub fn wxbr_dvlc_get_cell(win: *mut c_void, row: usize, col: usize, buf: *mut c_char, cap: c_int) -> c_int;
pub fn wxbr_dvlc_col_count(win: *mut c_void) -> c_int;
pub fn wxbr_dvlc_autosize_col(win: *mut c_void, pos: c_int);
pub fn wxbr_dvlc_autosize_col_capped(win: *mut c_void, pos: c_int, cap_px: c_int);
pub fn wxbr_dvlc_set_col_title(win: *mut c_void, col: c_int, title: *const c_char);
pub fn wxbr_dvlc_set_sort_indicator(win: *mut c_void, col: c_int, active: c_int, ascending: c_int);
pub fn wxbr_dvlc_col_at_pos(win: *mut c_void, pos: c_int) -> c_int;
@@ -437,6 +444,11 @@ impl Widget {
Widget(unsafe { notsafe::wxbr_text_ctrl(parent.0, multiline as c_int) })
}
/// A single-line text control that masks its content (for password entry).
pub fn password_ctrl(parent: Widget) -> Widget {
Widget(unsafe { notsafe::wxbr_text_ctrl_password(parent.0) })
}
pub fn get_value(&self) -> String {
let mut buf = vec![0i8; 65536];
let n = unsafe { notsafe::wxbr_text_ctrl_get(self.0, buf.as_mut_ptr(), buf.len() as c_int) };
@@ -570,17 +582,23 @@ impl Widget {
Widget(unsafe { notsafe::wxbr_dvlc(parent.0) })
}
pub fn dvlc_append_text_col(&self, title: &str, width: i32, reorderable: bool) {
/// Append a text column. `align` is the cell + header alignment:
/// [`ALIGN_LEFT`] (0), [`ALIGN_RIGHT`] (1) or [`ALIGN_CENTER`] (2).
pub fn dvlc_append_text_col(&self, title: &str, width: i32, reorderable: bool, align: i32) {
let c = CString::new(title).unwrap_or_default();
unsafe { notsafe::wxbr_dvlc_append_text_col(self.0, c.as_ptr(), width, reorderable as c_int) }
unsafe {
notsafe::wxbr_dvlc_append_text_col(self.0, c.as_ptr(), width, reorderable as c_int, align)
}
}
/// Like `dvlc_append_text_col`, but the column renders cell values through
/// the SegmentRenderer, so a value built with `model::encode_segments` is
/// drawn as coloured text runs (a plain string still renders normally).
pub fn dvlc_append_colored_col(&self, title: &str, width: i32, reorderable: bool) {
pub fn dvlc_append_colored_col(&self, title: &str, width: i32, reorderable: bool, align: i32) {
let c = CString::new(title).unwrap_or_default();
unsafe { notsafe::wxbr_dvlc_append_colored_col(self.0, c.as_ptr(), width, reorderable as c_int) };
unsafe {
notsafe::wxbr_dvlc_append_colored_col(self.0, c.as_ptr(), width, reorderable as c_int, align)
};
}
pub fn dvlc_append_toggle_col(&self, width: i32) {
@@ -647,6 +665,12 @@ impl Widget {
unsafe { notsafe::wxbr_dvlc_autosize_col(self.0, pos as c_int) }
}
/// Size the column at display position `pos` to its content, then clamp to
/// `cap_px`: the width becomes min(cap, content-fit) (round 18 #10).
pub fn dvlc_autosize_col_capped(&self, pos: usize, cap_px: i32) {
unsafe { notsafe::wxbr_dvlc_autosize_col_capped(self.0, pos as c_int, cap_px) }
}
/// Model column index shown at display position `pos` (after drag reorder).
pub fn dvlc_col_at_pos(&self, pos: usize) -> Option<usize> {
let v = unsafe { notsafe::wxbr_dvlc_col_at_pos(self.0, pos as c_int) };
+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":"d6816919357d770f9ae6dedea66bbfdec9ab0f4c8391f9928b90039b668ee026","src/data/capabilities.rs":"29cbab6262fb8888b30b4674a30ef03983e005b4e18eefddfbbf9c568e1e1e17","src/data/collector.rs":"792489f8292863a7d57b9867096349d3257ddaf5bb0b5317e7a4366aa1b9dec9","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":"9d9e47a33753956fcfef7a5fb2a8eb315464aed41fe25be41acb36dd223a0880","src/data/message.rs":"7b399ab1a0b6e43e61a5461d29a2752beed2d1fd7b214eb891572f8994d47c11","src/data/miner.rs":"641ed29589112fdecf96a2065b05a1878af2a08bb60bff5e624bf56cc08e4a3a","src/data/mod.rs":"620b6876d0c88ad80c4aad1ed8ce8f8c4a76641c1e1c61e02cff115b1ab1da55","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":"b198869b22a5e56366014a4090946cb44e9cddda32e77c62e57a90ceec8f1348","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":"b0ea657174d7259a7e9d9c232e707293940a4cce2558e1976dbf6ec5c726fe71","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":"7a0d2a7ce07ac5480ca0e1e80549828220df7802077f735cd334f6f21f0e0112","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":"1adf2f76b04fcaf0a4042f055eab07b2c87ea76fb8856a3c6741defa98e1f354","src/traits/mod.rs":"61406c4d2603299e4bad57c6f90115cadf93cee50a857bbfbb00d99f3a6873ac","src/traits/model.rs":"efde2b5cae4c4f018436bb68b236f354b5a733f7dafdeaf3f1c534b469a22d64","src/util.rs":"53255c65e85b97236cb34b452e2cb522edf377f49d2232645e0e0e33c447bb23"},"package":"1f25e625fc4c645ce995c5609a9fdff6f047d6a5e4d6be9dc167999a43197f58"}
+6
View File
@@ -90,6 +90,12 @@ pub struct BoardData {
pub tuned: Option<bool>,
/// Whether this board is enabled and actively mining
pub active: Option<bool>,
/// The ASIC chip type/model on this board (e.g. "BM1370"), when reported.
/// Not exposed by Antminer/LuxOS (their network API reports only the control
/// board type).
pub chip_type: Option<String>,
/// The hashboard model / part identifier (e.g. "A3HB70601"), when reported.
pub hashboard_model: Option<String>,
}
impl BoardData {
+18
View File
@@ -56,9 +56,21 @@ pub enum DataField {
/// Expected hashrate for the miner.
#[cfg_attr(feature = "python", pydantic(value = "ExpectedHashrate"))]
ExpectedHashrate,
/// Rolling average hashrate windows (1m/5m/15m/24h) reported by the miner.
#[cfg_attr(feature = "python", pydantic(value = "HashrateAverages"))]
HashrateAverages,
/// 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,
/// Board temperature safety thresholds (critical / shutdown), in Celsius.
#[cfg_attr(feature = "python", pydantic(value = "TemperatureLimits"))]
TemperatureLimits,
/// Auto-tuner status (a human-readable label, e.g. "Stable", "Tuning").
#[cfg_attr(feature = "python", pydantic(value = "TunerStatus"))]
TunerStatus,
/// PSU fan speed or configuration.
#[cfg_attr(feature = "python", pydantic(value = "PsuFans"))]
PsuFans,
@@ -74,6 +86,9 @@ pub enum DataField {
/// Current power consumption in watts.
#[cfg_attr(feature = "python", pydantic(value = "Wattage"))]
Wattage,
/// Power-supply info (identity, rated voltage envelope, live output V/A).
#[cfg_attr(feature = "python", pydantic(value = "Psu"))]
Psu,
/// manual tuning percent of full power (100 = unthrottled).
#[cfg_attr(feature = "python", pydantic(value = "TuningPercent"))]
TuningPercent,
@@ -105,6 +120,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,
+29
View File
@@ -318,3 +318,32 @@ impl Div<HashRate> for Power {
self.as_watts() / hash_rate.value
}
}
/// Rolling average hashrate over standard time windows, as reported by firmware.
///
/// Each window is optional; a backend fills in only the windows its firmware
/// exposes. The 24h window is reported by Braiins only. Every value carries the
/// same unit and mining algorithm as the miner's current hashrate.
#[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 HashrateAverages {
/// Average hashrate over the last minute, when reported.
pub avg_1m: Option<HashRate>,
/// Average hashrate over the last 5 minutes, when reported.
pub avg_5m: Option<HashRate>,
/// Average hashrate over the last 15 minutes, when reported.
pub avg_15m: Option<HashRate>,
/// Average hashrate over the last 24 hours, when reported (Braiins only).
pub avg_24h: Option<HashRate>,
}
impl HashrateAverages {
/// True when no window is populated.
pub fn is_empty(&self) -> bool {
self.avg_1m.is_none()
&& self.avg_5m.is_none()
&& self.avg_15m.is_none()
&& self.avg_24h.is_none()
}
}
+23 -1
View File
@@ -12,10 +12,12 @@ use super::{
capabilities::TuningCapabilities,
device::DeviceInfo,
fan::FanData,
hashrate::HashRate,
hashrate::{HashRate, HashrateAverages},
message::MinerMessage,
operating_state::OperatingState,
pool::PoolGroupData,
psu::PsuInfo,
share::ShareSummary,
};
use crate::data::{
deserialize::deserialize_macaddr,
@@ -164,6 +166,8 @@ pub struct MinerData {
pub hashboards: Vec<BoardData>,
/// The current hashrate of the miner
pub hashrate: Option<HashRate>,
/// Rolling average hashrate windows (1m/5m/15m/24h), when reported
pub hashrate_averages: Option<HashrateAverages>,
/// The expected hashrate of the miner
pub expected_hashrate: Option<HashRate>,
/// The total expected number of chips across all boards on this miner
@@ -174,6 +178,15 @@ 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>,
/// Board target temperature threshold in Celsius, when reported (round 19 #10).
pub temp_target: Option<f64>,
/// Board hot temperature threshold in Celsius, when reported (round 19 #10).
pub temp_hot: Option<f64>,
/// Board dangerous temperature threshold in Celsius, when reported (round 19 #10).
pub temp_dangerous: Option<f64>,
/// The current PDU fan information for the miner
pub psu_fans: Vec<FanData>,
/// The average temperature across all chips in the miner
@@ -192,6 +205,9 @@ pub struct MinerData {
#[serde(serialize_with = "serialize_power")]
#[ts(type = "number | null")]
pub wattage: Option<Power>,
/// Power-supply info (identity, rated voltage envelope, live output V/A),
/// when the firmware reports it.
pub psu: Option<PsuInfo>,
/// The current manual tuning percent of full power (100 = unthrottled), where supported
pub tuning_percent: Option<u8>,
/// The current tuning target of the miner, such as power target or hashrate target
@@ -220,6 +236,9 @@ pub struct MinerData {
#[serde(default)]
#[cfg_attr(feature = "python", pydantic(default = None))]
pub operating_state: Option<OperatingState>,
/// Auto-tuner status as a human-readable label (round 19 #10), when reported:
/// e.g. "Stable"/"Tuning" (Braiins), "Optimized"/"Tuning"/"Off" (ePIC).
pub tuner_status: Option<String>,
/// The current pools configured on the miner
pub pools: Vec<PoolGroupData>,
/// Difficulty of the best share found over the miner's lifetime, when reported.
@@ -231,6 +250,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")]
+1
View File
@@ -15,5 +15,6 @@ pub mod message;
pub mod miner;
pub mod operating_state;
pub mod pool;
pub mod psu;
pub(crate) mod serialize;
pub mod share;
+32
View File
@@ -0,0 +1,32 @@
//! Power-supply (PSU) information reported by a miner's firmware.
//!
//! A backend fills in only what its firmware actually exposes; every field is
//! optional. Some firmware reports the PSU's identity and rated voltage envelope
//! (min/max output voltage), others also report the live output voltage and
//! current. Voltages are in volts and currents in amps.
#[cfg(feature = "python")]
use pyo3::pyclass;
use serde::{Deserialize, Serialize};
use ts_rs::TS;
/// Power-supply identity and voltage telemetry for one miner.
#[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 PsuInfo {
/// PSU model / type identifier, when reported.
pub model: Option<String>,
/// PSU firmware/hardware version, when reported.
pub version: Option<String>,
/// PSU serial number, when reported (Braiins, WhatsMiner V3, VNish).
pub serial: Option<String>,
/// Minimum rated output voltage in volts, when reported.
pub voltage_min: Option<f64>,
/// Maximum rated output voltage in volts, when reported.
pub voltage_max: Option<f64>,
/// Live output voltage in volts, when reported.
pub output_voltage: Option<f64>,
/// Live output current in amps, when reported.
pub output_current: Option<f64>,
}
+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.
///
+80 -1
View File
@@ -28,11 +28,13 @@ use crate::{
device::DeviceInfo,
fan::FanData,
firmware::{FirmwareImage, FirmwareStats},
hashrate::{HashRate, HashRateUnit},
hashrate::{HashRate, HashRateUnit, HashrateAverages},
message::MinerMessage,
miner::{MinerData, TuningTarget},
operating_state::OperatingState,
pool::PoolGroupData,
psu::PsuInfo,
share::ShareSummary,
},
traits::firmware::MinerFirmware,
traits::model::MinerModel,
@@ -270,24 +272,30 @@ impl<
let control_board_version = self.parse_control_board_version(&data);
let uptime = self.parse_uptime(&data);
let hashrate = self.parse_hashrate(&data);
let hashrate_averages = self.parse_hashrate_averages(&data);
let expected_hashrate = self.parse_expected_hashrate(&data);
let wattage = self.parse_wattage(&data);
let psu = self.parse_psu(&data);
let tuning_percent = self.parse_tuning_percent(&data);
let tuning_target = self.parse_tuning_target(&data);
let scaled_tuning_target = self.parse_scaled_tuning_target(&data);
let tuning_capabilities = self.parse_tuning_capabilities(&data);
let fluid_temperature = self.parse_fluid_temperature(&data);
let outlet_fluid_temperature = self.parse_outlet_fluid_temperature(&data);
let (temp_target, temp_hot, temp_dangerous) = self.parse_temperature_limits(&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);
let is_mining = self.parse_is_mining(&data);
let operating_state = self.parse_operating_state(&data);
let tuner_status = self.parse_tuner_status(&data);
let messages = self.parse_messages(&data);
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
@@ -351,6 +359,7 @@ impl<
expected_hashboards: device_info.hardware.board_count(),
hashboards,
hashrate,
hashrate_averages,
expected_hashrate,
// Chip information
@@ -360,6 +369,10 @@ impl<
// Cooling information
expected_fans: device_info.hardware.fans,
fans,
fan_speed_percent,
temp_target,
temp_hot,
temp_dangerous,
psu_fans,
average_temperature,
fluid_temperature,
@@ -367,6 +380,7 @@ impl<
// Power information
wattage,
psu,
tuning_percent,
tuning_target,
scaled_tuning_target,
@@ -379,10 +393,12 @@ impl<
uptime,
is_mining,
operating_state,
tuner_status,
pools,
best_share,
session_best_share,
share_summary,
}
}
}
@@ -629,6 +645,20 @@ pub trait GetHashrate: CollectData {
fn parse_hashrate(&self, data: &HashMap<DataField, Value>) -> Option<HashRate> {
None
}
#[tracing::instrument(level = "debug")]
async fn get_hashrate_averages(&self) -> Option<HashrateAverages> {
let mut collector = self.get_collector();
let data = collector
.collect(&[DataField::HashrateAverages, DataField::Hashrate])
.await;
self.parse_hashrate_averages(&data)
}
/// Rolling average hashrate windows. Backends that expose them override this;
/// the values carry the same unit and algorithm as the current hashrate.
#[allow(unused_variables)]
fn parse_hashrate_averages(&self, data: &HashMap<DataField, Value>) -> Option<HashrateAverages> {
None
}
}
// Expected Hashrate
@@ -660,6 +690,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
@@ -705,6 +747,15 @@ pub trait GetFluidTemperature: CollectData {
) -> Option<Temperature> {
None
}
/// Board temperature safety thresholds as (target, hot, dangerous) in Celsius.
/// Backends that expose them override this; others return (None, None, None).
#[allow(unused_variables)]
fn parse_temperature_limits(
&self,
data: &HashMap<DataField, Value>,
) -> (Option<f64>, Option<f64>, Option<f64>) {
(None, None, None)
}
}
// Wattage
@@ -720,6 +771,10 @@ pub trait GetWattage: CollectData {
fn parse_wattage(&self, data: &HashMap<DataField, Value>) -> Option<Power> {
None
}
#[allow(unused_variables)]
fn parse_psu(&self, data: &HashMap<DataField, Value>) -> Option<PsuInfo> {
None
}
}
// Tuning Percent
@@ -861,6 +916,18 @@ pub trait GetOperatingState: CollectData {
fn parse_operating_state(&self, data: &HashMap<DataField, Value>) -> Option<OperatingState> {
None
}
#[tracing::instrument(level = "debug")]
async fn get_tuner_status(&self) -> Option<String> {
let mut collector = self.get_collector();
let data = collector.collect(&[DataField::TunerStatus]).await;
self.parse_tuner_status(&data)
}
/// Auto-tuner status as a human-readable label. Backends that expose it override
/// this; others return None.
#[allow(unused_variables)]
fn parse_tuner_status(&self, data: &HashMap<DataField, Value>) -> Option<String> {
None
}
}
// Pools
@@ -891,6 +958,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":"efcaa6b186c8b6e79e9799a647291b895c5ff59f058722e98455ef68bc97c548","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":"278e4dd04a753858e12df96ead3522aef0616ebf6f27b3da4f1a12b064c19ee6","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"}
+38 -1
View File
@@ -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},
};
@@ -499,6 +500,26 @@ impl GetDataLocations for AntMinerV2020 {
tag: None,
},
)],
// cgminer summary "Best Share" (all-time). RPC_SUMMARY is already
// fetched, so this adds no round-trip (round 19 #10).
DataField::BestShare => vec![(
RPC_SUMMARY,
DataExtractor {
func: get_by_pointer,
key: Some("/SUMMARY/0/Best Share"),
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![
@@ -873,7 +894,17 @@ impl GetUptime for AntMinerV2020 {
}
}
impl GetBestShare for AntMinerV2020 {}
impl GetBestShare for AntMinerV2020 {
fn parse_best_share(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
// cgminer summary "Best Share" (all-time); guard against a 0 placeholder
// (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 {}
impl GetOperatingState for AntMinerV2020 {}
@@ -1663,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},
};
@@ -521,8 +522,50 @@ impl GetDataLocations for AntMinerV202307 {
tag: None,
},
),
// Bixbit-based firmware reports Power=0 in stats but the real
// figure as "Power Estimated" in the cgminer summary; carry it
// under a "summary" tag so parse_wattage can fall back to it
// without colliding with the stats keys (round 17 R7).
(
RPC_SUMMARY,
DataExtractor {
func: get_by_pointer,
key: Some("/SUMMARY/0"),
tag: Some("summary"),
},
),
]
}
// Best share (all-time / session) from the cgminer summary. Antminer
// stock, Bixbit, and other cgminer-based firmware all report it here;
// it was previously unmapped, so best-share was blank fleet-wide
// (round 17 R7).
DataField::BestShare => vec![(
RPC_SUMMARY,
DataExtractor {
func: get_by_pointer,
key: Some("/SUMMARY/0/Best Share"),
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 {
func: get_by_pointer,
key: Some("/SUMMARY/0/Best Session Share"),
tag: None,
},
)],
DataField::SerialNumber => vec![
(
WEB_SYSTEM_INFO,
@@ -778,8 +821,6 @@ impl GetUptime for AntMinerV202307 {
}
}
impl GetBestShare for AntMinerV202307 {}
impl GetSessionBestShare for AntMinerV202307 {}
impl GetOperatingState for AntMinerV202307 {}
@@ -888,21 +929,56 @@ impl GetWattage for AntMinerV202307 {
}
}
if let Some(power) = stats_data
let primary = stats_data
.get("power")
.or_else(|| stats_data.get("Power"))
// Same firmware version spells this differently per model: the
// L9 reports `power`, the L11 `watt`.
.or_else(|| stats_data.get("watt"))
.and_then(|v| v.as_f64())
.and_then(|v| v.as_f64());
if let Some(power) = primary
&& power > 0.0
{
return Some(Power::from_watts(power));
}
// Bixbit-based firmware leaves the stats power at 0 and reports the
// real draw as "Power Estimated" in the summary (round 17 R7).
if let Some(est) = stats_data
.pointer("/summary/Power Estimated")
.and_then(|v| v.as_f64())
&& est > 0.0
{
return Some(Power::from_watts(est));
}
// Preserve the prior behaviour: a present-but-zero stats power still
// reads as 0 W rather than blank.
if let Some(power) = primary {
return Some(Power::from_watts(power));
}
}
None
}
}
impl GetBestShare for AntMinerV202307 {
fn parse_best_share(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
// cgminer summary "Best Share" (all-time). Guard against a firmware that
// 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 {
fn parse_session_best_share(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
data.extract::<f64>(DataField::SessionBestShare)
.filter(|&v| v > 0.0)
}
}
impl GetTuningTarget for AntMinerV202307 {
fn parse_tuning_target(&self, data: &HashMap<DataField, Value>) -> Option<TuningTarget> {
data.get(&DataField::TuningTarget)
File diff suppressed because one or more lines are too long
+113 -2
View File
@@ -16,7 +16,7 @@ use asic_rs_core::{
command::MinerCommand,
device::{DeviceInfo, HashAlgorithm},
fan::FanData,
hashrate::{HashRate, HashRateUnit},
hashrate::{HashRate, HashRateUnit, HashrateAverages},
message::{MessageSeverity, MinerMessage},
miner::TuningTarget,
operating_state::OperatingState,
@@ -204,6 +204,16 @@ impl GetDataLocations for BraiinsV2507 {
tag: None,
},
)],
// Rolling averages from miner_stats real_hashrate (round 19 #10, T2);
// command already fetched. Braiins reports the full 1m/5m/15m/24h set.
DataField::HashrateAverages => vec![(
WEB_MINER_STATS,
DataExtractor {
func: get_by_pointer,
key: Some("/miner_stats/real_hashrate"),
tag: None,
},
)],
DataField::ExpectedHashrate => vec![(
WEB_MINER_DETAILS,
DataExtractor {
@@ -220,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 {
@@ -252,6 +272,16 @@ impl GetDataLocations for BraiinsV2507 {
tag: None,
},
)],
// Auto-tuner status (round 19 #10, T3): performance/tuner-state
// overall_tuner_state enum; command already fetched.
DataField::TunerStatus => vec![(
WEB_PERFORMANCE_TUNER_STATE,
DataExtractor {
func: get_by_pointer,
key: Some("/overall_tuner_state"),
tag: None,
},
)],
DataField::Uptime => vec![(
WEB_MINER_DETAILS,
DataExtractor {
@@ -352,6 +382,16 @@ impl GetDataLocations for BraiinsV2507 {
tag: None,
},
)],
// Board temp thresholds (round 19 #10, T3): cooling_constraints defaults
// (target/hot/dangerous); WEB_CONSTRAINTS already fetched.
DataField::TemperatureLimits => vec![(
WEB_CONSTRAINTS,
DataExtractor {
func: get_by_pointer,
key: Some("/cooling_constraints"),
tag: None,
},
)],
_ => vec![],
}
}
@@ -494,6 +534,31 @@ impl GetHashrate for BraiinsV2507 {
.as_unit(HashRateUnit::default())
})
}
fn parse_hashrate_averages(&self, data: &HashMap<DataField, Value>) -> Option<HashrateAverages> {
// miner_stats real_hashrate last_1m/5m/15m/24h (GigaHash); full window set
// (round 19 #10).
let d = data.get(&DataField::HashrateAverages)?;
let ghs = |k: &str| {
d.pointer(&format!("/{k}/gigahash_per_second"))
.and_then(|v| v.as_f64())
.filter(|&f| f > 0.0)
.map(|f| {
HashRate {
value: f,
unit: HashRateUnit::GigaHash,
algo: self.device_info.algo,
}
.as_unit(HashRateUnit::default())
})
};
let avgs = HashrateAverages {
avg_1m: ghs("last_1m"),
avg_5m: ghs("last_5m"),
avg_15m: ghs("last_15m"),
avg_24h: ghs("last_24h"),
};
(!avgs.is_empty()).then_some(avgs)
}
}
impl GetExpectedHashrate for BraiinsV2507 {
@@ -532,6 +597,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 {
@@ -563,6 +640,21 @@ impl GetOperatingState for BraiinsV2507 {
},
})
}
fn parse_tuner_status(&self, data: &HashMap<DataField, Value>) -> Option<String> {
// BOS+ TunerState enum (bos-plus-api performance.proto): 1 Disabled,
// 2 Stable, 3 Tuning, 4 Error, 5 Continuous, 6 Preheat (round 19 #10, T3).
Some(match data.get(&DataField::TunerStatus)?.as_u64()? {
0 => return None,
1 => "Disabled",
2 => "Stable",
3 => "Tuning",
4 => "Error",
5 => "Continuous",
6 => "Preheat",
_ => return None,
})
.map(str::to_string)
}
}
impl GetIsMining for BraiinsV2507 {
@@ -668,7 +760,26 @@ impl GetScaledTuningTarget for BraiinsV2507 {
}
}
impl GetFluidTemperature for BraiinsV2507 {}
impl GetFluidTemperature for BraiinsV2507 {
fn parse_temperature_limits(
&self,
data: &HashMap<DataField, Value>,
) -> (Option<f64>, Option<f64>, Option<f64>) {
// Braiins cooling_constraints target/hot/dangerous default thresholds in
// degree_c (round 19 #10, T3).
let d = data.get(&DataField::TemperatureLimits);
let f = |k: &str| {
d.and_then(|v| v.pointer(&format!("/{k}/default/degree_c")))
.and_then(|v| v.as_f64())
.filter(|v| v.is_finite() && *v > 0.0)
};
(
f("target_temperature"),
f("hot_temperature"),
f("dangerous_temperature"),
)
}
}
impl GetTuningCapabilities for BraiinsV2507 {
fn parse_tuning_capabilities(
&self,
+184 -6
View File
@@ -17,11 +17,12 @@ use asic_rs_core::{
device::{DeviceInfo, HashAlgorithm},
fan::FanData,
firmware::{FirmwareStats, FirmwareUpdate},
hashrate::{HashRate, HashRateUnit},
hashrate::{HashRate, HashRateUnit, HashrateAverages},
message::{MessageSeverity, MinerMessage},
miner::TuningTarget,
operating_state::OperatingState,
pool::{PoolData, PoolGroupData, PoolURL},
psu::PsuInfo,
},
traits::{miner::*, model::MinerModel},
};
@@ -206,6 +207,16 @@ impl GetDataLocations for BraiinsV2604 {
tag: None,
},
)],
// Rolling averages from miner_stats real_hashrate (round 19 #10, T2);
// command already fetched. Braiins reports the full 1m/5m/15m/24h set.
DataField::HashrateAverages => vec![(
WEB_MINER_STATS,
DataExtractor {
func: get_by_pointer,
key: Some("/miner_stats/real_hashrate"),
tag: None,
},
)],
DataField::ExpectedHashrate => vec![(
WEB_MINER_DETAILS,
DataExtractor {
@@ -222,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 {
@@ -254,6 +275,16 @@ impl GetDataLocations for BraiinsV2604 {
tag: None,
},
)],
// Auto-tuner status (round 19 #10, T3): performance/tuner-state
// overall_tuner_state enum; command already fetched.
DataField::TunerStatus => vec![(
WEB_PERFORMANCE_TUNER_STATE,
DataExtractor {
func: get_by_pointer,
key: Some("/overall_tuner_state"),
tag: None,
},
)],
DataField::Uptime => vec![(
WEB_MINER_DETAILS,
DataExtractor {
@@ -294,6 +325,16 @@ impl GetDataLocations for BraiinsV2604 {
tag: None,
},
)],
// PSU identity + rated voltage envelope (round 17 R5/G15). BOS reports
// it at miner/details -> psu_info {version, min_voltage, max_voltage}.
DataField::Psu => vec![(
WEB_MINER_DETAILS,
DataExtractor {
func: get_by_pointer,
key: Some("/psu_info"),
tag: None,
},
)],
DataField::TuningTarget => vec![
(
WEB_MINER_CONFIGURATION,
@@ -362,6 +403,16 @@ impl GetDataLocations for BraiinsV2604 {
tag: None,
},
)],
// Board temp thresholds (round 19 #10, T3): cooling_constraints defaults
// (target/hot/dangerous); WEB_CONSTRAINTS already fetched.
DataField::TemperatureLimits => vec![(
WEB_CONSTRAINTS,
DataExtractor {
func: get_by_pointer,
key: Some("/cooling_constraints"),
tag: None,
},
)],
_ => vec![],
}
}
@@ -487,6 +538,16 @@ impl GetHashboards for BraiinsV2604 {
.and_then(|v| v.as_f64())
.map(Frequency::from_hertz);
board.active = chain.pointer("/enabled").and_then(|v| v.as_bool());
// ASIC chip model + hashboard model/part (round 19 #10 telemetry
// extension). BOS+ miner/hw/hashboards reports chip_type ("BM1370")
// and model ("A3HB70601"); board_name is the human label if present.
board.chip_type =
chain.pointer("/chip_type").and_then(|v| v.as_str()).map(str::to_string);
board.hashboard_model = chain
.pointer("/model")
.or_else(|| chain.pointer("/board_name"))
.and_then(|v| v.as_str())
.map(str::to_string);
}
hashboards
@@ -504,6 +565,31 @@ impl GetHashrate for BraiinsV2604 {
.as_unit(HashRateUnit::default())
})
}
fn parse_hashrate_averages(&self, data: &HashMap<DataField, Value>) -> Option<HashrateAverages> {
// miner_stats real_hashrate last_1m/5m/15m/24h (GigaHash); full window set
// (round 19 #10).
let d = data.get(&DataField::HashrateAverages)?;
let ghs = |k: &str| {
d.pointer(&format!("/{k}/gigahash_per_second"))
.and_then(|v| v.as_f64())
.filter(|&f| f > 0.0)
.map(|f| {
HashRate {
value: f,
unit: HashRateUnit::GigaHash,
algo: self.device_info.algo,
}
.as_unit(HashRateUnit::default())
})
};
let avgs = HashrateAverages {
avg_1m: ghs("last_1m"),
avg_5m: ghs("last_5m"),
avg_15m: ghs("last_15m"),
avg_24h: ghs("last_24h"),
};
(!avgs.is_empty()).then_some(avgs)
}
}
impl GetExpectedHashrate for BraiinsV2604 {
@@ -542,6 +628,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 {
@@ -579,6 +677,21 @@ impl GetOperatingState for BraiinsV2604 {
},
})
}
fn parse_tuner_status(&self, data: &HashMap<DataField, Value>) -> Option<String> {
// BOS+ TunerState enum (bos-plus-api performance.proto): 1 Disabled,
// 2 Stable, 3 Tuning, 4 Error, 5 Continuous, 6 Preheat (round 19 #10, T3).
Some(match data.get(&DataField::TunerStatus)?.as_u64()? {
0 => return None,
1 => "Disabled",
2 => "Stable",
3 => "Tuning",
4 => "Error",
5 => "Continuous",
6 => "Preheat",
_ => return None,
})
.map(str::to_string)
}
}
impl GetIsMining for BraiinsV2604 {
@@ -663,6 +776,24 @@ impl GetWattage for BraiinsV2604 {
fn parse_wattage(&self, data: &HashMap<DataField, Value>) -> Option<Power> {
data.extract_map::<i64, _>(DataField::Wattage, |w| Power::from_watts(w as f64))
}
fn parse_psu(&self, data: &HashMap<DataField, Value>) -> Option<PsuInfo> {
// BOS miner/details -> psu_info { model_name, fw_version, serial_number,
// version (numeric type code), min_voltage.volt, max_voltage.volt }. Read
// the human model_name and the firmware version (the old code used the
// numeric "version" type code as the model and dropped fw_version entirely).
let d = data.get(&DataField::Psu)?;
let psu = PsuInfo {
model: d.pointer("/model_name").and_then(|v| v.as_str()).map(str::to_string),
version: d.pointer("/fw_version").and_then(|v| v.as_i64()).map(|n| n.to_string()),
serial: d.pointer("/serial_number").and_then(|v| v.as_str()).map(str::to_string),
voltage_min: d.pointer("/min_voltage/volt").and_then(|v| v.as_f64()),
voltage_max: d.pointer("/max_voltage/volt").and_then(|v| v.as_f64()),
output_voltage: None,
output_current: None,
};
(psu != PsuInfo::default()).then_some(psu)
}
}
impl GetTuningTarget for BraiinsV2604 {
@@ -679,7 +810,26 @@ impl GetScaledTuningTarget for BraiinsV2604 {
}
}
impl GetFluidTemperature for BraiinsV2604 {}
impl GetFluidTemperature for BraiinsV2604 {
fn parse_temperature_limits(
&self,
data: &HashMap<DataField, Value>,
) -> (Option<f64>, Option<f64>, Option<f64>) {
// Braiins cooling_constraints target/hot/dangerous default thresholds in
// degree_c (round 19 #10, T3).
let d = data.get(&DataField::TemperatureLimits);
let f = |k: &str| {
d.and_then(|v| v.pointer(&format!("/{k}/default/degree_c")))
.and_then(|v| v.as_f64())
.filter(|v| v.is_finite() && *v > 0.0)
};
(
f("target_temperature"),
f("hot_temperature"),
f("dangerous_temperature"),
)
}
}
impl GetTuningCapabilities for BraiinsV2604 {
fn parse_tuning_capabilities(
&self,
@@ -1071,10 +1221,10 @@ mod tests {
use super::*;
use crate::test::json::v26_04::{
WEB_COOLING_STATE_COMMAND, WEB_HASHBOARDS_COMMAND, WEB_LOCATE_COMMAND,
WEB_MINER_CONFIGURATION_COMMAND, WEB_MINER_DETAILS_COMMAND, WEB_MINER_STATS_COMMAND,
WEB_NETWORK_COMMAND, WEB_PERFORMANCE_TUNER_STATE_COMMAND, WEB_POOLS_COMMAND,
WEB_VERSION_COMMAND,
WEB_CONSTRAINTS_COMMAND, WEB_COOLING_STATE_COMMAND, WEB_HASHBOARDS_COMMAND,
WEB_LOCATE_COMMAND, WEB_MINER_CONFIGURATION_COMMAND, WEB_MINER_DETAILS_COMMAND,
WEB_MINER_STATS_COMMAND, WEB_NETWORK_COMMAND, WEB_PERFORMANCE_TUNER_STATE_COMMAND,
WEB_POOLS_COMMAND, WEB_VERSION_COMMAND,
};
#[tokio::test]
@@ -1155,6 +1305,13 @@ mod tests {
},
Value::from_str(WEB_HASHBOARDS_COMMAND).unwrap(),
);
results.insert(
MinerCommand::WebAPI {
command: "configuration/constraints",
parameters: None,
},
Value::from_str(WEB_CONSTRAINTS_COMMAND).unwrap(),
);
results.insert(
MinerCommand::WebAPI {
command: "actions/locate",
@@ -1202,6 +1359,27 @@ mod tests {
assert_eq!(miner_data.pools[0].len(), 2);
assert!(miner_data.hashrate.is_some());
assert!(miner_data.expected_hashrate.is_some());
// Rolling averages: miner_stats real_hashrate last_1m/5m/15m/24h (GigaHash);
// Braiins reports the full window set (round 19 #10, T2).
let avgs = miner_data
.hashrate_averages
.expect("braiins exposes rolling averages");
assert!(avgs.avg_1m.is_some() && avgs.avg_5m.is_some());
assert!(avgs.avg_15m.is_some() && avgs.avg_24h.is_some());
if let Some(hr) = &avgs.avg_1m {
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);
// Board temp thresholds from cooling_constraints defaults (round 19 #10, T3).
assert_eq!(miner_data.temp_target, Some(60.0));
assert_eq!(miner_data.temp_hot, Some(80.0));
assert_eq!(miner_data.temp_dangerous, Some(90.0));
// Auto-tuner status: overall_tuner_state 5 -> Continuous (round 19 #10, T3).
assert_eq!(miner_data.tuner_status.as_deref(), Some("Continuous"));
}
#[test]
@@ -0,0 +1,200 @@
{
"tuner_constraints": {
"power_target": {
"default": {
"watt": 2832
},
"min": {
"watt": 944
},
"max": {
"watt": 6435
}
},
"hashrate_target": {
"default": {
"terahash_per_second": 96.0
},
"min": {
"terahash_per_second": 70.75
},
"max": {
"terahash_per_second": 252.57
}
},
"enabled": {
"default": true
},
"default_mode": 1
},
"cooling_constraints": {
"default_cooling_mode": 1,
"target_temperature": {
"default": {
"degree_c": 60.0
},
"min": {
"degree_c": 0.0
},
"max": {
"degree_c": 200.0
}
},
"hot_temperature": {
"default": {
"degree_c": 80.0
},
"min": {
"degree_c": 0.0
},
"max": {
"degree_c": 200.0
}
},
"dangerous_temperature": {
"default": {
"degree_c": 90.0
},
"min": {
"degree_c": 0.0
},
"max": {
"degree_c": 200.0
}
},
"fan_speed_ratio": {
"default": 1.0,
"min": 0.0,
"max": 1.0
},
"minimum_required_fans": {
"default": 2,
"min": 0,
"max": 4
},
"min_fan_speed": {
"default": 0,
"min": 0,
"max": 100
},
"max_fan_speed": {
"default": 100,
"min": 0,
"max": 100
},
"pause_cooldown_fan_speed_ratio": {
"default": 0.2,
"min": 0.0,
"max": 1.0
},
"default_fan_pause_mode": 2,
"default_fan_pause_runtime": 1,
"fan_pause_runtime_limited_duration_s": 120
},
"dps_constraints": {
"power_step": {
"default": {
"watt": 300
},
"min": {
"watt": 1
},
"max": {
"watt": 1000
}
},
"hashrate_step": {
"default": {
"terahash_per_second": 11.0
},
"min": {
"terahash_per_second": 0.1
},
"max": {
"terahash_per_second": 100.0
}
},
"min_power_target": {
"default": {
"watt": 944
},
"min": {
"watt": 944
},
"max": {
"watt": 6435
}
},
"min_hashrate_target": {
"default": {
"terahash_per_second": 70.75
},
"min": {
"terahash_per_second": 70.75
},
"max": {
"terahash_per_second": 252.57
}
},
"shutdown_enabled": {
"default": false
},
"shutdown_duration": {
"default": {
"hours": 3
},
"min": {
"hours": 0
},
"max": {
"hours": 999
}
},
"enabled": {
"default": true
},
"mode": 1,
"on_start_target_percent": {
"default": 100,
"min": 50,
"max": 100
}
},
"hashboards_constraints": {
"hashboard_ids": [
"1",
"2",
"3"
],
"enabled": {
"default": true
},
"frequency": {
"default": {
"hertz": 505000000.0
},
"min": {
"hertz": 50000000.0
},
"max": {
"hertz": 1300000000.0
}
},
"voltage": {
"default": {
"volt": 13.4
},
"min": {
"volt": 11.96
},
"max": {
"volt": 15.2
}
},
"quick_ramping_time_s": {
"default": 30,
"min": 2,
"max": 600
}
}
}
@@ -12,3 +12,4 @@ pub(crate) const WEB_POOLS_COMMAND: &str = include_str!("pools.json");
pub(crate) const WEB_COOLING_STATE_COMMAND: &str = include_str!("cooling_state.json");
pub(crate) const WEB_HASHBOARDS_COMMAND: &str = include_str!("miner_hw_hashboards.json");
pub(crate) const WEB_LOCATE_COMMAND: &str = include_str!("actions_locate.json");
pub(crate) const WEB_CONSTRAINTS_COMMAND: &str = include_str!("configuration_constraints.json");
+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":"fff17902f8fa033d5b67c6131ea2ff01b80f9a9c8e02dd0511e1e87521d23e47","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":"b42ecb0edb9e92f5de47fbac632b3f6edcb0160546619dc619ba75a9f070e791","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"}
+137 -1
View File
@@ -24,6 +24,7 @@ use asic_rs_core::{
miner::TuningTarget,
operating_state::OperatingState,
pool::{PoolData, PoolGroupData, PoolURL},
psu::PsuInfo,
},
traits::{miner::*, model::MinerModel},
util::unix_timestamp_secs,
@@ -436,6 +437,26 @@ impl GetDataLocations for PowerPlayV1 {
tag: None,
},
)],
// PSU: live stats from summary + rated envelope/identity from
// capabilities, tagged so parse_psu can read both (round 17 R5/G15).
DataField::Psu => vec![
(
WEB_SUMMARY,
DataExtractor {
func: get_by_pointer,
key: Some("/Power Supply Stats"),
tag: Some("stats"),
},
),
(
WEB_CAPABILITIES,
DataExtractor {
func: get_by_pointer,
key: Some("/Psu Info"),
tag: Some("info"),
},
),
],
DataField::TuningTarget => vec![(
WEB_SUMMARY,
DataExtractor {
@@ -452,6 +473,25 @@ 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,
},
)],
// Board temperature thresholds (round 19 #10, T3); summary /Misc carries
// Critical Temp and Shutdown Temp. Already fetched.
DataField::TemperatureLimits => vec![(
WEB_SUMMARY,
DataExtractor {
func: get_by_pointer,
key: Some("/Misc"),
tag: None,
},
)],
DataField::Hashboards => vec![
(
WEB_TEMPS,
@@ -554,6 +594,16 @@ impl GetDataLocations for PowerPlayV1 {
tag: None,
},
)],
// Auto-tuner status (round 19 #10, T3): PowerPlay PerpetualTune; summary
// already fetched.
DataField::TunerStatus => vec![(
WEB_SUMMARY,
DataExtractor {
func: get_by_pointer,
key: Some("/PerpetualTune"),
tag: None,
},
)],
DataField::LightFlashing => vec![(
WEB_SUMMARY,
DataExtractor {
@@ -776,6 +826,21 @@ impl GetHashboards for PowerPlayV1 {
.pointer("/Capabilities/Performance Estimator/Hashes Per Second Per Chip")
.and_then(|v| v.as_f64());
// ASIC chip type + hashboard model from capabilities (round 19 #10);
// capabilities reports them miner-wide, so apply to every board.
let chip_type =
api_data.pointer("/Capabilities/Chip Type").and_then(|v| v.as_str()).map(str::to_string);
let hashboard_model = api_data
.pointer("/Capabilities/Model Subtype")
.and_then(|v| v.as_str())
.map(str::to_string);
if chip_type.is_some() || hashboard_model.is_some() {
for board in &mut hashboards {
board.chip_type = chip_type.clone();
board.hashboard_model = hashboard_model.clone();
}
}
// Active status
if let Some(boards) = api_data
.pointer("/Summary/HBStatus")
@@ -1084,17 +1149,57 @@ 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 {}
impl GetTuningCapabilities for PowerPlayV1 {}
impl GetFluidTemperature for PowerPlayV1 {}
impl GetFluidTemperature for PowerPlayV1 {
fn parse_temperature_limits(
&self,
data: &HashMap<DataField, Value>,
) -> (Option<f64>, Option<f64>, Option<f64>) {
// ePIC summary /Misc: Shutdown Temp (hot) + Critical Temp (dangerous); no
// target threshold reported (round 19 #10, T3).
let d = data.get(&DataField::TemperatureLimits);
let f = |k: &str| {
d.and_then(|v| v.pointer(k))
.and_then(|v| v.as_f64())
.filter(|v| v.is_finite() && *v > 0.0)
};
(None, f("/Shutdown Temp"), f("/Critical Temp"))
}
}
impl GetWattage for PowerPlayV1 {
fn parse_wattage(&self, data: &HashMap<DataField, Value>) -> Option<Power> {
data.extract_map::<f64, _>(DataField::Wattage, Power::from_watts)
}
fn parse_psu(&self, data: &HashMap<DataField, Value>) -> Option<PsuInfo> {
// DataField::Psu is the merged {stats: Power Supply Stats, info: Psu Info}
// (see get_locations). capabilities Vout + summary Target Voltage are in
// millivolts; summary Output Voltage/Current are already volts/amps.
let d = data.get(&DataField::Psu)?;
let stats = d.pointer("/stats");
let info = d.pointer("/info");
let f = |v: Option<&Value>, key: &str| v.and_then(|o| o.pointer(key)).and_then(tuning_value_as_f64);
let psu = PsuInfo {
model: f(info, "/PSU Type").map(|n| format!("{n:.0}")),
version: f(info, "/FW").map(|n| format!("{n:.0}")),
serial: None, // ePIC capabilities does not report a PSU serial
voltage_min: f(info, "/Min Vout").map(|mv| mv / 1000.0),
voltage_max: f(info, "/Max Vout").map(|mv| mv / 1000.0),
output_voltage: f(stats, "/Output Voltage"),
output_current: f(stats, "/Output Current"),
};
(psu != PsuInfo::default()).then_some(psu)
}
}
fn tuning_value_as_f64(value: &Value) -> Option<f64> {
@@ -1313,6 +1418,28 @@ impl GetOperatingState for PowerPlayV1 {
.and_then(Value::as_str)
.and_then(OperatingState::from_label)
}
fn parse_tuner_status(&self, data: &HashMap<DataField, Value>) -> Option<String> {
// ePIC PerpetualTune: Running gates it; the per-algorithm Optimized flag
// distinguishes a settled tune from an in-progress one (round 19 #10, T3).
let pt = data.get(&DataField::TunerStatus)?;
if !pt.pointer("/Running").and_then(|v| v.as_bool()).unwrap_or(false) {
return Some("Off".to_string());
}
let optimized = pt
.pointer("/Algorithm")
.and_then(|v| v.as_object())
.and_then(|algos| {
algos
.values()
.filter_map(|a| a.pointer("/Optimized").and_then(|v| v.as_bool()))
.next()
});
Some(match optimized {
Some(true) => "Optimized",
_ => "Tuning",
})
.map(str::to_string)
}
}
impl GetIsMining for PowerPlayV1 {
@@ -2133,6 +2260,15 @@ 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));
// Board temp thresholds from summary /Misc (round 19 #10, T3): Shutdown->hot,
// Critical->dangerous, no target.
assert_eq!(miner_data.temp_target, None);
assert_eq!(miner_data.temp_hot, Some(85.0));
assert_eq!(miner_data.temp_dangerous, Some(100.0));
// Auto-tuner: PerpetualTune Running=true, Optimized=false -> Tuning (T3).
assert_eq!(miner_data.tuner_status.as_deref(), Some("Tuning"));
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":"0c12f7714b8486372054261afd263b61f432a446cef8ae9e6cd72550a0cf4f8f","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":"a66ca11f7ab20d83d17ef0b6106810524902e0650ac770144f3998e597dd0541","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":"e8d449dbe57fd97fa70908673438c069a050548e800b6e9762c5a622bd7acc6d","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"}
+213 -4
View File
@@ -5,6 +5,8 @@ use asic_rs_core::{
config::{
collector::{ConfigCollector, ConfigExtractor, ConfigField, ConfigLocation},
pools::{PoolConfig, PoolGroupConfig},
preset::PresetInfo,
tuning::TuningConfig,
},
data::{
board::{BoardData, ChipData, MinerControlBoard},
@@ -14,10 +16,11 @@ use asic_rs_core::{
command::MinerCommand,
device::{DeviceInfo, HashAlgorithm},
fan::FanData,
hashrate::{HashRate, HashRateUnit},
hashrate::{HashRate, HashRateUnit, HashrateAverages},
message::{MessageSeverity, MinerMessage},
miner::TuningTarget,
pool::{PoolData, PoolGroupData, PoolURL},
share::{ShareSummary, parse_cgminer_share_summary},
},
traits::{miner::*, model::MinerModel},
};
@@ -275,6 +278,11 @@ impl GetDataLocations for LuxMinerV1 {
parameters: None,
};
const RPC_TEMPCTRL: MinerCommand = MinerCommand::RPC {
command: "tempctrl",
parameters: None,
};
match data_field {
DataField::Mac => vec![(
RPC_CONFIG,
@@ -292,6 +300,26 @@ 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,
},
)],
// Board temp thresholds (round 19 #10, T3): LuxOS tempctrl reports
// ChipTarget / ChipHot / ChipDangerous.
DataField::TemperatureLimits => vec![(
RPC_TEMPCTRL,
DataExtractor {
func: get_by_pointer,
key: Some("/TEMPCTRL/0"),
tag: None,
},
)],
DataField::ApiVersion => vec![(
RPC_VERSION,
DataExtractor {
@@ -453,6 +481,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 {
@@ -535,6 +573,16 @@ impl GetDataLocations for LuxMinerV1 {
tag: None,
},
)],
// LuxOS summary exposes full rolling windows GHS 1m/5m/15m/24h
// (GigaHash); RPC_SUMMARY is already fetched (round 19 #10, T2).
DataField::HashrateAverages => vec![(
RPC_SUMMARY,
DataExtractor {
func: get_by_pointer,
key: Some("/SUMMARY/0"),
tag: None,
},
)],
DataField::ExpectedHashrate => vec![(
RPC_DEVS,
DataExtractor {
@@ -657,6 +705,20 @@ impl GetFluidTemperature for LuxMinerV1 {
(None, None) => None,
}
}
fn parse_temperature_limits(
&self,
data: &HashMap<DataField, Value>,
) -> (Option<f64>, Option<f64>, Option<f64>) {
// LuxOS tempctrl chip thresholds ChipTarget / ChipHot / ChipDangerous
// (round 19 #10, T3).
let d = data.get(&DataField::TemperatureLimits);
let f = |k: &str| {
d.and_then(|v| v.get(k))
.and_then(|v| v.as_f64())
.filter(|v| v.is_finite() && *v > 0.0)
};
(f("ChipTarget"), f("ChipHot"), f("ChipDangerous"))
}
}
impl GetFirmwareVersion for LuxMinerV1 {
@@ -841,6 +903,30 @@ impl GetHashrate for LuxMinerV1 {
.as_unit(HashRateUnit::default())
})
}
fn parse_hashrate_averages(&self, data: &HashMap<DataField, Value>) -> Option<HashrateAverages> {
// LuxOS summary GHS 1m/5m/15m/24h (GigaHash); full window set (round 19 #10).
let d = data.get(&DataField::HashrateAverages)?;
let ghs = |k: &str| {
d.pointer(k)
.and_then(|v| v.as_f64())
.filter(|&f| f > 0.0)
.map(|f| {
HashRate {
value: f,
unit: HashRateUnit::GigaHash,
algo: self.device_info.algo,
}
.as_unit(HashRateUnit::default())
})
};
let avgs = HashrateAverages {
avg_1m: ghs("/GHS 1m"),
avg_5m: ghs("/GHS 5m"),
avg_15m: ghs("/GHS 15m"),
avg_24h: ghs("/GHS 24h"),
};
(!avgs.is_empty()).then_some(avgs)
}
}
impl GetExpectedHashrate for LuxMinerV1 {
@@ -889,6 +975,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 {
@@ -909,6 +1006,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> {
@@ -1102,6 +1203,38 @@ fn parse_profile_watts(profiles: &Value) -> Vec<(String, f64)> {
.unwrap_or_default()
}
/// Parse a LuxOS `profiles` RPC reply into the firmware's tunable presets, one
/// per dynamic profile (round 18 / roadmap G3). The `Profile Name` is the
/// identifier `profileset` expects; the pretty string summarises the profile's
/// watt / hashrate / frequency operating point, and `status` reflects `IsTuned`.
fn parse_profiles_to_presets(profiles: &Value) -> Vec<PresetInfo> {
profiles
.get("PROFILES")
.and_then(Value::as_array)
.map(|arr| {
arr.iter()
.filter_map(|p| {
let name = p.get("Profile Name").and_then(Value::as_str)?.to_string();
let watts = p.get("Watts").and_then(Value::as_f64);
let hashrate = p.get("Hashrate").and_then(Value::as_f64);
let freq = p.get("Frequency").and_then(Value::as_f64);
let pretty = match (watts, hashrate, freq) {
(Some(w), Some(h), Some(f)) => Some(format!("{w:.0} W ~ {h:.1} TH @ {f:.0} MHz")),
(Some(w), Some(h), None) => Some(format!("{w:.0} W ~ {h:.1} TH")),
(Some(w), None, _) => Some(format!("{w:.0} W")),
_ => None,
};
let status = p
.get("IsTuned")
.and_then(Value::as_bool)
.map(|t| if t { "tuned" } else { "untuned" }.to_string());
Some(PresetInfo { name, pretty, status })
})
.collect()
})
.unwrap_or_default()
}
/// Choose the LuxOS profile name to satisfy a watts power limit: the highest-watt
/// profile that does not exceed `target_w`, or -- when the target is below every
/// profile -- the lowest-watt profile. Returns None only when there are no
@@ -1284,7 +1417,38 @@ impl Validate for LuxMinerV1 {
#[async_trait]
impl SupportsTuningConfig for LuxMinerV1 {
fn supports_tuning_config(&self) -> bool {
false
true
}
/// LuxOS tunes by named profile (roadmap G3). A `Preset` target is applied
/// straight through `profileset`; a `Power` target reuses the watts->profile
/// mapping in `set_power_limit`. LuxOS has no hashrate/mining-mode targets and
/// per-board manual tuning is not wired, so those targets are refused.
async fn set_tuning_config(
&self,
config: TuningConfig,
_scaling_config: Option<asic_rs_core::config::scaling::ScalingConfig>,
) -> anyhow::Result<bool> {
match config.target {
TuningTarget::Preset(name) => {
let resp = self.rpc.profileset(&name).await?;
Ok(resp
.pointer("/STATUS/0/STATUS")
.and_then(Value::as_str)
.map(|s| matches!(s, "S" | "I"))
.unwrap_or(true))
}
TuningTarget::Power(p) => self.set_power_limit(p).await,
TuningTarget::HashRate(_) => {
anyhow::bail!("LuxOS does not tune by hashrate target; select a named profile")
}
TuningTarget::MiningMode(_) => {
anyhow::bail!("LuxOS has no mining modes; select a named profile")
}
TuningTarget::Manual { .. } => {
anyhow::bail!("Per-board manual tuning is not wired for LuxOS")
}
}
}
}
@@ -1299,7 +1463,21 @@ impl SupportsTemperatureConfig for LuxMinerV1 {}
impl GetTuningPercent for LuxMinerV1 {}
impl SetTuningPercent for LuxMinerV1 {}
impl SupportsPresets for LuxMinerV1 {}
#[async_trait]
impl SupportsPresets for LuxMinerV1 {
fn supports_presets(&self) -> bool {
true
}
/// The firmware's tunable profiles, read live from the `profiles` RPC (roadmap
/// G3). Never hardcoded -- the step list varies by model and tune state.
async fn get_presets(&self) -> Vec<PresetInfo> {
match self.rpc.profiles().await {
Ok(profiles) => parse_profiles_to_presets(&profiles),
Err(_) => Vec::new(),
}
}
}
#[cfg(test)]
mod tests {
use std::sync::{Arc, Mutex};
@@ -1316,7 +1494,8 @@ mod tests {
use super::*;
use crate::test::json::v1::{
CONFIG, DEVS, EVENTS, FANS, HEALTHCHIPGET_0, HEALTHCHIPGET_1, HEALTHCHIPGET_2, POOLS,
POWER, PROFILES, STATS, SUMMARY, TEMPS, VERSION, VOLTAGEGET_0, VOLTAGEGET_1, VOLTAGEGET_2,
POWER, PROFILES, STATS, SUMMARY, TEMPCTRL, TEMPS, VERSION, VOLTAGEGET_0, VOLTAGEGET_1,
VOLTAGEGET_2,
};
#[test]
@@ -1361,6 +1540,22 @@ mod tests {
assert!(select_profile_at_or_below(&parsed, 2500.0).is_some());
}
#[test]
fn profiles_parse_to_presets() {
// The `profiles` reply becomes one PresetInfo per profile (roadmap G3).
let profiles: Value = serde_json::from_str(PROFILES).unwrap();
let presets = parse_profiles_to_presets(&profiles);
assert_eq!(presets.len(), 25, "one preset per fixture profile");
// The factory point is named "default"; its pretty string carries the
// watt / hashrate / frequency operating point.
let default = presets.iter().find(|p| p.name == "default").unwrap();
assert_eq!(default.pretty.as_deref(), Some("2794 W ~ 121.8 TH @ 590 MHz"));
// IsTuned maps to the status string.
let tuned = presets.iter().find(|p| p.name == "290MHz").unwrap();
assert_eq!(tuned.status.as_deref(), Some("tuned"));
assert_eq!(default.status.as_deref(), Some("untuned"));
}
#[tokio::test]
async fn test_luxminer_v1() -> anyhow::Result<()> {
@@ -1417,6 +1612,11 @@ mod tests {
parameters: None,
};
let tempctrl_cmd = MinerCommand::RPC {
command: "tempctrl",
parameters: None,
};
results.insert(version_cmd, Value::from_str(VERSION)?);
results.insert(stats_cmd, Value::from_str(STATS)?);
results.insert(summary_cmd, Value::from_str(SUMMARY)?);
@@ -1426,6 +1626,7 @@ mod tests {
results.insert(power_cmd, Value::from_str(POWER)?);
results.insert(profiles_cmd, Value::from_str(PROFILES)?);
results.insert(temps_cmd, Value::from_str(TEMPS)?);
results.insert(tempctrl_cmd, Value::from_str(TEMPCTRL)?);
results.insert(devs_cmd, Value::from_str(DEVS)?);
results.insert(
MinerCommand::RPC {
@@ -1536,6 +1737,14 @@ 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));
// Board temp thresholds from tempctrl ChipTarget/ChipHot/ChipDangerous
// (round 19 #10, T3).
assert_eq!(miner_data.temp_target, Some(83.0));
assert_eq!(miner_data.temp_hot, Some(93.0));
assert_eq!(miner_data.temp_dangerous, Some(100.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);
@@ -10,6 +10,7 @@ pub(crate) const PROFILES: &str = include_str!("profiles.json");
pub(crate) const STATS: &str = include_str!("stats.json");
pub(crate) const SUMMARY: &str = include_str!("summary.json");
pub(crate) const TEMPS: &str = include_str!("temps.json");
pub(crate) const TEMPCTRL: &str = include_str!("tempctrl.json");
pub(crate) const VERSION: &str = include_str!("version.json");
pub(crate) const EVENTS: &str = include_str!("events.json");
@@ -0,0 +1,26 @@
{
"STATUS": [
{
"Code": 200,
"Description": "LUXminer 2026.9.21.003141-c8f244146",
"Msg": "Temperature control",
"STATUS": "S",
"When": 1790206067
}
],
"TEMPCTRL": [
{
"ChipDangerous": 100.0,
"ChipHot": 93.0,
"ChipTarget": 83.0,
"Dangerous": 70.0,
"Hot": 65.0,
"Mode": "Automatic",
"Target": 45.0,
"WaterInletDangerous": 50.0,
"WaterInletHot": 49.0,
"WaterInletStartup": 15.0
}
],
"id": 1
}
+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":"12ece361e797e765d9a8d0d233ae045a68f3473faa5da14ada40fdb691abf3a0","Cargo.lock":"b527674a090d313c33a0a22c4d0a81936d5e9c13c2dc4e0d5f468d0d4421f1b8","Cargo.toml":"2ab1a2951b599aa549512faaeadf0d386d291fe6505dc29bf164b234be40869b","Cargo.toml.orig":"8436254854a45004b0cbb2d518fa4b59832cac91de1e5600de32f5baa4300a8c","src/backends/mod.rs":"947a81f33fa6ec8c3a801ad127f59ad78d96de927c3e86bee4587e2aace2914d","src/backends/v2025/mod.rs":"4c7fbda80d5a4717a655538b043f9fe55bd24b676a14ac97f32a53f51a0be40d","src/backends/v2025/rpc.rs":"2ed396bfed1e5d39cd20f90629b10acbde98d8e5c6d35e42ab5309343c90aa8c","src/backends/v2025/web.rs":"07ceefc9813f9c12df4312b249ac9cd49eebaf8466478cf5cfb6c13cc85eee65","src/firmware.rs":"69a62f81a6e7e94b75c1f952f77403451da6945b0683d2e5edfcbd585cc6921e","src/lib.rs":"53f7acddeff8f7d82f80d09e0a9f91962011f9ccf2e441c4ca05cd7fc4eb292e","src/test/json/mod.rs":"53e0a575ba942b132519c759b328a9ca8fcd67aca3fbfa93b5266ee9661f3579","src/test/json/v2025/get_system_info.json":"d394dd5a4874846c7ab019723e7a6e6c64800ad90fb913bf4ab97af0d806c5ce","src/test/json/v2025/miner_psu_status.json":"d62162f8eb00c4494f9ea421f5f47be13cf89091b9416de38d18fadb33458372","src/test/json/v2025/mod.rs":"8bb0fd3c0af51ece34903a79085e285e99c6dd0f2d11f3e020515d399fc78696","src/test/json/v2025/pools.json":"6ab4894d5b6c6d6359a3d21189be3bffd17f7bd820816a12293e2e8911dbeb6f","src/test/json/v2025/stats.json":"4d54226c4396aba5151a6195744a78c3e60f2807af918849196e76d180ae55c6","src/test/json/v2025/summary.json":"f794595e7068ebc7ace7176f4381b61464057aaa3170d5307971e5fc1a2a37be","src/test/json/v2025/version.json":"177606e67c34a59867b320cb0fe8bf2d1d743ee1e8f14a24b7c588910f9ad22c","src/test/mod.rs":"ed52c3d613eabc4a0346bb38bcfdf7a94933d61e368d3c9094821edeab92f81b"},"package":"ff5e051802299683f94b3a3771f065071551c85a1cd21dc09a5f05efce0e90d5"}
{"$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":"12ece361e797e765d9a8d0d233ae045a68f3473faa5da14ada40fdb691abf3a0","Cargo.lock":"b527674a090d313c33a0a22c4d0a81936d5e9c13c2dc4e0d5f468d0d4421f1b8","Cargo.toml":"2ab1a2951b599aa549512faaeadf0d386d291fe6505dc29bf164b234be40869b","Cargo.toml.orig":"8436254854a45004b0cbb2d518fa4b59832cac91de1e5600de32f5baa4300a8c","src/backends/mod.rs":"947a81f33fa6ec8c3a801ad127f59ad78d96de927c3e86bee4587e2aace2914d","src/backends/v2025/mod.rs":"db8ee27c551ae6b5e312e0975823839e3b465ccfdbecc190da2c4e40fa0db1ad","src/backends/v2025/rpc.rs":"2ed396bfed1e5d39cd20f90629b10acbde98d8e5c6d35e42ab5309343c90aa8c","src/backends/v2025/web.rs":"07ceefc9813f9c12df4312b249ac9cd49eebaf8466478cf5cfb6c13cc85eee65","src/firmware.rs":"69a62f81a6e7e94b75c1f952f77403451da6945b0683d2e5edfcbd585cc6921e","src/lib.rs":"53f7acddeff8f7d82f80d09e0a9f91962011f9ccf2e441c4ca05cd7fc4eb292e","src/test/json/mod.rs":"53e0a575ba942b132519c759b328a9ca8fcd67aca3fbfa93b5266ee9661f3579","src/test/json/v2025/get_system_info.json":"d394dd5a4874846c7ab019723e7a6e6c64800ad90fb913bf4ab97af0d806c5ce","src/test/json/v2025/miner_psu_status.json":"d62162f8eb00c4494f9ea421f5f47be13cf89091b9416de38d18fadb33458372","src/test/json/v2025/mod.rs":"8bb0fd3c0af51ece34903a79085e285e99c6dd0f2d11f3e020515d399fc78696","src/test/json/v2025/pools.json":"6ab4894d5b6c6d6359a3d21189be3bffd17f7bd820816a12293e2e8911dbeb6f","src/test/json/v2025/stats.json":"4d54226c4396aba5151a6195744a78c3e60f2807af918849196e76d180ae55c6","src/test/json/v2025/summary.json":"f794595e7068ebc7ace7176f4381b61464057aaa3170d5307971e5fc1a2a37be","src/test/json/v2025/version.json":"177606e67c34a59867b320cb0fe8bf2d1d743ee1e8f14a24b7c588910f9ad22c","src/test/mod.rs":"ed52c3d613eabc4a0346bb38bcfdf7a94933d61e368d3c9094821edeab92f81b"},"package":"ff5e051802299683f94b3a3771f065071551c85a1cd21dc09a5f05efce0e90d5"}
@@ -474,6 +474,7 @@ impl GetHashboards for SealMinerV2025 {
frequency: freq,
tuned,
active: Some(online),
..Default::default()
}
})
.collect()
+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":"de321c89f62a60690ba07d6bb145ac688c6141c458638e68b3ed36b50b8de1f1","Cargo.lock":"5942ec7c9cf5c201bd32442d65020dc3ae72e33cb5aaf374b2a26501571a1487","Cargo.toml":"cb9ee00cbb415fa66a71a7d4822839bb3552336ec9ab975ae7b1137c711449cb","Cargo.toml.orig":"08409c395e4d502015da62e97efdc9c5bc6e3076031144f3f5aa35c900c7c735","src/backends/mod.rs":"26591e67688f8d015242295dde5050c4b34986e9980018a855346291a0472206","src/backends/v1_2_0/mod.rs":"fc68a12769890e18231255c6a53cb2c68e4706a887d91f49113c6192684340d2","src/backends/v1_2_0/web.rs":"ac89f16bf623f7d85590d34b45c99b0e522d9d434b4c22af7fa8a8a653e09d2e","src/backends/v1_3_0/mod.rs":"0bba1bf94e7a86d763dbedda3bb5d68cf760e17f744204b0bbc0de4e3754f795","src/backends/v1_3_0/web.rs":"1ec4cbe6bdc26f165d9e54e9bf2aac4c3706357ce4677dc21113710d4a26c3c1","src/firmware.rs":"168eeffaef90cb1525bb2e126e73905b5205d49215437263813e30323f6b7a05","src/lib.rs":"16ea1c0007fa6d6c86c1f83d3ac9cdf065cd9936cd52f35ef89c227397bbc54a","src/timezone.rs":"309bf23de1bdc9126bde5db8dabff0d2c0fea797dbf2630a772a18539838a05e"},"package":"1cb662e56f104c0fe45c8ccdac13f60cbcaad45ac228f939c6ac46ff40335052"}
{"$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":"de321c89f62a60690ba07d6bb145ac688c6141c458638e68b3ed36b50b8de1f1","Cargo.lock":"5942ec7c9cf5c201bd32442d65020dc3ae72e33cb5aaf374b2a26501571a1487","Cargo.toml":"cb9ee00cbb415fa66a71a7d4822839bb3552336ec9ab975ae7b1137c711449cb","Cargo.toml.orig":"08409c395e4d502015da62e97efdc9c5bc6e3076031144f3f5aa35c900c7c735","src/backends/mod.rs":"26591e67688f8d015242295dde5050c4b34986e9980018a855346291a0472206","src/backends/v1_2_0/mod.rs":"a1b0eb9e2e57cad0190eb8f31dafff0999e31c3602db2b8d84e9dd45c955b623","src/backends/v1_2_0/web.rs":"ac89f16bf623f7d85590d34b45c99b0e522d9d434b4c22af7fa8a8a653e09d2e","src/backends/v1_3_0/mod.rs":"9aa230fe942ca775f812300f0041f5565861ef32ad73207e48d02b41e423ee25","src/backends/v1_3_0/web.rs":"1ec4cbe6bdc26f165d9e54e9bf2aac4c3706357ce4677dc21113710d4a26c3c1","src/firmware.rs":"168eeffaef90cb1525bb2e126e73905b5205d49215437263813e30323f6b7a05","src/lib.rs":"16ea1c0007fa6d6c86c1f83d3ac9cdf065cd9936cd52f35ef89c227397bbc54a","src/timezone.rs":"309bf23de1bdc9126bde5db8dabff0d2c0fea797dbf2630a772a18539838a05e"},"package":"1cb662e56f104c0fe45c8ccdac13f60cbcaad45ac228f939c6ac46ff40335052"}
+167 -11
View File
@@ -20,7 +20,7 @@ use asic_rs_core::{
device::DeviceInfo,
fan::FanData,
hashrate::{HashRate, HashRateUnit},
message::{MessageSeverity, MinerMessage},
message::{MessageSeverity, MinerComponent, MinerMessage},
miner::TuningTarget,
operating_state::OperatingState,
pool::{PoolData, PoolGroupData, PoolURL},
@@ -296,6 +296,16 @@ impl GetDataLocations for VnishV120 {
tag: Some("unit"),
},
),
// Per-board hashboard model ("board_model") from factory-info, which
// the live /chains + /summary do not carry. Already fetched for serial.
(
WEB_FACTORY_INFO,
DataExtractor {
func: get_by_pointer,
key: Some("/chains"),
tag: Some("factory"),
},
),
],
DataField::Chips => vec![(
WEB_CHAINS,
@@ -353,14 +363,26 @@ impl GetDataLocations for VnishV120 {
tag: None,
},
)],
DataField::Messages => vec![(
WEB_SUMMARY,
DataExtractor {
func: get_by_pointer,
key: Some("/miner/miner_status"),
tag: None,
},
)],
DataField::Messages => vec![
(
WEB_SUMMARY,
DataExtractor {
func: get_by_pointer,
key: Some("/miner/miner_status"),
tag: Some("miner_status"),
},
),
// Per-hashboard diagnostics (chip status buckets + per-chain state)
// for per-board fault messages in parse_messages.
(
WEB_SUMMARY,
DataExtractor {
func: get_by_pointer,
key: Some("/miner/chains"),
tag: Some("chains"),
},
),
],
DataField::TuningTarget => vec![(
WEB_SETTINGS,
DataExtractor {
@@ -369,6 +391,25 @@ impl GetDataLocations for VnishV120 {
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("/miner/cooling/fan_duty"),
tag: None,
},
)],
// Board temp thresholds (round 19 #10, T3): settings restart_temp
// (dangerous) + auto cooling target. Settings already fetched.
DataField::TemperatureLimits => vec![(
WEB_SETTINGS,
DataExtractor {
func: get_by_pointer,
key: Some("/miner"),
tag: None,
},
)],
_ => vec![],
}
}
@@ -462,6 +503,11 @@ impl GetHashboards for VnishV120 {
.unwrap_or(HashRateUnit::GigaHash);
let algo = self.device_info.algo;
let chip_chains = data.get(&DataField::Chips).and_then(|v| v.as_array());
// Factory-info chains carry the hashboard model (board_model), keyed by the
// same 1-based chain id. Not present on the live /chains or /summary.
let factory_chains = hashboards_data
.and_then(|v| v.pointer("/factory"))
.and_then(|v| v.as_array());
let mut hashboards: Vec<BoardData> =
(0..self.device_info.hardware.board_count().unwrap_or(0) as usize)
@@ -611,6 +657,16 @@ impl GetHashboards for VnishV120 {
.and_then(|v| v.as_str())
.map(|s| s == "mining")
.or_else(|| board.hashrate.as_ref().map(|h| h.value > 0.0));
// Hashboard model from factory-info (board_model), matched by chain id.
board.hashboard_model = factory_chains.and_then(|chains| {
chains
.iter()
.find(|c| c.pointer("/id").and_then(|v| v.as_u64()) == Some(id))
.and_then(|c| c.pointer("/board_model"))
.and_then(|v| v.as_str())
.filter(|s| !s.is_empty())
.map(String::from)
});
}
hashboards
@@ -678,6 +734,12 @@ impl GetFans for VnishV120 {
fans
}
fn parse_fan_speed_percent(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
// VNish summary /miner/cooling/fan_duty is a miner-level duty % (round 19 #10).
data.get(&DataField::FanSpeedPercent)
.and_then(|v| v.as_f64())
.filter(|v| v.is_finite() && *v >= 0.0)
}
}
impl GetPsuFans for VnishV120 {}
@@ -766,6 +828,26 @@ impl GetFluidTemperature for VnishV120 {
.max()
.map(|t| Temperature::from_celsius(t as f64))
}
fn parse_temperature_limits(
&self,
data: &HashMap<DataField, Value>,
) -> (Option<f64>, Option<f64>, Option<f64>) {
// VNish settings: restart_temp is the dangerous threshold; the auto cooling
// mode "param" is the target temperature. No hot threshold (round 19 #10, T3).
let m = data.get(&DataField::TemperatureLimits);
let dangerous = m
.and_then(|v| v.pointer("/misc/restart_temp"))
.and_then(|v| v.as_f64())
.filter(|v| v.is_finite() && *v > 0.0);
let target = m
.filter(|v| {
v.pointer("/cooling/settings/mode/name").and_then(|n| n.as_str()) == Some("auto")
})
.and_then(|v| v.pointer("/cooling/settings/mode/param"))
.and_then(|v| v.as_f64())
.filter(|v| v.is_finite() && *v > 0.0);
(target, None, dangerous)
}
}
impl GetWattage for VnishV120 {
@@ -805,9 +887,12 @@ impl GetMessages for VnishV120 {
/// reported here rather than computed from invented thresholds.
fn parse_messages(&self, data: &HashMap<DataField, Value>) -> Vec<MinerMessage> {
let mut messages = Vec::new();
let msg = data.get(&DataField::Messages);
if let Some(status) = data.get(&DataField::Messages)
&& let Some(state) = status.pointer("/miner_state").and_then(|v| v.as_str())
// Miner-level state verdict (now under the "miner_status" tag).
if let Some(state) = msg
.and_then(|v| v.pointer("/miner_status/miner_state"))
.and_then(|v| v.as_str())
{
let normal = matches!(
state.to_lowercase().as_str(),
@@ -827,6 +912,77 @@ impl GetMessages for VnishV120 {
}
}
// Per-hashboard faults from the summary chains (round 20 #1). VNish reports
// per-chip status buckets (`red` = failed, `orange` = degraded, `grey` =
// healthy) and a per-chain state; attribute each fault to its own board so
// the Health column reds the right hashboard icon and that icon's tooltip
// carries the specific fault, instead of everything landing on the miner-
// level (brain) message. Chain ids are 1-based; board positions are 0-based.
if let Some(chains) = msg
.and_then(|v| v.pointer("/chains"))
.and_then(|v| v.as_array())
{
for chain in chains {
let Some(id) = chain.pointer("/id").and_then(|v| v.as_u64()) else {
continue;
};
let idx = id.saturating_sub(1) as u16;
let red = chain
.pointer("/chip_statuses/red")
.and_then(|v| v.as_u64())
.unwrap_or(0);
let orange = chain
.pointer("/chip_statuses/orange")
.and_then(|v| v.as_u64())
.unwrap_or(0);
let state = chain
.pointer("/status/state")
.and_then(|v| v.as_str())
.unwrap_or("");
let state_ok = matches!(
state.to_lowercase().as_str(),
"" | "mining" | "auto-tuning" | "auto_tuning" | "tuning"
);
// Severity reflects whether the board is still doing its job. A board
// NOT in a normal mining state is down -> Error (red). A board that is
// still mining but has some failed/degraded chips is sub-optimal, not
// broken -> Warning (yellow): dead chips while the board keeps hashing
// near its target are wear, not a fault (a ~83%-hashrate board must not
// read as broken).
if !state_ok {
let detail = if red > 0 {
format!("Hashboard {id}: {state} ({red} failed chip(s))")
} else {
format!("Hashboard {id}: {state}")
};
messages.push(MinerMessage::with_component(
0,
0,
detail,
MessageSeverity::Error,
Some(MinerComponent::hashboard(idx)),
));
} else if red > 0 {
messages.push(MinerMessage::with_component(
0,
0,
format!("Hashboard {id}: {red} failed chip(s)"),
MessageSeverity::Warning,
Some(MinerComponent::hashboard(idx)),
));
} else if orange > 0 {
messages.push(MinerMessage::with_component(
0,
0,
format!("Hashboard {id}: {orange} degraded chip(s)"),
MessageSeverity::Warning,
Some(MinerComponent::hashboard(idx)),
));
}
}
}
messages
}
}

Some files were not shown because too many files have changed in this diff Show More