diff --git a/xmrstak/backend/amd/minethd.cpp b/xmrstak/backend/amd/minethd.cpp index bc14e441bfb1470d6bc028f78888d31811b25606..cab5ad9dac159699565e4f6427def89631b2f204 100644 --- a/xmrstak/backend/amd/minethd.cpp +++ b/xmrstak/backend/amd/minethd.cpp @@ -219,7 +219,7 @@ void minethd::work_main() uint8_t new_version = oWork.getVersion(); if(new_version != version) { - if(new_version >= ::jconf::inst()->GetMiningForkHeight()) + if(new_version >= ::jconf::inst()->GetMiningForkVersion()) { miner_algo = ::jconf::inst()->GetMiningAlgo(); hash_fun = cpu::minethd::func_selector(::jconf::inst()->HaveHardwareAes(), true /*bNoPrefetch*/, miner_algo); diff --git a/xmrstak/backend/cpu/minethd.cpp b/xmrstak/backend/cpu/minethd.cpp index 4c5551524db1c2b8de51f957b124ef7be583916b..5b56f851cf22175ab6343a161e330debb5c2978e 100644 --- a/xmrstak/backend/cpu/minethd.cpp +++ b/xmrstak/backend/cpu/minethd.cpp @@ -463,7 +463,7 @@ void minethd::work_main() uint8_t new_version = oWork.getVersion(); if(new_version != version) { - if(new_version >= ::jconf::inst()->GetMiningForkHeight()) + if(new_version >= ::jconf::inst()->GetMiningForkVersion()) { miner_algo = ::jconf::inst()->GetMiningAlgo(); hash_fun = func_selector(::jconf::inst()->HaveHardwareAes(), bNoPrefetch, miner_algo); @@ -720,7 +720,7 @@ void minethd::multiway_work_main() uint8_t new_version = oWork.getVersion(); if(new_version != version) { - if(new_version >= ::jconf::inst()->GetMiningForkHeight()) + if(new_version >= ::jconf::inst()->GetMiningForkVersion()) { miner_algo = ::jconf::inst()->GetMiningAlgo(); hash_fun_multi = func_multi_selector(N, ::jconf::inst()->HaveHardwareAes(), bNoPrefetch, miner_algo); diff --git a/xmrstak/backend/nvidia/minethd.cpp b/xmrstak/backend/nvidia/minethd.cpp index 917101f47b1159108ea02d32e4c2006daf6aaa8f..804c06a711ee8657b0d701459ca23cad9039f23d 100644 --- a/xmrstak/backend/nvidia/minethd.cpp +++ b/xmrstak/backend/nvidia/minethd.cpp @@ -266,7 +266,7 @@ void minethd::work_main() uint8_t new_version = oWork.getVersion(); if(new_version != version) { - if(new_version >= ::jconf::inst()->GetMiningForkHeight()) + if(new_version >= ::jconf::inst()->GetMiningForkVersion()) { miner_algo = ::jconf::inst()->GetMiningAlgo(); hash_fun = cpu::minethd::func_selector(::jconf::inst()->HaveHardwareAes(), true /*bNoPrefetch*/, miner_algo); diff --git a/xmrstak/jconf.cpp b/xmrstak/jconf.cpp index 87cb3e9e05831acadc4abefb1933c435d2d51b70..f99698a0e1a5b4a8945735431ed5c5bc3f9a4113 100644 --- a/xmrstak/jconf.cpp +++ b/xmrstak/jconf.cpp @@ -91,7 +91,7 @@ struct xmrstak_coin_algo const char* coin_name; xmrstak_algo algo; xmrstak_algo algo_root; - uint8_t fork_height; + uint8_t fork_version; const char* default_pool; }; @@ -634,7 +634,7 @@ bool jconf::parse_config(const char* sFilename, const char* sFilenamePools) { mining_algo = coin_algos[i].algo; mining_algo_root = coin_algos[i].algo_root; - mining_fork_height = coin_algos[i].fork_height; + mining_fork_version = coin_algos[i].fork_version; break; } } diff --git a/xmrstak/jconf.hpp b/xmrstak/jconf.hpp index 336e4be21d9fe0b127a9f3e92efb53d0d42b7962..76b93ddaede4145dcac240708a95132310270670 100644 --- a/xmrstak/jconf.hpp +++ b/xmrstak/jconf.hpp @@ -52,7 +52,7 @@ public: inline xmrstak_algo GetMiningAlgoRoot() const { return mining_algo_root; } - inline uint8_t GetMiningForkHeight() const { return mining_fork_height; } + inline uint8_t GetMiningForkVersion() const { return mining_fork_version; } std::string GetMiningCoin(); @@ -96,5 +96,5 @@ private: bool bHaveAes; xmrstak_algo mining_algo; xmrstak_algo mining_algo_root; - uint8_t mining_fork_height; + uint8_t mining_fork_version; };