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

601 Commits

Author SHA1 Message Date
Con Kolivas
a10e3294bd Be consistent with the get_statline function. 2012-10-12 14:41:13 +11:00
Con Kolivas
911b1788c7 Use the suffix string function for displaying hashrate with 4 significant digits. 2012-10-12 14:40:02 +11:00
Con Kolivas
420fdf32d6 Display the actual share diff next to the pool required diff, using a suffix creation function to prevent values of >1000 being shown in their entirety. 2012-10-12 14:17:29 +11:00
Con Kolivas
d211f8e0b0 Create a fix-protocol option which prevents cgminer from switching to stratum if it's detected. 2012-10-11 19:52:40 +11:00
Con Kolivas
5ed6e9d55e Simplify target generation code. 2012-10-11 19:31:24 +11:00
ckolivas
ca962ee58b Use a 64 bit unsigned integer on the diff target to generate the hex target. 2012-10-11 10:46:45 +11:00
Con Kolivas
ef6ad423e3 Only copy the stratum url to the rpc url if an rpc url does not exist. 2012-10-10 23:46:49 +11:00
Con Kolivas
974f65c67f Ignore the value of stratum_active on calling initiate_stratum and assume we're always trying to reinitiate it, and set the active flag to false in that function. 2012-10-10 23:22:24 +11:00
Con Kolivas
07605fad60 stratum auth can be unset if we fail to authorise on subsequent calls to auth_stratum which undoes the requirement of setting it in one place so set it in pool_active. 2012-10-10 23:07:33 +11:00
Con Kolivas
80d4355737 Remove free that could segfault. 2012-10-08 23:00:37 +11:00
Con Kolivas
7d6bcab899 Use the stratum url as the rpc url advertised if we switch to it. 2012-10-08 22:15:30 +11:00
Con Kolivas
662ab1eff7 Count each stratum work item as local work. 2012-10-08 21:34:46 +11:00
Con Kolivas
2023e53fb2 Cope with one stratum pool being the only active pool when it dies by sleeping for 5 seconds before retrying to get work from it instead of getting work indefinitely. 2012-10-08 13:48:18 +11:00
Con Kolivas
ef822a25ed Detect stratum outage based on either select timing out or receiving an empty buffer and properly re-establish connection by disabling the stratum_active flag, coping with empty buffers in parse_stratum. 2012-10-08 11:08:04 +11:00
Con Kolivas
0a90207111 Merge branch 'master' into stratum 2012-10-07 13:22:17 +11:00
Con Kolivas
461b7c6de2 Display correct pool number when block is found. 2012-10-06 15:12:05 +10:00
Con Kolivas
8a32f381b4 Use the stratum thread to detect when a stratum pool has died based on no message for 2 minutes. 2012-10-06 14:33:51 +10:00
Con Kolivas
0cddd1ab54 Only set the stratum auth flag once and once the stratum thread is started, use that to set/unset the stratum active flag. 2012-10-06 12:17:46 +10:00
Con Kolivas
7a01578cc5 Only hand off to stratum from getwork if we succeed in initiating the protocol. 2012-10-06 10:14:30 +10:00
Con Kolivas
8893f7ab23 Target should only be 32 bytes copied. 2012-10-06 01:13:52 +10:00
Con Kolivas
687fed1de9 Use a static array for work submission data instead of stack memory. 2012-10-05 19:03:28 +10:00
Con Kolivas
c4aa8d267c Clear the buffer data before sprinting to it. 2012-10-05 19:02:10 +10:00
Con Kolivas
f0901e0a26 Clear work stratum strings before setting them and add them to debug output. 2012-10-05 18:09:10 +10:00
Con Kolivas
a8d693029a Move stratum sockets to curl infrastructure with locking around send+recv to begin support for proxies and ssl. 2012-10-05 12:37:29 +10:00
Con Kolivas
591c433477 Make detect stratum fail if a proxy has been set up. 2012-10-05 09:41:23 +10:00
Con Kolivas
51c499a5ae Stratum does not currently have any proxy support so do not try to switch to stratum if a proxy has been specified. 2012-10-05 00:10:00 +10:00
Con Kolivas
deb0a9b644 Windows doesn't work with MSG_PEEK on recv so move to a continuously updating buffer for incoming messages. 2012-10-04 23:18:33 +10:00
Con Kolivas
3c85498d57 Add space to reject reason. 2012-10-04 09:38:05 +10:00
Con Kolivas
b4450bb852 Parse the reject reason where possible from stratum share submission. 2012-10-04 09:17:28 +10:00
Con Kolivas
512d244094 Pass json error value to share result function to be able to parse reject reason in stratum. 2012-10-04 08:52:56 +10:00
Con Kolivas
9698858abc Remove the sshare hash entry if we failed to send it. 2012-10-03 18:19:31 +10:00
Con Kolivas
284b786da7 Check the stratum pool difference has not changed compared to the work diff when testing whether a share meets the target or not and retarget if necessary. 2012-10-03 11:18:08 +10:00
Con Kolivas
ac0c813f9d Bit error in target calculation for stratum. 2012-10-03 10:33:11 +10:00
Con Kolivas
310239b8e8 Revert "Parse reject reason from the stratum json error code if there is one."
This reverts commit c6a3d065fa.

