diff --git a/.gitignore b/.gitignore index 1bf7586..459dfc5 100644 --- a/.gitignore +++ b/.gitignore @@ -11,8 +11,8 @@ prebuilt-binaries/dragonxd-win/* !prebuilt-binaries/dragonxd-win/.gitkeep prebuilt-binaries/dragonxd-mac/* !prebuilt-binaries/dragonxd-mac/.gitkeep -prebuilt-binaries/xmrig-hac/* -!prebuilt-binaries/xmrig-hac/.gitkeep +prebuilt-binaries/drg-xmrig/* +!prebuilt-binaries/drg-xmrig/.gitkeep # External sources / toolchains (created by scripts/setup.sh) @@ -33,7 +33,7 @@ imgui.ini *.bak* *.params asmap.dat -/external/xmrig-hac +/external/drg-xmrig /memory /todo.md /.github/ diff --git a/README.md b/README.md index b0331d5..57e642a 100644 --- a/README.md +++ b/README.md @@ -81,8 +81,8 @@ Download linux and windows binaries of latest releases and place in binary direc - prebuilt-binaries/dragonxd-win/ - prebuilt-binaries/dragonxd-mac/ -**xmrig HAC fork** (https://git.dragonx.is/dragonx/xmrig-hac): -- prebuilt-binaries/xmrig-hac/ +**DRG-XMRig fork** (https://git.dragonx.is/DragonX/drg-xmrig): +- prebuilt-binaries/drg-xmrig/ ## Build Steps diff --git a/build.sh b/build.sh index c3ea180..c0ba130 100755 --- a/build.sh +++ b/build.sh @@ -386,7 +386,7 @@ build_release_linux() { [[ -f bin/sapling-output.params ]] && cp bin/sapling-output.params "$dist_dir/" fi # Bundle xmrig for mining support - local XMRIG_LINUX="$SCRIPT_DIR/prebuilt-binaries/xmrig-hac/xmrig" + local XMRIG_LINUX="$SCRIPT_DIR/prebuilt-binaries/drg-xmrig/xmrig" [[ -f "$XMRIG_LINUX" ]] && { cp "$XMRIG_LINUX" "$dist_dir/"; chmod +x "$dist_dir/xmrig"; info "Bundled xmrig"; } || warn "xmrig not found — mining unavailable in zip" cp -r bin/res "$dist_dir/" 2>/dev/null || true @@ -419,7 +419,7 @@ build_release_linux() { [[ -f bin/sapling-output.params ]] && cp bin/sapling-output.params "$APPDIR/usr/bin/" fi # Bundle xmrig for mining support - local XMRIG_LINUX_AI="$SCRIPT_DIR/prebuilt-binaries/xmrig-hac/xmrig" + local XMRIG_LINUX_AI="$SCRIPT_DIR/prebuilt-binaries/drg-xmrig/xmrig" [[ -f "$XMRIG_LINUX_AI" ]] && { cp "$XMRIG_LINUX_AI" "$APPDIR/usr/bin/"; chmod +x "$APPDIR/usr/bin/xmrig"; } # Desktop entry @@ -628,8 +628,8 @@ HDR info "Lite mode: skipping embedded daemon binaries" fi - # ── xmrig binary (from prebuilt-binaries/xmrig-hac/) ──────────────── - local XMRIG_DIR="$SCRIPT_DIR/prebuilt-binaries/xmrig-hac" + # ── xmrig binary (from prebuilt-binaries/drg-xmrig/) ──────────────── + local XMRIG_DIR="$SCRIPT_DIR/prebuilt-binaries/drg-xmrig" # The published DRG-XMRig archives ship the binary inside a versioned subdir, not as a flat # xmrig.exe. Extract it from the matching win-x64 zip if it isn't already staged — otherwise # the embed below never fires (HAS_EMBEDDED_XMRIG stays undefined) and the wallet ships with @@ -766,7 +766,7 @@ HDR fi # Bundle xmrig for mining support - local XMRIG_WIN="$SCRIPT_DIR/prebuilt-binaries/xmrig-hac/xmrig.exe" + local XMRIG_WIN="$SCRIPT_DIR/prebuilt-binaries/drg-xmrig/xmrig.exe" [[ -f "$XMRIG_WIN" ]] && { cp "$XMRIG_WIN" "$dist_dir/"; info "Bundled xmrig.exe"; } || warn "xmrig.exe not found — mining unavailable in zip" cp -r bin/res "$dist_dir/" 2>/dev/null || true @@ -1063,8 +1063,8 @@ TOOLCHAIN info "Lite mode: skipping macOS daemon and Sapling/asmap bundling" fi - # xmrig binary (from prebuilt-binaries/xmrig-hac/) - local XMRIG_MAC="$SCRIPT_DIR/prebuilt-binaries/xmrig-hac/xmrig" + # xmrig binary (from prebuilt-binaries/drg-xmrig/) + local XMRIG_MAC="$SCRIPT_DIR/prebuilt-binaries/drg-xmrig/xmrig" if [[ -f "$XMRIG_MAC" ]]; then cp "$XMRIG_MAC" "$MACOS/xmrig" chmod +x "$MACOS/xmrig" diff --git a/prebuilt-binaries/drg-xmrig/.gitkeep b/prebuilt-binaries/drg-xmrig/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/scripts/legacy/build-windows.sh b/scripts/legacy/build-windows.sh index c5ecd01..aa406be 100755 --- a/scripts/legacy/build-windows.sh +++ b/scripts/legacy/build-windows.sh @@ -256,8 +256,8 @@ HEADER_START echo -e "${YELLOW}Note: Daemon binaries not found in prebuilt-binaries/dragonxd-win/ — wallet only${NC}" fi - # ── xmrig binary (from prebuilt-binaries/xmrig-hac/) ──────────────── - XMRIG_DIR="$SCRIPT_DIR/prebuilt-binaries/xmrig-hac" + # ── xmrig binary (from prebuilt-binaries/drg-xmrig/) ──────────────── + XMRIG_DIR="$SCRIPT_DIR/prebuilt-binaries/drg-xmrig" if [ -f "$XMRIG_DIR/xmrig.exe" ]; then cp -f "$XMRIG_DIR/xmrig.exe" "$EMBED_RES_DIR/xmrig.exe" echo " Staged xmrig.exe ($(du -h "$XMRIG_DIR/xmrig.exe" | cut -f1))" diff --git a/setup.sh b/setup.sh index 2340bee..e095185 100755 --- a/setup.sh +++ b/setup.sh @@ -684,11 +684,13 @@ if [[ "$STALE_DAEMON" -eq 1 ]]; then warn " Linux: ./setup.sh · Windows: ./setup.sh --win · macOS: ./setup.sh --mac" fi -# ── 7. xmrig-hac (mining binary) ──────────────────────────────────────────── -header "xmrig-hac Mining Binary" +# ── 7. drg-xmrig (mining binary) ──────────────────────────────────────────── +header "drg-xmrig Mining Binary" -XMRIG_SRC="$PROJECT_DIR/external/xmrig-hac" -XMRIG_PREBUILT="$PROJECT_DIR/prebuilt-binaries/xmrig-hac" +XMRIG_SRC="$PROJECT_DIR/external/drg-xmrig" +# Output dir bundled by build.sh (Linux zip, AppImage, Windows embed, mac .app) +# and scripts/legacy/build-windows.sh — keep this path in sync with those. +XMRIG_PREBUILT="$PROJECT_DIR/prebuilt-binaries/drg-xmrig" # Clean previous prebuilt xmrig binaries so we always rebuild # Only clean the binary for the platform(s) we are actually building, @@ -700,14 +702,14 @@ if ! $CHECK_ONLY; then fi fi -# Helper: clone xmrig-hac if not present +# Helper: clone drg-xmrig if not present clone_xmrig_if_needed() { if [[ ! -d "$XMRIG_SRC" ]]; then - info "Cloning xmrig-hac..." - git clone https://git.dragonx.is/dragonx/xmrig-hac.git "$XMRIG_SRC" + info "Cloning drg-xmrig..." + git clone https://git.dragonx.is/DragonX/drg-xmrig.git "$XMRIG_SRC" else - ok "xmrig-hac source already present" - info "Pulling latest xmrig-hac..." + ok "drg-xmrig source already present" + info "Pulling latest drg-xmrig..." (cd "$XMRIG_SRC" && git pull --ff-only 2>/dev/null || true) fi } @@ -728,15 +730,15 @@ else rm -rf "$XMRIG_SRC/build" # Build dependencies (libuv, hwloc, openssl) - info "Building xmrig-hac dependencies (libuv, hwloc, openssl)..." + info "Building drg-xmrig dependencies (libuv, hwloc, openssl)..." ( cd "$XMRIG_SRC/scripts" sh build_deps.sh ) - ok "xmrig-hac dependencies built" + ok "drg-xmrig dependencies built" # Build xmrig - info "Building xmrig-hac (Linux)..." + info "Building drg-xmrig (Linux)..." mkdir -p "$XMRIG_SRC/build" ( cd "$XMRIG_SRC/build" @@ -753,7 +755,7 @@ else mkdir -p "$XMRIG_PREBUILT" if [[ -f "$XMRIG_SRC/build/xmrig" ]]; then cp "$XMRIG_SRC/build/xmrig" "$XMRIG_LINUX" - ok "xmrig (Linux) built and installed to prebuilt-binaries/xmrig-hac/" + ok "xmrig (Linux) built and installed to prebuilt-binaries/drg-xmrig/" else err "xmrig (Linux) build failed — binary not found" MISSING=$((MISSING + 1)) @@ -777,7 +779,7 @@ else # Clean previous Windows build rm -rf "$XMRIG_SRC/build-windows" - info "Building xmrig-hac (Windows cross-compile)..." + info "Building drg-xmrig (Windows cross-compile)..." ( cd "$XMRIG_SRC/scripts" bash build_windows.sh @@ -787,7 +789,7 @@ else mkdir -p "$XMRIG_PREBUILT" if [[ -f "$XMRIG_SRC/build-windows/xmrig.exe" ]]; then cp "$XMRIG_SRC/build-windows/xmrig.exe" "$XMRIG_WIN" - ok "xmrig.exe (Windows) built and installed to prebuilt-binaries/xmrig-hac/" + ok "xmrig.exe (Windows) built and installed to prebuilt-binaries/drg-xmrig/" else err "xmrig.exe (Windows) build failed — binary not found" MISSING=$((MISSING + 1)) @@ -797,7 +799,7 @@ fi # ── 8. Binary directories ─────────────────────────────────────────────────── header "Binary Directories" -for platform in dragonxd-linux dragonxd-win dragonxd-mac xmrig; do +for platform in dragonxd-linux dragonxd-win dragonxd-mac drg-xmrig; do dir="$PROJECT_DIR/prebuilt-binaries/$platform" if [[ -d "$dir" ]]; then # Count actual files (not .gitkeep) diff --git a/src/daemon/xmrig_manager.cpp b/src/daemon/xmrig_manager.cpp index 9daa411..71dbe58 100644 --- a/src/daemon/xmrig_manager.cpp +++ b/src/daemon/xmrig_manager.cpp @@ -2,7 +2,7 @@ // Copyright 2024-2026 The Hush Developers // Released under the GPLv3 // -// xmrig_manager.cpp — Pool mining process management via xmrig-hac. +// xmrig_manager.cpp — Pool mining process management via drg-xmrig. // Spawns xmrig, monitors via HTTP API, tracks hashrate and shares. #include "xmrig_manager.h"