1
0
mirror of https://github.com/GOSTSec/ccminer synced 2025-01-09 22:38:05 +00:00
Commit Graph

150 Commits

Author SHA1 Message Date
Tanguy Pruvot
5636e2be5e remove double reference to luffa algo
doomcoin is dead but the luffa algo is still used (Joincoin)..

keep doom as alias for compat... rename functions...
2015-06-10 22:10:16 +02:00
Tanguy Pruvot
85394cf22b cuda: reduce possible segfaults on exit
not perfect but helps...
2015-05-28 15:58:38 +02:00
Tanguy Pruvot
5be1521294 Increase max password size to 128 chars (nicehash)
--pass="f0=0;f2=0;f3=2.7;f4=1.9;f5=99;f6=1.8;f7=7.9;f8=0;f9=0.45;f10=0;f11=4.3;f12=3.9"
2015-05-26 15:39:41 +02:00
Tanguy Pruvot
bbd2c704f9 multipool: Squashed commit (v2)
commit a9d3c1ffdb71d2a4985749acba3d424161154ab4
Author: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Date:   Thu May 21 05:39:24 2015 +0200

    multipool: last changes before squashed merge

    and fix net diff on wallets.. was longpoll specific

commit a63f0024f3f1fb52d2c4369518bf87c33a9e16ae
Author: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Date:   Thu May 21 05:02:27 2015 +0200

    update api sample for the protocol 1.5

commit adda14b22edde6485932be56550166478f6f00dd
Author: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Date:   Thu May 21 04:43:25 2015 +0200

    stats: store pool number in scanlog

commit e1a0274b01c29409ce16f9096b9985a35cf78ba7
Author: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Date:   Thu May 21 03:36:15 2015 +0200

    api: switchpool and new pool stats variables (API v1.5)

    add accepted/rej by pool, wait time on conditional, net diff and rate

    also add scantime per pool config option and do some pool cleanup..

commit 1a30450ad2a5e068983531b9d2a96629b970c1e8
Author: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Date:   Wed May 20 06:39:09 2015 +0200

    prevent concurrent pool switching

    and limit condtionnal wait messages to the first thread/device

commit e3922c7a331a3ad2730bc83082fcd6b2547542f5
Author: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Date:   Wed May 20 05:39:45 2015 +0200

    add some pool rotate options, like pool time-limit

    update sample pools.conf for time rotation

commit 312bd905412d49fd5a9f9e7ff2bc72b23edf38ed
Author: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Date:   Wed May 20 04:31:19 2015 +0200

    do not try to restart threads from threads

    Start inconditionally the stratum and longpoll threads,
    these threads are just waiting a tq_push() if unused...

    so add some checks to know if vars are set for the right pool

commit d4a9428fefdd9e9d70c3c8231f10961e7cd41760
Author: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Date:   Wed May 20 01:06:31 2015 +0200

    pools: add name and removed attributes

    also increase max defined pools to 8

    to be tested on windows..

commit d840d683ecb2cc4767f0a0612b8359c52d4bad29
Author: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Date:   Tue May 19 22:33:11 2015 +0200

    parse json config file pools array

commit d6c29b1f7f6b786c56e1f0cb8a90305f06cc7aec
Author: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Date:   Tue May 19 03:29:30 2015 +0200

    multi-pools: prepare storage/switch of credentials

    for the moment:
    - allow the storage of multiple -o params (and user/pass)
    - allow a failover pool on connection failed
    - switch to the next pool with the "seturl" api remote command
    - longpoll to stratum switch (reverse to check...)

    todo: mix stratum/getwork, new api commands, json config...

commit 2d6b3fddf6631d7df1ac6ca74eee91c33a3c09ee
Author: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Date:   Fri May 22 08:26:40 2015 +0200

    multipool: increase stability, but not 100% perfect

    several problems fixed:
    - submit to the pool set in work (source pool)
    - longpoll curl timeout could be too high and could lock the switch
    - mutexes cant be copied on windows (stratum global var to fully remove later)

    I linked the -T timeout option to curl and tried to remove all fixed timeout values

