Skip to content

Revert "store the next difficulty" #442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alikkille wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Revert "store the next difficulty" #442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion miner.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1391,7 +1391,6 @@ struct pool {
unsigned char *coinbase;
size_t nonce2_offset;
unsigned char header_bin[128];
double next_diff;
int merkle_offset;

struct timeval tv_lastwork;
Expand Down
7 changes: 3 additions & 4 deletions util.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1560,7 +1560,6 @@ static bool parse_notify(struct pool *pool, json_t *val)
pool->swork.nbit = nbit;
pool->swork.ntime = ntime;
pool->swork.clean = clean;
pool->swork.diff = pool->next_diff;
alloc_len = pool->swork.cb_len = cb1_len + pool->n1_len + pool->n2size + cb2_len;
pool->nonce2_offset = cb1_len + pool->n1_len;

Expand Down Expand Up @@ -1669,8 +1668,8 @@ static bool parse_diff(struct pool *pool, json_t *val)
return false;

cg_wlock(&pool->data_lock);
old_diff = pool->next_diff;
pool->next_diff = diff;
old_diff = pool->swork.diff;
pool->swork.diff = diff;
cg_wunlock(&pool->data_lock);

if (old_diff != diff) {
Expand Down Expand Up @@ -2561,7 +2560,7 @@ bool initiate_stratum(struct pool *pool)
if (!pool->stratum_url)
pool->stratum_url = pool->sockaddr_url;
pool->stratum_active = true;
pool->next_diff = pool->swork.diff = 1;
pool->swork.diff = 1;
if (opt_protocol) {
applog(LOG_DEBUG, "%s confirmed mining.subscribe with extranonce1 %s extran2size %d",
get_pool_name(pool), pool->nonce1, pool->n2size);
Expand Down