From f7f950ab204993dbdbdc4445dcb2cb251f3011d1 Mon Sep 17 00:00:00 2001 From: Codex Bot Date: Sat, 25 Apr 2026 17:35:33 +0200 Subject: [PATCH] Enable merge mining CLI option --- src/main.cpp | 2 +- src/params.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index d2c21f1..35ae5d2 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -97,7 +97,7 @@ void p2pool_usage() "--no-igd An alias for --no-upnp\n" "--upnp-stratum Port forward Stratum port (it's not forwarded by default)\n" #endif -// "--merge-mine IP:port and wallet address for another blockchain to merge mine with\n" + "--merge-mine IP:port and wallet address for another blockchain to merge mine with\n" "--version Print p2pool's version and build details\n" #ifdef WITH_TLS "--tls-cert file Load TLS certificate chain from \"file\" in the PEM format\n" diff --git a/src/params.cpp b/src/params.cpp index 9dad0f2..d865f7f 100644 --- a/src/params.cpp +++ b/src/params.cpp @@ -254,8 +254,8 @@ Params::Params(const std::vector>& args) } #endif - if ((arg[0] == "merge-mine") && has2(arg)) { - LOGWARN(0, "Merge mining is not supported in Salvium P2Pool. --merge-mine flag ignored."); + if ((arg[0] == "merge-mine") && has1(arg) && has2(arg)) { + m_mergeMiningHosts.emplace_back(arg[1], arg[2]); ok = true; }