commit 6fd935c369cf33949dab98c8b09b2ca8cab3e7ea
Author: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Date:   Fri May 22 11:23:07 2015 +0200

    stratum: remove last rpc_ vars in stratum thread

commit ee9c821525be303282e5dab512ffd2ae81ad524f
Author: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Date:   Sat May 23 03:53:50 2015 +0200

    stratum: do not alloc empty merkle tree

commit 69852a2874bd18c4ed1daa9180a10d12976424dc
Author: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Date:   Sat May 23 04:25:12 2015 +0200

    stratum: properly free jobs on disconnect

Signed-off-by: Tanguy Pruvot <tanguy.pruvot@gmail.com>
2015-05-23 05:28:12 +02:00
Tanguy Pruvot
298573b45d Drop Whirlpool and whirpoolx algos, no more used...
Vanillacoin is now PoS only
2015-05-19 01:05:38 +02:00
Tanguy Pruvot
a2b6488c01 Compute and display network diff (nbits) if max-diff
was only made on the wallets with getmininginfo

Todo: double check for all algos/pools

tested ok on x11, lyra2, skein, skein2, zr5 stratum/longpoll

Scrypt-Jane pool net diff seems incorrect, disabled
Neoscrypt could be different also (untested, disabled)...
2015-05-18 08:17:45 +02:00
Tanguy Pruvot
ff27ccb80e stats: simplify the storage filter
the gpu id key filter was useless, use thread ids...
2015-05-12 02:40:50 +02:00
Tanguy Pruvot
12fd78e2be config: remove AVX/2 entries, not for us 2015-05-12 02:40:50 +02:00
Tanguy Pruvot
15584e4f05 neoscrypt: adapt for visual studio compat
todo: fix SM 3.0 builds
2015-05-03 15:53:02 +02:00
Tanguy Pruvot
65c1d787e7 add neoscrypt based on djm34 work
indent, link --intensity, and some clean up

Tested speed on linux ~= 160kH/s on a 750Ti (Black Edition)

To be continued...
2015-05-03 14:38:15 +02:00
Tanguy Pruvot
a6d88abbc9 scrypt: finish scrypt-jane algo import 2015-04-21 13:20:35 +02:00
Tanguy Pruvot
c6a94c9998 Add time-limit option and exit codes
based on cudaminer implementation...
2015-04-19 12:16:01 +02:00
Tanguy Pruvot
9dc78da2ee import and adapt scrypt from cudaminer project
scrypt-jane under work...
2015-04-18 18:24:55 +02:00
Tanguy Pruvot
d58d53f2b2 update README, small changes, prepare release 1.6.1
still need a SM 3.0 fix for skein...
2015-04-14 23:28:00 +02:00
Tanguy Pruvot
7963dbb438 skein2 algo for woodcoin
Also known as Double Skein

Signed-off-by: Tanguy Pruvot <tanguy.pruvot@gmail.com>
2015-04-14 02:03:58 +02:00
Tanguy Pruvot
4f43abb402 bmw512: indent and restore SM 3.0 compat
could be also the source of the problem seen with CUDA 7

restored the code before sp/klaus changes for SM 3.0 devices...
2015-03-28 12:01:50 +01:00
Tanguy Pruvot
f86784ee56 Add skein algo (Skeincoin, Myriad, Unat...)
SKEIN512 + SHA256

Signed-off-by: Tanguy Pruvot <tanguy.pruvot@gmail.com>
2015-03-27 15:24:27 +01:00
Tanguy Pruvot
a37e909db9 Add zr5 algo (for SM 3.5+)
uint4 copy + keccak cleanup, groestl: small uint4 opt

