1
0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-09 06:18:06 +00:00
Commit Graph

6199 Commits

Author SHA1 Message Date
Noel Maersk
2f3e08a12c Merge branch 'api-compatibility' 2014-04-25 01:22:05 +03:00
Noel Maersk
47d00ee524 api: add missing header.
Imlicit declarations (using get_pool_name() without including pool.h)
produces a warning for me and AFAIR breaks compilation for someone else.
2014-04-24 21:54:02 +03:00
Luke Dashjr
5bd5b07e15 RPC: Add "Miner" to version response to include software name along with version 2014-04-24 21:28:35 +03:00
Noel Maersk
897ca9fd4c Merge pull request #200 from Elbandi/poolnamefix
Use get_pool_name everywhere
2014-04-24 15:15:54 +03:00
Elbandi
973dcefa8c Use get_pool_name everywhere 2014-04-24 12:09:56 +02:00
Noel Maersk
b090ac9302 misc: veox can no longer actively maintain this software. 2014-04-23 14:26:04 +03:00
Noel Maersk
3d7167ce2c config: improve pool section writing.
Order so JSON's not broken, write `priority` and `algorithm`.

Closes #102.
2014-04-18 17:31:06 +03:00
Noel Maersk
e42f77d9c1 misc: moved from veox/sgminer to sgminer-dev/sgminer 2014-04-17 16:23:27 +03:00
phm
0001517ac0 Merge branch 'marucoin'
Conflicts:
	Makefile.am
	configure.ac
	driver-opencl.c
	miner.h
	ocl.c
	sgminer.c
2014-04-15 19:43:30 +02:00
phm
67cf41a50c Added support for MaruCoin 2014-04-15 00:20:05 +02:00
Noel Maersk
7bc0be03d4 misc: FAQ cleanup. 2014-04-14 22:50:48 +03:00
Noel Maersk
b2462e6076 misc: Add Michael Fiano <mfiano> to AUTHORS.md.
Tested tecent name/desc/algo additions to API, helped find a segfault
condition.
2014-04-12 19:33:59 +03:00
Noel Maersk
f5709910fb api: Bugfix, bump version to 4.1.271, initialise name/desc/algo in addpool() so checks for NULL work.
Otherwise API "addpool|a,b,c" command segfaults (access uninitialised
memory address).
2014-04-12 19:28:23 +03:00
Noel Maersk
49fecf93a3 misc: Bump version to 4.1.270. 2014-04-12 18:10:00 +03:00
Noel Maersk
92c3b5eb48 api: set algorithm properly on addpool. 2014-04-12 17:32:41 +03:00
Noel Maersk
5409ffc2a4 api: check if name/desc/algo are NULL and fill with defaults if so.
Defaults should probably be specified elsewhere.
There should be a constructor for stuff like this.
This shit is really bringing me down.
2014-04-11 15:27:58 +03:00
Noel Maersk
9aaff8ccf5 api: bump version, but allow name/desc/algo to be missing when adding pool details.
This will have unintended consequences, since API clients are sure to
send pool details without name/desc/algo. pooldetails() will allow them
to do that, and add_pool_details() will fill the pool structure with
NULLs.
2014-04-11 15:17:42 +03:00
Noel Maersk
3c3a58475e ui+api: ask for pool name/description/algorithm when adding pool from NCurses/API.
Closes #116.

This is trivial and shouldn't be so hard: it required modifying
functions in both sgminer.c (for NCurses stuff) and api.c. There is
much code repetition, since the NCurses interface is hard-coded in.
Removing it would simplify things greatly.
2014-04-11 15:06:36 +03:00
Noel Maersk
e731aa1f16 Merge pull request #193 from troky/master
Small fix and upgrade
2014-04-11 14:35:58 +03:00
troky
2a087a7dae Added algorithm name to 'pools' API command. 2014-04-11 10:58:05 +02:00
troky
01e96606f0 Fixed (pool) algo selection. 2014-04-11 10:41:37 +02:00
Noel Maersk
da667d63e0 config: write pool name and description to config. 2014-04-11 03:01:13 +03:00
Noel Maersk
2c00158216 Merge pull request #189 from Bllacky/patch-7
Update sgminer.c
2014-04-10 18:47:28 +03:00
Bllacky
942c6714fa Update miner.h
Variable declaration. VS seems to like size_t instead of int for certain variables.
2014-04-10 18:39:38 +03:00
Noel Maersk
b3d483a035 core: revert two of the changes in Bllacky's pull request #187.
`ndigits` is actually an int, used as a field width specifier in
snprintf().

