From 66e9af286231f48f19d834635a000366a208f59a Mon Sep 17 00:00:00 2001 From: BitcoinMechanic Date: Sat, 14 Dec 2024 12:19:02 -0800 Subject: [PATCH 1/2] Check share_stale_seconds is within range 60-150 --- src/datum_conf.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/datum_conf.c b/src/datum_conf.c index 103e5d7..8f71a1f 100644 --- a/src/datum_conf.c +++ b/src/datum_conf.c @@ -362,6 +362,16 @@ int datum_read_config(const char *conffile) { return 0; } + if (datum_config.stratum_v1_share_stale_seconds < 60) { + DLOG_FATAL("Stratum server stratum.stratum_v1_share_stale_seconds must be at least 60 (suggest 120)"); + return 0; + } + + if (datum_config.stratum_v1_share_stale_seconds > 150) { + DLOG_FATAL("Stratum server stratum.stratum_v1_share_stale_seconds must not exceed 150 (suggest 120)"); + return 0; + } + if (datum_config.datum_protocol_global_timeout < (datum_config.bitcoind_work_update_seconds+5)) { DLOG_FATAL("DATUM protocol global timeout must be at least the work update interval plus 5 seconds."); return 0; From 467ba474f347f6d26b550be5577db7afcf5f1d93 Mon Sep 17 00:00:00 2001 From: BitcoinMechanic Date: Sat, 14 Dec 2024 14:02:00 -0800 Subject: [PATCH 2/2] delete 'stratum_v1_' from user messaging --- src/datum_conf.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/datum_conf.c b/src/datum_conf.c index 8f71a1f..48b36a0 100644 --- a/src/datum_conf.c +++ b/src/datum_conf.c @@ -348,12 +348,12 @@ int datum_read_config(const char *conffile) { if (roundDownToPowerOfTwo_64(datum_config.stratum_v1_vardiff_min) != datum_config.stratum_v1_vardiff_min) { const int nv = roundDownToPowerOfTwo_64(datum_config.stratum_v1_vardiff_min); - DLOG_WARN("stratum.stratum_v1_vardiff_min MUST be a power of two. adjusting from %d to %d", datum_config.stratum_v1_vardiff_min, nv); + DLOG_WARN("stratum.vardiff_min MUST be a power of two. adjusting from %d to %d", datum_config.stratum_v1_vardiff_min, nv); datum_config.stratum_v1_vardiff_min = nv; } if (datum_config.stratum_v1_vardiff_min < 1) { - DLOG_FATAL("Stratum server stratum.stratum_v1_vardiff_min must be at least 1 (suggest at least 1024, but more likely 32768)"); + DLOG_FATAL("Stratum server stratum.vardiff_min must be at least 1 (suggest at least 1024, but more likely 32768)"); return 0; } @@ -363,12 +363,12 @@ int datum_read_config(const char *conffile) { } if (datum_config.stratum_v1_share_stale_seconds < 60) { - DLOG_FATAL("Stratum server stratum.stratum_v1_share_stale_seconds must be at least 60 (suggest 120)"); + DLOG_FATAL("Stratum server stratum.share_stale_seconds must be at least 60 (suggest 120)"); return 0; } if (datum_config.stratum_v1_share_stale_seconds > 150) { - DLOG_FATAL("Stratum server stratum.stratum_v1_share_stale_seconds must not exceed 150 (suggest 120)"); + DLOG_FATAL("Stratum server stratum.share_stale_seconds must not exceed 150 (suggest 120)"); return 0; }