Signed-off-by: Tanguy Pruvot <tanguy.pruvot@gmail.com>
2015-03-27 15:16:25 +01:00
Tanguy Pruvot
5988e945ef some cleanup and longpoll changes 2015-03-27 08:03:26 +01:00
Tanguy Pruvot
5e42389b4b pluck: finish the algo, add cpu validation 2015-03-09 02:21:44 +01:00
Tanguy Pruvot
7939dce0aa pluck: adaptation from djm repo
remains the cpu validation check to do...

throughput for this algo is divided by 128 to keep same kind of intensity values (default 18.0)
2015-03-08 15:16:11 +01:00
Tanguy Pruvot
f8f46bfe5b whirlpoolx: fix for multi-gpu support
add also cputest entry and do some cleanup...
2015-03-07 16:33:04 +01:00
Tanguy Pruvot
0019936328 Import Whirlpoolx algo from alexis78 repo
remove trailing spaces and move to x15 folder
2015-03-07 14:06:33 +01:00
Erik Mossberg
c41d9e7bb6 hashrate: format units based on the value size 2015-02-22 11:46:21 +00:00
Tanguy Pruvot
a537fa304c Add basic API remote control
only allowed if --api-remote parameter or config key is set

and fix possible problem with urls containing user:password@

Signed-off-by: Tanguy Pruvot <tanguy.pruvot@gmail.com>
2015-02-13 06:57:44 +01:00
Tanguy Pruvot
5dd2534df9 Handle a default config file (ccminer.conf)
This allow to "debug" easily in visual studio (without project changes)

Prepare version 1.5.3, update README
2015-02-11 01:34:56 +01:00
Tanguy Pruvot
3938dce740 api: one decimal is enough for intensity
and fix windows build... missing __func define
2015-01-24 12:45:06 +01:00
Tanguy Pruvot
26b51a557b Allow different intensity per device
and clean the old variables, no more required
2015-01-24 11:17:29 +01:00
Tanguy Pruvot
2a5233f56e api: report throughput when default 2015-01-22 06:28:59 +01:00
Tanguy Pruvot
cafd4477d7 Handle a maximum of 16 gpus (vs 8 before)
Some cards have 2 gpus on board...
2015-01-22 04:55:27 +01:00
Tanguy Pruvot
ec454dd78c api: add fan rpm (windows nvapi only) 2014-12-26 15:33:55 +01:00
Tanguy Pruvot
49a73971c4 Enhance stale work detection + throughput fixes
seems to resolve solo mining lock on share.
export also computed solo work diff in api (not perfect)

In high rate algos, throughput should be unsigned...
This fixes keccak, blake and doom problems

And change terminal color of debug lines, to be selectable in putty,
color code is not supported in windows but selection is ok there.
2014-12-07 12:58:41 +01:00
Tanguy Pruvot
f9bba0ff1a lyra2: small changes and code cleanup 2014-12-07 09:04:03 +01:00
Tanguy Pruvot
c5b349e079 Add Lyra2 algo, based on Vertcoin published code
Seems to be djm34 work, i recognize the code style ;)

Code was cleaned/indented and adapted to my fork...

Only usable on the test pool until 16 december 2014!
2014-12-06 11:28:26 +01:00
Tanguy Pruvot
6ae28162db various extern cleanup + api history uids and gpu SM
uids could be useful to create graphes from history data

Note: please do a clean build after this commit (changes in miner.h)
2014-11-26 11:55:42 +01:00
Tanguy Pruvot
9b1ff1280e Allow intermediate intensity (decimals)
Sample with -i 18.5
  Adding 131072 threads to intensity 18, 393216 cuda threads

And with -i 19.5
  Adding 262144 threads to intensity 19, 786432 cuda threads
2014-11-25 19:57:56 +01:00
Tanguy Pruvot
7e15f31706 api: pool query (uptime, ping, discon., url and user) 2014-11-25 17:39:02 +01:00
Tanguy Pruvot
3e8457d76c api: add device uuid (nvml), and OS in hwinfo
move nvdriver to sys infos (unique on system)