Segfaults. Needs work.
2012-10-03 10:20:54 +10:00
Con Kolivas
3d982dfbe9 Set work_block in gen_stratum_work for when work is reused to avoid thinking it's all stale. 2012-10-03 09:49:01 +10:00
Con Kolivas
74c11945f0 Offset the current block detection to the prev block hash. 2012-10-03 09:42:20 +10:00
Con Kolivas
c6a3d065fa Parse reject reason from the stratum json error code if there is one. 2012-10-03 08:55:02 +10:00
Con Kolivas
9e0e61509d We should be testing for id_val, not id in parse stratum response. 2012-10-03 01:14:35 +10:00
Con Kolivas
fdaabf59c6 Make target on stratum scale to any size by clearing sequential bits according to diff. 2012-10-03 00:35:08 +10:00
Con Kolivas
a8a8ed6207 Correct target calculation in gen_stratum_work. 2012-10-02 16:01:32 +10:00
Con Kolivas
925d01922b If a share result has an error code but still has an id, it is likely a reject, not an error. 2012-10-02 14:12:34 +10:00
Con Kolivas
1b7aa48c8f Initiate stratum the first time in pool_active only, allowing us to switch to it on getting a failed getwork and detecting the presence of stratum on the url at that time. 2012-10-02 11:46:48 +10:00
Con Kolivas
210bc9be3e If no stratum url is set by the end of the detect stratum routine, copy the sockaddr url. 2012-10-02 10:02:25 +10:00
Con Kolivas
78aafcec5c Make all buffers slightly larger to prevent overflow. 2012-10-02 09:26:18 +10:00
Con Kolivas
df91df3507 Userpass needs to be copied to user and pass earlier to allow stratum authorisation to work with it. 2012-10-02 02:03:52 +10:00
Con Kolivas
2941febd05 Store a sockaddr url of the stripped url used in determining sockaddr to not confuse it with the stratum url and fix build warnings. 2012-10-02 00:00:55 +10:00
Con Kolivas
2ccb6d78ca Decrease the queued count with stratum work once it's staged as well. 2012-10-01 23:19:34 +10:00
Con Kolivas
601d1aca97 Allow the stratum retry to initiate and auth stratum in pool_alive to make sure the stratum thread is started. 2012-10-01 23:15:50 +10:00
Con Kolivas
4a7ce9dd2a Avoid duplicating pool->rpc_url and setting pool->stratum_url twice to itself. 2012-10-01 22:21:43 +10:00
Con Kolivas
eaf7ed0dcd Detect if a getwork based pool has the X-Stratum header on startup, and if so, switch to the stratum based pool. 2012-10-01 22:13:20 +10:00