diff --git a/README.txt b/README.txt index 4d26203..14f19ef 100644 --- a/README.txt +++ b/README.txt @@ -1,5 +1,5 @@ -ccMiner release 1.4.9-tpruvot (15 Nov 2014) - "GPU Monitoring" +ccMiner release 1.5.0-tpruvot (Nov 2014) - "Extra nonce" --------------------------------------------------------------- *************************************************************** @@ -89,7 +89,7 @@ its command line interface and options. -i, --intensity GPU threads per call 0-31 (default: 0=auto) -f, --diff Divide difficulty by this factor (std is 1) -v, --vote Heavycoin block vote (default: 512) - -o, --url=URL URL of mining server (default: " DEF_RPC_URL ") + -o, --url=URL URL of mining server -O, --userpass=U:P username:password pair for mining server -u, --user=USERNAME username for mining server -p, --pass=PASSWORD password for mining server @@ -120,23 +120,23 @@ its command line interface and options. Example for Heavycoin Mining on heavycoinpool.com with a single gpu in your system - ccminer.exe -t 1 -a heavy -o stratum+tcp://stratum01.heavycoinpool.com:5333 -u <> -p <> -v 8 + ccminer -t 1 -a heavy -o stratum+tcp://stratum01.heavycoinpool.com:5333 -u <> -p <> -v 8 Example for Heavycoin Mining on hvc.1gh.com with a dual gpu in your system - ccminer.exe -t 2 -a heavy -o stratum+tcp://hvcpool.1gh.com:5333 -u <> -p x -v 8 + ccminer -t 2 -a heavy -o stratum+tcp://hvcpool.1gh.com:5333/ -u <> -p x -v 8 Example for Fuguecoin solo-mining with 4 gpu's in your system and a Fuguecoin-wallet running on localhost - ccminer.exe -q -s 1 -t 4 -a fugue256 -o http://localhost:9089 -u <> -p <> + ccminer -q -s 1 -t 4 -a fugue256 -o http://localhost:9089/ -u <> -p <> Example for Fuguecoin pool mining on dwarfpool.com with all your GPUs - ccminer.exe -q -a fugue256 -o stratum+tcp://erebor.dwarfpool.com:3340 -u YOURWALLETADDRESS.1 -p YOUREMAILADDRESS + ccminer -q -a fugue256 -o stratum+tcp://erebor.dwarfpool.com:3340/ -u YOURWALLETADDRESS.1 -p YOUREMAILADDRESS Example for Groestlcoin solo mining - ccminer.exe -q -s 1 -a groestl -o http://127.0.0.1:1441 -u USERNAME -p PASSWORD + ccminer -q -s 1 -a groestl -o http://127.0.0.1:1441/ -u USERNAME -p PASSWORD For solo-mining you typically use -o http://127.0.0.1:xxxx where xxxx represents @@ -146,6 +146,19 @@ and password with -O (or -u -p) as specified in the wallet config. The wallet must also be started with the -server option and/or with the server=1 flag in the .conf file +>>> API and Monitoring <<< + +With the -b parameter you can open your ccminer to your network, use -b 0.0.0.0:4068 if required. +On windows, setting 0.0.0.0 will ask firewall permissions on the first launch. Its normal. + +Default API feature is only enabled for localhost queries by default, on port 4068. + +You can test this api on linux with "telnet 4068" and type "help" to list the commands. +Default api format is delimited text. If required a php json wrapper is present in api/ folder. + +I plan to add a json format later, if requests are formatted in json too.. + + >>> Additional Notes <<< This code should be running on nVidia GPUs ranging from compute capability @@ -156,7 +169,12 @@ features. >>> RELEASE HISTORY <<< v1.5.0 - x11: sp echo optimisation (+10KHs) + Upgrade compat jansson to 2.6 (for windows) + Add pool mining.set_extranonce support + Allow increased scan ranges (wip) + Some internal changes to use the C++ compiler + New API 1.2 with some new commands (read only) + Add most sp x11/x15 optimisations Nov. 15th 2014 v1.4.9 Support of nvml and nvapi(windows) to monitor gpus @@ -274,12 +292,12 @@ features. Notable contributors to this application are: -Christian Buchner, Christian H. (Germany): CUDA implementation +Christian Buchner, Christian H. (Germany): Initial CUDA implementation -djm34, tsiv : Recent CUDA algos +djm34, tsiv, sp for cuda algos implementation and optimisation Tanguy Pruvot : 750Ti tuning, blake, colors, general code cleanup/opts - linux Config/Makefile and vstudio stuff... + API monitoring, linux Config/Makefile and vstudio stuff... and also many thanks to anyone else who contributed to the original cpuminer application (Jeff Garzik, pooler), it's original HVC-fork diff --git a/ccminer.cpp b/ccminer.cpp index 95d5d2c..6654c3e 100644 --- a/ccminer.cpp +++ b/ccminer.cpp @@ -2018,7 +2018,7 @@ int main(int argc, char *argv[]) #endif printf(" Based on pooler cpuminer 2.3.2\n"); printf(" CUDA support by Christian Buchner and Christian H.\n"); - printf(" Include some of djm34 additions\n\n"); + printf(" Include some of djm34 additions and sp optimisations\n\n"); printf("BTC donation address: 1AJdfCpLWPNoAMDfHF1wD5y8VgKSSTHxPo\n\n"); diff --git a/util.cpp b/util.cpp index 3e3b43a..69c0cc9 100644 --- a/util.cpp +++ b/util.cpp @@ -915,7 +915,7 @@ static bool stratum_parse_extranonce(struct stratum_ctx *sctx, json_t *params, i applog(LOG_ERR, "Failed to get extranonce1"); goto out; } - xn2_size = json_integer_value(json_array_get(params, pndx+1)); + xn2_size = (int) json_integer_value(json_array_get(params, pndx+1)); if (!xn2_size) { applog(LOG_ERR, "Failed to get extranonce2_size"); goto out; @@ -1284,7 +1284,7 @@ static bool stratum_reconnect(struct stratum_ctx *sctx, json_t *params) if (json_is_string(port_val)) port = atoi(json_string_value(port_val)); else - port = json_integer_value(port_val); + port = (int) json_integer_value(port_val); if (!host || !port) return false;