Commit graph

329 commits

Author SHA1 Message Date
BenDroid
197034b5dd Increased version and changed donationstrategy again 2018-03-25 14:41:56 +02:00
BenDroid
edfd6605e1 Merge remote-tracking branch 'refs/remotes/origin/master'
Conflicts:
	README.md
2018-03-24 23:45:24 +01:00
BenDroid
ac2980cea7 # 1.5.2 Preparation
- Fixed OSX Build- Fixed force PoW algo version 
- Added AEON test vectors for new PoW Algo
- Changed DonateStrategy to latest XMRig to avoid peaks on donate pool when restarting multiple miners
2018-03-24 23:44:47 +01:00
BenDr0id
e4da579afa Added AEON v7 PoW change test vectors 2018-03-21 16:49:02 +01:00
BenDr0id
357ba0fed1 Fixed cryptonight tests when force PoW option is used 2018-03-21 09:24:37 +01:00
BenDr0id
113ac5d868 Merge branch 'master' of https://github.com/Bendr0id/xmrigCC 2018-03-21 09:01:05 +01:00
djfinch
90202b2920 OSX Mem.cpp fix (#70) Thx to @djfinch
* OSX Mem.cp fix
* Fixed current serverTime overflow.
2018-03-19 23:04:18 +01:00
sebastianstolzenberg
f5dd1cd5cf Removed unused code (#68) 2018-03-16 22:24:59 +01:00
BenDroid
8b2424b97a Cleanup 2018-03-16 22:07:04 +01:00
BenDroid
470bf67833 Integrated PoW changes for AEON
Added option to force PoW Version
Updated donate address
2018-03-16 20:22:53 +01:00
BenDr0id
76b4f9767f Added possibility to overrule the PoW
Added PoW adaptions for upcoming AEON PoW changes
2018-03-16 15:49:17 +01:00
sebastianstolzenberg
7c0ed8b8c2 Adds separate v7 hash methods and cleans up pre-v7 hash functions (#67)
* Adds separate v7 hash methods and cleans up pre-v7 hash functions
2018-03-15 23:26:48 +01:00
BenDroid
9433498a86 Removed align.h macro 2018-03-15 21:44:21 +01:00
BenDroid
17f00585c9 Prepared v1.5.1 2018-03-13 21:07:44 +01:00
sebastianstolzenberg
75952e0eb4 Implemented Monero v1 pow changes
* Adds arm implementation and test code for single hash
* Fixed build break for when APP_DEBUG is set
* Applied new icons / design
2018-03-13 20:19:20 +01:00
BenDroid
9098c4936a Fixed arm build 2018-03-03 21:34:20 +01:00
BenDroid
0b59e06bcc Additional arm fix 2018-03-03 21:32:53 +01:00
BenDroid
ad2aaada64 Fixed arm build 2018-03-03 21:31:51 +01:00
BenDroid
1c123868a5 Preparation for release 1.5.0 2018-03-03 12:25:27 +01:00
BenDroid
327a9b20d7 Merge branch 'master'
Conflicts:
	src/net/Client.cpp
2018-03-02 23:22:06 +01:00
BenDroid
ac805bd56f Fixed merge issues 2018-03-02 21:54:23 +01:00
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
BenDroid
30069aef22 Fixed merging 2018-03-02 20:51:48 +01:00
BenDroid
7ad143a0ac Merge branch 'master'
Conflicts:
	src/cc/Httpd.cpp
2018-03-02 20:49:05 +01:00
BenDroid
38f06ac4ca Increased network connection timeouts 2018-03-02 20:48:15 +01:00
BenDr0id
fa96fc6faf Merge remote-tracking branch 'origin/dev_tls' into dev_tls 2018-03-01 17:44:27 +01:00
BenDr0id
972f542901 Fixed TLS build on Windows GCC/MVSC
Cleanup TLS compile
2018-03-01 17:44:15 +01:00
Unknown
12fa14f034 Made executable names of miner and daemon settable via CMake parameters. 2018-03-01 13:10:55 +01:00
Ben Gräf
bc110ef162 Update Options.cpp 2018-02-26 11:44:37 +01:00
BenDr0id
246f6bcebd Cleanup 2018-02-26 09:19:46 +01:00
BenDroid
be293d72cd Cleanup and added integrated tls config params parsing 2018-02-25 23:32:51 +01:00
BenDroid
16fff2fd51 Added clibs-net and clibs-buffer to 3rdparty 2018-02-25 22:10:49 +01:00
BenDroid
b5cba7bf57 Added SSL/TLS support to stratum communication 2018-02-25 22:06:40 +01:00
BenDr0id
d6f27624b7 Merge remote-tracking branch 'origin/master' into dev_tls 2018-02-22 08:36:12 +01:00
BenDroid
8fd88a4e11 Manual merged #43 Mac OS Compilation fixes 2018-02-21 23:17:11 +01:00
BenDroid
204835a3f3 Fixed hugepages on MacOSx 2018-02-21 23:09:29 +01:00
XMRig
def56d5233 v2.4.5 RC 2018-02-19 04:31:50 +07:00
BenDroid
bcbda15832 Added tls flag to Url 2018-02-09 20:16:07 +01:00
BenDroid
f97a7fb121 Fixed behavior for non-tls mode 2018-02-09 20:15:11 +01:00
XMRig
8a3b8ff788 Fix code style, replace tabs to space #2. 2018-02-08 17:21:12 +07:00
XMRig
9cf2b0a782 Fix code style, replace tabs to space. 2018-02-08 17:02:32 +07:00
XMRig
640592ad95 Merge branch 'master' of https://github.com/Foudge/xmrig into Foudge-master 2018-02-08 16:56:20 +07:00
BenDroid
80c0381dc7 Fixed Uptime column in Dashboard
Implemented HTTPS for miner -> server and server -> dashboard
2018-02-06 21:43:53 +01:00
BenDroid
1b7b48f6e3 Added miner uptime to dashboard
WIP SSL/TLS for CC communication and Dashboard
2018-02-05 22:53:38 +01:00
Foudge
0184647f7e Correct L2 cache size calculation for Intel Core 2 family
This is a workaround for total L2 cache size calculation of Intel Core Solo, Core Duo, Core 2 Duo, Core 2 Quad and their Xeon homologue. These processors have L2 cache shared by 2 cores.

There is maybe more CPU with L2 shared cache, but I am sure that these models are concerned and they are not so numerous.
A better way would be to modify libcpuid to implement L2 cache counting.
2018-02-03 16:31:13 +01:00
Foudge
8869ede7b5 Compilation error under FreeBSD
ULONG is not recognized under this OS, so replaced it with more portable definition.
2018-01-28 18:13:00 +01:00
Foudge
50e4f9e3e7 up to 20% perf increase with Cryptonight with non-AES CPU
This time, the performance increase is got with MSVC and GCC. On non-AES CPU, there were an useless load/store SSE2 register. The last MSVC "hack" is replaced by a portable code and he's more complete (a load is saved).

On my C2Q6600, with 3 thread, I have +16% with MSVC2015 and +20% with GCC 7.3, compared to official 2.4.4 version.
2018-01-28 12:58:19 +01:00
Foudge
107cf54513 Remove compilation warnings under MSVC 2018-01-27 11:42:22 +01:00
BenDroid
512bbf83de When miner is offline status now shows "OFFLINE"
Cleanup of Readme.md
2018-01-24 21:31:27 +01:00