prepare pool query
2014-11-24 21:20:26 +01:00
Tanguy Pruvot
dc5d1b112d api: add scanlog command to monitor scan ranges
will be used for external debugging...
2014-11-24 20:26:41 +01:00
Tanguy Pruvot
e2ac7a2a75 api: add nvapi and nvml ids for C# tools 2014-11-23 11:12:58 +01:00
Tanguy Pruvot
73f22b237a Prepare trap of hardware/mem failures 2014-11-20 18:44:25 +01:00
Tanguy Pruvot
1bc4e7e942 api: add mem size and freq to hwinfo query 2014-11-20 15:54:56 +01:00
Tanguy Pruvot
3ad4be7de0 api: export gpu freq on linux too + hwinfo command 2014-11-19 16:16:27 +01:00
Tanguy Pruvot
b24b65a9c9 api: add gpu pci bus id, unified id + bloc height 2014-11-18 16:25:44 +01:00
Tanguy Pruvot
582c971f2b api: fix histo gpu/thr id mismatch 2014-11-17 19:11:26 +01:00
Tanguy Pruvot
047e79a9fc api: add meminfo query to debug mem storages 2014-11-17 16:17:53 +01:00
Tanguy Pruvot
6a9b8a5ab2 hashlog: use work objects, put struct in miner.h 2014-11-17 15:58:11 +01:00
Tanguy Pruvot
dca216f992 min() and max(a,b) are not defined on linux,
in fact max exists in jansson includes (in tree only)

Add them to miner.h
2014-11-17 00:23:18 +01:00
Tanguy Pruvot
3652c708b9 api: add histo command and difficulty
enhance multi-gpu stats and fix nvapi indexes

change syslog prefix to ccminer (cpuminer remains)

api 1.1 modified - not officially released yet
2014-11-14 19:09:48 +01:00
Tanguy Pruvot
49f3c454c2 Add nvml for GPU monitoring (squashed)
Based on mwhite73 <marvin.white@gmail.com> implementation

  Linked to the api system

  Also fix Makefile to support standard c++ files
  This prevent nvcc use without device code

Signed-off-by: Tanguy Pruvot <tanguy.pruvot@gmail.com>
2014-11-13 14:36:18 +01:00
Tanguy Pruvot
11a4bb1797 api: changes in data, global stuff in summary
PS: still under dev, wait the final 1.4.8 ;)
2014-11-12 16:49:44 +01:00
Tanguy Pruvot
4958ce6007 api: add a basic stats api on port 2068
you can use PHP api-example.php as a json wrapper...

to be tested on windows...

Signed-off-by: Tanguy Pruvot <tanguy.pruvot@gmail.com>
2014-11-12 12:23:11 +01:00
Tanguy Pruvot
66845a9b36 vstudio: fix intellisense base types warnings 2014-11-11 20:19:50 +01:00
Tanguy Pruvot
ec709af62f Store and display average hashrate (benchmark + on share)
Displayed data is the average of the last 50 scans in the 5 last minutes

Also move cuda common functions in a new file (cuda.cu)

Signed-off-by: Tanguy Pruvot <tanguy.pruvot@gmail.com>
2014-11-11 16:43:23 +01:00
Tanguy Pruvot
9f62014690 Add intensity parameter (-i 0:31)
Like cgminer, the value equals to 1 << n
if 0, we keep the default value defined in algo (19 for Xn algos)

19 = 524288 threads per gpu call

GTX 970 and 980 handle a higher number of threads compared to the 750 Ti

