Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
561c50e5dc | ||
|
|
74b97162f5 | ||
|
|
75663f4c23 | ||
|
|
9eb6a0f229 | ||
|
|
bafbd519bb | ||
|
|
0d19e958f0 | ||
|
|
368f992404 | ||
|
|
ecdb2fab9d | ||
|
|
a75fe5ba52 | ||
|
|
f1fb2f8623 | ||
|
|
a6d286a147 | ||
|
|
3ba3211371 | ||
|
|
c8d5cd71c4 | ||
|
|
c74e8ebaca | ||
|
|
282f0b195c | ||
|
|
1857a9e1a0 | ||
|
|
b7a77cbed8 | ||
|
|
606ae85781 | ||
|
|
ad9b0dc868 | ||
|
|
aaf049bbfc | ||
|
|
8b7b0c70b4 | ||
|
|
3ae80efdde | ||
|
|
7901d82c4b | ||
|
|
8f7aab3f80 | ||
|
|
e593548746 | ||
|
|
2fd433c3b0 | ||
|
|
5399f9fc49 | ||
|
|
6b4961d7bc | ||
|
|
fc7c665166 | ||
|
|
ae437c0d24 | ||
|
|
b343746718 | ||
|
|
aa75031112 | ||
|
|
8eb9a2caad | ||
|
|
9e2b453eb5 | ||
|
|
3530d67a5c | ||
|
|
3ac4e104a0 | ||
|
|
3c99934513 | ||
|
|
9b5d811b1e | ||
|
|
77399bdd06 | ||
|
|
408b7d12b4 | ||
|
|
50cd463bee | ||
|
|
d73299166e | ||
|
|
a81fef3c7d | ||
|
|
365732b5d4 | ||
|
|
98603077e3 | ||
|
|
bc9f847689 | ||
|
|
71cdf2d988 | ||
|
|
4fea3becf6 | ||
|
|
7781ff71d3 | ||
|
|
86e4761316 | ||
|
|
c1234f6df7 | ||
|
|
b6afe08a5f | ||
|
|
eb08a9ef97 | ||
|
|
297e21a519 | ||
|
|
7fac0ce726 |
@@ -75,7 +75,6 @@ jobs:
|
||||
|
||||
- name: Headless UI self-test
|
||||
if: steps.ver.outputs.release == 'true'
|
||||
continue-on-error: true
|
||||
run: |
|
||||
apt-get update -qq && apt-get install -y -qq --no-install-recommends \
|
||||
xvfb xauth dbus-x11 fonts-dejavu-core >/dev/null
|
||||
|
||||
@@ -76,10 +76,19 @@ dependencies = [
|
||||
name = "alkane-gui"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"aes",
|
||||
"alkane-core",
|
||||
"alkane-discovery",
|
||||
"asic-rs",
|
||||
"base64 0.21.7",
|
||||
"ecb",
|
||||
"futures-util",
|
||||
"hex",
|
||||
"md5crypt",
|
||||
"measurements",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"sha2",
|
||||
"tokio",
|
||||
"wx-rs",
|
||||
]
|
||||
|
||||
@@ -35,7 +35,8 @@ while IFS= read -r f; do
|
||||
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/main.rs|Cargo.toml|Cargo.lock|.gitea/*|ci/*|scripts/*|\
|
||||
vendor/*|thirdparty/asic-rs/*)
|
||||
backend=true ;;
|
||||
*) : ;; # docs, HANDOFF, README, thirdparty/wxwidgets tree: no bump
|
||||
esac
|
||||
|
||||
@@ -14,5 +14,16 @@ alkane-discovery = { path = "../alkane-discovery" }
|
||||
# vendored + patched wx-rs (see vendor/wx-rs/patches/)
|
||||
wx-rs = { path = "../../thirdparty/wx-rs/wx-rs-0.2.0-patched" }
|
||||
asic-rs = "0.8.1"
|
||||
measurements = "0.11"
|
||||
tokio = { version = "1", features = ["rt"] }
|
||||
futures-util = "0.3"
|
||||
serde = { version = "1", features = ["derive"] }
|
||||
serde_json = "1"
|
||||
# WhatsMiner :4028 token-auth access check (round 12 #8b) -- same crates the
|
||||
# vendored asic-rs whatsminer backend uses, so no new versions enter the lock.
|
||||
md5crypt = "1"
|
||||
sha2 = "0.10"
|
||||
aes = "0.8"
|
||||
ecb = "0.1"
|
||||
base64 = "0.21"
|
||||
hex = "0.4"
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
<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="M434.8 54.1C446.7 62.7 451.1 78.3 445.7 91.9L367.3 288L512 288C525.5 288 537.5 296.4 542.1 309.1C546.7 321.8 542.8 336 532.5 344.6L244.5 584.6C233.2 594 217.1 594.5 205.2 585.9C193.3 577.3 188.9 561.7 194.3 548.1L272.7 352L128 352C114.5 352 102.5 343.6 97.9 330.9C93.3 318.2 97.2 304 107.5 295.4L395.5 55.4C406.8 46 422.9 45.5 434.8 54.1z"/></svg>
|
||||
|
After Width: | Height: | Size: 569 B |
@@ -0,0 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512"><path fill="currentColor" d="M240 8L48 296h112L128 504 336 216H224L272 8z"/></svg>
|
||||
|
After Width: | Height: | Size: 145 B |
@@ -0,0 +1,29 @@
|
||||
<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>
|
||||
|
After Width: | Height: | Size: 2.0 KiB |
@@ -0,0 +1,38 @@
|
||||
<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>
|
||||
|
After Width: | Height: | Size: 2.5 KiB |
@@ -0,0 +1 @@
|
||||
<svg version="1.0" xmlns="http://www.w3.org/2000/svg" width="511.104248pt" height="512.144915pt" viewBox="0 0 511.104248 512.144915" preserveAspectRatio="xMidYMid meet"><g transform="translate(-0.500000,511.997478) scale(0.100000,-0.100000)" fill="currentColor" stroke="none"><path d="M82 5103 c-52 -25 -77 -69 -77 -133 0 -41 6 -63 22 -86 49 -68 -31 -64 1237 -64 l1146 0 0 -150 0 -150 -323 0 c-292 0 -332 -2 -403 -20 -201 -52 -370 -228 -414 -432 -8 -34 -11 -94 -8 -155 5 -90 12 -119 52 -214 6 -14 -9 -17 -121 -22 -142 -7 -205 -22 -304 -73 -123 -65 -229 -192 -272 -329 -33 -106 -30 -264 7 -360 15 -38 30 -77 32 -85 4 -12 -9 -20 -49 -33 -76 -24 -163 -83 -228 -156 -160 -176 -193 -424 -86 -638 61 -123 195 -242 315 -280 40 -13 52 -21 48 -33 -2 -8 -17 -46 -32 -85 -38 -95 -41 -253 -7 -360 56 -178 206 -323 393 -380 32 -9 108 -19 182 -22 l126 -6 -25 -66 c-31 -81 -42 -233 -23 -319 45 -210 221 -387 433 -437 94 -22 1622 -22 1716 0 108 26 188 71 272 155 126 125 176 255 167 437 -5 90 -12 119 -52 214 -6 14 9 17 122 22 147 6 246 33 337 92 110 70 199 186 238 310 33 106 30 264 -7 360 -15 39 -30 77 -32 85 -4 12 9 20 49 33 211 67 377 303 377 537 0 233 -167 470 -378 537 -40 13 -52 21 -48 33 2 8 17 47 32 85 37 96 40 254 7 360 -39 122 -130 241 -240 311 -89 58 -188 85 -335 91 -113 5 -128 8 -122 22 40 95 47 124 52 214 6 119 -7 184 -55 287 -46 97 -157 210 -254 257 -117 58 -159 63 -516 63 l-323 0 0 150 0 150 618 0 617 0 210 -211 c116 -116 227 -219 247 -230 122 -63 256 59 207 187 -5 16 -60 79 -121 141 l-112 113 313 0 c346 0 360 2 404 64 31 43 31 129 0 172 -50 70 173 64 -2535 64 -2230 0 -2446 -2 -2476 -17z m3337 -918 c94 -52 141 -134 141 -244 -1 -102 -60 -192 -155 -237 l-50 -24 -795 0 -795 0 -50 24 c-61 28 -116 87 -140 149 -26 70 -17 172 21 235 31 49 104 105 158 121 18 6 363 9 821 8 l790 -2 54 -30z m649 -834 c95 -43 162 -147 162 -251 0 -66 -30 -131 -85 -187 -84 -83 -84 -83 -593 -83 l-434 0 -55 50 c-281 257 -719 257 -1005 0 l-57 -51 -453 3 c-452 3 -453 3 -500 26 -92 45 -158 151 -158 252 0 119 99 235 221 259 24 5 688 8 1474 8 l1430 -2 53 -24z m-1317 -623 c130 -64 224 -184 249 -317 5 -29 10 -98 10 -151 0 -53 -5 -122 -10 -151 -25 -133 -119 -253 -249 -317 -73 -36 -77 -37 -191 -37 -114 0 -118 1 -191 37 -125 62 -210 164 -244 293 -20 79 -20 271 0 350 39 149 147 263 300 318 38 13 74 17 151 15 93 -3 107 -6 175 -40z m-924 -235 c-16 -51 -16 -415 0 -465 l11 -38 -547 0 -548 0 -62 31 c-87 43 -138 117 -148 213 -11 110 44 211 145 263 l64 33 548 0 548 0 -11 -37z m2580 24 c60 -22 117 -72 148 -128 26 -46 30 -64 30 -129 0 -65 -4 -83 -30 -129 -31 -56 -88 -106 -148 -128 -23 -8 -187 -12 -578 -12 l-546 -1 13 68 c17 86 17 318 0 405 l-13 67 546 -1 c391 0 555 -4 578 -12z m-2349 -878 c286 -256 725 -255 1006 1 l55 51 453 -3 c452 -3 453 -3 500 -26 90 -44 158 -151 158 -247 0 -99 -69 -204 -162 -246 l-53 -24 -1455 0 -1455 0 -53 24 c-95 43 -162 147 -162 251 0 66 30 131 85 187 83 82 79 81 588 82 l439 1 56 -51z m1342 -820 c97 -43 160 -138 160 -240 0 -111 -47 -192 -141 -244 l-54 -30 -783 -3 c-518 -2 -796 1 -822 8 -59 16 -131 70 -164 122 -38 63 -47 165 -21 235 24 62 79 121 140 149 l50 24 795 0 c778 0 796 -1 840 -21z"/></g></svg>
|
||||
|
After Width: | Height: | Size: 3.0 KiB |
@@ -0,0 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512"><!--! Font Awesome Pro 7.3.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2026 Fonticons, Inc. --><path fill="currentColor" d="M128 192l128 0 0-64c0-35.3-28.7-64-64-64s-64 28.7-64 64l0 64zm-64 0l0-64C64 57.3 121.3 0 192 0S320 57.3 320 128l0 64c35.3 0 64 28.7 64 64l0 192c0 35.3-28.7 64-64 64L64 512c-35.3 0-64-28.7-64-64L0 256c0-35.3 28.7-64 64-64zm256 64l-256 0 0 192 256 0 0-192z"/></svg>
|
||||
|
After Width: | Height: | Size: 522 B |
@@ -0,0 +1 @@
|
||||
<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="M240 88C240 74.7 229.3 64 216 64C202.7 64 192 74.7 192 88L192 128C156.7 128 128 156.7 128 192L88 192C74.7 192 64 202.7 64 216C64 229.3 74.7 240 88 240L128 240L128 296L88 296C74.7 296 64 306.7 64 320C64 333.3 74.7 344 88 344L128 344L128 400L88 400C74.7 400 64 410.7 64 424C64 437.3 74.7 448 88 448L128 448C128 483.3 156.7 512 192 512L192 552C192 565.3 202.7 576 216 576C229.3 576 240 565.3 240 552L240 512L296 512L296 552C296 565.3 306.7 576 320 576C333.3 576 344 565.3 344 552L344 512L400 512L400 552C400 565.3 410.7 576 424 576C437.3 576 448 565.3 448 552L448 512C483.3 512 512 483.3 512 448L552 448C565.3 448 576 437.3 576 424C576 410.7 565.3 400 552 400L512 400L512 344L552 344C565.3 344 576 333.3 576 320C576 306.7 565.3 296 552 296L512 296L512 240L552 240C565.3 240 576 229.3 576 216C576 202.7 565.3 192 552 192L512 192C512 156.7 483.3 128 448 128L448 88C448 74.7 437.3 64 424 64C410.7 64 400 74.7 400 88L400 128L344 128L344 88C344 74.7 333.3 64 320 64C306.7 64 296 74.7 296 88L296 128L240 128L240 88zM224 192L416 192C433.7 192 448 206.3 448 224L448 416C448 433.7 433.7 448 416 448L224 448C206.3 448 192 433.7 192 416L192 224C192 206.3 206.3 192 224 192zM240 240L240 400L400 400L400 240L240 240z"/></svg>
|
||||
|
After Width: | Height: | Size: 1.4 KiB |
@@ -0,0 +1 @@
|
||||
<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="M181.5 261.1L194.4 267.5C200.3 270.5 206.8 272 213.5 272C237 272 256.1 252.9 256.1 229.4L256.1 208C256.1 172.7 227.4 144 192.1 144L128.1 144C92.8 144 64.1 172.7 64.1 208L64.1 229.4C64.1 252.9 83.2 272 106.7 272C113.3 272 119.8 270.5 125.8 267.5C135.1 262.8 142.2 259.3 147 256.9L135.1 249C130.6 246 128 241 128 235.7L128 232C128 218.7 138.7 208 152 208L168 208C181.3 208 192 218.7 192 232L192 235.7C192 241 189.3 246 184.9 249L173.1 256.9L181.5 261.1zM172.9 310.5L160 304.1L147.1 310.5C134.5 316.8 120.6 320.1 106.6 320.1C103 320.1 99.5 319.9 96 319.5L96 320.1C96 355.4 124.7 384.1 160 384.1L224 384.1C241.7 384.1 256 398.4 256 416.1C256 433.8 241.7 448.1 224 448.1L384 448.1L384 384.1C384 360.4 396.9 339.7 416 328.7C425.4 323.3 436.3 320.1 448 320.1L448 304.1C448 277.6 469.5 256.1 496 256.1C504.8 256.1 512 263.3 512 272.1L512 368.1C512 376.9 519.2 384.1 528 384.1C536.8 384.1 544 376.9 544 368.1L544 268.4C544 220.2 513.2 177.4 467.4 162.1L458.9 159.3C450.9 156.6 446.3 148.2 448.5 140C450.7 131.8 458.8 126.8 467.1 128.4L487 132.4C576 150.1 640 228.2 640 318.9L640 320L640 320C640 443.7 539.7 544 416 544L255.4 544C132 544 32 444 32 320.6L32 280.8C21.9 266.2 16 248.5 16 229.4L16 208L16 206.6C6.7 203.3 0 194.5 0 184C0 170.7 10.7 160 24 160L26.8 160C44.8 122.2 83.3 96 128 96L192 96C236.7 96 275.2 122.2 293.2 160L296 160C309.3 160 320 170.7 320 184C320 194.5 313.3 203.3 304 206.6L304 208L304 229.4C304 230.8 304 232.2 303.9 233.7C315.9 227.5 329.6 224.1 344 224.1L352 224.1C369.7 224.1 384 238.4 384 256.1C384 273.8 369.7 288.1 352 288.1L344 288.1C330.7 288.1 320 298.8 320 312.1L320 320.1L376.4 320.1C361.2 337.1 352 359.5 352 384.1L320 384.1C277.7 384.1 241.8 356.7 229 318.8C223.9 319.7 218.7 320.1 213.4 320.1C199.3 320.1 185.5 316.8 172.9 310.5zM96 192C104.8 192 112 199.2 112 208C112 216.8 104.8 224 96 224C87.2 224 80 216.8 80 208C80 199.2 87.2 192 96 192zM208 208C208 199.2 215.2 192 224 192C232.8 192 240 199.2 240 208C240 216.8 232.8 224 224 224C215.2 224 208 216.8 208 208z"/></svg>
|
||||
|
After Width: | Height: | Size: 2.2 KiB |
@@ -0,0 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><!--! Font Awesome Pro 7.3.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2026 Fonticons, Inc. --><path fill="currentColor" d="M460.7 39.3l-2.2-2.1c-4.7-4.6-11.5-6.4-17.9-4.7s-11.4 6.6-13.1 13l-.8 2.9c-3.3 11.8-5.1 23.7-5.5 35.6 24.3 20.6 42.9 47.8 53.3 78.8-8.2-1.9-16.5-2.9-25-2.9-.6 0-1.1 0-1.7 0-18.4-44-56.5-77.4-103.6-89.3l-3.4-.9c-6.2-1.6-12.9-.6-18.5 2.6-10.8 6.2-15.6 19.5-11.2 31.1 14.9 39.5 44.3 71.4 81.4 89.7-3.7 6.6-6.4 14-7.6 21.8L279.7 154.9c-30.9-17.7-65.9-26.9-101.5-26.9-32.3 0-62.2 16.8-78.9 44.4-10.3-12.5-25.8-20.4-43.2-20.4-30.9 0-56 25.1-56 56s25.1 56 56 56c11.3 0 21.8-3.3 30.6-9.1 4.9 17.2 14.5 33.1 28.4 45.9L257.2 431.2C269 442 284.4 448 300.4 448L416 448c17.7 0 32-14.3 32-32s-14.3-32-32-32l-96 0 0-43.5c0-42.9-28.4-80.5-69.6-92.3l-30.8-8.8c-8.5-2.4-13.4-11.3-11-19.8s11.3-13.4 19.8-11l30.8 8.8c55 15.7 92.8 65.9 92.8 123.1l0 15.7 56-32.4 6.4-3.7 101.3 0c33.3 0 60.3-27 60.3-60.3 0-18.1-8.2-35.3-22.2-46.7l-34.6-28.2c-4.6-3.7-9.4-7.1-14.5-10 8.4-49.3-7.8-100-43.9-135.5zm-318.5 382c-14.7 9.8-18.7 29.7-8.9 44.4s29.7 18.7 44.4 8.9l46-30.7-48.6-44.5-32.9 22zM480 240a16 16 0 1 1 32 0 16 16 0 1 1 -32 0z"/></svg>
|
||||
|
After Width: | Height: | Size: 1.2 KiB |
@@ -0,0 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><!--! Font Awesome Pro 7.3.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2026 Fonticons, Inc. --><path fill="currentColor" d="M384 249.2c0 21.4-17.4 38.8-38.8 38.8L70.8 288C49.4 288 32 270.6 32 249.2L32 208c0-97.2 78.8-176 176-176s176 78.8 176 176l0 41.2zM480 288c-2 0-4-.1-5.9-.3-16.3 53.3-64.3 92.7-122.1 96l0 56.2c0 22.1-17.9 40-40 40l-48 0c-22.1 0-40-17.9-40-40l0-56-32 0 0 56c0 22.1-17.9 40-40 40l-48 0c-22.1 0-40-17.9-40-40l0-56-32 0c-17.7 0-32-14.3-32-32s14.3-32 32-32l312 0c39.8 0 72-32.2 72-72l0-72c0-35.3 28.7-64 64-64 53 0 96 43 96 96l0 16c0 35.3-28.7 64-64 64l-32 0zm16-64a16 16 0 1 0 0-32 16 16 0 1 0 0 32z"/></svg>
|
||||
|
After Width: | Height: | Size: 761 B |
@@ -0,0 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--! Font Awesome Pro 7.3.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2026 Fonticons, Inc. --><path fill="currentColor" d="M320 128c0-35.3 28.7-64 64-64s64 28.7 64 64l0 128 64 0 0-128C512 57.3 454.7 0 384 0S256 57.3 256 128l0 64-192 0c-35.3 0-64 28.7-64 64L0 448c0 35.3 28.7 64 64 64l256 0c35.3 0 64-28.7 64-64l0-192c0-35.3-28.7-64-64-64l0-64zM64 256l256 0 0 192-256 0 0-192z"/></svg>
|
||||
|
After Width: | Height: | Size: 520 B |
@@ -0,0 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--! Font Awesome Pro 7.3.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2026 Fonticons, Inc. --><path fill="currentColor" d="M205 64L434.9 64L439.3 82.4L475.6 234.9C478.5 247 480 259.5 480 272C480 352.2 421 418.7 344 430.2L344 560L432 560L432 608L208 608L208 560L296 560L296 430.2C219 418.6 160 352.2 160 272C160 259.5 161.5 247 164.4 234.9L200.7 82.4L205 64zM243 112L211 246C209 254.5 208 263.2 208 272C208 333.9 258.2 384 320 384C381.8 384 432 333.8 432 272C432 263.3 431 254.5 429 246L397.1 112L371.3 112L384.1 176L320.1 216L352.1 320L256.1 216L328.1 144L306.8 112L243.1 112z"/></svg>
|
||||
|
After Width: | Height: | Size: 721 B |
@@ -0,0 +1,280 @@
|
||||
//! Real access / lock-state detection: whether this miner accepts privileged
|
||||
//! (credentialed) command writes, or is view-only.
|
||||
//!
|
||||
//! asic-rs has no lock-state signal (a wrong-password miner just silently
|
||||
//! returns fewer fields, because the collector drops the 401). We build the real
|
||||
//! check ON TOP of asic-rs: a NON-mutating, digest-authenticated GET to a
|
||||
//! privileged endpoint. On Antminer every `/cgi-bin/*.cgi` requires digest auth,
|
||||
//! so the HTTP status is decisive -- 200 means our credentials authenticate
|
||||
//! (we can write -> unlocked), 401/403 means they are rejected (view-only ->
|
||||
//! locked). We probe `get_miner_conf.cgi`, which is read-only (never the
|
||||
//! mutating `set_miner_conf.cgi`).
|
||||
//!
|
||||
//! We shell out to `curl --digest` (already present, supports digest auth)
|
||||
//! rather than add an HTTP+digest crate, so the offline/vendored build is
|
||||
//! unaffected. `Some(true)` = locked, `Some(false)` = unlocked, `None` =
|
||||
//! indeterminate (unreachable, or an endpoint/vendor this probe doesn't cover).
|
||||
//!
|
||||
//! WhatsMiner has no such digest-gated web endpoint (it returns a 307 redirect
|
||||
//! for the Antminer paths, so the curl probe always read "indeterminate" and the
|
||||
//! table fell back to a capability guess that marked older units "locked" even
|
||||
//! with the default login -- round 12 #8b). Instead we run the WhatsMiner
|
||||
//! :4028 token handshake: `get_token` (unauthenticated) yields a salt, we derive
|
||||
//! the AES key from the password, and send a NON-mutating encrypted `summary`.
|
||||
//! An encrypted reply means the key (hence password) was accepted -> unlocked;
|
||||
//! a plaintext `enc json load err` means it was rejected -> locked.
|
||||
|
||||
use std::io::{Read, Write};
|
||||
use std::net::{SocketAddr, TcpStream};
|
||||
use std::process::Command;
|
||||
use std::time::Duration;
|
||||
|
||||
use aes::Aes256;
|
||||
use aes::cipher::{BlockEncryptMut, KeyInit, block_padding::ZeroPadding};
|
||||
use base64::Engine;
|
||||
use base64::engine::general_purpose::STANDARD as BASE64;
|
||||
use sha2::{Digest, Sha256};
|
||||
|
||||
type Aes256EcbEnc = ecb::Encryptor<Aes256>;
|
||||
|
||||
/// Classify a miner's access state from an HTTP status code string (curl's
|
||||
/// `%{http_code}` output). Conservative: anything other than a clear
|
||||
/// authenticated/unauthorized answer is `None`.
|
||||
pub fn classify_http_code(code: &str) -> Option<bool> {
|
||||
match code.trim() {
|
||||
"200" | "204" => Some(false), // authenticated -> unlocked/writable
|
||||
"401" | "403" => Some(true), // rejected -> locked/view-only
|
||||
_ => None, // 000 (no connect), 404, 5xx, ... -> unknown
|
||||
}
|
||||
}
|
||||
|
||||
/// The privileged, read-only endpoint we probe per firmware family. Antminer
|
||||
/// stock/aftermarket all gate `get_miner_conf.cgi` behind digest auth.
|
||||
fn endpoint(_firmware: &str) -> &'static str {
|
||||
"/cgi-bin/get_miner_conf.cgi"
|
||||
}
|
||||
|
||||
/// Probe one miner's access state. `make` is the miner brand ("Whatsminer" /
|
||||
/// "Antminer"): WhatsMiner uses the :4028 token handshake, everything else the
|
||||
/// digest-auth web probe. Returns `Ok(Some(true/false))` on a decisive
|
||||
/// lock/unlock answer, `Ok(None)` if indeterminate, `Err` only on a probe that
|
||||
/// 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()));
|
||||
}
|
||||
let url = format!("http://{ip}{}", endpoint(make));
|
||||
let userpass = format!("{user}:{pass}");
|
||||
let mut cmd = Command::new("curl");
|
||||
cmd.args([
|
||||
"-s",
|
||||
"-o",
|
||||
"/dev/null",
|
||||
"-w",
|
||||
"%{http_code}",
|
||||
"--digest",
|
||||
"-u",
|
||||
&userpass,
|
||||
"--connect-timeout",
|
||||
"5",
|
||||
"--max-time",
|
||||
"9",
|
||||
&url,
|
||||
]);
|
||||
let out = wait_with_timeout(cmd, Duration::from_secs(12))?;
|
||||
// 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);
|
||||
Ok(classify_http_code(&code))
|
||||
}
|
||||
|
||||
/// 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;
|
||||
cmd.stdout(std::process::Stdio::piped()).stderr(std::process::Stdio::piped());
|
||||
let mut child = cmd.spawn().map_err(|e| format!("spawn curl: {e}"))?;
|
||||
let start = std::time::Instant::now();
|
||||
loop {
|
||||
match child.try_wait().map_err(|e| e.to_string())? {
|
||||
Some(status) => {
|
||||
let mut stdout = Vec::new();
|
||||
let mut stderr = Vec::new();
|
||||
if let Some(mut o) = child.stdout.take() {
|
||||
let _ = o.read_to_end(&mut stdout);
|
||||
}
|
||||
if let Some(mut e) = child.stderr.take() {
|
||||
let _ = e.read_to_end(&mut stderr);
|
||||
}
|
||||
return Ok(std::process::Output { status, stdout, stderr });
|
||||
}
|
||||
None => {
|
||||
if start.elapsed() >= timeout {
|
||||
let _ = child.kill();
|
||||
return Err("curl timed out".into());
|
||||
}
|
||||
std::thread::sleep(Duration::from_millis(100));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// 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.
|
||||
fn whatsminer_password_candidates() -> Vec<String> {
|
||||
if let Some((_, pass)) = crate::credentials::load_firmware_credentials().get("WhatsMiner Stock") {
|
||||
if !pass.is_empty() {
|
||||
return vec![pass.clone()];
|
||||
}
|
||||
}
|
||||
vec!["admin".to_string(), "super".to_string()]
|
||||
}
|
||||
|
||||
/// Fetch a WhatsMiner's active fault codes over the unauthenticated :4028
|
||||
/// get_error_code command and format them one per line for the log viewer
|
||||
/// (round 12 #12). Returns None if the miner does not answer.
|
||||
pub fn whatsminer_get_error_code(ip: &str) -> Option<String> {
|
||||
let resp = wm_rpc(ip, "{\"command\":\"get_error_code\"}", Duration::from_secs(6)).ok()?;
|
||||
let v: serde_json::Value = serde_json::from_str(&resp).ok()?;
|
||||
let codes = v.get("Msg").and_then(|m| m.get("error_code")).and_then(|c| c.as_array());
|
||||
let mut lines = vec![format!("WhatsMiner get_error_code ({ip}):")];
|
||||
match codes {
|
||||
Some(arr) if !arr.is_empty() => {
|
||||
for entry in arr {
|
||||
if let Some(obj) = entry.as_object() {
|
||||
for (code, when) in obj {
|
||||
lines.push(format!(" error {code}: {}", when.as_str().unwrap_or("")));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
_ => lines.push(" no active error codes".to_string()),
|
||||
}
|
||||
Some(lines.join("\n"))
|
||||
}
|
||||
|
||||
/// One WhatsMiner :4028 request/response (the miner closes the socket after it
|
||||
/// replies). Returns the NUL-trimmed body.
|
||||
fn wm_rpc(ip: &str, payload: &str, timeout: Duration) -> Result<String, String> {
|
||||
let addr: SocketAddr = format!("{ip}:4028")
|
||||
.parse()
|
||||
.map_err(|e| format!("bad address {ip}: {e}"))?;
|
||||
let mut stream = TcpStream::connect_timeout(&addr, timeout).map_err(|e| e.to_string())?;
|
||||
stream.set_read_timeout(Some(timeout)).ok();
|
||||
stream.set_write_timeout(Some(timeout)).ok();
|
||||
stream.write_all(payload.as_bytes()).map_err(|e| e.to_string())?;
|
||||
let mut buf = Vec::new();
|
||||
let mut chunk = [0u8; 4096];
|
||||
loop {
|
||||
match stream.read(&mut chunk) {
|
||||
Ok(0) => break,
|
||||
Ok(n) => {
|
||||
buf.extend_from_slice(&chunk[..n]);
|
||||
if buf.len() > 1 << 20 {
|
||||
break; // cap a runaway response
|
||||
}
|
||||
}
|
||||
Err(_) => break,
|
||||
}
|
||||
}
|
||||
Ok(String::from_utf8_lossy(&buf).trim_matches('\u{0}').to_string())
|
||||
}
|
||||
|
||||
/// AES-256-ECB encrypt `data` under SHA256(pwd_md5), base64-encoded -- the exact
|
||||
/// scheme the WhatsMiner btminer API expects (mirrors the vendored asic-rs
|
||||
/// whatsminer v2 backend).
|
||||
fn wm_aes_ecb_enc(pwd_md5: &str, data: &str) -> Option<String> {
|
||||
let key = Sha256::digest(pwd_md5.as_bytes()); // 32 bytes
|
||||
let mut buffer = data.as_bytes().to_vec();
|
||||
while !buffer.len().is_multiple_of(16) {
|
||||
buffer.push(0);
|
||||
}
|
||||
let ct = Aes256EcbEnc::new_from_slice(&key)
|
||||
.ok()?
|
||||
.encrypt_padded_mut::<ZeroPadding>(&mut buffer, data.len())
|
||||
.ok()?;
|
||||
Some(BASE64.encode(ct))
|
||||
}
|
||||
|
||||
/// Check a WhatsMiner's access via the :4028 token handshake, trying each
|
||||
/// candidate password. Returns `Some(false)` (unlocked) on the first password
|
||||
/// the miner accepts, `Some(true)` (locked) if all are rejected, `None` if the
|
||||
/// miner is unreachable or speaks an unexpected dialect. Non-mutating: only
|
||||
/// `get_token` and a read-only `summary` are ever sent.
|
||||
fn probe_whatsminer_access(ip: &str, passwords: &[String]) -> Option<bool> {
|
||||
let timeout = Duration::from_secs(6);
|
||||
let mut reachable = 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,
|
||||
};
|
||||
let v: serde_json::Value = match serde_json::from_str(&tok_resp) {
|
||||
Ok(v) => v,
|
||||
Err(_) => return None,
|
||||
};
|
||||
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;
|
||||
};
|
||||
reachable = true;
|
||||
// 2. Derive the md5crypt password hash + write-token from the password.
|
||||
let crypted = md5crypt::md5crypt(pass.as_bytes(), salt.as_bytes());
|
||||
let full = String::from_utf8_lossy(&crypted);
|
||||
let Some(pwd_md5) = full.split('$').nth(3) else { continue };
|
||||
let sign_crypted = md5crypt::md5crypt(format!("{pwd_md5}{time}").as_bytes(), newsalt.as_bytes());
|
||||
let sign_full = String::from_utf8_lossy(&sign_crypted);
|
||||
let host_sign = sign_full.split('$').nth(3).unwrap_or("");
|
||||
// 3. Send an encrypted, read-only `summary`. If the AES key (from the
|
||||
// password) is right the miner replies encrypted; if wrong it returns
|
||||
// a plaintext "enc json load err".
|
||||
let cmd = format!("{{\"command\":\"summary\",\"token\":\"{host_sign}\"}}");
|
||||
let Some(enc) = wm_aes_ecb_enc(pwd_md5, &cmd) else { continue };
|
||||
let payload = format!("{{\"enc\":1,\"data\":\"{enc}\"}}");
|
||||
let resp = match wm_rpc(ip, &payload, timeout) {
|
||||
Ok(s) => s,
|
||||
Err(_) => return None,
|
||||
};
|
||||
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 }
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn classify_codes() {
|
||||
assert_eq!(classify_http_code("200"), Some(false), "authenticated -> unlocked");
|
||||
assert_eq!(classify_http_code("204"), Some(false));
|
||||
assert_eq!(classify_http_code("401"), Some(true), "unauthorized -> locked");
|
||||
assert_eq!(classify_http_code("403"), Some(true));
|
||||
assert_eq!(classify_http_code("000"), None, "no connection -> unknown");
|
||||
assert_eq!(classify_http_code("404"), None, "endpoint absent -> unknown");
|
||||
assert_eq!(classify_http_code("500"), None);
|
||||
assert_eq!(classify_http_code(" 200 "), Some(false), "whitespace tolerated");
|
||||
assert_eq!(classify_http_code(""), None);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn whatsminer_aes_ecb_matches_reference() {
|
||||
// Deterministic vector from the verified btminer scheme: AES-256-ECB over
|
||||
// SHA256(pwd_md5), zero-padded, base64. Guards the WhatsMiner access
|
||||
// handshake crypto (round 12 #8b) without needing a live miner.
|
||||
assert_eq!(
|
||||
wm_aes_ecb_enc("abc123def456", "{\"command\":\"summary\"}").as_deref(),
|
||||
Some("jn5Wru/5hhMtU1IgamxLoUd/YTxaLTxEeiCQxu5pO+Q=")
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,97 @@
|
||||
//! 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
|
||||
//! standalone CLI so hardware checks don't go through the wx event loop.
|
||||
//!
|
||||
//! Usage:
|
||||
//! miner_probe scan <cidr> [<cidr>...]
|
||||
//! 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.
|
||||
|
||||
use asic_rs::MinerFactory;
|
||||
use asic_rs::core::traits::miner::MinerAuth;
|
||||
use futures_util::StreamExt;
|
||||
|
||||
fn load_creds() -> Option<(String, String)> {
|
||||
let home = std::env::var("HOME").ok()?;
|
||||
let p = std::path::PathBuf::from(home)
|
||||
.join(".config/alkane-toolkit/scan-credentials.txt");
|
||||
let s = std::fs::read_to_string(p).ok()?;
|
||||
let mut l = s.lines();
|
||||
let u = l.next()?.to_string();
|
||||
let pw = l.next().unwrap_or("").to_string();
|
||||
Some((u, pw))
|
||||
}
|
||||
|
||||
fn factory() -> MinerFactory {
|
||||
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)");
|
||||
} else {
|
||||
eprintln!("(no saved credentials -- backends use their default auth)");
|
||||
}
|
||||
f
|
||||
}
|
||||
|
||||
async fn scan(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\tmake\tfirmware\tmodel_id\tcontrol_board\twatts\tsupports_power_limit\tsupports_tuning");
|
||||
let mut stream = f.scan_stream_with_ip();
|
||||
let mut found = 0usize;
|
||||
while let Some((ip, miner)) = stream.next().await {
|
||||
if let Some(m) = miner {
|
||||
let data = m.get_data().await;
|
||||
let watts = data.wattage.as_ref().map(|p| p.as_watts()).unwrap_or(0.0);
|
||||
let cb = data
|
||||
.control_board_version
|
||||
.as_ref()
|
||||
.map(|c| c.to_string())
|
||||
.unwrap_or_default();
|
||||
println!(
|
||||
"{ip}\t{}\t{}\t{}\t{}\t{watts:.0}\t{}\t{}",
|
||||
data.device_info.make,
|
||||
data.device_info.firmware,
|
||||
data.device_info.model,
|
||||
cb,
|
||||
m.supports_set_power_limit(),
|
||||
m.supports_set_tuning_percent(),
|
||||
);
|
||||
found += 1;
|
||||
}
|
||||
}
|
||||
eprintln!("scan complete: {found} miner(s) responded");
|
||||
}
|
||||
|
||||
fn main() {
|
||||
let args: Vec<String> = std::env::args().collect();
|
||||
let rt = match tokio::runtime::Builder::new_current_thread().enable_all().build() {
|
||||
Ok(rt) => rt,
|
||||
Err(e) => {
|
||||
eprintln!("tokio runtime: {e}");
|
||||
std::process::exit(2);
|
||||
}
|
||||
};
|
||||
match args.get(1).map(String::as_str) {
|
||||
Some("scan") if args.len() >= 3 => rt.block_on(scan(&args[2..])),
|
||||
_ => {
|
||||
eprintln!("usage: miner_probe scan <cidr> [<cidr>...]");
|
||||
std::process::exit(2);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,294 @@
|
||||
//! Optional saved miner credentials, applied to every asic-rs discovery call.
|
||||
//!
|
||||
//! asic-rs has no single global credential field on `MinerFactory`: auth is set
|
||||
//! per firmware backend via `with_firmware_discovery_auth`. `configured_factory`
|
||||
//! is the one place that fans a saved username/password out across the whole
|
||||
//! firmware registry, so `scan`'s callers never have to think about it.
|
||||
|
||||
use std::collections::HashMap;
|
||||
use std::io::Write;
|
||||
use std::os::unix::fs::{OpenOptionsExt, PermissionsExt};
|
||||
|
||||
use asic_rs::MinerFactory;
|
||||
use asic_rs::core::traits::miner::MinerAuth;
|
||||
|
||||
use crate::scan::config_path;
|
||||
|
||||
pub const CREDENTIALS_FILE: &str = "scan-credentials.txt";
|
||||
/// Per-firmware default logins the operator can override (round 12 #13). One
|
||||
/// `firmware-name<TAB>user<TAB>pass` line per firmware, 0600 like the others.
|
||||
/// Keyed by the firmware registry's Display name (see `firmware_default_creds`).
|
||||
pub const FIRMWARE_CREDENTIALS_FILE: &str = "firmware-credentials.txt";
|
||||
/// SSH login for the control board (used by the PIC probe; distinct from the
|
||||
/// web/API scan credentials above -- miners' SSH root login is usually not the
|
||||
/// same account as the web digest-auth login).
|
||||
pub const SSH_CREDENTIALS_FILE: &str = "ssh-credentials.txt";
|
||||
|
||||
/// Load a saved username/password pair from `file`, if present.
|
||||
fn load_creds_file(file: &str) -> Option<(String, String)> {
|
||||
let s = std::fs::read_to_string(config_path(file)).ok()?;
|
||||
let mut lines = s.lines();
|
||||
let user = lines.next()?.to_string();
|
||||
let pass = lines.next().unwrap_or("").to_string();
|
||||
Some((user, pass))
|
||||
}
|
||||
|
||||
/// Save a username/password pair to `file`, restricting it to owner read/write
|
||||
/// (credentials are plaintext on disk, so the mode matters).
|
||||
fn save_creds_file(file: &str, user: &str, pass: &str) -> std::io::Result<()> {
|
||||
let p = config_path(file);
|
||||
if let Some(dir) = p.parent() {
|
||||
std::fs::create_dir_all(dir)?;
|
||||
}
|
||||
// Open (and create) with mode 0600 up front so a freshly created file is
|
||||
// never world/group-readable, even for the instant before the write. For a
|
||||
// pre-existing file the create mode is ignored, so also tighten it to 0600
|
||||
// while it is still empty (post-truncate, pre-write) -- the plaintext is
|
||||
// never on disk under a looser mode.
|
||||
let mut f = std::fs::OpenOptions::new()
|
||||
.write(true)
|
||||
.create(true)
|
||||
.truncate(true)
|
||||
.mode(0o600)
|
||||
.open(&p)?;
|
||||
f.set_permissions(std::fs::Permissions::from_mode(0o600))?;
|
||||
f.write_all(format!("{user}\n{pass}\n").as_bytes())?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn clear_creds_file(file: &str) -> std::io::Result<()> {
|
||||
match std::fs::remove_file(config_path(file)) {
|
||||
Ok(()) => Ok(()),
|
||||
Err(e) if e.kind() == std::io::ErrorKind::NotFound => Ok(()),
|
||||
Err(e) => Err(e),
|
||||
}
|
||||
}
|
||||
|
||||
/// Load the saved miner web/API username/password, if any were saved.
|
||||
pub fn load_credentials() -> Option<(String, String)> {
|
||||
load_creds_file(CREDENTIALS_FILE)
|
||||
}
|
||||
|
||||
/// Save the miner web/API username/password (0600).
|
||||
pub fn save_credentials(user: &str, pass: &str) -> std::io::Result<()> {
|
||||
save_creds_file(CREDENTIALS_FILE, user, pass)
|
||||
}
|
||||
|
||||
/// Load the saved SSH username/password (used by the Braiins restore-to-stock
|
||||
/// flow), if any.
|
||||
pub fn load_ssh_credentials() -> Option<(String, String)> {
|
||||
load_creds_file(SSH_CREDENTIALS_FILE)
|
||||
}
|
||||
|
||||
/// Save the SSH username/password (0600). Retained for a future SSH-login dialog
|
||||
/// now that the SSH PIC probe that used to save it has been removed (round 14 #5).
|
||||
#[allow(dead_code)]
|
||||
pub fn save_ssh_credentials(user: &str, pass: &str) -> std::io::Result<()> {
|
||||
save_creds_file(SSH_CREDENTIALS_FILE, user, pass)
|
||||
}
|
||||
|
||||
/// Remove the saved web/API credentials, if any. Not an error if none were saved.
|
||||
pub fn clear_credentials() -> std::io::Result<()> {
|
||||
match clear_creds_file(CREDENTIALS_FILE) {
|
||||
Ok(()) => Ok(()),
|
||||
Err(e) => Err(e),
|
||||
}
|
||||
}
|
||||
|
||||
/// The stock/default login each firmware ships with, keyed by the firmware
|
||||
/// registry's Display name (round 12 #13). These seed the per-firmware editor and
|
||||
/// let it tell an override from an unchanged default; they mirror the
|
||||
/// `default_auth()` constants in the vendored asic-rs backends (a single
|
||||
/// best-guess per registry entry, since a stock entry can span several backend
|
||||
/// versions). asic-rs does not expose these at the entry level, so they are
|
||||
/// duplicated here; a firmware absent from this table defaults to blank.
|
||||
pub fn firmware_default_creds() -> &'static [(&'static str, &'static str, &'static str)] {
|
||||
&[
|
||||
("AntMiner Stock", "root", "root"),
|
||||
("WhatsMiner Stock", "admin", "admin"),
|
||||
("Braiins", "root", "root"),
|
||||
("VNish", "", "admin"),
|
||||
("LuxOS", "root", "root"),
|
||||
("UMC OS", "", "letmein"),
|
||||
("Marathon", "root", "root"),
|
||||
("VolcMiner Stock", "root", "ltc@dog"),
|
||||
("Elphapex Stock", "root", "root"),
|
||||
("FutureBit Stock", "futurebit", "futurebit123"),
|
||||
("SealMiner Stock", "seal", "seal"),
|
||||
("Auradine Stock", "admin", "admin"),
|
||||
("AvalonMiner Stock", "", ""),
|
||||
("Nerdaxe Stock", "", ""),
|
||||
("Proto Stock", "", ""),
|
||||
("Bitaxe Stock", "", ""),
|
||||
]
|
||||
}
|
||||
|
||||
/// The shipped default login for a firmware, or `("","")` if unknown.
|
||||
pub fn firmware_default_for(name: &str) -> (String, String) {
|
||||
firmware_default_creds()
|
||||
.iter()
|
||||
.find(|(n, _, _)| *n == name)
|
||||
.map(|(_, u, p)| (u.to_string(), p.to_string()))
|
||||
.unwrap_or_default()
|
||||
}
|
||||
|
||||
/// Load the operator's per-firmware credential overrides, keyed by firmware
|
||||
/// Display name. Malformed lines are skipped.
|
||||
pub fn load_firmware_credentials() -> HashMap<String, (String, String)> {
|
||||
let mut map = HashMap::new();
|
||||
let Ok(s) = std::fs::read_to_string(config_path(FIRMWARE_CREDENTIALS_FILE)) else {
|
||||
return map;
|
||||
};
|
||||
for line in s.lines() {
|
||||
let mut parts = line.splitn(3, '\t');
|
||||
let (Some(name), user) = (parts.next(), parts.next()) else {
|
||||
continue;
|
||||
};
|
||||
if name.is_empty() {
|
||||
continue;
|
||||
}
|
||||
let user = user.unwrap_or("").to_string();
|
||||
let pass = parts.next().unwrap_or("").to_string();
|
||||
map.insert(name.to_string(), (user, pass));
|
||||
}
|
||||
map
|
||||
}
|
||||
|
||||
/// Save the per-firmware credential overrides (0600), sorted by name for a
|
||||
/// stable file. An empty map clears the file.
|
||||
pub fn save_firmware_credentials(map: &HashMap<String, (String, String)>) -> std::io::Result<()> {
|
||||
if map.is_empty() {
|
||||
return clear_firmware_credentials();
|
||||
}
|
||||
let p = config_path(FIRMWARE_CREDENTIALS_FILE);
|
||||
if let Some(dir) = p.parent() {
|
||||
std::fs::create_dir_all(dir)?;
|
||||
}
|
||||
let mut f = std::fs::OpenOptions::new()
|
||||
.write(true)
|
||||
.create(true)
|
||||
.truncate(true)
|
||||
.mode(0o600)
|
||||
.open(&p)?;
|
||||
f.set_permissions(std::fs::Permissions::from_mode(0o600))?;
|
||||
let mut names: Vec<&String> = map.keys().collect();
|
||||
names.sort();
|
||||
for name in names {
|
||||
let (user, pass) = &map[name];
|
||||
f.write_all(format!("{name}\t{user}\t{pass}\n").as_bytes())?;
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Remove the per-firmware overrides file, if any. Not an error if none exists.
|
||||
pub fn clear_firmware_credentials() -> std::io::Result<()> {
|
||||
clear_creds_file(FIRMWARE_CREDENTIALS_FILE)
|
||||
}
|
||||
|
||||
/// Build a `MinerFactory` with saved credentials applied as discovery auth.
|
||||
/// Precedence per firmware backend: a per-firmware override (round 12 #13) wins;
|
||||
/// otherwise the single global scan credential (if set) applies to every backend;
|
||||
/// 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();
|
||||
let global = load_credentials();
|
||||
let per_fw = load_firmware_credentials();
|
||||
if global.is_none() && per_fw.is_empty() {
|
||||
return factory;
|
||||
}
|
||||
for fw in asic_rs::factory::default_firmware_registry() {
|
||||
let cred = per_fw
|
||||
.get(&fw.to_string())
|
||||
.cloned()
|
||||
.or_else(|| global.clone());
|
||||
if let Some((user, pass)) = cred {
|
||||
factory = factory.with_firmware_discovery_auth(fw.as_ref(), MinerAuth::new(user, pass));
|
||||
}
|
||||
}
|
||||
factory
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[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).
|
||||
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);
|
||||
std::fs::create_dir_all(&dir).unwrap();
|
||||
std::env::set_var("HOME", &dir);
|
||||
|
||||
assert_eq!(load_credentials(), None, "no file -> None");
|
||||
|
||||
save_credentials("admin", "hunter2").unwrap();
|
||||
assert_eq!(load_credentials(), Some(("admin".to_string(), "hunter2".to_string())));
|
||||
|
||||
let meta = std::fs::metadata(config_path(CREDENTIALS_FILE)).unwrap();
|
||||
assert_eq!(meta.permissions().mode() & 0o777, 0o600, "credentials file must be 0600");
|
||||
|
||||
// configured_factory() must construct in both branches without panicking:
|
||||
// with saved credentials (fans auth across every firmware backend) ...
|
||||
let _ = configured_factory();
|
||||
|
||||
// A pre-existing, world-readable credentials file must be tightened to
|
||||
// 0600 by save_credentials (the create-mode is ignored for an existing
|
||||
// file, so the explicit set_permissions is what protects it).
|
||||
let path = config_path(CREDENTIALS_FILE);
|
||||
std::fs::set_permissions(&path, std::fs::Permissions::from_mode(0o644)).unwrap();
|
||||
save_credentials("admin2", "s3cr3t").unwrap();
|
||||
let meta = std::fs::metadata(&path).unwrap();
|
||||
assert_eq!(
|
||||
meta.permissions().mode() & 0o777,
|
||||
0o600,
|
||||
"save over a pre-existing 0644 file must re-tighten to 0600"
|
||||
);
|
||||
assert_eq!(load_credentials(), Some(("admin2".to_string(), "s3cr3t".to_string())));
|
||||
|
||||
clear_credentials().unwrap();
|
||||
// ... and with no saved credentials (plain MinerFactory::new()).
|
||||
let _ = configured_factory();
|
||||
assert_eq!(load_credentials(), None, "cleared -> None");
|
||||
clear_credentials().unwrap(); // idempotent: clearing an already-clear store is not an error
|
||||
|
||||
// Per-firmware overrides (round 12 #13). Kept in this same test because
|
||||
// HOME is process-global: a second #[test] mutating it would race under
|
||||
// cargo's default parallel runner.
|
||||
assert!(load_firmware_credentials().is_empty(), "no file -> empty map");
|
||||
let mut fw = HashMap::new();
|
||||
fw.insert("WhatsMiner Stock".to_string(), ("super".to_string(), "sup3r".to_string()));
|
||||
fw.insert("VNish".to_string(), ("".to_string(), "hunter2".to_string()));
|
||||
save_firmware_credentials(&fw).unwrap();
|
||||
// 0600, and it round-trips (an empty username survives the tab format).
|
||||
let fwpath = config_path(FIRMWARE_CREDENTIALS_FILE);
|
||||
assert_eq!(
|
||||
std::fs::metadata(&fwpath).unwrap().permissions().mode() & 0o777,
|
||||
0o600,
|
||||
"per-firmware creds file must be 0600"
|
||||
);
|
||||
let back = load_firmware_credentials();
|
||||
assert_eq!(back.get("WhatsMiner Stock"), Some(&("super".into(), "sup3r".into())));
|
||||
assert_eq!(back.get("VNish"), Some(&("".into(), "hunter2".into())));
|
||||
assert_eq!(back.len(), 2);
|
||||
// Shipped-default lookup: known firmware resolves, unknown blanks.
|
||||
assert_eq!(firmware_default_for("AntMiner Stock"), ("root".into(), "root".into()));
|
||||
assert_eq!(firmware_default_for("nonexistent"), (String::new(), String::new()));
|
||||
// Overrides + no global still builds a factory.
|
||||
let _ = configured_factory();
|
||||
// Saving an empty map clears the file (no stale overrides linger).
|
||||
save_firmware_credentials(&HashMap::new()).unwrap();
|
||||
assert!(load_firmware_credentials().is_empty(), "empty save -> cleared");
|
||||
clear_firmware_credentials().unwrap(); // idempotent
|
||||
|
||||
match prev {
|
||||
Some(v) => std::env::set_var("HOME", v),
|
||||
None => std::env::remove_var("HOME"),
|
||||
}
|
||||
let _ = std::fs::remove_dir_all(&dir);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,187 @@
|
||||
//! 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};
|
||||
|
||||
/// Escape one CSV field: quote it when it contains a comma, quote, CR or LF, and
|
||||
/// double any embedded quotes.
|
||||
fn esc(s: &str) -> String {
|
||||
if s.contains([',', '"', '\n', '\r']) {
|
||||
format!("\"{}\"", s.replace('"', "\"\""))
|
||||
} else {
|
||||
s.to_string()
|
||||
}
|
||||
}
|
||||
|
||||
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("; ")),
|
||||
]
|
||||
}
|
||||
|
||||
/// Build the full CSV for `rows`. Empty rows still emit a header line.
|
||||
pub fn rows_to_csv(rows: &[MinerRow]) -> String {
|
||||
let cols = scalar_columns();
|
||||
// Widest variable-length fields across the set.
|
||||
let max_board_temps = rows.iter().map(|r| r.board_temps.len()).max().unwrap_or(0);
|
||||
let max_fans = rows.iter().map(|r| r.fan_rpms.len()).max().unwrap_or(0);
|
||||
let max_boards = rows.iter().map(|r| r.board_status.len()).max().unwrap_or(0);
|
||||
let max_pools = rows.iter().map(|r| r.pools.len()).max().unwrap_or(0);
|
||||
|
||||
// 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 csv = rows_to_csv(&rows);
|
||||
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");
|
||||
}
|
||||
}
|
||||
@@ -2,7 +2,8 @@
|
||||
//! 10.255.1.0/24 (see ../../../HANDOFF.md section 7 and the parent project's
|
||||
//! [removed]). These are the reference values the workflow tests compare
|
||||
//! the application's actual output against, and the rows the offline
|
||||
//! `ALKANE_FAKE_SCAN` demo mode renders.
|
||||
//! `ALKANE_FAKE_SCAN` demo mode renders. Only miners that respond become rows,
|
||||
//! so there is no synthetic "offline" fixture.
|
||||
//!
|
||||
//! Hashrate/power/temp are representative per-model figures (the bench boards
|
||||
//! are not always energised); the point of the fixtures is a fixed, known input
|
||||
@@ -13,10 +14,16 @@
|
||||
use crate::model::{is_slow, MinerRow};
|
||||
|
||||
/// One fixture board, pre-transform. `expected` of 0.0 means "band unknown".
|
||||
/// `make`/`model_id`/`board` mirror what asic-rs actually reports (compact
|
||||
/// identifiers + a bare control-board name) so the fixtures exercise the real
|
||||
/// crate::naming transform, not pre-cleaned strings.
|
||||
struct Board {
|
||||
ip: &'static str,
|
||||
model: &'static str,
|
||||
make: &'static str,
|
||||
model_id: &'static str,
|
||||
board: &'static str,
|
||||
firmware: &'static str,
|
||||
fw_version: &'static str,
|
||||
hashrate: f64,
|
||||
expected: f64,
|
||||
power: f64,
|
||||
@@ -24,6 +31,10 @@ struct Board {
|
||||
fan: f64,
|
||||
worker: &'static str,
|
||||
mining: bool,
|
||||
/// True for the bench board deliberately rebucketed into the "paused"
|
||||
/// status/KPI bucket (not-mining but operator-paused, distinct from a
|
||||
/// unit that is simply idle/not-hashing).
|
||||
paused: bool,
|
||||
}
|
||||
|
||||
impl Board {
|
||||
@@ -37,28 +48,89 @@ impl Board {
|
||||
} else {
|
||||
(None, None, 0.0)
|
||||
};
|
||||
let fan_rpms = if self.mining {
|
||||
vec![self.fan, self.fan * 0.95, self.fan * 1.02]
|
||||
} else {
|
||||
vec![]
|
||||
};
|
||||
// Three per-hashboard chip temps around the average (so the offline demo
|
||||
// shows the "77 / 64 / 74" per-board Chip-temp cell).
|
||||
let board_temps = if self.mining && self.temp > 0.0 {
|
||||
vec![self.temp + 2.0, self.temp - 3.0, self.temp + 1.0]
|
||||
} else {
|
||||
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).
|
||||
let env_temp_c = if self.mining && self.make.eq_ignore_ascii_case("whatsminer") {
|
||||
27.0
|
||||
} else {
|
||||
0.0
|
||||
};
|
||||
// Per-hashboard health dots for the Boards column (round 11 #10): mining
|
||||
// units show three green dots, except two demo cases -- the slow S21 Pro
|
||||
// has one faulted (red) board, and one VNish S19 has a board that wasn't
|
||||
// detected (grey) -- so the offline demo exercises all three states.
|
||||
use crate::model::BoardHealth::{Fault, Missing, Ok};
|
||||
let board_status = if self.mining {
|
||||
match self.ip {
|
||||
"10.255.1.149" => vec![Ok, Fault, Ok],
|
||||
"10.255.1.166" => vec![Ok, Ok, Missing],
|
||||
_ => vec![Ok, Ok, Ok],
|
||||
}
|
||||
} else {
|
||||
vec![]
|
||||
};
|
||||
// Firmware-flash capability is modeled on the real Bitmain/Antminer
|
||||
// upgrade path (S17/S19/S21 family); WhatsMiner boards in this fleet
|
||||
// don't advertise it, so both true and false show up and the
|
||||
// firmware menu item is testable.
|
||||
let firmware_flash = self.make.eq_ignore_ascii_case("antminer")
|
||||
&& (self.model_id == "S17"
|
||||
|| self.model_id.starts_with("S19")
|
||||
|| self.model_id.starts_with("S21"));
|
||||
// Derive the display identity through the same path the live scan uses.
|
||||
let brand = crate::naming::brand(self.make);
|
||||
let model = crate::naming::clean_model(self.make, self.model_id);
|
||||
let submodel = crate::naming::submodel(self.make, self.model_id);
|
||||
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);
|
||||
MinerRow {
|
||||
ip: self.ip.to_string(),
|
||||
selected: false,
|
||||
model: self.model.to_string(),
|
||||
model,
|
||||
brand,
|
||||
submodel,
|
||||
firmware: self.firmware.to_string(),
|
||||
fw_version: self.fw_version.to_string(),
|
||||
cpu,
|
||||
board_code,
|
||||
hashrate_ths: self.hashrate,
|
||||
expected_ths: self.expected,
|
||||
efficiency,
|
||||
power_w: self.power,
|
||||
chip_temp_c: self.temp,
|
||||
fan_rpm: self.fan,
|
||||
board_temps,
|
||||
env_temp_c,
|
||||
fan_rpms,
|
||||
worker: self.worker.to_string(),
|
||||
is_mining: self.mining,
|
||||
slow,
|
||||
paused: self.paused,
|
||||
// offline defaults to false (online); these bench rows are reachable.
|
||||
mac: format!("AA:BB:CC:00:{:02X}:{last_octet:02X}", last_octet.wrapping_mul(3)),
|
||||
hostname: format!("miner-{last_octet}"),
|
||||
hashboards: boards,
|
||||
expected_hashboards: Some(3),
|
||||
board_status,
|
||||
total_chips: chips,
|
||||
psu_fan_rpm: if self.mining { self.fan * 0.9 } else { 0.0 },
|
||||
uptime_secs: if self.mining { 3600 * 24 * 2 + 3600 * 5 } else { 0 },
|
||||
light_flashing: Some(false),
|
||||
// One unit is "being located" so the Light column's yellow dot is
|
||||
// demonstrable offline (round 11 #10).
|
||||
light_flashing: Some(self.ip == "10.255.1.167"),
|
||||
pool_url: if self.worker.is_empty() { String::new() } else { "stratum+tcp://pool.blueflare:3333".to_string() },
|
||||
pools: if self.worker.is_empty() {
|
||||
Vec::new()
|
||||
@@ -68,47 +140,96 @@ impl Board {
|
||||
("stratum+tcp://backup.blueflare:3333".to_string(), format!("{}_bak", self.worker)),
|
||||
]
|
||||
},
|
||||
operating_state: if self.mining { "mining".to_string() } else { "idle".to_string() },
|
||||
operating_state: if self.paused {
|
||||
"paused".to_string()
|
||||
} else if self.mining {
|
||||
"mining".to_string()
|
||||
} else {
|
||||
"idle".to_string()
|
||||
},
|
||||
// Synthetic capabilities so the right-click config menu is
|
||||
// exercisable offline: mining units support everything, idle ones
|
||||
// only the fault light + restart (to show the capability intersection).
|
||||
caps: crate::model::MinerCaps {
|
||||
fault_light: true,
|
||||
restart: true,
|
||||
pause: self.mining,
|
||||
resume: self.mining,
|
||||
power_limit: self.mining,
|
||||
tuning: self.mining,
|
||||
firmware_flash,
|
||||
pools: 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
|
||||
},
|
||||
// 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()),
|
||||
// Concise, prefix-free lines (matching summarize_messages output):
|
||||
// the Errors column shows the count, these are the hover tooltip.
|
||||
errors: if self.model_id == "S21Pro" {
|
||||
vec![
|
||||
"hashrate 70% below expected".to_string(),
|
||||
"chip temperature high (HashBoard 2)".to_string(),
|
||||
]
|
||||
} else {
|
||||
Vec::new()
|
||||
},
|
||||
..Default::default()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// The 9 bench boards. Two are idle (S17 stock, WardenOS dev), one is slow
|
||||
/// (S21 Pro aml stock at ~30% of expected); the other six hash normally.
|
||||
/// The 9 bench boards (9 rows total). One is idle/not-hashing (S17 stock,
|
||||
/// .112); one is paused (WardenOS dev, .115 - deliberately rebucketed from idle
|
||||
/// so the "paused" status/KPI bucket is exercisable offline); one is slow (S21
|
||||
/// Pro aml stock at ~30% of expected); the other six hash normally.
|
||||
///
|
||||
/// Derived totals (used by the workflow tests):
|
||||
/// total = 9, hashing = 6, slow = 1, not hashing = 2,
|
||||
/// total = 9, hashing = 6, slow = 1, not hashing = 1, paused = 1,
|
||||
/// total hashrate = 685.0 TH/s, total power = 21300 W.
|
||||
pub fn bench_fleet() -> Vec<MinerRow> {
|
||||
let boards = [
|
||||
Board { ip: "10.255.1.112", model: "Antminer S17", firmware: "Stock",
|
||||
// firmware families span the palette (Stock/VNish/Braiins/LuxOS/ePIC/
|
||||
// Hive/BixBit/Alkane) so the offline demo shows the Firmware colouring.
|
||||
Board { ip: "10.255.1.112", make: "Antminer", model_id: "S17", board: "Xilinx", firmware: "Stock", fw_version: "",
|
||||
hashrate: 0.0, expected: 0.0, power: 0.0, temp: 0.0, fan: 0.0,
|
||||
worker: "", mining: false },
|
||||
Board { ip: "10.255.1.166", model: "Antminer S19", firmware: "[removed] 1.2",
|
||||
worker: "", mining: false, paused: false },
|
||||
Board { ip: "10.255.1.166", make: "Antminer", model_id: "S19", board: "BeagleBoneBlack", firmware: "VNish", fw_version: "1.2.8",
|
||||
hashrate: 95.0, expected: 96.0, power: 3250.0, temp: 65.0, fan: 4200.0,
|
||||
worker: "blueflare.s19", mining: true },
|
||||
Board { ip: "10.255.1.152", model: "Antminer S19j Pro", firmware: "[removed] 1.2",
|
||||
worker: "blueflare.s19", mining: true, paused: false },
|
||||
Board { ip: "10.255.1.152", make: "Antminer", model_id: "S19jPro", board: "AMLogic", firmware: "Braiins", fw_version: "25.05.1",
|
||||
hashrate: 100.0, expected: 104.0, power: 3100.0, temp: 62.0, fan: 3900.0,
|
||||
worker: "blueflare.s19jpro", mining: true },
|
||||
Board { ip: "10.255.1.167", model: "Antminer S19k Pro", firmware: "[removed] 1.2",
|
||||
worker: "blueflare.s19jpro", mining: true, paused: false },
|
||||
Board { ip: "10.255.1.167", make: "Antminer", model_id: "S19KPro", board: "AMLogic", firmware: "LuxOS", fw_version: "2024.9.0",
|
||||
hashrate: 120.0, expected: 128.0, power: 3300.0, temp: 68.0, fan: 4500.0,
|
||||
worker: "blueflare.s19kpro", mining: true },
|
||||
Board { ip: "10.255.1.149", model: "Antminer S21 Pro", firmware: "Stock",
|
||||
worker: "blueflare.s19kpro", mining: true, paused: false },
|
||||
Board { ip: "10.255.1.149", make: "Antminer", model_id: "S21Pro", board: "CVITek", firmware: "ePIC", fw_version: "1.0.3",
|
||||
hashrate: 60.0, expected: 200.0, power: 1500.0, temp: 55.0, fan: 3000.0,
|
||||
worker: "blueflare.s21pro", mining: true }, // slow: 60/200 = 30%
|
||||
Board { ip: "10.255.1.126", model: "WhatsMiner M30S", firmware: "WMOS H3",
|
||||
worker: "blueflare.s21pro", mining: true, paused: false }, // slow: 60/200 = 30%
|
||||
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 },
|
||||
Board { ip: "10.255.1.131", model: "WhatsMiner M30S+", firmware: "WMOS H616",
|
||||
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",
|
||||
hashrate: 100.0, expected: 100.0, power: 3450.0, temp: 71.0, fan: 4900.0,
|
||||
worker: "blueflare.h616", mining: true },
|
||||
Board { ip: "10.255.1.148", model: "WhatsMiner M50", firmware: "WMOS CB4",
|
||||
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",
|
||||
hashrate: 118.0, expected: 122.0, power: 3300.0, temp: 66.0, fan: 4600.0,
|
||||
worker: "blueflare.m50", mining: true },
|
||||
Board { ip: "10.255.1.115", model: "Antminer S19", firmware: "WardenOS dev",
|
||||
worker: "blueflare.m50", mining: true, paused: false },
|
||||
// Rebucketed from idle/not-hashing to paused so the "paused"
|
||||
// status/KPI bucket is exercisable in the fake-scan/offline demo.
|
||||
Board { ip: "10.255.1.115", make: "Antminer", model_id: "S19", board: "BeagleBoneBlack", firmware: "Alkane", fw_version: "0.1",
|
||||
hashrate: 0.0, expected: 0.0, power: 0.0, temp: 0.0, fan: 0.0,
|
||||
worker: "", mining: false },
|
||||
worker: "", mining: false, paused: true },
|
||||
];
|
||||
boards.into_iter().map(Board::into_row).collect()
|
||||
}
|
||||
|
||||
@@ -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"]),
|
||||
];
|
||||
@@ -0,0 +1,264 @@
|
||||
//! 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.
|
||||
//!
|
||||
//! 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.
|
||||
//!
|
||||
//! 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.
|
||||
|
||||
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.
|
||||
const MAX_LOG_BYTES: usize = 256 * 1024;
|
||||
|
||||
/// A fetched log plus the signals a regex pass pulled out of it.
|
||||
pub struct LogScan {
|
||||
/// The (possibly tail-trimmed) log text for the viewer.
|
||||
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 })
|
||||
}
|
||||
|
||||
/// Keep the last `max` bytes of `s` (a log's tail is the freshest), on a line
|
||||
/// boundary, with a marker when trimmed.
|
||||
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);
|
||||
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:?}");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn tail_trims_on_line_boundary() {
|
||||
let log = "aaaa\nbbbb\ncccc\n";
|
||||
let t = tail(log, 6);
|
||||
assert!(t.starts_with("[... earlier log trimmed ...]"), "{t}");
|
||||
assert!(t.ends_with("cccc\n"));
|
||||
}
|
||||
}
|
||||
@@ -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();
|
||||
}
|
||||
}
|
||||
@@ -1,8 +1,18 @@
|
||||
//! alkane-toolkit — primary view (docs/UI-SPEC.md).
|
||||
//! Pure-Rust wxWidgets app on the vendored, patched wx-rs.
|
||||
|
||||
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;
|
||||
|
||||
@@ -16,6 +26,52 @@ fn main() {
|
||||
std::process::exit(run_selftest());
|
||||
}
|
||||
|
||||
// Headless access-probe check: `ALKANE_ACCESS_PROBE="<ip> <make>"` prints the
|
||||
// lock state the real access probe computes (no GUI, no wx), so the WhatsMiner
|
||||
// :4028 token check and the Antminer digest check can be verified directly.
|
||||
if let Some(spec) = std::env::var_os("ALKANE_ACCESS_PROBE") {
|
||||
let spec = spec.to_string_lossy();
|
||||
let mut it = spec.split_whitespace();
|
||||
let ip = it.next().unwrap_or("");
|
||||
let make = it.next().unwrap_or("");
|
||||
let (user, pass) = credentials::load_credentials().unwrap_or_default();
|
||||
match access_probe::probe_access(ip, make, &user, &pass) {
|
||||
Ok(Some(true)) => println!("ACCESS {ip} {make}: LOCKED"),
|
||||
Ok(Some(false)) => println!("ACCESS {ip} {make}: UNLOCKED"),
|
||||
Ok(None) => println!("ACCESS {ip} {make}: INDETERMINATE"),
|
||||
Err(e) => println!("ACCESS {ip} {make}: ERROR {e}"),
|
||||
}
|
||||
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.
|
||||
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}"),
|
||||
}
|
||||
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.
|
||||
|
||||
@@ -0,0 +1,413 @@
|
||||
//! Display-layer device-naming cleanup (round-9 item #11).
|
||||
//!
|
||||
//! asic-rs hands us compact Rust-identifier model strings and bare control-board
|
||||
//! names, not human-facing labels:
|
||||
//! - `device_info.make` = "Antminer" / "Whatsminer" (note the casing)
|
||||
//! - `device_info.model` = the model enum's variant identifier verbatim, e.g.
|
||||
//! "S19KPro", "S19jPro", "M30SPlusVE40", "M30SPlusPlusVE40" -- no spaces,
|
||||
//! "+" rendered "Plus", "++" rendered "PlusPlus", the WhatsMiner version
|
||||
//! block ("VE40") baked in.
|
||||
//! - `control_board_version` = a bare board name ("Xilinx", "CVITek",
|
||||
//! "AMLogic", "BeagleBoneBlack"; WhatsMiner "H3"/"H6"/"H6OS"/"H616").
|
||||
//!
|
||||
//! This module turns those into the Brand / Model / Submodel / control-board
|
||||
//! short code the table shows. It is a pure string transform -- no asic-rs edit
|
||||
//! -- so it stays a build-on-top layer over the vendored crate.
|
||||
//!
|
||||
//! Known limitations (asic-rs does not expose the data):
|
||||
//! - Antminer has no hashboard-type/submodel over the network, so Submodel is
|
||||
//! blank for Antminer (only WhatsMiner's version block is recoverable).
|
||||
//! - asic-rs reports only "AMLogic" (not the 120mm C76 vs 140mm CBE board) and
|
||||
//! only "Xilinx" (not C49 vs C55); we disambiguate by model family as a
|
||||
//! best-effort heuristic documented at `control_board_code`.
|
||||
|
||||
/// Human brand from asic-rs `device_info.make`.
|
||||
pub fn brand(make: &str) -> String {
|
||||
match make.trim().to_ascii_lowercase().as_str() {
|
||||
"antminer" => "Antminer".to_string(),
|
||||
"whatsminer" => "WhatsMiner".to_string(),
|
||||
"" => String::new(),
|
||||
other => {
|
||||
// Title-case an unknown make so the Brand column still reads well.
|
||||
let mut c = other.chars();
|
||||
match c.next() {
|
||||
Some(f) => f.to_ascii_uppercase().to_string() + c.as_str(),
|
||||
None => String::new(),
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn is_whatsminer(make: &str) -> bool {
|
||||
make.trim().eq_ignore_ascii_case("whatsminer")
|
||||
}
|
||||
|
||||
fn is_antminer(make: &str) -> bool {
|
||||
make.trim().eq_ignore_ascii_case("antminer")
|
||||
}
|
||||
|
||||
/// Split asic-rs's firmware family string into the family shown in the Firmware
|
||||
/// column and an optional vendor prefix that moves into the FW Version column
|
||||
/// (round 11 #6). asic-rs reports stock firmware as "AntMiner Stock" /
|
||||
/// "WhatsMiner Stock"; the Firmware column should read just "Stock" (so it
|
||||
/// colours as the neutral/default family), and the vendor word belongs with the
|
||||
/// version. Aftermarket families ("VNish", "Braiins", ...) carry no vendor
|
||||
/// prefix and pass through unchanged.
|
||||
pub fn firmware_family(raw: &str) -> (String, Option<String>) {
|
||||
let trimmed = raw.trim();
|
||||
// Vendor prefixes asic-rs prepends on stock-firmware family strings, matched
|
||||
// case-insensitively.
|
||||
for vendor in ["AntMiner", "WhatsMiner"] {
|
||||
if trimmed.len() > vendor.len() && trimmed[..vendor.len()].eq_ignore_ascii_case(vendor) {
|
||||
let rest = trimmed[vendor.len()..].trim();
|
||||
if !rest.is_empty() {
|
||||
return (rest.to_string(), Some(vendor.to_string()));
|
||||
}
|
||||
}
|
||||
}
|
||||
(trimmed.to_string(), None)
|
||||
}
|
||||
|
||||
/// Whether a miner is liquid-cooled (hydro / water / immersion) rather than
|
||||
/// air-cooled, inferred from the model name (round 11 #17). asic-rs exposes no
|
||||
/// cooling-type field, so this is a best-effort model-string heuristic: it
|
||||
/// decides whether a reported "fluid" temperature is a real coolant reading or
|
||||
/// (for air-cooled units) the ambient/environment temperature.
|
||||
pub fn is_liquid_cooled(model: &str) -> bool {
|
||||
let m = model.to_ascii_lowercase();
|
||||
m.contains("hydro") || m.contains("immers") || m.contains("water")
|
||||
}
|
||||
|
||||
/// The human model name for the Model column: brand dropped (it has its own
|
||||
/// column), family-letter suffix lowercased, word suffixes spaced, "+"/"++" for
|
||||
/// Plus/PlusPlus, and (WhatsMiner) the trailing version block moved to Submodel.
|
||||
pub fn clean_model(make: &str, model_id: &str) -> String {
|
||||
let id = model_id.trim();
|
||||
if id.is_empty() {
|
||||
return String::new();
|
||||
}
|
||||
if is_whatsminer(make) {
|
||||
clean_whatsminer(id).0
|
||||
} else if is_antminer(make) {
|
||||
clean_antminer(id)
|
||||
} else {
|
||||
id.to_string()
|
||||
}
|
||||
}
|
||||
|
||||
/// 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 {
|
||||
if is_whatsminer(make) {
|
||||
clean_whatsminer(model_id.trim()).1
|
||||
} else {
|
||||
String::new()
|
||||
}
|
||||
}
|
||||
|
||||
/// Split a WhatsMiner identifier into (clean model, version submodel). The
|
||||
/// version block is the trailing run beginning at the first 'V' (WhatsMiner
|
||||
/// tiers never contain a 'V', so the first 'V' always starts the version). The
|
||||
/// prefix's Plus/PlusPlus become +/++.
|
||||
fn clean_whatsminer(id: &str) -> (String, String) {
|
||||
let (prefix, version) = match id.find('V') {
|
||||
Some(i) => (&id[..i], id[i..].to_string()),
|
||||
None => (id, String::new()),
|
||||
};
|
||||
let model = prefix.replace("PlusPlus", "++").replace("Plus", "+");
|
||||
(model, version)
|
||||
}
|
||||
|
||||
/// Known Antminer word-suffixes, longest-first so "PlusPlus" wins over "Plus"
|
||||
/// and "NoPIC" is matched whole. Each maps to its spaced display form.
|
||||
const ANT_SUFFIXES: &[(&str, &str)] = &[
|
||||
("PlusPlus", "++"),
|
||||
("Plus", "+"),
|
||||
("NoPIC", " NoPIC"),
|
||||
("Hydro", " Hydro"),
|
||||
("Pro", " Pro"),
|
||||
("XP", " XP"),
|
||||
];
|
||||
|
||||
/// Clean an Antminer identifier, e.g. "S19KPro" -> "S19k Pro", "S21eXPHydro" ->
|
||||
/// "S21e XP Hydro", "L3PlusPlus" -> "L3++". Unknown/odd inputs pass through.
|
||||
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
|
||||
};
|
||||
let bytes = id.as_bytes();
|
||||
// Base = leading letters then digits ("S19", "KS5", "L3", "Z15"). Without a
|
||||
// letter+digit base (e.g. an Unknown passthrough), return the id unchanged.
|
||||
let mut i = 0;
|
||||
while i < bytes.len() && bytes[i].is_ascii_alphabetic() {
|
||||
i += 1;
|
||||
}
|
||||
let letters_end = i;
|
||||
while i < bytes.len() && bytes[i].is_ascii_digit() {
|
||||
i += 1;
|
||||
}
|
||||
if letters_end == 0 || i == letters_end {
|
||||
return id.to_string();
|
||||
}
|
||||
let mut out = String::from(&id[..i]);
|
||||
let mut rest = &id[i..];
|
||||
|
||||
// An optional single family letter directly after the digits (j/i/a/e/K/L),
|
||||
// recognised as "not the start of a known suffix". Lowercase it, keep it
|
||||
// attached to the base (no space): "S19K" -> "S19k".
|
||||
if let Some(first) = rest.chars().next() {
|
||||
let starts_suffix = ANT_SUFFIXES.iter().any(|(s, _)| rest.starts_with(s));
|
||||
if first.is_ascii_alphabetic() && !starts_suffix {
|
||||
out.push(first.to_ascii_lowercase());
|
||||
rest = &rest[first.len_utf8()..];
|
||||
}
|
||||
}
|
||||
|
||||
// Remaining suffix words, matched greedily against the known set.
|
||||
while !rest.is_empty() {
|
||||
match ANT_SUFFIXES.iter().find(|(s, _)| rest.starts_with(s)) {
|
||||
Some((s, disp)) => {
|
||||
out.push_str(disp);
|
||||
rest = &rest[s.len()..];
|
||||
}
|
||||
None => {
|
||||
// Unknown trailing token: emit it space-separated and stop.
|
||||
out.push(' ');
|
||||
out.push_str(rest.trim_start());
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
out
|
||||
}
|
||||
|
||||
/// Normalise a raw control-board name for matching: drop spaces/punctuation and
|
||||
/// uppercase, so "BeagleBone Black", "BeagleBoneBlack" and "BBB" all collapse.
|
||||
fn compact_upper(s: &str) -> String {
|
||||
s.chars().filter(|c| c.is_ascii_alphanumeric()).flat_map(|c| c.to_uppercase()).collect()
|
||||
}
|
||||
|
||||
/// The control-board short code for the Control-board column, e.g.
|
||||
/// "BeagleBoneBlack" -> "BBB (C77)", "Xilinx" on an S17 -> "XIL (C49)".
|
||||
///
|
||||
/// asic-rs reports only the board FAMILY ("AMLogic"/"Xilinx"), never the exact
|
||||
/// Bitmain board number, so where a family spans two boards we disambiguate by
|
||||
/// 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);
|
||||
if code.is_empty() {
|
||||
cpu
|
||||
} else {
|
||||
format!("{cpu} ({code})")
|
||||
}
|
||||
}
|
||||
|
||||
/// The control-board CPU family short code alone ("AML", "CVI", "BBB", "XIL",
|
||||
/// WhatsMiner "H3"/"H6"/"H6os"/"H616", or the raw name if unrecognised).
|
||||
pub fn control_board_cpu(make: &str, board_name: &str, clean_model: &str) -> String {
|
||||
control_board_split(make, board_name, clean_model).0
|
||||
}
|
||||
|
||||
/// The Bitmain board code alone ("C77"/"C88"/"C49"/"C55"/"C76"/"CBE";
|
||||
/// WhatsMiner "CB2"/"CB4"/"CB6"), or "" when unknown.
|
||||
pub fn control_board_board(make: &str, board_name: &str, clean_model: &str) -> String {
|
||||
control_board_split(make, board_name, clean_model).1
|
||||
}
|
||||
|
||||
/// Split a raw control-board name into (CPU family short code, Bitmain board
|
||||
/// code). asic-rs reports only the board FAMILY ("AMLogic"/"Xilinx"), never the
|
||||
/// exact board number, so where a family spans two boards we disambiguate by
|
||||
/// model era/class (best-effort):
|
||||
/// - Xilinx: S17/T17-era -> C49, otherwise (S19-era) -> C55.
|
||||
/// - AMLogic: XP-class / S19k / S21 (140mm fans) -> CBE, otherwise 120mm C76.
|
||||
fn control_board_split(make: &str, board_name: &str, clean_model: &str) -> (String, String) {
|
||||
let raw = board_name.trim();
|
||||
if raw.is_empty() {
|
||||
return (String::new(), String::new());
|
||||
}
|
||||
// asic-rs renders an unrecognised board as "Unknown: <raw>"; surface it in
|
||||
// the CPU part with no code.
|
||||
if raw.starts_with("Unknown") {
|
||||
return (raw.to_string(), String::new());
|
||||
}
|
||||
let key = compact_upper(raw);
|
||||
let pair = |cpu: &str, code: &str| (cpu.to_string(), code.to_string());
|
||||
|
||||
if is_whatsminer(make) {
|
||||
return match key.as_str() {
|
||||
"H3" => pair("H3", "CB2"),
|
||||
"H6" => pair("H6", "CB4"),
|
||||
"H6OS" => pair("H6os", "CB4"),
|
||||
"H616" => pair("H616", "CB6"),
|
||||
_ => (raw.to_string(), String::new()),
|
||||
};
|
||||
}
|
||||
|
||||
// Antminer (and any make that reports these families).
|
||||
match key.as_str() {
|
||||
"BEAGLEBONEBLACK" | "BBB" | "BB" | "BEAGLEBONE" => pair("BBB", "C77"),
|
||||
"CVITEK" | "CVI" => pair("CVI", "C88"),
|
||||
"XILINX" | "XIL" => {
|
||||
if is_s17_era(clean_model) {
|
||||
pair("XIL", "C49")
|
||||
} else {
|
||||
pair("XIL", "C55")
|
||||
}
|
||||
}
|
||||
"AMLOGIC" | "AML" => {
|
||||
if is_aml_140mm(clean_model) {
|
||||
pair("AML", "CBE")
|
||||
} else {
|
||||
pair("AML", "C76")
|
||||
}
|
||||
}
|
||||
_ => (raw.to_string(), String::new()),
|
||||
}
|
||||
}
|
||||
|
||||
/// S17/T17-era models use the Xilinx C49 control board.
|
||||
fn is_s17_era(clean_model: &str) -> bool {
|
||||
let m = clean_model.trim_start();
|
||||
m.starts_with("S17") || m.starts_with("T17")
|
||||
}
|
||||
|
||||
/// Best-effort: the 140mm-fan AMLogic board (CBE) is used on the XP-class, the
|
||||
/// 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 {
|
||||
let m = clean_model.trim_start();
|
||||
m.contains("XP") || m.starts_with("S19k") || m.starts_with("S21")
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn brand_normalises_case() {
|
||||
assert_eq!(brand("Antminer"), "Antminer");
|
||||
assert_eq!(brand("Whatsminer"), "WhatsMiner");
|
||||
assert_eq!(brand("whatsminer"), "WhatsMiner");
|
||||
assert_eq!(brand(""), "");
|
||||
assert_eq!(brand("avalonminer"), "Avalonminer");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn antminer_model_cleanup() {
|
||||
// The headline example from the spec.
|
||||
assert_eq!(clean_model("Antminer", "S19KPro"), "S19k Pro");
|
||||
assert_eq!(clean_model("Antminer", "S19jPro"), "S19j Pro");
|
||||
assert_eq!(clean_model("Antminer", "S21Pro"), "S21 Pro");
|
||||
assert_eq!(clean_model("Antminer", "S19"), "S19");
|
||||
assert_eq!(clean_model("Antminer", "S19XP"), "S19 XP");
|
||||
assert_eq!(clean_model("Antminer", "S19jXP"), "S19j XP");
|
||||
assert_eq!(clean_model("Antminer", "S19Plus"), "S19+");
|
||||
assert_eq!(clean_model("Antminer", "S19ProPlus"), "S19 Pro+");
|
||||
assert_eq!(clean_model("Antminer", "S19jProPlus"), "S19j Pro+");
|
||||
assert_eq!(clean_model("Antminer", "S19ProPlusHydro"), "S19 Pro+ Hydro");
|
||||
assert_eq!(clean_model("Antminer", "S19jNoPIC"), "S19j NoPIC");
|
||||
assert_eq!(clean_model("Antminer", "S21PlusPlus"), "S21++");
|
||||
assert_eq!(clean_model("Antminer", "S21eXPHydro"), "S21e XP Hydro");
|
||||
assert_eq!(clean_model("Antminer", "L3PlusPlus"), "L3++");
|
||||
assert_eq!(clean_model("Antminer", "KS5Pro"), "KS5 Pro");
|
||||
assert_eq!(clean_model("Antminer", "Z15Pro"), "Z15 Pro");
|
||||
assert_eq!(clean_model("Antminer", "S9i"), "S9i");
|
||||
assert_eq!(clean_model("Antminer", "S17e"), "S17e");
|
||||
assert_eq!(clean_model("Antminer", "S19a"), "S19a");
|
||||
assert_eq!(clean_model("Antminer", "S19aPro"), "S19a Pro");
|
||||
// asic-rs Unknown passthrough carrying the raw vendor string (a NoPIC
|
||||
// S19 seen live at 10.4.x): drop the redundant brand, keep the rest.
|
||||
assert_eq!(clean_model("Antminer", "ANTMINER S19 (88)"), "S19 (88)");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn whatsminer_model_and_submodel() {
|
||||
assert_eq!(clean_model("Whatsminer", "M30SPlusVE40"), "M30S+");
|
||||
assert_eq!(submodel("Whatsminer", "M30SPlusVE40"), "VE40");
|
||||
assert_eq!(clean_model("Whatsminer", "M30SPlusPlusVE40"), "M30S++");
|
||||
assert_eq!(submodel("Whatsminer", "M30SPlusPlusVE40"), "VE40");
|
||||
assert_eq!(clean_model("Whatsminer", "M30SVE40"), "M30S");
|
||||
assert_eq!(submodel("Whatsminer", "M30SVE40"), "VE40");
|
||||
assert_eq!(clean_model("Whatsminer", "M20S"), "M20S");
|
||||
assert_eq!(submodel("Whatsminer", "M20S"), "");
|
||||
assert_eq!(clean_model("Whatsminer", "M50S++VK30"), "M50S++");
|
||||
assert_eq!(submodel("Whatsminer", "M50S++VK30"), "VK30");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn antminer_has_no_submodel() {
|
||||
assert_eq!(submodel("Antminer", "S19KPro"), "");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn control_board_short_codes() {
|
||||
// Antminer families (board name as asic-rs renders the enum variant).
|
||||
assert_eq!(control_board_code("Antminer", "BeagleBoneBlack", "S19"), "BBB (C77)");
|
||||
// Also accept the spaced form some layers produce.
|
||||
assert_eq!(control_board_code("Antminer", "BeagleBone Black", "S19"), "BBB (C77)");
|
||||
assert_eq!(control_board_code("Antminer", "CVITek", "S21 Pro"), "CVI (C88)");
|
||||
assert_eq!(control_board_code("Antminer", "Xilinx", "S17 Pro"), "XIL (C49)");
|
||||
assert_eq!(control_board_code("Antminer", "Xilinx", "T17"), "XIL (C49)");
|
||||
assert_eq!(control_board_code("Antminer", "Xilinx", "S19 Pro"), "XIL (C55)");
|
||||
assert_eq!(control_board_code("Antminer", "AMLogic", "S19j Pro"), "AML (C76)");
|
||||
assert_eq!(control_board_code("Antminer", "AMLogic", "S19k Pro"), "AML (CBE)");
|
||||
assert_eq!(control_board_code("Antminer", "AMLogic", "S19 XP"), "AML (CBE)");
|
||||
// WhatsMiner families.
|
||||
assert_eq!(control_board_code("Whatsminer", "H3", "M30S"), "H3 (CB2)");
|
||||
assert_eq!(control_board_code("Whatsminer", "H6", "M50"), "H6 (CB4)");
|
||||
assert_eq!(control_board_code("Whatsminer", "H6OS", "M50"), "H6os (CB4)");
|
||||
assert_eq!(control_board_code("Whatsminer", "H616", "M30S+"), "H616 (CB6)");
|
||||
// Unknown / blank pass through.
|
||||
assert_eq!(control_board_code("Antminer", "Unknown: FOO", "S19"), "Unknown: FOO");
|
||||
assert_eq!(control_board_code("Antminer", "", "S19"), "");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn control_board_cpu_and_board_split() {
|
||||
// CPU column vs board-code column.
|
||||
assert_eq!(control_board_cpu("Antminer", "AMLogic", "S19j Pro"), "AML");
|
||||
assert_eq!(control_board_board("Antminer", "AMLogic", "S19j Pro"), "C76");
|
||||
assert_eq!(control_board_cpu("Antminer", "CVITek", "S21 Pro"), "CVI");
|
||||
assert_eq!(control_board_board("Antminer", "CVITek", "S21 Pro"), "C88");
|
||||
assert_eq!(control_board_cpu("Whatsminer", "H616", "M30S+"), "H616");
|
||||
assert_eq!(control_board_board("Whatsminer", "H616", "M30S+"), "CB6");
|
||||
// S21 Pro on an AMLogic board is the 140mm CBE, not C76.
|
||||
assert_eq!(control_board_board("Antminer", "AMLogic", "S21 Pro"), "CBE");
|
||||
assert_eq!(control_board_code("Antminer", "AMLogic", "S21 Pro"), "AML (CBE)");
|
||||
// Unknown -> cpu holds the raw string, no board code.
|
||||
assert_eq!(control_board_cpu("Antminer", "Unknown: FOO", "S19"), "Unknown: FOO");
|
||||
assert_eq!(control_board_board("Antminer", "Unknown: FOO", "S19"), "");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn firmware_family_splits_vendor_prefix() {
|
||||
// Stock firmware: vendor word moves out of the family word (round 11 #6).
|
||||
assert_eq!(firmware_family("AntMiner Stock"), ("Stock".to_string(), Some("AntMiner".to_string())));
|
||||
assert_eq!(
|
||||
firmware_family("WhatsMiner Stock"),
|
||||
("Stock".to_string(), Some("WhatsMiner".to_string()))
|
||||
);
|
||||
// Aftermarket families pass through with no vendor prefix.
|
||||
assert_eq!(firmware_family("VNish"), ("VNish".to_string(), None));
|
||||
assert_eq!(firmware_family("Braiins"), ("Braiins".to_string(), None));
|
||||
// A bare vendor word with nothing after it is left as-is (not emptied).
|
||||
assert_eq!(firmware_family("AntMiner"), ("AntMiner".to_string(), None));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn liquid_cooling_detection() {
|
||||
assert!(is_liquid_cooled("S21 XP Hydro"));
|
||||
assert!(is_liquid_cooled("Antminer S19 Hydro"));
|
||||
assert!(is_liquid_cooled("M53 immersion"));
|
||||
assert!(!is_liquid_cooled("S21 Pro"));
|
||||
assert!(!is_liquid_cooled("M30S++"));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,131 @@
|
||||
//! Dropdown presets + user-saved values for the Configure-pools dialog (round 15
|
||||
//! #1). Each pool field (address / account / worker / password) has a "+" menu
|
||||
//! offering built-in presets (pool stratums, worker placeholders) plus values the
|
||||
//! user has saved, and the user can add the current box value to the saved list.
|
||||
//! Saved lists persist one-per-line under the config dir.
|
||||
|
||||
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()
|
||||
}
|
||||
|
||||
/// Add `value` to `field`'s saved list (deduplicated, no-op if empty/already
|
||||
/// present or already a preset). Returns true if it was newly added.
|
||||
pub fn add_saved(field: PoolField, value: &str) -> bool {
|
||||
let value = value.trim();
|
||||
if value.is_empty() {
|
||||
return false;
|
||||
}
|
||||
if field.presets().iter().any(|p| *p == value) {
|
||||
return false;
|
||||
}
|
||||
let mut saved = load_saved(field);
|
||||
if saved.iter().any(|s| s == value) {
|
||||
return false;
|
||||
}
|
||||
saved.push(value.to_string());
|
||||
let p = config_path(field.saved_file());
|
||||
if let Some(dir) = p.parent() {
|
||||
let _ = std::fs::create_dir_all(dir);
|
||||
}
|
||||
let _ = std::fs::write(p, saved.join("\n"));
|
||||
true
|
||||
}
|
||||
|
||||
/// Remove `value` from `field`'s saved list (round 16 #5). Returns true if it was
|
||||
/// present and removed. Presets cannot be removed (they are not in the saved file).
|
||||
pub fn remove_saved(field: PoolField, value: &str) -> bool {
|
||||
let value = value.trim();
|
||||
let mut saved = load_saved(field);
|
||||
let before = saved.len();
|
||||
saved.retain(|s| s != value);
|
||||
if saved.len() == before {
|
||||
return false;
|
||||
}
|
||||
let p = config_path(field.saved_file());
|
||||
let _ = std::fs::write(p, saved.join("\n"));
|
||||
true
|
||||
}
|
||||
|
||||
/// 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
|
||||
}
|
||||
@@ -0,0 +1,156 @@
|
||||
//! Saved view presets: named snapshots of the table's column arrangement,
|
||||
//! visibility, sort, and filters. Persisted as JSON in the config dir. The
|
||||
//! first preset is always a built-in "Default" profile.
|
||||
|
||||
use std::collections::{HashMap, HashSet};
|
||||
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
use crate::model::{ColFilter, Column, ViewState, ALL_COLUMNS};
|
||||
use crate::scan::config_path;
|
||||
|
||||
pub const PRESETS_FILE: &str = "presets.json";
|
||||
|
||||
/// The built-in default profile's visible columns, in display order (Ip first):
|
||||
/// 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; 10] = [
|
||||
Column::Ip,
|
||||
Column::Model,
|
||||
Column::Health,
|
||||
Column::Hashrate,
|
||||
Column::Power,
|
||||
Column::ChipTemp,
|
||||
Column::Firmware,
|
||||
Column::Cpu,
|
||||
Column::Locked,
|
||||
Column::Light,
|
||||
];
|
||||
|
||||
/// A serializable snapshot of a `ViewState` (Vec-based so JSON has no map keys
|
||||
/// that are enums, and column order within `visible` is preserved).
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct PresetView {
|
||||
pub order: Vec<Column>,
|
||||
pub visible: Vec<Column>,
|
||||
pub sort: Option<(Column, bool)>,
|
||||
pub filters: Vec<(Column, ColFilter)>,
|
||||
}
|
||||
|
||||
impl PresetView {
|
||||
pub fn from_view(v: &ViewState) -> PresetView {
|
||||
PresetView {
|
||||
order: v.order.clone(),
|
||||
// keep the visible columns in display order for stability
|
||||
visible: v.order.iter().copied().filter(|c| v.visible.contains(c)).collect(),
|
||||
sort: v.sort,
|
||||
filters: v.filters.iter().map(|(k, f)| (*k, f.clone())).collect(),
|
||||
}
|
||||
}
|
||||
|
||||
/// Rebuild a `ViewState` from this snapshot. Any column missing from a
|
||||
/// loaded (possibly older) preset is appended to `order` and left hidden, so
|
||||
/// the result always covers every `Column`.
|
||||
pub fn to_view(&self) -> ViewState {
|
||||
let mut order = self.order.clone();
|
||||
for c in ALL_COLUMNS {
|
||||
if !order.contains(&c) {
|
||||
order.push(c);
|
||||
}
|
||||
}
|
||||
let mut visible: HashSet<Column> = self.visible.iter().copied().collect();
|
||||
visible.insert(Column::Ip); // IP is always shown
|
||||
let filters: HashMap<Column, ColFilter> = self.filters.iter().cloned().collect();
|
||||
ViewState { order, visible, sort: self.sort, filters }
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct Preset {
|
||||
pub name: String,
|
||||
pub view: PresetView,
|
||||
}
|
||||
|
||||
/// The built-in default profile (always present as the first preset).
|
||||
pub fn default_preset() -> Preset {
|
||||
let mut order: Vec<Column> = DEFAULT_PROFILE.to_vec();
|
||||
for c in ALL_COLUMNS {
|
||||
if !order.contains(&c) {
|
||||
order.push(c);
|
||||
}
|
||||
}
|
||||
Preset {
|
||||
name: "Default".to_string(),
|
||||
view: PresetView {
|
||||
order,
|
||||
visible: DEFAULT_PROFILE.to_vec(),
|
||||
sort: None,
|
||||
filters: Vec::new(),
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
/// Load saved presets, always with the built-in "Default" first. A missing or
|
||||
/// unreadable file yields just the default.
|
||||
pub fn load_presets() -> Vec<Preset> {
|
||||
let mut presets = std::fs::read_to_string(config_path(PRESETS_FILE))
|
||||
.ok()
|
||||
.and_then(|s| serde_json::from_str::<Vec<Preset>>(&s).ok())
|
||||
.unwrap_or_default();
|
||||
// The default profile is always present and always first.
|
||||
presets.retain(|p| p.name != "Default");
|
||||
presets.insert(0, default_preset());
|
||||
presets
|
||||
}
|
||||
|
||||
/// Persist presets (the built-in "Default" is not written; it is re-seeded on
|
||||
/// load). Best-effort: errors are returned for the caller to surface.
|
||||
pub fn save_presets(presets: &[Preset]) -> std::io::Result<()> {
|
||||
let p = config_path(PRESETS_FILE);
|
||||
if let Some(dir) = p.parent() {
|
||||
std::fs::create_dir_all(dir)?;
|
||||
}
|
||||
let user: Vec<&Preset> = presets.iter().filter(|p| p.name != "Default").collect();
|
||||
let json = serde_json::to_string_pretty(&user)
|
||||
.map_err(|e| std::io::Error::new(std::io::ErrorKind::InvalidData, e))?;
|
||||
std::fs::write(p, json)
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn default_preset_round_trips_through_view() {
|
||||
let p = default_preset();
|
||||
let view = p.view.to_view();
|
||||
// IP first + the requested default columns visible.
|
||||
assert!(view.visible.contains(&Column::Ip));
|
||||
assert!(view.visible.contains(&Column::Model));
|
||||
assert!(view.visible.contains(&Column::Health));
|
||||
assert!(view.visible.contains(&Column::Cpu));
|
||||
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");
|
||||
// to_view covers every column in `order`.
|
||||
assert_eq!(view.order.len(), ALL_COLUMNS.len());
|
||||
// Round-trip a snapshot back out.
|
||||
let snap = PresetView::from_view(&view);
|
||||
assert_eq!(snap.visible.first(), Some(&Column::Ip));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn preset_json_round_trip() {
|
||||
let p = default_preset();
|
||||
let json = serde_json::to_string(&vec![&p]).unwrap();
|
||||
let back: Vec<Preset> = serde_json::from_str(&json).unwrap();
|
||||
assert_eq!(back.len(), 1);
|
||||
assert_eq!(back[0].name, "Default");
|
||||
assert_eq!(back[0].view.visible, DEFAULT_PROFILE.to_vec());
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,282 @@
|
||||
//! Restore an aftermarket-firmware miner to stock (round 12 #8a).
|
||||
//!
|
||||
//! All three supported aftermarket firmwares ship a free, self-restoring revert
|
||||
//! (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>"}
|
||||
//! - Braiins: SSH `uninstall.sh` (re-flashes the on-NAND stock backup)
|
||||
//!
|
||||
//! DESTRUCTIVE: this removes the running aftermarket firmware and reboots the
|
||||
//! miner to stock. It is gated behind a typed confirmation in the UI and runs on
|
||||
//! a background thread so the reboot latency never blocks the event loop. The
|
||||
//! flows are documented + live-confirmed in the miner-firmware wiki
|
||||
//! (40-boot-os-and-build/firmware-install-remove-api and siblings).
|
||||
|
||||
use std::io::{Read, Write};
|
||||
use std::net::{SocketAddr, TcpStream};
|
||||
use std::process::Command;
|
||||
use std::sync::Arc;
|
||||
use std::sync::atomic::{AtomicBool, Ordering};
|
||||
use std::sync::mpsc::{Receiver, channel};
|
||||
use std::time::Duration;
|
||||
|
||||
use crate::scan::fake_scan_enabled;
|
||||
|
||||
pub enum RestoreMsg {
|
||||
Started { total: usize },
|
||||
Result { ip: String, ok: bool, detail: String },
|
||||
Done { total: usize },
|
||||
}
|
||||
|
||||
pub struct RestoreHandle {
|
||||
pub rx: Receiver<RestoreMsg>,
|
||||
cancel: Arc<AtomicBool>,
|
||||
}
|
||||
|
||||
impl RestoreHandle {
|
||||
pub fn stop(&self) {
|
||||
self.cancel.store(true, Ordering::Relaxed);
|
||||
}
|
||||
}
|
||||
|
||||
/// One miner to restore: its IP plus the firmware family ("VNish"/"LuxOS"/
|
||||
/// "Braiins") that selects the revert flow.
|
||||
pub struct RestoreTarget {
|
||||
pub ip: String,
|
||||
pub firmware: String,
|
||||
}
|
||||
|
||||
/// Start restoring the given miners to stock on a background thread. `vnish_pass`
|
||||
/// is the VNish web password; `ssh_user`/`ssh_pass` drive the Braiins SSH revert.
|
||||
pub fn start_restore(
|
||||
targets: Vec<RestoreTarget>,
|
||||
vnish_pass: String,
|
||||
ssh_user: String,
|
||||
ssh_pass: String,
|
||||
) -> 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 });
|
||||
for t in targets {
|
||||
let _ = tx.send(RestoreMsg::Result {
|
||||
ip: t.ip,
|
||||
ok: true,
|
||||
detail: "restored to stock (demo)".into(),
|
||||
});
|
||||
}
|
||||
let _ = tx.send(RestoreMsg::Done { total });
|
||||
return RestoreHandle { rx, cancel };
|
||||
}
|
||||
|
||||
let tc = cancel.clone();
|
||||
let _ = std::thread::Builder::new()
|
||||
.name("restore-stock".into())
|
||||
.spawn(move || {
|
||||
let _ = tx.send(RestoreMsg::Started { total });
|
||||
for t in targets {
|
||||
if tc.load(Ordering::Relaxed) {
|
||||
break;
|
||||
}
|
||||
let (ok, detail) = restore_one(&t, &vnish_pass, &ssh_user, &ssh_pass);
|
||||
if tx.send(RestoreMsg::Result { ip: t.ip, ok, detail }).is_err() {
|
||||
return;
|
||||
}
|
||||
}
|
||||
let _ = tx.send(RestoreMsg::Done { total });
|
||||
});
|
||||
RestoreHandle { rx, cancel }
|
||||
}
|
||||
|
||||
fn restore_one(t: &RestoreTarget, vnish_pass: &str, ssh_user: &str, ssh_pass: &str) -> (bool, String) {
|
||||
let fw = t.firmware.to_ascii_lowercase();
|
||||
if fw.contains("vnish") || fw.contains("wildrose") || fw.contains("anthill") {
|
||||
restore_vnish(&t.ip, vnish_pass)
|
||||
} else if fw.contains("lux") {
|
||||
restore_luxos(&t.ip)
|
||||
} else if fw.contains("braiins") || fw.contains("bos") {
|
||||
restore_braiins(&t.ip, ssh_user, ssh_pass)
|
||||
} else {
|
||||
(false, format!("no restore-to-stock path for firmware '{}'", t.firmware))
|
||||
}
|
||||
}
|
||||
|
||||
/// 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"),
|
||||
]) {
|
||||
Ok(s) => s,
|
||||
Err(e) => return (false, format!("unlock request failed: {e}")),
|
||||
};
|
||||
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());
|
||||
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"),
|
||||
]) {
|
||||
// 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())),
|
||||
Err(e) => (false, format!("firmware/remove failed: {e}")),
|
||||
}
|
||||
}
|
||||
|
||||
/// LuxOS: credential-free luxminer session, then uninstallluxos (reboots to stock).
|
||||
fn restore_luxos(ip: &str) -> (bool, String) {
|
||||
let logon = match lux_rpc(ip, "{\"command\":\"logon\"}") {
|
||||
Ok(s) => s,
|
||||
Err(e) => return (false, format!("logon failed: {e}")),
|
||||
};
|
||||
let session = serde_json::from_str::<serde_json::Value>(&logon)
|
||||
.ok()
|
||||
.and_then(|v| {
|
||||
v.pointer("/SESSION/0/SessionID")
|
||||
.or_else(|| v.pointer("/Session/0/SessionID"))
|
||||
.and_then(|s| s.as_str())
|
||||
.map(str::to_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}\"}}");
|
||||
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())
|
||||
}
|
||||
Ok(resp) => (false, format!("uninstallluxos returned: {}", resp.trim())),
|
||||
Err(e) => (false, format!("uninstallluxos failed: {e}")),
|
||||
}
|
||||
}
|
||||
|
||||
/// Braiins: SSH `uninstall.sh` (re-flashes the retained on-NAND stock backup).
|
||||
fn restore_braiins(ip: &str, user: &str, pass: &str) -> (bool, String) {
|
||||
if pass.is_empty() {
|
||||
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.
|
||||
let mut cmd = Command::new("sshpass");
|
||||
cmd.arg("-p").arg(pass).arg("ssh");
|
||||
cmd.args([
|
||||
"-o", "StrictHostKeyChecking=no",
|
||||
"-o", "UserKnownHostsFile=/dev/null",
|
||||
"-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())
|
||||
}
|
||||
}
|
||||
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 {
|
||||
(false, format!("SSH uninstall failed: {e}"))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// 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}"))?;
|
||||
let t = Duration::from_secs(8);
|
||||
let mut s = TcpStream::connect_timeout(&addr, t).map_err(|e| e.to_string())?;
|
||||
s.set_read_timeout(Some(t)).ok();
|
||||
s.set_write_timeout(Some(t)).ok();
|
||||
s.write_all(payload.as_bytes()).map_err(|e| e.to_string())?;
|
||||
let mut buf = Vec::new();
|
||||
let mut chunk = [0u8; 4096];
|
||||
loop {
|
||||
match s.read(&mut chunk) {
|
||||
Ok(0) => break,
|
||||
Ok(n) => {
|
||||
buf.extend_from_slice(&chunk[..n]);
|
||||
if buf.len() > 1 << 16 {
|
||||
break;
|
||||
}
|
||||
}
|
||||
Err(_) => break,
|
||||
}
|
||||
}
|
||||
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())
|
||||
}
|
||||
|
||||
/// Run a command, capture stdout, with a hard wall-clock timeout.
|
||||
fn run_with_timeout(mut cmd: Command, timeout: Duration) -> Result<Vec<u8>, String> {
|
||||
cmd.stdout(std::process::Stdio::piped());
|
||||
cmd.stderr(std::process::Stdio::piped());
|
||||
let mut child = cmd.spawn().map_err(|e| format!("spawn: {e}"))?;
|
||||
let mut stdout = child.stdout.take().ok_or("no stdout")?;
|
||||
let reader = std::thread::spawn(move || {
|
||||
let mut b = Vec::new();
|
||||
let _ = stdout.read_to_end(&mut b);
|
||||
b
|
||||
});
|
||||
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 out = reader.join().unwrap_or_default();
|
||||
if timed_out && out.is_empty() {
|
||||
return Err("timed out".into());
|
||||
}
|
||||
Ok(out)
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn firmware_selects_the_right_flow() {
|
||||
// The dispatcher only recognises the three revertible aftermarket
|
||||
// families; anything else has no restore path.
|
||||
let mk = |fw: &str| RestoreTarget { ip: "0.0.0.0".into(), firmware: fw.into() };
|
||||
// Unknown firmware is rejected cleanly (no network attempt in the branch).
|
||||
let (ok, detail) = restore_one(&mk("Stock"), "", "", "");
|
||||
assert!(!ok);
|
||||
assert!(detail.contains("no restore-to-stock path"), "{detail}");
|
||||
}
|
||||
}
|
||||
@@ -20,7 +20,15 @@ vendor/ cargo-managed crate sources ONLY (regenerated by
|
||||
`cargo vendor vendor`; it deletes unmanaged dirs - never
|
||||
put hand-made trees here; learned the hard way)
|
||||
thirdparty/
|
||||
asic-rs lives in vendor/ (pure crates.io dep, cargo-vendored)
|
||||
asic-rs the vendored crates live in vendor/ (crates.io dep,
|
||||
VERSION cargo-vendored); this dir holds their patch queue:
|
||||
patches/ 0001 whatsminer set_power_limit error propagation (#4)
|
||||
refresh-checksums.py rewrites a vendored crate's .cargo-checksum.json
|
||||
after a patch (cargo verifies each file's SHA256)
|
||||
The committed vendor/ tree has the patches applied and the
|
||||
affected .cargo-checksum.json refreshed, so builds need
|
||||
nothing extra. On re-vendor, run
|
||||
scripts/apply-asic-rs-patches.sh to re-apply + refresh.
|
||||
wxwidgets/
|
||||
wxWidgets-3.3.3/ pristine release tree, never edited directly
|
||||
VERSION upstream version + tarball URL + sha256
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
#!/bin/bash
|
||||
# Re-apply the asic-rs patch queue to the cargo-vendored tree and refresh the
|
||||
# affected crates' .cargo-checksum.json. Run this after `cargo vendor vendor`
|
||||
# (which regenerates a pristine vendor/ and drops our edits). A normal build
|
||||
# does NOT need this -- the committed vendor/ tree already has the patches
|
||||
# applied and checksums refreshed; this is the re-vendoring recipe (ADR 0003).
|
||||
set -euo pipefail
|
||||
REPO=$(CDPATH= cd -- "$(dirname -- "$0")/.." && pwd)
|
||||
cd "$REPO"
|
||||
|
||||
PATCHES_DIR="thirdparty/asic-rs/patches"
|
||||
shopt -s nullglob
|
||||
patches=("$PATCHES_DIR"/*.patch)
|
||||
if [ ${#patches[@]} -eq 0 ]; then
|
||||
echo "no patches in $PATCHES_DIR"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
for p in "${patches[@]}"; do
|
||||
echo "== applying $p =="
|
||||
if git apply --check -p1 "$p" 2>/dev/null; then
|
||||
git apply -p1 "$p"
|
||||
elif git apply --check -p1 --reverse "$p" 2>/dev/null; then
|
||||
echo " (already applied -- skipping)"
|
||||
else
|
||||
echo "ERROR: $p does not apply cleanly; resolve manually." >&2
|
||||
exit 1
|
||||
fi
|
||||
done
|
||||
|
||||
echo "== refreshing checksums for all vendored asic-rs crates =="
|
||||
python3 thirdparty/asic-rs/refresh-checksums.py --all
|
||||
echo "done."
|
||||
@@ -0,0 +1,37 @@
|
||||
upstream: asic-rs (crates.io)
|
||||
version: 0.8.1 (cargo-vendored under vendor/, per ADR 0003)
|
||||
state: pristine cargo-vendored tree + this patch queue.
|
||||
|
||||
asic-rs is materialized with `cargo vendor vendor` and consumed through
|
||||
.cargo/config.toml's vendored-sources replacement (directory = "vendor").
|
||||
Unlike wx-rs, asic-rs is many crates (asic-rs, asic-rs-core, and the
|
||||
per-make / per-firmware crates); a change to any of them lives here as a
|
||||
numbered .patch, NOT as an in-place edit of the pristine tree (ADR 0003).
|
||||
|
||||
The committed vendor/ tree already has the patches applied AND its affected
|
||||
crates' .cargo-checksum.json refreshed, so a normal build needs nothing extra
|
||||
-- the patch queue is provenance + the re-vendoring recipe.
|
||||
|
||||
GOTCHA (cargo caching): cargo fingerprints a registry/vendored crate by
|
||||
(name, version, source), NOT by file content, so it will REUSE a cached
|
||||
build of a vendored crate even after its source is edited. CI is unaffected
|
||||
(fresh target/ each run compiles the patched source). But an incremental
|
||||
LOCAL build that already compiled the unpatched crate must be forced:
|
||||
cargo clean -p asic-rs-firmwares-whatsminer # then rebuild
|
||||
Otherwise the local binary silently keeps the old behaviour.
|
||||
|
||||
Update / re-vendor flow:
|
||||
1. bump the pin in crates/alkane-gui/Cargo.toml, `cargo vendor vendor`
|
||||
(this regenerates a pristine vendor/ and DROPS our edits)
|
||||
2. scripts/apply-asic-rs-patches.sh # re-applies patches/ + refreshes checksums
|
||||
3. resolve any patch that no longer applies, rebuild, commit
|
||||
|
||||
patches/:
|
||||
0001 whatsminer set_power_limit (round-9 #4): fix the v3 (WhatsMinerOS)
|
||||
privileged auth -- the "super" account's token password is the separate
|
||||
v3 credential (default "super"), not the web/admin password -- and send
|
||||
the watts as a bare integer; also treat the apply-restart's transient
|
||||
RPC error as success. See the patch header.
|
||||
0002 antminer Equihash (Z15/Z15J) hashrate (round-10 #8): the cgminer "GHS"
|
||||
key carries a Sol/s value, so use the base Hash unit for Equihash so the
|
||||
SI prefix is correct ("288k", not "288T"). See the patch header.
|
||||
@@ -0,0 +1,104 @@
|
||||
Subject: [PATCH 0001] whatsminer set_power_limit: v3 auth/param fix + restart-tolerant result
|
||||
|
||||
Round-9 #4 -- "the power-limit on the WhatsMiners doesn't apply properly" --
|
||||
root-caused and verified against the live fleet.
|
||||
|
||||
v3 backend (WhatsMinerOS, firmware >= 2024-11-01, port 4433): the privileged
|
||||
power-limit write authenticated the "super" account with the WEB/admin password
|
||||
(a separate credential; the super account's factory default is "super") and sent
|
||||
the watts as a float, so the miner rejected every write with "invalid json or
|
||||
password is wrong". Fixes: v3 set_auth uses the super-account password ("super")
|
||||
-- the web password still drives the v2 (admin) path; set_power_limit sends a
|
||||
bare integer (a float trips the firmware's "invalid json" parser).
|
||||
|
||||
v2 backend (firmware < 2024-11-01, port 4028, "adjust_power_limit"): the command
|
||||
DOES apply the new watt limit, but the miner restarts to re-tune and drops the
|
||||
connection mid-command, so the read times out. Both v2 and v3 now treat a
|
||||
transient RPC error after the command (is_expected_write_error -- read timeout /
|
||||
connection reset, the same helper the pause/resume paths use) as success; a real
|
||||
rejection is a StatusCheckFailed and still errors.
|
||||
|
||||
Verified live: v3 (M30S+ fw 20241108) returns {"code":0,"msg":"ok"} and applies;
|
||||
v2 (M30S+ fw 20240930) applies the changed value (confirmed via the read-only
|
||||
:4028 "Power Limit" after the restart) and now returns Ok. All test miners were
|
||||
returned to their prior configured limit. Matches the pyasic / HashSource
|
||||
whatsminer-api-3 references.
|
||||
|
||||
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 c7b00e3b..096b2fcb 100644
|
||||
--- a/vendor/asic-rs-firmwares-whatsminer/src/backends/v2/mod.rs
|
||||
+++ b/vendor/asic-rs-firmwares-whatsminer/src/backends/v2/mod.rs
|
||||
@@ -637,11 +637,21 @@ impl SetFaultLight for WhatsMinerV2 {
|
||||
impl SetPowerLimit for WhatsMinerV2 {
|
||||
async fn set_power_limit(&self, limit: Power) -> anyhow::Result<bool> {
|
||||
let parameters = Some(json!({"power_limit": limit.as_watts().to_string()}));
|
||||
- let data = self
|
||||
+ match self
|
||||
.rpc
|
||||
.send_command("adjust_power_limit", true, parameters)
|
||||
- .await;
|
||||
- Ok(data.is_ok())
|
||||
+ .await
|
||||
+ {
|
||||
+ Ok(_) => Ok(true),
|
||||
+ // adjust_power_limit makes the miner restart to re-tune, so it drops
|
||||
+ // the connection / stops replying mid-command even though it accepted
|
||||
+ // and applied the new limit (verified on the live fleet: the set value
|
||||
+ // settles after the restart). A transient RPC error (read timeout /
|
||||
+ // connection reset) after the command is therefore success; a genuine
|
||||
+ // rejection surfaces as StatusCheckFailed and still errors.
|
||||
+ Err(e) if is_expected_write_error(&e) => Ok(true),
|
||||
+ Err(e) => Err(e),
|
||||
+ }
|
||||
}
|
||||
fn supports_set_power_limit(&self) -> bool {
|
||||
true
|
||||
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 77d724d5..c00c6d44 100644
|
||||
--- a/vendor/asic-rs-firmwares-whatsminer/src/backends/v3/mod.rs
|
||||
+++ b/vendor/asic-rs-firmwares-whatsminer/src/backends/v3/mod.rs
|
||||
@@ -669,12 +669,21 @@ impl SetFaultLight for WhatsMinerV3 {
|
||||
#[async_trait]
|
||||
impl SetPowerLimit for WhatsMinerV3 {
|
||||
async fn set_power_limit(&self, limit: Power) -> anyhow::Result<bool> {
|
||||
- let data = self
|
||||
+ // WhatsMinerOS wants a BARE INTEGER watt value; a float ("3000.0")
|
||||
+ // trips the firmware's "invalid json" parser (round-9 #4).
|
||||
+ let watts = limit.as_watts().round() as u64;
|
||||
+ match self
|
||||
.rpc
|
||||
- .send_command("set.miner.power_limit", true, Some(json!(limit.as_watts())))
|
||||
- .await;
|
||||
-
|
||||
- Ok(data.is_ok())
|
||||
+ .send_command("set.miner.power_limit", true, Some(json!(watts)))
|
||||
+ .await
|
||||
+ {
|
||||
+ Ok(_) => Ok(true),
|
||||
+ // A power-limit change restarts the miner to re-tune, so a transient
|
||||
+ // RPC error after the command means it was accepted (as with v2), not
|
||||
+ // rejected; a genuine rejection is a StatusCheckFailed and still errors.
|
||||
+ Err(e) if is_expected_write_error(&e) => Ok(true),
|
||||
+ Err(e) => Err(e),
|
||||
+ }
|
||||
}
|
||||
fn supports_set_power_limit(&self) -> bool {
|
||||
true
|
||||
@@ -806,8 +815,15 @@ impl HasDefaultAuth for WhatsMinerV3 {
|
||||
|
||||
impl HasAuth for WhatsMinerV3 {
|
||||
fn set_auth(&mut self, auth: MinerAuth) {
|
||||
- // WhatsMiner V3 username is always "super", V2 is always "admin"
|
||||
- self.rpc.set_auth(MinerAuth::new("super", auth.password()));
|
||||
+ // WhatsMiner V3 username is always "super", V2 is always "admin".
|
||||
+ // The V3 privileged token authenticates against the "super" ACCOUNT,
|
||||
+ // whose password is a separate v3 credential (factory default "super")
|
||||
+ // -- NOT the web/admin password carried by `auth`. Pairing account
|
||||
+ // "super" with the web password made every v3 privileged write fail with
|
||||
+ // "invalid json or password is wrong" (round-9 #4, confirmed on the live
|
||||
+ // fleet). Keep the super-account default password here; the web password
|
||||
+ // still drives the v2 (admin) path below.
|
||||
+ self.rpc.set_auth(MinerAuth::new("super", "super"));
|
||||
self.v2_rpc
|
||||
.set_auth(MinerAuth::new("admin", auth.password()));
|
||||
}
|
||||
@@ -0,0 +1,69 @@
|
||||
Subject: [PATCH 0002] antminer: Equihash (Z15/Z15J) hashrate uses base Sol/s unit
|
||||
|
||||
Round-10 #8 -- a Z15 shows its hashrate in 'T' (e.g. "288T") when it should be
|
||||
'k' (~288 kSol/s). Root cause verified on the live fleet: Equihash miners report
|
||||
a Sol/s rate in the cgminer "GHS" key, but AntMiner's parse_hashrate takes the
|
||||
unit from the key name ("GHS" -> GigaHash), scaling the value 1e9x too large.
|
||||
The value is a raw Sol/s count, so for Equihash use the base Hash unit; the
|
||||
downstream SI-prefixing then yields "288k". Matched by algorithm, and by "Z15"
|
||||
model name for the Z15J which asic-rs leaves algo Unknown. Applies to both the
|
||||
v2020 and v2023_07 backends. Verified: Z15 288T -> 288k, Z15J 138T -> 110k.
|
||||
|
||||
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 cd4f7cbd..5b9f77b3 100644
|
||||
--- a/vendor/asic-rs-firmwares-antminer/src/backends/v2020/mod.rs
|
||||
+++ b/vendor/asic-rs-firmwares-antminer/src/backends/v2020/mod.rs
|
||||
@@ -14,7 +14,7 @@ use asic_rs_core::{
|
||||
DataCollector, DataExtensions, DataExtractor, DataField, DataLocation, get_by_pointer,
|
||||
},
|
||||
command::MinerCommand,
|
||||
- device::DeviceInfo,
|
||||
+ device::{DeviceInfo, HashAlgorithm},
|
||||
fan::FanData,
|
||||
firmware::FirmwareImage,
|
||||
hashrate::{HashRate, HashRateUnit},
|
||||
@@ -722,6 +722,15 @@ impl GetHashrate for AntMinerV2020 {
|
||||
})
|
||||
})?;
|
||||
|
||||
+ // Equihash miners (e.g. Z15/Z15J) report a Sol/s rate in the cgminer
|
||||
+ // "GHS" key, so the key's GigaHash label is wrong -- the value is the
|
||||
+ // raw Sol/s count. Use the base unit so the magnitude (and SI prefix)
|
||||
+ // is correct (e.g. ~288000 Sol/s -> "288k", not "288T"). Match by algo,
|
||||
+ // and by Z15 model name for the Z15J which asic-rs leaves algo Unknown.
|
||||
+ let is_equihash = self.device_info.algo == HashAlgorithm::Equihash
|
||||
+ || self.device_info.model.to_string().to_ascii_uppercase().contains("Z15");
|
||||
+ let unit = if is_equihash { HashRateUnit::Hash } else { unit };
|
||||
+
|
||||
Some(
|
||||
HashRate {
|
||||
value,
|
||||
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 4ba13537..6d6dc593 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
|
||||
@@ -16,7 +16,7 @@ use asic_rs_core::{
|
||||
DataCollector, DataExtensions, DataExtractor, DataField, DataLocation, get_by_pointer,
|
||||
},
|
||||
command::MinerCommand,
|
||||
- device::DeviceInfo,
|
||||
+ device::{DeviceInfo, HashAlgorithm},
|
||||
fan::FanData,
|
||||
firmware::FirmwareImage,
|
||||
hashrate::{HashRate, HashRateUnit},
|
||||
@@ -698,6 +698,15 @@ impl GetHashrate for AntMinerV202307 {
|
||||
})
|
||||
})?;
|
||||
|
||||
+ // Equihash miners (e.g. Z15/Z15J) report a Sol/s rate in the cgminer
|
||||
+ // "GHS" key, so the key's GigaHash label is wrong -- the value is the
|
||||
+ // raw Sol/s count. Use the base unit so the magnitude (and SI prefix)
|
||||
+ // is correct (e.g. ~288000 Sol/s -> "288k", not "288T"). Match by algo,
|
||||
+ // and by Z15 model name for the Z15J which asic-rs leaves algo Unknown.
|
||||
+ let is_equihash = self.device_info.algo == HashAlgorithm::Equihash
|
||||
+ || self.device_info.model.to_string().to_ascii_uppercase().contains("Z15");
|
||||
+ let unit = if is_equihash { HashRateUnit::Hash } else { unit };
|
||||
+
|
||||
Some(
|
||||
HashRate {
|
||||
value,
|
||||
@@ -0,0 +1,29 @@
|
||||
Subject: [PATCH 0003] antminer: recognise VNish short control-board platforms (CV, XIL)
|
||||
|
||||
Round-11 #5 -- VNish reports the control board in short form via /api/v1/info
|
||||
"platform": "cv" (CVITek), "xil" (Xilinx), "aml" (AMLogic). asic-rs's
|
||||
AntMinerControlBoard::parse matched the full names (CVITEK, XILINX) but not the
|
||||
short "CV"/"XIL", so VNish CVITek and Xilinx boards showed a blank control board
|
||||
(the "can't scan XIL or CVITek boards" bug). Add the short forms. Verified live:
|
||||
S19k Pro platform "cv" -> CVITek, S19 platform "xil" -> Xilinx.
|
||||
|
||||
diff --git a/vendor/asic-rs-makes-antminer/src/hardware.rs b/vendor/asic-rs-makes-antminer/src/hardware.rs
|
||||
index 41a73240..aa0923c8 100644
|
||||
--- a/vendor/asic-rs-makes-antminer/src/hardware.rs
|
||||
+++ b/vendor/asic-rs-makes-antminer/src/hardware.rs
|
||||
@@ -268,11 +268,13 @@ impl AntMinerControlBoard {
|
||||
.collect::<String>();
|
||||
|
||||
match compact.as_str() {
|
||||
- "XILINX" => Some(Self::Xilinx),
|
||||
+ // "XIL" is VNish's short platform form for a Xilinx control board.
|
||||
+ "XILINX" | "XIL" => Some(Self::Xilinx),
|
||||
"BBB" | "BBCTRL" | "BB" | "BEAGLEBONE" | "BEAGLEBONEBLACK" => {
|
||||
Some(Self::BeagleBoneBlack)
|
||||
}
|
||||
- "CVITEK" | "CVCTRL" => Some(Self::CVITek),
|
||||
+ // "CV" is VNish's short platform form for a CVITek control board.
|
||||
+ "CVITEK" | "CVCTRL" | "CV" => Some(Self::CVITek),
|
||||
"AMLOGIC" | "AML" => Some(Self::AMLogic),
|
||||
"AMCB07" => Some(Self::Xilinx), // Mara FW
|
||||
"ZYNQ7007" => Some(Self::Xilinx),
|
||||
@@ -0,0 +1,65 @@
|
||||
Subject: [PATCH 0004] whatsminer v1: control-board fallback + optional ALLWINNER_ prefix
|
||||
|
||||
Round-11 #5 -- older M30S firmware (< 2022.7.29, the v1 backend) often omits
|
||||
"CB Platform" from the summary RPC, and its parse mandatorily stripped an
|
||||
"ALLWINNER_" prefix (strip_prefix(..)? -> None when absent), so those units
|
||||
showed a blank control board. Add get_version /Msg/platform (the source v2 uses)
|
||||
as a fallback location, and make the ALLWINNER_ strip optional. Verified live:
|
||||
M30S+ VE40 (fw 20220422, v1) blank -> H6OS.
|
||||
|
||||
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 b4a27db8..f95a22ae 100644
|
||||
--- a/vendor/asic-rs-firmwares-whatsminer/src/backends/v1/mod.rs
|
||||
+++ b/vendor/asic-rs-firmwares-whatsminer/src/backends/v1/mod.rs
|
||||
@@ -131,14 +131,28 @@ impl GetDataLocations for WhatsMinerV1 {
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
- DataField::ControlBoardVersion => vec![(
|
||||
- RPC_SUMMARY,
|
||||
- DataExtractor {
|
||||
- func: get_by_pointer,
|
||||
- key: Some("/SUMMARY/0/CB Platform"),
|
||||
- tag: None,
|
||||
- },
|
||||
- )],
|
||||
+ DataField::ControlBoardVersion => vec![
|
||||
+ (
|
||||
+ RPC_SUMMARY,
|
||||
+ DataExtractor {
|
||||
+ func: get_by_pointer,
|
||||
+ key: Some("/SUMMARY/0/CB Platform"),
|
||||
+ tag: None,
|
||||
+ },
|
||||
+ ),
|
||||
+ // Older M30S firmware (< 2022.7.29, so this v1 backend) often omits
|
||||
+ // "CB Platform" from summary but still reports the board under
|
||||
+ // get_version /Msg/platform (the source v2 uses). Fall back to it so
|
||||
+ // those units don't show a blank control board.
|
||||
+ (
|
||||
+ RPC_GET_VERSION,
|
||||
+ DataExtractor {
|
||||
+ func: get_by_pointer,
|
||||
+ key: Some("/Msg/platform"),
|
||||
+ tag: None,
|
||||
+ },
|
||||
+ ),
|
||||
+ ],
|
||||
DataField::TuningTarget => vec![(
|
||||
RPC_SUMMARY,
|
||||
DataExtractor {
|
||||
@@ -285,8 +299,12 @@ impl GetControlBoardVersion for WhatsMinerV1 {
|
||||
) -> Option<MinerControlBoard> {
|
||||
data.extract::<String>(DataField::ControlBoardVersion)
|
||||
.and_then(|s| {
|
||||
- WhatsMinerControlBoard::parse(s.to_uppercase().strip_prefix("ALLWINNER_")?)
|
||||
- .map(|cb| cb.into())
|
||||
+ // The "ALLWINNER_" prefix is optional: summary's CB Platform carries
|
||||
+ // it (e.g. "ALLWINNER_H6"), but the get_version /Msg/platform fallback
|
||||
+ // does not (e.g. "H6OS"). Strip it only when present.
|
||||
+ let up = s.to_uppercase();
|
||||
+ let board = up.strip_prefix("ALLWINNER_").unwrap_or(&up);
|
||||
+ WhatsMinerControlBoard::parse(board).map(|cb| cb.into())
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,93 @@
|
||||
Subject: [PATCH 0005] vnish: surface the partner build name in the firmware version
|
||||
|
||||
Round-11 #6b/#11 -- VNish /api/v1/info carries a partner/reseller "build_name"
|
||||
("WildRose", "vnishreturn", ...) alongside "fw_version"; it is shown in the
|
||||
Hashcore toolkit but asic-rs did not expose it. Point the FirmwareVersion
|
||||
extractor at /build_name and combine it with the /fw_version number (still on
|
||||
ApiVersion) in parse_firmware_version, so firmware_version reads "<build>
|
||||
<version>", e.g. "WildRose 1.2.7". Applies to both the v1_2_0 and v1_3_0
|
||||
backends. Verified live: S19j Pro -> "WildRose 1.2.7", S19k Pro -> "vnishreturn 1.3.5".
|
||||
|
||||
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 4cc1434a..e734a03e 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
|
||||
@@ -179,11 +179,15 @@ impl GetDataLocations for VnishV120 {
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
+ // The partner/reseller build name ("WildRose", "vnishreturn", ...) --
|
||||
+ // combined with the version number in parse_firmware_version so the FW
|
||||
+ // Version column shows e.g. "WildRose 1.3.5". ApiVersion still carries
|
||||
+ // the bare /fw_version.
|
||||
DataField::FirmwareVersion => vec![(
|
||||
WEB_INFO,
|
||||
DataExtractor {
|
||||
func: get_by_pointer,
|
||||
- key: Some("/fw_version"),
|
||||
+ key: Some("/build_name"),
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
@@ -415,7 +419,20 @@ impl GetApiVersion for VnishV120 {
|
||||
|
||||
impl GetFirmwareVersion for VnishV120 {
|
||||
fn parse_firmware_version(&self, data: &HashMap<DataField, Value>) -> Option<String> {
|
||||
- data.extract::<String>(DataField::FirmwareVersion)
|
||||
+ // FirmwareVersion carries /build_name (the partner build), ApiVersion the
|
||||
+ // /fw_version number; show "<build> <version>" when both are present, else
|
||||
+ // whichever is available.
|
||||
+ let build = data
|
||||
+ .extract::<String>(DataField::FirmwareVersion)
|
||||
+ .filter(|b| !b.is_empty());
|
||||
+ let version = data
|
||||
+ .extract::<String>(DataField::ApiVersion)
|
||||
+ .filter(|v| !v.is_empty());
|
||||
+ match (build, version) {
|
||||
+ (Some(b), Some(v)) => Some(format!("{b} {v}")),
|
||||
+ (Some(b), None) => Some(b),
|
||||
+ (None, v) => v,
|
||||
+ }
|
||||
}
|
||||
}
|
||||
|
||||
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 6975d9e5..0a5d694e 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
|
||||
@@ -179,11 +179,13 @@ impl GetDataLocations for VnishV130 {
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
+ // Partner/reseller build name; combined with the version number in
|
||||
+ // parse_firmware_version (FW Version shows e.g. "WildRose 1.3.5").
|
||||
DataField::FirmwareVersion => vec![(
|
||||
WEB_INFO,
|
||||
DataExtractor {
|
||||
func: get_by_pointer,
|
||||
- key: Some("/fw_version"),
|
||||
+ key: Some("/build_name"),
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
@@ -423,7 +425,19 @@ impl GetApiVersion for VnishV130 {
|
||||
|
||||
impl GetFirmwareVersion for VnishV130 {
|
||||
fn parse_firmware_version(&self, data: &HashMap<DataField, Value>) -> Option<String> {
|
||||
- data.extract::<String>(DataField::FirmwareVersion)
|
||||
+ // FirmwareVersion carries /build_name (partner build), ApiVersion the
|
||||
+ // /fw_version number; show "<build> <version>" when both are present.
|
||||
+ let build = data
|
||||
+ .extract::<String>(DataField::FirmwareVersion)
|
||||
+ .filter(|b| !b.is_empty());
|
||||
+ let version = data
|
||||
+ .extract::<String>(DataField::ApiVersion)
|
||||
+ .filter(|v| !v.is_empty());
|
||||
+ match (build, version) {
|
||||
+ (Some(b), Some(v)) => Some(format!("{b} {v}")),
|
||||
+ (Some(b), None) => Some(b),
|
||||
+ (None, v) => v,
|
||||
+ }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,243 @@
|
||||
Subject: [PATCH 0006] antminer: route old models to the right backend + read the Z15 control board
|
||||
|
||||
Round-12 #10. Three fixes for stock Antminer Z15/Z15J (fw 2020), all verified
|
||||
live on 10.5.1.x:
|
||||
|
||||
1. Backend routing: the version detector only read summary.cgi, which older
|
||||
models (Z15) do not serve (404) -> version None -> AntMiner::new defaulted to
|
||||
the newest backend, which mis-parsed the miner (empty control board, no
|
||||
expected hashrate/wattage/fans). Fall back to the cgminer :4028 `version`
|
||||
RPC's CompileTime so the Z15 (2020) routes to the v2020 backend.
|
||||
|
||||
2. Control board "read, not guess": the Z15 has no miner_type.cgi, so its
|
||||
control-board subtype is unreadable there. Read the kernel build string from
|
||||
get_system_info.cgi instead ("Linux 4.6.0-xilinx-..." -> Xilinx); the
|
||||
ControlBoardVersion field now carries both the subtype and the kernel, and the
|
||||
parser prefers the subtype and falls back to the kernel marker.
|
||||
|
||||
3. Malformed cgminer stats: the Z15 emits a stats array whose objects are not
|
||||
comma-separated (`...}{"STATS":0...`), invalid JSON that serde rejected,
|
||||
dropping the whole stats command and every stats-derived field. Insert the
|
||||
missing separators before parsing (a no-op on well-formed responses); this
|
||||
restores expected hashrate, fans, hashboards and uptime. The expected
|
||||
hashrate also gets the same Equihash Sol/s reinterpretation as the realtime
|
||||
rate, so both read on one scale (e.g. 144k / 320k) instead of the expected
|
||||
reading ~1e6x larger.
|
||||
|
||||
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 5b9f77b3..a02bdf9d 100644
|
||||
--- a/vendor/asic-rs-firmwares-antminer/src/backends/v2020/mod.rs
|
||||
+++ b/vendor/asic-rs-firmwares-antminer/src/backends/v2020/mod.rs
|
||||
@@ -434,14 +434,29 @@ impl GetDataLocations for AntMinerV2020 {
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
- DataField::ControlBoardVersion => vec![(
|
||||
- WEB_MINER_TYPE,
|
||||
- DataExtractor {
|
||||
- func: get_by_pointer,
|
||||
- key: Some("/subtype"),
|
||||
- tag: None,
|
||||
- },
|
||||
- )],
|
||||
+ // Prefer the explicit control-board subtype from miner_type.cgi, but
|
||||
+ // carry the kernel build string from get_system_info.cgi too: older
|
||||
+ // models (e.g. Z15/Z15J) have no miner_type.cgi, and their kernel
|
||||
+ // string ("...-xilinx-...") names the control board we can actually
|
||||
+ // read instead of guessing from the model (round 12 #10).
|
||||
+ DataField::ControlBoardVersion => vec![
|
||||
+ (
|
||||
+ WEB_MINER_TYPE,
|
||||
+ DataExtractor {
|
||||
+ func: get_by_pointer,
|
||||
+ key: Some("/subtype"),
|
||||
+ tag: Some("subtype"),
|
||||
+ },
|
||||
+ ),
|
||||
+ (
|
||||
+ WEB_SYSTEM_INFO,
|
||||
+ DataExtractor {
|
||||
+ func: get_by_pointer,
|
||||
+ key: Some("/system_kernel_version"),
|
||||
+ tag: Some("kernel"),
|
||||
+ },
|
||||
+ ),
|
||||
+ ],
|
||||
// cgminer names its summary keys after the unit they are in —
|
||||
// `GHS 5s` on SHA-256 models, `MHS 5s` on Scrypt ones — so keep
|
||||
// the whole entry and let the parse pick the key that is present.
|
||||
@@ -748,16 +763,33 @@ impl GetExpectedHashrate for AntMinerV2020 {
|
||||
let value = field?
|
||||
.pointer("/hashrate")
|
||||
.and_then(Self::parse_f64_field)?;
|
||||
+ // Equihash miners (Z15/Z15J) report `total_rateideal` as a Sol/s count in
|
||||
+ // the same (mislabelled) scale as the realtime "GHS" rate, so reinterpret
|
||||
+ // it as the base Hash unit -- matching parse_hashrate. Without this,
|
||||
+ // expected reads ~1e6x larger than realtime and the realtime figure looks
|
||||
+ // absent next to it (round 12 #10).
|
||||
+ let is_equihash = self.device_info.algo == HashAlgorithm::Equihash
|
||||
+ || self
|
||||
+ .device_info
|
||||
+ .model
|
||||
+ .to_string()
|
||||
+ .to_ascii_uppercase()
|
||||
+ .contains("Z15");
|
||||
+ let unit = if is_equihash {
|
||||
+ HashRateUnit::Hash
|
||||
+ } else {
|
||||
+ // `total_rateideal` does not name its own scale, so take it from
|
||||
+ // STATS' `rate_unit` (`"GH"` / `"MH"`).
|
||||
+ field
|
||||
+ .and_then(|v| v.pointer("/unit"))
|
||||
+ .and_then(|v| v.as_str())
|
||||
+ .and_then(|s| HashRateUnit::from_str(s).ok())
|
||||
+ .unwrap_or(HashRateUnit::GigaHash)
|
||||
+ };
|
||||
Some(
|
||||
HashRate {
|
||||
value,
|
||||
- // `total_rateideal` does not name its own scale, so take it
|
||||
- // from STATS' `rate_unit` (`"GH"` / `"MH"`).
|
||||
- unit: field
|
||||
- .and_then(|v| v.pointer("/unit"))
|
||||
- .and_then(|v| v.as_str())
|
||||
- .and_then(|s| HashRateUnit::from_str(s).ok())
|
||||
- .unwrap_or(HashRateUnit::GigaHash),
|
||||
+ unit,
|
||||
algo: self.device_info.algo,
|
||||
}
|
||||
.as_unit(HashRateUnit::default()),
|
||||
@@ -888,11 +920,34 @@ impl GetControlBoardVersion for AntMinerV2020 {
|
||||
&self,
|
||||
data: &HashMap<DataField, Value>,
|
||||
) -> Option<MinerControlBoard> {
|
||||
- let cb_type = data.extract::<String>(DataField::ControlBoardVersion)?;
|
||||
- match cb_type.as_str() {
|
||||
- s if s.to_uppercase().contains("AML") => Some(AntMinerControlBoard::AMLogic.into()),
|
||||
- _ => AntMinerControlBoard::parse(cb_type.split("_").collect::<Vec<&str>>()[0])
|
||||
- .map(|cb| cb.into()),
|
||||
+ let field = data.get(&DataField::ControlBoardVersion)?;
|
||||
+ // Explicit control-board subtype (miner_type.cgi) wins when present.
|
||||
+ let subtype = field
|
||||
+ .pointer("/subtype")
|
||||
+ .and_then(|v| v.as_str())
|
||||
+ .unwrap_or("");
|
||||
+ if !subtype.is_empty() {
|
||||
+ return match subtype {
|
||||
+ s if s.to_uppercase().contains("AML") => Some(AntMinerControlBoard::AMLogic.into()),
|
||||
+ _ => AntMinerControlBoard::parse(subtype.split('_').next().unwrap_or(subtype))
|
||||
+ .map(|cb| cb.into()),
|
||||
+ };
|
||||
+ }
|
||||
+ // No subtype (older models): read the control board from the kernel build
|
||||
+ // string instead of guessing from the model (round 12 #10). Bitmain names
|
||||
+ // the SoC in the kernel version, e.g. "Linux 4.6.0-xilinx-..." (Z15) or an
|
||||
+ // AMLogic/Meson kernel on newer AMLogic boards.
|
||||
+ let kernel = field
|
||||
+ .pointer("/kernel")
|
||||
+ .and_then(|v| v.as_str())
|
||||
+ .unwrap_or("")
|
||||
+ .to_ascii_lowercase();
|
||||
+ if kernel.contains("xilinx") || kernel.contains("zynq") {
|
||||
+ Some(AntMinerControlBoard::Xilinx.into())
|
||||
+ } else if kernel.contains("aml") || kernel.contains("meson") {
|
||||
+ Some(AntMinerControlBoard::AMLogic.into())
|
||||
+ } else {
|
||||
+ None
|
||||
}
|
||||
}
|
||||
}
|
||||
diff --git a/vendor/asic-rs-firmwares-antminer/src/backends/v2020/rpc.rs b/vendor/asic-rs-firmwares-antminer/src/backends/v2020/rpc.rs
|
||||
index 23962f35..52232c1f 100644
|
||||
--- a/vendor/asic-rs-firmwares-antminer/src/backends/v2020/rpc.rs
|
||||
+++ b/vendor/asic-rs-firmwares-antminer/src/backends/v2020/rpc.rs
|
||||
@@ -71,7 +71,17 @@ impl AntMinerRPCAPI {
|
||||
read_stream_response(&mut stream, DEFAULT_RPC_TIMEOUT).await
|
||||
};
|
||||
let response = response?;
|
||||
- self.parse_rpc_result(&response)
|
||||
+ self.parse_rpc_result(&Self::sanitize_cgminer(&response))
|
||||
+ }
|
||||
+
|
||||
+ /// Antminer's cgminer `stats` sometimes emits an array whose objects are not
|
||||
+ /// comma-separated (`...}{"STATS":0,...` on the Z15/Z15J), which is invalid
|
||||
+ /// JSON that serde rejects -- dropping the whole stats command and with it
|
||||
+ /// every stats-derived field (expected hashrate, wattage, fans, hashboards,
|
||||
+ /// uptime). Insert the missing separators. Well-formed JSON never contains an
|
||||
+ /// unseparated `}{`, so this is a no-op on valid responses (round 12 #10).
|
||||
+ fn sanitize_cgminer(response: &str) -> String {
|
||||
+ response.replace("}{", "},{")
|
||||
}
|
||||
|
||||
fn parse_rpc_result(&self, response: &str) -> anyhow::Result<Value> {
|
||||
diff --git a/vendor/asic-rs-firmwares-antminer/src/firmware.rs b/vendor/asic-rs-firmwares-antminer/src/firmware.rs
|
||||
index fce5e8ff..46abbc9d 100644
|
||||
--- a/vendor/asic-rs-firmwares-antminer/src/firmware.rs
|
||||
+++ b/vendor/asic-rs-firmwares-antminer/src/firmware.rs
|
||||
@@ -142,18 +142,9 @@ async fn get_model_with_auth(
|
||||
}
|
||||
}
|
||||
|
||||
-/// Fetch the firmware version from a miner using digest auth.
|
||||
-async fn get_version_with_auth(ip: IpAddr, auth: &MinerAuth) -> Option<semver::Version> {
|
||||
- let client = build_discovery_client().ok()?;
|
||||
- let data: Response = client
|
||||
- .get(format!("http://{ip}/cgi-bin/summary.cgi"))
|
||||
- .send_digest_auth((auth.username(), auth.password()))
|
||||
- .await
|
||||
- .ok()?;
|
||||
-
|
||||
- let json_data = data.json::<serde_json::Value>().await.ok()?;
|
||||
- let fw_version = json_data["INFO"]["CompileTime"].as_str().unwrap_or("");
|
||||
-
|
||||
+/// Parse an Antminer cgminer `CompileTime` string ("Mon Dec 14 18:01:42 CST
|
||||
+/// 2020") into a date-based semver (year.month.day) used to pick the backend.
|
||||
+fn parse_antminer_compile_time(fw_version: &str) -> Option<semver::Version> {
|
||||
let cleaned: String = {
|
||||
let mut parts: Vec<&str> = fw_version.split_whitespace().collect();
|
||||
if parts.len() > 4 {
|
||||
@@ -161,9 +152,7 @@ async fn get_version_with_auth(ip: IpAddr, auth: &MinerAuth) -> Option<semver::V
|
||||
}
|
||||
parts.join(" ")
|
||||
};
|
||||
-
|
||||
let dt = NaiveDateTime::parse_from_str(&cleaned, "%a %b %e %H:%M:%S %Y").ok()?;
|
||||
-
|
||||
Some(semver::Version::new(
|
||||
dt.year() as u64,
|
||||
dt.month() as u64,
|
||||
@@ -171,6 +160,34 @@ async fn get_version_with_auth(ip: IpAddr, auth: &MinerAuth) -> Option<semver::V
|
||||
))
|
||||
}
|
||||
|
||||
+/// Fetch the firmware version (as a date-based semver) to pick the backend.
|
||||
+async fn get_version_with_auth(ip: IpAddr, auth: &MinerAuth) -> Option<semver::Version> {
|
||||
+ // Newer Antminers expose the firmware CompileTime via summary.cgi.
|
||||
+ if let Ok(client) = build_discovery_client()
|
||||
+ && let Ok(data) = client
|
||||
+ .get(format!("http://{ip}/cgi-bin/summary.cgi"))
|
||||
+ .send_digest_auth((auth.username(), auth.password()))
|
||||
+ .await
|
||||
+ && let Ok(json_data) = data.json::<serde_json::Value>().await
|
||||
+ && let Some(v) =
|
||||
+ parse_antminer_compile_time(json_data["INFO"]["CompileTime"].as_str().unwrap_or(""))
|
||||
+ {
|
||||
+ return Some(v);
|
||||
+ }
|
||||
+
|
||||
+ // Older models (e.g. Z15/Z15J) have no summary.cgi, so summary-based version
|
||||
+ // detection returns nothing and the miner would default to the newest
|
||||
+ // backend and be mis-parsed. Fall back to the cgminer :4028 `version` RPC,
|
||||
+ // which still reports the CompileTime, so the right (older) backend is picked
|
||||
+ // (round 12 #10).
|
||||
+ let rpc = asic_rs_core::util::send_rpc_command(&ip, "version").await?;
|
||||
+ parse_antminer_compile_time(
|
||||
+ rpc.pointer("/VERSION/0/CompileTime")
|
||||
+ .and_then(|v| v.as_str())
|
||||
+ .unwrap_or(""),
|
||||
+ )
|
||||
+}
|
||||
+
|
||||
#[async_trait]
|
||||
impl MinerFirmware for AntMinerStockFirmware {
|
||||
/// Uses default credentials. For custom credentials, use `build_miner`
|
||||
@@ -0,0 +1,205 @@
|
||||
Subject: [PATCH 0007] whatsminer: enable control commands on the V1 backend
|
||||
|
||||
Round-12 #8b part 2. Pre-2022-07-29 WhatsMiners route to the V1 backend, which
|
||||
exposed no control commands (every supports_* returned false), so older units
|
||||
could be monitored but not controlled -- and the GUI's capability-based actions
|
||||
never lit up for them. V1-era firmware speaks the same classic btminer token
|
||||
write API (get_token + md5crypt + AES-256-ECB) as V2 (the access-probe token
|
||||
handshake proved V1 accepts it), so V1 now reuses V2's proven RPC client for
|
||||
writes: set_fault_light, set_power_limit, update_pools, restart, pause, resume
|
||||
are implemented exactly as V2, going through a new `write_rpc`
|
||||
(crate::backends::v2::rpc), and HasAuth routes the admin password to it.
|
||||
|
||||
Verified on a live V1 unit that the token AES key (password) is accepted; the
|
||||
control-command write path is identical to V2's, which is validated live on the
|
||||
fleet. Note: some V1 units keep their API in read-only mode and answer write
|
||||
commands with Code 45 "can't access write cmd" until an operator enables write
|
||||
access via the WhatsMiner Tool -- that is a per-device setting, and the backend
|
||||
now fails such a write gracefully rather than not offering the command at all.
|
||||
The 40 whatsminer crate tests pass unchanged.
|
||||
|
||||
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 f95a22ae..c9c96713 100644
|
||||
--- a/vendor/asic-rs-firmwares-whatsminer/src/backends/v1/mod.rs
|
||||
+++ b/vendor/asic-rs-firmwares-whatsminer/src/backends/v1/mod.rs
|
||||
@@ -26,8 +26,9 @@ use async_trait::async_trait;
|
||||
use macaddr::MacAddr;
|
||||
use measurements::{AngularVelocity, Frequency, Power, Temperature};
|
||||
use rpc::WhatsMinerRPCAPI;
|
||||
+use asic_rs_core::util::is_expected_write_error;
|
||||
use semver::Version;
|
||||
-use serde_json::Value;
|
||||
+use serde_json::{Value, json};
|
||||
|
||||
use crate::firmware::WhatsMinerFirmware;
|
||||
|
||||
@@ -37,6 +38,12 @@ mod rpc;
|
||||
pub struct WhatsMinerV1 {
|
||||
pub ip: IpAddr,
|
||||
pub rpc: WhatsMinerRPCAPI,
|
||||
+ // Privileged (token-authenticated) writes reuse the V2 btminer RPC client:
|
||||
+ // pre-2022-07-29 miners speak the same classic get_token + AES-ECB write API
|
||||
+ // as V2 (proven live via the access-probe token handshake), so the control
|
||||
+ // commands share V2's implementation instead of the read-only V1 rpc above
|
||||
+ // (round 12 #8b part 2).
|
||||
+ pub write_rpc: crate::backends::v2::rpc::WhatsMinerRPCAPI,
|
||||
pub device_info: DeviceInfo,
|
||||
}
|
||||
|
||||
@@ -45,6 +52,11 @@ impl WhatsMinerV1 {
|
||||
WhatsMinerV1 {
|
||||
ip,
|
||||
rpc: WhatsMinerRPCAPI::new(ip, None),
|
||||
+ write_rpc: crate::backends::v2::rpc::WhatsMinerRPCAPI::new(
|
||||
+ ip,
|
||||
+ None,
|
||||
+ MinerAuth::new("admin", "admin"),
|
||||
+ ),
|
||||
device_info: DeviceInfo::new(
|
||||
model,
|
||||
WhatsMinerFirmware::default(),
|
||||
@@ -560,17 +572,45 @@ impl GetPools for WhatsMinerV1 {
|
||||
}
|
||||
}
|
||||
|
||||
+#[async_trait]
|
||||
+// Control commands (round 12 #8b part 2): the classic btminer token write API is
|
||||
+// the same on V1-era firmware as on V2, so these mirror the V2 backend but go
|
||||
+// through `write_rpc`. The write path was validated live on a V1 unit with the
|
||||
+// reversible locate-light command (safe, non-disruptive to mining).
|
||||
#[async_trait]
|
||||
impl SetFaultLight for WhatsMinerV1 {
|
||||
+ async fn set_fault_light(&self, fault: bool) -> anyhow::Result<bool> {
|
||||
+ let parameters = match fault {
|
||||
+ false => Some(json!({"param": "auto"})),
|
||||
+ true => Some(json!({"color": "red", "period": 200, "duration": 100, "start": 0})),
|
||||
+ };
|
||||
+ let data = self.write_rpc.send_command("set_led", true, parameters).await;
|
||||
+ Ok(data.is_ok())
|
||||
+ }
|
||||
fn supports_set_fault_light(&self) -> bool {
|
||||
- false
|
||||
+ true
|
||||
}
|
||||
}
|
||||
|
||||
#[async_trait]
|
||||
impl SetPowerLimit for WhatsMinerV1 {
|
||||
+ async fn set_power_limit(&self, limit: Power) -> anyhow::Result<bool> {
|
||||
+ let parameters = Some(json!({"power_limit": limit.as_watts().to_string()}));
|
||||
+ match self
|
||||
+ .write_rpc
|
||||
+ .send_command("adjust_power_limit", true, parameters)
|
||||
+ .await
|
||||
+ {
|
||||
+ Ok(_) => Ok(true),
|
||||
+ // adjust_power_limit restarts the miner to re-tune, dropping the
|
||||
+ // connection mid-command even though the limit was accepted; a
|
||||
+ // transient write error is success, a genuine rejection still errors.
|
||||
+ Err(e) if is_expected_write_error(&e) => Ok(true),
|
||||
+ Err(e) => Err(e),
|
||||
+ }
|
||||
+ }
|
||||
fn supports_set_power_limit(&self) -> bool {
|
||||
- false
|
||||
+ true
|
||||
}
|
||||
}
|
||||
|
||||
@@ -585,29 +625,77 @@ impl SupportsPoolsConfig for WhatsMinerV1 {
|
||||
.collect())
|
||||
}
|
||||
|
||||
+ async fn set_pools_config(&self, config: Vec<PoolGroupConfig>) -> anyhow::Result<bool> {
|
||||
+ let group = config
|
||||
+ .into_iter()
|
||||
+ .next()
|
||||
+ .ok_or_else(|| anyhow::anyhow!("No pool groups provided"))?;
|
||||
+ let mut params = serde_json::Map::new();
|
||||
+ for n in 1..=3 {
|
||||
+ let pool = group.pools.get(n - 1);
|
||||
+ params.insert(
|
||||
+ format!("pool{n}"),
|
||||
+ json!(pool.map(|p| p.url.to_string()).unwrap_or_default()),
|
||||
+ );
|
||||
+ params.insert(
|
||||
+ format!("worker{n}"),
|
||||
+ json!(pool.map(|p| p.username.as_str()).unwrap_or_default()),
|
||||
+ );
|
||||
+ params.insert(
|
||||
+ format!("passwd{n}"),
|
||||
+ json!(pool.map(|p| p.password.as_str()).unwrap_or_default()),
|
||||
+ );
|
||||
+ }
|
||||
+ Ok(self
|
||||
+ .write_rpc
|
||||
+ .send_command("update_pools", true, Some(json!(params)))
|
||||
+ .await
|
||||
+ .is_ok())
|
||||
+ }
|
||||
+
|
||||
fn supports_pools_config(&self) -> bool {
|
||||
- false
|
||||
+ true
|
||||
}
|
||||
}
|
||||
|
||||
#[async_trait]
|
||||
impl Restart for WhatsMinerV1 {
|
||||
+ async fn restart(&self) -> anyhow::Result<bool> {
|
||||
+ // The miner often reboots before replying, so any error is treated as
|
||||
+ // "rebooting".
|
||||
+ let _ = self.write_rpc.send_command("reboot", true, None).await;
|
||||
+ Ok(true)
|
||||
+ }
|
||||
fn supports_restart(&self) -> bool {
|
||||
- false
|
||||
+ true
|
||||
}
|
||||
}
|
||||
|
||||
#[async_trait]
|
||||
impl Pause for WhatsMinerV1 {
|
||||
+ #[allow(unused_variables)]
|
||||
+ async fn pause(&self, at_time: Option<Duration>) -> anyhow::Result<bool> {
|
||||
+ // Fire-and-forget: the miner may power off before responding.
|
||||
+ let _ = self
|
||||
+ .write_rpc
|
||||
+ .send_command("power_off", true, Some(json!({"respbefore": "true"})))
|
||||
+ .await;
|
||||
+ Ok(true)
|
||||
+ }
|
||||
fn supports_pause(&self) -> bool {
|
||||
- false
|
||||
+ true
|
||||
}
|
||||
}
|
||||
|
||||
#[async_trait]
|
||||
impl Resume for WhatsMinerV1 {
|
||||
+ #[allow(unused_variables)]
|
||||
+ async fn resume(&self, at_time: Option<Duration>) -> anyhow::Result<bool> {
|
||||
+ let data = self.write_rpc.send_command("power_on", true, None).await;
|
||||
+ Ok(data.is_ok())
|
||||
+ }
|
||||
fn supports_resume(&self) -> bool {
|
||||
- false
|
||||
+ true
|
||||
}
|
||||
}
|
||||
|
||||
@@ -643,7 +731,13 @@ impl UpgradeFirmware for WhatsMinerV1 {
|
||||
}
|
||||
}
|
||||
|
||||
-impl HasAuth for WhatsMinerV1 {}
|
||||
+impl HasAuth for WhatsMinerV1 {
|
||||
+ fn set_auth(&mut self, auth: MinerAuth) {
|
||||
+ // WhatsMiner's token account is always "admin"; only the password varies.
|
||||
+ // Route it to the privileged write RPC (round 12 #8b part 2).
|
||||
+ self.write_rpc.set_auth(MinerAuth::new("admin", auth.password()));
|
||||
+ }
|
||||
+}
|
||||
impl HasDefaultAuth for WhatsMinerV1 {}
|
||||
|
||||
impl Validate for WhatsMinerV1 {
|
||||
@@ -0,0 +1,143 @@
|
||||
Subject: [PATCH 0008] antminer: resolve Z15J / unknown-model algorithm
|
||||
|
||||
Round-13 #4/#5. A Z15J reports its model as "ANTMINER Z15J", which asic-rs' alias
|
||||
table did not recognise, so it deserialised to AntMinerModel::Unknown and its
|
||||
hash algorithm resolved to HashAlgorithm::Unknown. That left the miner's Sol/s
|
||||
hashrate un-bucketed as "unknown hashrate" in the GUI, even though the round-10
|
||||
unit reinterpretation already read the value correctly. (The older ANTMINER Z15
|
||||
matched the table and reported Equihash; only the J revision was affected.)
|
||||
|
||||
Two layers of fix:
|
||||
- models.rs / hardware.rs: add a first-class Z15J model (Equihash, same 3-chip
|
||||
x 3-board / 2-fan chassis profile as the Z15) so it parses to a named model
|
||||
and carries the right algorithm, and shows a clean "Z15J" model name.
|
||||
- v2020 backend: when the alias table still can't place a model, infer the
|
||||
algorithm from the Antminer family letter for the lines that are
|
||||
single-algorithm end to end (Z -> Equihash, L -> Scrypt, S/T -> SHA-256), so
|
||||
other not-yet-tabled models are bucketed sensibly instead of Unknown.
|
||||
Ambiguous families (K spans Kadena/KHeavyHash/Eaglesong; DR is Blake256 while
|
||||
D is X11) are deliberately left Unknown rather than guessed wrong.
|
||||
|
||||
Live-verified on 10.5.1.{50,72,196,205}: Z15 and Z15J now both report
|
||||
algo=Equihash with their real Sol/s rates (e.g. 305k, 132k; 0 on idle units).
|
||||
The antminer crate tests pass, plus two new unit tests (z15j_parses_as_equihash,
|
||||
unknown_models_infer_algo_from_family_letter).
|
||||
|
||||
diff --git a/vendor/asic-rs-makes-antminer/src/models.rs b/vendor/asic-rs-makes-antminer/src/models.rs
|
||||
--- a/vendor/asic-rs-makes-antminer/src/models.rs
|
||||
+++ b/vendor/asic-rs-makes-antminer/src/models.rs
|
||||
@@ -78,6 +78,9 @@
|
||||
#[serde(alias = "ANTMINER Z15 PRO")]
|
||||
#[algorithm(HashAlgorithm::Equihash)]
|
||||
Z15Pro,
|
||||
+ #[serde(alias = "ANTMINER Z15J")]
|
||||
+ #[algorithm(HashAlgorithm::Equihash)]
|
||||
+ Z15J,
|
||||
#[serde(alias = "ANTMINER S17")]
|
||||
#[algorithm(HashAlgorithm::SHA256)]
|
||||
S17,
|
||||
@@ -281,12 +284,22 @@
|
||||
(AntMinerModel::E9Pro, HashAlgorithm::EtHash),
|
||||
(AntMinerModel::Z15, HashAlgorithm::Equihash),
|
||||
(AntMinerModel::Z15Pro, HashAlgorithm::Equihash),
|
||||
+ (AntMinerModel::Z15J, HashAlgorithm::Equihash),
|
||||
] {
|
||||
assert_eq!(model.hash_algorithm(), expected, "{model}");
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
+ fn z15j_parses_as_equihash() {
|
||||
+ // The Z15J reports "ANTMINER Z15J"; before it had an alias it fell back to
|
||||
+ // Unknown, which left its Sol/s hashrate un-bucketed (round 13 #5).
|
||||
+ let model = AntMinerModel::from_str("ANTMINER Z15J").unwrap();
|
||||
+ assert_eq!(model, AntMinerModel::Z15J);
|
||||
+ assert_eq!(model.hash_algorithm(), HashAlgorithm::Equihash);
|
||||
+ }
|
||||
+
|
||||
+ #[test]
|
||||
fn unknown_model_uses_unknown_algorithm() {
|
||||
let model = AntMinerModel::from_str("ANTMINER S99").unwrap();
|
||||
|
||||
diff --git a/vendor/asic-rs-makes-antminer/src/hardware.rs b/vendor/asic-rs-makes-antminer/src/hardware.rs
|
||||
--- a/vendor/asic-rs-makes-antminer/src/hardware.rs
|
||||
+++ b/vendor/asic-rs-makes-antminer/src/hardware.rs
|
||||
@@ -97,6 +97,10 @@
|
||||
AntMinerModel::Z15Pro => Self {
|
||||
fans: Some(2),
|
||||
boards: Some(vec![Some(6), Some(6), Some(6)]),
|
||||
+ },
|
||||
+ AntMinerModel::Z15J => Self {
|
||||
+ fans: Some(2),
|
||||
+ boards: Some(vec![Some(3), Some(3), Some(3)]),
|
||||
},
|
||||
AntMinerModel::S17 => Self {
|
||||
fans: Some(4),
|
||||
diff --git a/vendor/asic-rs-firmwares-antminer/src/backends/v2020/mod.rs b/vendor/asic-rs-firmwares-antminer/src/backends/v2020/mod.rs
|
||||
--- a/vendor/asic-rs-firmwares-antminer/src/backends/v2020/mod.rs
|
||||
+++ b/vendor/asic-rs-firmwares-antminer/src/backends/v2020/mod.rs
|
||||
@@ -201,10 +201,41 @@
|
||||
Value::Object(payload)
|
||||
}
|
||||
|
||||
+/// Infer an Antminer's hash algorithm from its model-family letter, for models
|
||||
+/// asic-rs' alias table doesn't recognise (round 13 #5). Only the families whose
|
||||
+/// entire product line shares one algorithm are inferred; anything ambiguous
|
||||
+/// (the K-series spans Kadena/KHeavyHash/Eaglesong, DR is Blake256 while D is
|
||||
+/// X11) is left Unknown rather than guessed wrong.
|
||||
+fn infer_antminer_algo(model: &str) -> HashAlgorithm {
|
||||
+ let upper = model.to_ascii_uppercase();
|
||||
+ let name = upper
|
||||
+ .strip_prefix("ANTMINER ")
|
||||
+ .unwrap_or(&upper)
|
||||
+ .trim_start();
|
||||
+ match name.chars().next() {
|
||||
+ // Z9 / Z11 / Z15 / Z15 Pro / Z15J -- the whole Z line is Equihash.
|
||||
+ Some('Z') => HashAlgorithm::Equihash,
|
||||
+ // L3+ / L7 / L9 / L11 -- the whole L line is Scrypt.
|
||||
+ Some('L') => HashAlgorithm::Scrypt,
|
||||
+ // S9..S21 and T9..T21 (and future revisions) are all SHA-256.
|
||||
+ Some('S') | Some('T') => HashAlgorithm::SHA256,
|
||||
+ _ => HashAlgorithm::Unknown,
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
impl AntMinerV2020 {
|
||||
pub fn new(ip: IpAddr, model: impl MinerModel) -> Self {
|
||||
let auth = Self::default_auth();
|
||||
- let algo = model.hash_algorithm();
|
||||
+ // asic-rs maps a model string to its algorithm through a fixed alias
|
||||
+ // table; a model that is not in the table (a Z15J, a not-yet-added
|
||||
+ // S-series, ...) resolves to HashAlgorithm::Unknown, which then leaves the
|
||||
+ // miner's hashrate un-bucketed ("unknown hashrate", round 13 #5). When the
|
||||
+ // table can't place the model, infer the algorithm from its Antminer
|
||||
+ // family letter for the lines that are single-algorithm end to end.
|
||||
+ let algo = match model.hash_algorithm() {
|
||||
+ HashAlgorithm::Unknown => infer_antminer_algo(&model.to_string()),
|
||||
+ known => known,
|
||||
+ };
|
||||
AntMinerV2020 {
|
||||
ip,
|
||||
rpc: AntMinerRPCAPI::new(ip),
|
||||
@@ -1431,6 +1462,21 @@
|
||||
};
|
||||
|
||||
#[test]
|
||||
+ fn unknown_models_infer_algo_from_family_letter() {
|
||||
+ // Round 13 #5: a model outside asic-rs' alias table must still resolve a
|
||||
+ // sensible algorithm from its Antminer family letter instead of Unknown.
|
||||
+ assert_eq!(infer_antminer_algo("ANTMINER Z15J"), HashAlgorithm::Equihash);
|
||||
+ assert_eq!(infer_antminer_algo("Z9"), HashAlgorithm::Equihash);
|
||||
+ assert_eq!(infer_antminer_algo("ANTMINER L15"), HashAlgorithm::Scrypt);
|
||||
+ assert_eq!(infer_antminer_algo("ANTMINER S23"), HashAlgorithm::SHA256);
|
||||
+ assert_eq!(infer_antminer_algo("ANTMINER T23"), HashAlgorithm::SHA256);
|
||||
+ // Ambiguous / unrelated families stay Unknown (K-series spans three
|
||||
+ // algorithms; a bare unknown string has no family).
|
||||
+ assert_eq!(infer_antminer_algo("ANTMINER KS7"), HashAlgorithm::Unknown);
|
||||
+ assert_eq!(infer_antminer_algo("WHATSMINER M30"), HashAlgorithm::Unknown);
|
||||
+ }
|
||||
+
|
||||
+ #[test]
|
||||
fn set_miner_conf_payload_matches_cgi_contract_for_pause_resume() {
|
||||
let pre = json!({
|
||||
"pools": [
|
||||
@@ -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,74 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Refresh the .cargo-checksum.json of vendored asic-rs crates after the patch
|
||||
queue (thirdparty/asic-rs/patches/) has been applied to the cargo-vendored tree.
|
||||
|
||||
cargo verifies each vendored file against the per-file SHA256 in that crate's
|
||||
.cargo-checksum.json; a patched file whose checksum is stale fails the build. For
|
||||
every crate named on the command line (or, with --all, every asic-rs* crate under
|
||||
vendor/), this recomputes the SHA256 of each file already listed in the manifest
|
||||
and rewrites it, preserving the top-level "package"/"$comment" keys. Files not
|
||||
listed are left alone (cargo only checks listed files).
|
||||
|
||||
Usage:
|
||||
refresh-checksums.py <crate-dir> [<crate-dir> ...]
|
||||
refresh-checksums.py --all # every vendor/asic-rs* crate
|
||||
"""
|
||||
import hashlib
|
||||
import json
|
||||
import sys
|
||||
from pathlib import Path
|
||||
|
||||
REPO = Path(__file__).resolve().parents[2]
|
||||
VENDOR = REPO / "vendor"
|
||||
|
||||
|
||||
def sha256(path: Path) -> str:
|
||||
h = hashlib.sha256()
|
||||
with open(path, "rb") as f:
|
||||
for chunk in iter(lambda: f.read(1 << 16), b""):
|
||||
h.update(chunk)
|
||||
return h.hexdigest()
|
||||
|
||||
|
||||
def refresh(crate_dir: Path) -> int:
|
||||
manifest = crate_dir / ".cargo-checksum.json"
|
||||
if not manifest.exists():
|
||||
print(f"skip {crate_dir.name}: no .cargo-checksum.json")
|
||||
return 0
|
||||
data = json.loads(manifest.read_text())
|
||||
files = data.get("files", {})
|
||||
changed = 0
|
||||
for rel in list(files):
|
||||
fp = crate_dir / rel
|
||||
if not fp.exists():
|
||||
print(f" WARN {crate_dir.name}: listed file missing: {rel}")
|
||||
continue
|
||||
new = sha256(fp)
|
||||
if new != files[rel]:
|
||||
files[rel] = new
|
||||
changed += 1
|
||||
if changed:
|
||||
manifest.write_text(json.dumps(data, separators=(",", ":")))
|
||||
print(f"{crate_dir.name}: refreshed {changed} checksum(s)")
|
||||
else:
|
||||
print(f"{crate_dir.name}: no changes")
|
||||
return changed
|
||||
|
||||
|
||||
def main() -> None:
|
||||
args = sys.argv[1:]
|
||||
if not args:
|
||||
print(__doc__)
|
||||
sys.exit(2)
|
||||
if args == ["--all"]:
|
||||
crates = sorted(p for p in VENDOR.glob("asic-rs*") if p.is_dir())
|
||||
else:
|
||||
crates = [Path(a) if Path(a).is_absolute() else (VENDOR / a) for a in args]
|
||||
total = 0
|
||||
for c in crates:
|
||||
total += refresh(c)
|
||||
print(f"done: {total} checksum(s) refreshed across {len(crates)} crate(s)")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
@@ -10,7 +10,7 @@
|
||||
+pub use widgets::*;
|
||||
--- a/src/widgets.rs
|
||||
+++ b/src/widgets.rs
|
||||
@@ -0,0 +1,561 @@
|
||||
@@ -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).
|
||||
@@ -28,6 +28,7 @@
|
||||
+ pub fn wxbr_main_frame() -> *mut c_void;
|
||||
+ pub fn wxbr_panel(parent: *mut c_void) -> *mut c_void;
|
||||
+ pub fn wxbr_box_sizer(vertical: c_int) -> *mut c_void;
|
||||
+ pub fn wxbr_wrap_sizer(vertical: c_int) -> *mut c_void;
|
||||
+ pub fn wxbr_sizer_add(sizer: *mut c_void, win: *mut c_void, proportion: c_int, flags: c_int, border: c_int);
|
||||
+ pub fn wxbr_sizer_add_sizer(sizer: *mut c_void, subsizer: *mut c_void, proportion: c_int, flags: c_int, border: c_int);
|
||||
+ pub fn wxbr_sizer_add_spacer(sizer: *mut c_void, px: c_int);
|
||||
@@ -35,17 +36,22 @@
|
||||
+ pub fn wxbr_set_sizer(win: *mut c_void, sizer: *mut c_void);
|
||||
+ pub fn wxbr_layout(win: *mut c_void);
|
||||
+ pub fn wxbr_sizer_detach(sizer: *mut c_void, win: *mut c_void);
|
||||
+ pub fn wxbr_sizer_show(sizer: *mut c_void, win: *mut c_void, show: c_int);
|
||||
+ 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;
|
||||
+ pub fn wxbr_set_bold(win: *mut c_void);
|
||||
+ pub fn wxbr_set_font_size(win: *mut c_void, pts: c_int);
|
||||
+ 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_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);
|
||||
@@ -59,16 +65,22 @@
|
||||
+ pub fn wxbr_dialog(parent: *mut c_void, title: *const c_char) -> *mut c_void;
|
||||
+ 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_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);
|
||||
+ pub fn wxbr_dvlc_clear(win: *mut c_void);
|
||||
+ 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_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;
|
||||
@@ -77,12 +89,20 @@
|
||||
+ pub fn wxbr_dvlc_get_selections(win: *mut c_void, buf: *mut c_int, cap: c_int) -> c_int;
|
||||
+ pub fn wxbr_dvlc_select_rows(win: *mut c_void, rows: *const c_int, n: c_int);
|
||||
+ pub fn wxbr_dvlc_set_alt_row_color(win: *mut c_void, r: c_int, g: c_int, b: c_int);
|
||||
+ pub fn wxbr_dvlc_set_row_color(win: *mut c_void, row: usize, r: c_int, g: c_int, b: c_int);
|
||||
+ pub fn wxbr_dvlc_set_zebra(win: *mut c_void, r: c_int, g: c_int, b: c_int);
|
||||
+ pub fn wxbr_dvlc_get_top_row(win: *mut c_void) -> c_int;
|
||||
+ pub fn wxbr_dvlc_ensure_visible(win: *mut c_void, row: usize);
|
||||
+ pub fn wxbr_apply_zebra_css(r: c_int, g: c_int, b: c_int);
|
||||
+ pub fn wxbr_rearrange_list(parent: *mut c_void, n: c_int, order: *const c_int, items: *const *const c_char) -> *mut c_void;
|
||||
+ pub fn wxbr_rearrange_get_order(win: *mut c_void, buf: *mut c_int, cap: c_int) -> c_int;
|
||||
+ pub fn wxbr_reorder_list(parent: *mut c_void, n: c_int, order: *const c_int, items: *const *const c_char) -> *mut c_void;
|
||||
+ pub fn wxbr_reorder_get_order(win: *mut c_void, buf: *mut c_int, cap: c_int) -> c_int;
|
||||
+ pub fn wxbr_reorder_set_order(win: *mut c_void, n: c_int, order: *const c_int, items: *const *const c_char);
|
||||
+ 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;
|
||||
@@ -96,7 +116,24 @@
|
||||
+ pub fn wxbr_system_color(which: c_int, r: *mut u8, g: *mut u8, b: *mut u8);
|
||||
+ pub fn wxbr_set_bg(win: *mut c_void, r: c_int, g: c_int, b: c_int);
|
||||
+ pub fn wxbr_set_fg(win: *mut c_void, r: c_int, g: c_int, b: c_int);
|
||||
+ pub fn wxbr_choice(parent: *mut c_void, id: c_int) -> *mut c_void;
|
||||
+ pub fn wxbr_choice_append(win: *mut c_void, label: *const c_char);
|
||||
+ pub fn wxbr_choice_clear(win: *mut c_void);
|
||||
+ pub fn wxbr_choice_get_selection(win: *mut c_void) -> c_int;
|
||||
+ pub fn wxbr_choice_set_selection(win: *mut c_void, i: c_int);
|
||||
+ pub fn wxbr_media_button(parent: *mut c_void, id: c_int, kind: c_int, r: c_int, g: c_int, b: c_int) -> *mut c_void;
|
||||
+ pub fn wxbr_svg_icon(parent: *mut c_void, svg: *const c_char, w: c_int, h: c_int) -> *mut c_void;
|
||||
+ pub fn wxbr_register_shape_svg(sentinel: c_int, svg: *const c_char, vbw: c_int, vbh: c_int);
|
||||
+ pub fn wxbr_set_light_pulse(on: c_int);
|
||||
+ pub fn wxbr_bind_sys_colour(win: *mut c_void);
|
||||
+ pub fn wxbr_destroy(win: *mut c_void);
|
||||
+ pub fn wxbr_destroy_children(win: *mut c_void);
|
||||
+ pub fn wxbr_call_after(id: c_int);
|
||||
+ pub fn wxbr_status_indicator_init(frame: *mut c_void);
|
||||
+ pub fn wxbr_status_indicator_set(text: *const c_char, r: c_int, g: c_int, b: c_int);
|
||||
+ pub fn wxbr_status_zoom_init(frame: *mut c_void);
|
||||
+ pub fn wxbr_table_set_zoom(factor: f64);
|
||||
+ pub fn wxbr_table_zoom_reapply();
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
@@ -129,6 +166,12 @@
|
||||
+ DvlcSelectionChanged,
|
||||
+ DvlcContextMenu,
|
||||
+ MenuItem,
|
||||
+ ChoiceChanged,
|
||||
+ SysColour,
|
||||
+ Deferred,
|
||||
+ DvlcHeaderRightClick,
|
||||
+ /// Window resized; p1 = new client width, p2 = new client height.
|
||||
+ Sized,
|
||||
+}
|
||||
+
|
||||
+impl WxEventKind {
|
||||
@@ -144,6 +187,11 @@
|
||||
+ 9 => WxEventKind::DvlcSelectionChanged,
|
||||
+ 10 => WxEventKind::DvlcContextMenu,
|
||||
+ 11 => WxEventKind::MenuItem,
|
||||
+ 12 => WxEventKind::ChoiceChanged,
|
||||
+ 13 => WxEventKind::SysColour,
|
||||
+ 14 => WxEventKind::Deferred,
|
||||
+ 15 => WxEventKind::DvlcHeaderRightClick,
|
||||
+ 16 => WxEventKind::Sized,
|
||||
+ _ => return None,
|
||||
+ })
|
||||
+ }
|
||||
@@ -154,6 +202,64 @@
|
||||
+ unsafe { notsafe::wxbr_apply_zebra_css(r as c_int, g as c_int, b as c_int) }
|
||||
+}
|
||||
+
|
||||
+/// Schedule a deferred action: a `Deferred` event carrying `id` is delivered
|
||||
+/// from the event loop after the current event finishes. Use this to rebuild or
|
||||
+/// destroy a control from outside its own event handler.
|
||||
+pub fn call_after(id: i32) {
|
||||
+ unsafe { notsafe::wxbr_call_after(id as c_int) }
|
||||
+}
|
||||
+
|
||||
+/// Reconfigure the frame's status bar to two fields and attach a colour-tinted
|
||||
+/// label pinned to the right-hand field (bottom-right corner). Call once after
|
||||
+/// `create_status_bar()`. The main scan status keeps using the left field via
|
||||
+/// the upstream `set_status_text` path.
|
||||
+pub fn status_indicator_init(frame: Widget) {
|
||||
+ unsafe { notsafe::wxbr_status_indicator_init(frame.0) }
|
||||
+}
|
||||
+
|
||||
+/// Add the table-zoom slider + percent label to the frame's status bar (round 14
|
||||
+/// #3). Call after the table exists so the slider can find it. The slider scales
|
||||
+/// the table entirely in C++; no further Rust calls are needed.
|
||||
+pub fn status_zoom_init(frame: Widget) {
|
||||
+ unsafe { notsafe::wxbr_status_zoom_init(frame.0) }
|
||||
+}
|
||||
+
|
||||
+/// Set the table zoom factor programmatically (1.0 = 100%); also moves the slider.
|
||||
+pub fn table_set_zoom(factor: f64) {
|
||||
+ unsafe { notsafe::wxbr_table_set_zoom(factor) }
|
||||
+}
|
||||
+
|
||||
+/// Re-apply the current zoom after the table's columns are rebuilt, so a non-100%
|
||||
+/// zoom survives a column show/hide/reorder (round 14 #3).
|
||||
+pub fn table_zoom_reapply() {
|
||||
+ unsafe { notsafe::wxbr_table_zoom_reapply() }
|
||||
+}
|
||||
+
|
||||
+/// Set the bottom-right status indicator's text and colour (an empty string
|
||||
+/// clears it). Used for scan/apply errors (red) and warnings (amber).
|
||||
+pub fn status_indicator_set(text: &str, r: u8, g: u8, b: u8) {
|
||||
+ let c = CString::new(text).unwrap_or_default();
|
||||
+ unsafe { notsafe::wxbr_status_indicator_set(c.as_ptr(), r as c_int, g as c_int, b as c_int) }
|
||||
+}
|
||||
+
|
||||
+/// Register a raw SVG for a table-cell shape sentinel (a control-char code point)
|
||||
+/// so the segment renderer can draw it recoloured to each cell's segment colour.
|
||||
+/// `vbw`/`vbh` are the SVG viewBox dimensions, used to keep the icon's aspect
|
||||
+/// ratio when it is rasterised at the cell height (round 12 #9/#11).
|
||||
+pub fn register_shape_svg(sentinel: u32, svg: &str, vbw: i32, vbh: i32) {
|
||||
+ let c = CString::new(svg).unwrap_or_default();
|
||||
+ unsafe {
|
||||
+ notsafe::wxbr_register_shape_svg(sentinel as c_int, c.as_ptr(), vbw as c_int, vbh as c_int)
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+/// Start (or stop) the locate-light dot fade animation. Call with `true` while at
|
||||
+/// least one miner's locate light is flashing so the table repaint timer only
|
||||
+/// runs when there is a pulsing dot to animate (round 12 #6).
|
||||
+pub fn set_light_pulse(on: bool) {
|
||||
+ unsafe { notsafe::wxbr_set_light_pulse(on as c_int) }
|
||||
+}
|
||||
+
|
||||
+/// Open a URL in the system default browser. Returns true on success.
|
||||
+pub fn launch_browser(url: &str) -> bool {
|
||||
+ let c = CString::new(url).unwrap_or_default();
|
||||
@@ -229,6 +335,14 @@
|
||||
+ Widget(unsafe { notsafe::wxbr_box_sizer(vertical as c_int) })
|
||||
+ }
|
||||
+
|
||||
+ /// A box sizer that wraps overflowing items onto additional lines instead
|
||||
+ /// of shrinking them. wxWrapSizer is a wxBoxSizer subclass, so the result
|
||||
+ /// accepts the same add/add_sizer/add_spacer/add_stretch/set_sizer_on
|
||||
+ /// calls as `box_sizer`'s.
|
||||
+ pub fn wrap_sizer(vertical: bool) -> Widget {
|
||||
+ Widget(unsafe { notsafe::wxbr_wrap_sizer(vertical as c_int) })
|
||||
+ }
|
||||
+
|
||||
+ pub fn add(&self, win: Widget, proportion: i32, flags: i32, border: i32) {
|
||||
+ unsafe { notsafe::wxbr_sizer_add(self.0, win.0, proportion, flags, border) }
|
||||
+ }
|
||||
@@ -262,6 +376,18 @@
|
||||
+ unsafe { notsafe::wxbr_sizer_detach(self.0, win.0) }
|
||||
+ }
|
||||
+
|
||||
+ /// Show or hide a child window in this sizer (self = a sizer), reclaiming or
|
||||
+ /// restoring its space on the next `layout()`.
|
||||
+ pub fn sizer_show(&self, win: Widget, show: bool) {
|
||||
+ unsafe { notsafe::wxbr_sizer_show(self.0, win.0, show as c_int) }
|
||||
+ }
|
||||
+
|
||||
+ /// Emit `WxEventKind::Sized` (p1 = width, p2 = height) whenever this window
|
||||
+ /// is resized.
|
||||
+ pub fn bind_size(&self) {
|
||||
+ unsafe { notsafe::wxbr_bind_size(self.0) }
|
||||
+ }
|
||||
+
|
||||
+ pub fn fit(&self, win: Widget) {
|
||||
+ unsafe { notsafe::wxbr_fit(win.0) }
|
||||
+ }
|
||||
@@ -270,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()) })
|
||||
@@ -305,6 +437,15 @@
|
||||
+ Widget(unsafe { notsafe::wxbr_button(parent.0, c.as_ptr(), id) })
|
||||
+ }
|
||||
+
|
||||
+ /// Make this window clickable: a left mouse down on it emits the same
|
||||
+ /// `ButtonClicked` event a real button would, carrying `id`. Bind each
|
||||
+ /// child that should also count as part of the click target (e.g. the
|
||||
+ /// static text labels on a KPI card), since a child window swallows its
|
||||
+ /// own mouse events rather than letting them propagate to the parent.
|
||||
+ pub fn bind_click(&self, id: i32) {
|
||||
+ unsafe { notsafe::wxbr_bind_click(self.0, id) }
|
||||
+ }
|
||||
+
|
||||
+ pub fn text_ctrl(parent: Widget, multiline: bool) -> Widget {
|
||||
+ Widget(unsafe { notsafe::wxbr_text_ctrl(parent.0, multiline as c_int) })
|
||||
+ }
|
||||
@@ -322,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()) })
|
||||
@@ -384,6 +532,51 @@
|
||||
+ unsafe { notsafe::wxbr_dialog_close(self.0, code) }
|
||||
+ }
|
||||
+
|
||||
+ /// Show a native "open file, must exist" dialog. Returns the chosen path,
|
||||
+ /// or `None` if the dialog was cancelled.
|
||||
+ pub fn file_dialog(parent: Widget, title: &str) -> Option<String> {
|
||||
+ let c = CString::new(title).unwrap_or_default();
|
||||
+ let mut buf = vec![0i8; 4096];
|
||||
+ let n = unsafe {
|
||||
+ notsafe::wxbr_file_dialog(parent.0, c.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())
|
||||
+ }
|
||||
+
|
||||
+ /// 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 {
|
||||
@@ -395,6 +588,14 @@
|
||||
+ unsafe { notsafe::wxbr_dvlc_append_text_col(self.0, c.as_ptr(), width, reorderable as c_int) }
|
||||
+ }
|
||||
+
|
||||
+ /// 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) {
|
||||
+ 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) };
|
||||
+ }
|
||||
+
|
||||
+ pub fn dvlc_append_toggle_col(&self, width: i32) {
|
||||
+ unsafe { notsafe::wxbr_dvlc_append_toggle_col(self.0, width) }
|
||||
+ }
|
||||
@@ -422,6 +623,22 @@
|
||||
+ unsafe { notsafe::wxbr_dvlc_set_cell(self.0, row, col, c.as_ptr()) }
|
||||
+ }
|
||||
+
|
||||
+ /// Set the hover tooltip for one cell (empty clears it). GTK only; a no-op
|
||||
+ /// on other platforms until they gain per-cell tooltip support.
|
||||
+ pub fn dvlc_set_cell_tooltip(&self, row: usize, col: usize, text: &str) {
|
||||
+ let c = CString::new(text).unwrap_or_default();
|
||||
+ 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 {
|
||||
@@ -438,6 +655,11 @@
|
||||
+ unsafe { notsafe::wxbr_dvlc_col_count(self.0).max(0) as usize }
|
||||
+ }
|
||||
+
|
||||
+ /// Auto-size the column at display position `pos` to fit its content.
|
||||
+ pub fn dvlc_autosize_col(&self, pos: usize) {
|
||||
+ unsafe { notsafe::wxbr_dvlc_autosize_col(self.0, pos as c_int) }
|
||||
+ }
|
||||
+
|
||||
+ /// 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) };
|
||||
@@ -472,6 +694,36 @@
|
||||
+ unsafe { notsafe::wxbr_dvlc_set_alt_row_color(self.0, r as c_int, g as c_int, b as c_int) }
|
||||
+ }
|
||||
+
|
||||
+ /// Set a row's text colour (e.g. by miner status). Pass `None` to clear it.
|
||||
+ pub fn dvlc_set_row_color(&self, row: usize, color: Option<(u8, u8, u8)>) {
|
||||
+ let (r, g, b) = match color {
|
||||
+ Some((r, g, b)) => (r as c_int, g as c_int, b as c_int),
|
||||
+ None => (-1, -1, -1),
|
||||
+ };
|
||||
+ unsafe { notsafe::wxbr_dvlc_set_row_color(self.0, row, r, g, b) }
|
||||
+ }
|
||||
+
|
||||
+ /// Set the alternating-row (zebra) background colour applied to odd rows.
|
||||
+ /// Pass `None` to turn zebra striping off.
|
||||
+ pub fn dvlc_set_zebra(&self, color: Option<(u8, u8, u8)>) {
|
||||
+ let (r, g, b) = match color {
|
||||
+ Some((r, g, b)) => (r as c_int, g as c_int, b as c_int),
|
||||
+ None => (-1, -1, -1),
|
||||
+ };
|
||||
+ unsafe { notsafe::wxbr_dvlc_set_zebra(self.0, r, g, b) }
|
||||
+ }
|
||||
+
|
||||
+ /// The model-row index of the top (first visible) row, or `None` if empty.
|
||||
+ pub fn dvlc_get_top_row(&self) -> Option<usize> {
|
||||
+ let r = unsafe { notsafe::wxbr_dvlc_get_top_row(self.0) };
|
||||
+ (r >= 0).then_some(r as usize)
|
||||
+ }
|
||||
+
|
||||
+ /// Scroll so `row` is visible (used to restore scroll position after a refill).
|
||||
+ pub fn dvlc_ensure_visible(&self, row: usize) {
|
||||
+ unsafe { notsafe::wxbr_dvlc_ensure_visible(self.0, row) }
|
||||
+ }
|
||||
+
|
||||
+ // ---- rearrangeable check-list ----
|
||||
+
|
||||
+ /// Create a rearrangeable checklist. `order` uses wx encoding: a value `v`
|
||||
@@ -493,6 +745,38 @@
|
||||
+ buf.into_iter().take(n.max(0) as usize).collect()
|
||||
+ }
|
||||
+
|
||||
+ /// A checkable, multi-select, drag-reorderable column list (round 11 #4):
|
||||
+ /// like `rearrange_list` but with no up/down buttons -- rows are reordered by
|
||||
+ /// dragging, and selected with shift/ctrl-click or a rubber-band drag. Same
|
||||
+ /// `[idx | !idx]` order encoding.
|
||||
+ pub fn reorder_list(parent: Widget, order: &[i32], items: &[&str]) -> Widget {
|
||||
+ let cs: Vec<CString> = items.iter().map(|s| CString::new(*s).unwrap_or_default()).collect();
|
||||
+ let ptrs: Vec<*const c_char> = cs.iter().map(|c| c.as_ptr()).collect();
|
||||
+ Widget(unsafe {
|
||||
+ notsafe::wxbr_reorder_list(parent.0, items.len() as c_int, order.as_ptr(), ptrs.as_ptr())
|
||||
+ })
|
||||
+ }
|
||||
+
|
||||
+ /// Read back the current order from a `reorder_list` (same encoding).
|
||||
+ pub fn reorder_get_order(&self) -> Vec<i32> {
|
||||
+ let mut buf = vec![0i32; 4096];
|
||||
+ let n = unsafe {
|
||||
+ notsafe::wxbr_reorder_get_order(self.0, buf.as_mut_ptr(), buf.len() as c_int)
|
||||
+ };
|
||||
+ buf.into_iter().take(n.max(0) as usize).collect()
|
||||
+ }
|
||||
+
|
||||
+ /// Repopulate a `reorder_list` in a new order (same `[idx | !idx]` encoding
|
||||
+ /// and same base-index `items` array as `reorder_list`). Used by the column
|
||||
+ /// picker's Alphabetical / Categories sort buttons.
|
||||
+ pub fn reorder_set_order(&self, order: &[i32], items: &[&str]) {
|
||||
+ let cs: Vec<CString> = items.iter().map(|s| CString::new(*s).unwrap_or_default()).collect();
|
||||
+ let ptrs: Vec<*const c_char> = cs.iter().map(|c| c.as_ptr()).collect();
|
||||
+ unsafe {
|
||||
+ notsafe::wxbr_reorder_set_order(self.0, items.len() as c_int, order.as_ptr(), ptrs.as_ptr())
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ // ---- popup menu ----
|
||||
+
|
||||
+ pub fn menu_new() -> Widget {
|
||||
@@ -508,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) }
|
||||
@@ -566,9 +857,68 @@
|
||||
+ unsafe { notsafe::wxbr_set_fg(self.0, r as c_int, g as c_int, b as c_int) }
|
||||
+ }
|
||||
+
|
||||
+ // ---- choice (dropdown) ----
|
||||
+
|
||||
+ /// Create a dropdown; selection changes emit `ChoiceChanged` with this id.
|
||||
+ pub fn choice(parent: Widget, id: i32) -> Widget {
|
||||
+ Widget(unsafe { notsafe::wxbr_choice(parent.0, id) })
|
||||
+ }
|
||||
+
|
||||
+ pub fn choice_append(&self, label: &str) {
|
||||
+ let c = CString::new(label).unwrap_or_default();
|
||||
+ unsafe { notsafe::wxbr_choice_append(self.0, c.as_ptr()) }
|
||||
+ }
|
||||
+
|
||||
+ pub fn choice_clear(&self) {
|
||||
+ unsafe { notsafe::wxbr_choice_clear(self.0) }
|
||||
+ }
|
||||
+
|
||||
+ pub fn choice_get_selection(&self) -> i32 {
|
||||
+ unsafe { notsafe::wxbr_choice_get_selection(self.0) }
|
||||
+ }
|
||||
+
|
||||
+ pub fn choice_set_selection(&self, i: i32) {
|
||||
+ unsafe { notsafe::wxbr_choice_set_selection(self.0, i) }
|
||||
+ }
|
||||
+
|
||||
+ // ---- media (icon) button ----
|
||||
+
|
||||
+ /// A coloured icon button: `kind` 0=play, 1=pause, 2=stop. Clicks emit
|
||||
+ /// `ButtonClicked` with `id`, like a normal button.
|
||||
+ pub fn media_button(parent: Widget, id: i32, kind: i32, color: (u8, u8, u8)) -> Widget {
|
||||
+ Widget(unsafe {
|
||||
+ notsafe::wxbr_media_button(
|
||||
+ parent.0,
|
||||
+ id,
|
||||
+ kind,
|
||||
+ color.0 as c_int,
|
||||
+ color.1 as c_int,
|
||||
+ color.2 as c_int,
|
||||
+ )
|
||||
+ })
|
||||
+ }
|
||||
+
|
||||
+ /// Render an SVG string (recolour it first -- its fill must be an explicit
|
||||
+ /// colour, not "currentColor") into a static-bitmap icon at `w`x`h` px
|
||||
+ /// (round 11 #15).
|
||||
+ pub fn svg_icon(parent: Widget, svg: &str, w: i32, h: i32) -> Widget {
|
||||
+ let c = CString::new(svg).unwrap_or_default();
|
||||
+ Widget(unsafe { notsafe::wxbr_svg_icon(parent.0, c.as_ptr(), w as c_int, h as c_int) })
|
||||
+ }
|
||||
+
|
||||
+ /// Listen for OS light/dark theme changes on this window (emits `SysColour`).
|
||||
+ pub fn bind_sys_colour(&self) {
|
||||
+ unsafe { notsafe::wxbr_bind_sys_colour(self.0) }
|
||||
+ }
|
||||
+
|
||||
+ /// Deferred destruction (safe from event handlers); used to rebuild
|
||||
+ /// the table when its column set changes.
|
||||
+ pub fn destroy(&self) {
|
||||
+ unsafe { notsafe::wxbr_destroy(self.0) }
|
||||
+ }
|
||||
+
|
||||
+ /// Destroy this window's children (to rebuild dynamic panel contents).
|
||||
+ pub fn destroy_children(&self) {
|
||||
+ unsafe { notsafe::wxbr_destroy_children(self.0) }
|
||||
+ }
|
||||
+}
|
||||
|
||||
@@ -15,6 +15,7 @@ mod notsafe {
|
||||
pub fn wxbr_main_frame() -> *mut c_void;
|
||||
pub fn wxbr_panel(parent: *mut c_void) -> *mut c_void;
|
||||
pub fn wxbr_box_sizer(vertical: c_int) -> *mut c_void;
|
||||
pub fn wxbr_wrap_sizer(vertical: c_int) -> *mut c_void;
|
||||
pub fn wxbr_sizer_add(sizer: *mut c_void, win: *mut c_void, proportion: c_int, flags: c_int, border: c_int);
|
||||
pub fn wxbr_sizer_add_sizer(sizer: *mut c_void, subsizer: *mut c_void, proportion: c_int, flags: c_int, border: c_int);
|
||||
pub fn wxbr_sizer_add_spacer(sizer: *mut c_void, px: c_int);
|
||||
@@ -22,17 +23,22 @@ mod notsafe {
|
||||
pub fn wxbr_set_sizer(win: *mut c_void, sizer: *mut c_void);
|
||||
pub fn wxbr_layout(win: *mut c_void);
|
||||
pub fn wxbr_sizer_detach(sizer: *mut c_void, win: *mut c_void);
|
||||
pub fn wxbr_sizer_show(sizer: *mut c_void, win: *mut c_void, show: c_int);
|
||||
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;
|
||||
pub fn wxbr_set_bold(win: *mut c_void);
|
||||
pub fn wxbr_set_font_size(win: *mut c_void, pts: c_int);
|
||||
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_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);
|
||||
@@ -46,16 +52,22 @@ mod notsafe {
|
||||
pub fn wxbr_dialog(parent: *mut c_void, title: *const c_char) -> *mut c_void;
|
||||
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_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);
|
||||
pub fn wxbr_dvlc_clear(win: *mut c_void);
|
||||
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_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;
|
||||
@@ -64,12 +76,20 @@ mod notsafe {
|
||||
pub fn wxbr_dvlc_get_selections(win: *mut c_void, buf: *mut c_int, cap: c_int) -> c_int;
|
||||
pub fn wxbr_dvlc_select_rows(win: *mut c_void, rows: *const c_int, n: c_int);
|
||||
pub fn wxbr_dvlc_set_alt_row_color(win: *mut c_void, r: c_int, g: c_int, b: c_int);
|
||||
pub fn wxbr_dvlc_set_row_color(win: *mut c_void, row: usize, r: c_int, g: c_int, b: c_int);
|
||||
pub fn wxbr_dvlc_set_zebra(win: *mut c_void, r: c_int, g: c_int, b: c_int);
|
||||
pub fn wxbr_dvlc_get_top_row(win: *mut c_void) -> c_int;
|
||||
pub fn wxbr_dvlc_ensure_visible(win: *mut c_void, row: usize);
|
||||
pub fn wxbr_apply_zebra_css(r: c_int, g: c_int, b: c_int);
|
||||
pub fn wxbr_rearrange_list(parent: *mut c_void, n: c_int, order: *const c_int, items: *const *const c_char) -> *mut c_void;
|
||||
pub fn wxbr_rearrange_get_order(win: *mut c_void, buf: *mut c_int, cap: c_int) -> c_int;
|
||||
pub fn wxbr_reorder_list(parent: *mut c_void, n: c_int, order: *const c_int, items: *const *const c_char) -> *mut c_void;
|
||||
pub fn wxbr_reorder_get_order(win: *mut c_void, buf: *mut c_int, cap: c_int) -> c_int;
|
||||
pub fn wxbr_reorder_set_order(win: *mut c_void, n: c_int, order: *const c_int, items: *const *const c_char);
|
||||
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;
|
||||
@@ -83,7 +103,24 @@ mod notsafe {
|
||||
pub fn wxbr_system_color(which: c_int, r: *mut u8, g: *mut u8, b: *mut u8);
|
||||
pub fn wxbr_set_bg(win: *mut c_void, r: c_int, g: c_int, b: c_int);
|
||||
pub fn wxbr_set_fg(win: *mut c_void, r: c_int, g: c_int, b: c_int);
|
||||
pub fn wxbr_choice(parent: *mut c_void, id: c_int) -> *mut c_void;
|
||||
pub fn wxbr_choice_append(win: *mut c_void, label: *const c_char);
|
||||
pub fn wxbr_choice_clear(win: *mut c_void);
|
||||
pub fn wxbr_choice_get_selection(win: *mut c_void) -> c_int;
|
||||
pub fn wxbr_choice_set_selection(win: *mut c_void, i: c_int);
|
||||
pub fn wxbr_media_button(parent: *mut c_void, id: c_int, kind: c_int, r: c_int, g: c_int, b: c_int) -> *mut c_void;
|
||||
pub fn wxbr_svg_icon(parent: *mut c_void, svg: *const c_char, w: c_int, h: c_int) -> *mut c_void;
|
||||
pub fn wxbr_register_shape_svg(sentinel: c_int, svg: *const c_char, vbw: c_int, vbh: c_int);
|
||||
pub fn wxbr_set_light_pulse(on: c_int);
|
||||
pub fn wxbr_bind_sys_colour(win: *mut c_void);
|
||||
pub fn wxbr_destroy(win: *mut c_void);
|
||||
pub fn wxbr_destroy_children(win: *mut c_void);
|
||||
pub fn wxbr_call_after(id: c_int);
|
||||
pub fn wxbr_status_indicator_init(frame: *mut c_void);
|
||||
pub fn wxbr_status_indicator_set(text: *const c_char, r: c_int, g: c_int, b: c_int);
|
||||
pub fn wxbr_status_zoom_init(frame: *mut c_void);
|
||||
pub fn wxbr_table_set_zoom(factor: f64);
|
||||
pub fn wxbr_table_zoom_reapply();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -116,6 +153,12 @@ pub enum WxEventKind {
|
||||
DvlcSelectionChanged,
|
||||
DvlcContextMenu,
|
||||
MenuItem,
|
||||
ChoiceChanged,
|
||||
SysColour,
|
||||
Deferred,
|
||||
DvlcHeaderRightClick,
|
||||
/// Window resized; p1 = new client width, p2 = new client height.
|
||||
Sized,
|
||||
}
|
||||
|
||||
impl WxEventKind {
|
||||
@@ -131,6 +174,11 @@ impl WxEventKind {
|
||||
9 => WxEventKind::DvlcSelectionChanged,
|
||||
10 => WxEventKind::DvlcContextMenu,
|
||||
11 => WxEventKind::MenuItem,
|
||||
12 => WxEventKind::ChoiceChanged,
|
||||
13 => WxEventKind::SysColour,
|
||||
14 => WxEventKind::Deferred,
|
||||
15 => WxEventKind::DvlcHeaderRightClick,
|
||||
16 => WxEventKind::Sized,
|
||||
_ => return None,
|
||||
})
|
||||
}
|
||||
@@ -141,6 +189,64 @@ pub fn apply_zebra_css(r: u8, g: u8, b: u8) {
|
||||
unsafe { notsafe::wxbr_apply_zebra_css(r as c_int, g as c_int, b as c_int) }
|
||||
}
|
||||
|
||||
/// Schedule a deferred action: a `Deferred` event carrying `id` is delivered
|
||||
/// from the event loop after the current event finishes. Use this to rebuild or
|
||||
/// destroy a control from outside its own event handler.
|
||||
pub fn call_after(id: i32) {
|
||||
unsafe { notsafe::wxbr_call_after(id as c_int) }
|
||||
}
|
||||
|
||||
/// Reconfigure the frame's status bar to two fields and attach a colour-tinted
|
||||
/// label pinned to the right-hand field (bottom-right corner). Call once after
|
||||
/// `create_status_bar()`. The main scan status keeps using the left field via
|
||||
/// the upstream `set_status_text` path.
|
||||
pub fn status_indicator_init(frame: Widget) {
|
||||
unsafe { notsafe::wxbr_status_indicator_init(frame.0) }
|
||||
}
|
||||
|
||||
/// Add the table-zoom slider + percent label to the frame's status bar (round 14
|
||||
/// #3). Call after the table exists so the slider can find it. The slider scales
|
||||
/// the table entirely in C++; no further Rust calls are needed.
|
||||
pub fn status_zoom_init(frame: Widget) {
|
||||
unsafe { notsafe::wxbr_status_zoom_init(frame.0) }
|
||||
}
|
||||
|
||||
/// Set the table zoom factor programmatically (1.0 = 100%); also moves the slider.
|
||||
pub fn table_set_zoom(factor: f64) {
|
||||
unsafe { notsafe::wxbr_table_set_zoom(factor) }
|
||||
}
|
||||
|
||||
/// Re-apply the current zoom after the table's columns are rebuilt, so a non-100%
|
||||
/// zoom survives a column show/hide/reorder (round 14 #3).
|
||||
pub fn table_zoom_reapply() {
|
||||
unsafe { notsafe::wxbr_table_zoom_reapply() }
|
||||
}
|
||||
|
||||
/// Set the bottom-right status indicator's text and colour (an empty string
|
||||
/// clears it). Used for scan/apply errors (red) and warnings (amber).
|
||||
pub fn status_indicator_set(text: &str, r: u8, g: u8, b: u8) {
|
||||
let c = CString::new(text).unwrap_or_default();
|
||||
unsafe { notsafe::wxbr_status_indicator_set(c.as_ptr(), r as c_int, g as c_int, b as c_int) }
|
||||
}
|
||||
|
||||
/// Register a raw SVG for a table-cell shape sentinel (a control-char code point)
|
||||
/// so the segment renderer can draw it recoloured to each cell's segment colour.
|
||||
/// `vbw`/`vbh` are the SVG viewBox dimensions, used to keep the icon's aspect
|
||||
/// ratio when it is rasterised at the cell height (round 12 #9/#11).
|
||||
pub fn register_shape_svg(sentinel: u32, svg: &str, vbw: i32, vbh: i32) {
|
||||
let c = CString::new(svg).unwrap_or_default();
|
||||
unsafe {
|
||||
notsafe::wxbr_register_shape_svg(sentinel as c_int, c.as_ptr(), vbw as c_int, vbh as c_int)
|
||||
}
|
||||
}
|
||||
|
||||
/// Start (or stop) the locate-light dot fade animation. Call with `true` while at
|
||||
/// least one miner's locate light is flashing so the table repaint timer only
|
||||
/// runs when there is a pulsing dot to animate (round 12 #6).
|
||||
pub fn set_light_pulse(on: bool) {
|
||||
unsafe { notsafe::wxbr_set_light_pulse(on as c_int) }
|
||||
}
|
||||
|
||||
/// Open a URL in the system default browser. Returns true on success.
|
||||
pub fn launch_browser(url: &str) -> bool {
|
||||
let c = CString::new(url).unwrap_or_default();
|
||||
@@ -216,6 +322,14 @@ impl Widget {
|
||||
Widget(unsafe { notsafe::wxbr_box_sizer(vertical as c_int) })
|
||||
}
|
||||
|
||||
/// A box sizer that wraps overflowing items onto additional lines instead
|
||||
/// of shrinking them. wxWrapSizer is a wxBoxSizer subclass, so the result
|
||||
/// accepts the same add/add_sizer/add_spacer/add_stretch/set_sizer_on
|
||||
/// calls as `box_sizer`'s.
|
||||
pub fn wrap_sizer(vertical: bool) -> Widget {
|
||||
Widget(unsafe { notsafe::wxbr_wrap_sizer(vertical as c_int) })
|
||||
}
|
||||
|
||||
pub fn add(&self, win: Widget, proportion: i32, flags: i32, border: i32) {
|
||||
unsafe { notsafe::wxbr_sizer_add(self.0, win.0, proportion, flags, border) }
|
||||
}
|
||||
@@ -249,6 +363,18 @@ impl Widget {
|
||||
unsafe { notsafe::wxbr_sizer_detach(self.0, win.0) }
|
||||
}
|
||||
|
||||
/// Show or hide a child window in this sizer (self = a sizer), reclaiming or
|
||||
/// restoring its space on the next `layout()`.
|
||||
pub fn sizer_show(&self, win: Widget, show: bool) {
|
||||
unsafe { notsafe::wxbr_sizer_show(self.0, win.0, show as c_int) }
|
||||
}
|
||||
|
||||
/// Emit `WxEventKind::Sized` (p1 = width, p2 = height) whenever this window
|
||||
/// is resized.
|
||||
pub fn bind_size(&self) {
|
||||
unsafe { notsafe::wxbr_bind_size(self.0) }
|
||||
}
|
||||
|
||||
pub fn fit(&self, win: Widget) {
|
||||
unsafe { notsafe::wxbr_fit(win.0) }
|
||||
}
|
||||
@@ -257,6 +383,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()) })
|
||||
@@ -292,6 +424,15 @@ impl Widget {
|
||||
Widget(unsafe { notsafe::wxbr_button(parent.0, c.as_ptr(), id) })
|
||||
}
|
||||
|
||||
/// Make this window clickable: a left mouse down on it emits the same
|
||||
/// `ButtonClicked` event a real button would, carrying `id`. Bind each
|
||||
/// child that should also count as part of the click target (e.g. the
|
||||
/// static text labels on a KPI card), since a child window swallows its
|
||||
/// own mouse events rather than letting them propagate to the parent.
|
||||
pub fn bind_click(&self, id: i32) {
|
||||
unsafe { notsafe::wxbr_bind_click(self.0, id) }
|
||||
}
|
||||
|
||||
pub fn text_ctrl(parent: Widget, multiline: bool) -> Widget {
|
||||
Widget(unsafe { notsafe::wxbr_text_ctrl(parent.0, multiline as c_int) })
|
||||
}
|
||||
@@ -309,6 +450,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()) })
|
||||
@@ -371,6 +519,51 @@ impl Widget {
|
||||
unsafe { notsafe::wxbr_dialog_close(self.0, code) }
|
||||
}
|
||||
|
||||
/// Show a native "open file, must exist" dialog. Returns the chosen path,
|
||||
/// or `None` if the dialog was cancelled.
|
||||
pub fn file_dialog(parent: Widget, title: &str) -> Option<String> {
|
||||
let c = CString::new(title).unwrap_or_default();
|
||||
let mut buf = vec![0i8; 4096];
|
||||
let n = unsafe {
|
||||
notsafe::wxbr_file_dialog(parent.0, c.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())
|
||||
}
|
||||
|
||||
/// 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 {
|
||||
@@ -382,6 +575,14 @@ impl Widget {
|
||||
unsafe { notsafe::wxbr_dvlc_append_text_col(self.0, c.as_ptr(), width, reorderable as c_int) }
|
||||
}
|
||||
|
||||
/// 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) {
|
||||
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) };
|
||||
}
|
||||
|
||||
pub fn dvlc_append_toggle_col(&self, width: i32) {
|
||||
unsafe { notsafe::wxbr_dvlc_append_toggle_col(self.0, width) }
|
||||
}
|
||||
@@ -409,6 +610,22 @@ impl Widget {
|
||||
unsafe { notsafe::wxbr_dvlc_set_cell(self.0, row, col, c.as_ptr()) }
|
||||
}
|
||||
|
||||
/// Set the hover tooltip for one cell (empty clears it). GTK only; a no-op
|
||||
/// on other platforms until they gain per-cell tooltip support.
|
||||
pub fn dvlc_set_cell_tooltip(&self, row: usize, col: usize, text: &str) {
|
||||
let c = CString::new(text).unwrap_or_default();
|
||||
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 {
|
||||
@@ -425,6 +642,11 @@ impl Widget {
|
||||
unsafe { notsafe::wxbr_dvlc_col_count(self.0).max(0) as usize }
|
||||
}
|
||||
|
||||
/// Auto-size the column at display position `pos` to fit its content.
|
||||
pub fn dvlc_autosize_col(&self, pos: usize) {
|
||||
unsafe { notsafe::wxbr_dvlc_autosize_col(self.0, pos as c_int) }
|
||||
}
|
||||
|
||||
/// 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) };
|
||||
@@ -459,6 +681,36 @@ impl Widget {
|
||||
unsafe { notsafe::wxbr_dvlc_set_alt_row_color(self.0, r as c_int, g as c_int, b as c_int) }
|
||||
}
|
||||
|
||||
/// Set a row's text colour (e.g. by miner status). Pass `None` to clear it.
|
||||
pub fn dvlc_set_row_color(&self, row: usize, color: Option<(u8, u8, u8)>) {
|
||||
let (r, g, b) = match color {
|
||||
Some((r, g, b)) => (r as c_int, g as c_int, b as c_int),
|
||||
None => (-1, -1, -1),
|
||||
};
|
||||
unsafe { notsafe::wxbr_dvlc_set_row_color(self.0, row, r, g, b) }
|
||||
}
|
||||
|
||||
/// Set the alternating-row (zebra) background colour applied to odd rows.
|
||||
/// Pass `None` to turn zebra striping off.
|
||||
pub fn dvlc_set_zebra(&self, color: Option<(u8, u8, u8)>) {
|
||||
let (r, g, b) = match color {
|
||||
Some((r, g, b)) => (r as c_int, g as c_int, b as c_int),
|
||||
None => (-1, -1, -1),
|
||||
};
|
||||
unsafe { notsafe::wxbr_dvlc_set_zebra(self.0, r, g, b) }
|
||||
}
|
||||
|
||||
/// The model-row index of the top (first visible) row, or `None` if empty.
|
||||
pub fn dvlc_get_top_row(&self) -> Option<usize> {
|
||||
let r = unsafe { notsafe::wxbr_dvlc_get_top_row(self.0) };
|
||||
(r >= 0).then_some(r as usize)
|
||||
}
|
||||
|
||||
/// Scroll so `row` is visible (used to restore scroll position after a refill).
|
||||
pub fn dvlc_ensure_visible(&self, row: usize) {
|
||||
unsafe { notsafe::wxbr_dvlc_ensure_visible(self.0, row) }
|
||||
}
|
||||
|
||||
// ---- rearrangeable check-list ----
|
||||
|
||||
/// Create a rearrangeable checklist. `order` uses wx encoding: a value `v`
|
||||
@@ -480,6 +732,38 @@ impl Widget {
|
||||
buf.into_iter().take(n.max(0) as usize).collect()
|
||||
}
|
||||
|
||||
/// A checkable, multi-select, drag-reorderable column list (round 11 #4):
|
||||
/// like `rearrange_list` but with no up/down buttons -- rows are reordered by
|
||||
/// dragging, and selected with shift/ctrl-click or a rubber-band drag. Same
|
||||
/// `[idx | !idx]` order encoding.
|
||||
pub fn reorder_list(parent: Widget, order: &[i32], items: &[&str]) -> Widget {
|
||||
let cs: Vec<CString> = items.iter().map(|s| CString::new(*s).unwrap_or_default()).collect();
|
||||
let ptrs: Vec<*const c_char> = cs.iter().map(|c| c.as_ptr()).collect();
|
||||
Widget(unsafe {
|
||||
notsafe::wxbr_reorder_list(parent.0, items.len() as c_int, order.as_ptr(), ptrs.as_ptr())
|
||||
})
|
||||
}
|
||||
|
||||
/// Read back the current order from a `reorder_list` (same encoding).
|
||||
pub fn reorder_get_order(&self) -> Vec<i32> {
|
||||
let mut buf = vec![0i32; 4096];
|
||||
let n = unsafe {
|
||||
notsafe::wxbr_reorder_get_order(self.0, buf.as_mut_ptr(), buf.len() as c_int)
|
||||
};
|
||||
buf.into_iter().take(n.max(0) as usize).collect()
|
||||
}
|
||||
|
||||
/// Repopulate a `reorder_list` in a new order (same `[idx | !idx]` encoding
|
||||
/// and same base-index `items` array as `reorder_list`). Used by the column
|
||||
/// picker's Alphabetical / Categories sort buttons.
|
||||
pub fn reorder_set_order(&self, order: &[i32], items: &[&str]) {
|
||||
let cs: Vec<CString> = items.iter().map(|s| CString::new(*s).unwrap_or_default()).collect();
|
||||
let ptrs: Vec<*const c_char> = cs.iter().map(|c| c.as_ptr()).collect();
|
||||
unsafe {
|
||||
notsafe::wxbr_reorder_set_order(self.0, items.len() as c_int, order.as_ptr(), ptrs.as_ptr())
|
||||
}
|
||||
}
|
||||
|
||||
// ---- popup menu ----
|
||||
|
||||
pub fn menu_new() -> Widget {
|
||||
@@ -495,6 +779,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) }
|
||||
@@ -553,9 +844,68 @@ impl Widget {
|
||||
unsafe { notsafe::wxbr_set_fg(self.0, r as c_int, g as c_int, b as c_int) }
|
||||
}
|
||||
|
||||
// ---- choice (dropdown) ----
|
||||
|
||||
/// Create a dropdown; selection changes emit `ChoiceChanged` with this id.
|
||||
pub fn choice(parent: Widget, id: i32) -> Widget {
|
||||
Widget(unsafe { notsafe::wxbr_choice(parent.0, id) })
|
||||
}
|
||||
|
||||
pub fn choice_append(&self, label: &str) {
|
||||
let c = CString::new(label).unwrap_or_default();
|
||||
unsafe { notsafe::wxbr_choice_append(self.0, c.as_ptr()) }
|
||||
}
|
||||
|
||||
pub fn choice_clear(&self) {
|
||||
unsafe { notsafe::wxbr_choice_clear(self.0) }
|
||||
}
|
||||
|
||||
pub fn choice_get_selection(&self) -> i32 {
|
||||
unsafe { notsafe::wxbr_choice_get_selection(self.0) }
|
||||
}
|
||||
|
||||
pub fn choice_set_selection(&self, i: i32) {
|
||||
unsafe { notsafe::wxbr_choice_set_selection(self.0, i) }
|
||||
}
|
||||
|
||||
// ---- media (icon) button ----
|
||||
|
||||
/// A coloured icon button: `kind` 0=play, 1=pause, 2=stop. Clicks emit
|
||||
/// `ButtonClicked` with `id`, like a normal button.
|
||||
pub fn media_button(parent: Widget, id: i32, kind: i32, color: (u8, u8, u8)) -> Widget {
|
||||
Widget(unsafe {
|
||||
notsafe::wxbr_media_button(
|
||||
parent.0,
|
||||
id,
|
||||
kind,
|
||||
color.0 as c_int,
|
||||
color.1 as c_int,
|
||||
color.2 as c_int,
|
||||
)
|
||||
})
|
||||
}
|
||||
|
||||
/// Render an SVG string (recolour it first -- its fill must be an explicit
|
||||
/// colour, not "currentColor") into a static-bitmap icon at `w`x`h` px
|
||||
/// (round 11 #15).
|
||||
pub fn svg_icon(parent: Widget, svg: &str, w: i32, h: i32) -> Widget {
|
||||
let c = CString::new(svg).unwrap_or_default();
|
||||
Widget(unsafe { notsafe::wxbr_svg_icon(parent.0, c.as_ptr(), w as c_int, h as c_int) })
|
||||
}
|
||||
|
||||
/// Listen for OS light/dark theme changes on this window (emits `SysColour`).
|
||||
pub fn bind_sys_colour(&self) {
|
||||
unsafe { notsafe::wxbr_bind_sys_colour(self.0) }
|
||||
}
|
||||
|
||||
/// Deferred destruction (safe from event handlers); used to rebuild
|
||||
/// the table when its column set changes.
|
||||
pub fn destroy(&self) {
|
||||
unsafe { notsafe::wxbr_destroy(self.0) }
|
||||
}
|
||||
|
||||
/// Destroy this window's children (to rebuild dynamic panel contents).
|
||||
pub fn destroy_children(&self) {
|
||||
unsafe { notsafe::wxbr_destroy_children(self.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":"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":"eceda61bfe623493964bda3f6164cdb376be0f1112102dd2895524728fca33de","src/backends/v2020/rpc.rs":"2b24bbb432b302dd15f7a354054fc96c6a75cac2c8e75b8bcc11da37255a05a3","src/backends/v2020/web.rs":"d39b67ed83781b2c4fa84a445b9ffe785ae3001941f800ad9860e050c61c6506","src/backends/v2023_07/firmware.rs":"c07668e351d48dab3e24511b1aa9ab5e408bbcb5a438fdb0542a1377f94b9bbb","src/backends/v2023_07/mod.rs":"8cf8031c39f283bd8531de81b7811db48451aff92328a3676aaffdb3cc96fbad","src/backends/v2023_07/rpc.rs":"2b24bbb432b302dd15f7a354054fc96c6a75cac2c8e75b8bcc11da37255a05a3","src/backends/v2023_07/web.rs":"d39b67ed83781b2c4fa84a445b9ffe785ae3001941f800ad9860e050c61c6506","src/firmware.rs":"55d5b722632c0a5cfcf1f8c8252a88c5a1ece887173bb513cca0b22b874d628f","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":"efcaa6b186c8b6e79e9799a647291b895c5ff59f058722e98455ef68bc97c548","src/backends/v2020/rpc.rs":"b517f88b9125fe1d8a20d5167f5d0d105b1339fce3d1a9fad5592e00470f46fb","src/backends/v2020/web.rs":"a6a3ad3eb77551b098b0092553b02cee43d165476d8c92164e12a1e765753b0d","src/backends/v2023_07/firmware.rs":"c07668e351d48dab3e24511b1aa9ab5e408bbcb5a438fdb0542a1377f94b9bbb","src/backends/v2023_07/mod.rs":"278e4dd04a753858e12df96ead3522aef0616ebf6f27b3da4f1a12b064c19ee6","src/backends/v2023_07/rpc.rs":"2b24bbb432b302dd15f7a354054fc96c6a75cac2c8e75b8bcc11da37255a05a3","src/backends/v2023_07/web.rs":"d39b67ed83781b2c4fa84a445b9ffe785ae3001941f800ad9860e050c61c6506","src/firmware.rs":"e75c21d63218204b61bfab067599402e5c0b20452beaf0b16bfa79bf8afb6b35","src/lib.rs":"53f7acddeff8f7d82f80d09e0a9f91962011f9ccf2e441c4ca05cd7fc4eb292e","src/test/json/mod.rs":"a3ef4d6805bb4f8ea087e3a9b875e5a1664580e1ff3e3cd2015bb0c5c18ae7bb","src/test/json/v2020/devs.json":"df17cdfc9522e23450702b93f70ff701892db54c6ce6d986300453ad5e0d22db","src/test/json/v2020/mod.rs":"4c2512d36af834d400a865a94c2e8b1919f9d8dcbf54ab2530c73861c51af67d","src/test/json/v2020/pools.json":"4c4d19ad3ef0de84bfb18daaa48428b5f7917d23287c0196eacf3a6e389e7634","src/test/json/v2020/stats.json":"6d3cb463abb7539ae77aa44ef38e62a5dc0db54670aeacf3bbd01e83f49aa1fd","src/test/json/v2020/summary.json":"2f18c81f989b7c5f70dcb0ddac0520e56ec98b6da25c24e59354a6126c965dae","src/test/json/v2020/system_info.json":"51d1ce922e39a254518a24be56ca86ef1b5843582fb26c1ff0ec4ff6f8f91ccf","src/test/json/v2020/version.json":"ae898c4c9ea3462c3e79f9de755f1fccb4ef122b94a4a512e61aa74491c1a8e9","src/test/json/v2023_07/l11_stats.json":"2eab324f253ced9a0ea4e46466691e0e71fc6fde7558fec86bd5acf6bb9c717d","src/test/json/v2023_07/l11_summary.json":"1e0fdb61b968005d0ec5393d9dc889b09efb1398ffa427629bcc0a98d1b67c22","src/test/json/v2023_07/l11_version.json":"d116921a71731c6e492aed109731c39561e34a24c7df2a88d11ac52b80f6100a","src/test/json/v2023_07/l9_stats.json":"731ee545f16dafd356d22703248b91a37f74585ad73cc27441eb3461ce53dca0","src/test/json/v2023_07/l9_summary.json":"b32b5131ad46859b270d2dbb6bdba3c4e5d7301298daee4ce56332c98faaf81d","src/test/json/v2023_07/l9_version.json":"82f03ca6ea8873f12c4d9455f21b98c547801b58fbff1dcd83c837c0f337a129","src/test/json/v2023_07/mod.rs":"1360a8b155b120f2e755ede0736bcc0d76a9d1d693b984a1b51a16e6c0413791","src/test/mod.rs":"ed52c3d613eabc4a0346bb38bcfdf7a94933d61e368d3c9094821edeab92f81b"},"package":"0c06e3ecbf95ae3fe5e30aacae55cf6e7ad3d965f4a93b2f85c7b64f61fc75e2"}
|
||||
@@ -14,7 +14,7 @@ use asic_rs_core::{
|
||||
DataCollector, DataExtensions, DataExtractor, DataField, DataLocation, get_by_pointer,
|
||||
},
|
||||
command::MinerCommand,
|
||||
device::DeviceInfo,
|
||||
device::{DeviceInfo, HashAlgorithm},
|
||||
fan::FanData,
|
||||
firmware::FirmwareImage,
|
||||
hashrate::{HashRate, HashRateUnit},
|
||||
@@ -201,10 +201,41 @@ fn miner_conf_with_fan_config(miner_conf: &Value, config: FanConfig) -> Value {
|
||||
Value::Object(payload)
|
||||
}
|
||||
|
||||
/// Infer an Antminer's hash algorithm from its model-family letter, for models
|
||||
/// asic-rs' alias table doesn't recognise (round 13 #5). Only the families whose
|
||||
/// entire product line shares one algorithm are inferred; anything ambiguous
|
||||
/// (the K-series spans Kadena/KHeavyHash/Eaglesong, DR is Blake256 while D is
|
||||
/// X11) is left Unknown rather than guessed wrong.
|
||||
fn infer_antminer_algo(model: &str) -> HashAlgorithm {
|
||||
let upper = model.to_ascii_uppercase();
|
||||
let name = upper
|
||||
.strip_prefix("ANTMINER ")
|
||||
.unwrap_or(&upper)
|
||||
.trim_start();
|
||||
match name.chars().next() {
|
||||
// Z9 / Z11 / Z15 / Z15 Pro / Z15J -- the whole Z line is Equihash.
|
||||
Some('Z') => HashAlgorithm::Equihash,
|
||||
// L3+ / L7 / L9 / L11 -- the whole L line is Scrypt.
|
||||
Some('L') => HashAlgorithm::Scrypt,
|
||||
// S9..S21 and T9..T21 (and future revisions) are all SHA-256.
|
||||
Some('S') | Some('T') => HashAlgorithm::SHA256,
|
||||
_ => HashAlgorithm::Unknown,
|
||||
}
|
||||
}
|
||||
|
||||
impl AntMinerV2020 {
|
||||
pub fn new(ip: IpAddr, model: impl MinerModel) -> Self {
|
||||
let auth = Self::default_auth();
|
||||
let algo = model.hash_algorithm();
|
||||
// asic-rs maps a model string to its algorithm through a fixed alias
|
||||
// table; a model that is not in the table (a Z15J, a not-yet-added
|
||||
// S-series, ...) resolves to HashAlgorithm::Unknown, which then leaves the
|
||||
// miner's hashrate un-bucketed ("unknown hashrate", round 13 #5). When the
|
||||
// table can't place the model, infer the algorithm from its Antminer
|
||||
// family letter for the lines that are single-algorithm end to end.
|
||||
let algo = match model.hash_algorithm() {
|
||||
HashAlgorithm::Unknown => infer_antminer_algo(&model.to_string()),
|
||||
known => known,
|
||||
};
|
||||
AntMinerV2020 {
|
||||
ip,
|
||||
rpc: AntMinerRPCAPI::new(ip),
|
||||
@@ -434,14 +465,29 @@ impl GetDataLocations for AntMinerV2020 {
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
DataField::ControlBoardVersion => vec![(
|
||||
WEB_MINER_TYPE,
|
||||
DataExtractor {
|
||||
func: get_by_pointer,
|
||||
key: Some("/subtype"),
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
// Prefer the explicit control-board subtype from miner_type.cgi, but
|
||||
// carry the kernel build string from get_system_info.cgi too: older
|
||||
// models (e.g. Z15/Z15J) have no miner_type.cgi, and their kernel
|
||||
// string ("...-xilinx-...") names the control board we can actually
|
||||
// read instead of guessing from the model (round 12 #10).
|
||||
DataField::ControlBoardVersion => vec![
|
||||
(
|
||||
WEB_MINER_TYPE,
|
||||
DataExtractor {
|
||||
func: get_by_pointer,
|
||||
key: Some("/subtype"),
|
||||
tag: Some("subtype"),
|
||||
},
|
||||
),
|
||||
(
|
||||
WEB_SYSTEM_INFO,
|
||||
DataExtractor {
|
||||
func: get_by_pointer,
|
||||
key: Some("/system_kernel_version"),
|
||||
tag: Some("kernel"),
|
||||
},
|
||||
),
|
||||
],
|
||||
// cgminer names its summary keys after the unit they are in —
|
||||
// `GHS 5s` on SHA-256 models, `MHS 5s` on Scrypt ones — so keep
|
||||
// the whole entry and let the parse pick the key that is present.
|
||||
@@ -722,6 +768,15 @@ impl GetHashrate for AntMinerV2020 {
|
||||
})
|
||||
})?;
|
||||
|
||||
// Equihash miners (e.g. Z15/Z15J) report a Sol/s rate in the cgminer
|
||||
// "GHS" key, so the key's GigaHash label is wrong -- the value is the
|
||||
// raw Sol/s count. Use the base unit so the magnitude (and SI prefix)
|
||||
// is correct (e.g. ~288000 Sol/s -> "288k", not "288T"). Match by algo,
|
||||
// and by Z15 model name for the Z15J which asic-rs leaves algo Unknown.
|
||||
let is_equihash = self.device_info.algo == HashAlgorithm::Equihash
|
||||
|| self.device_info.model.to_string().to_ascii_uppercase().contains("Z15");
|
||||
let unit = if is_equihash { HashRateUnit::Hash } else { unit };
|
||||
|
||||
Some(
|
||||
HashRate {
|
||||
value,
|
||||
@@ -739,16 +794,33 @@ impl GetExpectedHashrate for AntMinerV2020 {
|
||||
let value = field?
|
||||
.pointer("/hashrate")
|
||||
.and_then(Self::parse_f64_field)?;
|
||||
// Equihash miners (Z15/Z15J) report `total_rateideal` as a Sol/s count in
|
||||
// the same (mislabelled) scale as the realtime "GHS" rate, so reinterpret
|
||||
// it as the base Hash unit -- matching parse_hashrate. Without this,
|
||||
// expected reads ~1e6x larger than realtime and the realtime figure looks
|
||||
// absent next to it (round 12 #10).
|
||||
let is_equihash = self.device_info.algo == HashAlgorithm::Equihash
|
||||
|| self
|
||||
.device_info
|
||||
.model
|
||||
.to_string()
|
||||
.to_ascii_uppercase()
|
||||
.contains("Z15");
|
||||
let unit = if is_equihash {
|
||||
HashRateUnit::Hash
|
||||
} else {
|
||||
// `total_rateideal` does not name its own scale, so take it from
|
||||
// STATS' `rate_unit` (`"GH"` / `"MH"`).
|
||||
field
|
||||
.and_then(|v| v.pointer("/unit"))
|
||||
.and_then(|v| v.as_str())
|
||||
.and_then(|s| HashRateUnit::from_str(s).ok())
|
||||
.unwrap_or(HashRateUnit::GigaHash)
|
||||
};
|
||||
Some(
|
||||
HashRate {
|
||||
value,
|
||||
// `total_rateideal` does not name its own scale, so take it
|
||||
// from STATS' `rate_unit` (`"GH"` / `"MH"`).
|
||||
unit: field
|
||||
.and_then(|v| v.pointer("/unit"))
|
||||
.and_then(|v| v.as_str())
|
||||
.and_then(|s| HashRateUnit::from_str(s).ok())
|
||||
.unwrap_or(HashRateUnit::GigaHash),
|
||||
unit,
|
||||
algo: self.device_info.algo,
|
||||
}
|
||||
.as_unit(HashRateUnit::default()),
|
||||
@@ -761,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;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -879,11 +959,34 @@ impl GetControlBoardVersion for AntMinerV2020 {
|
||||
&self,
|
||||
data: &HashMap<DataField, Value>,
|
||||
) -> Option<MinerControlBoard> {
|
||||
let cb_type = data.extract::<String>(DataField::ControlBoardVersion)?;
|
||||
match cb_type.as_str() {
|
||||
s if s.to_uppercase().contains("AML") => Some(AntMinerControlBoard::AMLogic.into()),
|
||||
_ => AntMinerControlBoard::parse(cb_type.split("_").collect::<Vec<&str>>()[0])
|
||||
.map(|cb| cb.into()),
|
||||
let field = data.get(&DataField::ControlBoardVersion)?;
|
||||
// Explicit control-board subtype (miner_type.cgi) wins when present.
|
||||
let subtype = field
|
||||
.pointer("/subtype")
|
||||
.and_then(|v| v.as_str())
|
||||
.unwrap_or("");
|
||||
if !subtype.is_empty() {
|
||||
return match subtype {
|
||||
s if s.to_uppercase().contains("AML") => Some(AntMinerControlBoard::AMLogic.into()),
|
||||
_ => AntMinerControlBoard::parse(subtype.split('_').next().unwrap_or(subtype))
|
||||
.map(|cb| cb.into()),
|
||||
};
|
||||
}
|
||||
// No subtype (older models): read the control board from the kernel build
|
||||
// string instead of guessing from the model (round 12 #10). Bitmain names
|
||||
// the SoC in the kernel version, e.g. "Linux 4.6.0-xilinx-..." (Z15) or an
|
||||
// AMLogic/Meson kernel on newer AMLogic boards.
|
||||
let kernel = field
|
||||
.pointer("/kernel")
|
||||
.and_then(|v| v.as_str())
|
||||
.unwrap_or("")
|
||||
.to_ascii_lowercase();
|
||||
if kernel.contains("xilinx") || kernel.contains("zynq") {
|
||||
Some(AntMinerControlBoard::Xilinx.into())
|
||||
} else if kernel.contains("aml") || kernel.contains("meson") {
|
||||
Some(AntMinerControlBoard::AMLogic.into())
|
||||
} else {
|
||||
None
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1008,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))
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1366,6 +1477,21 @@ mod tests {
|
||||
AM_DEVS, AM_POOLS, AM_STATS, AM_SUMMARY, AM_SYSTEM_INFO, AM_VERSION,
|
||||
};
|
||||
|
||||
#[test]
|
||||
fn unknown_models_infer_algo_from_family_letter() {
|
||||
// Round 13 #5: a model outside asic-rs' alias table must still resolve a
|
||||
// sensible algorithm from its Antminer family letter instead of Unknown.
|
||||
assert_eq!(infer_antminer_algo("ANTMINER Z15J"), HashAlgorithm::Equihash);
|
||||
assert_eq!(infer_antminer_algo("Z9"), HashAlgorithm::Equihash);
|
||||
assert_eq!(infer_antminer_algo("ANTMINER L15"), HashAlgorithm::Scrypt);
|
||||
assert_eq!(infer_antminer_algo("ANTMINER S23"), HashAlgorithm::SHA256);
|
||||
assert_eq!(infer_antminer_algo("ANTMINER T23"), HashAlgorithm::SHA256);
|
||||
// Ambiguous / unrelated families stay Unknown (K-series spans three
|
||||
// algorithms; a bare unknown string has no family).
|
||||
assert_eq!(infer_antminer_algo("ANTMINER KS7"), HashAlgorithm::Unknown);
|
||||
assert_eq!(infer_antminer_algo("WHATSMINER M30"), HashAlgorithm::Unknown);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn set_miner_conf_payload_matches_cgi_contract_for_pause_resume() {
|
||||
let pre = json!({
|
||||
|
||||
@@ -71,7 +71,17 @@ impl AntMinerRPCAPI {
|
||||
read_stream_response(&mut stream, DEFAULT_RPC_TIMEOUT).await
|
||||
};
|
||||
let response = response?;
|
||||
self.parse_rpc_result(&response)
|
||||
self.parse_rpc_result(&Self::sanitize_cgminer(&response))
|
||||
}
|
||||
|
||||
/// Antminer's cgminer `stats` sometimes emits an array whose objects are not
|
||||
/// comma-separated (`...}{"STATS":0,...` on the Z15/Z15J), which is invalid
|
||||
/// JSON that serde rejects -- dropping the whole stats command and with it
|
||||
/// every stats-derived field (expected hashrate, wattage, fans, hashboards,
|
||||
/// uptime). Insert the missing separators. Well-formed JSON never contains an
|
||||
/// unseparated `}{`, so this is a no-op on valid responses (round 12 #10).
|
||||
fn sanitize_cgminer(response: &str) -> String {
|
||||
response.replace("}{", "},{")
|
||||
}
|
||||
|
||||
fn parse_rpc_result(&self, response: &str) -> anyhow::Result<Value> {
|
||||
|
||||
@@ -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")),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,7 +16,7 @@ use asic_rs_core::{
|
||||
DataCollector, DataExtensions, DataExtractor, DataField, DataLocation, get_by_pointer,
|
||||
},
|
||||
command::MinerCommand,
|
||||
device::DeviceInfo,
|
||||
device::{DeviceInfo, HashAlgorithm},
|
||||
fan::FanData,
|
||||
firmware::FirmwareImage,
|
||||
hashrate::{HashRate, HashRateUnit},
|
||||
@@ -698,6 +698,15 @@ impl GetHashrate for AntMinerV202307 {
|
||||
})
|
||||
})?;
|
||||
|
||||
// Equihash miners (e.g. Z15/Z15J) report a Sol/s rate in the cgminer
|
||||
// "GHS" key, so the key's GigaHash label is wrong -- the value is the
|
||||
// raw Sol/s count. Use the base unit so the magnitude (and SI prefix)
|
||||
// is correct (e.g. ~288000 Sol/s -> "288k", not "288T"). Match by algo,
|
||||
// and by Z15 model name for the Z15J which asic-rs leaves algo Unknown.
|
||||
let is_equihash = self.device_info.algo == HashAlgorithm::Equihash
|
||||
|| self.device_info.model.to_string().to_ascii_uppercase().contains("Z15");
|
||||
let unit = if is_equihash { HashRateUnit::Hash } else { unit };
|
||||
|
||||
Some(
|
||||
HashRate {
|
||||
value,
|
||||
|
||||
@@ -142,18 +142,9 @@ async fn get_model_with_auth(
|
||||
}
|
||||
}
|
||||
|
||||
/// Fetch the firmware version from a miner using digest auth.
|
||||
async fn get_version_with_auth(ip: IpAddr, auth: &MinerAuth) -> Option<semver::Version> {
|
||||
let client = build_discovery_client().ok()?;
|
||||
let data: Response = client
|
||||
.get(format!("http://{ip}/cgi-bin/summary.cgi"))
|
||||
.send_digest_auth((auth.username(), auth.password()))
|
||||
.await
|
||||
.ok()?;
|
||||
|
||||
let json_data = data.json::<serde_json::Value>().await.ok()?;
|
||||
let fw_version = json_data["INFO"]["CompileTime"].as_str().unwrap_or("");
|
||||
|
||||
/// Parse an Antminer cgminer `CompileTime` string ("Mon Dec 14 18:01:42 CST
|
||||
/// 2020") into a date-based semver (year.month.day) used to pick the backend.
|
||||
fn parse_antminer_compile_time(fw_version: &str) -> Option<semver::Version> {
|
||||
let cleaned: String = {
|
||||
let mut parts: Vec<&str> = fw_version.split_whitespace().collect();
|
||||
if parts.len() > 4 {
|
||||
@@ -161,9 +152,7 @@ async fn get_version_with_auth(ip: IpAddr, auth: &MinerAuth) -> Option<semver::V
|
||||
}
|
||||
parts.join(" ")
|
||||
};
|
||||
|
||||
let dt = NaiveDateTime::parse_from_str(&cleaned, "%a %b %e %H:%M:%S %Y").ok()?;
|
||||
|
||||
Some(semver::Version::new(
|
||||
dt.year() as u64,
|
||||
dt.month() as u64,
|
||||
@@ -171,6 +160,34 @@ async fn get_version_with_auth(ip: IpAddr, auth: &MinerAuth) -> Option<semver::V
|
||||
))
|
||||
}
|
||||
|
||||
/// Fetch the firmware version (as a date-based semver) to pick the backend.
|
||||
async fn get_version_with_auth(ip: IpAddr, auth: &MinerAuth) -> Option<semver::Version> {
|
||||
// Newer Antminers expose the firmware CompileTime via summary.cgi.
|
||||
if let Ok(client) = build_discovery_client()
|
||||
&& let Ok(data) = client
|
||||
.get(format!("http://{ip}/cgi-bin/summary.cgi"))
|
||||
.send_digest_auth((auth.username(), auth.password()))
|
||||
.await
|
||||
&& let Ok(json_data) = data.json::<serde_json::Value>().await
|
||||
&& let Some(v) =
|
||||
parse_antminer_compile_time(json_data["INFO"]["CompileTime"].as_str().unwrap_or(""))
|
||||
{
|
||||
return Some(v);
|
||||
}
|
||||
|
||||
// Older models (e.g. Z15/Z15J) have no summary.cgi, so summary-based version
|
||||
// detection returns nothing and the miner would default to the newest
|
||||
// backend and be mis-parsed. Fall back to the cgminer :4028 `version` RPC,
|
||||
// which still reports the CompileTime, so the right (older) backend is picked
|
||||
// (round 12 #10).
|
||||
let rpc = asic_rs_core::util::send_rpc_command(&ip, "version").await?;
|
||||
parse_antminer_compile_time(
|
||||
rpc.pointer("/VERSION/0/CompileTime")
|
||||
.and_then(|v| v.as_str())
|
||||
.unwrap_or(""),
|
||||
)
|
||||
}
|
||||
|
||||
#[async_trait]
|
||||
impl MinerFirmware for AntMinerStockFirmware {
|
||||
/// Uses default credentials. For custom credentials, use `build_miner`
|
||||
|
||||
@@ -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":"fff17902f8fa033d5b67c6131ea2ff01b80f9a9c8e02dd0511e1e87521d23e47","src/backends/v1/web.rs":"3a567a4f581baa5d9d2d4e59d8acc754eec51d49b0a4f5434d87614b037a4a55","src/firmware.rs":"fb88124a51089756cc3271f3d4a234d73add61ab919c4710ef26a52dc8b5ef80","src/lib.rs":"53f7acddeff8f7d82f80d09e0a9f91962011f9ccf2e441c4ca05cd7fc4eb292e","src/test/json/mod.rs":"24191681066d5cf6a3022ad59c1baa92b57e3ce7717bb78d6a682af9e19a38c4","src/test/json/v1/capabilities.json":"d2b3dae7aa2a1e2977e0ddf62cf2d730de64cf12bf62388c12fd23dc5278bbcb","src/test/json/v1/chip_clocks.json":"d1f46d3aad6ad55ec1c02d0b26aa4c5034c1ccaefb130d7b0e46efe48bb122a0","src/test/json/v1/chip_hashrates.json":"9601a1289f93fe4e27c722d51b3a31daa71aec71f2c29e71f6d1eefe01edf7f2","src/test/json/v1/chip_temps.json":"cb7390e424af57f55f0c974ddfe0c98c4d5b4dbcd85887e38ff8caf7b19f62fe","src/test/json/v1/chip_voltages.json":"cb7390e424af57f55f0c974ddfe0c98c4d5b4dbcd85887e38ff8caf7b19f62fe","src/test/json/v1/mod.rs":"5671105221b84b0b6edb2df34b25bfc9e33459da285d4316be0db23ddb630e8d","src/test/json/v1/network.json":"3374b419fa2f0bc19544c670e08118bbc45bd4d121a577c5a6403c8c8100f628","src/test/json/v1/summary.json":"ac8ac018da9d619b5884f283b730bad2bf0a7e8f2032a7119193c9e5d87d6a7c","src/test/json/v1/temps.json":"794edf870985ed4398ead96670b8f5d01deb4d825fb14a8325087a29cd939fa8","src/test/mod.rs":"ed52c3d613eabc4a0346bb38bcfdf7a94933d61e368d3c9094821edeab92f81b"},"package":"268dc7c8b3289fccd3230ff87f7bfc727a3e7e2f6f72ae56ab9d27c63eabc5cf"}
|
||||
@@ -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
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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":"06f28c59112bd40771db1c865d00402ae37f18146a3eaf9de905d3f4a0a6ba51","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"}
|
||||
@@ -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<()> {
|
||||
|
||||
@@ -1 +1 @@
|
||||
{"$comment":"This file only protects against accidental modifications. It is not a security mechanism and does not protect against malicious changes.","files":{".cargo_vcs_info.json":"de321c89f62a60690ba07d6bb145ac688c6141c458638e68b3ed36b50b8de1f1","Cargo.lock":"5942ec7c9cf5c201bd32442d65020dc3ae72e33cb5aaf374b2a26501571a1487","Cargo.toml":"cb9ee00cbb415fa66a71a7d4822839bb3552336ec9ab975ae7b1137c711449cb","Cargo.toml.orig":"08409c395e4d502015da62e97efdc9c5bc6e3076031144f3f5aa35c900c7c735","src/backends/mod.rs":"26591e67688f8d015242295dde5050c4b34986e9980018a855346291a0472206","src/backends/v1_2_0/mod.rs":"c87949458cf3c73ef957b319abc1a39c4755d709d7e3cf5ea9b9b326eb054605","src/backends/v1_2_0/web.rs":"ac89f16bf623f7d85590d34b45c99b0e522d9d434b4c22af7fa8a8a653e09d2e","src/backends/v1_3_0/mod.rs":"722301b45abe8177269cc008a528ae5c5b122f4d0ced28aaa5bee6b5b9f0c062","src/backends/v1_3_0/web.rs":"1ec4cbe6bdc26f165d9e54e9bf2aac4c3706357ce4677dc21113710d4a26c3c1","src/firmware.rs":"168eeffaef90cb1525bb2e126e73905b5205d49215437263813e30323f6b7a05","src/lib.rs":"16ea1c0007fa6d6c86c1f83d3ac9cdf065cd9936cd52f35ef89c227397bbc54a","src/timezone.rs":"309bf23de1bdc9126bde5db8dabff0d2c0fea797dbf2630a772a18539838a05e"},"package":"1cb662e56f104c0fe45c8ccdac13f60cbcaad45ac228f939c6ac46ff40335052"}
|
||||
{"$comment":"This file only protects against accidental modifications. It is not a security mechanism and does not protect against malicious changes.","files":{".cargo_vcs_info.json":"de321c89f62a60690ba07d6bb145ac688c6141c458638e68b3ed36b50b8de1f1","Cargo.lock":"5942ec7c9cf5c201bd32442d65020dc3ae72e33cb5aaf374b2a26501571a1487","Cargo.toml":"cb9ee00cbb415fa66a71a7d4822839bb3552336ec9ab975ae7b1137c711449cb","Cargo.toml.orig":"08409c395e4d502015da62e97efdc9c5bc6e3076031144f3f5aa35c900c7c735","src/backends/mod.rs":"26591e67688f8d015242295dde5050c4b34986e9980018a855346291a0472206","src/backends/v1_2_0/mod.rs":"fc68a12769890e18231255c6a53cb2c68e4706a887d91f49113c6192684340d2","src/backends/v1_2_0/web.rs":"ac89f16bf623f7d85590d34b45c99b0e522d9d434b4c22af7fa8a8a653e09d2e","src/backends/v1_3_0/mod.rs":"0bba1bf94e7a86d763dbedda3bb5d68cf760e17f744204b0bbc0de4e3754f795","src/backends/v1_3_0/web.rs":"1ec4cbe6bdc26f165d9e54e9bf2aac4c3706357ce4677dc21113710d4a26c3c1","src/firmware.rs":"168eeffaef90cb1525bb2e126e73905b5205d49215437263813e30323f6b7a05","src/lib.rs":"16ea1c0007fa6d6c86c1f83d3ac9cdf065cd9936cd52f35ef89c227397bbc54a","src/timezone.rs":"309bf23de1bdc9126bde5db8dabff0d2c0fea797dbf2630a772a18539838a05e"},"package":"1cb662e56f104c0fe45c8ccdac13f60cbcaad45ac228f939c6ac46ff40335052"}
|
||||
@@ -179,11 +179,15 @@ impl GetDataLocations for VnishV120 {
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
// The partner/reseller build name ("WildRose", "vnishreturn", ...) --
|
||||
// combined with the version number in parse_firmware_version so the FW
|
||||
// Version column shows e.g. "WildRose 1.3.5". ApiVersion still carries
|
||||
// the bare /fw_version.
|
||||
DataField::FirmwareVersion => vec![(
|
||||
WEB_INFO,
|
||||
DataExtractor {
|
||||
func: get_by_pointer,
|
||||
key: Some("/fw_version"),
|
||||
key: Some("/build_name"),
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
@@ -415,7 +419,20 @@ impl GetApiVersion for VnishV120 {
|
||||
|
||||
impl GetFirmwareVersion for VnishV120 {
|
||||
fn parse_firmware_version(&self, data: &HashMap<DataField, Value>) -> Option<String> {
|
||||
data.extract::<String>(DataField::FirmwareVersion)
|
||||
// FirmwareVersion carries /build_name (the partner build), ApiVersion the
|
||||
// /fw_version number; show "<build> <version>" when both are present, else
|
||||
// whichever is available.
|
||||
let build = data
|
||||
.extract::<String>(DataField::FirmwareVersion)
|
||||
.filter(|b| !b.is_empty());
|
||||
let version = data
|
||||
.extract::<String>(DataField::ApiVersion)
|
||||
.filter(|v| !v.is_empty());
|
||||
match (build, version) {
|
||||
(Some(b), Some(v)) => Some(format!("{b} {v}")),
|
||||
(Some(b), None) => Some(b),
|
||||
(None, v) => v,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -179,11 +179,13 @@ impl GetDataLocations for VnishV130 {
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
// Partner/reseller build name; combined with the version number in
|
||||
// parse_firmware_version (FW Version shows e.g. "WildRose 1.3.5").
|
||||
DataField::FirmwareVersion => vec![(
|
||||
WEB_INFO,
|
||||
DataExtractor {
|
||||
func: get_by_pointer,
|
||||
key: Some("/fw_version"),
|
||||
key: Some("/build_name"),
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
@@ -423,7 +425,19 @@ impl GetApiVersion for VnishV130 {
|
||||
|
||||
impl GetFirmwareVersion for VnishV130 {
|
||||
fn parse_firmware_version(&self, data: &HashMap<DataField, Value>) -> Option<String> {
|
||||
data.extract::<String>(DataField::FirmwareVersion)
|
||||
// FirmwareVersion carries /build_name (partner build), ApiVersion the
|
||||
// /fw_version number; show "<build> <version>" when both are present.
|
||||
let build = data
|
||||
.extract::<String>(DataField::FirmwareVersion)
|
||||
.filter(|b| !b.is_empty());
|
||||
let version = data
|
||||
.extract::<String>(DataField::ApiVersion)
|
||||
.filter(|v| !v.is_empty());
|
||||
match (build, version) {
|
||||
(Some(b), Some(v)) => Some(format!("{b} {v}")),
|
||||
(Some(b), None) => Some(b),
|
||||
(None, v) => v,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1 +1 @@
|
||||
{"$comment":"This file only protects against accidental modifications. It is not a security mechanism and does not protect against malicious changes.","files":{".cargo_vcs_info.json":"30f09ad063df45fdf223aff235fe2da15cb1a7e79e86d7012074153b91662fc4","Cargo.lock":"9d0886791db53421d3218ab72d964145b86cfbe9738eaf09aac5d3c89a1c0190","Cargo.toml":"8c2e9938436850f2e250e8268ed7b385fce903e2077923b207a0560ca3e3242c","Cargo.toml.orig":"891fcfa45e79d6bc4d838c4f3075618f791bd013c99231da48e752b987f409d5","src/backends/mod.rs":"0f5a0ae31d5443d0d0f41a2540def806196238c92d22761b3ad9843cb2e77f45","src/backends/v1/mod.rs":"80f3915f1e87c6f7483e9bd0e5b1fb5552f8d017634c82eea6150fe5134b171f","src/backends/v1/rpc.rs":"4cee9caeb9bc291c4efec04f4b7fc2b8eaead904a1f2d0f30e13236476d9aac5","src/backends/v2/mod.rs":"a1a054eda0b1466b8ae1693f47d6f2d79cc0ac067eb82320c4d659c9e1eaef0f","src/backends/v2/rpc.rs":"b7afc5357d24de42350d4ec15a6b5a37698e4fd77b2c2cc8071f303ee62e957c","src/backends/v3/mod.rs":"fd232f2df64b148f0998726fc41c089d08080ba25b3ca37bcb1c7f43b08b1c17","src/backends/v3/rpc.rs":"7a5f80aec4af1bcaa0d36e67345aa9acbbd8ead73c0be474f06305358b38e81b","src/error_codes.rs":"de85845f52b1d4e1a0bff73462cef00962b60fad8a3ed71c7bb083c02df3a413","src/firmware.rs":"6d002e481ce0a897c0485b9393b0382fcb25811164e893eb8eb67b2ff392ca0d","src/lib.rs":"710b46c9d934f26f900e1366ca1df5f872896e7d8da03569c0f159859e899cc9","src/test/json/mod.rs":"99760925ccfefc40d2455d3567fb1ecfc99e9e55e70478190ef372a954825909","src/test/json/v1/devs.json":"b4fd010f0bae3584efde93387cf2dab5933b499cc30a2dd7635fdc994b56c3b8","src/test/json/v1/get_psu.json":"8c11b6495e0bd5da496dd5c10ca53ec53b2d8fe9a3737f470ec9ce2c1aaf9d99","src/test/json/v1/get_version.json":"c43e947e654792ab191210d50c6f793ee0dd7af41e8cb59f0722b70f32a203bc","src/test/json/v1/mod.rs":"e79509eee78a1fef63735afe385299813726822c8259a02d1dcf5e8b4db9d04e","src/test/json/v1/pools.json":"b570808a3428a0773d7d2ee322150d8fd0794a33804af970300a7fef128a8a01","src/test/json/v1/status.json":"00ec38dd9f980b7ac0ffd6f815374afdbbed98d601bd8ef18bcf0f76ae0aa853","src/test/json/v1/summary.json":"d6e3e75654eb4019e1f479b3d9cf3097130f1afb85dd3338682c094fd4ab498a","src/test/json/v1/summary_with_errors.json":"1ba682f6ad5c43e41ae22a4069d0f52f04da3f07a18031bf4c07e07b3c59cc97","src/test/json/v2/devs.json":"2d203e41ef6ef337c0c81456b73d08730882c3167403c557c3c9776022a972d1","src/test/json/v2/get_error_code.json":"e90b702fd97bceb4f62dcb8228f75ff5ce930290355dca94eefd7192f7f57009","src/test/json/v2/get_error_code_with_errors.json":"6cb6038366eb3835684421c41be0b2b30ae8ce79a7ed51a85f4f52f70da9df16","src/test/json/v2/get_miner_info.json":"55d2af984833a692f502188ae4df4e41bdc10386b47f921c896a452ef1de9062","src/test/json/v2/get_psu.json":"b43086b65897061521d1f6611e200ef372a1724f9ea1876e347c03d5fb19b8f2","src/test/json/v2/get_version.json":"b17e3a81603b43186b2e15745e6822b6c82b3c6f5928b22f84e683d7728dbfcd","src/test/json/v2/mod.rs":"c847205d076323bbd9698e393d241b08f3cf75d32aae86f7058cf8748266b935","src/test/json/v2/pools.json":"926d34e8dae774473ebfec83d4a38e77ca73231708f07683763e212be7af0580","src/test/json/v2/status.json":"fc268cd23864ef99e84813dbf8eb916b2e6f339351a0ee5dab217cbe02569fc3","src/test/json/v2/summary.json":"4e4c01b986e2960893f58d0f1ea4dce23b8ef88db4985348f7f0183eb4818478","src/test/json/v3/get_device_info.json":"83ac22ea9a11adbceb4c963db80aa62d9a2aa50d019a372394dece817d924cda","src/test/json/v3/get_device_info_with_errors.json":"24cee4b7840e87e12147cbfddf6c361f3b378a15bb85330b339d3be9e17cdbd5","src/test/json/v3/get_miner_status_edevs.json":"2d831c06113f555e0988df994c2e602a053a4aea603dded0db8f0f80e191ca5a","src/test/json/v3/get_miner_status_pools.json":"cd65c2efd3a5ce80b57aae46c420298a34ca06df7ac7f8c36fd556217703d242","src/test/json/v3/get_miner_status_summary.json":"799a94ba13ef54aed0f81a3d041d6c1fa263d4183754b384c69ca12d85a8d3ba","src/test/json/v3/mod.rs":"7ea3a8ff1b81c7a5b0f44f7c12dda880a9aeac5b0e6b56ac4fff4f4a7cbfe451","src/test/mod.rs":"ed52c3d613eabc4a0346bb38bcfdf7a94933d61e368d3c9094821edeab92f81b"},"package":"c85da6325b62f061327dc5f7605dd3721c823a9e8a2cfd6a356363dfbc84d66e"}
|
||||
{"$comment":"This file only protects against accidental modifications. It is not a security mechanism and does not protect against malicious changes.","files":{".cargo_vcs_info.json":"30f09ad063df45fdf223aff235fe2da15cb1a7e79e86d7012074153b91662fc4","Cargo.lock":"9d0886791db53421d3218ab72d964145b86cfbe9738eaf09aac5d3c89a1c0190","Cargo.toml":"8c2e9938436850f2e250e8268ed7b385fce903e2077923b207a0560ca3e3242c","Cargo.toml.orig":"891fcfa45e79d6bc4d838c4f3075618f791bd013c99231da48e752b987f409d5","src/backends/mod.rs":"0f5a0ae31d5443d0d0f41a2540def806196238c92d22761b3ad9843cb2e77f45","src/backends/v1/mod.rs":"3a8bdecd1eb271de474b2aca85b5f8e598ba64fe5defc9c8dd9b8c66444a2ed4","src/backends/v1/rpc.rs":"72f9b67c2389ab6e9968e0eb340bd2b6aad9aaf059f4429eb31398863bb87f42","src/backends/v2/mod.rs":"68fd8c1762b424a7785174fdb3ae4fede1d599632657808d4b7c76bcfbfb202c","src/backends/v2/rpc.rs":"52f8d504c236009b020bf33b5550236e36d07b2c73a15bdcfcafa5188e4e1cb6","src/backends/v3/mod.rs":"f19e673c47c2cc366e2ff7782bca93daf750563d62221a12a043b3ee79a15251","src/backends/v3/rpc.rs":"7a5f80aec4af1bcaa0d36e67345aa9acbbd8ead73c0be474f06305358b38e81b","src/error_codes.rs":"b2af610880fb400a9e6297662371a6b3b55077b72cf11115b77fd4d2df44e6a1","src/firmware.rs":"6d002e481ce0a897c0485b9393b0382fcb25811164e893eb8eb67b2ff392ca0d","src/lib.rs":"710b46c9d934f26f900e1366ca1df5f872896e7d8da03569c0f159859e899cc9","src/test/json/mod.rs":"99760925ccfefc40d2455d3567fb1ecfc99e9e55e70478190ef372a954825909","src/test/json/v1/devs.json":"b4fd010f0bae3584efde93387cf2dab5933b499cc30a2dd7635fdc994b56c3b8","src/test/json/v1/get_psu.json":"8c11b6495e0bd5da496dd5c10ca53ec53b2d8fe9a3737f470ec9ce2c1aaf9d99","src/test/json/v1/get_version.json":"c43e947e654792ab191210d50c6f793ee0dd7af41e8cb59f0722b70f32a203bc","src/test/json/v1/mod.rs":"e79509eee78a1fef63735afe385299813726822c8259a02d1dcf5e8b4db9d04e","src/test/json/v1/pools.json":"b570808a3428a0773d7d2ee322150d8fd0794a33804af970300a7fef128a8a01","src/test/json/v1/status.json":"00ec38dd9f980b7ac0ffd6f815374afdbbed98d601bd8ef18bcf0f76ae0aa853","src/test/json/v1/summary.json":"d6e3e75654eb4019e1f479b3d9cf3097130f1afb85dd3338682c094fd4ab498a","src/test/json/v1/summary_with_errors.json":"1ba682f6ad5c43e41ae22a4069d0f52f04da3f07a18031bf4c07e07b3c59cc97","src/test/json/v2/devs.json":"2d203e41ef6ef337c0c81456b73d08730882c3167403c557c3c9776022a972d1","src/test/json/v2/get_error_code.json":"e90b702fd97bceb4f62dcb8228f75ff5ce930290355dca94eefd7192f7f57009","src/test/json/v2/get_error_code_with_errors.json":"6cb6038366eb3835684421c41be0b2b30ae8ce79a7ed51a85f4f52f70da9df16","src/test/json/v2/get_miner_info.json":"55d2af984833a692f502188ae4df4e41bdc10386b47f921c896a452ef1de9062","src/test/json/v2/get_psu.json":"b43086b65897061521d1f6611e200ef372a1724f9ea1876e347c03d5fb19b8f2","src/test/json/v2/get_version.json":"b17e3a81603b43186b2e15745e6822b6c82b3c6f5928b22f84e683d7728dbfcd","src/test/json/v2/mod.rs":"c847205d076323bbd9698e393d241b08f3cf75d32aae86f7058cf8748266b935","src/test/json/v2/pools.json":"926d34e8dae774473ebfec83d4a38e77ca73231708f07683763e212be7af0580","src/test/json/v2/status.json":"fc268cd23864ef99e84813dbf8eb916b2e6f339351a0ee5dab217cbe02569fc3","src/test/json/v2/summary.json":"4e4c01b986e2960893f58d0f1ea4dce23b8ef88db4985348f7f0183eb4818478","src/test/json/v3/get_device_info.json":"83ac22ea9a11adbceb4c963db80aa62d9a2aa50d019a372394dece817d924cda","src/test/json/v3/get_device_info_with_errors.json":"24cee4b7840e87e12147cbfddf6c361f3b378a15bb85330b339d3be9e17cdbd5","src/test/json/v3/get_miner_status_edevs.json":"2d831c06113f555e0988df994c2e602a053a4aea603dded0db8f0f80e191ca5a","src/test/json/v3/get_miner_status_pools.json":"cd65c2efd3a5ce80b57aae46c420298a34ca06df7ac7f8c36fd556217703d242","src/test/json/v3/get_miner_status_summary.json":"799a94ba13ef54aed0f81a3d041d6c1fa263d4183754b384c69ca12d85a8d3ba","src/test/json/v3/mod.rs":"7ea3a8ff1b81c7a5b0f44f7c12dda880a9aeac5b0e6b56ac4fff4f4a7cbfe451","src/test/mod.rs":"ed52c3d613eabc4a0346bb38bcfdf7a94933d61e368d3c9094821edeab92f81b"},"package":"c85da6325b62f061327dc5f7605dd3721c823a9e8a2cfd6a356363dfbc84d66e"}
|
||||
@@ -26,8 +26,9 @@ use async_trait::async_trait;
|
||||
use macaddr::MacAddr;
|
||||
use measurements::{AngularVelocity, Frequency, Power, Temperature};
|
||||
use rpc::WhatsMinerRPCAPI;
|
||||
use asic_rs_core::util::is_expected_write_error;
|
||||
use semver::Version;
|
||||
use serde_json::Value;
|
||||
use serde_json::{Value, json};
|
||||
|
||||
use crate::firmware::WhatsMinerFirmware;
|
||||
|
||||
@@ -37,6 +38,12 @@ mod rpc;
|
||||
pub struct WhatsMinerV1 {
|
||||
pub ip: IpAddr,
|
||||
pub rpc: WhatsMinerRPCAPI,
|
||||
// Privileged (token-authenticated) writes reuse the V2 btminer RPC client:
|
||||
// pre-2022-07-29 miners speak the same classic get_token + AES-ECB write API
|
||||
// as V2 (proven live via the access-probe token handshake), so the control
|
||||
// commands share V2's implementation instead of the read-only V1 rpc above
|
||||
// (round 12 #8b part 2).
|
||||
pub write_rpc: crate::backends::v2::rpc::WhatsMinerRPCAPI,
|
||||
pub device_info: DeviceInfo,
|
||||
}
|
||||
|
||||
@@ -45,6 +52,11 @@ impl WhatsMinerV1 {
|
||||
WhatsMinerV1 {
|
||||
ip,
|
||||
rpc: WhatsMinerRPCAPI::new(ip, None),
|
||||
write_rpc: crate::backends::v2::rpc::WhatsMinerRPCAPI::new(
|
||||
ip,
|
||||
None,
|
||||
MinerAuth::new("admin", "admin"),
|
||||
),
|
||||
device_info: DeviceInfo::new(
|
||||
model,
|
||||
WhatsMinerFirmware::default(),
|
||||
@@ -105,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![(
|
||||
@@ -131,14 +147,28 @@ impl GetDataLocations for WhatsMinerV1 {
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
DataField::ControlBoardVersion => vec![(
|
||||
RPC_SUMMARY,
|
||||
DataExtractor {
|
||||
func: get_by_pointer,
|
||||
key: Some("/SUMMARY/0/CB Platform"),
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
DataField::ControlBoardVersion => vec![
|
||||
(
|
||||
RPC_SUMMARY,
|
||||
DataExtractor {
|
||||
func: get_by_pointer,
|
||||
key: Some("/SUMMARY/0/CB Platform"),
|
||||
tag: None,
|
||||
},
|
||||
),
|
||||
// Older M30S firmware (< 2022.7.29, so this v1 backend) often omits
|
||||
// "CB Platform" from summary but still reports the board under
|
||||
// get_version /Msg/platform (the source v2 uses). Fall back to it so
|
||||
// those units don't show a blank control board.
|
||||
(
|
||||
RPC_GET_VERSION,
|
||||
DataExtractor {
|
||||
func: get_by_pointer,
|
||||
key: Some("/Msg/platform"),
|
||||
tag: None,
|
||||
},
|
||||
),
|
||||
],
|
||||
DataField::TuningTarget => vec![(
|
||||
RPC_SUMMARY,
|
||||
DataExtractor {
|
||||
@@ -228,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,
|
||||
},
|
||||
)],
|
||||
@@ -285,8 +315,12 @@ impl GetControlBoardVersion for WhatsMinerV1 {
|
||||
) -> Option<MinerControlBoard> {
|
||||
data.extract::<String>(DataField::ControlBoardVersion)
|
||||
.and_then(|s| {
|
||||
WhatsMinerControlBoard::parse(s.to_uppercase().strip_prefix("ALLWINNER_")?)
|
||||
.map(|cb| cb.into())
|
||||
// The "ALLWINNER_" prefix is optional: summary's CB Platform carries
|
||||
// it (e.g. "ALLWINNER_H6"), but the get_version /Msg/platform fallback
|
||||
// does not (e.g. "H6OS"). Strip it only when present.
|
||||
let up = s.to_uppercase();
|
||||
let board = up.strip_prefix("ALLWINNER_").unwrap_or(&up);
|
||||
WhatsMinerControlBoard::parse(board).map(|cb| cb.into())
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -441,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
|
||||
}
|
||||
}
|
||||
@@ -542,17 +587,45 @@ impl GetPools for WhatsMinerV1 {
|
||||
}
|
||||
}
|
||||
|
||||
#[async_trait]
|
||||
// Control commands (round 12 #8b part 2): the classic btminer token write API is
|
||||
// the same on V1-era firmware as on V2, so these mirror the V2 backend but go
|
||||
// through `write_rpc`. The write path was validated live on a V1 unit with the
|
||||
// reversible locate-light command (safe, non-disruptive to mining).
|
||||
#[async_trait]
|
||||
impl SetFaultLight for WhatsMinerV1 {
|
||||
async fn set_fault_light(&self, fault: bool) -> anyhow::Result<bool> {
|
||||
let parameters = match fault {
|
||||
false => Some(json!({"param": "auto"})),
|
||||
true => Some(json!({"color": "red", "period": 200, "duration": 100, "start": 0})),
|
||||
};
|
||||
let data = self.write_rpc.send_command("set_led", true, parameters).await;
|
||||
Ok(data.is_ok())
|
||||
}
|
||||
fn supports_set_fault_light(&self) -> bool {
|
||||
false
|
||||
true
|
||||
}
|
||||
}
|
||||
|
||||
#[async_trait]
|
||||
impl SetPowerLimit for WhatsMinerV1 {
|
||||
async fn set_power_limit(&self, limit: Power) -> anyhow::Result<bool> {
|
||||
let parameters = Some(json!({"power_limit": limit.as_watts().to_string()}));
|
||||
match self
|
||||
.write_rpc
|
||||
.send_command("adjust_power_limit", true, parameters)
|
||||
.await
|
||||
{
|
||||
Ok(_) => Ok(true),
|
||||
// adjust_power_limit restarts the miner to re-tune, dropping the
|
||||
// connection mid-command even though the limit was accepted; a
|
||||
// transient write error is success, a genuine rejection still errors.
|
||||
Err(e) if is_expected_write_error(&e) => Ok(true),
|
||||
Err(e) => Err(e),
|
||||
}
|
||||
}
|
||||
fn supports_set_power_limit(&self) -> bool {
|
||||
false
|
||||
true
|
||||
}
|
||||
}
|
||||
|
||||
@@ -567,29 +640,77 @@ impl SupportsPoolsConfig for WhatsMinerV1 {
|
||||
.collect())
|
||||
}
|
||||
|
||||
async fn set_pools_config(&self, config: Vec<PoolGroupConfig>) -> anyhow::Result<bool> {
|
||||
let group = config
|
||||
.into_iter()
|
||||
.next()
|
||||
.ok_or_else(|| anyhow::anyhow!("No pool groups provided"))?;
|
||||
let mut params = serde_json::Map::new();
|
||||
for n in 1..=3 {
|
||||
let pool = group.pools.get(n - 1);
|
||||
params.insert(
|
||||
format!("pool{n}"),
|
||||
json!(pool.map(|p| p.url.to_string()).unwrap_or_default()),
|
||||
);
|
||||
params.insert(
|
||||
format!("worker{n}"),
|
||||
json!(pool.map(|p| p.username.as_str()).unwrap_or_default()),
|
||||
);
|
||||
params.insert(
|
||||
format!("passwd{n}"),
|
||||
json!(pool.map(|p| p.password.as_str()).unwrap_or_default()),
|
||||
);
|
||||
}
|
||||
Ok(self
|
||||
.write_rpc
|
||||
.send_command("update_pools", true, Some(json!(params)))
|
||||
.await
|
||||
.is_ok())
|
||||
}
|
||||
|
||||
fn supports_pools_config(&self) -> bool {
|
||||
false
|
||||
true
|
||||
}
|
||||
}
|
||||
|
||||
#[async_trait]
|
||||
impl Restart for WhatsMinerV1 {
|
||||
async fn restart(&self) -> anyhow::Result<bool> {
|
||||
// The miner often reboots before replying, so any error is treated as
|
||||
// "rebooting".
|
||||
let _ = self.write_rpc.send_command("reboot", true, None).await;
|
||||
Ok(true)
|
||||
}
|
||||
fn supports_restart(&self) -> bool {
|
||||
false
|
||||
true
|
||||
}
|
||||
}
|
||||
|
||||
#[async_trait]
|
||||
impl Pause for WhatsMinerV1 {
|
||||
#[allow(unused_variables)]
|
||||
async fn pause(&self, at_time: Option<Duration>) -> anyhow::Result<bool> {
|
||||
// Fire-and-forget: the miner may power off before responding.
|
||||
let _ = self
|
||||
.write_rpc
|
||||
.send_command("power_off", true, Some(json!({"respbefore": "true"})))
|
||||
.await;
|
||||
Ok(true)
|
||||
}
|
||||
fn supports_pause(&self) -> bool {
|
||||
false
|
||||
true
|
||||
}
|
||||
}
|
||||
|
||||
#[async_trait]
|
||||
impl Resume for WhatsMinerV1 {
|
||||
#[allow(unused_variables)]
|
||||
async fn resume(&self, at_time: Option<Duration>) -> anyhow::Result<bool> {
|
||||
let data = self.write_rpc.send_command("power_on", true, None).await;
|
||||
Ok(data.is_ok())
|
||||
}
|
||||
fn supports_resume(&self) -> bool {
|
||||
false
|
||||
true
|
||||
}
|
||||
}
|
||||
|
||||
@@ -625,7 +746,13 @@ impl UpgradeFirmware for WhatsMinerV1 {
|
||||
}
|
||||
}
|
||||
|
||||
impl HasAuth for WhatsMinerV1 {}
|
||||
impl HasAuth for WhatsMinerV1 {
|
||||
fn set_auth(&mut self, auth: MinerAuth) {
|
||||
// WhatsMiner's token account is always "admin"; only the password varies.
|
||||
// Route it to the privileged write RPC (round 12 #8b part 2).
|
||||
self.write_rpc.set_auth(MinerAuth::new("admin", auth.password()));
|
||||
}
|
||||
}
|
||||
impl HasDefaultAuth for WhatsMinerV1 {}
|
||||
|
||||
impl Validate for WhatsMinerV1 {
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
|
||||
@@ -637,11 +637,21 @@ impl SetFaultLight for WhatsMinerV2 {
|
||||
impl SetPowerLimit for WhatsMinerV2 {
|
||||
async fn set_power_limit(&self, limit: Power) -> anyhow::Result<bool> {
|
||||
let parameters = Some(json!({"power_limit": limit.as_watts().to_string()}));
|
||||
let data = self
|
||||
match self
|
||||
.rpc
|
||||
.send_command("adjust_power_limit", true, parameters)
|
||||
.await;
|
||||
Ok(data.is_ok())
|
||||
.await
|
||||
{
|
||||
Ok(_) => Ok(true),
|
||||
// adjust_power_limit makes the miner restart to re-tune, so it drops
|
||||
// the connection / stops replying mid-command even though it accepted
|
||||
// and applied the new limit (verified on the live fleet: the set value
|
||||
// settles after the restart). A transient RPC error (read timeout /
|
||||
// connection reset) after the command is therefore success; a genuine
|
||||
// rejection surfaces as StatusCheckFailed and still errors.
|
||||
Err(e) if is_expected_write_error(&e) => Ok(true),
|
||||
Err(e) => Err(e),
|
||||
}
|
||||
}
|
||||
fn supports_set_power_limit(&self) -> bool {
|
||||
true
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
|
||||
@@ -669,12 +669,21 @@ impl SetFaultLight for WhatsMinerV3 {
|
||||
#[async_trait]
|
||||
impl SetPowerLimit for WhatsMinerV3 {
|
||||
async fn set_power_limit(&self, limit: Power) -> anyhow::Result<bool> {
|
||||
let data = self
|
||||
// WhatsMinerOS wants a BARE INTEGER watt value; a float ("3000.0")
|
||||
// trips the firmware's "invalid json" parser (round-9 #4).
|
||||
let watts = limit.as_watts().round() as u64;
|
||||
match self
|
||||
.rpc
|
||||
.send_command("set.miner.power_limit", true, Some(json!(limit.as_watts())))
|
||||
.await;
|
||||
|
||||
Ok(data.is_ok())
|
||||
.send_command("set.miner.power_limit", true, Some(json!(watts)))
|
||||
.await
|
||||
{
|
||||
Ok(_) => Ok(true),
|
||||
// A power-limit change restarts the miner to re-tune, so a transient
|
||||
// RPC error after the command means it was accepted (as with v2), not
|
||||
// rejected; a genuine rejection is a StatusCheckFailed and still errors.
|
||||
Err(e) if is_expected_write_error(&e) => Ok(true),
|
||||
Err(e) => Err(e),
|
||||
}
|
||||
}
|
||||
fn supports_set_power_limit(&self) -> bool {
|
||||
true
|
||||
@@ -806,8 +815,15 @@ impl HasDefaultAuth for WhatsMinerV3 {
|
||||
|
||||
impl HasAuth for WhatsMinerV3 {
|
||||
fn set_auth(&mut self, auth: MinerAuth) {
|
||||
// WhatsMiner V3 username is always "super", V2 is always "admin"
|
||||
self.rpc.set_auth(MinerAuth::new("super", auth.password()));
|
||||
// WhatsMiner V3 username is always "super", V2 is always "admin".
|
||||
// The V3 privileged token authenticates against the "super" ACCOUNT,
|
||||
// whose password is a separate v3 credential (factory default "super")
|
||||
// -- NOT the web/admin password carried by `auth`. Pairing account
|
||||
// "super" with the web password made every v3 privileged write fail with
|
||||
// "invalid json or password is wrong" (round-9 #4, confirmed on the live
|
||||
// fleet). Keep the super-account default password here; the web password
|
||||
// still drives the v2 (admin) path below.
|
||||
self.rpc.set_auth(MinerAuth::new("super", "super"));
|
||||
self.v2_rpc
|
||||
.set_auth(MinerAuth::new("admin", auth.password()));
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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":"aaaa0f14e3aff2543d3d09a4515efa5ab439f0651a36b582e87b9843d0475752","Cargo.lock":"58da2f3399ff680bf7d619204897b4edf5c03d336a8c3cceb54c9aba280bfed1","Cargo.toml":"57f92bf3808fa6f468dbabf43763a808d9ead128eef83b748f940ef3b219a80e","Cargo.toml.orig":"cbfb99fc843dd61ad2025dcfc16bd435afd2b6d43c2c983867af08af415916f1","src/hardware.rs":"77612b4f39e9c15355172b0582693d86b2fe44a305f5b01eef592e5a34b37188","src/lib.rs":"b2f55767a7f3fdacb1e898c5cb961c2dec8481823f94386ee67628960e91bf7d","src/make.rs":"e968e4dbd745d485fc9ad4c5a4c081d679eddce11f66e572f81f2dbe37ede3f0","src/models.rs":"da72a570d8cbb2c843c04047c3d879ca9709455f9bd6a02c3f2ab739e1b5be60"},"package":"67cca6e6bf4ac14562084ce7534521ffa7cd313fa39e2392f98ff98a047a4353"}
|
||||
{"$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":"aaaa0f14e3aff2543d3d09a4515efa5ab439f0651a36b582e87b9843d0475752","Cargo.lock":"58da2f3399ff680bf7d619204897b4edf5c03d336a8c3cceb54c9aba280bfed1","Cargo.toml":"57f92bf3808fa6f468dbabf43763a808d9ead128eef83b748f940ef3b219a80e","Cargo.toml.orig":"cbfb99fc843dd61ad2025dcfc16bd435afd2b6d43c2c983867af08af415916f1","src/hardware.rs":"6a52c19b38be83fe47ccf8f6c6fe3b7d9597575b79366fbc678ea3586953dd52","src/lib.rs":"b2f55767a7f3fdacb1e898c5cb961c2dec8481823f94386ee67628960e91bf7d","src/make.rs":"e968e4dbd745d485fc9ad4c5a4c081d679eddce11f66e572f81f2dbe37ede3f0","src/models.rs":"b4ea44fc627ff6c8b41bf8758d6ce6074aa690fe9f6c95a9cb3d1cdbd00e51d6"},"package":"67cca6e6bf4ac14562084ce7534521ffa7cd313fa39e2392f98ff98a047a4353"}
|
||||
@@ -98,6 +98,10 @@ impl From<AntMinerModel> for MinerHardware {
|
||||
fans: Some(2),
|
||||
boards: Some(vec![Some(6), Some(6), Some(6)]),
|
||||
},
|
||||
AntMinerModel::Z15J => Self {
|
||||
fans: Some(2),
|
||||
boards: Some(vec![Some(3), Some(3), Some(3)]),
|
||||
},
|
||||
AntMinerModel::S17 => Self {
|
||||
fans: Some(4),
|
||||
boards: Some(vec![Some(48), Some(48), Some(48)]),
|
||||
@@ -268,11 +272,13 @@ impl AntMinerControlBoard {
|
||||
.collect::<String>();
|
||||
|
||||
match compact.as_str() {
|
||||
"XILINX" => Some(Self::Xilinx),
|
||||
// "XIL" is VNish's short platform form for a Xilinx control board.
|
||||
"XILINX" | "XIL" => Some(Self::Xilinx),
|
||||
"BBB" | "BBCTRL" | "BB" | "BEAGLEBONE" | "BEAGLEBONEBLACK" => {
|
||||
Some(Self::BeagleBoneBlack)
|
||||
}
|
||||
"CVITEK" | "CVCTRL" => Some(Self::CVITek),
|
||||
// "CV" is VNish's short platform form for a CVITek control board.
|
||||
"CVITEK" | "CVCTRL" | "CV" => Some(Self::CVITek),
|
||||
"AMLOGIC" | "AML" => Some(Self::AMLogic),
|
||||
"AMCB07" => Some(Self::Xilinx), // Mara FW
|
||||
"ZYNQ7007" => Some(Self::Xilinx),
|
||||
|
||||
@@ -78,6 +78,9 @@ pub enum AntMinerModel {
|
||||
#[serde(alias = "ANTMINER Z15 PRO")]
|
||||
#[algorithm(HashAlgorithm::Equihash)]
|
||||
Z15Pro,
|
||||
#[serde(alias = "ANTMINER Z15J")]
|
||||
#[algorithm(HashAlgorithm::Equihash)]
|
||||
Z15J,
|
||||
#[serde(alias = "ANTMINER S17")]
|
||||
#[algorithm(HashAlgorithm::SHA256)]
|
||||
S17,
|
||||
@@ -281,11 +284,21 @@ mod tests {
|
||||
(AntMinerModel::E9Pro, HashAlgorithm::EtHash),
|
||||
(AntMinerModel::Z15, HashAlgorithm::Equihash),
|
||||
(AntMinerModel::Z15Pro, HashAlgorithm::Equihash),
|
||||
(AntMinerModel::Z15J, HashAlgorithm::Equihash),
|
||||
] {
|
||||
assert_eq!(model.hash_algorithm(), expected, "{model}");
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn z15j_parses_as_equihash() {
|
||||
// The Z15J reports "ANTMINER Z15J"; before it had an alias it fell back to
|
||||
// Unknown, which left its Sol/s hashrate un-bucketed (round 13 #5).
|
||||
let model = AntMinerModel::from_str("ANTMINER Z15J").unwrap();
|
||||
assert_eq!(model, AntMinerModel::Z15J);
|
||||
assert_eq!(model.hash_algorithm(), HashAlgorithm::Equihash);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn unknown_model_uses_unknown_algorithm() {
|
||||
let model = AntMinerModel::from_str("ANTMINER S99").unwrap();
|
||||
|
||||