Commit Graph

1047 Commits

Author SHA1 Message Date
Con Kolivas
d526eb8a76 Mask out (null) as a valid result in json_result 2014-09-22 21:59:26 +10:00
Con Kolivas
08f7f39836 Do not accept proxy notify update until subscription complete 2014-09-22 21:56:42 +10:00
Con Kolivas
e326d36be5 Only use 4 bytes for enonce1 in proxy mode when we have 8 or more bytes for nonce2len 2014-09-22 21:07:17 +10:00
Con Kolivas
ffb054c95a Show all connector messages in debug mode 2014-09-22 20:05:55 +10:00
Con Kolivas
ce2559f8c2 Update btcd docs 2014-09-22 16:43:36 +10:00
Con Kolivas
ed10a73946 Merge branch 'master' of bitbucket.org:ckolivas/ckpool 2014-09-22 12:32:50 +10:00
Con Kolivas
8e34ff377b Make necessary changes to ckproxy to support large coinbases and null length enonce1 for p2pool support 2014-09-22 12:31:36 +10:00
kanoi
44562a061c Merge branch 'master' of https://bitbucket.org/ckolivas/ckpool 2014-09-21 12:32:25 +10:00
kanoi
b508b72999 php - api in json (if required) 2014-09-21 12:31:50 +10:00
Con Kolivas
dce999f92a Fix typo 2014-09-21 09:44:54 +10:00
kanoi
94066d22e0 ckdb - fix broken BTC username caused by salt change 2014-09-21 05:17:43 +10:00
kanoi
a19e77eee1 Merge branch 'master' of https://bitbucket.org/ckolivas/ckpool 2014-09-21 03:59:44 +10:00
kanoi
d22fdf78df php - add an API interface for users 2014-09-21 03:56:31 +10:00
Con Kolivas
73ca6c2e45 No need for 64 bit ids in the proxy jobs 2014-09-19 23:59:00 +10:00
Con Kolivas
7e00e19a72 Merge branch 'master' of bitbucket.org:ckolivas/ckpool 2014-09-19 23:53:27 +10:00
Con Kolivas
b36e4cec3c Make sure jobids align between generator and stratifier in proxy mode 2014-09-19 23:53:10 +10:00
kanoi
23f0b77f33 php - make the share age function reusable 2014-09-19 22:06:53 +10:00
kanoi
7b119f05a3 ckdb - share invalid breakdown per worker 2014-09-19 19:10:23 +10:00
kanoi
9226a0ea29 php - same header spacing for users/workers 2014-09-19 18:26:33 +10:00
kanoi
fe39c58229 ckdb - add missing stats 2014-09-18 18:15:35 +10:00
kanoi
4f9fca7806 ckdb - initialise pool data for optioncontrol 2014-09-18 13:36:47 +10:00
Con Kolivas
8a106dea9f Merged in archang/ckpool (pull request #4)
Fix url resolving error when using numeric ipv6 address with square brackets
2014-09-18 12:33:05 +10:00
kanoi
27ef322f63 Merge branch 'master' of https://bitbucket.org/ckolivas/ckpool 2014-09-18 12:11:40 +10:00
kanoi
947e22a91a php - fix user level menu mess up 2014-09-18 12:10:58 +10:00
CC Ding
1dd1ecba46 Merged ckolivas/ckpool into master 2014-09-18 10:02:14 +08:00
CC Ding
d64827bf35 Get rid of the square brackets when using numeric ipv6 address. 2014-09-18 02:01:29 +00:00
Con Kolivas
04c4f0587f Merge branch 'master' of bitbucket.org:ckolivas/ckpool 2014-09-18 11:56:35 +10:00
Con Kolivas
099701f26b Set initial start time in the stratum loop to zero to guarantee we get a new workbase immediately 2014-09-18 11:55:31 +10:00
Con Kolivas
01240af44d Implement basic get_transactions and new get_txnhashes calls 2014-09-18 11:48:07 +10:00
CC Ding
a690ea3159 Merged ckolivas/ckpool into master 2014-09-18 09:18:16 +08:00
kanoi
79953adf59 php - show the default menu on error pages 2014-09-18 10:56:13 +10:00
kanoi
8a0e7b5547 ckdb - version 2014-09-18 10:36:12 +10:00
kanoi
f091bc75cc ckdb - salt new user 2014-09-18 09:50:24 +10:00
kanoi
c5a2737a1f sql - format initid.sh output so it can be sent to ckpmsg 2014-09-18 04:01:57 +10:00
kanoi
0ec9cd2fd2 sql - correct version in ckdb.sql 2014-09-18 03:56:46 +10:00
kanoi
b25687af68 Merge branch 'master' of https://bitbucket.org/ckolivas/ckpool 2014-09-18 03:34:38 +10:00
kanoi
98f5b7e0c8 php - add a password reset, ckdb db functions for opts/atts and define a default menu 2014-09-18 03:33:36 +10:00
Con Kolivas
7660f0ba6c Merge branch 'master' of bitbucket.org:ckolivas/ckpool 2014-09-17 21:14:51 +10:00
Con Kolivas
6bd4ed66bd Move block hash update display to add base for notify enabled btcds 2014-09-17 21:14:29 +10:00
kanoi
fe9ea8b0f5 ckdb - add TZ to screen log and handle fractional hour timezones 2014-09-17 14:04:10 +10:00
kanoi
8ccaedaf42 Merge branch 'master' of https://bitbucket.org/ckolivas/ckpool 2014-09-17 12:05:08 +10:00
kanoi
5798453985 ckdb - also report postgresql version at startup 2014-09-17 12:03:20 +10:00
kanoi
e0b08aadd0 ckdb - allow retrying the db connection and reconnect often 2014-09-17 11:55:22 +10:00
kanoi
45e29b3da4 ckdb - consistent commit/rollback and par initialisation 2014-09-17 08:53:07 +10:00
kanoi
48ffb1d109 ckdb - optioncontrol table and commands - getopts/setopts 2014-09-16 22:14:22 +10:00
Con Kolivas
683fdec8f2 Reset proxy diff to startdiff on each new subscription 2014-09-16 12:35:28 +10:00
Con Kolivas
47519286a4 Use a global notify id counter in proxy mode to avoid clashes 2014-09-16 11:39:35 +10:00
Con Kolivas
5ca5cae084 Only drop proxy connections when we're killing an existing server and start rejecting before dropping further connections 2014-09-16 11:03:57 +10:00
Con Kolivas
3608c47045 Merge branch 'master' of bitbucket.org:ckolivas/ckpool 2014-09-16 10:21:51 +10:00
Con Kolivas
6880b9f03d Implement fallback in proxy mode and keep existing connection when testing if servers or proxies are alive 2014-09-16 10:21:39 +10:00