Signed-off-by: Tanguy Pruvot <tanguy.pruvot@gmail.com>
2014-11-09 22:21:11 +01:00
Tanguy Pruvot
4c3964539f Fix vc debug builds, missing symbols 2014-11-06 17:42:01 +01:00
Tanguy Pruvot
12fafd5687 Try to reconnect on pool duplicates
reduce log announces and define uchar in miner.h
2014-11-04 15:14:24 +01:00
Tanguy Pruvot
5bc969fa57 Some work on data alignment
linux: add -march=native (we build it ourself) and some other flags

+ remove unused vars (seen with -Wall)
2014-11-03 16:40:13 +01:00
Tanguy Pruvot
6169bf683b Add S3 Algo (1Coin)
Simple addition of the algo using existing X11 code
2014-10-26 09:10:58 +01:00
Tanguy Pruvot
0720797f1b Add proper keccak-256 (maxcoin)
Cleaned from djm34 repo, tuned for the 750 Ti
2014-10-17 06:46:20 +02:00
Tanguy Pruvot
cdc29336f7 stats: compute work difficulty from target 2014-09-30 10:03:12 +02:00
Tanguy Pruvot
4f326576d2 implement X-Mining-Hashrate header
remove midstate extension, seems only used in sha256/scrypt

and prepare noncerange, need a pool which supports that to finish...
2014-09-29 08:24:12 +02:00
Tanguy Pruvot
799b230af2 enhance solo mining, update http headers
and prepare next version...
2014-09-28 15:34:44 +02:00
Tanguy Pruvot
9efe0b965d blake: only use high part of target on gpu
Add another few MH/s boost :)
2014-09-13 00:15:34 +02:00
Tanguy Pruvot
c3eb66683a Import djm34 qubit, deep and doom algos
Indent, and put commonly used functions proto. in cuda_helper.h

And add them to --cputest function

Also change the color option to --nocolor, -C is no more needed

Signed-off-by: Tanguy Pruvot <tanguy.pruvot@gmail.com>
(Which is tired to remove these german copy/pasted comments)
2014-09-10 00:26:55 +02:00
Tanguy Pruvot
13bb9d267e Remove debug rpc, already exists with -P 2014-09-09 21:59:03 +02:00
Tanguy Pruvot
cec5baea95 enable colors by default, except for syslog
debug: show compared hash diffs in color
2014-09-09 21:59:03 +02:00
Tanguy Pruvot
402e416853 Add pentablake algo (-a penta)
Signed-off-by: Tanguy Pruvot <tanguy.pruvot@gmail.com>
2014-09-09 21:58:58 +02:00
Tanguy Pruvot
b98239ec2a hashlog: enhance scan range store and debug dump 2014-09-05 20:01:50 +02:00
Tanguy Pruvot
5682b7d241 blake: add also blakecoin (8-rounds) variant 2014-09-05 19:12:29 +02:00
Tanguy Pruvot
033fb5745c Release v1.4 with blake 2014-09-05 08:20:19 +02:00
Tanguy Pruvot
2ebfb546a6 clean extra logs, show bloc height on new jobs 2014-09-04 13:27:41 +02:00
Tanguy Pruvot
806c3e8691 enhance double scan checks 2014-09-04 11:11:39 +02:00
Tanguy Pruvot
a270adc4b6 to test on windows 2014-09-03 22:13:07 +02:00
Tanguy Pruvot
69616b37ac hashlog: prepare store of scanned range 2014-09-03 14:49:13 +02:00
Tanguy Pruvot
b1f5df374d stratum: store server time offset in context 2014-09-03 14:49:09 +02:00
Tanguy Pruvot
1a4391d7ff hashlog: prevent double computing on jobs already done 2014-09-03 12:20:24 +02:00
Tanguy Pruvot
2d42ae6de5 stratum: handle a small cache of submitted jobs
Prevent to send duplicated shares on some pools like hashharder..

This cache keeps submitted job/nounces of the last 15 minutes

so, remove exit on repeated duplicate shares,
    the submitted cache now handles this problem.

