mirror of
https://github.com/GOSTSec/sgminer
synced 2025-01-27 15:04:17 +00:00
Merge branch 'master' into usb-dev
This commit is contained in:
Con Kolivas
commit
0244998ef8
60
cgminer.c
60
cgminer.c
@ -1414,16 +1414,16 @@ void free_work(struct work *work)
|
||||
* entered under gbt_lock */
|
||||
static void __build_gbt_coinbase(struct pool *pool)
|
||||
{
|
||||
int cbt_len, cal_len, orig_len;
|
||||
unsigned char *coinbase;
|
||||
int cbt_len, orig_len;
|
||||
uint8_t *extra_len;
|
||||
size_t cal_len;
|
||||
|
||||
cbt_len = strlen(pool->coinbasetxn) / 2;
|
||||
pool->coinbase_len = cbt_len + 4;
|
||||
/* We add 4 bytes of extra data corresponding to nonce2 of stratum */
|
||||
cal_len = pool->coinbase_len + 1;
|
||||
if (cal_len % 4)
|
||||
cal_len += 4 - (cal_len % 4);
|
||||
align_len(&cal_len);
|
||||
coinbase = calloc(cal_len, 1);
|
||||
hex2bin(coinbase, pool->coinbasetxn, 42);
|
||||
extra_len = (uint8_t *)(coinbase + 41);
|
||||
@ -1447,7 +1447,8 @@ static bool __build_gbt_txns(struct pool *pool, json_t *res_val)
|
||||
{
|
||||
json_t *txn_array;
|
||||
bool ret = false;
|
||||
int i, cal_len;
|
||||
size_t cal_len;
|
||||
int i;
|
||||
|
||||
free(pool->txn_hashes);
|
||||
pool->txn_hashes = NULL;
|
||||
@ -1473,8 +1474,7 @@ static bool __build_gbt_txns(struct pool *pool, json_t *res_val)
|
||||
unsigned char *txn_bin;
|
||||
|
||||
cal_len = txn_len;
|
||||
if (cal_len % 4)
|
||||
cal_len += 4 - (cal_len % 4);
|
||||
align_len(&cal_len);
|
||||
txn_bin = calloc(cal_len, 1);
|
||||
if (unlikely(!txn_bin))
|
||||
quit(1, "Failed to calloc txn_bin in __build_gbt_txns");
|
||||
@ -5144,28 +5144,30 @@ static void set_work_target(struct work *work, double diff)
|
||||
* other means to detect when the pool has died in stratum_thread */
|
||||
static void gen_stratum_work(struct pool *pool, struct work *work)
|
||||
{
|
||||
unsigned char *coinbase, merkle_root[32], merkle_sha[64], *merkle_hash;
|
||||
int len, cb1_len, n1_len, cb2_len, i;
|
||||
unsigned char *coinbase, merkle_root[32], merkle_sha[64];
|
||||
char *header, *merkle_hash;
|
||||
uint32_t *data32, *swap32;
|
||||
char *header;
|
||||
size_t alloc_len;
|
||||
int i;
|
||||
|
||||
mutex_lock(&pool->pool_lock);
|
||||
|
||||
/* Generate coinbase */
|
||||
work->nonce2 = bin2hex((const unsigned char *)&pool->nonce2, pool->n2size);
|
||||
pool->nonce2++;
|
||||
cb1_len = strlen(pool->swork.coinbase1) / 2;
|
||||
n1_len = strlen(pool->nonce1) / 2;
|
||||
cb2_len = strlen(pool->swork.coinbase2) / 2;
|
||||
len = cb1_len + n1_len + pool->n2size + cb2_len;
|
||||
coinbase = alloca(len + 1);
|
||||
hex2bin(coinbase, pool->swork.coinbase1, cb1_len);
|
||||
hex2bin(coinbase + cb1_len, pool->nonce1, n1_len);
|
||||
hex2bin(coinbase + cb1_len + n1_len, work->nonce2, pool->n2size);
|
||||
hex2bin(coinbase + cb1_len + n1_len + pool->n2size, pool->swork.coinbase2, cb2_len);
|
||||
alloc_len = pool->swork.cb_len;
|
||||
align_len(&alloc_len);
|
||||
coinbase = calloc(alloc_len, 1);
|
||||
if (unlikely(!coinbase))
|
||||
quit(1, "Failed to calloc coinbase in gen_stratum_work");
|
||||
hex2bin(coinbase, pool->swork.coinbase1, pool->swork.cb1_len);
|
||||
hex2bin(coinbase + pool->swork.cb1_len, pool->nonce1, pool->n1_len);
|
||||
hex2bin(coinbase + pool->swork.cb1_len + pool->n1_len, work->nonce2, pool->n2size);
|
||||
hex2bin(coinbase + pool->swork.cb1_len + pool->n1_len + pool->n2size, pool->swork.coinbase2, pool->swork.cb2_len);
|
||||
|
||||
/* Generate merkle root */
|
||||
gen_hash(coinbase, merkle_root, len);
|
||||
gen_hash(coinbase, merkle_root, pool->swork.cb_len);
|
||||
free(coinbase);
|
||||
memcpy(merkle_sha, merkle_root, 32);
|
||||
for (i = 0; i < pool->swork.merkles; i++) {
|
||||
unsigned char merkle_bin[32];
|
||||
@ -5179,15 +5181,19 @@ static void gen_stratum_work(struct pool *pool, struct work *work)
|
||||
swap32 = (uint32_t *)merkle_root;
|
||||
for (i = 0; i < 32 / 4; i++)
|
||||
swap32[i] = swab32(data32[i]);
|
||||
merkle_hash = (unsigned char *)bin2hex((const unsigned char *)merkle_root, 32);
|
||||
merkle_hash = bin2hex((const unsigned char *)merkle_root, 32);
|
||||
|
||||
header = strdup(pool->swork.bbversion);
|
||||
header = realloc_strcat(header, pool->swork.prev_hash);
|
||||
header = realloc_strcat(header, (char *)merkle_hash);
|
||||
header = realloc_strcat(header, pool->swork.ntime);
|
||||
header = realloc_strcat(header, pool->swork.nbit);
|
||||
header = realloc_strcat(header, "00000000"); /* nonce */
|
||||
header = realloc_strcat(header, workpadding);
|
||||
header = calloc(pool->swork.header_len, 1);
|
||||
if (unlikely(!header))
|
||||
quit(1, "Failed to calloc header in gen_stratum_work");
|
||||
sprintf(header, "%s%s%s%s%s%s%s",
|
||||
pool->swork.bbversion,
|
||||
pool->swork.prev_hash,
|
||||
merkle_hash,
|
||||
pool->swork.ntime,
|
||||
pool->swork.nbit,
|
||||
"00000000", /* nonce */
|
||||
workpadding);
|
||||
|
||||
/* Store the stratum work diff to check it still matches the pool's
|
||||
* stratum diff when submitting shares */
|
||||
|
||||
6
miner.h
6
miner.h
@ -880,6 +880,11 @@ struct stratum_work {
|
||||
char *ntime;
|
||||
bool clean;
|
||||
|
||||
size_t cb1_len;
|
||||
size_t cb2_len;
|
||||
size_t cb_len;
|
||||
|
||||
size_t header_len;
|
||||
int merkles;
|
||||
double diff;
|
||||
};
|
||||
@ -959,6 +964,7 @@ struct pool {
|
||||
size_t sockbuf_size;
|
||||
char *sockaddr_url; /* stripped url used for sockaddr */
|
||||
char *nonce1;
|
||||
size_t n1_len;
|
||||
uint32_t nonce2;
|
||||
int n2size;
|
||||
bool has_stratum;
|
||||
|
||||
17
util.c
17
util.c
@ -1158,11 +1158,15 @@ static bool parse_notify(struct pool *pool, json_t *val)
|
||||
pool->swork.job_id = job_id;
|
||||
pool->swork.prev_hash = prev_hash;
|
||||
pool->swork.coinbase1 = coinbase1;
|
||||
pool->swork.cb1_len = strlen(coinbase1) / 2;
|
||||
pool->swork.coinbase2 = coinbase2;
|
||||
pool->swork.cb2_len = strlen(coinbase2) / 2;
|
||||
pool->swork.bbversion = bbversion;
|
||||
pool->swork.nbit = nbit;
|
||||
pool->swork.ntime = ntime;
|
||||
pool->swork.clean = clean;
|
||||
pool->swork.cb_len = pool->swork.cb1_len + pool->n1_len + pool->n2size + pool->swork.cb2_len;
|
||||
|
||||
for (i = 0; i < pool->swork.merkles; i++)
|
||||
free(pool->swork.merkle[i]);
|
||||
if (merkles) {
|
||||
@ -1173,6 +1177,15 @@ static bool parse_notify(struct pool *pool, json_t *val)
|
||||
pool->swork.merkles = merkles;
|
||||
if (clean)
|
||||
pool->nonce2 = 0;
|
||||
pool->swork.header_len = strlen(pool->swork.bbversion) +
|
||||
strlen(pool->swork.prev_hash) +
|
||||
strlen(pool->swork.ntime) +
|
||||
strlen(pool->swork.nbit) +
|
||||
/* merkle_hash */ 32 +
|
||||
/* nonce */ 8 +
|
||||
/* workpadding */ 96;
|
||||
pool->swork.header_len = pool->swork.header_len * 2 + 1;
|
||||
align_len(&pool->swork.header_len);
|
||||
mutex_unlock(&pool->pool_lock);
|
||||
|
||||
if (opt_protocol) {
|
||||
@ -1486,6 +1499,7 @@ bool initiate_stratum(struct pool *pool)
|
||||
applog(LOG_INFO, "Failed to get nonce1 in initiate_stratum");
|
||||
goto out;
|
||||
}
|
||||
pool->n1_len = strlen(pool->nonce1) / 2;
|
||||
pool->n2size = json_integer_value(json_array_get(res_val, 2));
|
||||
if (!pool->n2size) {
|
||||
applog(LOG_INFO, "Failed to get n2size in initiate_stratum");
|
||||
@ -1570,8 +1584,7 @@ void *realloc_strcat(char *ptr, char *s)
|
||||
return ptr;
|
||||
|
||||
len += old + 1;
|
||||
if (len % 4)
|
||||
len += 4 - (len % 4);
|
||||
align_len(&len);
|
||||
|
||||
ret = malloc(len);
|
||||
if (unlikely(!ret))
|
||||
|
||||
7
util.h
7
util.h
@ -57,4 +57,11 @@ void dev_error(struct cgpu_info *dev, enum dev_reason reason);
|
||||
void *realloc_strcat(char *ptr, char *s);
|
||||
void RenameThread(const char* name);
|
||||
|
||||
/* Align a size_t to 4 byte boundaries for fussy arches */
|
||||
static inline void align_len(size_t *len)
|
||||
{
|
||||
if (*len % 4)
|
||||
*len += 4 - (*len % 4);
|
||||
}
|
||||
|
||||
#endif /* __UTIL_H__ */
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user