Skip to content

Commit 0458043

Browse files
author
WillItMod
committed
AxeDGB: disable scrypt until Miningcore has libmultihash; bump 0.8.10
1 parent 7778abd commit 0458043

6 files changed

Lines changed: 12 additions & 121 deletions

File tree

willitmod-dev-dgb/data/templates/miningcore.json.template

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -77,45 +77,6 @@
7777
"password": "${RPC_PASSWORD}"
7878
}
7979
]
80-
},
81-
{
82-
"id": "dgb-scrypt-1",
83-
"enabled": true,
84-
"coin": "digibyte-scrypt",
85-
"address": "${PAYOUT_ADDRESS}",
86-
"blockRefreshInterval": 500,
87-
"jobRebroadcastTimeout": 10,
88-
"clientConnectionTimeout": 600,
89-
"paymentProcessing": {
90-
"enabled": false
91-
},
92-
"banning": {
93-
"enabled": true,
94-
"time": 600,
95-
"invalidPercent": 50,
96-
"checkThreshold": 50
97-
},
98-
"ports": {
99-
"3334": {
100-
"listenAddress": "127.0.0.1",
101-
"difficulty": ${STARTDIFF},
102-
"varDiff": {
103-
"minDiff": ${MINDIFF},
104-
"maxDiff": ${MAXDIFF_JSON},
105-
"targetTime": 15,
106-
"retargetTime": 90,
107-
"variancePercent": 30
108-
}
109-
}
110-
},
111-
"daemons": [
112-
{
113-
"host": "dgbd",
114-
"port": ${DGB_RPC_PORT},
115-
"user": "${RPC_USER}",
116-
"password": "${RPC_PASSWORD}"
117-
}
118-
]
11980
}
12081
]
12182
}

willitmod-dev-dgb/docker-compose.yml

