Skip to content

Finalize UPXTWO changes #1

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
uPlexa wants to merge 1 commit into
base: upxtwo
Choose a base branch
from
Open

Finalize UPXTWO changes #1

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
5 changes: 3 additions & 2 deletions lib/xmr.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ function parse_algo_variant(algo_str, variant) {
}

function detectAlgo(default_pool_algo_set, block_version) {
if ("cn/2" in default_pool_algo_set && "cn/1" in default_pool_algo_set) return block_version >= 11 ? "cn/2" : "cn/1"; // monero fork
if ("cn-upx/2" in default_pool_algo_set && "cn/1" in default_pool_algo_set) return block_version >= 11 ? "cn/2" : "cn/1"; // monero fork
const default_pool_algo_arr = Object.keys(default_pool_algo_set);
if (default_pool_algo_arr.length == 1) return default_pool_algo_arr[0];
console.error("Can't not correctly detect block template algorithm from the list of provided default algorithms (please reduce it to single item): " + default_pool_algo_arr.join(", "));
Expand Down Expand Up @@ -309,10 +309,11 @@ function processShare(miner, job, blockTemplate, nonce, resultHash) {
var hard_fork_version = convertedBlob[0];
hash = multiHashing.cryptonight_upx(convertedBlob, 1);
if(hard_fork_version>=11){
hash = multiHashing.cryptonight(convertedBlob, 8);
hash = multiHashing.cryptonight_plex(convertedBlob);
}
if (hash.toString('hex') !== resultHash) {
console.error(global.threadName + "Bad share from miner " + miner.logString);
console.log("\r\n" + hash.toString('hex') + "\r\n" + resultHash);
miner.messageSender('job', miner.getJob(miner, blockTemplate, true));
return false;
}
Expand Down
20 changes: 14 additions & 6 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.