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

decred: optional --vote argument without arg or 0, dont vote (votebits set to 1)

Browse Source
This commit is contained in:
elbandi 2016-04-01 14:43:22 +02:00
parent 29c3f1c714
commit 27c32cd5a9
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sgminer.c
View File

@ -107,6 +107,7 @@ int nDevs;
int opt_dynamic_interval = 7; int opt_dynamic_interval = 7;
int opt_g_threads = -1; int opt_g_threads = -1;
bool opt_restart = true; bool opt_restart = true;
int opt_vote = 0;
/***************************************** /*****************************************
* Xn Algorithm options * Xn Algorithm options
@ -1803,6 +1804,9 @@ struct opt_table opt_config_table[] = {
OPT_WITHOUT_ARG("--verbose|-v", OPT_WITHOUT_ARG("--verbose|-v",
opt_set_bool, &opt_verbose, opt_set_bool, &opt_verbose,
"Log verbose output to stderr as well as status output"), "Log verbose output to stderr as well as status output"),
OPT_WITH_ARG("--vote",
set_int_1_to_65535, opt_show_intval, &opt_vote,
"Optional vote value for decred blocks"),
OPT_WITH_ARG("--watchpool-refresh", OPT_WITH_ARG("--watchpool-refresh",
set_int_1_to_65535, opt_show_intval, &opt_watchpool_refresh, set_int_1_to_65535, opt_show_intval, &opt_watchpool_refresh,
"Interval in seconds to refresh pool status"), "Interval in seconds to refresh pool status"),
@ -2283,6 +2287,8 @@ static bool getwork_decode(json_t *res_val, struct work *work)
return false; return false;
} }
if (work->pool->algorithm.type == ALGO_DECRED) { if (work->pool->algorithm.type == ALGO_DECRED) {
uint16_t vote = (uint16_t) (opt_vote << 1) | 1;
memcpy(&work->data[100], &vote, 2);
// some random extradata to make it unique // some random extradata to make it unique
((uint32_t*)work->data)[36] = (rand()*4); ((uint32_t*)work->data)[36] = (rand()*4);
((uint32_t*)work->data)[37] = (rand()*4) << 8 | work->thr_id; ((uint32_t*)work->data)[37] = (rand()*4) << 8 | work->thr_id;
@ -5642,9 +5648,16 @@ static void *stratum_sthread(void *userdata)
sshare->id = swork_id++; sshare->id = swork_id++;
mutex_unlock(&sshare_lock); mutex_unlock(&sshare_lock);
if (pool->algorithm.type == ALGO_DECRED && opt_vote) {
snprintf(s, sizeof(s),
"{\"params\": [\"%s\", \"%s\", \"%s\", \"%s\", \"%s\", \"%04x\"], \"id\": %d, \"method\": \"mining.submit\"}",
pool->rpc_user, work->job_id, nonce2hex, work->ntime, noncehex, (opt_vote << 1) | 1, sshare->id);
} else {
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\"}",
pool->rpc_user, work->job_id, nonce2hex, work->ntime, noncehex, sshare->id); pool->rpc_user, work->job_id, nonce2hex, work->ntime, noncehex, sshare->id);
}
applog(LOG_INFO, "Submitting share %08lx to %s", (long unsigned int)htole32(hash32[6]), get_pool_name(pool)); applog(LOG_INFO, "Submitting share %08lx to %s", (long unsigned int)htole32(hash32[6]), get_pool_name(pool));
@ -6166,10 +6179,12 @@ static void gen_stratum_work(struct pool *pool, struct work *work)
((uint32_t *)work->data)[31] = 0x00000280; ((uint32_t *)work->data)[31] = 0x00000280;
} }
else if (pool->algorithm.type == ALGO_DECRED) { else if (pool->algorithm.type == ALGO_DECRED) {
uint16_t vote = (uint16_t) (opt_vote << 1) | 1;
memcpy(work->data, pool->header_bin, 4); // version memcpy(work->data, pool->header_bin, 4); // version
flip32(work->data + 4, pool->header_bin + 4); // prevhash flip32(work->data + 4, pool->header_bin + 4); // prevhash
memcpy(work->data + 4 + 32, pool->coinbase, MIN((int)pool->swork.cb_len, 108)); memcpy(work->data + 4 + 32, pool->coinbase, MIN((int)pool->swork.cb_len, 108));
memcpy(work->data + 144, pool->nonce1bin, MIN(pool->n1_len, 36)); memcpy(work->data + 144, pool->nonce1bin, MIN(pool->n1_len, 36));
memcpy(work->data + 100, &vote, 2);
((uint32_t *)work->data)[36] = work->nonce2; ((uint32_t *)work->data)[36] = work->nonce2;
// ((uint32_t *)work->data)[36] = 2; // ((uint32_t *)work->data)[36] = 2;
((uint32_t *)work->data)[37] = ((rand() * 4) << 8) | work->thr_id; ((uint32_t *)work->data)[37] = ((rand() * 4) << 8) | work->thr_id;