Merge branch 'master' of https://bitbucket.org/ckolivas/ckpool

README

@@ -241,7 +241,7 @@ for when the notifier is not set up and only polls if the "notify" field is
 not set on a btcd.
 
 "nonce1length" : This is optional allowing the extranonce1 length to be chosen
-from 2 to 8. Default 8
+from 2 to 8. Default 4
 
 "nonce2length" : This is optional allowing the extranonce2 length to be chosen
 from 2 to 8. Default 8

ckpool.conf

@@ -16,7 +16,7 @@
 "btcaddress" : "14BMjogz69qe8hk9thyzbmR5pg34mVKB1e",
 "btcsig" : "/mined by ck/",
 "blockpoll" : 100,
-"nonce1length" : 8,
+"nonce1length" : 4,
 "nonce2length" : 8,
 "update_interval" : 30,
 "serverurl" : [

src/ckpool.c

@@ -1421,7 +1421,7 @@ int main(int argc, char **argv)
 	if (!ckp.blockpoll)
 		ckp.blockpoll = 100;
 	if (!ckp.nonce1length)
-		ckp.nonce1length = 8;
+		ckp.nonce1length = 4;
 	else if (ckp.nonce1length < 2 || ckp.nonce1length > 8)
 		quit(0, "Invalid nonce1length %d specified, must be 2~8", ckp.nonce1length);
 	if (!ckp.nonce2length)