Skip to content
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

add nicehash support #19

Open
wants to merge 3 commits into
base: Verus2.2
Choose a base branch
from
Open

add nicehash support #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
03bebf1
add nicehash support [ --nicehash ]
wong-fi-hung May 29, 2023
9ac46e0
add nicehash support [ --nicehash ]
wong-fi-hung May 29, 2023
22c6f6d
Merge branch 'monkins1010:Verus2.2' into Verus2.2
wong-fi-hung Apr 22, 2024
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
43 changes: 41 additions & 2 deletions ccminer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,9 @@ struct workio_cmd {
int pooln;
};

// nicehash mode [ --nicehash ]
bool nicehash = false;

bool opt_debug = false;
bool opt_debug_diff = false;
bool opt_debug_threads = false;
Expand Down Expand Up @@ -306,6 +309,7 @@ Options:\n\
x17 X17\n\
wildkeccak Boolberry\n\
zr5 ZR5 (ZiftrCoin)\n\
--nicehash Enable extranonce subscribe(for nicehash) using this option\n\
-d, --devices Comma separated list of CUDA devices to use.\n\
Device IDs start counting from 0! Alternatively takes\n\
string names of your cards like gtx780ti or gt640#2\n\
Expand Down Expand Up @@ -416,6 +420,7 @@ struct option options[] = {
{ "no-longpoll", 0, NULL, 1003 },
{ "no-stratum", 0, NULL, 1007 },
{ "no-autotune", 0, NULL, 1004 }, // scrypt
{ "nicehash", 0, NULL, 1040 }, // nicehash mode [ --nicehash ]
{ "interactive", 1, NULL, 1050 }, // scrypt
{ "lookup-gap", 1, NULL, 'L' }, // scrypt
{ "texture-cache", 1, NULL, 1051 },// scrypt
Expand Down Expand Up @@ -1936,6 +1941,37 @@ static void *miner_thread(void *userdata)
//nonceptr[0] = (UINT32_MAX / opt_n_threads) * thr_id; // 0 if single thr
}

/* nicehash support */
if (opt_algo == ALGO_EQUIHASH) {
uint32_t oldpos = nonceptr[0];
bool nh = strstr(pools[cur_pooln].url, "nicehash") != NULL;
if (memcmp(&work.data[wcmpoft], &g_work.data[wcmpoft], wcmplen)) {
memcpy(&work, &g_work, sizeof(struct work));
if (!nh) nonceptr[0] = (rand()*4) << 24;
nonceptr[0] &= 0xFF000000u; // nicehash prefix hack
nonceptr[0] |= (0x00FFFFFFu / opt_n_threads) * thr_id;

if (nicehash) {
// enable subscribe when using this option.
opt_extranonce = true;
} else {
// disable subscribe by default.
opt_extranonce = false;
}
}
// also check the end, nonce in the middle.
else if (memcmp(&work.data[44/4], &g_work.data[0], 76-44)) {
memcpy(&work, &g_work, sizeof(struct work));
}
if (oldpos & 0xFFFF) {
if (!nh) nonceptr[0] = oldpos + 0x1000000u;
else {
uint32_t pfx = nonceptr[0] & 0xFF000000u;
nonceptr[0] = pfx | ((oldpos + 0x8000u) & 0xFFFFFFu);
}
}
}

if (memcmp(&work.data[wcmpoft], &g_work.data[wcmpoft], wcmplen)) {
#if 0
if (opt_debug) {
Expand Down Expand Up @@ -3033,6 +3069,9 @@ void parse_arg(int key, char *arg)
device_lookup_gap[n++] = last;
}
break;
case 1040: /* --nicehash */
nicehash = true;
break;
case 1050: /* scrypt --interactive */
{
char *pch = strtok(arg,",");
Expand Down Expand Up @@ -3541,8 +3580,8 @@ int main(int argc, char *argv[])
allow_mininginfo = false;
}

if (opt_algo == ALGO_EQUIHASH) {
opt_extranonce = false; // disable subscribe
if (opt_algo == ALGO_EQUIHASH && !nicehash) {
opt_extranonce = false; // disable subscribe by default.
}


Expand Down
8 changes: 4 additions & 4 deletions util.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,18 +214,18 @@ void format_hashrate_unit(double hashrate, char *output, const char *unit)
{
char prefix[2] = { 0, 0 };

if (hashrate < 10000) {
if (hashrate < 1000) {
// nop
}
else if (hashrate < 1e7) {
else if (hashrate < 1e6) {
prefix[0] = 'k';
hashrate *= 1e-3;
}
else if (hashrate < 1e10) {
else if (hashrate < 1e9) {
prefix[0] = 'M';
hashrate *= 1e-6;
}
else if (hashrate < 1e13) {
else if (hashrate < 1e12) {
prefix[0] = 'G';
hashrate *= 1e-9;
}
Expand Down