mirrors/xmrig
1
0
Fork 1
mirror of https://github.com/xmrig/xmrig.git synced 2025-12-25 21:52:54 -05:00
Code Issues Projects Releases Wiki Activity

Merge xmrig v6.12.2 into master

Browse Source
This commit is contained in:
MoneroOcean
2021-05-31 15:06:47 +00:00
parent 4c6d815b19 80ae339343
commit 28ad107de8
28 changed files with 987 additions and 506 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/base/crypto/Algorithm.cpp
View File

@@ -119,6 +119,7 @@ static AlgoName const algorithm_names[] = {
{ "chukwa", nullptr, Algorithm::AR2_CHUKWA },
{ "argon2/chukwav2", nullptr, Algorithm::AR2_CHUKWA_V2 },
{ "chukwav2", nullptr, Algorithm::AR2_CHUKWA_V2 },
{ "argon2/ninja", nullptr, Algorithm::AR2_WRKZ },
{ "argon2/wrkz", nullptr, Algorithm::AR2_WRKZ },
# endif
# ifdef XMRIG_ALGO_ASTROBWT

6
src/base/net/stratum/Pools.h
View File

@@ -57,6 +57,12 @@ public:
Pools();
# ifdef XMRIG_FEATURE_BENCHMARK
inline bool isBenchmark() const { return !!m_benchmark; }
# else
inline constexpr bool isBenchmark() const { return false; }
# endif
inline const std::vector<Pool> &data() const { return m_data; }
inline int retries() const { return m_retries; }
inline int retryPause() const { return m_retryPause; }