GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-22 12:34:27 +00:00
Code Issues Releases Wiki Activity

Minimise risk of nonce2 overflow with small nonce2 lengths by always encoding the work little endian, and increasing the maximum size of nonce2 to 8 bytes.

Browse Source
This commit is contained in:
Con Kolivas 2013-12-22 14:29:38 +11:00 committed by Noel Maersk
parent 9628207066
commit 350fe7f135
2 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
cgminer.c
View File

@ -1615,13 +1615,15 @@ static void gen_gbt_work(struct pool *pool, struct work *work)
{ {
unsigned char *merkleroot; unsigned char *merkleroot;
struct timeval now; struct timeval now;
uint64_t nonce2le;
cgtime(&now); cgtime(&now);
if (now.tv_sec - pool->tv_lastwork.tv_sec > 60) if (now.tv_sec - pool->tv_lastwork.tv_sec > 60)
update_gbt(pool); update_gbt(pool);
cg_wlock(&pool->gbt_lock); cg_wlock(&pool->gbt_lock);
memcpy(pool->coinbase + pool->nonce2_offset, &pool->nonce2, 4); nonce2le = htole64(pool->nonce2);
memcpy(pool->coinbase + pool->nonce2_offset, &nonce2le, pool->n2size);
pool->nonce2++; pool->nonce2++;
cg_dwlock(&pool->gbt_lock); cg_dwlock(&pool->gbt_lock);
merkleroot = __gbt_merkleroot(pool); merkleroot = __gbt_merkleroot(pool);
@ -1720,8 +1722,9 @@ static bool gbt_decode(struct pool *pool, json_t *res_val)
free(pool->coinbasetxn); free(pool->coinbasetxn);
pool->coinbasetxn = strdup(coinbasetxn); pool->coinbasetxn = strdup(coinbasetxn);
cbt_len = strlen(pool->coinbasetxn) / 2; cbt_len = strlen(pool->coinbasetxn) / 2;
pool->coinbase_len = cbt_len + 4; /* We add 8 bytes of extra data corresponding to nonce2 */
/* We add 4 bytes of extra data corresponding to nonce2 of stratum */ pool->n2size = 8;
pool->coinbase_len = cbt_len + pool->n2size;
cal_len = pool->coinbase_len + 1; cal_len = pool->coinbase_len + 1;
align_len(&cal_len); align_len(&cal_len);
free(pool->coinbase); free(pool->coinbase);
@ -1732,7 +1735,7 @@ static bool gbt_decode(struct pool *pool, json_t *res_val)
extra_len = (uint8_t *)(pool->coinbase + 41); extra_len = (uint8_t *)(pool->coinbase + 41);
orig_len = *extra_len; orig_len = *extra_len;
hex2bin(pool->coinbase + 42, pool->coinbasetxn + 84, orig_len); hex2bin(pool->coinbase + 42, pool->coinbasetxn + 84, orig_len);
*extra_len += 4; *extra_len += pool->n2size;
hex2bin(pool->coinbase + 42 + *extra_len, pool->coinbasetxn + 84 + (orig_len * 2), hex2bin(pool->coinbase + 42 + *extra_len, pool->coinbasetxn + 84 + (orig_len * 2),
cbt_len - orig_len - 42); cbt_len - orig_len - 42);
pool->nonce2_offset = orig_len + 42; pool->nonce2_offset = orig_len + 42;
@ -5249,10 +5252,11 @@ static void *stratum_sthread(void *userdata)
quit(1, "Failed to create stratum_q in stratum_sthread"); quit(1, "Failed to create stratum_q in stratum_sthread");
while (42) { while (42) {
char noncehex[12], nonce2hex[20]; char noncehex[12], nonce2hex[20], s[1024];
struct stratum_share *sshare; struct stratum_share *sshare;
uint32_t *hash32, nonce; uint32_t *hash32, nonce;
char s[1024], nonce2[8]; unsigned char nonce2[8];
uint64_t *nonce2_64;
struct work *work; struct work *work;
bool submitted; bool submitted;
@ -5287,10 +5291,9 @@ static void *stratum_sthread(void *userdata)
sshare->id = swork_id++; sshare->id = swork_id++;
mutex_unlock(&sshare_lock); mutex_unlock(&sshare_lock);
memset(nonce2, 0, 8); nonce2_64 = (uint64_t *)nonce2;
/* We only use uint32_t sized nonce2 increments internally */ *nonce2_64 = htole64(work->nonce2);
memcpy(nonce2, &work->nonce2, sizeof(uint32_t)); __bin2hex(nonce2hex, nonce2, work->nonce2_len);
__bin2hex(nonce2hex, (const unsigned char *)nonce2, work->nonce2_len);
snprintf(s, sizeof(s), snprintf(s, sizeof(s),
"{\"params\": [\"%s\", \"%s\", \"%s\", \"%s\", \"%s\"], \"id\": %d, \"method\": \"mining.submit\"}", "{\"params\": [\"%s\", \"%s\", \"%s\", \"%s\", \"%s\"], \"id\": %d, \"method\": \"mining.submit\"}",
@ -5695,12 +5698,15 @@ static void gen_stratum_work(struct pool *pool, struct work *work)
{ {
unsigned char merkle_root[32], merkle_sha[64]; unsigned char merkle_root[32], merkle_sha[64];
uint32_t *data32, *swap32; uint32_t *data32, *swap32;
uint64_t nonce2le;
int i; int i;
cg_wlock(&pool->data_lock); cg_wlock(&pool->data_lock);
/* Update coinbase */ /* Update coinbase. Always use an LE encoded nonce2 to fill in values
memcpy(pool->coinbase + pool->nonce2_offset, &pool->nonce2, sizeof(uint32_t)); * from left to right and prevent overflow errors with small n2sizes */
nonce2le = htole64(pool->nonce2);
memcpy(pool->coinbase + pool->nonce2_offset, &nonce2le, pool->n2size);
work->nonce2 = pool->nonce2++; work->nonce2 = pool->nonce2++;
work->nonce2_len = pool->n2size; work->nonce2_len = pool->n2size;
@ -5740,7 +5746,8 @@ static void gen_stratum_work(struct pool *pool, struct work *work)
merkle_hash = bin2hex((const unsigned char *)merkle_root, 32); merkle_hash = bin2hex((const unsigned char *)merkle_root, 32);
applog(LOG_DEBUG, "Generated stratum merkle %s", merkle_hash); applog(LOG_DEBUG, "Generated stratum merkle %s", merkle_hash);
applog(LOG_DEBUG, "Generated stratum header %s", header); applog(LOG_DEBUG, "Generated stratum header %s", header);
applog(LOG_DEBUG, "Work job_id %s nonce2 %d ntime %s", work->job_id, work->nonce2, work->ntime); applog(LOG_DEBUG, "Work job_id %s nonce2 %"PRIu64" ntime %s", work->job_id,
work->nonce2, work->ntime);
free(header); free(header);
free(merkle_hash); free(merkle_hash);
} }

4
miner.h
View File

@ -1234,7 +1234,7 @@ struct pool {
char *nonce1; char *nonce1;
unsigned char *nonce1bin; unsigned char *nonce1bin;
size_t n1_len; size_t n1_len;
uint32_t nonce2; uint64_t nonce2;
int n2size; int n2size;
char *sessionid; char *sessionid;
bool has_stratum; bool has_stratum;
@ -1311,7 +1311,7 @@ struct work {
bool stratum; bool stratum;
char *job_id; char *job_id;
uint32_t nonce2; uint64_t nonce2;
size_t nonce2_len; size_t nonce2_len;
char *ntime; char *ntime;
double sdiff; double sdiff;