diff options
author | psychocrypt <psychocryptHPC@gmail.com> | 2018-04-16 17:52:42 +0200 |
---|---|---|
committer | psychocrypt <psychocryptHPC@gmail.com> | 2018-04-17 21:01:23 +0200 |
commit | a5ddd040a6eeb0609e1d1b0f16c1d271d31c7377 (patch) | |
tree | 92aad2fd9010eeb278eb1e97a43ec97f6c64b164 /xmrstak/backend/nvidia/minethd.cpp | |
parent | 9df1d4d608f59e81e1e7db1f9b20dd2807e7dd6e (diff) | |
download | xmr-stak-a5ddd040a6eeb0609e1d1b0f16c1d271d31c7377.zip xmr-stak-a5ddd040a6eeb0609e1d1b0f16c1d271d31c7377.tar.gz |
fix wrong algo selection
In the case where the dev pool mines on a higher version than a monero fork coin the miner is not resetting the algorithm.
This PR select the correct algorithm each time the block version hash changed.
Diffstat (limited to 'xmrstak/backend/nvidia/minethd.cpp')
-rw-r--r-- | xmrstak/backend/nvidia/minethd.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/xmrstak/backend/nvidia/minethd.cpp b/xmrstak/backend/nvidia/minethd.cpp index 804c06a..4593dab 100644 --- a/xmrstak/backend/nvidia/minethd.cpp +++ b/xmrstak/backend/nvidia/minethd.cpp @@ -247,6 +247,7 @@ void minethd::work_main() globalStates::inst().iConsumeCnt++; uint8_t version = 0; + size_t lastPoolId = 0; while (bQuit == 0) { @@ -264,13 +265,19 @@ void minethd::work_main() continue; } uint8_t new_version = oWork.getVersion(); - if(new_version != version) + if(new_version != version || oWork.iPoolId != lastPoolId) { - if(new_version >= ::jconf::inst()->GetMiningForkVersion()) + if(new_version >= ::jconf::inst()->GetMiningForkVersion() || oWork.iPoolId == 0) { miner_algo = ::jconf::inst()->GetMiningAlgo(); hash_fun = cpu::minethd::func_selector(::jconf::inst()->HaveHardwareAes(), true /*bNoPrefetch*/, miner_algo); } + else + { + miner_algo = ::jconf::inst()->GetMiningAlgoRoot(); + hash_fun = cpu::minethd::func_selector(::jconf::inst()->HaveHardwareAes(), true /*bNoPrefetch*/, miner_algo); + } + lastPoolId = oWork.iPoolId; version = new_version; } |