Add SPV sync progress with ETA to loading page

Author: frstrtr

src/c2pool/c2pool_refactored.cpp

@@ -2993,6 +2993,22 @@ int main(int argc, char* argv[]) {
                 return result;
             });
 
+            // SPV sync progress for loading page
+            web_server.get_mining_interface()->set_spv_progress_fn(
+                [&ltc_utxo_cache, &embedded_chain]() {
+                nlohmann::json r;
+                int ltc_connected = ltc_utxo_cache ? static_cast<int>(ltc_utxo_cache->blocks_connected()) : 0;
+                int ltc_need = static_cast<int>(core::coin::LTC_MINING_GATE_DEPTH);
+                int ltc_height = embedded_chain ? static_cast<int>(embedded_chain->height()) : 0;
+                r["ltc_blocks"] = ltc_connected;
+                r["ltc_need"] = ltc_need;
+                r["ltc_height"] = ltc_height;
+                // DOGE UTXO is initialized after LTC — show 0 until wired
+                r["doge_blocks"] = 0;
+                r["doge_need"] = static_cast<int>(core::coin::DOGE_MINING_GATE_DEPTH);
+                return r;
+            });
+
             // Wire per-share window data for the defragmenter grid
             web_server.get_mining_interface()->set_sharechain_window_fn([&p2p_node, &web_server]() {
                 nlohmann::json result;

src/core/web_server.cpp

@@ -4387,6 +4387,12 @@ nlohmann::json MiningInterface::rest_sync_status()
         std::chrono::duration_cast<std::chrono::seconds>(
             std::chrono::steady_clock::now() - m_start_time).count());
 
+    // SPV sync progress
+    if (m_spv_progress_fn) {
+        auto spv = m_spv_progress_fn();
+        result["spv"] = spv;
+    }
+
     return result;
 }
 

src/core/web_server.hpp

@@ -495,6 +495,10 @@ class MiningInterface : public jsonrpccxx::JsonRpc2Server
     void set_local_hashrate(double hr) { m_cached_pool_hashrate = hr; }
     double get_network_difficulty() const { return m_network_difficulty.load(); }
 
+    // SPV sync progress callback — returns {ltc_blocks, ltc_need, doge_blocks, doge_need}
+    using spv_progress_fn_t = std::function<nlohmann::json()>;
+    void set_spv_progress_fn(spv_progress_fn_t fn) { m_spv_progress_fn = std::move(fn); }
+
     // Sharechain stats callback — returns live tracker data for the /sharechain/stats endpoint
     using sharechain_stats_fn_t = std::function<nlohmann::json()>;
     void set_sharechain_stats_fn(sharechain_stats_fn_t fn) { m_sharechain_stats_fn = thread_safe_wrap(std::move(fn)); }
@@ -899,6 +903,7 @@ class MiningInterface : public jsonrpccxx::JsonRpc2Server
 
     // Sharechain stats callback
     sharechain_stats_fn_t m_sharechain_stats_fn;
+    spv_progress_fn_t m_spv_progress_fn;
     sharechain_window_fn_t m_sharechain_window_fn;
     sharechain_tip_fn_t m_sharechain_tip_fn;
     sharechain_delta_fn_t m_sharechain_delta_fn;

web-static/loading.html

@@ -37,7 +37,8 @@ <h1>c2pool</h1>
         <div class="row"><span class="label">Sharechain</span><span class="val" id="d-shares">...</span></div>
         <div class="row"><span class="label">Verified</span><span class="val" id="d-verified">...</span></div>
         <div class="row"><span class="label">Best share</span><span class="val" id="d-best">...</span></div>
-        <div class="row"><span class="label">SPV nodes</span><span class="val" id="d-work">...</span></div>
+        <div class="row"><span class="label">LTC SPV</span><span class="val" id="d-ltc-spv">...</span></div>
+        <div class="row"><span class="label">DOGE SPV</span><span class="val" id="d-doge-spv">...</span></div>
         <div class="row"><span class="label">Uptime</span><span class="val" id="d-uptime">...</span></div>
     </div>
     <div class="note">This page auto-refreshes. You will be redirected to the dashboard when ready.</div>
@@ -60,8 +61,27 @@ <h1>c2pool</h1>
         // Dashboard is truly ready when currency_info has real data
         var dashReady = ci.block_value != null && ci.block_value > 0
             && ci.pool_hash_rate != null && d.verified_size > 0;
-        document.getElementById('d-work').textContent = dashReady ? 'ready' : 'syncing...';
-        document.getElementById('d-work').className = 'val ' + (dashReady ? 'ok' : 'wait');
+        // SPV progress with ETA
+        if (d.spv) {
+            var ltcDone = d.spv.ltc_blocks >= d.spv.ltc_need;
+            var ltcTxt = ltcDone ? 'ready' : d.spv.ltc_blocks + '/' + d.spv.ltc_need;
+            if (!ltcDone && d.spv.ltc_blocks > 1 && d.uptime_seconds > 10) {
+                var rate = d.spv.ltc_blocks / d.uptime_seconds;
+                var remain = Math.ceil((d.spv.ltc_need - d.spv.ltc_blocks) / Math.max(rate, 0.01));
+                ltcTxt += ' (~' + (remain > 60 ? Math.ceil(remain/60) + 'min' : remain + 's') + ')';
+            }
+            document.getElementById('d-ltc-spv').textContent = ltcTxt;
+            document.getElementById('d-ltc-spv').className = 'val ' + (ltcDone ? 'ok' : 'wait');
+            var dogeDone = d.spv.doge_blocks >= d.spv.doge_need;
+            var dogeTxt = dogeDone ? 'ready' : d.spv.doge_blocks + '/' + d.spv.doge_need;
+            if (!dogeDone && d.spv.doge_blocks > 1 && d.uptime_seconds > 10) {
+                var dr = d.spv.doge_blocks / d.uptime_seconds;
+                var drem = Math.ceil((d.spv.doge_need - d.spv.doge_blocks) / Math.max(dr, 0.01));
+                dogeTxt += ' (~' + (drem > 60 ? Math.ceil(drem/60) + 'min' : drem + 's') + ')';
+            }
+            document.getElementById('d-doge-spv').textContent = dogeTxt;
+            document.getElementById('d-doge-spv').className = 'val ' + (dogeDone ? 'ok' : 'wait');
+        }
         var m = Math.floor((d.uptime_seconds || 0) / 60);
         var s = (d.uptime_seconds || 0) % 60;
         document.getElementById('d-uptime').textContent = m + 'm ' + s + 's';