s is an extensively-used pointer.
2014-04-09 22:37:07 +03:00
Noel Maersk
b457461eb7 Merge pull request #187 from Bllacky/patch-5
Reduce the number of warnings by about 5 (Update sgminer.c)
2014-04-09 22:20:36 +03:00
Bllacky
fe64ac99d6 Update sgminer.c
One small change to work well with previous ones.
Number of warnings now is 151, down from 157.

Still a long way to go. Most of the serious warnings are related to variables in miner.h, which is so intertwined with everything else that I fear of breaking something or making performance worse if I touch miner.h too much.
2014-04-09 22:17:37 +03:00
Bllacky
1dc8aabda9 Update sgminer.c
Minor changes to variable declaration.
Should reduce the number of warnings by about 5.
2014-04-09 22:03:12 +03:00
Noel Maersk
4f3d2edcc8 misc: set algorithm for pool in example.conf.
Also finish up what was started in f2934d8afd
2014-04-08 22:50:50 +03:00
Noel Maersk
aa5f4c713b config: add const qualifier to set_pool_{algorithm,nfactor}().
MSVS doesn't like implicit casting.
2014-04-08 14:28:50 +03:00
Noel Maersk
7051629232 log: change log level in setup_stratum_socket().
Erroneously stayed at LOG_ERROR after issue #88 (IIRC).
2014-04-07 23:54:43 +03:00
Noel Maersk
0dcb6ca498 doc: clarify algorithm usage in a config file pool section. 2014-04-07 23:14:27 +03:00
Noel Maersk
e7078a5e16 misc: clarify currentpool() comment. 2014-04-07 22:51:23 +03:00
Noel Maersk
f6616aa63b config: allow specifying per-pool algorithm with --algorithm instead of --pool-algorithm.
This will probably only work with config file, though, since it relies
on json_array_index.
2014-04-07 22:43:43 +03:00
Noel Maersk
53a199a21d config: use get_pool_name() in set_pool_algorithm() and set_pool_nfactor(). 2014-04-07 22:21:57 +03:00
Noel Maersk
af879b1c77 core/misc: rename set_poolname() to set_pool_name(). 2014-04-07 22:19:57 +03:00
Jan Berdajs
cc59247c43 adding mrbrdo to AUTHORS.md for kernel hot-switching 2014-04-07 22:15:36 +03:00
Noel Maersk
3ddf6baad9 core: rename default_algorithm to opt_algorithm.
... So it's easier to find when refactoring the configuration system
later on.
2014-04-07 22:09:05 +03:00
Noel Maersk
0793c96074 Merge remote-tracking branch 'mrbrdo/poolalgo' into poolalgo
Conflicts (resolved):
	ocl.h
	sgminer.c
2014-04-07 22:05:33 +03:00
Noel Maersk
336135f888 misc: Bump version to 4.1.242. 2014-04-07 21:19:46 +03:00
Noel Maersk
b6218e20c1 config: rename --pool-priority to --priority, --coin to --description.
There are now get_current_pool() and current_pool(), which is confusing.
Moved them closer together, so it's at least obvious.
2014-04-07 21:14:17 +03:00
phm
7678db6801 Fixed problem with stratum support when mining FC, GRS and TWE. Added --difficulty-multiplier parameter for controlling stratum difficulty multiplier. 2014-04-05 20:55:22 +02:00
phm
769c9f8036 Merge branch 'twecoin'
Conflicts:
	Makefile.am
	configure.ac
	driver-opencl.c
	miner.h
	ocl.c
	sgminer.c
	sph/Makefile.am
2014-04-05 17:41:42 +02:00
phm
474091c426 Added support for Twecoin 2014-04-05 17:27:59 +02:00
Noel Maersk
cc735db550 misc: don't violate reserved identifier naming convention.
Closes https://github.com/veox/sgminer/issues/177
2014-04-03 19:12:35 +03:00
Noel Maersk
cabb02f5d4 log: do not show pool difficulty changes on non-current pool.
Keep log spam down when using a lot of vardiff pools, or if a p2pool is
a fallback.
2014-04-02 23:35:03 +03:00
Noel Maersk
4c64a192f7 Merge pull request #181 from morenoh149/patch-1
added clarification for dependencies
2014-04-02 16:53:44 +03:00
Harry Moreno
3c5f0fa989 made debian apt-get a one-liner 2014-03-31 19:23:18 -07:00
Harry Moreno
74ec14664f added clarification for dependencies
Improved clarity of dependencies by adding example of how to install dependencies using apt-get. It was not clear whether `autoreconf -i` would install the dependencies or not. And how to install the dependencies if a user doesn't know how.
2014-03-31 19:05:49 -07:00
Jan Berdajs
cdb817bcbd Change algorithm more robustly and faster, previous way was buggy 2014-03-31 21:05:20 +02:00