Lines changed: 4 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -145,51 +145,7 @@ services:
145145
) else . end))
146146
' /data/pool/config/miningcore.json > "$$tmp" && mv "$$tmp" /data/pool/config/miningcore.json
147147
148-
# Ensure the Scrypt pool exists when upgrading from SHA256-only configs.
149-
if ! jq -e '.pools[]? | select(.id=="dgb-scrypt-1")' /data/pool/config/miningcore.json >/dev/null 2>&1; then
150-
echo "[axedgb] Adding dgb-scrypt-1 Miningcore pool"
151-
base_addr="$(jq -r '.pools[]? | select(.id=="dgb-sha256-1") | .address // empty' /data/pool/config/miningcore.json | head -n 1)"
152-
base_diff="$(jq -r '.pools[]? | select(.id=="dgb-sha256-1") | (.ports|to_entries[0].value.difficulty // 1024)' /data/pool/config/miningcore.json | head -n 1)"
153-
base_mindiff="$(jq -r '.pools[]? | select(.id=="dgb-sha256-1") | (.ports|to_entries[0].value.varDiff.minDiff // 1024)' /data/pool/config/miningcore.json | head -n 1)"
154-
base_maxdiff_json="$(jq -c '.pools[]? | select(.id=="dgb-sha256-1") | (.ports|to_entries[0].value.varDiff.maxDiff // null)' /data/pool/config/miningcore.json | head -n 1)"
155-
daemons_json="$(jq -c '.pools[]? | select(.id=="dgb-sha256-1") | (.daemons // [])' /data/pool/config/miningcore.json | head -n 1)"
156-
if [ -z "$$daemons_json" ]; then daemons_json='[]'; fi
157-
if [ -z "$$base_maxdiff_json" ]; then base_maxdiff_json='null'; fi
158-
159-
tmp2="/data/pool/config/miningcore.json.tmp2"
160-
jq --arg addr "$$base_addr" \
161-
--argjson diff "$$base_diff" \
162-
--argjson mindiff "$$base_mindiff" \
163-
--argjson maxdiff "$$base_maxdiff_json" \
164-
--argjson daemons "$$daemons_json" \
165-
'
166-
.pools = (.pools // []) + [{
167-
"id": "dgb-scrypt-1",
168-
"enabled": true,
169-
"coin": "digibyte-scrypt",
170-
"address": $$addr,
171-
"blockRefreshInterval": 500,
172-
"jobRebroadcastTimeout": 10,
173-
"clientConnectionTimeout": 600,
174-
"paymentProcessing": {"enabled": false},
175-
"banning": {"enabled": true, "time": 600, "invalidPercent": 50, "checkThreshold": 50},
176-
"ports": {
177-
"3334": {
178-
"listenAddress": "127.0.0.1",
179-
"difficulty": $$diff,
180-
"varDiff": {
181-
"minDiff": $$mindiff,
182-
"maxDiff": $$maxdiff,
183-
"targetTime": 15,
184-
"retargetTime": 90,
185-
"variancePercent": 30
186-
}
187-
}
188-
},
189-
"daemons": $$daemons
190-
}]
191-
' /data/pool/config/miningcore.json > "$$tmp2" && mv "$$tmp2" /data/pool/config/miningcore.json
192-
fi
148+
# Note: Scrypt is disabled by default for now (some Miningcore builds ship without libmultihash).
193149
fi
194150
fi
195151
@@ -215,25 +171,6 @@ services:
215171
"explorerBlockLink": "https://chainz.cryptoid.info/dgb/block.dws?$$height$$.htm",
216172
"explorerTxLink": "https://chainz.cryptoid.info/dgb/tx.dws?{0}.htm",
217173
"explorerAccountLink": "https://chainz.cryptoid.info/dgb/address.dws?{0}.htm"
218-
},
219-
"digibyte-scrypt": {
220-
"name": "Digibyte Scrypt",
221-
"canonicalName": "Digibyte",
222-
"symbol": "DGB",
223-
"family": "bitcoin",
224-
"website": "https://digibyte.org/",
225-
"market": "https://coinmarketcap.com/currencies/digibyte/",
226-
"twitter": "https://twitter.com/digibytecoin",
227-
"telegram": "https://t.me/DigiByteCoin",
228-
"discord": "",
229-
"coinbaseHasher": { "hash": "sha256d" },
230-
"headerHasher": { "hash": "scrypt", "args": [1024, 1] },
231-
"blockHasher": { "hash": "reverse", "args": [ { "hash": "sha256d" } ] },
232-
"shareMultiplier": 65536,
233-
"blockTemplateRpcExtraParams": ["scrypt"],
234-
"explorerBlockLink": "https://chainz.cryptoid.info/dgb/block.dws?$$height$$.htm",
235-
"explorerTxLink": "https://chainz.cryptoid.info/dgb/tx.dws?{0}.htm",
236-
"explorerAccountLink": "https://chainz.cryptoid.info/dgb/address.dws?{0}.htm"
237174
}
238175
}
239176
EOF
@@ -348,13 +285,12 @@ services:
348285
stop_grace_period: 30s
349286
ports:
350287
- "5678:3333/tcp" # Stratum v1 (SHA256)
351-
- "5679:3334/tcp" # Stratum v1 (Scrypt)
352288
volumes:
353289
- ${APP_DATA_DIR}/data/pool/config/miningcore.json:/app/config.json:ro
354290
- ${APP_DATA_DIR}/data/pool/config/coins.json:/app/coins.json:ro
355291

356292
app:
357-
image: ghcr.io/willitmod/axedgb-app-umbrel-dev:0.7.68-alpha
293+
image: ghcr.io/willitmod/axedgb-app-umbrel-dev:0.8.10
358294
user: "1000:1000"
359295
restart: on-failure
360296
stop_grace_period: 30s
@@ -372,8 +308,8 @@ services:
372308
DGB_RPC_PASS: "${APP_PASSWORD}"
373309
MININGCORE_API_URL: "http://miningcore:4000"
374310
MININGCORE_POOL_ID: "dgb-sha256-1"
375-
MININGCORE_POOL_IDS: "sha256:dgb-sha256-1,scrypt:dgb-scrypt-1"
376-
STRATUM_PORTS: "sha256:5678,scrypt:5679"
311+
MININGCORE_POOL_IDS: "sha256:dgb-sha256-1"
312+
STRATUM_PORTS: "sha256:5678"
377313
MININGCORE_CONF_PATH: "/data/pool/config/miningcore.json"
378314
APP_CHANNEL: "ALPHA"
379315
DGB_IMAGE: "ghcr.io/willitmod/digibyte:8.22.2"

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def _env_or_default(name: str, default: str) -> str:
6363
SUPPORT_TICKET_URL = _env_or_default("SUPPORT_TICKET_URL", f"{DEFAULT_SUPPORT_BASE_URL}/api/support/upload")
6464

