Make extranonce support optional

diff --git a/NEWS b/NEWS
index 671014fafc98a860df1924d974e42b2d1cd68788..2b887ba9a6aef37add0291e63a2c564e31e52aa0 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,7 @@ version 1.1 (Tanguy Pruvot)
 - Add Skein2 algo (Double Skein for Woodcoin)
 - Add Animecoin algo (Quark variant)
 - Add Dropcoin pok algo
+- Add BMW-256 (MDT) algo
 - Change some logged strings
 - Use all cores by default, not N-1
 - Handle a default config to run without params
@@ -14,6 +15,9 @@ version 1.1 (Tanguy Pruvot)
 - add NSIS installer script for windows setup
 - Implement background option on windows
 - add -m stratum option (diff-multiplier)
+- Time limit to allow benchmarks or cron jobs
+- Fix Cryptonight stratum support
+- Allow to disable extranonce support
 
 version 1.0.9 (Tanguy Pruvot)
 - pool extranonce subscribe

diff --git a/cpu-miner.c b/cpu-miner.c
index 2c73dc24280aa4b468a3cce5758b7f5cae2d64ab..9129304864dfdf75c289e399ba36dfbd87f4b614 100644 (file)
--- a/cpu-miner.c
+++ b/cpu-miner.c
@@ -149,7 +149,7 @@ bool opt_debug = false;
 bool opt_protocol = false;
 bool opt_benchmark = false;
 bool opt_redirect = true;
-bool opt_extranonce = false;
+bool opt_extranonce = true;
 bool want_longpoll = true;
 bool have_longpoll = false;
 bool have_gbt = true;
@@ -298,6 +298,7 @@ Options:\n\
       --no-getwork      disable getwork support\n\
       --no-gbt          disable getblocktemplate support\n\
       --no-stratum      disable X-Stratum support\n\
+      --no-extranonce   disable Stratum extranonce support\n\
       --no-redirect     ignore requests to change the URL of the mining server\n\
   -q, --quiet           disable per-thread hashmeter output\n\
       --no-color        disable colored output\n\
@@ -355,6 +356,7 @@ static struct option const options[] = {
        { "no-longpoll", 0, NULL, 1003 },
        { "no-redirect", 0, NULL, 1009 },
        { "no-stratum", 0, NULL, 1007 },
+       { "no-extranonce", 0, NULL, 1012 },
        { "max-temp", 1, NULL, 1060 },
        { "max-diff", 1, NULL, 1061 },
        { "max-rate", 1, NULL, 1062 },
@@ -2674,6 +2676,7 @@ void parse_arg(int key, char *arg)
                exit(0);
        case 1007:
                want_stratum = false;
+               opt_extranonce = false;
                break;
        case 1008:
                opt_time_limit = atoi(arg);
@@ -2687,6 +2690,9 @@ void parse_arg(int key, char *arg)
        case 1011:
                have_gbt = false;
                break;
+       case 1012:
+               opt_extranonce = false;
+               break;
        case 1013:                      /* --coinbase-addr */
                pk_script_size = address_to_script(pk_script, sizeof(pk_script), arg);
                if (!pk_script_size) {