d0s3t3ch
/
wownero-puddle
mirror of https://git.wownero.com/wownero/wownero-puddle.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

treat xmr-node-proxy specifically 

xmrig-proxy does not use the same job parameters as xmr-node-proxy.
Therefore, treat xmrig-proxy like any other miner.
This commit is contained in:
Jethro Grassie 2019-10-27 14:10:51 -04:00
parent e784fb24ac
commit d27694431e
No known key found for this signature in database
GPG Key ID: DE8ED755616565BB
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/pool.c
View File

@ -178,7 +178,7 @@ typedef struct client_t
job_t active_jobs[CLIENT_JOBS_MAX]; job_t active_jobs[CLIENT_JOBS_MAX];
uint64_t hashes; uint64_t hashes;
time_t connected_since; time_t connected_since;
bool is_proxy; bool is_xnp;
uint32_t mode; uint32_t mode;
uint8_t bad_shares; uint8_t bad_shares;
} client_t; } client_t;
@ -828,7 +828,7 @@ static void
retarget(client_t *client, job_t *job) retarget(client_t *client, job_t *job)
{ {
double duration = difftime(time(NULL), client->connected_since); double duration = difftime(time(NULL), client->connected_since);
uint8_t retarget_time = client->is_proxy ? 5 : 120; uint8_t retarget_time = client->is_xnp ? 5 : 120;
uint64_t target = fmax((double)client->hashes / uint64_t target = fmax((double)client->hashes /
duration * retarget_time, config.pool_start_diff); duration * retarget_time, config.pool_start_diff);
job->target = target; job->target = target;
@ -1181,7 +1181,7 @@ client_send_job(client_t *client, bool response)
retarget(client, job); retarget(client, job);
char body[JOB_BODY_MAX]; char body[JOB_BODY_MAX];
if (!client->is_proxy) if (!client->is_xnp)
{ {
stratum_get_job_body(body, client, response); stratum_get_job_body(body, client, response);
} }
@ -2078,15 +2078,15 @@ client_on_login(json_object *message, client_t *client)
if (user_agent) if (user_agent)
{ {
strncpy(client->agent, user_agent, 255); strncpy(client->agent, user_agent, 255);
client->is_proxy = strstr(user_agent, "proxy") != NULL client->is_xnp = strstr(user_agent, "xmr-node-proxy") != NULL
? true : false; ? true : false;
} }
} }
if (client->is_proxy && client->mode == MODE_SELF_SELECT) if (client->is_xnp && client->mode == MODE_SELF_SELECT)
{ {
send_validation_error(client, send_validation_error(client,
"login mode self-select and proxy not yet supported"); "mode self-select not supported by xmr-node-proxy");
return; return;
} }
@ -2094,7 +2094,8 @@ client_on_login(json_object *message, client_t *client)
strncpy(client->worker_id, worker_id, sizeof(client->worker_id)); strncpy(client->worker_id, worker_id, sizeof(client->worker_id));
uuid_t cid; uuid_t cid;
uuid_generate(cid); uuid_generate(cid);
bin_to_hex((const unsigned char*)cid, sizeof(uuid_t), client->client_id, 32); bin_to_hex((const unsigned char*)cid, sizeof(uuid_t),
client->client_id, 32);
client_send_job(client, true); client_send_job(client, true);
} }
@ -2274,7 +2275,7 @@ client_on_submit(json_object *message, client_t *client)
memcpy(p, &job->extra_nonce, sizeof(extra_nonce)); memcpy(p, &job->extra_nonce, sizeof(extra_nonce));
p += 4; p += 4;
memcpy(p, &instance_id, sizeof(instance_id)); memcpy(p, &instance_id, sizeof(instance_id));
if (client->is_proxy) if (client->is_xnp)
{ {
/* /*
A proxy supplies pool_nonce and worker_nonce A proxy supplies pool_nonce and worker_nonce