Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d3a06d682f | ||
|
|
4d530721dc | ||
|
|
0b691ca943 | ||
|
|
ed0f781851 | ||
|
|
613132035a | ||
|
|
b3dc5a336e | ||
|
|
a4d0cb65f0 | ||
|
|
29b9b17c67 | ||
|
|
8deecf3558 | ||
|
|
3a6a190ce1 | ||
|
|
1f0a4cbe76 | ||
|
|
fbc43216fb | ||
|
|
a4fcb6e763 | ||
|
|
76409b0d3b | ||
|
|
4aec6d40ad | ||
|
|
33a116d9fd | ||
|
|
45d9632590 | ||
|
|
0265370be2 | ||
|
|
fadd851e04 | ||
|
|
24f9d9682d | ||
|
|
3f9fc4a24b | ||
|
|
8ab607de6c | ||
|
|
a60bb34e64 | ||
|
|
c944897807 | ||
|
|
a6e22581d7 | ||
|
|
b15de7f747 | ||
|
|
f887affd6d | ||
|
|
e5e6b0f1e1 | ||
|
|
ad28dab542 | ||
|
|
42e3bf8f5b | ||
|
|
4154a50ed0 | ||
|
|
0ab822940e | ||
|
|
c1aa6db834 | ||
|
|
7feab6117b | ||
|
|
808fd4de1d | ||
|
|
63ada5bb99 | ||
|
|
52b7c3f2a1 | ||
|
|
571c2305aa | ||
|
|
79ecc100d3 | ||
|
|
51b4eb2556 | ||
|
|
3b18219e4e | ||
|
|
bcc0ba38b6 | ||
|
|
749cdc4eed | ||
|
|
19e469ebc4 | ||
|
|
6cd732dec5 | ||
|
|
95b8428c12 | ||
|
|
a7ed34b8e4 | ||
|
|
b839e9012d | ||
|
|
d378a484d6 | ||
|
|
64e084ddee | ||
|
|
93bd528430 | ||
|
|
e45e6eaf91 | ||
|
|
e5a6cc2b5e | ||
|
|
6fb73c9746 | ||
|
|
49985631d4 | ||
|
|
8fe61ec427 | ||
|
|
34a1a1f3b1 | ||
|
|
0db89d6c55 | ||
|
|
08b3d56864 | ||
|
|
4e825f3ee5 | ||
|
|
8e67c50fe0 | ||
|
|
da0d1582be | ||
|
|
7f802c568f | ||
|
|
86338062a5 | ||
|
|
c4c85d5b3d | ||
|
|
25c8ccf1ff | ||
|
|
307539543d | ||
|
|
561c50e5dc | ||
|
|
74b97162f5 | ||
|
|
75663f4c23 | ||
|
|
9eb6a0f229 | ||
|
|
bafbd519bb | ||
|
|
0d19e958f0 |
@@ -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",
|
||||
]
|
||||
@@ -0,0 +1,45 @@
|
||||
name: next-build
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [next]
|
||||
|
||||
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 --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.GITHUB_TOKEN }}
|
||||
run: python3 ci/release-rc.py "${{ steps.version.outputs.tag }}" true "dist/alkane-toolkit-${{ steps.version.outputs.version }}-linux-x86_64.tar.gz"
|
||||
@@ -11,6 +11,9 @@ jobs:
|
||||
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 +25,9 @@ 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: Install build dependencies
|
||||
if: steps.ver.outputs.release == 'true'
|
||||
run: |
|
||||
apt-get update -qq
|
||||
apt-get install -y -qq --no-install-recommends \
|
||||
@@ -34,14 +35,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 +48,11 @@ 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
|
||||
|
||||
- name: Set crate version to ${{ steps.ver.outputs.version }}
|
||||
if: steps.ver.outputs.release == 'true'
|
||||
run: |
|
||||
@@ -56,31 +60,120 @@ 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
|
||||
|
||||
- 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 --release --offline -- --ignored --nocapture bench_ \
|
||||
| tee bench-current.txt
|
||||
|
||||
- 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 the unit tests AND the headless self-test (ci/coverage.sh)
|
||||
# so the committed badge reflects real coverage, not the tests-only number a
|
||||
# plain `cargo llvm-cov` reports. Best-effort: cargo-llvm-cov is fetched as a
|
||||
# prebuilt binary because the vendored .cargo/config blocks `cargo install`,
|
||||
# and the instrumented rebuild is slow, so a failure here never blocks a
|
||||
# release. Feeds steps.cov.outputs.pct to the badge refresh below. xvfb is
|
||||
# already installed by the self-test step above.
|
||||
- name: Coverage (best-effort)
|
||||
id: cov
|
||||
continue-on-error: true
|
||||
run: |
|
||||
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" \
|
||||
|| echo "cargo-llvm-cov download failed"
|
||||
fi
|
||||
if command -v cargo-llvm-cov >/dev/null 2>&1; then
|
||||
PCT=$(bash ci/coverage.sh --summary-only 2>/dev/null \
|
||||
| awk '/^TOTAL/{gsub(/%/,"",$10); print $10}')
|
||||
if [ -n "$PCT" ]; then
|
||||
echo "pct=${PCT}" >> "$GITHUB_OUTPUT"
|
||||
echo "line coverage (tests + self-test): ${PCT}%"
|
||||
else
|
||||
echo "coverage report produced no TOTAL line; badge left as committed"
|
||||
fi
|
||||
else
|
||||
echo "cargo-llvm-cov unavailable; coverage badge left as committed"
|
||||
fi
|
||||
|
||||
- name: Microbenchmark coverage
|
||||
id: benchcov
|
||||
run: |
|
||||
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}%"
|
||||
|
||||
# Refresh the committed README badges from live metrics and push any change
|
||||
# back to main. Best-effort: a locked-down runner that can't push must not
|
||||
# fail the release. A badges-only push does not bump the version (see
|
||||
# compute-version.sh), so it does not loop back into another release.
|
||||
- name: Refresh badges
|
||||
if: steps.ver.outputs.release == 'true'
|
||||
continue-on-error: true
|
||||
env:
|
||||
TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
run: |
|
||||
PASS=$(cargo test -p alkane-gui --offline 2>&1 \
|
||||
| grep -hoE '[0-9]+ passed' | grep -oE '[0-9]+' | awk '{s+=$1} END{print s+0}')
|
||||
# Update the coverage badge only when the coverage step produced a number;
|
||||
# otherwise leave the committed coverage.svg untouched.
|
||||
COV="${{ steps.cov.outputs.pct }}"
|
||||
BENCH_COV="${{ steps.benchcov.outputs.pct }}"
|
||||
COV_ARG=""
|
||||
[ -n "$COV" ] && COV_ARG="--coverage $COV"
|
||||
# Weighted-average microbench delta vs the previous release (round 19 #1).
|
||||
# bench-badge.py also rewrites badges/bench-baseline.json, which is
|
||||
# committed below with the SVGs (badges/* does not trip a release bump).
|
||||
BENCH_DELTA=$(python3 ci/bench-badge.py --current bench-current.txt \
|
||||
--baseline badges/bench-baseline.json 2>/dev/null || echo NEW)
|
||||
python3 ci/gen-badges.py --tests "${PASS:-0}" $COV_ARG \
|
||||
--bench-coverage "$BENCH_COV" \
|
||||
--bench-delta "${BENCH_DELTA:-NEW}" --bench "row-render + scan-parse"
|
||||
if [ -n "$(git status --porcelain badges)" ]; then
|
||||
git config user.name "alkane-ci"
|
||||
git config user.email "ci@bluefla.re"
|
||||
git add badges
|
||||
git commit -m "ci: refresh README badges [skip release]"
|
||||
API="${GITHUB_API_URL:-https://gitea.bluefla.re/api/v1}"
|
||||
HOST="${API%/api/v1}"
|
||||
git -c http.extraheader="Authorization: token ${TOKEN}" \
|
||||
push "${HOST}/${GITHUB_REPOSITORY}.git" "HEAD:main" || echo "badge push skipped"
|
||||
else
|
||||
echo "badges unchanged"
|
||||
fi
|
||||
|
||||
- name: Package artifact
|
||||
if: steps.ver.outputs.release == 'true'
|
||||
id: pkg
|
||||
|
||||
@@ -0,0 +1,75 @@
|
||||
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
|
||||
|
||||
- name: Build
|
||||
run: cargo build --release -p alkane-gui --offline
|
||||
|
||||
- name: Unit tests
|
||||
run: cargo test -p alkane-gui --offline
|
||||
|
||||
- name: Microbenchmarks
|
||||
run: cargo test -p alkane-gui --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,3 +1,4 @@
|
||||
/target
|
||||
**/target
|
||||
.claude/
|
||||
__pycache__/
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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.
|
||||
@@ -1,38 +1,118 @@
|
||||
# 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).
|
||||
[](https://gitea.bluefla.re/blueflare/alkane-toolkit/actions)
|
||||

|
||||

|
||||

|
||||

|
||||

|
||||

|
||||

|
||||

|
||||
|
||||
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.
|
||||
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, and installs **stock** or **alkaneOS** firmware onto a
|
||||
control board whatever it currently runs (stock, VNish/AnthillOS, Braiins OS+,
|
||||
LuxOS, ePIC, HiveOn, BixBit, WardenOS).
|
||||
|
||||
## Status
|
||||
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.
|
||||
|
||||
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).
|
||||
## What it does
|
||||
|
||||
## Build + run (Debian)
|
||||
- **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).
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
{
|
||||
"bench_parse_line_near_max_addrs": 644187.0,
|
||||
"bench_parse_targets_many_ranges_near_cap": 49565223.0,
|
||||
"bench_render_cells": 3037944.0,
|
||||
"bench_sort_by_each_column": 816884.0,
|
||||
"bench_targets_to_cidrs_large_range": 443875.0,
|
||||
"bench_upsert_cold_start_population": 8871040.0,
|
||||
"bench_view_pipeline": 177652.0,
|
||||
"bench_view_pipeline_default_sort": 203830.0,
|
||||
"bench_view_pipeline_with_filter": 187371.0
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="160.5" height="20" role="img" aria-label="bench coverage: pending">
|
||||
<title>bench coverage: pending</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="160.5" 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="57.5" height="20" fill="#9f9f9f"/>
|
||||
<rect width="160.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="51.5" y="15" fill="#010101" fill-opacity=".3">bench coverage</text>
|
||||
<text x="51.5" y="14">bench coverage</text>
|
||||
<text x="131.8" y="15" fill="#010101" fill-opacity=".3">pending</text>
|
||||
<text x="131.8" y="14">pending</text>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 966 B |
@@ -0,0 +1,19 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="147.5" height="20" role="img" aria-label="bench: -79.9% vs prev">
|
||||
<title>bench: -79.9% 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="147.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="103.0" height="20" fill="#4c1"/>
|
||||
<rect width="147.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">bench</text>
|
||||
<text x="22.2" y="14">bench</text>
|
||||
<text x="96.0" y="15" fill="#010101" fill-opacity=".3">-79.9% vs prev</text>
|
||||
<text x="96.0" y="14">-79.9% vs prev</text>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 952 B |
@@ -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 |
@@ -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 |
@@ -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 |
@@ -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 |
@@ -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 |
@@ -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 |
@@ -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())
|
||||
@@ -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 -- \
|
||||
--ignored --nocapture bench_
|
||||
cargo llvm-cov report --release --ignore-filename-regex '(thirdparty|vendor)/' "$@"
|
||||
@@ -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}"
|
||||
@@ -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)
|
||||
@@ -30,12 +31,16 @@ ui=false; backend=false
|
||||
while IFS= read -r f; do
|
||||
[ -z "$f" ] && continue
|
||||
case "$f" in
|
||||
crates/alkane-gui/src/ui.rs|crates/alkane-gui/src/fixtures.rs|thirdparty/wx-rs/*)
|
||||
crates/alkane-gui/src/ui.rs|crates/alkane-gui/src/fixtures.rs|thirdparty/wx-rs/*|\
|
||||
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
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
#!/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.
|
||||
cargo llvm-cov --no-report "${CARGO_FLAGS[@]}" -p alkane-gui --bin alkane-toolkit
|
||||
|
||||
# 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)/' "$@"
|
||||
@@ -0,0 +1,210 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Generate self-contained shields-style SVG badges into badges/.
|
||||
|
||||
Self-hosted Gitea renders a README's relative image links straight from the
|
||||
repo, so committing the SVGs (rather than depending on an external badge
|
||||
service that would have to reach a possibly-private Gitea) is the robust choice.
|
||||
CI regenerates them from live metrics and commits any changes back.
|
||||
|
||||
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 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 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()
|
||||
|
||||
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 = "A" if args.clippy == "clean" else "F"
|
||||
write("quality", "code quality", grade, "brightgreen" if grade == "A" else "red")
|
||||
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())
|
||||
@@ -0,0 +1,55 @@
|
||||
#!/usr/bin/env python3
|
||||
"""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 OS build from {sha}. Conformance results are in the repository."
|
||||
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()
|
||||
@@ -1 +1,29 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free 7.3.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2026 Fonticons, Inc.--><path d="M184 120C184 89.1 209.1 64 240 64L264 64C281.7 64 296 78.3 296 96L296 544C296 561.7 281.7 576 264 576L232 576C202.2 576 177.1 555.6 170 528C169.3 528 168.7 528 168 528C123.8 528 88 492.2 88 448C88 430 94 413.4 104 400C84.6 385.4 72 362.2 72 336C72 305.1 89.6 278.2 115.2 264.9C108.1 252.9 104 238.9 104 224C104 179.8 139.8 144 184 144L184 120zM456 120L456 144C500.2 144 536 179.8 536 224C536 239 531.9 253 524.8 264.9C550.5 278.2 568 305 568 336C568 362.2 555.4 385.4 536 400C546 413.4 552 430 552 448C552 492.2 516.2 528 472 528C471.3 528 470.7 528 470 528C462.9 555.6 437.8 576 408 576L376 576C358.3 576 344 561.7 344 544L344 96C344 78.3 358.3 64 376 64L400 64C430.9 64 456 89.1 456 120z"/></svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><g transform="translate(0.000000,512.000000) scale(0.100000,-0.100000)" >
|
||||
<path d="M2152 4645 c-35 -8 -95 -28 -133 -46 l-70 -32 39 -41 c109 -115 121
|
||||
-180 41 -222 -48 -24 -74 -11 -168 85 -225 229 -555 240 -774 25 l-59 -57 57
|
||||
-22 c103 -38 134 -107 76 -166 -36 -36 -54 -36 -145 -3 -290 107 -608 -44
|
||||
-712 -339 -13 -36 -13 -39 4 -32 147 57 237 37 237 -54 0 -56 -26 -78 -115
|
||||
-101 -479 -123 -584 -723 -175 -995 92 -62 102 -71 105 -100 4 -40 -1 -56 -25
|
||||
-80 -34 -35 -81 -33 -146 5 -28 17 -53 29 -55 27 -2 -2 14 -38 35 -80 114
|
||||
-227 341 -383 586 -404 l70 -5 1 103 c4 397 280 752 674 870 70 21 101 23 447
|
||||
28 l373 6 25 26 c19 18 28 42 35 85 15 107 57 173 141 219 54 30 55 30 234 33
|
||||
108 2 191 -1 207 -7 60 -23 72 -111 21 -151 -23 -18 -41 -20 -185 -20 -200 0
|
||||
-238 -16 -238 -98 0 -66 -30 -134 -84 -188 -82 -81 -98 -84 -482 -84 -348 0
|
||||
-405 -6 -526 -55 -355 -144 -547 -560 -421 -912 156 -434 650 -621 1049 -398
|
||||
60 34 224 176 224 195 0 4 -17 19 -38 33 -109 72 -138 132 -92 190 43 54 75
|
||||
48 192 -36 291 -208 673 -260 1012 -136 205 74 390 218 518 399 71 102 72 106
|
||||
48 140 -37 52 -90 177 -90 213 0 68 62 109 126 82 25 -10 36 -26 58 -81 153
|
||||
-385 618 -488 905 -201 197 197 213 494 39 725 -38 52 -148 142 -172 142 -6 0
|
||||
-20 -33 -30 -72 -33 -128 -107 -172 -175 -104 -31 32 -31 62 3 171 114 371
|
||||
-43 798 -372 1015 -71 47 -198 108 -206 99 -3 -2 13 -40 35 -84 46 -92 43
|
||||
-132 -12 -160 -64 -34 -95 -17 -149 81 -251 454 -793 618 -1249 378 -99 -52
|
||||
-140 -57 -176 -18 -43 46 -30 109 28 144 l31 19 -39 17 c-102 42 -247 54 -363
|
||||
29z"/>
|
||||
<path d="M4064 2007 c-184 -270 -531 -485 -854 -529 -49 -7 -90 -16 -90 -20 0
|
||||
-19 163 -171 228 -213 494 -318 1255 -101 1387 395 15 55 18 199 6 254 l-6 30
|
||||
-155 1 c-119 1 -168 6 -210 19 -67 22 -184 79 -226 111 l-31 24 -49 -72z"/>
|
||||
<path d="M2431 1509 c-51 -58 -53 -62 -47 -103 13 -83 97 -179 179 -205 18 -5
|
||||
62 -12 98 -16 138 -13 125 -2 531 -464 231 -265 244 -275 305 -259 63 17 68
|
||||
37 68 276 l0 214 -80 27 c-237 80 -440 241 -552 441 -23 41 -33 50 -56 50 -49
|
||||
0 -179 30 -284 66 -55 19 -103 34 -105 34 -2 0 -28 -27 -57 -61z"/>
|
||||
</g></svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 920 B After Width: | Height: | Size: 2.0 KiB |
@@ -1 +1,38 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free 7.3.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2026 Fonticons, Inc.--><path d="M224 208C224 128.5 288.5 64 368 64C376.8 64 384 71.2 384 80L384 232.2C399 226.9 415.2 224 432 224C511.5 224 576 288.5 576 368C576 376.8 568.8 384 560 384L407.8 384C413.1 399 416 415.2 416 432C416 511.5 351.5 576 272 576C263.2 576 256 568.8 256 560L256 407.8C241 413.1 224.8 416 208 416C128.5 416 64 351.5 64 272C64 263.2 71.2 256 80 256L232.2 256C226.9 241 224 224.8 224 208zM320 352C337.7 352 352 337.7 352 320C352 302.3 337.7 288 320 288C302.3 288 288 302.3 288 320C288 337.7 302.3 352 320 352z"/></svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><g transform="translate(0.000000,512.000000) scale(0.100000,-0.100000)" >
|
||||
<path d="M1970 5109 c-158 -18 -233 -52 -290 -130 -63 -88 -40 -168 95 -329
|
||||
290 -345 492 -728 595 -1130 7 -25 34 -86 61 -136 l49 -91 108 -6 c76 -3 130
|
||||
-12 187 -31 44 -14 83 -22 87 -18 13 13 87 322 112 470 126 749 -33 1218 -462
|
||||
1362 -134 45 -353 60 -542 39z"/>
|
||||
<path d="M3615 4886 c-82 -30 -119 -107 -130 -271 -29 -409 -151 -830 -337
|
||||
-1160 -41 -74 -72 -146 -94 -220 l-33 -110 34 -27 c45 -38 120 -139 157 -213
|
||||
17 -33 32 -61 33 -63 10 -11 325 187 480 303 704 524 836 1036 386 1499 -221
|
||||
228 -372 307 -496 262z"/>
|
||||
<path d="M975 4370 c-226 -36 -431 -174 -638 -430 -97 -120 -131 -220 -107
|
||||
-310 24 -90 105 -132 280 -145 435 -32 872 -164 1211 -366 30 -17 103 -47 163
|
||||
-64 l108 -33 29 33 c42 48 130 113 209 154 l70 37 -56 99 c-246 438 -574 799
|
||||
-857 943 -131 67 -298 101 -412 82z"/>
|
||||
<path d="M4795 3451 c-23 -10 -86 -56 -140 -103 -326 -277 -690 -475 -1066
|
||||
-579 -76 -21 -144 -48 -205 -82 l-91 -51 -6 -105 c-3 -75 -13 -130 -31 -186
|
||||
-14 -44 -22 -83 -18 -87 10 -10 261 -74 382 -97 794 -154 1301 2 1450 447 74
|
||||
222 63 625 -20 756 -63 99 -158 131 -255 87z"/>
|
||||
<path d="M2443 3095 c-206 -45 -374 -215 -418 -422 -82 -385 263 -730 648
|
||||
-648 209 44 378 213 423 424 81 385 -268 730 -653 646z m152 -179 c59 -25 75
|
||||
-97 31 -141 -24 -24 -35 -28 -111 -40 -54 -9 -121 -76 -130 -130 -12 -76 -16
|
||||
-87 -40 -111 -26 -26 -72 -32 -107 -13 -49 26 -54 133 -10 232 45 101 163 191
|
||||
274 207 29 4 54 8 56 9 1 0 18 -5 37 -13z"/>
|
||||
<path d="M767 3009 c-562 -63 -820 -407 -758 -1013 20 -185 49 -255 133 -316
|
||||
87 -64 167 -40 333 100 329 276 698 475 1070 575 65 18 132 45 192 79 l93 51
|
||||
0 73 c0 79 21 199 46 258 20 47 20 47 -116 83 -359 95 -742 138 -993 110z"/>
|
||||
<path d="M1770 2244 c-141 -81 -339 -216 -449 -304 -716 -578 -764 -1101 -146
|
||||
-1599 106 -85 171 -115 255 -115 139 -2 184 64 206 302 43 463 178 899 372
|
||||
1206 14 23 40 90 58 151 l33 109 -40 34 c-48 41 -117 137 -155 215 -16 31 -31
|
||||
57 -34 56 -3 0 -48 -25 -100 -55z"/>
|
||||
<path d="M3098 2066 c-35 -44 -138 -121 -213 -158 -33 -17 -61 -32 -63 -33
|
||||
-12 -10 203 -350 312 -494 527 -695 1026 -820 1490 -372 193 187 268 305 270
|
||||
421 1 129 -67 183 -251 201 -210 20 -292 32 -408 55 -297 62 -591 172 -836
|
||||
314 -36 21 -106 50 -155 64 -50 14 -97 28 -105 31 -8 3 -25 -9 -41 -29z"/>
|
||||
<path d="M2256 1882 c-25 -41 -108 -428 -131 -612 -18 -143 -21 -439 -5 -550
|
||||
74 -535 419 -776 1015 -710 174 19 246 50 305 131 63 87 39 170 -92 324 -277
|
||||
326 -474 689 -579 1066 -21 74 -49 146 -82 207 l-51 92 -73 0 c-79 0 -200 21
|
||||
-257 45 -41 17 -43 18 -50 7z"/>
|
||||
</g></svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 727 B After Width: | Height: | Size: 2.5 KiB |
@@ -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)]
|
||||
|
||||
@@ -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:
|
||||
@@ -8,15 +8,26 @@
|
||||
//! Scan the given subnets and print, per responder (TSV):
|
||||
//! ip make firmware model_id control_board watts supports_power_limit supports_tuning
|
||||
//!
|
||||
//! Mutation modes (setpl) are intentionally NOT included here: asic-rs exposes
|
||||
//! no read-back of a miner's configured power limit, so an exact
|
||||
//! restore-to-prior-state cannot be guaranteed from this tool alone.
|
||||
//! miner_probe setpl <ip> <watts>
|
||||
//! Apply a power limit to ONE miner and print the setter's result. This
|
||||
//! MUTATES the device -- capture and restore its prior configured limit
|
||||
//! separately (e.g. WhatsMiner cgminer API on :4028 reports "Power Limit"
|
||||
//! read-only). asic-rs has no power-limit read-back, so this tool cannot
|
||||
//! restore on its own.
|
||||
//!
|
||||
//! Credentials come from ~/.config/alkane-toolkit/scan-credentials.txt, or from
|
||||
//! ALKANE_PROBE_USER / ALKANE_PROBE_PASS if set (so a test can authenticate
|
||||
//! without touching the app's saved config).
|
||||
|
||||
use asic_rs::MinerFactory;
|
||||
use asic_rs::core::traits::miner::MinerAuth;
|
||||
use futures_util::StreamExt;
|
||||
use measurements::Power;
|
||||
|
||||
fn load_creds() -> Option<(String, String)> {
|
||||
if let (Ok(u), Ok(pw)) = (std::env::var("ALKANE_PROBE_USER"), std::env::var("ALKANE_PROBE_PASS")) {
|
||||
return Some((u, pw));
|
||||
}
|
||||
let home = std::env::var("HOME").ok()?;
|
||||
let p = std::path::PathBuf::from(home)
|
||||
.join(".config/alkane-toolkit/scan-credentials.txt");
|
||||
@@ -28,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)");
|
||||
}
|
||||
@@ -51,7 +67,19 @@ async fn scan(cidrs: &[String]) {
|
||||
}
|
||||
};
|
||||
}
|
||||
println!("ip\tmake\tfirmware\tmodel_id\tcontrol_board\twatts\tsupports_power_limit\tsupports_tuning");
|
||||
// Cap identification concurrency to match the GUI (see
|
||||
// scan::SCAN_CONCURRENCY_LIMIT). asic-rs defaults to 1000, which over a real
|
||||
// link starves the per-responder get_data -- Braiins miners drop most values
|
||||
// (watts=0, no best-share) and some responders are missed entirely. 128 is the
|
||||
// highest cap that stayed fully reliable on the live fleet. ALKANE_PROBE_CONCURRENCY
|
||||
// overrides it for diagnostics.
|
||||
let concurrency = std::env::var("ALKANE_PROBE_CONCURRENCY")
|
||||
.ok()
|
||||
.and_then(|c| c.parse::<usize>().ok())
|
||||
.unwrap_or(128);
|
||||
eprintln!("(scan concurrency = {concurrency})");
|
||||
f = f.with_concurrent_limit(concurrency);
|
||||
println!("ip\tmake\tfirmware\tfw_version\tmodel_id\tcontrol_board\twatts\tsupports_power_limit\tsupports_tuning\tbest_share\tsession_best_share");
|
||||
let mut stream = f.scan_stream_with_ip();
|
||||
let mut found = 0usize;
|
||||
while let Some((ip, miner)) = stream.next().await {
|
||||
@@ -63,10 +91,14 @@ async fn scan(cidrs: &[String]) {
|
||||
.as_ref()
|
||||
.map(|c| c.to_string())
|
||||
.unwrap_or_default();
|
||||
let fw_ver = data.firmware_version.clone().unwrap_or_default();
|
||||
let bs = data.best_share.map(|v| format!("{v:.0}")).unwrap_or_default();
|
||||
let sbs = data.session_best_share.map(|v| format!("{v:.0}")).unwrap_or_default();
|
||||
println!(
|
||||
"{ip}\t{}\t{}\t{}\t{}\t{watts:.0}\t{}\t{}",
|
||||
"{ip}\t{}\t{}\t{}\t{}\t{}\t{watts:.0}\t{}\t{}\t{bs}\t{sbs}",
|
||||
data.device_info.make,
|
||||
data.device_info.firmware,
|
||||
fw_ver,
|
||||
data.device_info.model,
|
||||
cb,
|
||||
m.supports_set_power_limit(),
|
||||
@@ -78,6 +110,574 @@ async fn scan(cidrs: &[String]) {
|
||||
eprintln!("scan complete: {found} miner(s) responded");
|
||||
}
|
||||
|
||||
/// Dump raw hashrate value/unit/algo (and expected) as asic-rs reports them,
|
||||
/// to diagnose the SI-prefix handling for non-SHA algorithms (round-9 #8, Z15).
|
||||
async fn hashrate(cidrs: &[String]) {
|
||||
let mut f = factory();
|
||||
for c in cidrs {
|
||||
f = match f.with_subnet(c) {
|
||||
Ok(f) => f,
|
||||
Err(e) => {
|
||||
eprintln!("bad subnet {c}: {e}");
|
||||
return;
|
||||
}
|
||||
};
|
||||
}
|
||||
println!("ip\tmodel\talgo\thr_value\thr_unit\texp_value\texp_unit");
|
||||
let mut stream = f.scan_stream_with_ip();
|
||||
while let Some((ip, miner)) = stream.next().await {
|
||||
if let Some(m) = miner {
|
||||
let data = m.get_data().await;
|
||||
let hr = data.hashrate.as_ref();
|
||||
let exp = data.expected_hashrate.as_ref();
|
||||
println!(
|
||||
"{ip}\t{}\t{}\t{}\t{}\t{}\t{}",
|
||||
data.device_info.model,
|
||||
hr.map(|h| h.algo.to_string()).unwrap_or_default(),
|
||||
hr.map(|h| h.value).unwrap_or(0.0),
|
||||
hr.map(|h| format!("{:?}", h.unit)).unwrap_or_default(),
|
||||
exp.map(|h| h.value).unwrap_or(0.0),
|
||||
exp.map(|h| format!("{:?}", h.unit)).unwrap_or_default(),
|
||||
);
|
||||
}
|
||||
}
|
||||
eprintln!("hashrate dump complete");
|
||||
}
|
||||
|
||||
async fn setpl(ip_s: &str, watts: f64) {
|
||||
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 data = m.get_data().await;
|
||||
eprintln!(
|
||||
"target {ip}: {} {} {} (supports_power_limit={})",
|
||||
data.device_info.make,
|
||||
data.device_info.firmware,
|
||||
data.device_info.model,
|
||||
m.supports_set_power_limit()
|
||||
);
|
||||
match m.set_power_limit(Power::from_watts(watts)).await {
|
||||
Ok(v) => println!("set_power_limit({watts:.0} W) -> Ok({v})"),
|
||||
// {e:#} prints the full anyhow chain (the miner's own Msg is the
|
||||
// root cause), which is exactly what we need to characterise #4.
|
||||
Err(e) => println!("set_power_limit({watts:.0} W) -> Err: {e:#}"),
|
||||
}
|
||||
}
|
||||
Ok(None) => eprintln!("no miner at {ip}"),
|
||||
Err(e) => eprintln!("scan_miner {ip}: {e}"),
|
||||
}
|
||||
}
|
||||
|
||||
/// LOCAL-ONLY: toggle a miner's locate light on then back off, to validate the
|
||||
/// (token-authenticated) write path safely -- the LED is reversible and does not
|
||||
/// disturb mining. Restores the light to off afterward.
|
||||
async fn led(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)) => {
|
||||
let data = m.get_data().await;
|
||||
eprintln!(
|
||||
"target {ip}: {} {} {} (supports_set_fault_light={})",
|
||||
data.device_info.make,
|
||||
data.device_info.firmware,
|
||||
data.device_info.model,
|
||||
m.supports_set_fault_light()
|
||||
);
|
||||
match m.set_fault_light(true).await {
|
||||
Ok(v) => println!("set_fault_light(on) -> Ok({v})"),
|
||||
Err(e) => println!("set_fault_light(on) -> Err: {e:#}"),
|
||||
}
|
||||
let after_on = m.get_data().await.light_flashing;
|
||||
println!(" light_flashing after on = {after_on:?}");
|
||||
// Restore: turn the locate light back off.
|
||||
match m.set_fault_light(false).await {
|
||||
Ok(v) => println!("set_fault_light(off) [restore] -> Ok({v})"),
|
||||
Err(e) => println!("set_fault_light(off) [restore] -> Err: {e:#}"),
|
||||
}
|
||||
let after_off = m.get_data().await.light_flashing;
|
||||
println!(" light_flashing after off = {after_off:?}");
|
||||
}
|
||||
Ok(None) => eprintln!("no miner at {ip}"),
|
||||
Err(e) => eprintln!("scan_miner {ip}: {e}"),
|
||||
}
|
||||
}
|
||||
|
||||
/// Apply a single "default" pool group to ONE miner via asic-rs set_pools_config
|
||||
/// (the same path the GUI's pool feature uses). MUTATES the device's pool config.
|
||||
/// Usage: setpools <ip> <url> <user> <pass>
|
||||
async fn setpools(ip_s: &str, url: &str, user: &str, pass: &str) {
|
||||
use asic_rs::core::config::pools::{PoolConfig, PoolGroupConfig};
|
||||
use asic_rs::core::data::pool::PoolURL;
|
||||
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 data = m.get_data().await;
|
||||
eprintln!(
|
||||
"target {ip}: {} {} {} (supports_pools_config={})",
|
||||
data.device_info.make,
|
||||
data.device_info.firmware,
|
||||
data.device_info.model,
|
||||
m.supports_pools_config()
|
||||
);
|
||||
let group = PoolGroupConfig {
|
||||
name: "default".to_string(),
|
||||
quota: 1,
|
||||
pools: vec![PoolConfig {
|
||||
url: PoolURL::from(url.to_string()),
|
||||
username: user.to_string(),
|
||||
password: pass.to_string(),
|
||||
}],
|
||||
};
|
||||
match m.set_pools_config(vec![group]).await {
|
||||
Ok(v) => println!("set_pools_config -> Ok({v})"),
|
||||
Err(e) => println!("set_pools_config -> Err: {e:#}"),
|
||||
}
|
||||
// Read back the configured pools to verify.
|
||||
let after = m.get_data().await;
|
||||
for (i, p) in after.pools.iter().flat_map(|g| g.pools.iter()).enumerate() {
|
||||
let u = p.url.as_ref().map(|u| u.to_string()).unwrap_or_default();
|
||||
let acct = p.user.clone().unwrap_or_default();
|
||||
println!(" pool[{i}] {u} user={acct}");
|
||||
}
|
||||
}
|
||||
Ok(None) => eprintln!("no miner at {ip}"),
|
||||
Err(e) => eprintln!("scan_miner {ip}: {e}"),
|
||||
}
|
||||
}
|
||||
|
||||
/// READ-ONLY: dump a miner's structured messages (code + severity + component +
|
||||
/// text) plus its per-board data, to design health/error attribution.
|
||||
async fn msgs(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)) => {
|
||||
let d = m.get_data().await;
|
||||
let th = |h: &Option<asic_rs::core::data::hashrate::HashRate>| {
|
||||
h.clone().map(|x| x.as_unit(asic_rs::core::data::hashrate::HashRateUnit::TeraHash).value)
|
||||
};
|
||||
println!(
|
||||
"{ip}: {} {} hashboards={:?} expected={:?}",
|
||||
d.device_info.firmware,
|
||||
d.device_info.model,
|
||||
d.hashboards.len(),
|
||||
d.expected_hashboards,
|
||||
);
|
||||
println!(
|
||||
" TOTAL hashrate={:?} TH wattage={:?} W fluid/env_temp={:?} best_share={:?}",
|
||||
th(&d.hashrate),
|
||||
d.wattage.as_ref().map(|p| p.as_watts()),
|
||||
d.fluid_temperature.as_ref().map(|t| t.as_celsius()),
|
||||
d.best_share,
|
||||
);
|
||||
let fans: Vec<i64> = d
|
||||
.fans
|
||||
.iter()
|
||||
.map(|f| f.rpm.as_ref().map(|r| r.as_rpm() as i64).unwrap_or(-1))
|
||||
.collect();
|
||||
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={:?} 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() {
|
||||
println!(" (no messages)");
|
||||
}
|
||||
for msg in &d.messages {
|
||||
println!(
|
||||
" MSG code={} sev={:?} comp={:?} :: {}",
|
||||
msg.code, msg.severity, msg.component, msg.message
|
||||
);
|
||||
}
|
||||
}
|
||||
Ok(None) => eprintln!("no miner at {ip}"),
|
||||
Err(e) => eprintln!("scan_miner {ip}: {e}"),
|
||||
}
|
||||
}
|
||||
|
||||
/// Set the locate light to an explicit on/off state (round 16/G1). Capability-gated.
|
||||
async fn light(ip_s: &str, on: bool) {
|
||||
let Ok(ip) = ip_s.parse::<std::net::IpAddr>() else {
|
||||
eprintln!("bad ip {ip_s}");
|
||||
return;
|
||||
};
|
||||
match factory().scan_miner(ip).await {
|
||||
Ok(Some(m)) => {
|
||||
if !m.supports_set_fault_light() {
|
||||
eprintln!("{ip}: locate light not supported");
|
||||
return;
|
||||
}
|
||||
match m.set_fault_light(on).await {
|
||||
Ok(v) => println!("{ip} light {} -> Ok({v})", if on { "on" } else { "off" }),
|
||||
Err(e) => println!("{ip} light -> Err: {e:#}"),
|
||||
}
|
||||
}
|
||||
Ok(None) => eprintln!("no miner at {ip}"),
|
||||
Err(e) => eprintln!("scan_miner {ip}: {e}"),
|
||||
}
|
||||
}
|
||||
|
||||
/// Run a simple lifecycle action (restart / pause / resume) on one miner (G1).
|
||||
/// Capability-gated; MUTATES (pause/restart disrupt mining -- run on the test bed).
|
||||
async fn lifecycle(ip_s: &str, verb: &str) {
|
||||
let Ok(ip) = ip_s.parse::<std::net::IpAddr>() else {
|
||||
eprintln!("bad ip {ip_s}");
|
||||
return;
|
||||
};
|
||||
match factory().scan_miner(ip).await {
|
||||
Ok(Some(m)) => {
|
||||
let res = match verb {
|
||||
"restart" if m.supports_restart() => m.restart().await,
|
||||
"pause" if m.supports_pause() => m.pause(None).await,
|
||||
"resume" if m.supports_resume() => m.resume(None).await,
|
||||
"restart" | "pause" | "resume" => {
|
||||
eprintln!("{ip}: {verb} not supported");
|
||||
return;
|
||||
}
|
||||
_ => {
|
||||
eprintln!("unknown lifecycle verb {verb}");
|
||||
return;
|
||||
}
|
||||
};
|
||||
match res {
|
||||
Ok(v) => println!("{ip} {verb} -> Ok({v})"),
|
||||
Err(e) => println!("{ip} {verb} -> Err: {e:#}"),
|
||||
}
|
||||
}
|
||||
Ok(None) => eprintln!("no miner at {ip}"),
|
||||
Err(e) => eprintln!("scan_miner {ip}: {e}"),
|
||||
}
|
||||
}
|
||||
|
||||
/// Read (no tz arg) or set the miner's timezone (round 16 / G10). Capability-gated.
|
||||
async fn timezone(ip_s: &str, tz: Option<&str>) {
|
||||
use asic_rs::core::config::timezone::{Tz, TimezoneConfig};
|
||||
let Ok(ip) = ip_s.parse::<std::net::IpAddr>() else {
|
||||
eprintln!("bad ip {ip_s}");
|
||||
return;
|
||||
};
|
||||
match factory().scan_miner(ip).await {
|
||||
Ok(Some(m)) => {
|
||||
if !m.supports_timezone_config() {
|
||||
eprintln!("{ip}: timezone config not supported");
|
||||
return;
|
||||
}
|
||||
if let Some(tz_s) = tz {
|
||||
let Ok(zone) = tz_s.parse::<Tz>() else {
|
||||
eprintln!("bad IANA timezone '{tz_s}' (e.g. America/Edmonton)");
|
||||
return;
|
||||
};
|
||||
let cfg = TimezoneConfig {
|
||||
timezone: Some(zone),
|
||||
available: Vec::new(),
|
||||
};
|
||||
match m.set_timezone_config(cfg).await {
|
||||
Ok(v) => println!("{ip} set timezone {zone} -> Ok({v})"),
|
||||
Err(e) => println!("{ip} set timezone -> Err: {e:#}"),
|
||||
}
|
||||
}
|
||||
match m.get_timezone_config().await {
|
||||
Ok(c) => println!(
|
||||
"{ip} timezone now: {:?} ({} available)",
|
||||
c.timezone.map(|t| t.to_string()),
|
||||
c.available.len()
|
||||
),
|
||||
Err(e) => println!("{ip} read timezone -> Err: {e:#}"),
|
||||
}
|
||||
}
|
||||
Ok(None) => eprintln!("no miner at {ip}"),
|
||||
Err(e) => eprintln!("scan_miner {ip}: {e}"),
|
||||
}
|
||||
}
|
||||
|
||||
/// Change the miner's web/API password (round 16 / G11). Capability-gated.
|
||||
/// DANGEROUS: a failed change can lock the toolkit out -- use a dedicated unit.
|
||||
async fn passwd(ip_s: &str, newpass: &str) {
|
||||
let Ok(ip) = ip_s.parse::<std::net::IpAddr>() else {
|
||||
eprintln!("bad ip {ip_s}");
|
||||
return;
|
||||
};
|
||||
match factory().scan_miner(ip).await {
|
||||
Ok(Some(mut m)) => {
|
||||
if !m.supports_change_password() {
|
||||
eprintln!("{ip}: change password not supported");
|
||||
return;
|
||||
}
|
||||
match m.change_password(newpass).await {
|
||||
Ok(v) => println!("{ip} change_password -> Ok({v})"),
|
||||
Err(e) => println!("{ip} change_password -> Err: {e:#}"),
|
||||
}
|
||||
}
|
||||
Ok(None) => eprintln!("no miner at {ip}"),
|
||||
Err(e) => eprintln!("scan_miner {ip}: {e}"),
|
||||
}
|
||||
}
|
||||
|
||||
/// Factory-reset the miner (round 16 / G12). Capability-gated. DESTRUCTIVE:
|
||||
/// wipes config and may reset the network (unit can drop off its IP) -- only run
|
||||
/// on a sacrificial/console-attached unit.
|
||||
async fn factoryreset(ip_s: &str) {
|
||||
let Ok(ip) = ip_s.parse::<std::net::IpAddr>() else {
|
||||
eprintln!("bad ip {ip_s}");
|
||||
return;
|
||||
};
|
||||
match factory().scan_miner(ip).await {
|
||||
Ok(Some(m)) => {
|
||||
if !m.supports_factory_reset() {
|
||||
eprintln!("{ip}: factory reset not supported");
|
||||
return;
|
||||
}
|
||||
match m.factory_reset().await {
|
||||
Ok(v) => println!("{ip} factory_reset -> Ok({v})"),
|
||||
Err(e) => println!("{ip} factory_reset -> Err: {e:#}"),
|
||||
}
|
||||
}
|
||||
Ok(None) => eprintln!("no miner at {ip}"),
|
||||
Err(e) => eprintln!("scan_miner {ip}: {e}"),
|
||||
}
|
||||
}
|
||||
|
||||
/// READ-ONLY: dump a miner's structured-tuning surface -- what it supports, its
|
||||
/// current target, and the capability envelope (power/hashrate min-max, or the
|
||||
/// preset/mode list) the firmware advertises. Drives the round-17 C tuning work:
|
||||
/// it shows what each live firmware actually offers before any write is wired up.
|
||||
async fn tune(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)) => {
|
||||
let data = m.get_data().await;
|
||||
println!(
|
||||
"{ip}: {} {} {}",
|
||||
data.device_info.make, data.device_info.firmware, data.device_info.model
|
||||
);
|
||||
println!(
|
||||
" supports: power_limit={} tuning_percent={} tuning_config={}",
|
||||
m.supports_set_power_limit(),
|
||||
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 {
|
||||
Some(c) => {
|
||||
println!(" caps.power={:?}", c.power);
|
||||
println!(" caps.hashrate={:?}", c.hashrate);
|
||||
match &c.presets {
|
||||
Some(p) => {
|
||||
println!(" caps.presets.default={:?}", p.default);
|
||||
println!(" caps.presets[{}]:", p.presets.len());
|
||||
for t in &p.presets {
|
||||
println!(" - {t:?}");
|
||||
}
|
||||
}
|
||||
None => println!(" caps.presets=None"),
|
||||
}
|
||||
}
|
||||
None => println!(" tuning_capabilities=None"),
|
||||
}
|
||||
}
|
||||
Ok(None) => eprintln!("no miner at {ip}"),
|
||||
Err(e) => eprintln!("scan_miner {ip}: {e}"),
|
||||
}
|
||||
}
|
||||
|
||||
/// WRITE (reversible): apply a structured tuning target via set_tuning_config.
|
||||
/// `settune <ip> power <watts>` or `settune <ip> hashrate <ths>`. Prints the
|
||||
/// prior target so the caller can restore it. Used to verify the set_tuning_config
|
||||
/// path on live corpus hardware (round 17 C) before wiring it into the GUI.
|
||||
async fn settune(ip_s: &str, kind: &str, value: f64) {
|
||||
use asic_rs::core::config::tuning::TuningConfig;
|
||||
use asic_rs::core::data::hashrate::HashRateUnit;
|
||||
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_tuning_config={}); prior target = {:?}",
|
||||
before.device_info.make,
|
||||
before.device_info.firmware,
|
||||
before.device_info.model,
|
||||
m.supports_tuning_config(),
|
||||
before.tuning_target,
|
||||
);
|
||||
let target = match kind {
|
||||
"power" => TuningTarget::Power(Power::from_watts(value)),
|
||||
// Clone the miner's current HashRate to inherit its algorithm
|
||||
// (HashAlgorithm is not publicly re-exported, so it cannot be named
|
||||
// directly), overriding just the value and unit.
|
||||
"hashrate" => match before.hashrate.clone() {
|
||||
Some(mut hr) => {
|
||||
hr.value = value;
|
||||
hr.unit = HashRateUnit::TeraHash;
|
||||
TuningTarget::HashRate(hr)
|
||||
}
|
||||
None => {
|
||||
eprintln!("miner reports no current hashrate; cannot build a hashrate target");
|
||||
return;
|
||||
}
|
||||
},
|
||||
_ => {
|
||||
eprintln!("kind must be 'power' or 'hashrate'");
|
||||
return;
|
||||
}
|
||||
};
|
||||
// Route by what the firmware actually supports: structured
|
||||
// set_tuning_config where available (ePIC/VNish/WM), else the plain
|
||||
// power-limit setter for a power target (LuxOS/Braiins tune by power
|
||||
// and expose no set_tuning_config).
|
||||
if m.supports_tuning_config() {
|
||||
// Mirror the GUI apply path: preserve the firmware's current tuning
|
||||
// algorithm + scaling (ePIC requires both for set_tuning_config).
|
||||
let mut cfg = TuningConfig::new(target);
|
||||
if let Some(algo) = m.get_tuning_config().await.ok().and_then(|c| c.algorithm) {
|
||||
cfg = cfg.with_algorithm(algo);
|
||||
}
|
||||
let scaling = m.get_scaling_config().await.ok();
|
||||
match m.set_tuning_config(cfg, scaling).await {
|
||||
Ok(v) => println!("set_tuning_config({kind} {value}) -> Ok({v})"),
|
||||
Err(e) => println!("set_tuning_config({kind} {value}) -> Err: {e:#}"),
|
||||
}
|
||||
} else if kind == "power" && m.supports_set_power_limit() {
|
||||
match m.set_power_limit(Power::from_watts(value)).await {
|
||||
Ok(v) => println!("set_power_limit({value} W) -> Ok({v}) [tuning_config unsupported]"),
|
||||
Err(e) => println!("set_power_limit({value} W) -> Err: {e:#}"),
|
||||
}
|
||||
} else {
|
||||
println!("no structured-tuning path for {kind} on this firmware");
|
||||
}
|
||||
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}"),
|
||||
}
|
||||
}
|
||||
|
||||
/// 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() {
|
||||
@@ -89,8 +689,69 @@ fn main() {
|
||||
};
|
||||
match args.get(1).map(String::as_str) {
|
||||
Some("scan") if args.len() >= 3 => rt.block_on(scan(&args[2..])),
|
||||
Some("hashrate") if args.len() >= 3 => rt.block_on(hashrate(&args[2..])),
|
||||
Some("setpl") if args.len() == 4 => {
|
||||
let watts: f64 = args[3].parse().unwrap_or(-1.0);
|
||||
if watts <= 0.0 {
|
||||
eprintln!("watts must be a positive number");
|
||||
std::process::exit(2);
|
||||
}
|
||||
rt.block_on(setpl(&args[2], watts));
|
||||
}
|
||||
Some("led") if args.len() == 3 => rt.block_on(led(&args[2])),
|
||||
Some("light") if args.len() == 4 && matches!(args[3].as_str(), "on" | "off") => {
|
||||
rt.block_on(light(&args[2], args[3] == "on"))
|
||||
}
|
||||
Some(v @ ("restart" | "pause" | "resume")) if args.len() == 3 => {
|
||||
rt.block_on(lifecycle(&args[2], v))
|
||||
}
|
||||
Some("setpools") if args.len() == 6 => {
|
||||
rt.block_on(setpools(&args[2], &args[3], &args[4], &args[5]))
|
||||
}
|
||||
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 {
|
||||
eprintln!("value must be a positive number");
|
||||
std::process::exit(2);
|
||||
}
|
||||
rt.block_on(settune(&args[2], &args[3], value));
|
||||
}
|
||||
Some("timezone") if args.len() == 3 => rt.block_on(timezone(&args[2], None)),
|
||||
Some("timezone") if args.len() == 4 => rt.block_on(timezone(&args[2], Some(&args[3]))),
|
||||
Some("passwd") if args.len() == 4 => rt.block_on(passwd(&args[2], &args[3])),
|
||||
Some("factoryreset") if args.len() == 3 => rt.block_on(factoryreset(&args[2])),
|
||||
_ => {
|
||||
eprintln!("usage: miner_probe scan <cidr> [<cidr>...]");
|
||||
eprintln!(
|
||||
"miner_probe -- asic-rs config + scan CLI for the alkane-toolkit fleet\n\
|
||||
\n\
|
||||
READ (safe on any miner):\n\
|
||||
\x20 scan <cidr> [<cidr>...] discover + telemetry (TSV)\n\
|
||||
\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\
|
||||
\x20 led <ip> toggle locate light on then off (reversible test)\n\
|
||||
\x20 pause <ip> pause mining\n\
|
||||
\x20 resume <ip> resume mining\n\
|
||||
\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\
|
||||
\x20 factoryreset <ip> factory reset (DESTRUCTIVE; sacrificial units only)\n\
|
||||
\n\
|
||||
Each write verb is capability-gated (skips miners that do not support it).\n\
|
||||
Credentials: ALKANE_PROBE_USER/PASS or ~/.config/alkane-toolkit/scan-credentials.txt."
|
||||
);
|
||||
std::process::exit(2);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -0,0 +1,246 @@
|
||||
//! CSV export of the full scan data (round 15 #14).
|
||||
//!
|
||||
//! Unlike the on-screen table (which packs several values into one cell, e.g.
|
||||
//! "95T/96T" or a row of health icons), the export is one value per cell and
|
||||
//! covers every scanned data point, so it is complete and machine-readable.
|
||||
//! Variable-length fields (per-board temps, per-fan RPMs, per-board health, the
|
||||
//! pool list) are expanded into indexed columns out to the widest miner in the
|
||||
//! set, so every row has the same columns.
|
||||
|
||||
use crate::model::{BoardHealth, MinerRow};
|
||||
|
||||
/// 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 {
|
||||
let mut val = s.to_string();
|
||||
if val.starts_with(['=', '+', '-', '@', '\t', '\r']) {
|
||||
val.insert(0, '\'');
|
||||
}
|
||||
if val.contains([',', '"', '\n', '\r']) {
|
||||
format!("\"{}\"", val.replace('"', "\"\""))
|
||||
} else {
|
||||
val
|
||||
}
|
||||
}
|
||||
|
||||
fn num(v: f64) -> String {
|
||||
if v == 0.0 {
|
||||
String::new()
|
||||
} else if v.fract() == 0.0 {
|
||||
format!("{v:.0}")
|
||||
} else {
|
||||
format!("{v:.3}")
|
||||
}
|
||||
}
|
||||
|
||||
fn opt_bool(v: Option<bool>, yes: &str, no: &str) -> String {
|
||||
match v {
|
||||
Some(true) => yes.to_string(),
|
||||
Some(false) => no.to_string(),
|
||||
None => String::new(),
|
||||
}
|
||||
}
|
||||
|
||||
fn board_health_str(h: &BoardHealth) -> &'static str {
|
||||
match h {
|
||||
BoardHealth::Ok => "ok",
|
||||
BoardHealth::Fault => "fault",
|
||||
BoardHealth::Missing => "missing",
|
||||
}
|
||||
}
|
||||
|
||||
/// The fixed scalar columns, in order: (header, extractor).
|
||||
type Col = (&'static str, fn(&MinerRow) -> String);
|
||||
|
||||
fn scalar_columns() -> Vec<Col> {
|
||||
vec![
|
||||
("ip", |r| r.ip.clone()),
|
||||
("model", |r| r.model.clone()),
|
||||
("brand", |r| r.brand.clone()),
|
||||
("submodel", |r| r.submodel.clone()),
|
||||
("mac", |r| r.mac.clone()),
|
||||
("hostname", |r| r.hostname.clone()),
|
||||
("serial", |r| r.serial.clone()),
|
||||
("firmware", |r| r.firmware.clone()),
|
||||
("fw_version", |r| r.fw_version.clone()),
|
||||
("api_version", |r| r.api_version.clone()),
|
||||
("control_board", |r| r.control_board.clone()),
|
||||
("cpu", |r| r.cpu.clone()),
|
||||
("board_code", |r| r.board_code.clone()),
|
||||
("algorithm", |r| r.algorithm.clone()),
|
||||
("status", |r| r.status().to_string()),
|
||||
("operating_state", |r| r.operating_state.clone()),
|
||||
("is_mining", |r| r.is_mining.to_string()),
|
||||
("slow", |r| r.slow.to_string()),
|
||||
("paused", |r| r.paused.to_string()),
|
||||
("pic", |r| opt_bool(r.pic_present, "PIC", "noPIC")),
|
||||
("write_locked", |r| opt_bool(r.write_locked, "locked", "unlocked")),
|
||||
("light_flashing", |r| opt_bool(r.light_flashing, "on", "off")),
|
||||
("hashrate_ths", |r| num(r.hashrate_ths)),
|
||||
("expected_ths", |r| num(r.expected_ths)),
|
||||
("efficiency_j_th", |r| num(r.efficiency)),
|
||||
("power_w", |r| num(r.power_w)),
|
||||
("tuning_percent", |r| r.tuning_percent.map(|v| v.to_string()).unwrap_or_default()),
|
||||
("chip_temp_c", |r| num(r.chip_temp_c)),
|
||||
("fluid_temp_c", |r| num(r.fluid_temp_c)),
|
||||
("env_temp_c", |r| num(r.env_temp_c)),
|
||||
("outlet_temp_c", |r| num(r.outlet_temp_c)),
|
||||
("psu_fan_rpm", |r| num(r.psu_fan_rpm)),
|
||||
("fan_count", |r| r.fan_count.map(|v| v.to_string()).unwrap_or_default()),
|
||||
("expected_fans", |r| r.expected_fans.map(|v| v.to_string()).unwrap_or_default()),
|
||||
("total_chips", |r| r.total_chips.map(|v| v.to_string()).unwrap_or_default()),
|
||||
("expected_chips", |r| r.expected_chips.map(|v| v.to_string()).unwrap_or_default()),
|
||||
("hashboards", |r| r.hashboards.map(|v| v.to_string()).unwrap_or_default()),
|
||||
("expected_hashboards", |r| r.expected_hashboards.map(|v| v.to_string()).unwrap_or_default()),
|
||||
("uptime_secs", |r| if r.uptime_secs > 0 { r.uptime_secs.to_string() } else { String::new() }),
|
||||
("best_share", |r| r.best_share.map(num).unwrap_or_default()),
|
||||
("session_best_share", |r| r.session_best_share.map(num).unwrap_or_default()),
|
||||
("pool_account", |r| r.worker.split_once('.').map(|(a, _)| a).unwrap_or(&r.worker).to_string()),
|
||||
("pool_url", |r| r.pool_url.clone()),
|
||||
("errors", |r| r.errors.join("; ")),
|
||||
]
|
||||
}
|
||||
|
||||
// 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();
|
||||
for i in 1..=max_board_temps {
|
||||
headers.push(format!("board_temp_{i}_c"));
|
||||
}
|
||||
for i in 1..=max_fans {
|
||||
headers.push(format!("fan_{i}_rpm"));
|
||||
}
|
||||
for i in 1..=max_boards {
|
||||
headers.push(format!("board_{i}_status"));
|
||||
}
|
||||
for i in 1..=max_pools {
|
||||
headers.push(format!("pool_{i}_url"));
|
||||
headers.push(format!("pool_{i}_worker"));
|
||||
}
|
||||
|
||||
let mut out = String::new();
|
||||
out.push_str(&headers.iter().map(|h| esc(h)).collect::<Vec<_>>().join(","));
|
||||
out.push('\n');
|
||||
|
||||
for r in rows {
|
||||
let mut vals: Vec<String> = cols.iter().map(|(_, f)| f(r)).collect();
|
||||
for i in 0..max_board_temps {
|
||||
vals.push(r.board_temps.get(i).map(|&t| num(t)).unwrap_or_default());
|
||||
}
|
||||
for i in 0..max_fans {
|
||||
vals.push(r.fan_rpms.get(i).map(|&t| num(t)).unwrap_or_default());
|
||||
}
|
||||
for i in 0..max_boards {
|
||||
vals.push(r.board_status.get(i).map(board_health_str).unwrap_or("").to_string());
|
||||
}
|
||||
for i in 0..max_pools {
|
||||
let (u, w) = r.pools.get(i).cloned().unwrap_or_default();
|
||||
vals.push(u);
|
||||
vals.push(w);
|
||||
}
|
||||
out.push_str(&vals.iter().map(|v| esc(v)).collect::<Vec<_>>().join(","));
|
||||
out.push('\n');
|
||||
}
|
||||
out
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn csv_has_header_and_one_row_per_miner() {
|
||||
let rows = vec![
|
||||
MinerRow {
|
||||
ip: "10.0.0.1".into(),
|
||||
model: "S19".into(),
|
||||
hashrate_ths: 95.0,
|
||||
expected_ths: 96.0,
|
||||
board_temps: vec![77.0, 64.0, 74.0],
|
||||
fan_rpms: vec![6000.0, 6100.0],
|
||||
..Default::default()
|
||||
},
|
||||
MinerRow { ip: "10.0.0.2".into(), model: "M30S".into(), ..Default::default() },
|
||||
];
|
||||
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,"));
|
||||
// Expanded columns out to the widest miner (3 board temps, 2 fans).
|
||||
assert!(lines[0].contains("board_temp_3_c"));
|
||||
assert!(lines[0].contains("fan_2_rpm"));
|
||||
assert!(lines[1].starts_with("10.0.0.1,S19,"));
|
||||
// One value per cell: hashrate and expected are separate columns.
|
||||
assert!(lines[1].contains(",95,96,") || lines[1].contains("95,96"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn csv_escapes_commas_and_quotes() {
|
||||
assert_eq!(esc("a,b"), "\"a,b\"");
|
||||
assert_eq!(esc("he said \"hi\""), "\"he said \"\"hi\"\"\"");
|
||||
assert_eq!(esc("plain"), "plain");
|
||||
}
|
||||
}
|
||||
@@ -60,6 +60,19 @@ impl Board {
|
||||
} else {
|
||||
vec![]
|
||||
};
|
||||
// Per-board hashrate for the R2 Health tooltip demo: split the total three
|
||||
// ways with a little variety (index-aligned with the 3 boards).
|
||||
let board_hashrates = if self.mining && self.hashrate > 0.0 {
|
||||
vec![self.hashrate * 0.34, self.hashrate * 0.35, self.hashrate * 0.31]
|
||||
} 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).
|
||||
@@ -79,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![]
|
||||
};
|
||||
@@ -97,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,
|
||||
@@ -108,7 +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,
|
||||
@@ -127,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).
|
||||
@@ -157,20 +191,21 @@ impl Board {
|
||||
resume: self.mining,
|
||||
power_limit: self.mining,
|
||||
tuning: self.mining,
|
||||
hashrate_target: self.mining,
|
||||
supports_presets: self.mining,
|
||||
firmware_flash,
|
||||
pools: true,
|
||||
timezone: self.mining,
|
||||
change_password: true,
|
||||
factory_reset: true,
|
||||
},
|
||||
// Demo values for the round-8/9 columns (synthetic, so the columns
|
||||
// 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()),
|
||||
@@ -184,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()
|
||||
}
|
||||
}
|
||||
@@ -219,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"
|
||||
|
||||
@@ -0,0 +1,162 @@
|
||||
//! Lightweight UI localization (round 15 #13).
|
||||
//!
|
||||
//! Visible strings are wrapped in `t("English text")`; the English text is the
|
||||
//! lookup key. `t` returns the translation for the current language, falling back
|
||||
//! to the English key when a string has no translation yet. The language is a
|
||||
//! process-global, persisted under the config dir; changing it re-titles the
|
||||
//! table columns and toolbar/KPI labels live and localizes dialogs as they open.
|
||||
|
||||
use std::path::PathBuf;
|
||||
use std::sync::atomic::{AtomicU8, Ordering};
|
||||
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||
pub enum Lang {
|
||||
En,
|
||||
Zh,
|
||||
Ru,
|
||||
Fr,
|
||||
Es,
|
||||
Pt,
|
||||
}
|
||||
|
||||
impl Lang {
|
||||
pub fn all() -> [Lang; 6] {
|
||||
[Lang::En, Lang::Zh, Lang::Ru, Lang::Fr, Lang::Es, Lang::Pt]
|
||||
}
|
||||
/// The language's own name, for the selector menu.
|
||||
pub fn label(self) -> &'static str {
|
||||
match self {
|
||||
Lang::En => "English",
|
||||
Lang::Zh => "\u{4e2d}\u{6587}", // 中文
|
||||
Lang::Ru => "\u{0420}\u{0443}\u{0441}\u{0441}\u{043a}\u{0438}\u{0439}", // Русский
|
||||
Lang::Fr => "Fran\u{e7}ais",
|
||||
Lang::Es => "Espa\u{f1}ol",
|
||||
Lang::Pt => "Portugu\u{ea}s",
|
||||
}
|
||||
}
|
||||
fn code(self) -> &'static str {
|
||||
match self {
|
||||
Lang::En => "en",
|
||||
Lang::Zh => "zh",
|
||||
Lang::Ru => "ru",
|
||||
Lang::Fr => "fr",
|
||||
Lang::Es => "es",
|
||||
Lang::Pt => "pt",
|
||||
}
|
||||
}
|
||||
fn from_code(s: &str) -> Lang {
|
||||
match s.trim() {
|
||||
"zh" => Lang::Zh,
|
||||
"ru" => Lang::Ru,
|
||||
"fr" => Lang::Fr,
|
||||
"es" => Lang::Es,
|
||||
"pt" => Lang::Pt,
|
||||
_ => Lang::En,
|
||||
}
|
||||
}
|
||||
fn index(self) -> usize {
|
||||
match self {
|
||||
Lang::En => 0,
|
||||
Lang::Zh => 1,
|
||||
Lang::Ru => 2,
|
||||
Lang::Fr => 3,
|
||||
Lang::Es => 4,
|
||||
Lang::Pt => 5,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static CURRENT: AtomicU8 = AtomicU8::new(0);
|
||||
|
||||
const LANG_FILE: &str = "language.txt";
|
||||
|
||||
fn config_path() -> PathBuf {
|
||||
let home = std::env::var("HOME").unwrap_or_else(|_| ".".into());
|
||||
PathBuf::from(home).join(".config/alkane-toolkit").join(LANG_FILE)
|
||||
}
|
||||
|
||||
/// Load the saved language into the global (call once at startup).
|
||||
pub fn init() {
|
||||
let l = std::fs::read_to_string(config_path())
|
||||
.ok()
|
||||
.map(|s| Lang::from_code(&s))
|
||||
.unwrap_or(Lang::En);
|
||||
CURRENT.store(lang_to_u8(l), Ordering::Relaxed);
|
||||
}
|
||||
|
||||
pub fn current() -> Lang {
|
||||
u8_to_lang(CURRENT.load(Ordering::Relaxed))
|
||||
}
|
||||
|
||||
/// Set + persist the language.
|
||||
pub fn set(l: Lang) {
|
||||
CURRENT.store(lang_to_u8(l), Ordering::Relaxed);
|
||||
let p = config_path();
|
||||
if let Some(dir) = p.parent() {
|
||||
let _ = std::fs::create_dir_all(dir);
|
||||
}
|
||||
let _ = std::fs::write(p, l.code());
|
||||
}
|
||||
|
||||
fn lang_to_u8(l: Lang) -> u8 {
|
||||
l.index() as u8
|
||||
}
|
||||
fn u8_to_lang(v: u8) -> Lang {
|
||||
Lang::all().get(v as usize).copied().unwrap_or(Lang::En)
|
||||
}
|
||||
|
||||
/// Translate `key` (an English string) to the current language, or return `key`
|
||||
/// when there is no translation.
|
||||
pub fn t(key: &str) -> String {
|
||||
let lang = current();
|
||||
if lang == Lang::En {
|
||||
return key.to_string();
|
||||
}
|
||||
for (en, tr) in TABLE {
|
||||
if *en == key {
|
||||
let s = tr[lang.index()];
|
||||
if !s.is_empty() {
|
||||
return s.to_string();
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
key.to_string()
|
||||
}
|
||||
|
||||
// Translation table: (English, [en, zh, ru, fr, es, pt]). The en slot mirrors the
|
||||
// key (unused by `t`, kept for readability). An empty slot falls back to English.
|
||||
#[rustfmt::skip]
|
||||
const TABLE: &[(&str, [&str; 6])] = &[
|
||||
// Toolbar + settings
|
||||
("Scan ranges", ["Scan ranges", "\u{626b}\u{63cf}\u{8303}\u{56f4}", "\u{0414}\u{0438}\u{0430}\u{043f}\u{0430}\u{0437}\u{043e}\u{043d}\u{044b}", "Plages", "Rangos", "Faixas"]),
|
||||
("Presets", ["Presets", "\u{9884}\u{8bbe}", "\u{041f}\u{0440}\u{0435}\u{0441}\u{0435}\u{0442}\u{044b}", "Pr\u{e9}r\u{e9}glages", "Ajustes", "Predefini\u{e7}\u{f5}es"]),
|
||||
("Filter", ["Filter", "\u{7b5b}\u{9009}", "\u{0424}\u{0438}\u{043b}\u{044c}\u{0442}\u{0440}", "Filtre", "Filtro", "Filtro"]),
|
||||
("Columns", ["Columns", "\u{5217}", "\u{0421}\u{0442}\u{043e}\u{043b}\u{0431}\u{0446}\u{044b}", "Colonnes", "Columnas", "Colunas"]),
|
||||
("Export", ["Export", "\u{5bfc}\u{51fa}", "\u{042d}\u{043a}\u{0441}\u{043f}\u{043e}\u{0440}\u{0442}", "Exporter", "Exportar", "Exportar"]),
|
||||
("Settings", ["Settings", "\u{8bbe}\u{7f6e}", "\u{041d}\u{0430}\u{0441}\u{0442}\u{0440}\u{043e}\u{0439}\u{043a}\u{0438}", "Param\u{e8}tres", "Ajustes", "Configura\u{e7}\u{f5}es"]),
|
||||
("Credentials", ["Credentials", "\u{51ed}\u{636e}", "\u{0423}\u{0447}\u{0451}\u{0442}\u{043d}\u{044b}\u{0435} \u{0434}\u{0430}\u{043d}\u{043d}\u{044b}\u{0435}", "Identifiants", "Credenciales", "Credenciais"]),
|
||||
("Language", ["Language", "\u{8bed}\u{8a00}", "\u{042f}\u{0437}\u{044b}\u{043a}", "Langue", "Idioma", "Idioma"]),
|
||||
("Logs", ["Logs", "\u{65e5}\u{5fd7}", "\u{0416}\u{0443}\u{0440}\u{043d}\u{0430}\u{043b}", "Journaux", "Registros", "Registos"]),
|
||||
// KPI captions
|
||||
("Total", ["Total", "\u{603b}\u{6570}", "\u{0412}\u{0441}\u{0435}\u{0433}\u{043e}", "Total", "Total", "Total"]),
|
||||
("Hashing", ["Hashing", "\u{6b63}\u{5728}\u{6316}\u{77ff}", "\u{0425}\u{0435}\u{0448}\u{0438}\u{0440}\u{043e}\u{0432}\u{0430}\u{043d}\u{0438}\u{0435}", "Minage", "Minando", "Minerando"]),
|
||||
("Slow", ["Slow", "\u{7f13}\u{6162}", "\u{041c}\u{0435}\u{0434}\u{043b}\u{0435}\u{043d}\u{043d}\u{043e}", "Lent", "Lento", "Lento"]),
|
||||
("Not hashing", ["Not hashing", "\u{672a}\u{6316}\u{77ff}", "\u{041d}\u{0435} \u{0445}\u{0435}\u{0448}\u{0438}\u{0440}\u{0443}\u{0435}\u{0442}", "Inactif", "Inactivo", "Inativo"]),
|
||||
("Paused", ["Paused", "\u{5df2}\u{6682}\u{505c}", "\u{041f}\u{0430}\u{0443}\u{0437}\u{0430}", "En pause", "Pausado", "Pausado"]),
|
||||
("Est. power", ["Est. power", "\u{4f30}\u{8ba1}\u{529f}\u{7387}", "\u{041e}\u{0446}. \u{043c}\u{043e}\u{0449}\u{043d}.", "Puiss. est.", "Pot. est.", "Pot. est."]),
|
||||
// Column headers (the default-visible set + common ones)
|
||||
("Model", ["Model", "\u{578b}\u{53f7}", "\u{041c}\u{043e}\u{0434}\u{0435}\u{043b}\u{044c}", "Mod\u{e8}le", "Modelo", "Modelo"]),
|
||||
("Health", ["Health", "\u{72b6}\u{6001}", "\u{0421}\u{043e}\u{0441}\u{0442}\u{043e}\u{044f}\u{043d}\u{0438}\u{0435}", "\u{c9}tat", "Estado", "Sa\u{fa}de"]),
|
||||
("Hashrate", ["Hashrate", "\u{7b97}\u{529b}", "\u{0425}\u{0435}\u{0448}\u{0440}\u{0435}\u{0439}\u{0442}", "Hashrate", "Hashrate", "Hashrate"]),
|
||||
("Power", ["Power", "\u{529f}\u{7387}", "\u{041c}\u{043e}\u{0449}\u{043d}\u{043e}\u{0441}\u{0442}\u{044c}", "Puissance", "Potencia", "Pot\u{ea}ncia"]),
|
||||
("Chip temp", ["Chip temp", "\u{82af}\u{7247}\u{6e29}\u{5ea6}", "\u{0422}\u{0435}\u{043c}\u{043f}. \u{0447}\u{0438}\u{043f}\u{0430}", "Temp. puce", "Temp. chip", "Temp. chip"]),
|
||||
("Firmware", ["Firmware", "\u{56fa}\u{4ef6}", "\u{041f}\u{0440}\u{043e}\u{0448}\u{0438}\u{0432}\u{043a}\u{0430}", "Firmware", "Firmware", "Firmware"]),
|
||||
("CPU", ["CPU", "CPU", "\u{041f}\u{0440}\u{043e}\u{0446}.", "Processeur", "CPU", "CPU"]),
|
||||
("Access", ["Access", "\u{8bbf}\u{95ee}", "\u{0414}\u{043e}\u{0441}\u{0442}\u{0443}\u{043f}", "Acc\u{e8}s", "Acceso", "Acesso"]),
|
||||
("Light", ["Light", "\u{6307}\u{793a}\u{706f}", "\u{041f}\u{043e}\u{0434}\u{0441}\u{0432}\u{0435}\u{0442}\u{043a}\u{0430}", "Voyant", "Luz", "Luz"]),
|
||||
("Fan (RPM)", ["Fan (RPM)", "\u{98ce}\u{6247} (RPM)", "\u{0412}\u{0435}\u{043d}\u{0442}. (\u{043e}\u{0431}/\u{043c}\u{0438}\u{043d})", "Ventilo (TR/M)", "Ventilador (RPM)", "Ventoinha (RPM)"]),
|
||||
("Control Board", ["Control Board", "\u{63a7}\u{5236}\u{677f}", "\u{041f}\u{043b}\u{0430}\u{0442}\u{0430} \u{0443}\u{043f}\u{0440}.", "Carte de contr\u{f4}le", "Placa control", "Placa controlo"]),
|
||||
("Uptime", ["Uptime", "\u{8fd0}\u{884c}\u{65f6}\u{95f4}", "\u{0412}\u{0440}\u{0435}\u{043c}\u{044f} \u{0440}\u{0430}\u{0431}.", "Dur\u{e9}e", "Tiempo activo", "Tempo ativo"]),
|
||||
("Serial", ["Serial", "\u{5e8f}\u{5217}\u{53f7}", "\u{0421}\u{0435}\u{0440}\u{0438}\u{0439}\u{043d}\u{044b}\u{0439}", "N\u{b0} de s\u{e9}rie", "N\u{b0} de serie", "N\u{b0} de s\u{e9}rie"]),
|
||||
];
|
||||
@@ -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]
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
//! In-app activity log (round 15 #13). A small, process-global ring buffer of
|
||||
//! timestamped messages -- scans starting/finishing, operations applied, errors --
|
||||
//! shown in the Settings > Logs page. Thread-safe so background workers can append.
|
||||
|
||||
use std::sync::Mutex;
|
||||
use std::time::{SystemTime, UNIX_EPOCH};
|
||||
|
||||
const MAX_ENTRIES: usize = 2000;
|
||||
|
||||
static LOG: Mutex<Vec<String>> = Mutex::new(Vec::new());
|
||||
|
||||
/// Local wall-clock HH:MM:SS for a log line. Uses the system clock offset from
|
||||
/// UTC via the TZ-less epoch; good enough for an activity log timestamp.
|
||||
fn stamp() -> String {
|
||||
let secs = SystemTime::now().duration_since(UNIX_EPOCH).map(|d| d.as_secs()).unwrap_or(0);
|
||||
let t = secs % 86_400;
|
||||
format!("{:02}:{:02}:{:02}", t / 3600, (t % 3600) / 60, t % 60)
|
||||
}
|
||||
|
||||
/// Append a message to the activity log (timestamped).
|
||||
pub fn log(msg: impl Into<String>) {
|
||||
let line = format!("{} {}", stamp(), msg.into());
|
||||
if let Ok(mut v) = LOG.lock() {
|
||||
v.push(line);
|
||||
let len = v.len();
|
||||
if len > MAX_ENTRIES {
|
||||
v.drain(0..len - MAX_ENTRIES);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// The whole log as one string, newest last (for the Logs page text box).
|
||||
pub fn dump() -> String {
|
||||
LOG.lock().map(|v| v.join("\n")).unwrap_or_default()
|
||||
}
|
||||
|
||||
/// Clear the log.
|
||||
pub fn clear() {
|
||||
if let Ok(mut v) = LOG.lock() {
|
||||
v.clear();
|
||||
}
|
||||
}
|
||||
@@ -3,16 +3,19 @@
|
||||
|
||||
mod access_probe;
|
||||
mod credentials;
|
||||
mod export;
|
||||
mod fixtures;
|
||||
mod i18n;
|
||||
mod logs;
|
||||
mod log_scan;
|
||||
mod model;
|
||||
mod naming;
|
||||
mod pool_prefs;
|
||||
mod presets;
|
||||
mod restore;
|
||||
mod scan;
|
||||
mod ui;
|
||||
|
||||
use wx_rs;
|
||||
|
||||
fn main() {
|
||||
// Headless workflow self-test: render the bench-fleet fixtures through the
|
||||
@@ -40,31 +43,24 @@ 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);
|
||||
}
|
||||
|
||||
// Load the saved UI language before any strings are built (round 15 #13).
|
||||
i18n::init();
|
||||
|
||||
// Bootstrap the wx app + main frame (upstream bridge).
|
||||
wx_rs::init_app("alkane-toolkit", 1280, 800);
|
||||
// Follow the system light/dark appearance.
|
||||
|
||||
@@ -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");
|
||||
|
||||
@@ -0,0 +1,169 @@
|
||||
//! 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. "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;
|
||||
|
||||
const CONFIG_DIR: &str = ".config/alkane-toolkit";
|
||||
|
||||
/// Which pool field a "+" menu belongs to.
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||
pub enum PoolField {
|
||||
Address,
|
||||
Account,
|
||||
Worker,
|
||||
Password,
|
||||
}
|
||||
|
||||
impl PoolField {
|
||||
fn saved_file(self) -> &'static str {
|
||||
match self {
|
||||
PoolField::Address => "pool-addresses.txt",
|
||||
PoolField::Account => "pool-accounts.txt",
|
||||
PoolField::Worker => "pool-workers.txt",
|
||||
PoolField::Password => "pool-passwords.txt",
|
||||
}
|
||||
}
|
||||
|
||||
/// Built-in presets offered before the user's saved values.
|
||||
pub fn presets(self) -> Vec<&'static str> {
|
||||
match self {
|
||||
// Top Bitcoin pools by hashrate with their primary stratum endpoints
|
||||
// (researched round 15; verify in-app before relying on any one).
|
||||
PoolField::Address => POOL_STRATUMS.iter().map(|(_, u)| *u).collect(),
|
||||
PoolField::Account => Vec::new(),
|
||||
// Per-miner worker-name placeholders (see MinerRow::expand_worker_template).
|
||||
PoolField::Worker => vec![
|
||||
"{ip1}", "{ip2}", "{ip3}", "{ip4}", "{serial}", "{mac}", "{nameplate-hr}",
|
||||
"{brand}", "{model}", "{submodel}", "{cpu}", "{cb}", "{firmware}", "{hostname}",
|
||||
],
|
||||
PoolField::Password => vec!["x"],
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// (pool name, primary stratum URL). Used for the address dropdown labels.
|
||||
pub const POOL_STRATUMS: &[(&str, &str)] = &[
|
||||
("Foundry USA", "stratum+tcp://btc.foundryusapool.com:3333"),
|
||||
("AntPool", "stratum+tcp://ss.antpool.com:3333"),
|
||||
("F2Pool", "stratum+tcp://btc.f2pool.com:1314"),
|
||||
("ViaBTC", "stratum+tcp://btc.viabtc.io:3333"),
|
||||
("SpiderPool", "stratum+tcp://btc-us.spiderpool.com:2309"),
|
||||
("Binance Pool", "stratum+tcp://bs.poolbinance.com:3333"),
|
||||
("Luxor", "stratum+tcp://btc.global.luxor.tech:700"),
|
||||
("SBI Crypto", "stratum+tcp://us1.sbicrypto.com:3333"),
|
||||
("Braiins Pool", "stratum+tcp://stratum.braiins.com:3333"),
|
||||
("ULTIMUSPOOL", "stratum+tcp://bs.ultimuspool.com:8888"),
|
||||
("SECPOOL", "stratum+tcp://btc.secpool.com:3333"),
|
||||
];
|
||||
|
||||
fn config_path(file: &str) -> PathBuf {
|
||||
let home = std::env::var("HOME").unwrap_or_else(|_| ".".into());
|
||||
PathBuf::from(home).join(CONFIG_DIR).join(file)
|
||||
}
|
||||
|
||||
/// The user's saved values for `field`, in save order (most recent last).
|
||||
pub fn load_saved(field: PoolField) -> Vec<String> {
|
||||
std::fs::read_to_string(config_path(field.saved_file()))
|
||||
.ok()
|
||||
.map(|s| s.lines().map(str::trim).filter(|l| !l.is_empty()).map(String::from).collect())
|
||||
.unwrap_or_default()
|
||||
}
|
||||
|
||||
/// 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);
|
||||
}
|
||||
// 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())
|
||||
}
|
||||
|
||||
/// 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)
|
||||
}
|
||||
#[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
|
||||
/// values. For the address field each entry is labelled with the pool name.
|
||||
pub fn dropdown_entries(field: PoolField) -> Vec<(String, String)> {
|
||||
// (label, value)
|
||||
let mut out: Vec<(String, String)> = Vec::new();
|
||||
if field == PoolField::Address {
|
||||
for (name, url) in POOL_STRATUMS {
|
||||
out.push((format!("{name} -- {url}"), url.to_string()));
|
||||
}
|
||||
} else {
|
||||
for p in field.presets() {
|
||||
out.push((p.to_string(), p.to_string()));
|
||||
}
|
||||
}
|
||||
for s in load_saved(field) {
|
||||
out.push((s.clone(), s));
|
||||
}
|
||||
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());
|
||||
}
|
||||
}
|
||||
@@ -15,7 +15,7 @@ pub const PRESETS_FILE: &str = "presets.json";
|
||||
/// IP, model, health (component icons), hashrate, power, chip temp, firmware,
|
||||
/// CPU, access. The Health column (round 13 #3) replaced the old errors, boards
|
||||
/// (hashboard dots) and status columns.
|
||||
const DEFAULT_PROFILE: [Column; 9] = [
|
||||
const DEFAULT_PROFILE: [Column; 10] = [
|
||||
Column::Ip,
|
||||
Column::Model,
|
||||
Column::Health,
|
||||
@@ -25,6 +25,7 @@ const DEFAULT_PROFILE: [Column; 9] = [
|
||||
Column::Firmware,
|
||||
Column::Cpu,
|
||||
Column::Locked,
|
||||
Column::Light,
|
||||
];
|
||||
|
||||
/// A serializable snapshot of a `ViewState` (Vec-based so JSON has no map keys
|
||||
@@ -132,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.
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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,6 +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;
|
||||
/// 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; 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;
|
||||
@@ -151,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}"));
|
||||
}
|
||||
@@ -364,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();
|
||||
@@ -377,7 +421,19 @@ pub fn start_scan(lines: Vec<String>, timeout_secs: u64) -> ScanHandle {
|
||||
};
|
||||
rt.block_on(async move {
|
||||
let mut factory = crate::credentials::configured_factory()
|
||||
.with_identification_timeout_secs(timeout_secs.max(1));
|
||||
.with_identification_timeout_secs(timeout_secs.max(1))
|
||||
// Cap identification concurrency. asic-rs defaults to 1000 for any
|
||||
// range up to /22, so a /24 fires all 254 probes at once. Over a
|
||||
// real link (VPN, or a subnet full of dead IPs whose TCP connects
|
||||
// sit open for the whole identification timeout) that burst starves
|
||||
// the per-responder get_data -- a Braiins miner fans out ~12
|
||||
// authenticated REST calls and drops most of its values (watts=0,
|
||||
// no best-share/temps), and some responders are missed entirely.
|
||||
// 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.
|
||||
// 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,
|
||||
@@ -387,28 +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;
|
||||
let step = (total / 100).max(1); // throttle progress messages
|
||||
while let Some((ip, miner)) = stream.next().await {
|
||||
// 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);
|
||||
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() });
|
||||
}
|
||||
}
|
||||
@@ -455,14 +548,235 @@ fn summarize_messages(messages: &[asic_rs::core::data::message::MinerMessage]) -
|
||||
ranked.into_iter().map(|(_, s)| s).collect()
|
||||
}
|
||||
|
||||
/// Convert a miner's structured messages into `Fault`s with their attributed
|
||||
/// 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> {
|
||||
use asic_rs::core::data::message::{MessageSeverity, MinerComponent};
|
||||
use crate::model::{Fault, FaultComponent};
|
||||
messages
|
||||
.iter()
|
||||
.filter_map(|m| {
|
||||
let is_error = match m.severity {
|
||||
MessageSeverity::Error => true,
|
||||
MessageSeverity::Warning => false,
|
||||
MessageSeverity::Info => return None,
|
||||
};
|
||||
let text = m.message.trim();
|
||||
if text.is_empty() {
|
||||
return None;
|
||||
}
|
||||
let component = match &m.component {
|
||||
Some(MinerComponent::PowerSupply { .. }) => FaultComponent::Power,
|
||||
Some(MinerComponent::ControlBoard {}) => FaultComponent::Control,
|
||||
Some(MinerComponent::Fan { idx }) => FaultComponent::Fan(*idx as usize),
|
||||
Some(MinerComponent::HashBoard { idx, .. }) => FaultComponent::Board(*idx as usize),
|
||||
// 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,
|
||||
message: text.to_string(),
|
||||
code: m.code,
|
||||
is_error,
|
||||
})
|
||||
})
|
||||
.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
|
||||
/// type, so a model map is the only network-only method:
|
||||
/// - noPIC: an explicit "noPIC" model, the S19k Pro board, and the BM1368+
|
||||
/// 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.
|
||||
pub(crate) fn infer_pic(model: &str) -> Option<bool> {
|
||||
let m = model.to_lowercase();
|
||||
if m.contains("nopic") {
|
||||
return Some(false);
|
||||
}
|
||||
if m.contains("s21") || m.contains("t21") {
|
||||
return Some(false);
|
||||
}
|
||||
if m.contains("s19k") {
|
||||
return Some(false);
|
||||
}
|
||||
if m.contains("s19") {
|
||||
return Some(true);
|
||||
}
|
||||
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)
|
||||
@@ -479,16 +793,63 @@ 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
|
||||
// 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
|
||||
// lines up.
|
||||
let board_hashrates: Vec<f64> = data
|
||||
.hashboards
|
||||
.iter()
|
||||
.filter_map(|b| {
|
||||
b.board_temperature
|
||||
.map(|b| {
|
||||
b.hashrate
|
||||
.as_ref()
|
||||
.or(b.outlet_chip_temperature.as_ref())
|
||||
.map(|t| t.as_celsius())
|
||||
.map(|h| h.clone().as_unit(asic_rs::core::data::hashrate::HashRateUnit::TeraHash).value)
|
||||
.unwrap_or(0.0)
|
||||
})
|
||||
.filter(|&t| t > 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
|
||||
@@ -527,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}"),
|
||||
@@ -567,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();
|
||||
@@ -577,6 +958,51 @@ async fn to_row(miner: &dyn Miner) -> MinerRow {
|
||||
// VNish; Braiins and the rest keep asic-rs's answer.
|
||||
let power_limit = miner.supports_set_power_limit()
|
||||
&& !data.device_info.firmware.eq_ignore_ascii_case("VNish");
|
||||
// Structured tuning (round 17 C). Extract the current target + the advertised
|
||||
// envelope so the "Set performance target" prompt can show/validate bounds.
|
||||
use asic_rs::core::data::miner::TuningTarget;
|
||||
let target_watts = |t: &TuningTarget| match t {
|
||||
TuningTarget::Power(p) => Some(p.as_watts()),
|
||||
_ => None,
|
||||
};
|
||||
let target_ths = |t: &TuningTarget| match t {
|
||||
TuningTarget::HashRate(h) => Some(
|
||||
h.clone()
|
||||
.as_unit(asic_rs::core::data::hashrate::HashRateUnit::TeraHash)
|
||||
.value,
|
||||
),
|
||||
_ => None,
|
||||
};
|
||||
let (power_target_min_w, power_target_max_w, hashrate_target_min_ths, hashrate_target_max_ths) =
|
||||
match &data.tuning_capabilities {
|
||||
Some(c) => (
|
||||
c.power.as_ref().and_then(|p| p.minimum.as_ref()).and_then(&target_watts),
|
||||
c.power.as_ref().and_then(|p| p.maximum.as_ref()).and_then(&target_watts),
|
||||
c.hashrate.as_ref().and_then(|h| h.minimum.as_ref()).and_then(&target_ths),
|
||||
c.hashrate.as_ref().and_then(|h| h.maximum.as_ref()).and_then(&target_ths),
|
||||
),
|
||||
None => (None, None, None, None),
|
||||
};
|
||||
let tuning_target_label = data.tuning_target.as_ref().map(|t| match t {
|
||||
TuningTarget::Power(p) => format!("{:.0} W", p.as_watts()),
|
||||
TuningTarget::HashRate(h) => format!(
|
||||
"{:.0} TH/s",
|
||||
h.clone().as_unit(asic_rs::core::data::hashrate::HashRateUnit::TeraHash).value
|
||||
),
|
||||
TuningTarget::MiningMode(m) => format!("mode {m}"),
|
||||
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.
|
||||
let tunes_by_hashrate = matches!(data.tuning_target, Some(TuningTarget::HashRate(_)))
|
||||
|| data.tuning_capabilities.as_ref().map(|c| c.hashrate.is_some()).unwrap_or(false);
|
||||
let hashrate_target = miner.supports_tuning_config() && tunes_by_hashrate;
|
||||
// Probe what this miner supports being told to do (sync, no extra I/O).
|
||||
let caps = MinerCaps {
|
||||
fault_light: miner.supports_set_fault_light(),
|
||||
@@ -585,13 +1011,31 @@ async fn to_row(miner: &dyn Miner) -> MinerRow {
|
||||
resume: miner.supports_resume(),
|
||||
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(),
|
||||
};
|
||||
// PIC vs noPIC is not reported over the network by asic-rs; best-effort
|
||||
// heuristic from the model string, else unknown (true detection needs an
|
||||
// on-board SSH/I2C probe -- a separate feature).
|
||||
let pic_present = if model.to_lowercase().contains("nopic") { Some(false) } else { None };
|
||||
// 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`.
|
||||
let pic_present = infer_pic(&model);
|
||||
// Access: locked/view-only when the miner exposes no writable control at
|
||||
// all, otherwise unlocked. Inferred from asic-rs capabilities (there is no
|
||||
// direct lock-state field). This now covers WhatsMiner too: since round 12
|
||||
@@ -626,17 +1070,36 @@ async fn to_row(miner: &dyn Miner) -> MinerRow {
|
||||
}
|
||||
}
|
||||
let errors = summarize_messages(&data.messages);
|
||||
let faults = messages_to_faults(&data.messages);
|
||||
MinerRow {
|
||||
ip: data.ip.to_string(),
|
||||
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,
|
||||
faults,
|
||||
model,
|
||||
brand,
|
||||
submodel,
|
||||
presets,
|
||||
mac: data.mac.map(|m| m.to_string()).unwrap_or_default(),
|
||||
hostname: data.hostname.clone().unwrap_or_default(),
|
||||
serial: {
|
||||
@@ -662,16 +1125,53 @@ 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 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,
|
||||
hashrate_target_max_ths,
|
||||
tuning_percent: data.tuning_percent,
|
||||
chip_temp_c,
|
||||
board_temps,
|
||||
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),
|
||||
@@ -685,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,
|
||||
@@ -702,8 +1232,13 @@ pub enum ConfigAction {
|
||||
Restart,
|
||||
Pause,
|
||||
Resume,
|
||||
PowerLimit(f64), // watts
|
||||
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)
|
||||
FactoryReset, // round 17 B / G12
|
||||
}
|
||||
|
||||
impl ConfigAction {
|
||||
@@ -715,8 +1250,13 @@ impl ConfigAction {
|
||||
ConfigAction::Restart => "restart".into(),
|
||||
ConfigAction::Pause => "pause".into(),
|
||||
ConfigAction::Resume => "resume".into(),
|
||||
ConfigAction::PowerLimit(w) => format!("power limit {w:.0} W"),
|
||||
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(),
|
||||
ConfigAction::FactoryReset => "factory reset".into(),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -730,7 +1270,12 @@ impl ConfigAction {
|
||||
ConfigAction::Pause => "pausing…".into(),
|
||||
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(),
|
||||
ConfigAction::FactoryReset => "factory resetting…".into(),
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -761,11 +1306,90 @@ async fn apply_action(miner: &dyn Miner, action: &ConfigAction) -> Result<bool,
|
||||
ConfigAction::Pause => miner.pause(None).await,
|
||||
ConfigAction::Resume => miner.resume(None).await,
|
||||
ConfigAction::PowerLimit(w) => miner.set_power_limit(Power::from_watts(*w)).await,
|
||||
ConfigAction::HashRateTarget(ths) => {
|
||||
use asic_rs::core::config::tuning::TuningConfig;
|
||||
use asic_rs::core::data::hashrate::HashRateUnit;
|
||||
use asic_rs::core::data::miner::TuningTarget;
|
||||
// Build a HashRate target by cloning the miner's current hashrate to
|
||||
// inherit its algorithm (HashAlgorithm is not publicly nameable),
|
||||
// overriding value + unit.
|
||||
let data = miner.get_data().await;
|
||||
let Some(mut hr) = data.hashrate.clone() else {
|
||||
return Err("miner reports no current hashrate; cannot set a hashrate target".into());
|
||||
};
|
||||
hr.value = *ths;
|
||||
hr.unit = HashRateUnit::TeraHash;
|
||||
let mut cfg = TuningConfig::new(TuningTarget::HashRate(hr));
|
||||
// Preserve the firmware's current tuning algorithm + scaling (ePIC
|
||||
// requires both for set_tuning_config; other firmware ignore them).
|
||||
if let Some(algo) = miner.get_tuning_config().await.ok().and_then(|c| c.algorithm) {
|
||||
cfg = cfg.with_algorithm(algo);
|
||||
}
|
||||
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};
|
||||
match tz.parse::<Tz>() {
|
||||
Ok(zone) => {
|
||||
miner
|
||||
.set_timezone_config(TimezoneConfig {
|
||||
timezone: Some(zone),
|
||||
available: Vec::new(),
|
||||
})
|
||||
.await
|
||||
}
|
||||
Err(_) => return Err(format!("invalid IANA timezone '{tz}'")),
|
||||
}
|
||||
}
|
||||
ConfigAction::FactoryReset => miner.factory_reset().await,
|
||||
// ChangePassword takes &mut self; handled in the run loop, not here.
|
||||
ConfigAction::ChangePassword(_) => {
|
||||
return Err("internal: change-password handled separately".to_string());
|
||||
}
|
||||
};
|
||||
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.
|
||||
@@ -817,11 +1441,21 @@ pub fn start_config_action(ips: Vec<String>, action: ConfigAction) -> ActionHand
|
||||
let (success, detail) = match ip_s.parse::<std::net::IpAddr>() {
|
||||
Err(_) => (false, "bad IP".to_string()),
|
||||
Ok(ip) => match factory.scan_miner(ip).await {
|
||||
Ok(Some(miner)) => match apply_action(&*miner, &action).await {
|
||||
Ok(true) => (true, "ok".to_string()),
|
||||
Ok(false) => (false, "refused".to_string()),
|
||||
Err(e) => (false, format!("{e}")),
|
||||
},
|
||||
Ok(Some(mut miner)) => {
|
||||
// change_password takes &mut self, so it can't go through
|
||||
// apply_action(&dyn Miner); run it on the owned miner here.
|
||||
let outcome = match &action {
|
||||
ConfigAction::ChangePassword(p) => {
|
||||
miner.change_password(p).await.map_err(|e| e.to_string())
|
||||
}
|
||||
other => apply_action(&*miner, other).await,
|
||||
};
|
||||
match outcome {
|
||||
Ok(true) => (true, "ok".to_string()),
|
||||
Ok(false) => (false, "refused".to_string()),
|
||||
Err(e) => (false, e.to_string()),
|
||||
}
|
||||
}
|
||||
Ok(None) => (false, "no miner at IP".to_string()),
|
||||
Err(e) => (false, format!("{e}")),
|
||||
},
|
||||
@@ -842,16 +1476,20 @@ pub fn start_config_action(ips: Vec<String>, action: ConfigAction) -> ActionHand
|
||||
ActionHandle { rx, cancel }
|
||||
}
|
||||
|
||||
/// One miner's pool config to write (round 14 #7). The worker `username` has
|
||||
/// already been expanded from the per-firmware worker template in the UI (which
|
||||
/// holds the scanned MinerRow), so this carries a fully-resolved endpoint.
|
||||
pub struct PoolTarget {
|
||||
pub ip: String,
|
||||
/// One resolved pool endpoint (worker already expanded from the template).
|
||||
pub struct PoolEntry {
|
||||
pub url: String,
|
||||
pub username: String,
|
||||
pub password: String,
|
||||
}
|
||||
|
||||
/// One miner's pool config to write (round 14 #7, round 15 #1): up to three
|
||||
/// pools (primary + backups), each already worker-expanded in the UI.
|
||||
pub struct PoolTarget {
|
||||
pub ip: String,
|
||||
pub pools: Vec<PoolEntry>,
|
||||
}
|
||||
|
||||
/// Apply a single "default" pool group to each target miner on a background
|
||||
/// thread (round 14 #7). Reuses the ActionMsg/ActionHandle plumbing so the
|
||||
/// existing drain_action + status handling covers it. Miners whose backend does
|
||||
@@ -867,15 +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 ({})", t.username),
|
||||
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 });
|
||||
@@ -910,11 +1557,15 @@ pub fn start_pools_action(targets: Vec<PoolTarget>) -> ActionHandle {
|
||||
let group = PoolGroupConfig {
|
||||
name: "default".to_string(),
|
||||
quota: 1,
|
||||
pools: vec![PoolConfig {
|
||||
url: PoolURL::from(t.url.clone()),
|
||||
username: t.username.clone(),
|
||||
password: t.password.clone(),
|
||||
}],
|
||||
pools: t
|
||||
.pools
|
||||
.iter()
|
||||
.map(|p| PoolConfig {
|
||||
url: PoolURL::from(p.url.clone()),
|
||||
username: p.username.clone(),
|
||||
password: p.password.clone(),
|
||||
})
|
||||
.collect(),
|
||||
};
|
||||
match miner.set_pools_config(vec![group]).await {
|
||||
Ok(true) => (true, "ok".to_string()),
|
||||
@@ -945,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.
|
||||
@@ -1124,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()),
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1160,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);
|
||||
}
|
||||
@@ -1405,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);
|
||||
|
||||
@@ -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"
|
||||
@@ -0,0 +1,51 @@
|
||||
#!/usr/bin/env bash
|
||||
#
|
||||
# Reclaim disk from the local cargo build directory.
|
||||
#
|
||||
# The app and the miner_probe CLI ship as release builds, and the unit tests run
|
||||
# under --release too (see the build notes), so the dev/debug profile tree, any
|
||||
# cross-compile target trees, and the coverage tree are all disposable: they only
|
||||
# ever reappear if something explicitly rebuilds them, and left alone they grow
|
||||
# without bound (a stray `cargo check`/`cargo test` can push the debug tree past
|
||||
# 30 GiB on its own). The release tree is kept warm so the next iteration is still
|
||||
# incremental; only its throwaway bits are pruned.
|
||||
#
|
||||
# Run it right after a release push -- the pushed commit is what CI builds and
|
||||
# ships, so the local intermediates are spare from that point. Safe to run any
|
||||
# time; it never deletes the release build itself.
|
||||
#
|
||||
# Honours CARGO_TARGET_DIR (the build sets it to ~/.cache/alkane-tk-target).
|
||||
set -uo pipefail
|
||||
|
||||
TARGET="${CARGO_TARGET_DIR:-$HOME/.cache/alkane-tk-target}"
|
||||
if [ ! -d "$TARGET" ]; then
|
||||
echo "clean-old-builds: no target dir at $TARGET (nothing to do)"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
human() { du -sh "$1" 2>/dev/null | cut -f1; }
|
||||
before=$(human "$TARGET")
|
||||
|
||||
# Disposable profile/aux trees -- regenerated on demand, never shipped.
|
||||
rm -rf "$TARGET"/debug "$TARGET"/llvm-cov-target "$TARGET"/doc 2>/dev/null
|
||||
|
||||
# Cross-compile target trees (e.g. armv7-unknown-linux-musleabihf). Rust target
|
||||
# triples all carry "-unknown-"; the host release/debug trees do not, so this
|
||||
# never touches the warm release build.
|
||||
for d in "$TARGET"/*-unknown-*; do
|
||||
[ -d "$d" ] && rm -rf "$d"
|
||||
done
|
||||
|
||||
# The incremental caches are rebuild accelerators, not build output -- dropping
|
||||
# them costs one slightly-slower rebuild and can free a few GiB.
|
||||
rm -rf "$TARGET"/release/incremental 2>/dev/null
|
||||
|
||||
# If cargo-sweep is installed, additionally drop release artifacts not touched in
|
||||
# the last few days (old dependency versions left by past rebuilds), keeping the
|
||||
# current build. Optional: install with `cargo install cargo-sweep`.
|
||||
if command -v cargo-sweep >/dev/null 2>&1; then
|
||||
cargo sweep --time 3 "$TARGET" >/dev/null 2>&1 || true
|
||||
fi
|
||||
|
||||
after=$(human "$TARGET")
|
||||
echo "clean-old-builds: $TARGET $before -> $after"
|
||||
@@ -0,0 +1,39 @@
|
||||
Subject: [PATCH 0009] antminer: read Z15-style fans from higher fan slots
|
||||
|
||||
Round-15 #12. The v2020 backend's parse_fans only read fan1..hardware.fans, but
|
||||
some models report their fans in higher slots and leave the low ones at 0 -- the
|
||||
Z15 has fan_num=2 yet reports its two fans in fan3/fan4 with fan1/fan2 = 0, so no
|
||||
fans were read. Scan a generous range of fan slots (1..16) and collect the
|
||||
non-zero readings instead, renumbered 0.. in the order found. Verified against a
|
||||
live Z15 (fan3=4920, fan4=5160). The antminer crate tests pass unchanged.
|
||||
|
||||
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 0ce462c9..38935a59 100644
|
||||
--- a/vendor/asic-rs-firmwares-antminer/src/backends/v2020/mod.rs
|
||||
+++ b/vendor/asic-rs-firmwares-antminer/src/backends/v2020/mod.rs
|
||||
@@ -833,15 +833,23 @@ impl GetFans for AntMinerV2020 {
|
||||
let mut fans: Vec<FanData> = Vec::new();
|
||||
|
||||
if let Some(stats_data) = data.get(&DataField::Fans) {
|
||||
- for i in 1..=self.device_info.hardware.fans.unwrap_or(4) {
|
||||
+ // Some models report their fans in higher fan slots and leave the low
|
||||
+ // ones at 0 -- the Z15, for example, has fan_num=2 but reports its two
|
||||
+ // fans in fan3/fan4 with fan1/fan2 = 0. So scan a generous range of
|
||||
+ // slots and collect the non-zero readings rather than only reading
|
||||
+ // fan1..hardware.fans (which missed the Z15 entirely). The collected
|
||||
+ // fans are renumbered 0.. in the order found (round 14 #12).
|
||||
+ let mut pos: i16 = 0;
|
||||
+ for i in 1..=16 {
|
||||
if let Some(fan_speed) =
|
||||
stats_data.get(format!("fan{}", i)).and_then(|v| v.as_f64())
|
||||
&& fan_speed > 0.0
|
||||
{
|
||||
fans.push(FanData {
|
||||
- position: (i - 1) as i16,
|
||||
+ position: pos,
|
||||
rpm: Some(AngularVelocity::from_rpm(fan_speed)),
|
||||
});
|
||||
+ pos += 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,183 @@
|
||||
Subject: [PATCH 0010] antminer: fix v2020 locate-LED + reboot for the legacy web UI
|
||||
|
||||
Round-15 #7. On old (< 2023.07) Antminer firmware -- the LuCI-derived web UI, e.g.
|
||||
the Z15/Z15J -- the "flash the locate light" action never worked: set_fault_light
|
||||
returned Ok(false) on real hardware even though the request "succeeded".
|
||||
|
||||
Root cause (confirmed against a live Z15): that firmware's blink.cgi does NOT take
|
||||
the JSON body {"blink":"true"} the backend sent (it silently ignores it, answering
|
||||
200 with an empty text/html body, so the JSON parse fails and the error is swallowed
|
||||
into Ok(false)). Its own blink.html instead POSTs a form field action=startBlink /
|
||||
stopBlink, and reads state back with action=onPageLoaded -> {"isBlinking":bool}.
|
||||
The action handler also frequently answers 401/500 even when the toggle succeeds, so
|
||||
its HTTP status is not a reliable success signal.
|
||||
|
||||
Fix: add send_web_form_command (application/x-www-form-urlencoded POST; this reqwest
|
||||
build has no .form()); blink() now fires action=startBlink/stopBlink, ignores the
|
||||
unreliable status, and reads the real state back via onPageLoaded; set_fault_light
|
||||
reports success only when the observed isBlinking matches the request. The LightFlashing
|
||||
data read is routed to the same onPageLoaded path (get_blink_status.cgi is 404 on this
|
||||
firmware) and remapped to {"blink":bool} so the shared /blink extractor still works.
|
||||
|
||||
Also fixes reboot() for the same generation: reboot.html does type:'GET', but the
|
||||
backend POSTed to reboot.cgi. Switched to GET to match the vendor UI (the Restart
|
||||
action was affected). Not live-fired, to avoid rebooting production miners.
|
||||
|
||||
Verified live: Z15 and Z15J now return set_fault_light(on/off) -> Ok(true) with the
|
||||
light genuinely toggling; VNish (AMLogic/CVITek/Xilinx/BeagleBoneBlack) and WhatsMiner
|
||||
(H6OS/H616) remain Ok(true) with no regression.
|
||||
|
||||
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 38935a59..bd8662b1 100644
|
||||
--- a/vendor/asic-rs-firmwares-antminer/src/backends/v2020/mod.rs
|
||||
+++ b/vendor/asic-rs-firmwares-antminer/src/backends/v2020/mod.rs
|
||||
@@ -1111,9 +1111,17 @@ impl SetFaultLight for AntMinerV2020 {
|
||||
true
|
||||
}
|
||||
|
||||
- #[allow(unused_variables)]
|
||||
async fn set_fault_light(&self, fault: bool) -> anyhow::Result<bool> {
|
||||
- Ok(self.web.blink(fault).await.is_ok())
|
||||
+ // `blink()` fires the toggle then reads the state back as `{"isBlinking":
|
||||
+ // bool}` (the legacy CGI's own HTTP status is unreliable). Report success
|
||||
+ // only when the observed locate-LED state matches what was requested.
|
||||
+ let observed = self
|
||||
+ .web
|
||||
+ .blink(fault)
|
||||
+ .await?
|
||||
+ .get("isBlinking")
|
||||
+ .and_then(serde_json::Value::as_bool);
|
||||
+ Ok(observed == Some(fault))
|
||||
}
|
||||
}
|
||||
|
||||
diff --git a/vendor/asic-rs-firmwares-antminer/src/backends/v2020/web.rs b/vendor/asic-rs-firmwares-antminer/src/backends/v2020/web.rs
|
||||
index 7d6f237c..a50cc4ee 100644
|
||||
--- a/vendor/asic-rs-firmwares-antminer/src/backends/v2020/web.rs
|
||||
+++ b/vendor/asic-rs-firmwares-antminer/src/backends/v2020/web.rs
|
||||
@@ -240,6 +240,45 @@ impl AntMinerWebAPI {
|
||||
Ok(response)
|
||||
}
|
||||
|
||||
+ /// POST a form-encoded (`application/x-www-form-urlencoded`) body to a CGI
|
||||
+ /// endpoint and parse the JSON reply. The legacy LuCI web UI endpoints (e.g.
|
||||
+ /// `blink.cgi`) expect `action=...` form fields, not a JSON body. An empty
|
||||
+ /// reply parses to `{}`; a non-2xx status bails.
|
||||
+ async fn send_web_form_command(&self, command: &str, form: &[(&str, &str)]) -> Result<Value> {
|
||||
+ let url = format!("http://{}:{}/cgi-bin/{}.cgi", self.ip, self.port, command);
|
||||
+ // Build an application/x-www-form-urlencoded body by hand (this reqwest
|
||||
+ // build has no `.form()` helper). The only fields used are `action` with
|
||||
+ // fixed ASCII values, so percent-encoding is unnecessary.
|
||||
+ let body = form
|
||||
+ .iter()
|
||||
+ .map(|(k, v)| format!("{k}={v}"))
|
||||
+ .collect::<Vec<_>>()
|
||||
+ .join("&");
|
||||
+ let response = self
|
||||
+ .client()?
|
||||
+ .post(&url)
|
||||
+ .header(
|
||||
+ reqwest::header::CONTENT_TYPE,
|
||||
+ "application/x-www-form-urlencoded",
|
||||
+ )
|
||||
+ .body(body)
|
||||
+ .timeout(self.timeout)
|
||||
+ .send_digest_auth((self.auth.username(), self.auth.password()))
|
||||
+ .await
|
||||
+ .map_err(|e| anyhow!(e.to_string()))?;
|
||||
+
|
||||
+ let status = response.status();
|
||||
+ if !status.is_success() {
|
||||
+ bail!("HTTP request failed with status code {}", status);
|
||||
+ }
|
||||
+ let text = response.text().await.map_err(|e| anyhow!(e.to_string()))?;
|
||||
+ if text.trim().is_empty() {
|
||||
+ Ok(json!({}))
|
||||
+ } else {
|
||||
+ serde_json::from_str(&text).map_err(|e| anyhow!(e.to_string()))
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
pub async fn get_miner_conf(&self) -> Result<Value> {
|
||||
self.send_web_command("get_miner_conf", false, None, Method::GET)
|
||||
.await
|
||||
@@ -257,17 +296,31 @@ impl AntMinerWebAPI {
|
||||
}
|
||||
|
||||
pub async fn blink(&self, blink: bool) -> Result<Value> {
|
||||
- let param = if blink {
|
||||
- json!({"blink": "true"})
|
||||
- } else {
|
||||
- json!({"blink": "false"})
|
||||
- };
|
||||
- self.send_web_command("blink", false, Some(param), Method::POST)
|
||||
+ // Legacy LuCI web UI: the locate LED is toggled by POSTing an `action`
|
||||
+ // form field to blink.cgi (`startBlink`/`stopBlink`) -- NOT a JSON body
|
||||
+ // like the newer (>= 2023.07) firmware expects. The handler performs the
|
||||
+ // action but frequently answers 401/500 even on success, so its HTTP
|
||||
+ // status is not a reliable signal: fire it, ignore the response, then read
|
||||
+ // the real state back via `onPageLoaded`.
|
||||
+ let action = if blink { "startBlink" } else { "stopBlink" };
|
||||
+ let _ = self
|
||||
+ .send_web_form_command("blink", &[("action", action)])
|
||||
+ .await;
|
||||
+ self.blink_status().await
|
||||
+ }
|
||||
+
|
||||
+ /// Query the locate-LED state via the legacy blink.cgi `onPageLoaded` action,
|
||||
+ /// which reliably answers `200 {"isBlinking": bool}`.
|
||||
+ pub async fn blink_status(&self) -> Result<Value> {
|
||||
+ self.send_web_form_command("blink", &[("action", "onPageLoaded")])
|
||||
.await
|
||||
}
|
||||
|
||||
pub async fn reboot(&self) -> Result<Value> {
|
||||
- self.send_web_command("reboot", false, None, Method::POST)
|
||||
+ // The legacy LuCI web UI reboots via GET /cgi-bin/reboot.cgi (its own
|
||||
+ // reboot.html does `type: 'GET'`); a POST is not what this firmware
|
||||
+ // generation expects.
|
||||
+ self.send_web_command("reboot", false, None, Method::GET)
|
||||
.await
|
||||
}
|
||||
|
||||
@@ -350,8 +403,17 @@ impl AntMinerWebAPI {
|
||||
}
|
||||
|
||||
pub async fn get_blink_status(&self) -> Result<Value> {
|
||||
- self.send_web_command("get_blink_status", false, None, Method::GET)
|
||||
- .await
|
||||
+ // The old firmware has no `get_blink_status.cgi` (it answers 404); the
|
||||
+ // locate state lives behind blink.cgi's `onPageLoaded` action as
|
||||
+ // `{"isBlinking": bool}`. Remap it to `{"blink": bool}` so the shared
|
||||
+ // LightFlashing extractor (key `/blink`) keeps working.
|
||||
+ let flashing = self
|
||||
+ .blink_status()
|
||||
+ .await?
|
||||
+ .get("isBlinking")
|
||||
+ .and_then(Value::as_bool)
|
||||
+ .unwrap_or(false);
|
||||
+ Ok(json!({ "blink": flashing }))
|
||||
}
|
||||
|
||||
pub async fn set_network_conf(
|
||||
@@ -383,10 +445,16 @@ impl APIClient for AntMinerWebAPI {
|
||||
MinerCommand::WebAPI {
|
||||
command,
|
||||
parameters,
|
||||
- } => self
|
||||
- .send_web_command(command, false, parameters.clone(), Method::GET)
|
||||
- .await
|
||||
- .map_err(|e| anyhow!(e.to_string())),
|
||||
+ } => {
|
||||
+ // The legacy blink status lives behind a POST form action, not a
|
||||
+ // GET .cgi (which 404s), so route it through the dedicated helper.
|
||||
+ if *command == "get_blink_status" {
|
||||
+ return self.get_blink_status().await;
|
||||
+ }
|
||||
+ self.send_web_command(command, false, parameters.clone(), Method::GET)
|
||||
+ .await
|
||||
+ .map_err(|e| anyhow!(e.to_string()))
|
||||
+ }
|
||||
_ => Err(anyhow!("Unsupported command type for Web client")),
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,162 @@
|
||||
Subject: [PATCH 0011] luxminer: implement set_power_limit; epic: document PSU gating
|
||||
|
||||
Round-15 follow-up. The toolkit reported supports_power_limit=false for LuxOS and
|
||||
ePIC (UMC OS) miners. Investigated against the live corpus (S19j Pro on both).
|
||||
|
||||
LuxOS: genuinely under-reported. LuxOS tunes by discrete named profiles, each
|
||||
carrying a Watts rating (the `profiles` RPC returns Step + Watts), applied with
|
||||
profileset -- pure frequency/voltage tuning, no special PSU needed. Implemented
|
||||
SetPowerLimit by mapping the requested watts to the highest profile whose Watts
|
||||
does not exceed it (or the lowest profile when the target is below all of them),
|
||||
then profileset. supports_set_power_limit now returns true. The pure mapping is
|
||||
factored into parse_profile_watts + select_profile_at_or_below with a unit test.
|
||||
Verified live: set_power_limit(2500) on an S19j Pro selected step -4 (2385 W, the
|
||||
highest <= 2500) and the miner's active profile became 445MHz/-4.
|
||||
|
||||
ePIC: NOT under-reporting after all -- left at false, with a comment explaining
|
||||
why. ePIC PowerPlay's only true power-limit path is the PowerTune perpetual-tune
|
||||
algorithm, which the firmware gates on the PSU: on a fixed-voltage Bitmain PSU
|
||||
(the APW12 on an S19j Pro) perpetualtune/algo rejects it with "Power optimization
|
||||
is not supported by this PSU". That support is a per-PSU runtime property this
|
||||
synchronous, no-I/O capability check cannot observe, so advertising true would
|
||||
over-report on most reflashed Antminers. (Hashrate tuning stays available via
|
||||
set_tuning_config.)
|
||||
|
||||
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 a6f555f7..c21e05b1 100644
|
||||
--- a/vendor/asic-rs-firmwares-epic/src/backends/v1/mod.rs
|
||||
+++ b/vendor/asic-rs-firmwares-epic/src/backends/v1/mod.rs
|
||||
@@ -1369,6 +1369,14 @@ impl SetFaultLight for PowerPlayV1 {
|
||||
#[async_trait]
|
||||
impl SetPowerLimit for PowerPlayV1 {
|
||||
fn supports_set_power_limit(&self) -> bool {
|
||||
+ // ePIC PowerPlay's only true power-limit mechanism is the PowerTune
|
||||
+ // perpetual-tune algorithm, which the firmware gates on the PSU: on a
|
||||
+ // fixed-voltage Bitmain PSU (e.g. the APW12 on an S19j Pro) the
|
||||
+ // perpetualtune/algo endpoint rejects it with "Power optimization is not
|
||||
+ // supported by this PSU". Since that support is a per-PSU runtime property
|
||||
+ // that this synchronous, no-I/O capability check cannot observe, report
|
||||
+ // false rather than over-advertise a control that fails on most reflashed
|
||||
+ // Antminers. (Hashrate tuning is exposed separately via set_tuning_config.)
|
||||
false
|
||||
}
|
||||
}
|
||||
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 af89167c..aac39eb6 100644
|
||||
--- a/vendor/asic-rs-firmwares-luxminer/src/backends/v1/mod.rs
|
||||
+++ b/vendor/asic-rs-firmwares-luxminer/src/backends/v1/mod.rs
|
||||
@@ -1052,10 +1052,66 @@ impl SetFaultLight for LuxMinerV1 {
|
||||
}
|
||||
}
|
||||
|
||||
+/// Parse a LuxOS `profiles` RPC reply into (step name, watts) pairs, keeping only
|
||||
+/// profiles that report both a `Step` and a `Watts` value.
|
||||
+fn parse_profile_watts(profiles: &Value) -> Vec<(String, f64)> {
|
||||
+ profiles
|
||||
+ .get("PROFILES")
|
||||
+ .and_then(Value::as_array)
|
||||
+ .map(|arr| {
|
||||
+ arr.iter()
|
||||
+ .filter_map(|p| {
|
||||
+ let step = p.get("Step").and_then(Value::as_str)?.to_string();
|
||||
+ let watts = p.get("Watts").and_then(Value::as_f64)?;
|
||||
+ Some((step, watts))
|
||||
+ })
|
||||
+ .collect()
|
||||
+ })
|
||||
+ .unwrap_or_default()
|
||||
+}
|
||||
+
|
||||
+/// Choose the LuxOS profile step 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
|
||||
+/// profiles to choose from.
|
||||
+fn select_profile_at_or_below(steps: &[(String, f64)], target_w: f64) -> Option<String> {
|
||||
+ if steps.is_empty() {
|
||||
+ return None;
|
||||
+ }
|
||||
+ let mut sorted: Vec<&(String, f64)> = steps.iter().collect();
|
||||
+ sorted.sort_by(|a, b| a.1.partial_cmp(&b.1).unwrap_or(std::cmp::Ordering::Equal));
|
||||
+ sorted
|
||||
+ .iter()
|
||||
+ .rev()
|
||||
+ .find(|(_, w)| *w <= target_w)
|
||||
+ .or_else(|| sorted.first())
|
||||
+ .map(|(s, _)| s.clone())
|
||||
+}
|
||||
+
|
||||
#[async_trait]
|
||||
impl SetPowerLimit for LuxMinerV1 {
|
||||
fn supports_set_power_limit(&self) -> bool {
|
||||
- false
|
||||
+ true
|
||||
+ }
|
||||
+
|
||||
+ async fn set_power_limit(&self, power: Power) -> anyhow::Result<bool> {
|
||||
+ // LuxOS tunes by discrete named profiles (each carries a Watts rating),
|
||||
+ // not a raw watts setpoint. Map the requested limit to the highest profile
|
||||
+ // whose Watts does not exceed it (or the lowest profile when the target is
|
||||
+ // below every profile), then apply it with profileset.
|
||||
+ let profiles = self.rpc.profiles().await?;
|
||||
+ let steps = parse_profile_watts(&profiles);
|
||||
+ let Some(chosen) = select_profile_at_or_below(&steps, power.as_watts()) else {
|
||||
+ anyhow::bail!("LuxOS reported no tunable profiles with a Step/Watts pair");
|
||||
+ };
|
||||
+ let resp = self.rpc.profileset(&chosen).await?;
|
||||
+ // LuxOS answers with a STATUS array; "S"/"I" is success. A missing status
|
||||
+ // after a non-error reply is treated as applied.
|
||||
+ Ok(resp
|
||||
+ .pointer("/STATUS/0/STATUS")
|
||||
+ .and_then(Value::as_str)
|
||||
+ .map(|s| matches!(s, "S" | "I"))
|
||||
+ .unwrap_or(true))
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1231,6 +1287,46 @@ mod tests {
|
||||
POWER, PROFILES, STATS, SUMMARY, TEMPS, VERSION, VOLTAGEGET_0, VOLTAGEGET_1, VOLTAGEGET_2,
|
||||
};
|
||||
|
||||
+ #[test]
|
||||
+ fn power_limit_profile_selection() {
|
||||
+ // LuxOS reports a ladder of profiles, each with a Step name and Watts.
|
||||
+ let steps = vec![
|
||||
+ ("-16".to_string(), 865.0),
|
||||
+ ("-4".to_string(), 2385.0),
|
||||
+ ("-2".to_string(), 2790.0),
|
||||
+ ("0".to_string(), 3100.0),
|
||||
+ ];
|
||||
+ // The highest profile at or below the requested watts limit.
|
||||
+ assert_eq!(
|
||||
+ select_profile_at_or_below(&steps, 2500.0).as_deref(),
|
||||
+ Some("-4")
|
||||
+ );
|
||||
+ assert_eq!(
|
||||
+ select_profile_at_or_below(&steps, 2790.0).as_deref(),
|
||||
+ Some("-2")
|
||||
+ );
|
||||
+ // Above every profile -> the maximum profile (a limit can't exceed the
|
||||
+ // hardware's top profile).
|
||||
+ assert_eq!(
|
||||
+ select_profile_at_or_below(&steps, 9000.0).as_deref(),
|
||||
+ Some("0")
|
||||
+ );
|
||||
+ // Below every profile -> the minimum profile.
|
||||
+ assert_eq!(
|
||||
+ select_profile_at_or_below(&steps, 100.0).as_deref(),
|
||||
+ Some("-16")
|
||||
+ );
|
||||
+ // No profiles -> nothing to choose.
|
||||
+ assert_eq!(select_profile_at_or_below(&[], 2500.0), None);
|
||||
+
|
||||
+ // parse_profile_watts against the captured LuxOS `profiles` reply: it
|
||||
+ // yields tunable profiles and selection finds a real step among them.
|
||||
+ let profiles: Value = serde_json::from_str(PROFILES).unwrap();
|
||||
+ let parsed = parse_profile_watts(&profiles);
|
||||
+ assert!(!parsed.is_empty(), "fixture should carry tunable profiles");
|
||||
+ assert!(select_profile_at_or_below(&parsed, 2500.0).is_some());
|
||||
+ }
|
||||
+
|
||||
#[tokio::test]
|
||||
|
||||
async fn test_luxminer_v1() -> anyhow::Result<()> {
|
||||
@@ -0,0 +1,229 @@
|
||||
Subject: [PATCH 0012] whatsminer: robust per-component fault messages (V1 source + malformed-array repair)
|
||||
|
||||
Round-16 #1/#3. The toolkit could not attribute WhatsMiner faults to specific
|
||||
hashboards. Two backend gaps, both found against live H6OS units:
|
||||
|
||||
1. V1 backend sourced messages from `summary` (/SUMMARY/0 "Error Code N"), which
|
||||
is empty on these units -- the real faults are in get_error_code, like V2/V3.
|
||||
Repointed DataField::Messages to get_error_code (/Msg/error_code) and rewrote
|
||||
parse_messages to read the {code: timestamp} array (mirroring V2). asic-rs's
|
||||
error_codes::error_info already maps each code to a MinerComponent (HashBoard
|
||||
idx / PowerSupply / Fan / ControlBoard) and human text.
|
||||
|
||||
2. Some firmware emits an INVALID error_code array of bare "code":"timestamp"
|
||||
pairs (`["540":"..","541":".."]`) instead of objects (`[{"540":".."}]`), which
|
||||
fails the whole response parse so no messages surface at all. Added
|
||||
error_codes::repair_error_code_array (targeted, no-op on valid input) and call
|
||||
it in the V1 and V2 RPC read paths before parsing.
|
||||
|
||||
Verified live: 10.7.1.231 -> PowerSupply errors 205/206/217/251; 10.8.1.234 (the
|
||||
malformed-array unit) -> 540 HashBoard 0, 541/561 HashBoard 1, 600 miner-level --
|
||||
board 2 correctly clean. Unit test covers the repair; whatsminer tests pass.
|
||||
|
||||
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 c9c96713..67907049 100644
|
||||
--- a/vendor/asic-rs-firmwares-whatsminer/src/backends/v1/mod.rs
|
||||
+++ b/vendor/asic-rs-firmwares-whatsminer/src/backends/v1/mod.rs
|
||||
@@ -117,6 +117,10 @@ impl GetDataLocations for WhatsMinerV1 {
|
||||
command: "get_psu",
|
||||
parameters: None,
|
||||
};
|
||||
+ const RPC_GET_ERROR_CODE: MinerCommand = MinerCommand::RPC {
|
||||
+ command: "get_error_code",
|
||||
+ parameters: None,
|
||||
+ };
|
||||
|
||||
match data_field {
|
||||
DataField::Mac => vec![(
|
||||
@@ -254,10 +258,10 @@ impl GetDataLocations for WhatsMinerV1 {
|
||||
},
|
||||
)],
|
||||
DataField::Messages => vec![(
|
||||
- RPC_SUMMARY,
|
||||
+ RPC_GET_ERROR_CODE,
|
||||
DataExtractor {
|
||||
func: get_by_pointer,
|
||||
- key: Some("/SUMMARY/0"),
|
||||
+ key: Some("/Msg/error_code"),
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
@@ -471,32 +475,43 @@ impl GetTuningCapabilities for WhatsMinerV1 {}
|
||||
impl GetLightFlashing for WhatsMinerV1 {}
|
||||
impl GetMessages for WhatsMinerV1 {
|
||||
fn parse_messages(&self, data: &HashMap<DataField, Value>) -> Vec<MinerMessage> {
|
||||
+ // WhatsMiner V1 (H6OS) reports faults via get_error_code -> Msg.error_code,
|
||||
+ // an array of {code: timestamp} objects (the same shape as V2/V3; the RPC
|
||||
+ // layer repairs the occasional invalid bare-pair array first). The older
|
||||
+ // summary "Error Code N" fields are frequently empty on these units.
|
||||
let mut messages = Vec::new();
|
||||
-
|
||||
- let error_count = data
|
||||
- .get(&DataField::Messages)
|
||||
- .and_then(|val| {
|
||||
- val.pointer("/Error Code Count")
|
||||
- .and_then(|val| val.as_u64())
|
||||
- })
|
||||
- .unwrap_or(0u64) as usize;
|
||||
- for idx in 0..error_count {
|
||||
- let e_code = data
|
||||
- .get(&DataField::Messages)
|
||||
- .and_then(|val| val.pointer(&format!("/Error Code {}", idx)))
|
||||
- .and_then(|val| val.as_u64());
|
||||
- if let Some(code) = e_code {
|
||||
- let info = crate::error_codes::error_info(code);
|
||||
+ let Some(errors) = data.get(&DataField::Messages) else {
|
||||
+ return messages;
|
||||
+ };
|
||||
+ for obj in errors.as_array().unwrap_or(&Vec::new()).iter() {
|
||||
+ let Some(obj) = obj.as_object() else {
|
||||
+ continue;
|
||||
+ };
|
||||
+ for (code, time) in obj.iter() {
|
||||
+ let Some(time_str) = time.as_str() else {
|
||||
+ continue;
|
||||
+ };
|
||||
+ let timestamp =
|
||||
+ chrono::NaiveDateTime::parse_from_str(time_str, "%Y-%m-%d %H:%M:%S")
|
||||
+ .map(|t| {
|
||||
+ chrono::DateTime::<chrono::Utc>::from_naive_utc_and_offset(
|
||||
+ t,
|
||||
+ chrono::Utc,
|
||||
+ )
|
||||
+ })
|
||||
+ .map(|dt| dt.timestamp() as u32)
|
||||
+ .unwrap_or(0);
|
||||
+ let parsed_code = code.parse::<u64>().unwrap_or(0);
|
||||
+ let info = crate::error_codes::error_info(parsed_code);
|
||||
messages.push(MinerMessage::with_component(
|
||||
- 0,
|
||||
- code,
|
||||
+ timestamp,
|
||||
+ parsed_code,
|
||||
info.message,
|
||||
MessageSeverity::Error,
|
||||
info.component,
|
||||
));
|
||||
}
|
||||
}
|
||||
-
|
||||
messages
|
||||
}
|
||||
}
|
||||
diff --git a/vendor/asic-rs-firmwares-whatsminer/src/backends/v1/rpc.rs b/vendor/asic-rs-firmwares-whatsminer/src/backends/v1/rpc.rs
|
||||
index 6e6c604e..384bbcd3 100644
|
||||
--- a/vendor/asic-rs-firmwares-whatsminer/src/backends/v1/rpc.rs
|
||||
+++ b/vendor/asic-rs-firmwares-whatsminer/src/backends/v1/rpc.rs
|
||||
@@ -106,6 +106,9 @@ impl RPCAPIClient for WhatsMinerRPCAPI {
|
||||
let response = response
|
||||
.replace('\n', "") // Fix for WM V1, can have newlines in version which breaks the json parser
|
||||
.replace(",}", "}"); // Fix for WM V1, can have trailing commas which breaks the json parser
|
||||
+ // Fix for WM V1 get_error_code, which can emit an invalid array of bare
|
||||
+ // "code":"timestamp" pairs (`["540":".."]`) that fails the whole parse.
|
||||
+ let response = crate::error_codes::repair_error_code_array(&response);
|
||||
|
||||
self.parse_rpc_result(&response)
|
||||
}
|
||||
diff --git a/vendor/asic-rs-firmwares-whatsminer/src/backends/v2/rpc.rs b/vendor/asic-rs-firmwares-whatsminer/src/backends/v2/rpc.rs
|
||||
index 9eec7a93..99da6a89 100644
|
||||
--- a/vendor/asic-rs-firmwares-whatsminer/src/backends/v2/rpc.rs
|
||||
+++ b/vendor/asic-rs-firmwares-whatsminer/src/backends/v2/rpc.rs
|
||||
@@ -202,6 +202,9 @@ impl WhatsMinerRPCAPI {
|
||||
read_stream_response(&mut stream, DEFAULT_RPC_TIMEOUT).await
|
||||
};
|
||||
let response = response?;
|
||||
+ // Repair the occasional invalid get_error_code array (bare
|
||||
+ // "code":"timestamp" pairs) before parsing; a no-op on valid responses.
|
||||
+ let response = crate::error_codes::repair_error_code_array(&response);
|
||||
|
||||
self.parse_rpc_result(&response)
|
||||
}
|
||||
diff --git a/vendor/asic-rs-firmwares-whatsminer/src/error_codes.rs b/vendor/asic-rs-firmwares-whatsminer/src/error_codes.rs
|
||||
index b442e9dc..5bd8b02a 100644
|
||||
--- a/vendor/asic-rs-firmwares-whatsminer/src/error_codes.rs
|
||||
+++ b/vendor/asic-rs-firmwares-whatsminer/src/error_codes.rs
|
||||
@@ -2,6 +2,56 @@ use asic_rs_core::data::message::MinerComponent;
|
||||
|
||||
const UNKNOWN: &str = "Unknown error type.";
|
||||
|
||||
+/// Repair an invalid `error_code` array emitted by some WhatsMiner firmware.
|
||||
+///
|
||||
+/// Certain (older, H6OS) firmwares report the fault list as bare
|
||||
+/// `"code":"timestamp"` pairs directly inside a JSON array
|
||||
+/// (`"error_code":["540":"..","541":".."]`) rather than an array of single-key
|
||||
+/// objects (`[{"540":".."},{"541":".."}]`). The bare form is not valid JSON and
|
||||
+/// fails the whole response parse, so no messages are surfaced at all. Rewrite the
|
||||
+/// bare pairs into objects; already-valid (object-wrapped or empty) arrays and
|
||||
+/// responses without an `error_code` array are returned unchanged.
|
||||
+pub fn repair_error_code_array(raw: &str) -> String {
|
||||
+ const KEY: &str = "\"error_code\":[";
|
||||
+ let Some(pos) = raw.find(KEY) else {
|
||||
+ return raw.to_string();
|
||||
+ };
|
||||
+ let open = pos + KEY.len() - 1; // index of the '['
|
||||
+ let bytes = raw.as_bytes();
|
||||
+ let mut depth = 0i32;
|
||||
+ let mut close = None;
|
||||
+ for (i, &b) in bytes.iter().enumerate().skip(open) {
|
||||
+ match b {
|
||||
+ b'[' => depth += 1,
|
||||
+ b']' => {
|
||||
+ depth -= 1;
|
||||
+ if depth == 0 {
|
||||
+ close = Some(i);
|
||||
+ break;
|
||||
+ }
|
||||
+ }
|
||||
+ _ => {}
|
||||
+ }
|
||||
+ }
|
||||
+ let Some(close) = close else {
|
||||
+ return raw.to_string();
|
||||
+ };
|
||||
+ let inner = &raw[open + 1..close];
|
||||
+ // Already valid (each entry object-wrapped) or empty -> leave untouched.
|
||||
+ if inner.trim().is_empty() || inner.contains('{') {
|
||||
+ return raw.to_string();
|
||||
+ }
|
||||
+ // Timestamps carry no commas, so a top-level comma split isolates each pair.
|
||||
+ let wrapped = inner
|
||||
+ .split(',')
|
||||
+ .map(str::trim)
|
||||
+ .filter(|s| !s.is_empty())
|
||||
+ .map(|pair| format!("{{{pair}}}"))
|
||||
+ .collect::<Vec<_>>()
|
||||
+ .join(",");
|
||||
+ format!("{}{}{}", &raw[..=open], wrapped, &raw[close..])
|
||||
+}
|
||||
+
|
||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||
pub struct ErrorInfo {
|
||||
pub message: String,
|
||||
@@ -514,6 +564,27 @@ fn serial_info_error(sub: u64, val: u64) -> String {
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
+ #[test]
|
||||
+ fn repair_malformed_error_code_array() {
|
||||
+ // Bare "code":"timestamp" pairs inside the array (invalid JSON) -> objects.
|
||||
+ let bad = r#"{"STATUS":"S","Msg":{"error_code":["540":"2026-09-22 07:08:14","561":"2026-09-21 22:26:36"]},"Description":""}"#;
|
||||
+ let fixed = repair_error_code_array(bad);
|
||||
+ let v: serde_json::Value = serde_json::from_str(&fixed).expect("repaired JSON must parse");
|
||||
+ let arr = v["Msg"]["error_code"].as_array().unwrap();
|
||||
+ assert_eq!(arr.len(), 2);
|
||||
+ assert_eq!(arr[0]["540"], "2026-09-22 07:08:14");
|
||||
+ assert_eq!(arr[1]["561"], "2026-09-21 22:26:36");
|
||||
+
|
||||
+ // Already-valid (object-wrapped) arrays are returned unchanged.
|
||||
+ let good = r#"{"Msg":{"error_code":[{"205":"2026-09-20 03:35:44"}]}}"#;
|
||||
+ assert_eq!(repair_error_code_array(good), good);
|
||||
+ // Empty array and no-array responses are untouched.
|
||||
+ let empty = r#"{"Msg":{"error_code":[]}}"#;
|
||||
+ assert_eq!(repair_error_code_array(empty), empty);
|
||||
+ let none = r#"{"STATUS":"S"}"#;
|
||||
+ assert_eq!(repair_error_code_array(none), none);
|
||||
+ }
|
||||
+
|
||||
#[test]
|
||||
fn short_code_returns_unknown() {
|
||||
// Act
|
||||
@@ -0,0 +1,98 @@
|
||||
Subject: [PATCH 0013] braiins+luxminer: implement best-share / session-best-share (round 16 G9)
|
||||
|
||||
The GetBestShare/GetSessionBestShare traits had empty impls on every backend, so
|
||||
MinerData.best_share/session_best_share were always None and the toolkit's two
|
||||
"Best share" / "Session best" columns were dead.
|
||||
|
||||
Braiins v26_04: map DataField::BestShare to the already-fetched miner/stats WebAPI
|
||||
response (/miner_stats/best_share) and parse it. (BOS has no session-best field ->
|
||||
session stays None.) Verified live read-only on 10.4.1.83: 130601978.
|
||||
|
||||
LuxMiner v1: map DataField::BestShare + SessionBestShare to the already-fetched
|
||||
summary RPC (/SUMMARY/0/Best Share and /Best Session Share) and parse both.
|
||||
Verified live read-only on 10.4.1.60 (638881749/638881749) and 10.4.1.67
|
||||
(497802665/497802665).
|
||||
|
||||
No extra network calls (both reuse commands already collected by get_data).
|
||||
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 fa947aee..e65fb201 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
|
||||
@@ -286,6 +286,14 @@ impl GetDataLocations for BraiinsV2604 {
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
+ DataField::BestShare => vec![(
|
||||
+ WEB_MINER_STATS,
|
||||
+ DataExtractor {
|
||||
+ func: get_by_pointer,
|
||||
+ key: Some("/miner_stats/best_share"),
|
||||
+ tag: None,
|
||||
+ },
|
||||
+ )],
|
||||
DataField::TuningTarget => vec![
|
||||
(
|
||||
WEB_MINER_CONFIGURATION,
|
||||
@@ -548,7 +556,13 @@ impl GetUptime for BraiinsV2604 {
|
||||
}
|
||||
}
|
||||
|
||||
-impl GetBestShare for BraiinsV2604 {}
|
||||
+impl GetBestShare for BraiinsV2604 {
|
||||
+ fn parse_best_share(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
|
||||
+ // Braiins OS reports the all-time best share at miner/stats -> miner_stats.best_share
|
||||
+ // (round 16 / G9). Large diffs may exceed f64 exactness but are fine for display.
|
||||
+ data.extract::<f64>(DataField::BestShare)
|
||||
+ }
|
||||
+}
|
||||
impl GetSessionBestShare for BraiinsV2604 {}
|
||||
|
||||
impl GetOperatingState for BraiinsV2604 {
|
||||
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 aac39eb6..2d1331bf 100644
|
||||
--- a/vendor/asic-rs-firmwares-luxminer/src/backends/v1/mod.rs
|
||||
+++ b/vendor/asic-rs-firmwares-luxminer/src/backends/v1/mod.rs
|
||||
@@ -445,6 +445,22 @@ impl GetDataLocations for LuxMinerV1 {
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
+ 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::Uptime => vec![(
|
||||
RPC_STATS,
|
||||
DataExtractor {
|
||||
@@ -888,8 +904,18 @@ impl GetUptime for LuxMinerV1 {
|
||||
}
|
||||
}
|
||||
|
||||
-impl GetBestShare for LuxMinerV1 {}
|
||||
-impl GetSessionBestShare for LuxMinerV1 {}
|
||||
+impl GetBestShare for LuxMinerV1 {
|
||||
+ fn parse_best_share(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
|
||||
+ // LuxOS summary -> "Best Share" (all-time), round 16 / G9.
|
||||
+ data.extract::<f64>(DataField::BestShare)
|
||||
+ }
|
||||
+}
|
||||
+impl GetSessionBestShare for LuxMinerV1 {
|
||||
+ fn parse_session_best_share(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
|
||||
+ // LuxOS summary -> "Best Session Share" (since boot), round 16 / G9.
|
||||
+ data.extract::<f64>(DataField::SessionBestShare)
|
||||
+ }
|
||||
+}
|
||||
|
||||
impl GetOperatingState for LuxMinerV1 {}
|
||||
|
||||
@@ -0,0 +1,88 @@
|
||||
Subject: [PATCH 0014] luxminer: pool ops must be privileged (send session_id); add removepool
|
||||
|
||||
Round 16 / G13. The LuxOS pool write commands (addgroup, groupquota, removegroup,
|
||||
addpool, switchpool, enablepool, disablepool) were sent with privileged=false, so
|
||||
no session_id was included. That works on default units but FAILS with a
|
||||
"Missing session_id" error on password-set LuxOS units (every other LuxOS write --
|
||||
profileset/fanset/curtail/etc. -- is already privileged=true). Flip all seven pool
|
||||
ops to privileged=true so send_command prepends the logon session token, and add
|
||||
the missing rpc.removepool (privileged) for future incremental pool editing.
|
||||
|
||||
Verified no regression on a default corpus unit (10.4.1.60): set_pools_config still
|
||||
applies correctly via the new privileged path. The password-set failure path is a
|
||||
code-correct fix but needs a password-set LuxOS unit to reproduce/verify live.
|
||||
diff --git a/vendor/asic-rs-firmwares-luxminer/src/backends/v1/rpc.rs b/vendor/asic-rs-firmwares-luxminer/src/backends/v1/rpc.rs
|
||||
index 1afc686c..39d7ef63 100644
|
||||
--- a/vendor/asic-rs-firmwares-luxminer/src/backends/v1/rpc.rs
|
||||
+++ b/vendor/asic-rs-firmwares-luxminer/src/backends/v1/rpc.rs
|
||||
@@ -239,7 +239,7 @@ impl LUXMinerRPCAPI {
|
||||
pub async fn addgroup(&self, name: &str, quota: u32) -> anyhow::Result<Value> {
|
||||
self.send_command(
|
||||
"addgroup",
|
||||
- false,
|
||||
+ true,
|
||||
Some(Value::String(format!("{name},{quota}"))),
|
||||
)
|
||||
.await
|
||||
@@ -248,7 +248,7 @@ impl LUXMinerRPCAPI {
|
||||
pub async fn groupquota(&self, group_id: u32, quota: u32) -> anyhow::Result<Value> {
|
||||
self.send_command(
|
||||
"groupquota",
|
||||
- false,
|
||||
+ true,
|
||||
Some(Value::String(format!("{group_id},{quota}"))),
|
||||
)
|
||||
.await
|
||||
@@ -257,7 +257,7 @@ impl LUXMinerRPCAPI {
|
||||
pub async fn removegroup(&self, group_id: u32) -> anyhow::Result<Value> {
|
||||
self.send_command(
|
||||
"removegroup",
|
||||
- false,
|
||||
+ true,
|
||||
Some(Value::String(group_id.to_string())),
|
||||
)
|
||||
.await
|
||||
@@ -275,14 +275,14 @@ impl LUXMinerRPCAPI {
|
||||
params.push(group_id);
|
||||
}
|
||||
|
||||
- self.send_command("addpool", false, Some(Value::String(params.join(","))))
|
||||
+ self.send_command("addpool", true, Some(Value::String(params.join(","))))
|
||||
.await
|
||||
}
|
||||
|
||||
pub async fn switchpool(&self, pool_id: i32) -> anyhow::Result<Value> {
|
||||
self.send_command(
|
||||
"switchpool",
|
||||
- false,
|
||||
+ true,
|
||||
Some(Value::String(pool_id.to_string())),
|
||||
)
|
||||
.await
|
||||
@@ -291,7 +291,7 @@ impl LUXMinerRPCAPI {
|
||||
pub async fn enablepool(&self, pool_id: i32) -> anyhow::Result<Value> {
|
||||
self.send_command(
|
||||
"enablepool",
|
||||
- false,
|
||||
+ true,
|
||||
Some(Value::String(pool_id.to_string())),
|
||||
)
|
||||
.await
|
||||
@@ -300,7 +300,16 @@ impl LUXMinerRPCAPI {
|
||||
pub async fn disablepool(&self, pool_id: i32) -> anyhow::Result<Value> {
|
||||
self.send_command(
|
||||
"disablepool",
|
||||
- false,
|
||||
+ true,
|
||||
+ Some(Value::String(pool_id.to_string())),
|
||||
+ )
|
||||
+ .await
|
||||
+ }
|
||||
+
|
||||
+ pub async fn removepool(&self, pool_id: i32) -> anyhow::Result<Value> {
|
||||
+ self.send_command(
|
||||
+ "removepool",
|
||||
+ true,
|
||||
Some(Value::String(pool_id.to_string())),
|
||||
)
|
||||
.await
|
||||
@@ -0,0 +1,37 @@
|
||||
Subject: [PATCH 0015] braiins v26_04: treat an empty 2xx body as success (not a parse error)
|
||||
|
||||
Found live verifying change-password (round 17 B / G11). The BOS REST setters like
|
||||
PUT auth/password answer 2xx with an empty body; send_command tried
|
||||
response.json() on it, which fails, so change_password (which does `.is_ok()`)
|
||||
reported Ok(false) even though the password DID change. Read the body as text
|
||||
first: an empty body on a success status is Null (success), a non-empty body must
|
||||
still parse. Verified live on 10.4.1.27: change root->bftest2 now returns Ok(true),
|
||||
the new password authenticates, and restore -> root returns Ok(true).
|
||||
diff --git a/vendor/asic-rs-firmwares-braiins/src/backends/v26_04/web.rs b/vendor/asic-rs-firmwares-braiins/src/backends/v26_04/web.rs
|
||||
index 624eca4c..3e06b682 100644
|
||||
--- a/vendor/asic-rs-firmwares-braiins/src/backends/v26_04/web.rs
|
||||
+++ b/vendor/asic-rs-firmwares-braiins/src/backends/v26_04/web.rs
|
||||
@@ -57,11 +57,20 @@ impl WebAPIClient for BraiinsWebAPI {
|
||||
|
||||
let status = response.status();
|
||||
if status.is_success() {
|
||||
- let json_data = response
|
||||
- .json()
|
||||
+ // Some setters (e.g. PUT auth/password) answer 2xx with an empty or
|
||||
+ // non-JSON body. An empty body is success, not a parse error -- treat
|
||||
+ // it as Null so callers using `.is_ok()` don't read a real success as
|
||||
+ // failure. A non-empty body must still parse.
|
||||
+ let body = response
|
||||
+ .text()
|
||||
.await
|
||||
.map_err(|e| BraiinsError::ParseError(e.to_string()))?;
|
||||
- Ok(json_data)
|
||||
+ if body.trim().is_empty() {
|
||||
+ Ok(Value::Null)
|
||||
+ } else {
|
||||
+ Ok(serde_json::from_str(&body)
|
||||
+ .map_err(|e| BraiinsError::ParseError(e.to_string()))?)
|
||||
+ }
|
||||
} else {
|
||||
// The API reports why it rejected a request in the body.
|
||||
let status = status.as_u16();
|
||||
@@ -0,0 +1,62 @@
|
||||
Subject: [PATCH 0016] braiins v26_04: single-flight auth + defensive get_data timeout
|
||||
|
||||
Round 17 R4 support. Braiins get_data fans out to ~12 authenticated REST calls
|
||||
concurrently. Two hardening changes so a Braiins miner survives a busy scan:
|
||||
|
||||
- ensure_authenticated single-flights the login. Previously all ~12 concurrent
|
||||
commands could see no token and each POST /auth/login -- a thundering herd that
|
||||
doubled the connection load. Now the write lock is held across the login with a
|
||||
double-check, so exactly one call authenticates and the rest reuse the token.
|
||||
- The per-call timeout goes 5s -> 15s as defensive headroom (a healthy miner still
|
||||
answers well under a second) so a call queued behind a scan burst completes
|
||||
instead of dropping miner/stats.
|
||||
|
||||
Neither is the primary fix for the fleet-scan value dropout -- that is the
|
||||
app-side scan concurrency cap (scan::SCAN_CONCURRENCY_LIMIT = 128), which keeps
|
||||
the identification burst from starving these calls. These are the belt to that
|
||||
suspenders. Verified live: a 10.4.1.0/24 scan now populates both Braiins corpus
|
||||
miners (.27, .83) fully (watts, best-share, fw/control-board) and misses no
|
||||
responders.
|
||||
diff --git a/vendor/asic-rs-firmwares-braiins/src/backends/v26_04/web.rs b/vendor/asic-rs-firmwares-braiins/src/backends/v26_04/web.rs
|
||||
index 3e06b682..ae433d98 100644
|
||||
--- a/vendor/asic-rs-firmwares-braiins/src/backends/v26_04/web.rs
|
||||
+++ b/vendor/asic-rs-firmwares-braiins/src/backends/v26_04/web.rs
|
||||
@@ -87,7 +87,13 @@ impl BraiinsWebAPI {
|
||||
client: OnceCell::new(),
|
||||
ip,
|
||||
port: 80,
|
||||
- timeout: Duration::from_secs(5),
|
||||
+ // Braiins get_data fans out to ~12 authenticated REST calls that run
|
||||
+ // concurrently. A healthy miner answers well under a second; the extra
|
||||
+ // headroom over the old 5 s is defensive so a call that queues behind a
|
||||
+ // scan burst still completes instead of dropping miner/stats
|
||||
+ // (hashrate/watts/best-share). The real fix for the fleet-scan dropout
|
||||
+ // is the app-side scan concurrency cap (see scan::SCAN_CONCURRENCY_LIMIT).
|
||||
+ timeout: Duration::from_secs(15),
|
||||
bearer_token: RwLock::new(None),
|
||||
auth,
|
||||
}
|
||||
@@ -122,13 +128,22 @@ impl BraiinsWebAPI {
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
+ // Single-flight the login: get_data fires ~12 commands concurrently, and
|
||||
+ // without this they would ALL see no token and each POST /auth/login (a
|
||||
+ // thundering herd that doubles the connection load and races under a
|
||||
+ // high-concurrency fleet scan, dropping most values). Hold the write lock
|
||||
+ // across the login so exactly one call authenticates and the rest reuse it.
|
||||
+ let mut guard = self.bearer_token.write().await;
|
||||
+ if guard.is_some() {
|
||||
+ return Ok(());
|
||||
+ }
|
||||
let token = match &self.auth {
|
||||
MinerAuth::TokenAuth(token) => token.expose_secret().to_string(),
|
||||
MinerAuth::UserAndPass(creds) => {
|
||||
self.authenticate(creds.password.expose_secret()).await?
|
||||
}
|
||||
};
|
||||
- *self.bearer_token.write().await = Some(token);
|
||||
+ *guard = Some(token);
|
||||
|
||||
Ok(())
|
||||
}
|
||||
@@ -0,0 +1,103 @@
|
||||
Subject: [PATCH 0017] luxminer v1: select power-limit profile by name, not step
|
||||
|
||||
Round 17 C (found via live tuning verification). set_power_limit mapped a watts
|
||||
target to a LuxOS profile and applied it with `profileset`, but keyed on the
|
||||
profile's `Step` field. The top/factory profile is named "default" and its Step
|
||||
is "0"; LuxOS's profileset reads the parameter "0" as empty and answers
|
||||
"Missing profile parameter" (Code 400). So the setter could never select the
|
||||
default profile -- and a miner nudged off default by a watts limit could not be
|
||||
returned to it via the power-limit control, stranding it below its factory point.
|
||||
|
||||
parse_profile_watts now keys on `Profile Name` (e.g. "480MHz", "default"), which
|
||||
profileset accepts for every profile including the default. Verified live on a
|
||||
LuxOS S19j Pro (10.4.1.60): set_power_limit(2700) -> 480MHz/2632W, and
|
||||
set_power_limit(2900) -> default/2794W (previously errored), restoring the miner
|
||||
to its factory profile. Unit test updated to key on names and to cover the
|
||||
top-profile-is-"default" case.
|
||||
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 2d1331bf..a4db1e03 100644
|
||||
--- a/vendor/asic-rs-firmwares-luxminer/src/backends/v1/mod.rs
|
||||
+++ b/vendor/asic-rs-firmwares-luxminer/src/backends/v1/mod.rs
|
||||
@@ -1078,8 +1078,14 @@ impl SetFaultLight for LuxMinerV1 {
|
||||
}
|
||||
}
|
||||
|
||||
-/// Parse a LuxOS `profiles` RPC reply into (step name, watts) pairs, keeping only
|
||||
-/// profiles that report both a `Step` and a `Watts` value.
|
||||
+/// Parse a LuxOS `profiles` RPC reply into (profile name, watts) pairs, keeping
|
||||
+/// only profiles that report both a `Profile Name` and a `Watts` value.
|
||||
+///
|
||||
+/// The identifier is the `Profile Name` (e.g. "480MHz", "default"), NOT the
|
||||
+/// `Step`: `profileset` takes the name, and the default profile's step is "0",
|
||||
+/// which LuxOS reads as an empty parameter ("Missing profile parameter"), so a
|
||||
+/// step-keyed setter can never select the default profile and could strand a
|
||||
+/// miner off its factory point.
|
||||
fn parse_profile_watts(profiles: &Value) -> Vec<(String, f64)> {
|
||||
profiles
|
||||
.get("PROFILES")
|
||||
@@ -1087,16 +1093,16 @@ fn parse_profile_watts(profiles: &Value) -> Vec<(String, f64)> {
|
||||
.map(|arr| {
|
||||
arr.iter()
|
||||
.filter_map(|p| {
|
||||
- let step = p.get("Step").and_then(Value::as_str)?.to_string();
|
||||
+ let name = p.get("Profile Name").and_then(Value::as_str)?.to_string();
|
||||
let watts = p.get("Watts").and_then(Value::as_f64)?;
|
||||
- Some((step, watts))
|
||||
+ Some((name, watts))
|
||||
})
|
||||
.collect()
|
||||
})
|
||||
.unwrap_or_default()
|
||||
}
|
||||
|
||||
-/// Choose the LuxOS profile step to satisfy a watts power limit: the highest-watt
|
||||
+/// 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
|
||||
/// profiles to choose from.
|
||||
@@ -1315,32 +1321,34 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn power_limit_profile_selection() {
|
||||
- // LuxOS reports a ladder of profiles, each with a Step name and Watts.
|
||||
+ // LuxOS reports a ladder of profiles, each with a Profile Name and Watts.
|
||||
+ // The top profile is named "default" (its Step is "0", which profileset
|
||||
+ // rejects -- so selection must key on the name, not the step).
|
||||
let steps = vec![
|
||||
- ("-16".to_string(), 865.0),
|
||||
- ("-4".to_string(), 2385.0),
|
||||
- ("-2".to_string(), 2790.0),
|
||||
- ("0".to_string(), 3100.0),
|
||||
+ ("190MHz".to_string(), 865.0),
|
||||
+ ("405MHz".to_string(), 2385.0),
|
||||
+ ("455MHz".to_string(), 2790.0),
|
||||
+ ("default".to_string(), 3100.0),
|
||||
];
|
||||
// The highest profile at or below the requested watts limit.
|
||||
assert_eq!(
|
||||
select_profile_at_or_below(&steps, 2500.0).as_deref(),
|
||||
- Some("-4")
|
||||
+ Some("405MHz")
|
||||
);
|
||||
assert_eq!(
|
||||
select_profile_at_or_below(&steps, 2790.0).as_deref(),
|
||||
- Some("-2")
|
||||
+ Some("455MHz")
|
||||
);
|
||||
- // Above every profile -> the maximum profile (a limit can't exceed the
|
||||
- // hardware's top profile).
|
||||
+ // Above every profile -> the maximum profile, selected by NAME ("default")
|
||||
+ // rather than its step "0" (which profileset would reject).
|
||||
assert_eq!(
|
||||
select_profile_at_or_below(&steps, 9000.0).as_deref(),
|
||||
- Some("0")
|
||||
+ Some("default")
|
||||
);
|
||||
// Below every profile -> the minimum profile.
|
||||
assert_eq!(
|
||||
select_profile_at_or_below(&steps, 100.0).as_deref(),
|
||||
- Some("-16")
|
||||
+ Some("190MHz")
|
||||
);
|
||||
// No profiles -> nothing to choose.
|
||||
assert_eq!(select_profile_at_or_below(&[], 2500.0), None);
|
||||
@@ -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)
|
||||
@@ -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,
|
||||
@@ -10,7 +10,7 @@
|
||||
+pub use widgets::*;
|
||||
--- a/src/widgets.rs
|
||||
+++ b/src/widgets.rs
|
||||
@@ -0,0 +1,847 @@
|
||||
@@ -0,0 +1,911 @@
|
||||
+// widgets.rs — alkane-toolkit extension: Rust bindings for the widget bridge
|
||||
+// in cpp_src/widgets_bridge.cpp. Handles are opaque pointers owned by the
|
||||
+// wxWidgets object tree (parents own children; nothing to free in Rust).
|
||||
@@ -40,6 +40,7 @@
|
||||
+ pub fn wxbr_bind_size(win: *mut c_void);
|
||||
+ pub fn wxbr_fit(win: *mut c_void);
|
||||
+ pub fn wxbr_set_min_size(win: *mut c_void, w: c_int, h: c_int);
|
||||
+ pub fn wxbr_set_tooltip(win: *mut c_void, text: *const c_char);
|
||||
+ pub fn wxbr_static_text(parent: *mut c_void, label: *const c_char) -> *mut c_void;
|
||||
+ pub fn wxbr_set_label(win: *mut c_void, label: *const c_char);
|
||||
+ pub fn wxbr_get_label(win: *mut c_void, buf: *mut c_char, cap: c_int) -> c_int;
|
||||
@@ -50,6 +51,7 @@
|
||||
+ pub fn wxbr_text_ctrl(parent: *mut c_void, multiline: c_int) -> *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);
|
||||
+ pub fn wxbr_check_box(parent: *mut c_void, label: *const c_char) -> *mut c_void;
|
||||
+ pub fn wxbr_check_box_get(win: *mut c_void) -> c_int;
|
||||
+ pub fn wxbr_check_box_set(win: *mut c_void, v: c_int);
|
||||
@@ -64,6 +66,7 @@
|
||||
+ pub fn wxbr_dialog_show_modal(win: *mut c_void) -> c_int;
|
||||
+ pub fn wxbr_dialog_close(win: *mut c_void, code: c_int);
|
||||
+ 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;
|
||||
@@ -74,6 +77,7 @@
|
||||
+ pub fn wxbr_dvlc_row_count(win: *mut c_void) -> c_int;
|
||||
+ pub fn wxbr_dvlc_set_cell(win: *mut c_void, row: usize, col: usize, value: *const c_char);
|
||||
+ pub fn wxbr_dvlc_set_cell_tooltip(win: *mut c_void, row: usize, col: usize, text: *const c_char);
|
||||
+ pub fn wxbr_dvlc_set_icon_tooltips(win: *mut c_void, row: usize, col: usize, joined: *const c_char);
|
||||
+ 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);
|
||||
@@ -98,6 +102,7 @@
|
||||
+ pub fn wxbr_menu_new() -> *mut c_void;
|
||||
+ pub fn wxbr_menu_append(menu: *mut c_void, id: c_int, label: *const c_char);
|
||||
+ pub fn wxbr_menu_append_separator(menu: *mut c_void);
|
||||
+ pub fn wxbr_menu_append_submenu(menu: *mut c_void, label: *const c_char, submenu: *mut c_void);
|
||||
+ pub fn wxbr_popup_menu(win: *mut c_void, menu: *mut c_void);
|
||||
+ pub fn wxbr_timer(id: c_int, ms: c_int) -> *mut c_void;
|
||||
+ pub fn wxbr_gauge(parent: *mut c_void, range: c_int) -> *mut c_void;
|
||||
@@ -391,6 +396,12 @@
|
||||
+ unsafe { notsafe::wxbr_set_min_size(self.0, w, h) }
|
||||
+ }
|
||||
+
|
||||
+ /// Attach a hover tooltip to this widget (round 15 #10). Empty clears it.
|
||||
+ pub fn set_tool_tip(&self, text: &str) {
|
||||
+ let c = CString::new(text).unwrap_or_default();
|
||||
+ unsafe { notsafe::wxbr_set_tooltip(self.0, c.as_ptr()) }
|
||||
+ }
|
||||
+
|
||||
+ pub fn static_text(parent: Widget, label: &str) -> Widget {
|
||||
+ let c = CString::new(label).unwrap_or_default();
|
||||
+ Widget(unsafe { notsafe::wxbr_static_text(parent.0, c.as_ptr()) })
|
||||
@@ -452,6 +463,13 @@
|
||||
+ unsafe { notsafe::wxbr_text_ctrl_set(self.0, c.as_ptr()) }
|
||||
+ }
|
||||
+
|
||||
+ /// Insert `value` at the text control's cursor (replacing any selection),
|
||||
+ /// rather than replacing the whole contents (round 15 #1).
|
||||
+ pub fn write_text(&self, value: &str) {
|
||||
+ let c = CString::new(value).unwrap_or_default();
|
||||
+ unsafe { notsafe::wxbr_text_ctrl_write(self.0, c.as_ptr()) }
|
||||
+ }
|
||||
+
|
||||
+ pub fn check_box(parent: Widget, label: &str) -> Widget {
|
||||
+ let c = CString::new(label).unwrap_or_default();
|
||||
+ Widget(unsafe { notsafe::wxbr_check_box(parent.0, c.as_ptr()) })
|
||||
@@ -529,6 +547,36 @@
|
||||
+ Some(String::from_utf8_lossy(&bytes).into_owned())
|
||||
+ }
|
||||
+
|
||||
+ /// Save-file dialog (round 15 #14): returns the chosen path, or None if
|
||||
+ /// cancelled. `default_name` prefills the filename; `wildcard` is a wx filter
|
||||
+ /// string like "CSV files (*.csv)|*.csv".
|
||||
+ pub fn save_file_dialog(
|
||||
+ parent: Widget,
|
||||
+ title: &str,
|
||||
+ default_name: &str,
|
||||
+ wildcard: &str,
|
||||
+ ) -> Option<String> {
|
||||
+ let t = CString::new(title).unwrap_or_default();
|
||||
+ let d = CString::new(default_name).unwrap_or_default();
|
||||
+ let w = CString::new(wildcard).unwrap_or_default();
|
||||
+ let mut buf = vec![0i8; 4096];
|
||||
+ let n = unsafe {
|
||||
+ notsafe::wxbr_save_file_dialog(
|
||||
+ parent.0,
|
||||
+ t.as_ptr(),
|
||||
+ d.as_ptr(),
|
||||
+ w.as_ptr(),
|
||||
+ buf.as_mut_ptr(),
|
||||
+ buf.len() as c_int,
|
||||
+ )
|
||||
+ };
|
||||
+ if n <= 0 {
|
||||
+ return None;
|
||||
+ }
|
||||
+ let bytes: Vec<u8> = buf[..(n - 1) as usize].iter().map(|&b| b as u8).collect();
|
||||
+ Some(String::from_utf8_lossy(&bytes).into_owned())
|
||||
+ }
|
||||
+
|
||||
+ // ---- data view list ctrl ----
|
||||
+
|
||||
+ pub fn dvlc(parent: Widget) -> Widget {
|
||||
@@ -582,6 +630,15 @@
|
||||
+ unsafe { notsafe::wxbr_dvlc_set_cell_tooltip(self.0, row, col, c.as_ptr()) }
|
||||
+ }
|
||||
+
|
||||
+ /// Set per-icon hover tooltips for a cell (round 15 #15): one tooltip per icon
|
||||
+ /// in draw order. The bridge shows the one under the pointer. Passing an empty
|
||||
+ /// slice clears them.
|
||||
+ pub fn dvlc_set_icon_tooltips(&self, row: usize, col: usize, tips: &[String]) {
|
||||
+ let joined = tips.join("\u{1f}");
|
||||
+ let c = CString::new(joined).unwrap_or_default();
|
||||
+ unsafe { notsafe::wxbr_dvlc_set_icon_tooltips(self.0, row, col, c.as_ptr()) }
|
||||
+ }
|
||||
+
|
||||
+ pub fn dvlc_get_cell(&self, row: usize, col: usize) -> Option<String> {
|
||||
+ let mut buf = vec![0i8; 4096];
|
||||
+ let n = unsafe {
|
||||
@@ -735,6 +792,13 @@
|
||||
+ unsafe { notsafe::wxbr_menu_append_separator(self.0) }
|
||||
+ }
|
||||
+
|
||||
+ /// Append `submenu` under this menu with `label` (round 15 #13). This menu
|
||||
+ /// takes ownership of the submenu.
|
||||
+ pub fn menu_append_submenu(&self, label: &str, submenu: Widget) {
|
||||
+ let c = CString::new(label).unwrap_or_default();
|
||||
+ unsafe { notsafe::wxbr_menu_append_submenu(self.0, c.as_ptr(), submenu.0) }
|
||||
+ }
|
||||
+
|
||||
+ /// Show `menu` as a popup on this window; blocks until dismissed.
|
||||
+ pub fn popup_menu(&self, menu: Widget) {
|
||||
+ unsafe { notsafe::wxbr_popup_menu(self.0, menu.0) }
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/cpp_src/widgets_bridge.cpp
|
||||
+++ b/cpp_src/widgets_bridge.cpp
|
||||
@@ -0,0 +1,1886 @@
|
||||
@@ -0,0 +1,2053 @@
|
||||
+// widgets_bridge.cpp — alkane-toolkit extension to wx-rs
|
||||
+// Adds the widget/event surface the toolkit UI needs on top of the upstream
|
||||
+// render-callback bridge (which is kept untouched).
|
||||
@@ -88,6 +88,10 @@
|
||||
+ // Per-cell hover tooltip text, keyed by (row, model column). Used for the
|
||||
+ // Errors column's full-message tooltip (see the GTK query-tooltip handler).
|
||||
+ std::map<std::pair<unsigned, unsigned>, wxString> cell_tip;
|
||||
+ // Per-ICON hover tooltips for a cell (round 15 #15): the Health column stores
|
||||
+ // one tooltip per component icon so the tooltip pertains to the icon under the
|
||||
+ // pointer, not the whole cell.
|
||||
+ std::map<std::pair<unsigned, unsigned>, std::vector<wxString>> icon_tip;
|
||||
+ bool GetAttrByRow(unsigned int row, unsigned int col,
|
||||
+ wxDataViewItemAttr& attr) const override {
|
||||
+ (void)col;
|
||||
@@ -176,6 +180,13 @@
|
||||
+const wxUniChar SHAPE_BRAIN = 0x0E; // control board
|
||||
+const wxUniChar SHAPE_FAN = 0x0F; // cooling fan
|
||||
+const wxUniChar SHAPE_CHIP = 0x10; // hashboard
|
||||
+// Locate-light beacon (round 15 #6): a green dot above a red dot, both flashing
|
||||
+// quickly while the miner's locate light is on.
|
||||
+const wxUniChar SHAPE_LIGHT_BEACON = 0x11;
|
||||
+// Health-column alignment gap (round 15 #5): draws nothing but advances by one
|
||||
+// health-icon width, so component icons line up in fixed slots across rows even
|
||||
+// when a miner has fewer fans/boards than the widest in the fleet.
|
||||
+const wxUniChar SHAPE_GAP = 0x12;
|
||||
+const int SHAPE_ADVANCE = 15; // horizontal space one shape occupies
|
||||
+
|
||||
+// Table zoom factor (round 14 #3), 1.0 = 100%. A status-bar slider scales the
|
||||
@@ -186,7 +197,7 @@
|
||||
+static wxFont g_zoom_base_font; // its font at 100% (captured lazily)
|
||||
+static wxVector<int> g_zoom_base_w; // column widths at 100% (per column)
|
||||
+static wxSlider* g_zoom_slider = nullptr; // the status-bar zoom slider
|
||||
+static wxStaticText* g_zoom_label = nullptr; // the "100%" readout next to it
|
||||
+static wxTextCtrl* g_zoom_entry = nullptr; // the editable "100%" field next to it
|
||||
+
|
||||
+// Animation phase for the pulsing locate-light dot (round 12 #6), advanced by a
|
||||
+// wxTimer while any such dot is on screen; the treeview it repaints is tracked so
|
||||
@@ -199,7 +210,8 @@
|
||||
+ wxUniChar c = s[0];
|
||||
+ if (c == SHAPE_DOT || c == SHAPE_LOCK || c == SHAPE_UNLOCK ||
|
||||
+ c == SHAPE_HASHING || c == SHAPE_SLOW || c == SHAPE_NOTHASHING ||
|
||||
+ c == SHAPE_PAUSED || c == SHAPE_PULSE_DOT ||
|
||||
+ c == SHAPE_PAUSED || c == SHAPE_PULSE_DOT || c == SHAPE_LIGHT_BEACON ||
|
||||
+ c == SHAPE_GAP ||
|
||||
+ c == SHAPE_BOLT || c == SHAPE_BRAIN || c == SHAPE_FAN || c == SHAPE_CHIP) {
|
||||
+ out = c;
|
||||
+ return true;
|
||||
@@ -299,6 +311,18 @@
|
||||
+int DrawShape(wxDC* dc, wxUniChar shape, wxCoord x, const wxRect& cell,
|
||||
+ const wxColour& colour, const wxColour& bg) {
|
||||
+ int cy = cell.y + cell.height / 2;
|
||||
+ // Health-column alignment gap (round 15 #5): occupy one health-icon width but
|
||||
+ // draw nothing, so component icons line up in fixed slots across rows. The
|
||||
+ // health icons are square, so the advance is (h - 3) just like a real one.
|
||||
+ if (shape == SHAPE_GAP) {
|
||||
+ int h = cell.height - 1;
|
||||
+ int cap = (int)(28 * g_table_zoom + 0.5);
|
||||
+ if (cap < 8) cap = 8;
|
||||
+ if (h > cap) h = cap;
|
||||
+ if (h < 8) h = 8;
|
||||
+ int adv = h - 3;
|
||||
+ return adv < 1 ? 1 : adv;
|
||||
+ }
|
||||
+ // SVG-backed icon (access padlocks #9, status KPI icons #11): recolour to the
|
||||
+ // segment colour, rasterise (cached), and draw centred in its slot.
|
||||
+ if (const ShapeSvg* sv = LookupShapeSvg(shape)) {
|
||||
@@ -330,6 +354,20 @@
|
||||
+ }
|
||||
+ }
|
||||
+ int cx = x + SHAPE_ADVANCE / 2;
|
||||
+ if (shape == SHAPE_LIGHT_BEACON) {
|
||||
+ // A green dot above a red dot, both flashing quickly (round 15 #6). The blink
|
||||
+ // is a fast on/off (~0.5 s) driven by the shared pulse phase.
|
||||
+ double a = (std::sin(g_pulse_phase * 3.0) > 0.0) ? 1.0 : 0.18;
|
||||
+ wxColour green = BlendColour(bg, wxColour(30, 175, 70), a);
|
||||
+ wxColour red = BlendColour(bg, wxColour(215, 45, 40), a);
|
||||
+ int r = 3;
|
||||
+ dc->SetPen(*wxTRANSPARENT_PEN);
|
||||
+ dc->SetBrush(wxBrush(green));
|
||||
+ dc->DrawCircle(cx, cy - (r + 1), r);
|
||||
+ dc->SetBrush(wxBrush(red));
|
||||
+ dc->DrawCircle(cx, cy + (r + 1), r);
|
||||
+ return SHAPE_ADVANCE;
|
||||
+ }
|
||||
+ if (shape == SHAPE_DOT || shape == SHAPE_PULSE_DOT) {
|
||||
+ wxColour fill = colour;
|
||||
+ if (shape == SHAPE_PULSE_DOT) {
|
||||
@@ -478,7 +516,12 @@
|
||||
+ // with the table zoom (round 14 #3).
|
||||
+ int hh = (int)((health ? 22 : 15) * g_table_zoom + 0.5);
|
||||
+ if (hh < 8) hh = 8;
|
||||
+ if (const ShapeSvg* sv = LookupShapeSvg(shape)) {
|
||||
+ // The alignment gap is one health-icon-width slot that draws nothing
|
||||
+ // (round 15 #5); health icons are square, so its advance is hh - 3.
|
||||
+ if (shape == SHAPE_GAP) {
|
||||
+ adv = hh - 3;
|
||||
+ if (adv < 1) adv = 1;
|
||||
+ } 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;
|
||||
@@ -641,6 +684,16 @@
|
||||
+ ((wxWindow*)win)->SetMinSize(wxSize(w, h));
|
||||
+}
|
||||
+
|
||||
+// Attach a hover tooltip to any widget (round 15 #10). An empty string clears it.
|
||||
+void wxbr_set_tooltip(void* win, const char* text) {
|
||||
+ wxWindow* w = (wxWindow*)win;
|
||||
+ if (text && *text) {
|
||||
+ w->SetToolTip(wxString::FromUTF8(text));
|
||||
+ } else {
|
||||
+ w->UnsetToolTip();
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+// ---- static text / fonts --------------------------------------------------
|
||||
+
|
||||
+void* wxbr_static_text(void* parent, const char* label) {
|
||||
@@ -727,6 +780,15 @@
|
||||
+ ((wxTextCtrl*)win)->SetValue(wxString::FromUTF8(value));
|
||||
+}
|
||||
+
|
||||
+// Insert text at the current cursor position, replacing any selection (round 15
|
||||
+// #1: worker-name placeholders are inserted, not overwritten). Leaves focus + the
|
||||
+// cursor after the inserted text.
|
||||
+void wxbr_text_ctrl_write(void* win, const char* value) {
|
||||
+ wxTextCtrl* t = (wxTextCtrl*)win;
|
||||
+ t->WriteText(wxString::FromUTF8(value));
|
||||
+ t->SetFocus();
|
||||
+}
|
||||
+
|
||||
+// ---- checkbox -------------------------------------------------------------
|
||||
+
|
||||
+void* wxbr_check_box(void* parent, const char* label) {
|
||||
@@ -840,6 +902,25 @@
|
||||
+ return n + 1;
|
||||
+}
|
||||
+
|
||||
+// Save-file dialog (round 15 #14). `default_name` prefills the filename;
|
||||
+// `wildcard` is a wxWidgets filter string (e.g. "CSV files (*.csv)|*.csv").
|
||||
+// Returns the chosen path in `buf` (length+1), or 0 if cancelled.
|
||||
+int wxbr_save_file_dialog(void* parent, const char* title, const char* default_name,
|
||||
+ const char* wildcard, char* buf, int cap) {
|
||||
+ wxString wc = (wildcard && *wildcard) ? wxString::FromUTF8(wildcard)
|
||||
+ : wxString(wxFileSelectorDefaultWildcardStr);
|
||||
+ wxFileDialog dlg((wxWindow*)parent, wxString::FromUTF8(title), wxEmptyString,
|
||||
+ wxString::FromUTF8(default_name ? default_name : ""), wc,
|
||||
+ wxFD_SAVE | wxFD_OVERWRITE_PROMPT);
|
||||
+ if (dlg.ShowModal() != wxID_OK) return 0;
|
||||
+ wxCharBuffer b = dlg.GetPath().ToUTF8();
|
||||
+ int n = (int)strlen(b.data());
|
||||
+ if (n >= cap) n = cap - 1;
|
||||
+ memcpy(buf, b.data(), n);
|
||||
+ buf[n] = 0;
|
||||
+ return n + 1;
|
||||
+}
|
||||
+
|
||||
+// ---- data view list ctrl ------------------------------------------------------
|
||||
+
|
||||
+static AttrListStore* dvlc_store(void* win) {
|
||||
@@ -864,12 +945,38 @@
|
||||
+ return FALSE;
|
||||
+ gint* idx = gtk_tree_path_get_indices(path);
|
||||
+ int row = idx ? idx[0] : -1;
|
||||
+ gtk_tree_path_free(path);
|
||||
+ if (row < 0 || !gcol) return FALSE;
|
||||
+ if (row < 0 || !gcol) { gtk_tree_path_free(path); return FALSE; }
|
||||
+ wxDataViewColumn* wxcol = dv->GTKColumnToWX(gcol);
|
||||
+ if (!wxcol) return FALSE;
|
||||
+ if (!wxcol) { gtk_tree_path_free(path); return FALSE; }
|
||||
+ AttrListStore* store = static_cast<AttrListStore*>(dv->GetModel());
|
||||
+ auto it = store->cell_tip.find({(unsigned)row, wxcol->GetModelColumn()});
|
||||
+ unsigned mcol = wxcol->GetModelColumn();
|
||||
+ // Per-icon tooltip (round 15 #15): if this cell has one tooltip per icon, pick
|
||||
+ // the one under the pointer from the icon slot the x-offset falls in.
|
||||
+ auto iit = store->icon_tip.find({(unsigned)row, mcol});
|
||||
+ if (iit != store->icon_tip.end() && !iit->second.empty()) {
|
||||
+ 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).
|
||||
+ int h = crect.height - 1;
|
||||
+ int cap = (int)(28 * g_table_zoom + 0.5);
|
||||
+ if (cap < 8) cap = 8;
|
||||
+ if (h > cap) h = cap;
|
||||
+ if (h < 8) h = 8;
|
||||
+ int adv = h - 3;
|
||||
+ if (adv < 1) adv = 1;
|
||||
+ int off = bx - crect.x;
|
||||
+ 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;
|
||||
+ const wxString& tip = iit->second[(size_t)slot];
|
||||
+ if (tip.IsEmpty()) return FALSE;
|
||||
+ gtk_tooltip_set_text(tooltip, tip.utf8_str());
|
||||
+ return TRUE;
|
||||
+ }
|
||||
+ gtk_tree_path_free(path);
|
||||
+ auto it = store->cell_tip.find({(unsigned)row, mcol});
|
||||
+ if (it == store->cell_tip.end() || it->second.IsEmpty()) return FALSE;
|
||||
+ gtk_tooltip_set_text(tooltip, it->second.utf8_str());
|
||||
+ return TRUE;
|
||||
@@ -1054,6 +1161,30 @@
|
||||
+ store->DeleteAllItems();
|
||||
+ store->row_fg.clear();
|
||||
+ store->cell_tip.clear();
|
||||
+ store->icon_tip.clear();
|
||||
+}
|
||||
+
|
||||
+// Set per-icon tooltips for one cell (round 15 #15): `joined` is the tooltips for
|
||||
+// each icon in draw order, separated by 0x1f. An empty string clears them.
|
||||
+void wxbr_dvlc_set_icon_tooltips(void* win, unsigned row, unsigned col, const char* joined) {
|
||||
+ AttrListStore* store = dvlc_store(win);
|
||||
+ if (!joined || !joined[0]) {
|
||||
+ store->icon_tip.erase({row, col});
|
||||
+ return;
|
||||
+ }
|
||||
+ std::vector<wxString> tips;
|
||||
+ wxString s = wxString::FromUTF8(joined);
|
||||
+ wxString cur;
|
||||
+ for (size_t i = 0; i < s.length(); i++) {
|
||||
+ if (s[i] == wxUniChar(0x1f)) {
|
||||
+ tips.push_back(cur);
|
||||
+ cur.clear();
|
||||
+ } else {
|
||||
+ cur += s[i];
|
||||
+ }
|
||||
+ }
|
||||
+ tips.push_back(cur);
|
||||
+ store->icon_tip[{row, col}] = tips;
|
||||
+}
|
||||
+
|
||||
+// Set (or clear, with an empty string) the hover tooltip for one cell,
|
||||
@@ -1597,6 +1728,12 @@
|
||||
+ ((wxMenu*)menu)->Append(id, wxString::FromUTF8(label));
|
||||
+}
|
||||
+
|
||||
+// Append `submenu` under `menu` as a labelled sub-menu (round 15 #13); `menu`
|
||||
+// takes ownership of `submenu`.
|
||||
+void wxbr_menu_append_submenu(void* menu, const char* label, void* submenu) {
|
||||
+ ((wxMenu*)menu)->AppendSubMenu((wxMenu*)submenu, wxString::FromUTF8(label));
|
||||
+}
|
||||
+
|
||||
+void wxbr_menu_append_separator(void* menu) {
|
||||
+ ((wxMenu*)menu)->AppendSeparator();
|
||||
+}
|
||||
@@ -1754,17 +1891,17 @@
|
||||
+ g_status_indicator->SetSize(r.x + 4, y, r.width - 8, h);
|
||||
+ }
|
||||
+ }
|
||||
+ // Zoom slider + "NNN%" label in the far-right field (round 14 #3): label at the
|
||||
+ // right edge, slider filling the space to its left.
|
||||
+ if (g_zoom_slider && g_zoom_label) {
|
||||
+ // Zoom slider + editable "NNN%" entry in the far-right field (round 14 #3, #4):
|
||||
+ // the entry at the right edge, slider filling the space to its left.
|
||||
+ if (g_zoom_slider && g_zoom_entry) {
|
||||
+ int fld = (sb->GetFieldsCount() >= 3) ? 2 : 1;
|
||||
+ wxRect r;
|
||||
+ if (sb->GetFieldRect(fld, r)) {
|
||||
+ wxSize lbest = g_zoom_label->GetBestSize();
|
||||
+ int lw = lbest.GetWidth() + 6;
|
||||
+ int lh = lbest.GetHeight();
|
||||
+ g_zoom_label->SetSize(r.x + r.width - lw, r.y + (r.height - lh) / 2, lw, lh);
|
||||
+ int sw = r.width - lw - 8;
|
||||
+ int ew = 52;
|
||||
+ int eh = g_zoom_entry->GetBestSize().GetHeight();
|
||||
+ if (eh > r.height - 2) eh = r.height - 2;
|
||||
+ g_zoom_entry->SetSize(r.x + r.width - ew - 2, r.y + (r.height - eh) / 2, ew, eh);
|
||||
+ int sw = r.width - ew - 10;
|
||||
+ if (sw < 20) sw = 20;
|
||||
+ int sh = r.height - 2;
|
||||
+ g_zoom_slider->SetSize(r.x + 2, r.y + (r.height - sh) / 2, sw, sh);
|
||||
@@ -1799,9 +1936,9 @@
|
||||
+ g_zoom_table->Refresh();
|
||||
+ g_zoom_table->Update();
|
||||
+ }
|
||||
+ if (g_zoom_label) {
|
||||
+ g_zoom_label->SetLabel(wxString::Format(wxT("%d%%"), (int)(factor * 100 + 0.5)));
|
||||
+ reposition_status_indicator();
|
||||
+ if (g_zoom_entry) {
|
||||
+ // ChangeValue does not fire wxEVT_TEXT, so this never loops back into a zoom.
|
||||
+ g_zoom_entry->ChangeValue(wxString::Format(wxT("%d%%"), (int)(factor * 100 + 0.5)));
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
@@ -1837,6 +1974,7 @@
|
||||
+// #3). Widens the bar to three fields (status | indicator | zoom) and wires the
|
||||
+// slider straight to apply_table_zoom -- no Rust round-trip. Call after the table
|
||||
+// exists so the slider can find it.
|
||||
+void wxbr_table_set_zoom(double factor); // defined below; used by the handlers here
|
||||
+void wxbr_status_zoom_init(void* frame_ptr) {
|
||||
+ wxFrame* frame = (wxFrame*)frame_ptr;
|
||||
+ wxStatusBar* sb = frame->GetStatusBar();
|
||||
@@ -1850,15 +1988,44 @@
|
||||
+ if (!g_zoom_slider) {
|
||||
+ g_zoom_slider = new wxSlider(sb, wxID_ANY, 100, 50, 250);
|
||||
+ g_zoom_slider->SetToolTip(wxT("Table zoom"));
|
||||
+ g_zoom_label = new wxStaticText(sb, wxID_ANY, wxT("100%"),
|
||||
+ wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT | wxST_NO_AUTORESIZE);
|
||||
+ // Editable percent field (round 15 #4): type an exact scale and press Enter.
|
||||
+ g_zoom_entry = new wxTextCtrl(sb, wxID_ANY, wxT("100%"), wxDefaultPosition,
|
||||
+ wxDefaultSize, wxTE_PROCESS_ENTER | wxTE_RIGHT);
|
||||
+ g_zoom_entry->SetToolTip(wxT("Table zoom (type a %, Enter)"));
|
||||
+ g_zoom_slider->Bind(wxEVT_SLIDER, [](wxCommandEvent& e) {
|
||||
+ apply_table_zoom(e.GetInt() / 100.0);
|
||||
+ });
|
||||
+ g_zoom_entry->Bind(wxEVT_TEXT_ENTER, [](wxCommandEvent&) {
|
||||
+ if (!g_zoom_entry) return;
|
||||
+ wxString s = g_zoom_entry->GetValue();
|
||||
+ s.Replace("%", "");
|
||||
+ s.Trim(true).Trim(false);
|
||||
+ long pct = 0;
|
||||
+ if (s.ToLong(&pct) && pct > 0) wxbr_table_set_zoom(pct / 100.0);
|
||||
+ });
|
||||
+ sb->Bind(wxEVT_SIZE, [](wxSizeEvent& ev) {
|
||||
+ reposition_status_indicator();
|
||||
+ ev.Skip();
|
||||
+ });
|
||||
+ // Ctrl +/- / Ctrl+0 zoom the table from anywhere in the window (round 15 #4).
|
||||
+ frame->Bind(wxEVT_CHAR_HOOK, [](wxKeyEvent& e) {
|
||||
+ if (e.ControlDown()) {
|
||||
+ int k = e.GetKeyCode();
|
||||
+ if (k == '=' || k == '+' || k == WXK_NUMPAD_ADD) {
|
||||
+ wxbr_table_set_zoom(g_table_zoom + 0.1);
|
||||
+ return;
|
||||
+ }
|
||||
+ if (k == '-' || k == WXK_NUMPAD_SUBTRACT) {
|
||||
+ wxbr_table_set_zoom(g_table_zoom - 0.1);
|
||||
+ return;
|
||||
+ }
|
||||
+ if (k == '0' || k == WXK_NUMPAD0) {
|
||||
+ wxbr_table_set_zoom(1.0);
|
||||
+ return;
|
||||
+ }
|
||||
+ }
|
||||
+ e.Skip();
|
||||
+ });
|
||||
+ }
|
||||
+ reposition_status_indicator();
|
||||
+}
|
||||
|
||||
@@ -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);
|
||||
@@ -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"]
|
||||
|
||||
@@ -85,6 +85,10 @@ class AttrListStore : public wxDataViewListStore {
|
||||
// Per-cell hover tooltip text, keyed by (row, model column). Used for the
|
||||
// Errors column's full-message tooltip (see the GTK query-tooltip handler).
|
||||
std::map<std::pair<unsigned, unsigned>, wxString> cell_tip;
|
||||
// Per-ICON hover tooltips for a cell (round 15 #15): the Health column stores
|
||||
// one tooltip per component icon so the tooltip pertains to the icon under the
|
||||
// pointer, not the whole cell.
|
||||
std::map<std::pair<unsigned, unsigned>, std::vector<wxString>> icon_tip;
|
||||
bool GetAttrByRow(unsigned int row, unsigned int col,
|
||||
wxDataViewItemAttr& attr) const override {
|
||||
(void)col;
|
||||
@@ -173,6 +177,13 @@ const wxUniChar SHAPE_BOLT = 0x0C; // power supply
|
||||
const wxUniChar SHAPE_BRAIN = 0x0E; // control board
|
||||
const wxUniChar SHAPE_FAN = 0x0F; // cooling fan
|
||||
const wxUniChar SHAPE_CHIP = 0x10; // hashboard
|
||||
// Locate-light beacon (round 15 #6): a green dot above a red dot, both flashing
|
||||
// quickly while the miner's locate light is on.
|
||||
const wxUniChar SHAPE_LIGHT_BEACON = 0x11;
|
||||
// Health-column alignment gap (round 15 #5): draws nothing but advances by one
|
||||
// health-icon width, so component icons line up in fixed slots across rows even
|
||||
// when a miner has fewer fans/boards than the widest in the fleet.
|
||||
const wxUniChar SHAPE_GAP = 0x12;
|
||||
const int SHAPE_ADVANCE = 15; // horizontal space one shape occupies
|
||||
|
||||
// Table zoom factor (round 14 #3), 1.0 = 100%. A status-bar slider scales the
|
||||
@@ -183,7 +194,7 @@ static wxDataViewCtrl* g_zoom_table = nullptr; // the table the zoom scales
|
||||
static wxFont g_zoom_base_font; // its font at 100% (captured lazily)
|
||||
static wxVector<int> g_zoom_base_w; // column widths at 100% (per column)
|
||||
static wxSlider* g_zoom_slider = nullptr; // the status-bar zoom slider
|
||||
static wxStaticText* g_zoom_label = nullptr; // the "100%" readout next to it
|
||||
static wxTextCtrl* g_zoom_entry = nullptr; // the editable "100%" field next to it
|
||||
|
||||
// Animation phase for the pulsing locate-light dot (round 12 #6), advanced by a
|
||||
// wxTimer while any such dot is on screen; the treeview it repaints is tracked so
|
||||
@@ -196,7 +207,8 @@ bool IsShapeSentinel(const wxString& s, wxUniChar& out) {
|
||||
wxUniChar c = s[0];
|
||||
if (c == SHAPE_DOT || c == SHAPE_LOCK || c == SHAPE_UNLOCK ||
|
||||
c == SHAPE_HASHING || c == SHAPE_SLOW || c == SHAPE_NOTHASHING ||
|
||||
c == SHAPE_PAUSED || c == SHAPE_PULSE_DOT ||
|
||||
c == SHAPE_PAUSED || c == SHAPE_PULSE_DOT || c == SHAPE_LIGHT_BEACON ||
|
||||
c == SHAPE_GAP ||
|
||||
c == SHAPE_BOLT || c == SHAPE_BRAIN || c == SHAPE_FAN || c == SHAPE_CHIP) {
|
||||
out = c;
|
||||
return true;
|
||||
@@ -296,6 +308,18 @@ const wxBitmap& ShapeBitmap(wxUniChar shape, const ShapeSvg& sv, const wxColour&
|
||||
int DrawShape(wxDC* dc, wxUniChar shape, wxCoord x, const wxRect& cell,
|
||||
const wxColour& colour, const wxColour& bg) {
|
||||
int cy = cell.y + cell.height / 2;
|
||||
// Health-column alignment gap (round 15 #5): occupy one health-icon width but
|
||||
// draw nothing, so component icons line up in fixed slots across rows. The
|
||||
// health icons are square, so the advance is (h - 3) just like a real one.
|
||||
if (shape == SHAPE_GAP) {
|
||||
int h = cell.height - 1;
|
||||
int cap = (int)(28 * g_table_zoom + 0.5);
|
||||
if (cap < 8) cap = 8;
|
||||
if (h > cap) h = cap;
|
||||
if (h < 8) h = 8;
|
||||
int adv = h - 3;
|
||||
return adv < 1 ? 1 : adv;
|
||||
}
|
||||
// SVG-backed icon (access padlocks #9, status KPI icons #11): recolour to the
|
||||
// segment colour, rasterise (cached), and draw centred in its slot.
|
||||
if (const ShapeSvg* sv = LookupShapeSvg(shape)) {
|
||||
@@ -311,15 +335,32 @@ 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;
|
||||
const wxBitmap& bmp = ShapeBitmap(shape, *sv, colour, w, h);
|
||||
// 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;
|
||||
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;
|
||||
}
|
||||
const wxBitmap& bmp = ShapeBitmap(shape, *sv, colour, dw, dh);
|
||||
if (bmp.IsOk()) {
|
||||
if (health) {
|
||||
// Left-align and advance by less than the 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, cy - h / 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);
|
||||
@@ -327,6 +368,20 @@ int DrawShape(wxDC* dc, wxUniChar shape, wxCoord x, const wxRect& cell,
|
||||
}
|
||||
}
|
||||
int cx = x + SHAPE_ADVANCE / 2;
|
||||
if (shape == SHAPE_LIGHT_BEACON) {
|
||||
// A green dot above a red dot, both flashing quickly (round 15 #6). The blink
|
||||
// is a fast on/off (~0.5 s) driven by the shared pulse phase.
|
||||
double a = (std::sin(g_pulse_phase * 3.0) > 0.0) ? 1.0 : 0.18;
|
||||
wxColour green = BlendColour(bg, wxColour(30, 175, 70), a);
|
||||
wxColour red = BlendColour(bg, wxColour(215, 45, 40), a);
|
||||
int r = 3;
|
||||
dc->SetPen(*wxTRANSPARENT_PEN);
|
||||
dc->SetBrush(wxBrush(green));
|
||||
dc->DrawCircle(cx, cy - (r + 1), r);
|
||||
dc->SetBrush(wxBrush(red));
|
||||
dc->DrawCircle(cx, cy + (r + 1), r);
|
||||
return SHAPE_ADVANCE;
|
||||
}
|
||||
if (shape == SHAPE_DOT || shape == SHAPE_PULSE_DOT) {
|
||||
wxColour fill = colour;
|
||||
if (shape == SHAPE_PULSE_DOT) {
|
||||
@@ -400,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;
|
||||
@@ -475,10 +536,18 @@ class SegmentRenderer : public wxDataViewCustomRenderer {
|
||||
// with the table zoom (round 14 #3).
|
||||
int hh = (int)((health ? 22 : 15) * g_table_zoom + 0.5);
|
||||
if (hh < 8) hh = 8;
|
||||
if (const ShapeSvg* sv = LookupShapeSvg(shape)) {
|
||||
// The alignment gap is one health-icon-width slot that draws nothing
|
||||
// (round 15 #5); health icons are square, so its advance is hh - 3.
|
||||
if (shape == SHAPE_GAP) {
|
||||
adv = hh - 3;
|
||||
if (adv < 1) adv = 1;
|
||||
} 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;
|
||||
@@ -638,6 +707,16 @@ void wxbr_set_min_size(void* win, int w, int h) {
|
||||
((wxWindow*)win)->SetMinSize(wxSize(w, h));
|
||||
}
|
||||
|
||||
// Attach a hover tooltip to any widget (round 15 #10). An empty string clears it.
|
||||
void wxbr_set_tooltip(void* win, const char* text) {
|
||||
wxWindow* w = (wxWindow*)win;
|
||||
if (text && *text) {
|
||||
w->SetToolTip(wxString::FromUTF8(text));
|
||||
} else {
|
||||
w->UnsetToolTip();
|
||||
}
|
||||
}
|
||||
|
||||
// ---- static text / fonts --------------------------------------------------
|
||||
|
||||
void* wxbr_static_text(void* parent, const char* label) {
|
||||
@@ -709,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();
|
||||
@@ -724,6 +810,15 @@ void wxbr_text_ctrl_set(void* win, const char* value) {
|
||||
((wxTextCtrl*)win)->SetValue(wxString::FromUTF8(value));
|
||||
}
|
||||
|
||||
// Insert text at the current cursor position, replacing any selection (round 15
|
||||
// #1: worker-name placeholders are inserted, not overwritten). Leaves focus + the
|
||||
// cursor after the inserted text.
|
||||
void wxbr_text_ctrl_write(void* win, const char* value) {
|
||||
wxTextCtrl* t = (wxTextCtrl*)win;
|
||||
t->WriteText(wxString::FromUTF8(value));
|
||||
t->SetFocus();
|
||||
}
|
||||
|
||||
// ---- checkbox -------------------------------------------------------------
|
||||
|
||||
void* wxbr_check_box(void* parent, const char* label) {
|
||||
@@ -837,6 +932,25 @@ int wxbr_file_dialog(void* parent, const char* title, char* buf, int cap) {
|
||||
return n + 1;
|
||||
}
|
||||
|
||||
// Save-file dialog (round 15 #14). `default_name` prefills the filename;
|
||||
// `wildcard` is a wxWidgets filter string (e.g. "CSV files (*.csv)|*.csv").
|
||||
// Returns the chosen path in `buf` (length+1), or 0 if cancelled.
|
||||
int wxbr_save_file_dialog(void* parent, const char* title, const char* default_name,
|
||||
const char* wildcard, char* buf, int cap) {
|
||||
wxString wc = (wildcard && *wildcard) ? wxString::FromUTF8(wildcard)
|
||||
: wxString(wxFileSelectorDefaultWildcardStr);
|
||||
wxFileDialog dlg((wxWindow*)parent, wxString::FromUTF8(title), wxEmptyString,
|
||||
wxString::FromUTF8(default_name ? default_name : ""), wc,
|
||||
wxFD_SAVE | wxFD_OVERWRITE_PROMPT);
|
||||
if (dlg.ShowModal() != wxID_OK) return 0;
|
||||
wxCharBuffer b = dlg.GetPath().ToUTF8();
|
||||
int n = (int)strlen(b.data());
|
||||
if (n >= cap) n = cap - 1;
|
||||
memcpy(buf, b.data(), n);
|
||||
buf[n] = 0;
|
||||
return n + 1;
|
||||
}
|
||||
|
||||
// ---- data view list ctrl ------------------------------------------------------
|
||||
|
||||
static AttrListStore* dvlc_store(void* win) {
|
||||
@@ -861,12 +975,73 @@ static gboolean dvlc_query_tooltip(GtkWidget* tv, gint x, gint y, gboolean keybo
|
||||
return FALSE;
|
||||
gint* idx = gtk_tree_path_get_indices(path);
|
||||
int row = idx ? idx[0] : -1;
|
||||
gtk_tree_path_free(path);
|
||||
if (row < 0 || !gcol) return FALSE;
|
||||
if (row < 0 || !gcol) { gtk_tree_path_free(path); return FALSE; }
|
||||
wxDataViewColumn* wxcol = dv->GTKColumnToWX(gcol);
|
||||
if (!wxcol) return FALSE;
|
||||
if (!wxcol) { gtk_tree_path_free(path); return FALSE; }
|
||||
AttrListStore* store = static_cast<AttrListStore*>(dv->GetModel());
|
||||
auto it = store->cell_tip.find({(unsigned)row, wxcol->GetModelColumn()});
|
||||
unsigned mcol = wxcol->GetModelColumn();
|
||||
// Per-icon tooltip (round 15 #15): if this cell has one tooltip per icon, pick
|
||||
// the one under the pointer from the icon slot the x-offset falls in.
|
||||
auto iit = store->icon_tip.find({(unsigned)row, mcol});
|
||||
if (iit != store->icon_tip.end() && !iit->second.empty()) {
|
||||
GdkRectangle crect;
|
||||
gtk_tree_view_get_cell_area(GTK_TREE_VIEW(tv), path, gcol, &crect);
|
||||
gtk_tree_path_free(path);
|
||||
// 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;
|
||||
if (h > cap) h = cap;
|
||||
if (h < 8) h = 8;
|
||||
int adv = h - 3;
|
||||
if (adv < 1) adv = 1;
|
||||
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 >= 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;
|
||||
}
|
||||
gtk_tree_path_free(path);
|
||||
auto it = store->cell_tip.find({(unsigned)row, mcol});
|
||||
if (it == store->cell_tip.end() || it->second.IsEmpty()) return FALSE;
|
||||
gtk_tooltip_set_text(tooltip, it->second.utf8_str());
|
||||
return TRUE;
|
||||
@@ -987,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();
|
||||
@@ -1005,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();
|
||||
@@ -1051,6 +1237,30 @@ void wxbr_dvlc_clear(void* win) {
|
||||
store->DeleteAllItems();
|
||||
store->row_fg.clear();
|
||||
store->cell_tip.clear();
|
||||
store->icon_tip.clear();
|
||||
}
|
||||
|
||||
// Set per-icon tooltips for one cell (round 15 #15): `joined` is the tooltips for
|
||||
// each icon in draw order, separated by 0x1f. An empty string clears them.
|
||||
void wxbr_dvlc_set_icon_tooltips(void* win, unsigned row, unsigned col, const char* joined) {
|
||||
AttrListStore* store = dvlc_store(win);
|
||||
if (!joined || !joined[0]) {
|
||||
store->icon_tip.erase({row, col});
|
||||
return;
|
||||
}
|
||||
std::vector<wxString> tips;
|
||||
wxString s = wxString::FromUTF8(joined);
|
||||
wxString cur;
|
||||
for (size_t i = 0; i < s.length(); i++) {
|
||||
if (s[i] == wxUniChar(0x1f)) {
|
||||
tips.push_back(cur);
|
||||
cur.clear();
|
||||
} else {
|
||||
cur += s[i];
|
||||
}
|
||||
}
|
||||
tips.push_back(cur);
|
||||
store->icon_tip[{row, col}] = tips;
|
||||
}
|
||||
|
||||
// Set (or clear, with an empty string) the hover tooltip for one cell,
|
||||
@@ -1135,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) {
|
||||
@@ -1594,6 +1821,12 @@ void wxbr_menu_append(void* menu, int id, const char* label) {
|
||||
((wxMenu*)menu)->Append(id, wxString::FromUTF8(label));
|
||||
}
|
||||
|
||||
// Append `submenu` under `menu` as a labelled sub-menu (round 15 #13); `menu`
|
||||
// takes ownership of `submenu`.
|
||||
void wxbr_menu_append_submenu(void* menu, const char* label, void* submenu) {
|
||||
((wxMenu*)menu)->AppendSubMenu((wxMenu*)submenu, wxString::FromUTF8(label));
|
||||
}
|
||||
|
||||
void wxbr_menu_append_separator(void* menu) {
|
||||
((wxMenu*)menu)->AppendSeparator();
|
||||
}
|
||||
@@ -1751,17 +1984,17 @@ static void reposition_status_indicator() {
|
||||
g_status_indicator->SetSize(r.x + 4, y, r.width - 8, h);
|
||||
}
|
||||
}
|
||||
// Zoom slider + "NNN%" label in the far-right field (round 14 #3): label at the
|
||||
// right edge, slider filling the space to its left.
|
||||
if (g_zoom_slider && g_zoom_label) {
|
||||
// Zoom slider + editable "NNN%" entry in the far-right field (round 14 #3, #4):
|
||||
// the entry at the right edge, slider filling the space to its left.
|
||||
if (g_zoom_slider && g_zoom_entry) {
|
||||
int fld = (sb->GetFieldsCount() >= 3) ? 2 : 1;
|
||||
wxRect r;
|
||||
if (sb->GetFieldRect(fld, r)) {
|
||||
wxSize lbest = g_zoom_label->GetBestSize();
|
||||
int lw = lbest.GetWidth() + 6;
|
||||
int lh = lbest.GetHeight();
|
||||
g_zoom_label->SetSize(r.x + r.width - lw, r.y + (r.height - lh) / 2, lw, lh);
|
||||
int sw = r.width - lw - 8;
|
||||
int ew = 52;
|
||||
int eh = g_zoom_entry->GetBestSize().GetHeight();
|
||||
if (eh > r.height - 2) eh = r.height - 2;
|
||||
g_zoom_entry->SetSize(r.x + r.width - ew - 2, r.y + (r.height - eh) / 2, ew, eh);
|
||||
int sw = r.width - ew - 10;
|
||||
if (sw < 20) sw = 20;
|
||||
int sh = r.height - 2;
|
||||
g_zoom_slider->SetSize(r.x + 2, r.y + (r.height - sh) / 2, sw, sh);
|
||||
@@ -1796,9 +2029,9 @@ static void apply_table_zoom(double factor) {
|
||||
g_zoom_table->Refresh();
|
||||
g_zoom_table->Update();
|
||||
}
|
||||
if (g_zoom_label) {
|
||||
g_zoom_label->SetLabel(wxString::Format(wxT("%d%%"), (int)(factor * 100 + 0.5)));
|
||||
reposition_status_indicator();
|
||||
if (g_zoom_entry) {
|
||||
// ChangeValue does not fire wxEVT_TEXT, so this never loops back into a zoom.
|
||||
g_zoom_entry->ChangeValue(wxString::Format(wxT("%d%%"), (int)(factor * 100 + 0.5)));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1834,6 +2067,7 @@ void wxbr_status_indicator_set(const char* text, int r, int g, int b) {
|
||||
// #3). Widens the bar to three fields (status | indicator | zoom) and wires the
|
||||
// slider straight to apply_table_zoom -- no Rust round-trip. Call after the table
|
||||
// exists so the slider can find it.
|
||||
void wxbr_table_set_zoom(double factor); // defined below; used by the handlers here
|
||||
void wxbr_status_zoom_init(void* frame_ptr) {
|
||||
wxFrame* frame = (wxFrame*)frame_ptr;
|
||||
wxStatusBar* sb = frame->GetStatusBar();
|
||||
@@ -1847,15 +2081,44 @@ void wxbr_status_zoom_init(void* frame_ptr) {
|
||||
if (!g_zoom_slider) {
|
||||
g_zoom_slider = new wxSlider(sb, wxID_ANY, 100, 50, 250);
|
||||
g_zoom_slider->SetToolTip(wxT("Table zoom"));
|
||||
g_zoom_label = new wxStaticText(sb, wxID_ANY, wxT("100%"),
|
||||
wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT | wxST_NO_AUTORESIZE);
|
||||
// Editable percent field (round 15 #4): type an exact scale and press Enter.
|
||||
g_zoom_entry = new wxTextCtrl(sb, wxID_ANY, wxT("100%"), wxDefaultPosition,
|
||||
wxDefaultSize, wxTE_PROCESS_ENTER | wxTE_RIGHT);
|
||||
g_zoom_entry->SetToolTip(wxT("Table zoom (type a %, Enter)"));
|
||||
g_zoom_slider->Bind(wxEVT_SLIDER, [](wxCommandEvent& e) {
|
||||
apply_table_zoom(e.GetInt() / 100.0);
|
||||
});
|
||||
g_zoom_entry->Bind(wxEVT_TEXT_ENTER, [](wxCommandEvent&) {
|
||||
if (!g_zoom_entry) return;
|
||||
wxString s = g_zoom_entry->GetValue();
|
||||
s.Replace("%", "");
|
||||
s.Trim(true).Trim(false);
|
||||
long pct = 0;
|
||||
if (s.ToLong(&pct) && pct > 0) wxbr_table_set_zoom(pct / 100.0);
|
||||
});
|
||||
sb->Bind(wxEVT_SIZE, [](wxSizeEvent& ev) {
|
||||
reposition_status_indicator();
|
||||
ev.Skip();
|
||||
});
|
||||
// Ctrl +/- / Ctrl+0 zoom the table from anywhere in the window (round 15 #4).
|
||||
frame->Bind(wxEVT_CHAR_HOOK, [](wxKeyEvent& e) {
|
||||
if (e.ControlDown()) {
|
||||
int k = e.GetKeyCode();
|
||||
if (k == '=' || k == '+' || k == WXK_NUMPAD_ADD) {
|
||||
wxbr_table_set_zoom(g_table_zoom + 0.1);
|
||||
return;
|
||||
}
|
||||
if (k == '-' || k == WXK_NUMPAD_SUBTRACT) {
|
||||
wxbr_table_set_zoom(g_table_zoom - 0.1);
|
||||
return;
|
||||
}
|
||||
if (k == '0' || k == WXK_NUMPAD0) {
|
||||
wxbr_table_set_zoom(1.0);
|
||||
return;
|
||||
}
|
||||
}
|
||||
e.Skip();
|
||||
});
|
||||
}
|
||||
reposition_status_indicator();
|
||||
}
|
||||
|
||||
@@ -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};
|
||||
|
||||
@@ -27,6 +32,7 @@ mod notsafe {
|
||||
pub fn wxbr_bind_size(win: *mut c_void);
|
||||
pub fn wxbr_fit(win: *mut c_void);
|
||||
pub fn wxbr_set_min_size(win: *mut c_void, w: c_int, h: c_int);
|
||||
pub fn wxbr_set_tooltip(win: *mut c_void, text: *const c_char);
|
||||
pub fn wxbr_static_text(parent: *mut c_void, label: *const c_char) -> *mut c_void;
|
||||
pub fn wxbr_set_label(win: *mut c_void, label: *const c_char);
|
||||
pub fn wxbr_get_label(win: *mut c_void, buf: *mut c_char, cap: c_int) -> c_int;
|
||||
@@ -35,8 +41,10 @@ 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);
|
||||
pub fn wxbr_check_box(parent: *mut c_void, label: *const c_char) -> *mut c_void;
|
||||
pub fn wxbr_check_box_get(win: *mut c_void) -> c_int;
|
||||
pub fn wxbr_check_box_set(win: *mut c_void, v: c_int);
|
||||
@@ -51,9 +59,10 @@ mod notsafe {
|
||||
pub fn wxbr_dialog_show_modal(win: *mut c_void) -> c_int;
|
||||
pub fn wxbr_dialog_close(win: *mut c_void, code: c_int);
|
||||
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);
|
||||
@@ -61,9 +70,11 @@ mod notsafe {
|
||||
pub fn wxbr_dvlc_row_count(win: *mut c_void) -> c_int;
|
||||
pub fn wxbr_dvlc_set_cell(win: *mut c_void, row: usize, col: usize, value: *const c_char);
|
||||
pub fn wxbr_dvlc_set_cell_tooltip(win: *mut c_void, row: usize, col: usize, text: *const c_char);
|
||||
pub fn wxbr_dvlc_set_icon_tooltips(win: *mut c_void, row: usize, col: usize, joined: *const c_char);
|
||||
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;
|
||||
@@ -85,6 +96,7 @@ mod notsafe {
|
||||
pub fn wxbr_menu_new() -> *mut c_void;
|
||||
pub fn wxbr_menu_append(menu: *mut c_void, id: c_int, label: *const c_char);
|
||||
pub fn wxbr_menu_append_separator(menu: *mut c_void);
|
||||
pub fn wxbr_menu_append_submenu(menu: *mut c_void, label: *const c_char, submenu: *mut c_void);
|
||||
pub fn wxbr_popup_menu(win: *mut c_void, menu: *mut c_void);
|
||||
pub fn wxbr_timer(id: c_int, ms: c_int) -> *mut c_void;
|
||||
pub fn wxbr_gauge(parent: *mut c_void, range: c_int) -> *mut c_void;
|
||||
@@ -378,6 +390,12 @@ impl Widget {
|
||||
unsafe { notsafe::wxbr_set_min_size(self.0, w, h) }
|
||||
}
|
||||
|
||||
/// Attach a hover tooltip to this widget (round 15 #10). Empty clears it.
|
||||
pub fn set_tool_tip(&self, text: &str) {
|
||||
let c = CString::new(text).unwrap_or_default();
|
||||
unsafe { notsafe::wxbr_set_tooltip(self.0, c.as_ptr()) }
|
||||
}
|
||||
|
||||
pub fn static_text(parent: Widget, label: &str) -> Widget {
|
||||
let c = CString::new(label).unwrap_or_default();
|
||||
Widget(unsafe { notsafe::wxbr_static_text(parent.0, c.as_ptr()) })
|
||||
@@ -426,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) };
|
||||
@@ -439,6 +462,13 @@ impl Widget {
|
||||
unsafe { notsafe::wxbr_text_ctrl_set(self.0, c.as_ptr()) }
|
||||
}
|
||||
|
||||
/// Insert `value` at the text control's cursor (replacing any selection),
|
||||
/// rather than replacing the whole contents (round 15 #1).
|
||||
pub fn write_text(&self, value: &str) {
|
||||
let c = CString::new(value).unwrap_or_default();
|
||||
unsafe { notsafe::wxbr_text_ctrl_write(self.0, c.as_ptr()) }
|
||||
}
|
||||
|
||||
pub fn check_box(parent: Widget, label: &str) -> Widget {
|
||||
let c = CString::new(label).unwrap_or_default();
|
||||
Widget(unsafe { notsafe::wxbr_check_box(parent.0, c.as_ptr()) })
|
||||
@@ -516,23 +546,59 @@ impl Widget {
|
||||
Some(String::from_utf8_lossy(&bytes).into_owned())
|
||||
}
|
||||
|
||||
/// Save-file dialog (round 15 #14): returns the chosen path, or None if
|
||||
/// cancelled. `default_name` prefills the filename; `wildcard` is a wx filter
|
||||
/// string like "CSV files (*.csv)|*.csv".
|
||||
pub fn save_file_dialog(
|
||||
parent: Widget,
|
||||
title: &str,
|
||||
default_name: &str,
|
||||
wildcard: &str,
|
||||
) -> Option<String> {
|
||||
let t = CString::new(title).unwrap_or_default();
|
||||
let d = CString::new(default_name).unwrap_or_default();
|
||||
let w = CString::new(wildcard).unwrap_or_default();
|
||||
let mut buf = vec![0i8; 4096];
|
||||
let n = unsafe {
|
||||
notsafe::wxbr_save_file_dialog(
|
||||
parent.0,
|
||||
t.as_ptr(),
|
||||
d.as_ptr(),
|
||||
w.as_ptr(),
|
||||
buf.as_mut_ptr(),
|
||||
buf.len() as c_int,
|
||||
)
|
||||
};
|
||||
if n <= 0 {
|
||||
return None;
|
||||
}
|
||||
let bytes: Vec<u8> = buf[..(n - 1) as usize].iter().map(|&b| b as u8).collect();
|
||||
Some(String::from_utf8_lossy(&bytes).into_owned())
|
||||
}
|
||||
|
||||
// ---- data view list ctrl ----
|
||||
|
||||
pub fn dvlc(parent: Widget) -> 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) {
|
||||
@@ -569,6 +635,15 @@ impl Widget {
|
||||
unsafe { notsafe::wxbr_dvlc_set_cell_tooltip(self.0, row, col, c.as_ptr()) }
|
||||
}
|
||||
|
||||
/// Set per-icon hover tooltips for a cell (round 15 #15): one tooltip per icon
|
||||
/// in draw order. The bridge shows the one under the pointer. Passing an empty
|
||||
/// slice clears them.
|
||||
pub fn dvlc_set_icon_tooltips(&self, row: usize, col: usize, tips: &[String]) {
|
||||
let joined = tips.join("\u{1f}");
|
||||
let c = CString::new(joined).unwrap_or_default();
|
||||
unsafe { notsafe::wxbr_dvlc_set_icon_tooltips(self.0, row, col, c.as_ptr()) }
|
||||
}
|
||||
|
||||
pub fn dvlc_get_cell(&self, row: usize, col: usize) -> Option<String> {
|
||||
let mut buf = vec![0i8; 4096];
|
||||
let n = unsafe {
|
||||
@@ -590,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) };
|
||||
@@ -722,6 +803,13 @@ impl Widget {
|
||||
unsafe { notsafe::wxbr_menu_append_separator(self.0) }
|
||||
}
|
||||
|
||||
/// Append `submenu` under this menu with `label` (round 15 #13). This menu
|
||||
/// takes ownership of the submenu.
|
||||
pub fn menu_append_submenu(&self, label: &str, submenu: Widget) {
|
||||
let c = CString::new(label).unwrap_or_default();
|
||||
unsafe { notsafe::wxbr_menu_append_submenu(self.0, c.as_ptr(), submenu.0) }
|
||||
}
|
||||
|
||||
/// Show `menu` as a popup on this window; blocks until dismissed.
|
||||
pub fn popup_menu(&self, menu: Widget) {
|
||||
unsafe { notsafe::wxbr_popup_menu(self.0, menu.0) }
|
||||
|
||||
@@ -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"}
|
||||
@@ -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 {
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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")]
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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>,
|
||||
}
|
||||
@@ -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.
|
||||
///
|
||||
|
||||
@@ -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 @@
|
||||
{"$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":"cf1bd56ca56178968f8ef57955f06d14f4c3775f27ca3a85ac280919f19b8e50","src/backends/v2020/rpc.rs":"b517f88b9125fe1d8a20d5167f5d0d105b1339fce3d1a9fad5592e00470f46fb","src/backends/v2020/web.rs":"d39b67ed83781b2c4fa84a445b9ffe785ae3001941f800ad9860e050c61c6506","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"}
|
||||
@@ -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![
|
||||
@@ -833,15 +854,23 @@ impl GetFans for AntMinerV2020 {
|
||||
let mut fans: Vec<FanData> = Vec::new();
|
||||
|
||||
if let Some(stats_data) = data.get(&DataField::Fans) {
|
||||
for i in 1..=self.device_info.hardware.fans.unwrap_or(4) {
|
||||
// Some models report their fans in higher fan slots and leave the low
|
||||
// ones at 0 -- the Z15, for example, has fan_num=2 but reports its two
|
||||
// fans in fan3/fan4 with fan1/fan2 = 0. So scan a generous range of
|
||||
// slots and collect the non-zero readings rather than only reading
|
||||
// fan1..hardware.fans (which missed the Z15 entirely). The collected
|
||||
// fans are renumbered 0.. in the order found (round 14 #12).
|
||||
let mut pos: i16 = 0;
|
||||
for i in 1..=16 {
|
||||
if let Some(fan_speed) =
|
||||
stats_data.get(format!("fan{}", i)).and_then(|v| v.as_f64())
|
||||
&& fan_speed > 0.0
|
||||
{
|
||||
fans.push(FanData {
|
||||
position: (i - 1) as i16,
|
||||
position: pos,
|
||||
rpm: Some(AngularVelocity::from_rpm(fan_speed)),
|
||||
});
|
||||
pos += 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -865,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 {}
|
||||
@@ -1103,9 +1142,17 @@ impl SetFaultLight for AntMinerV2020 {
|
||||
true
|
||||
}
|
||||
|
||||
#[allow(unused_variables)]
|
||||
async fn set_fault_light(&self, fault: bool) -> anyhow::Result<bool> {
|
||||
Ok(self.web.blink(fault).await.is_ok())
|
||||
// `blink()` fires the toggle then reads the state back as `{"isBlinking":
|
||||
// bool}` (the legacy CGI's own HTTP status is unreliable). Report success
|
||||
// only when the observed locate-LED state matches what was requested.
|
||||
let observed = self
|
||||
.web
|
||||
.blink(fault)
|
||||
.await?
|
||||
.get("isBlinking")
|
||||
.and_then(serde_json::Value::as_bool);
|
||||
Ok(observed == Some(fault))
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1647,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]
|
||||
|
||||
@@ -240,6 +240,45 @@ impl AntMinerWebAPI {
|
||||
Ok(response)
|
||||
}
|
||||
|
||||
/// POST a form-encoded (`application/x-www-form-urlencoded`) body to a CGI
|
||||
/// endpoint and parse the JSON reply. The legacy LuCI web UI endpoints (e.g.
|
||||
/// `blink.cgi`) expect `action=...` form fields, not a JSON body. An empty
|
||||
/// reply parses to `{}`; a non-2xx status bails.
|
||||
async fn send_web_form_command(&self, command: &str, form: &[(&str, &str)]) -> Result<Value> {
|
||||
let url = format!("http://{}:{}/cgi-bin/{}.cgi", self.ip, self.port, command);
|
||||
// Build an application/x-www-form-urlencoded body by hand (this reqwest
|
||||
// build has no `.form()` helper). The only fields used are `action` with
|
||||
// fixed ASCII values, so percent-encoding is unnecessary.
|
||||
let body = form
|
||||
.iter()
|
||||
.map(|(k, v)| format!("{k}={v}"))
|
||||
.collect::<Vec<_>>()
|
||||
.join("&");
|
||||
let response = self
|
||||
.client()?
|
||||
.post(&url)
|
||||
.header(
|
||||
reqwest::header::CONTENT_TYPE,
|
||||
"application/x-www-form-urlencoded",
|
||||
)
|
||||
.body(body)
|
||||
.timeout(self.timeout)
|
||||
.send_digest_auth((self.auth.username(), self.auth.password()))
|
||||
.await
|
||||
.map_err(|e| anyhow!(e.to_string()))?;
|
||||
|
||||
let status = response.status();
|
||||
if !status.is_success() {
|
||||
bail!("HTTP request failed with status code {}", status);
|
||||
}
|
||||
let text = response.text().await.map_err(|e| anyhow!(e.to_string()))?;
|
||||
if text.trim().is_empty() {
|
||||
Ok(json!({}))
|
||||
} else {
|
||||
serde_json::from_str(&text).map_err(|e| anyhow!(e.to_string()))
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn get_miner_conf(&self) -> Result<Value> {
|
||||
self.send_web_command("get_miner_conf", false, None, Method::GET)
|
||||
.await
|
||||
@@ -257,17 +296,31 @@ impl AntMinerWebAPI {
|
||||
}
|
||||
|
||||
pub async fn blink(&self, blink: bool) -> Result<Value> {
|
||||
let param = if blink {
|
||||
json!({"blink": "true"})
|
||||
} else {
|
||||
json!({"blink": "false"})
|
||||
};
|
||||
self.send_web_command("blink", false, Some(param), Method::POST)
|
||||
// Legacy LuCI web UI: the locate LED is toggled by POSTing an `action`
|
||||
// form field to blink.cgi (`startBlink`/`stopBlink`) -- NOT a JSON body
|
||||
// like the newer (>= 2023.07) firmware expects. The handler performs the
|
||||
// action but frequently answers 401/500 even on success, so its HTTP
|
||||
// status is not a reliable signal: fire it, ignore the response, then read
|
||||
// the real state back via `onPageLoaded`.
|
||||
let action = if blink { "startBlink" } else { "stopBlink" };
|
||||
let _ = self
|
||||
.send_web_form_command("blink", &[("action", action)])
|
||||
.await;
|
||||
self.blink_status().await
|
||||
}
|
||||
|
||||
/// Query the locate-LED state via the legacy blink.cgi `onPageLoaded` action,
|
||||
/// which reliably answers `200 {"isBlinking": bool}`.
|
||||
pub async fn blink_status(&self) -> Result<Value> {
|
||||
self.send_web_form_command("blink", &[("action", "onPageLoaded")])
|
||||
.await
|
||||
}
|
||||
|
||||
pub async fn reboot(&self) -> Result<Value> {
|
||||
self.send_web_command("reboot", false, None, Method::POST)
|
||||
// The legacy LuCI web UI reboots via GET /cgi-bin/reboot.cgi (its own
|
||||
// reboot.html does `type: 'GET'`); a POST is not what this firmware
|
||||
// generation expects.
|
||||
self.send_web_command("reboot", false, None, Method::GET)
|
||||
.await
|
||||
}
|
||||
|
||||
@@ -350,8 +403,17 @@ impl AntMinerWebAPI {
|
||||
}
|
||||
|
||||
pub async fn get_blink_status(&self) -> Result<Value> {
|
||||
self.send_web_command("get_blink_status", false, None, Method::GET)
|
||||
.await
|
||||
// The old firmware has no `get_blink_status.cgi` (it answers 404); the
|
||||
// locate state lives behind blink.cgi's `onPageLoaded` action as
|
||||
// `{"isBlinking": bool}`. Remap it to `{"blink": bool}` so the shared
|
||||
// LightFlashing extractor (key `/blink`) keeps working.
|
||||
let flashing = self
|
||||
.blink_status()
|
||||
.await?
|
||||
.get("isBlinking")
|
||||
.and_then(Value::as_bool)
|
||||
.unwrap_or(false);
|
||||
Ok(json!({ "blink": flashing }))
|
||||
}
|
||||
|
||||
pub async fn set_network_conf(
|
||||
@@ -383,10 +445,16 @@ impl APIClient for AntMinerWebAPI {
|
||||
MinerCommand::WebAPI {
|
||||
command,
|
||||
parameters,
|
||||
} => self
|
||||
.send_web_command(command, false, parameters.clone(), Method::GET)
|
||||
.await
|
||||
.map_err(|e| anyhow!(e.to_string())),
|
||||
} => {
|
||||
// The legacy blink status lives behind a POST form action, not a
|
||||
// GET .cgi (which 404s), so route it through the dedicated helper.
|
||||
if *command == "get_blink_status" {
|
||||
return self.get_blink_status().await;
|
||||
}
|
||||
self.send_web_command(command, false, parameters.clone(), Method::GET)
|
||||
.await
|
||||
.map_err(|e| anyhow!(e.to_string()))
|
||||
}
|
||||
_ => Err(anyhow!("Unsupported command type for Web client")),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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 {
|
||||
@@ -286,6 +317,24 @@ impl GetDataLocations for BraiinsV2604 {
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
DataField::BestShare => vec![(
|
||||
WEB_MINER_STATS,
|
||||
DataExtractor {
|
||||
func: get_by_pointer,
|
||||
key: Some("/miner_stats/best_share"),
|
||||
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,
|
||||
@@ -354,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![],
|
||||
}
|
||||
}
|
||||
@@ -479,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
|
||||
@@ -496,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 {
|
||||
@@ -534,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 {
|
||||
@@ -548,7 +654,13 @@ impl GetUptime for BraiinsV2604 {
|
||||
}
|
||||
}
|
||||
|
||||
impl GetBestShare for BraiinsV2604 {}
|
||||
impl GetBestShare for BraiinsV2604 {
|
||||
fn parse_best_share(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
|
||||
// Braiins OS reports the all-time best share at miner/stats -> miner_stats.best_share
|
||||
// (round 16 / G9). Large diffs may exceed f64 exactness but are fine for display.
|
||||
data.extract::<f64>(DataField::BestShare)
|
||||
}
|
||||
}
|
||||
impl GetSessionBestShare for BraiinsV2604 {}
|
||||
|
||||
impl GetOperatingState for BraiinsV2604 {
|
||||
@@ -565,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 {
|
||||
@@ -649,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 {
|
||||
@@ -665,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,
|
||||
@@ -1057,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]
|
||||
@@ -1141,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",
|
||||
@@ -1188,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]
|
||||
|
||||
@@ -57,11 +57,20 @@ impl WebAPIClient for BraiinsWebAPI {
|
||||
|
||||
let status = response.status();
|
||||
if status.is_success() {
|
||||
let json_data = response
|
||||
.json()
|
||||
// Some setters (e.g. PUT auth/password) answer 2xx with an empty or
|
||||
// non-JSON body. An empty body is success, not a parse error -- treat
|
||||
// it as Null so callers using `.is_ok()` don't read a real success as
|
||||
// failure. A non-empty body must still parse.
|
||||
let body = response
|
||||
.text()
|
||||
.await
|
||||
.map_err(|e| BraiinsError::ParseError(e.to_string()))?;
|
||||
Ok(json_data)
|
||||
if body.trim().is_empty() {
|
||||
Ok(Value::Null)
|
||||
} else {
|
||||
Ok(serde_json::from_str(&body)
|
||||
.map_err(|e| BraiinsError::ParseError(e.to_string()))?)
|
||||
}
|
||||
} else {
|
||||
// The API reports why it rejected a request in the body.
|
||||
let status = status.as_u16();
|
||||
@@ -78,7 +87,13 @@ impl BraiinsWebAPI {
|
||||
client: OnceCell::new(),
|
||||
ip,
|
||||
port: 80,
|
||||
timeout: Duration::from_secs(5),
|
||||
// Braiins get_data fans out to ~12 authenticated REST calls that run
|
||||
// concurrently. A healthy miner answers well under a second; the extra
|
||||
// headroom over the old 5 s is defensive so a call that queues behind a
|
||||
// scan burst still completes instead of dropping miner/stats
|
||||
// (hashrate/watts/best-share). The real fix for the fleet-scan dropout
|
||||
// is the app-side scan concurrency cap (see scan::SCAN_CONCURRENCY_LIMIT).
|
||||
timeout: Duration::from_secs(15),
|
||||
bearer_token: RwLock::new(None),
|
||||
auth,
|
||||
}
|
||||
@@ -113,13 +128,22 @@ impl BraiinsWebAPI {
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
// Single-flight the login: get_data fires ~12 commands concurrently, and
|
||||
// without this they would ALL see no token and each POST /auth/login (a
|
||||
// thundering herd that doubles the connection load and races under a
|
||||
// high-concurrency fleet scan, dropping most values). Hold the write lock
|
||||
// across the login so exactly one call authenticates and the rest reuse it.
|
||||
let mut guard = self.bearer_token.write().await;
|
||||
if guard.is_some() {
|
||||
return Ok(());
|
||||
}
|
||||
let token = match &self.auth {
|
||||
MinerAuth::TokenAuth(token) => token.expose_secret().to_string(),
|
||||
MinerAuth::UserAndPass(creds) => {
|
||||
self.authenticate(creds.password.expose_secret()).await?
|
||||
}
|
||||
};
|
||||
*self.bearer_token.write().await = Some(token);
|
||||
*guard = Some(token);
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
@@ -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 @@
|
||||
{"$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":"360f173deb62c38bceb907774be6caaea5814b4f543d8d7f3c72828db31640b9","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"}
|
||||
@@ -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 {
|
||||
@@ -1369,6 +1496,14 @@ impl SetFaultLight for PowerPlayV1 {
|
||||
#[async_trait]
|
||||
impl SetPowerLimit for PowerPlayV1 {
|
||||
fn supports_set_power_limit(&self) -> bool {
|
||||
// ePIC PowerPlay's only true power-limit mechanism is the PowerTune
|
||||
// perpetual-tune algorithm, which the firmware gates on the PSU: on a
|
||||
// fixed-voltage Bitmain PSU (e.g. the APW12 on an S19j Pro) the
|
||||
// perpetualtune/algo endpoint rejects it with "Power optimization is not
|
||||
// supported by this PSU". Since that support is a per-PSU runtime property
|
||||
// that this synchronous, no-I/O capability check cannot observe, report
|
||||
// false rather than over-advertise a control that fails on most reflashed
|
||||
// Antminers. (Hashrate tuning is exposed separately via set_tuning_config.)
|
||||
false
|
||||
}
|
||||
}
|
||||
@@ -2125,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 @@
|
||||
{"$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":"fc109beb7fa4713b5f7a6d717e225ff91baa6f8ef497bc770a435f92981c2879","src/backends/v1/rpc.rs":"9dea9c65629e1e9b833b96a4ae88014f7195a26036104f92daa264fbdf13feba","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"}
|
||||
@@ -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 {
|
||||
@@ -445,6 +473,32 @@ impl GetDataLocations for LuxMinerV1 {
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
DataField::BestShare => vec![(
|
||||
RPC_SUMMARY,
|
||||
DataExtractor {
|
||||
func: get_by_pointer,
|
||||
key: Some("/SUMMARY/0/Best Share"),
|
||||
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 {
|
||||
func: get_by_pointer,
|
||||
key: Some("/SUMMARY/0/Best Session Share"),
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
DataField::Uptime => vec![(
|
||||
RPC_STATS,
|
||||
DataExtractor {
|
||||
@@ -519,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 {
|
||||
@@ -641,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 {
|
||||
@@ -825,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 {
|
||||
@@ -873,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 {
|
||||
@@ -888,8 +1001,22 @@ impl GetUptime for LuxMinerV1 {
|
||||
}
|
||||
}
|
||||
|
||||
impl GetBestShare for LuxMinerV1 {}
|
||||
impl GetSessionBestShare for LuxMinerV1 {}
|
||||
impl GetBestShare for LuxMinerV1 {
|
||||
fn parse_best_share(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
|
||||
// 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> {
|
||||
// LuxOS summary -> "Best Session Share" (since boot), round 16 / G9.
|
||||
data.extract::<f64>(DataField::SessionBestShare)
|
||||
}
|
||||
}
|
||||
|
||||
impl GetOperatingState for LuxMinerV1 {}
|
||||
|
||||
@@ -1052,10 +1179,104 @@ impl SetFaultLight for LuxMinerV1 {
|
||||
}
|
||||
}
|
||||
|
||||
/// Parse a LuxOS `profiles` RPC reply into (profile name, watts) pairs, keeping
|
||||
/// only profiles that report both a `Profile Name` and a `Watts` value.
|
||||
///
|
||||
/// The identifier is the `Profile Name` (e.g. "480MHz", "default"), NOT the
|
||||
/// `Step`: `profileset` takes the name, and the default profile's step is "0",
|
||||
/// which LuxOS reads as an empty parameter ("Missing profile parameter"), so a
|
||||
/// step-keyed setter can never select the default profile and could strand a
|
||||
/// miner off its factory point.
|
||||
fn parse_profile_watts(profiles: &Value) -> Vec<(String, f64)> {
|
||||
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)?;
|
||||
Some((name, watts))
|
||||
})
|
||||
.collect()
|
||||
})
|
||||
.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
|
||||
/// profiles to choose from.
|
||||
fn select_profile_at_or_below(steps: &[(String, f64)], target_w: f64) -> Option<String> {
|
||||
if steps.is_empty() {
|
||||
return None;
|
||||
}
|
||||
let mut sorted: Vec<&(String, f64)> = steps.iter().collect();
|
||||
sorted.sort_by(|a, b| a.1.partial_cmp(&b.1).unwrap_or(std::cmp::Ordering::Equal));
|
||||
sorted
|
||||
.iter()
|
||||
.rev()
|
||||
.find(|(_, w)| *w <= target_w)
|
||||
.or_else(|| sorted.first())
|
||||
.map(|(s, _)| s.clone())
|
||||
}
|
||||
|
||||
#[async_trait]
|
||||
impl SetPowerLimit for LuxMinerV1 {
|
||||
fn supports_set_power_limit(&self) -> bool {
|
||||
false
|
||||
true
|
||||
}
|
||||
|
||||
async fn set_power_limit(&self, power: Power) -> anyhow::Result<bool> {
|
||||
// LuxOS tunes by discrete named profiles (each carries a Watts rating),
|
||||
// not a raw watts setpoint. Map the requested limit to the highest profile
|
||||
// whose Watts does not exceed it (or the lowest profile when the target is
|
||||
// below every profile), then apply it with profileset.
|
||||
let profiles = self.rpc.profiles().await?;
|
||||
let steps = parse_profile_watts(&profiles);
|
||||
let Some(chosen) = select_profile_at_or_below(&steps, power.as_watts()) else {
|
||||
anyhow::bail!("LuxOS reported no tunable profiles with a Step/Watts pair");
|
||||
};
|
||||
let resp = self.rpc.profileset(&chosen).await?;
|
||||
// LuxOS answers with a STATUS array; "S"/"I" is success. A missing status
|
||||
// after a non-error reply is treated as applied.
|
||||
Ok(resp
|
||||
.pointer("/STATUS/0/STATUS")
|
||||
.and_then(Value::as_str)
|
||||
.map(|s| matches!(s, "S" | "I"))
|
||||
.unwrap_or(true))
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1196,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")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1211,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};
|
||||
@@ -1228,9 +1494,68 @@ 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]
|
||||
fn power_limit_profile_selection() {
|
||||
// LuxOS reports a ladder of profiles, each with a Profile Name and Watts.
|
||||
// The top profile is named "default" (its Step is "0", which profileset
|
||||
// rejects -- so selection must key on the name, not the step).
|
||||
let steps = vec![
|
||||
("190MHz".to_string(), 865.0),
|
||||
("405MHz".to_string(), 2385.0),
|
||||
("455MHz".to_string(), 2790.0),
|
||||
("default".to_string(), 3100.0),
|
||||
];
|
||||
// The highest profile at or below the requested watts limit.
|
||||
assert_eq!(
|
||||
select_profile_at_or_below(&steps, 2500.0).as_deref(),
|
||||
Some("405MHz")
|
||||
);
|
||||
assert_eq!(
|
||||
select_profile_at_or_below(&steps, 2790.0).as_deref(),
|
||||
Some("455MHz")
|
||||
);
|
||||
// Above every profile -> the maximum profile, selected by NAME ("default")
|
||||
// rather than its step "0" (which profileset would reject).
|
||||
assert_eq!(
|
||||
select_profile_at_or_below(&steps, 9000.0).as_deref(),
|
||||
Some("default")
|
||||
);
|
||||
// Below every profile -> the minimum profile.
|
||||
assert_eq!(
|
||||
select_profile_at_or_below(&steps, 100.0).as_deref(),
|
||||
Some("190MHz")
|
||||
);
|
||||
// No profiles -> nothing to choose.
|
||||
assert_eq!(select_profile_at_or_below(&[], 2500.0), None);
|
||||
|
||||
// parse_profile_watts against the captured LuxOS `profiles` reply: it
|
||||
// yields tunable profiles and selection finds a real step among them.
|
||||
let profiles: Value = serde_json::from_str(PROFILES).unwrap();
|
||||
let parsed = parse_profile_watts(&profiles);
|
||||
assert!(!parsed.is_empty(), "fixture should carry tunable profiles");
|
||||
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<()> {
|
||||
@@ -1287,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)?);
|
||||
@@ -1296,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 {
|
||||
@@ -1406,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);
|
||||
|
||||
@@ -239,7 +239,7 @@ impl LUXMinerRPCAPI {
|
||||
pub async fn addgroup(&self, name: &str, quota: u32) -> anyhow::Result<Value> {
|
||||
self.send_command(
|
||||
"addgroup",
|
||||
false,
|
||||
true,
|
||||
Some(Value::String(format!("{name},{quota}"))),
|
||||
)
|
||||
.await
|
||||
@@ -248,7 +248,7 @@ impl LUXMinerRPCAPI {
|
||||
pub async fn groupquota(&self, group_id: u32, quota: u32) -> anyhow::Result<Value> {
|
||||
self.send_command(
|
||||
"groupquota",
|
||||
false,
|
||||
true,
|
||||
Some(Value::String(format!("{group_id},{quota}"))),
|
||||
)
|
||||
.await
|
||||
@@ -257,7 +257,7 @@ impl LUXMinerRPCAPI {
|
||||
pub async fn removegroup(&self, group_id: u32) -> anyhow::Result<Value> {
|
||||
self.send_command(
|
||||
"removegroup",
|
||||
false,
|
||||
true,
|
||||
Some(Value::String(group_id.to_string())),
|
||||
)
|
||||
.await
|
||||
@@ -275,14 +275,14 @@ impl LUXMinerRPCAPI {
|
||||
params.push(group_id);
|
||||
}
|
||||
|
||||
self.send_command("addpool", false, Some(Value::String(params.join(","))))
|
||||
self.send_command("addpool", true, Some(Value::String(params.join(","))))
|
||||
.await
|
||||
}
|
||||
|
||||
pub async fn switchpool(&self, pool_id: i32) -> anyhow::Result<Value> {
|
||||
self.send_command(
|
||||
"switchpool",
|
||||
false,
|
||||
true,
|
||||
Some(Value::String(pool_id.to_string())),
|
||||
)
|
||||
.await
|
||||
@@ -291,7 +291,7 @@ impl LUXMinerRPCAPI {
|
||||
pub async fn enablepool(&self, pool_id: i32) -> anyhow::Result<Value> {
|
||||
self.send_command(
|
||||
"enablepool",
|
||||
false,
|
||||
true,
|
||||
Some(Value::String(pool_id.to_string())),
|
||||
)
|
||||
.await
|
||||
@@ -300,7 +300,16 @@ impl LUXMinerRPCAPI {
|
||||
pub async fn disablepool(&self, pool_id: i32) -> anyhow::Result<Value> {
|
||||
self.send_command(
|
||||
"disablepool",
|
||||
false,
|
||||
true,
|
||||
Some(Value::String(pool_id.to_string())),
|
||||
)
|
||||
.await
|
||||
}
|
||||
|
||||
pub async fn removepool(&self, pool_id: i32) -> anyhow::Result<Value> {
|
||||
self.send_command(
|
||||
"removepool",
|
||||
true,
|
||||
Some(Value::String(pool_id.to_string())),
|
||||
)
|
||||
.await
|
||||
|
||||
@@ -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");
|
||||
|
||||
|
||||