Commit graph

54 commits

Author SHA1 Message Date
BenDroid
f171801a61 Manual merge 2018-03-02 21:29:53 +01:00
BenDroid
892c7207fb 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
XMRig
fd4e37bee7 #341 Added option --dry-run. 2018-01-20 20:43:31 +07:00
Ben Gräf
acf27e9341 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
5f8ea98764 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
e7bf633010 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
1c68ca4f9d Add libmicrohttpd version to --version output. 2018-01-05 19:41:19 +07:00
BenDroid
daa4d912b3 Integrated thread based double hash mode 2017-12-01 07:48:28 +01:00
BenDroid
1cf1e38077 Removed libcurl dependency and fixed avgTime round in dashboard 2017-11-07 18:51:55 +01:00
BenDroid
6ab298eeac 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
XMRig
9bfa49b7d0 Fix regression, option --no-color not fully disabled colored output. 2017-06-19 10:58:28 +03:00
XMRig
fed163568e Add option "--print-time". 2017-06-16 11:08:10 +03:00
Admin
1bf428f8da Initial OS X support 2017-06-14 20:37:59 +03:00
XMRig
5af169fd7b Fix linux build. 2017-06-14 16:11:01 +03:00
XMRig
42bf85d10b Fixes for MSVC. 2017-06-13 06:31:25 +03:00
XMRig
3df545cfc5 Initial MSVC support. 2017-06-12 16:19:07 +03:00
XMRig
ef3af1c4fd Restore autoconf. 2017-06-09 03:37:56 +03:00
XMRig
04c5d6d00a Print threads summary. 2017-06-09 02:47:46 +03:00
XMRig
8b83a5fe2e Implemented CryptoNight with C++ templates. 2017-06-08 23:31:42 +03:00
XMRig
878e021ff6 Initial CryptoNight. 2017-06-08 09:47:25 +03:00
XMRig
c31ea00399 Basic failover support. 2017-06-07 09:07:31 +03:00