|
|
@ -98,7 +98,7 @@ bool allow_gbt = true; |
|
|
|
bool allow_mininginfo = true; |
|
|
|
bool allow_mininginfo = true; |
|
|
|
bool check_dups = true; //false;
|
|
|
|
bool check_dups = true; //false;
|
|
|
|
bool check_stratum_jobs = false; |
|
|
|
bool check_stratum_jobs = false; |
|
|
|
|
|
|
|
bool opt_submit_stale = false; |
|
|
|
bool submit_old = false; |
|
|
|
bool submit_old = false; |
|
|
|
bool use_syslog = false; |
|
|
|
bool use_syslog = false; |
|
|
|
bool use_colors = true; |
|
|
|
bool use_colors = true; |
|
|
@ -319,6 +319,7 @@ Options:\n\ |
|
|
|
-T, --timeout=N network timeout, in seconds (default: 300)\n\ |
|
|
|
-T, --timeout=N network timeout, in seconds (default: 300)\n\ |
|
|
|
-s, --scantime=N upper bound on time spent scanning current work when\n\ |
|
|
|
-s, --scantime=N upper bound on time spent scanning current work when\n\ |
|
|
|
long polling is unavailable, in seconds (default: 10)\n\ |
|
|
|
long polling is unavailable, in seconds (default: 10)\n\ |
|
|
|
|
|
|
|
--submit-stale ignore stale jobs checks, may create more rejected shares\n\ |
|
|
|
-n, --ndevs list cuda devices\n\ |
|
|
|
-n, --ndevs list cuda devices\n\ |
|
|
|
-N, --statsavg number of samples used to compute hashrate (default: 30)\n\ |
|
|
|
-N, --statsavg number of samples used to compute hashrate (default: 30)\n\ |
|
|
|
--no-gbt disable getblocktemplate support (height check in solo)\n\ |
|
|
|
--no-gbt disable getblocktemplate support (height check in solo)\n\ |
|
|
@ -431,7 +432,8 @@ struct option options[] = { |
|
|
|
{ "retries", 1, NULL, 'r' }, |
|
|
|
{ "retries", 1, NULL, 'r' }, |
|
|
|
{ "retry-pause", 1, NULL, 'R' }, |
|
|
|
{ "retry-pause", 1, NULL, 'R' }, |
|
|
|
{ "scantime", 1, NULL, 's' }, |
|
|
|
{ "scantime", 1, NULL, 's' }, |
|
|
|
{ "show-diff", 0, NULL, 1013 }, |
|
|
|
{ "show-diff", 0, NULL, 1013 }, // deprecated
|
|
|
|
|
|
|
|
{ "submit-stale", 0, NULL, 1015 }, |
|
|
|
{ "hide-diff", 0, NULL, 1014 }, |
|
|
|
{ "hide-diff", 0, NULL, 1014 }, |
|
|
|
{ "statsavg", 1, NULL, 'N' }, |
|
|
|
{ "statsavg", 1, NULL, 'N' }, |
|
|
|
{ "gpu-clock", 1, NULL, 1070 }, |
|
|
|
{ "gpu-clock", 1, NULL, 1070 }, |
|
|
@ -897,7 +899,7 @@ static bool submit_upstream_work(CURL *curl, struct work *work) |
|
|
|
|
|
|
|
|
|
|
|
/* discard if a newer block was received */ |
|
|
|
/* discard if a newer block was received */ |
|
|
|
stale_work = work->height && work->height < g_work.height; |
|
|
|
stale_work = work->height && work->height < g_work.height; |
|
|
|
if (have_stratum && !stale_work && opt_algo != ALGO_ZR5 && opt_algo != ALGO_SCRYPT_JANE) { |
|
|
|
if (have_stratum && !stale_work && !opt_submit_stale && opt_algo != ALGO_ZR5 && opt_algo != ALGO_SCRYPT_JANE) { |
|
|
|
pthread_mutex_lock(&g_work_lock); |
|
|
|
pthread_mutex_lock(&g_work_lock); |
|
|
|
if (strlen(work->job_id + 8)) |
|
|
|
if (strlen(work->job_id + 8)) |
|
|
|
stale_work = strncmp(work->job_id + 8, g_work.job_id + 8, sizeof(g_work.job_id) - 8); |
|
|
|
stale_work = strncmp(work->job_id + 8, g_work.job_id + 8, sizeof(g_work.job_id) - 8); |
|
|
@ -3530,6 +3532,9 @@ void parse_arg(int key, char *arg) |
|
|
|
case 1014: |
|
|
|
case 1014: |
|
|
|
opt_showdiff = false; |
|
|
|
opt_showdiff = false; |
|
|
|
break; |
|
|
|
break; |
|
|
|
|
|
|
|
case 1015: |
|
|
|
|
|
|
|
opt_submit_stale = true; |
|
|
|
|
|
|
|
break; |
|
|
|
case 'S': |
|
|
|
case 'S': |
|
|
|
case 1018: |
|
|
|
case 1018: |
|
|
|
applog(LOG_INFO, "Now logging to syslog..."); |
|
|
|
applog(LOG_INFO, "Now logging to syslog..."); |
|
|
|