6565
APP_ID = "willitmod-dev-dgb"
66-
APP_VERSION = "0.7.68-alpha"
66+
APP_VERSION = "0.8.10"
6767

6868
DGB_RPC_HOST = os.getenv("DGB_RPC_HOST", "dgbd")
6969
DGB_RPC_PORT = int(os.getenv("DGB_RPC_PORT", "14022"))
@@ -123,7 +123,7 @@ def _read_static(rel_path: str):
123123

124124
def _parse_pool_ids(raw: str) -> dict[str, str]:
125125
"""
126-
Parse MININGCORE_POOL_IDS like: "sha256:dgb-sha256-1,scrypt:dgb-scrypt-1".
126+
Parse MININGCORE_POOL_IDS like: "sha256:dgb-sha256-1".
127127
"""
128128
out: dict[str, str] = {}
129129
for part in (raw or "").split(","):
@@ -172,7 +172,7 @@ def _stratum_ports() -> dict[str, int]:
172172
ports = _parse_ports(STRATUM_PORTS)
173173
if ports:
174174
return ports
175-
return {"sha256": 5678, "scrypt": 5679}
175+
return {"sha256": 5678}
176176

177177

178178
def _algo_from_query(path: str) -> str | None:
@@ -1025,11 +1025,9 @@ def _update_pool_settings(
10251025
algo_to_pool_id = _pool_ids()
10261026
algo_to_coin = {
10271027
"sha256": "digibyte-sha256",
1028-
"scrypt": "digibyte-scrypt",
10291028
}
10301029
algo_to_port = {
10311030
"sha256": "3333",
1032-
"scrypt": "3334",
10331031
}
10341032
try:
10351033
def upsert(pool_id: str, *, coin: str | None, port: str):

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -374,17 +374,14 @@ async function refreshWorkerDetails(algo) {
374374
}
375375

376376
function getAlgo() {
377-
const el = document.getElementById('algo');
378-
const saved = localStorage.getItem('dgbAlgo');
379-
if (saved && el && el.value !== saved) el.value = saved;
380-
return (el && el.value) || saved || 'sha256';
377+
return 'sha256';
381378
}
382379

383380
function getStratumPort(algo) {
384381
const ports = window.__stratumPorts || {};
385382
const p = ports && typeof ports === 'object' ? Number(ports[algo]) : NaN;
386383
if (Number.isFinite(p) && p > 0) return p;
387-
return algo === 'scrypt' ? 5679 : 5678;
384+
return 5678;
388385
}
389386

390387
async function refresh() {
@@ -476,7 +473,7 @@ async function refresh() {
476473
if (diffEl) diffEl.textContent = formatCompactNumber(pool && pool.network_difficulty);
477474
if (diffSub) {
478475
const height = pool && pool.network_height ? ` | height ${pool.network_height}` : '';
479-
diffSub.textContent = `${algo === 'scrypt' ? 'Scrypt' : 'SHA256d'}${height}`;
476+
diffSub.textContent = `SHA256d${height}`;
480477
}
481478

482479
const banner = document.getElementById('block-found-banner');

willitmod-dev-dgb/images/axedgb-app/static/index.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
<div class="text-sm text-slate-300">Solo Pool</div>
9898
<div class="mt-1 text-2xl font-extrabold tracking-tight">Stratum v1</div>
9999
<div class="mt-2 text-sm text-slate-300">
100-
SHA256 <span class="font-mono">5678</span> | Scrypt <span class="font-mono">5679</span>
100+
SHA256 <span class="font-mono">5678</span>
101101
</div>
102102
</div>
103103
<button id="go-pool" class="axe-btn" type="button">Open Pool</button>
@@ -135,7 +135,6 @@
135135
<label class="axe-label" for="algo">Algo</label>
136136
<select id="algo" class="axe-input">
137137
<option value="sha256">SHA256</option>
138-
<option value="scrypt">Scrypt</option>
139138
</select>
140139
<div class="axe-help">Select which pool to view.</div>
141140
</div>

willitmod-dev-dgb/umbrel-app.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ manifestVersion: 1
22
id: willitmod-dev-dgb
33
category: altcoin
44
name: AxeDGB
5-
version: "0.7.68-alpha"
5+
version: "0.8.10"
66
tagline: DGB node + solo pool
77
description: >-
88
Run a DigiByte full node (DigiByte Core) and a solo Stratum v1 pool (Miningcore) as a single Umbrel app installation.

0 commit comments

Comments
 (0)