Skip to content

Commit 3cb7f9e

Browse files
committed
Merge: V36 native colors + signaling brightness fix
2 parents 1b9c59d + c9e4aea commit 3cb7f9e

1 file changed

Lines changed: 30 additions & 16 deletions

File tree

web-static/dashboard.html

Lines changed: 30 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2141,6 +2141,10 @@ <h4>Chain Window</h4>
21412141
<span class="label">Pool Fee</span>
21422142
<span class="value" id="defrag-fee" style="color:#9c27b0">-</span>
21432143
</div>
2144+
<div class="defrag-stat-row">
2145+
<span class="label">V36 Native</span>
2146+
<span class="value" id="defrag-v36native" style="color:#00e676">-</span>
2147+
</div>
21442148
<div class="defrag-stat-row">
21452149
<span class="label">V36 Signaling</span>
21462150
<span class="value" id="defrag-v36sig" style="color:#0097a7">-</span>
@@ -2154,12 +2158,20 @@ <h4>Chain Window</h4>
21542158
<div class="defrag-legend">
21552159
<h4>Legend</h4>
21562160
<div class="legend-item">
2157-
<div class="legend-swatch" style="background:#008de4"></div>
2161+
<div class="legend-swatch" style="background:#00b0ff"></div>
21582162
<span>This Node</span>
21592163
</div>
21602164
<div class="legend-item">
2161-
<div class="legend-swatch" style="background:#28a745"></div>
2162-
<span>Verified (others)</span>
2165+
<div class="legend-swatch" style="background:#00e676"></div>
2166+
<span>V36 (others)</span>
2167+
</div>
2168+
<div class="legend-item">
2169+
<div class="legend-swatch" style="background:#26c6da"></div>
2170+
<span>V36 signaling</span>
2171+
</div>
2172+
<div class="legend-item">
2173+
<div class="legend-swatch" style="background:#2e7d32"></div>
2174+
<span>V35 only</span>
21632175
</div>
21642176
<div class="legend-item">
21652177
<div class="legend-swatch" style="background:#555577"></div>
@@ -2177,10 +2189,6 @@ <h4>Legend</h4>
21772189
<div class="legend-swatch" style="background:#9c27b0"></div>
21782190
<span>Pool fee share</span>
21792191
</div>
2180-
<div class="legend-item">
2181-
<div class="legend-swatch" style="background:#0097a7"></div>
2182-
<span>V36 signaling</span>
2183-
</div>
21842192
<div class="legend-item">
21852193
<div class="legend-swatch" style="background:#28a745;border:2px solid #ffd700;box-shadow:0 0 3px rgba(255,215,0,0.5)"></div>
21862194
<span>LTC block</span>
@@ -4730,15 +4738,20 @@ <h4>Legend</h4>
47304738
// Pool fee share - purple
47314739
if (share.fee) return '#9c27b0';
47324740

4733-
// V36-desired signaling shares - teal tint
4734-
var isV36Signal = share.dv && share.dv >= 36 && share.V < 36;
4735-
47364741
var isMine = this.myAddress && share.m === this.myAddress;
4742+
var isV36Native = share.V >= 36;
4743+
var isV36Signal = !isV36Native && share.dv && share.dv >= 36;
47374744

4738-
if (isMine) {
4739-
return isV36Signal ? '#0097a7' : '#008de4';
4745+
if (isV36Native) {
4746+
// V36 native — brightest: cyan-green / bright blue
4747+
return isMine ? '#00b0ff' : '#00e676';
4748+
}
4749+
if (isV36Signal) {
4750+
// V35 signaling V36 — bright teal (rewarded visually)
4751+
return isMine ? '#0097a7' : '#26c6da';
47404752
}
4741-
return isV36Signal ? '#2e7d32' : '#28a745';
4753+
// V35 only (not signaling) — dim muted green / blue
4754+
return isMine ? '#1565c0' : '#2e7d32';
47424755
},
47434756

47444757
hitTest: function(e) {
@@ -5139,7 +5152,7 @@ <h4>Legend</h4>
51395152

51405153
updateStats: function(data) {
51415154
var shares = data.shares || [];
5142-
var mine = 0, stale = 0, dead = 0, verified = 0, fee = 0, v36sig = 0;
5155+
var mine = 0, stale = 0, dead = 0, verified = 0, fee = 0, v36sig = 0, v36native = 0;
51435156
var ltcBlocks = 0, dogeBlocks = 0;
51445157
var self = this;
51455158
shares.forEach(function(s) {
@@ -5148,8 +5161,8 @@ <h4>Legend</h4>
51485161
if (s.s === 2) dead++;
51495162
if (s.v) verified++;
51505163
if (s.fee) fee++;
5151-
if (s.dv && s.dv >= 36 && s.V < 36) v36sig++;
5152-
// Count blocks from both blk flag and blockSet/dogeSet
5164+
if (s.V >= 36) v36native++;
5165+
else if (s.dv && s.dv >= 36) v36sig++;
51535166
if (s.blk || self.blockSet[s.h]) ltcBlocks++;
51545167
if (self.dogeSet[s.h]) dogeBlocks++;
51555168
});
@@ -5162,6 +5175,7 @@ <h4>Legend</h4>
51625175
document.getElementById('defrag-chain-len').textContent = data.chain_length || '-';
51635176
document.getElementById('defrag-blocks').textContent = ltcBlocks + ' LTC / ' + dogeBlocks + ' DOGE';
51645177
document.getElementById('defrag-fee').textContent = fee;
5178+
document.getElementById('defrag-v36native').textContent = v36native;
51655179
document.getElementById('defrag-v36sig').textContent = v36sig;
51665180
}
51675181
};

0 commit comments

Comments
 (0)