Signed-off-by: Tanguy Pruvot <tanguy.pruvot@gmail.com>
2014-09-02 08:01:26 +02:00
Tanguy Pruvot
1b8c3c12fa debug: a new boolean to log or not json rpc data 2014-09-02 03:38:57 +02:00
Tanguy Pruvot
1f99aae0ff exit on repeated duplicate shares (to enhance)
create a new function proper_exit() to do common stuff on exit...
2014-09-01 20:28:34 +02:00
Tanguy Pruvot
1fb9becc1f cpu-miner: sort algos by name, show reject reason 2014-09-01 09:50:19 +02:00
Tanguy Pruvot
c17d11e377 add "blake" 256, 14 rounds (for NEOS blake, not BlakeCoin)
also remove "missing" file, its old and not compatible with ubuntu 14.04
2014-09-01 05:53:36 +02:00
Tanguy Pruvot
ba7b6ba1a0 cputest: simplified func to print hashes with algo names
add a prefixed printf with some colors
2014-08-31 00:00:06 +02:00
Tanguy Pruvot
64e8cd3f98 add x17 algo, cleaned djm34 commit
todo: visual studio...
2014-08-23 22:44:17 +02:00
Tanguy Pruvot
0867fb15c6 output: add the --color parameter (-C)
disabled by default or if syslog option is set

Signed-off-by: Tanguy Pruvot <tanguy.pruvot@gmail.com>
2014-08-22 16:52:39 +02:00
Tanguy Pruvot
1fbcbbacc4 Add whirlcoin and optimize x11 luffa (maxrregcount) 2014-08-20 07:49:22 +02:00
Tanguy Pruvot
bc2eb75758 Add fresh algo (based on djm34 code)
Cleaned up and adapted to my changes (cputest added)

Remove Makefile.in which should be in gitignore

(Plz refresh it with ./config.sh to compile on linux)
2014-08-19 18:31:26 +02:00
Tanguy Pruvot
d9ea5f72ce Remove duplicated defines present in cuda_helper.h
also add cudaDeviceReset() on Ctrl+C for nvprof
2014-08-19 03:29:11 +02:00
Tanguy Pruvot
6984a001d6 Win32 build fix after linux work (configure) 2014-08-15 03:59:49 +02:00
Tanguy Pruvot
8e32e5ea09 cputest: add other hashes to cpu tests 2014-08-14 23:35:02 +02:00
Tanguy Pruvot
06763c20b1 Implement x14 (cuda + cpu functions)
Project was updated for VS2013 and CUDA SDK 6.5

add also a --cputest function to dump cpu hash results

TODO: x15 is not fully functional, but first loop seems ok

Signed-off-by: Tanguy Pruvot <tanguy.pruvot@gmail.com>
2014-08-12 14:47:03 +02:00
Christian Buchner
d99b91ea65 adding third party X13 and Diamond Groestl code contributions. 2014-06-15 14:31:20 +02:00
Christian Buchner
af07302b4b v1.0 - Yo, I heard y'all like X11 2014-05-10 00:29:59 +02:00
Christian Buchner
e2bfb4b14f committing a quick attempt at NIST5 (TalkCoin) 2014-05-08 09:25:37 +02:00
Christian Buchner
e049f32fee bump to revision v0.9 (VC++ project files not updated yet) 2014-05-06 13:53:52 +02:00
Christian Buchner
6c8eff98c0 bump to revision v0.8 2014-05-03 21:01:50 +02:00
Christian Buchner
0659d697c1 Revision 0.6 with myriad-groestl and jackpot coin 2014-04-27 01:26:08 +02:00
Christian Buchner
b93669a99f committing changes to v0.3 release - added Groestlcoin. 2014-03-23 21:39:26 +01:00
Christian Buchner
f67ee69819 last minute changes to repo (v0.1 release) 2014-03-18 23:09:43 +01:00
Christian Buchner
6aac3fbba5 commit initial version 0.1 2014-03-18 22:17:40 +01:00