Commit graph

65 commits

Author SHA1 Message Date
Ben Gräf
df6ca1319c Fixed cryptonight tests when force PoW option is used 2018-03-21 09:24:37 +01:00
Ben Gräf
b394aea8bf Merge branch 'master' of https://github.com/Bendr0id/xmrigCC 2018-03-21 09:01:05 +01:00
BenDroid
a3bf5938d4 Cleanup 2018-03-16 22:07:04 +01:00
BenDroid
2da8dad94c Integrated PoW changes for AEON
Added option to force PoW Version
Updated donate address
2018-03-16 20:22:53 +01:00
Ben Gräf
77cb5b1196 Added possibility to overrule the PoW
Added PoW adaptions for upcoming AEON PoW changes
2018-03-16 15:49:17 +01:00
BenDroid
563fdf6485 Merge branch 'master'
Conflicts:
	src/net/Client.cpp
2018-03-02 23:22:06 +01:00
BenDroid
4f6200f057 Manual merge 2018-03-02 21:29:53 +01:00
BenDroid
e9edd366fe Merge remote-tracking branch 'refs/remotes/xmrig/master'
Conflicts:
	CHANGELOG.md
	README.md
	src/App.cpp
	src/App.h
	src/Cpu.cpp
	src/Options.cpp
	src/Options.h
	src/crypto/CryptoNight_arm.h
	src/crypto/CryptoNight_x86.h
	src/version.h
2018-03-02 21:29:33 +01:00
Ben Gräf
9d0f570577 Fixed TLS build on Windows GCC/MVSC
Cleanup TLS compile
2018-03-01 17:44:15 +01:00
Ben Gräf
48493bbbb2
Update Options.cpp 2018-02-26 11:44:37 +01:00
Ben Gräf
c3aa7b446b Cleanup 2018-02-26 09:19:46 +01:00
BenDroid
69afccf762 Cleanup and added integrated tls config params parsing 2018-02-25 23:32:51 +01:00
BenDroid
054b302ab5 Added miner uptime to dashboard
WIP SSL/TLS for CC communication and Dashboard
2018-02-05 22:53:38 +01:00
XMRig
631fd755c8 #341 Added option --dry-run. 2018-01-20 20:43:31 +07:00
Ben Gräf
cf868666d4
Preparation for #1.4.0 (#30)
- Fixed CPU affinity on Windows for NUMA and CPUs with lot of cores
- Implemented per thread configurable Multihash mode (double, triple, quadruple, quintuple)
- Rebased from XMRig 2.4.4
2018-01-19 19:42:06 +01:00
BenDroid
990bf8d963 Merge remote-tracking branch 'refs/remotes/xmrig/master'
Conflicts:
	CHANGELOG.md
	README.md
	src/version.h
2018-01-19 19:25:31 +01:00
BenDroid
bdb0bb9926 Integrated config less startup with only given CCServer and token #14
Fixed time drift issues on dashboard by sending server time to dashboard and use this for comparisson
2018-01-12 23:11:00 +01:00
XMRig
49b45ddd18 Add libmicrohttpd version to --version output. 2018-01-05 19:41:19 +07:00
BenDroid
0712d269ef Integrated thread based double hash mode 2017-12-01 07:48:28 +01:00
BenDroid
f914e6d46c Removed libcurl dependency and fixed avgTime round in dashboard 2017-11-07 18:51:55 +01:00
BenDroid
deaefe4d96 Added configuration for cclient update status interval 2017-11-03 20:12:04 +01:00
Ben Gräf
627321b6cc Fixed windows build 2017-10-24 14:24:29 -07:00
Ben Gräf
baa9faddd5 Fixed crash on startup 2017-10-23 11:48:34 +02:00
BenDroid
94a830302d Updated documentation, minor cleanup 2017-10-22 22:48:38 +02:00
BenDroid
e4ccdd000f Removed compiler warning, fixed links in readme 2017-10-21 23:09:04 +02:00
Ben Gräf
3f39ca31fd Added xmrigDaemon to control xmrigMiner
Fixed some issues in CCClient and CCServer
2017-10-19 22:12:20 +02:00
Ben Gräf
215efcabb8 Implemented CCClient and extended CCServer service 2017-10-16 21:38:00 +02:00
XMRig
1123c20da0 Add comments to config file. 2017-10-07 00:49:38 +03:00
XMRig
8729616698 Added special option -t all 2017-10-06 23:44:25 +03:00
XMRig
914fdd5f0a #97 Ignore keepalive option with minergate and nicehash.com 2017-10-06 19:10:08 +03:00
XMRig
af51513614 libjansson replaced to rapidjson.
Sync changes with proxy.
2017-10-04 23:33:30 +03:00
XMRig
3a7bb24b40 #108 Silently ignore invalid values for donate-level option. 2017-09-13 18:01:28 +03:00
XMRig
4928b6d3e3 Sync changes with xmrig-nvidia 2017-09-02 19:04:40 +03:00
XMRig
5601c7a672 Added Httpd class and API config options. 2017-08-31 02:28:33 +03:00
XMRig
e3dd4a6581 Fixed config load for MSVC. 2017-08-17 06:43:32 +03:00
XMRig
8bba0df054 Added option --no-huge-pages. 2017-08-16 14:21:12 +03:00
XMRig
27f02d5f9f Added option --user-agent. 2017-08-16 13:19:14 +03:00
XMRig
1b0ddae4eb Fixed: failed open default config file if path contains non English characters. 2017-08-16 12:22:35 +03:00
XMRig
f05a328474 Added --cpu-priority option. 2017-08-15 08:19:55 +03:00
XMRig
a07b0e5953 Fix Visual Studio warnings. 2017-08-14 09:30:41 +03:00
XMRig
1720d3e096 Fixed initialization, no need init logs and network if configuration not ready. 2017-08-04 21:47:43 +03:00
XMRig
eb5f7c6a7b #46 Simplify config parsing 2017-08-01 12:56:30 +03:00
XMRig
1bc23354d3 #46 Add support for default config. 2017-07-31 18:38:02 +03:00
XMRig
e6a72b2f78 #46 Added config file support. 2017-07-31 16:05:16 +03:00
XMRig
a383eba8df Merge branch 'feature-multiple-pools' into dev
# Conflicts:
#	src/Options.cpp
2017-07-01 21:50:27 +03:00
XMRig
7536663caf Remove option --backup-url. 2017-06-30 13:23:13 +03:00
XMRig
c0dcfc2a97 Initial multiple pools support [2/2]. 2017-06-27 06:32:17 +03:00
XMRig
f36b5eeaad Fix --cpu-affinity overflow. 2017-06-26 23:08:10 +03:00
XMRig
952017ae7a Initial multiple pools support [1/2]. 2017-06-26 21:13:05 +03:00
XMRig
c1b3802590 Add option "-l, --log-file=FILE" and stub for option "-S, --syslog". 2017-06-23 03:12:46 +03:00