AxeDGB: revert to DGB 8.22.2, reduce RPC load

Author: WillItMod

willitmod-dev-dgb/docker-compose.yml

@@ -130,10 +130,16 @@ services:
           # and Miningcore currently assumes notifications exists).
           if command -v jq >/dev/null 2>&1 && jq -e '.' >/dev/null 2>&1 < /data/pool/config/miningcore.json; then
             tmp="/data/pool/config/miningcore.json.tmp"
-            jq '
+            jq --argjson rpcport "$$DGB_RPC_PORT" '
               .notifications = (.notifications // {"enabled": false})
-              | (.pools |= (if type=="array" then map(if type=="object" then (.paymentProcessing = (.paymentProcessing // {"enabled": false})) else . end) else . end))
               | (.banning |= (if type=="object" then del(.manager) else . end))
+              | (.pools |= (if type=="array" then map(
+                  if type=="object" then
+                    (.paymentProcessing = (.paymentProcessing // {"enabled": false}))
+                    | (.blockRefreshInterval = ((.blockRefreshInterval // 500) | if . < 2000 then 2000 else . end))
+                    | (.daemons = ((.daemons // []) | (if type=="array" then map(if type=="object" then (.port=$rpcport) else . end) else . end)))
+                  else . end
+                ) else . end))
             ' /data/pool/config/miningcore.json > "$$tmp" && mv "$$tmp" /data/pool/config/miningcore.json
 
             # Ensure the Scrypt pool exists when upgrading from SHA256-only configs.
@@ -292,7 +298,7 @@ services:
         fi
 
   dgbd:
-    image: ghcr.io/willitmod/digibyte:8.26.1
+    image: ghcr.io/willitmod/digibyte:8.22.2
     user: "1000:1000"
     restart: unless-stopped
     stop_grace_period: 15m30s
@@ -345,7 +351,7 @@ services:
       - ${APP_DATA_DIR}/data/pool/config/coins.json:/app/coins.json:ro
 
   app:
-    image: ghcr.io/willitmod/axedgb-app-umbrel-dev:0.7.65-alpha
+    image: ghcr.io/willitmod/axedgb-app-umbrel-dev:0.7.66-alpha
     user: "1000:1000"
     restart: on-failure
     stop_grace_period: 30s
@@ -367,7 +373,7 @@ services:
       STRATUM_PORTS: "sha256:5678,scrypt:5679"
       MININGCORE_CONF_PATH: "/data/pool/config/miningcore.json"
       APP_CHANNEL: "ALPHA"
-      DGB_IMAGE: "ghcr.io/willitmod/digibyte:8.26.1"
+      DGB_IMAGE: "ghcr.io/willitmod/digibyte:8.22.2"
       MININGCORE_IMAGE: "ghcr.io/willitmod/miningcore:a553f62301f44c6df80891e408b6526d1dd98692"
       POSTGRES_IMAGE: "postgres:16-alpine"
       STATIC_DIR: "/app/static"

willitmod-dev-dgb/images/axedgb-app/app.py

@@ -54,7 +54,7 @@ def _env_or_default(name: str, default: str) -> str:
 SUPPORT_TICKET_URL = _env_or_default("SUPPORT_TICKET_URL", f"{DEFAULT_SUPPORT_BASE_URL}/api/support/upload")
 
 APP_ID = "willitmod-dev-dgb"
-APP_VERSION = "0.7.65-alpha"
+APP_VERSION = "0.7.66-alpha"
 
 DGB_RPC_HOST = os.getenv("DGB_RPC_HOST", "dgbd")
 DGB_RPC_PORT = int(os.getenv("DGB_RPC_PORT", "14022"))
@@ -247,6 +247,9 @@ def _rpc_call(method: str, params=None):
     return data.get("result")
 
 
+NODE_STATUS_LOCK = threading.Lock()
+
+
 def _read_conf_kv_in_section(path: Path, section: str) -> dict:
     if not path.exists():
         return {}
@@ -544,8 +547,6 @@ def _update_miningcore_daemon_port(network: str):
         for pool in pools:
             if not isinstance(pool, dict):
                 continue
-            if str(pool.get("id") or "") != MININGCORE_POOL_ID:
-                continue
             daemons = pool.get("daemons") or []
             if not isinstance(daemons, list):
                 continue
@@ -1880,6 +1881,35 @@ def do_GET(self):
         if self.path == "/api/node":
             reindex_requested = NODE_REINDEX_FLAG_PATH.exists()
             reindex_required = _detect_reindex_required()
+            cached = _read_node_cache()
+            if cached and (int(time.time()) - int(cached["t"])) <= 4:
+                payload = dict(cached["status"])
+                payload.update(
+                    {
+                        "cached": True,
+                        "lastSeen": int(cached["t"]),
+                        "reindexRequested": reindex_requested,
+                        "reindexRequired": reindex_required,
+                    }
+                )
+                return self._send(*_json(payload))
+
+            acquired = NODE_STATUS_LOCK.acquire(blocking=False)
+            if not acquired:
+                if cached:
+                    payload = dict(cached["status"])
+                    payload.update(
+                        {
+                            "cached": True,
+                            "lastSeen": int(cached["t"]),
+                            "error": "busy",
+                            "reindexRequested": reindex_requested,
+                            "reindexRequired": reindex_required,
+                        }
+                    )
+                    return self._send(*_json(payload))
+                return self._send(*_json({"error": "busy"}, status=503))
+
             try:
                 s = _node_status()
                 payload = dict(s)
@@ -1903,7 +1933,7 @@ def do_GET(self):
                         "reindexRequired": reindex_required,
                     }
                     return self._send(*_json(payload))
-                cached = _read_node_cache()
+                cached = cached or _read_node_cache()
                 if cached:
                     payload = dict(cached["status"])
                     payload.update(
@@ -1928,6 +1958,12 @@ def do_GET(self):
                         status=503,
                     )
                 )
+            finally:
+                if acquired:
+                    try:
+                        NODE_STATUS_LOCK.release()
+                    except Exception:
+                        pass
 
         if path == "/api/pool":
             algo = _algo_from_query(raw_path)

willitmod-dev-dgb/images/axedgb-app/static/app.js

@@ -393,6 +393,9 @@ function getStratumPort(algo) {
 }
 
 async function refresh() {
+  if (window.__refreshInFlight) return;
+  window.__refreshInFlight = true;
+  try {
   try {
     const res = await fetch('/api/node', { cache: 'no-store' });
     const node = await res.json().catch(() => ({}));
@@ -545,6 +548,9 @@ async function refresh() {
     renderWorkerDetails([]);
   }
 
+  } finally {
+    window.__refreshInFlight = false;
+  }
 }
 
 function setStratumUrl() {

willitmod-dev-dgb/umbrel-app.yml

@@ -2,7 +2,7 @@ manifestVersion: 1
 id: willitmod-dev-dgb
 category: altcoin
 name: AxeDGB
-version: "0.7.65-alpha"
+version: "0.7.66-alpha"
 tagline: DGB node + solo pool
 description: >-
   Run a DigiByte full node (DigiByte Core) and a solo Stratum v1 pool (Miningcore) as a single Umbrel app installation.