solo: switch to getwork on unhandled gbt versions

version seen: 1024 (Neos), 6 (Mist in PoW phase)

README.md

@@ -20,19 +20,19 @@ fork of [pooler](//github.com/pooler)'s cpuminer (see AUTHORS for list of contri
 Algorithms
 ==========
 #### Currently supported
- * ✓ __scrypt__ (Litecoin, Dogecoin, Feathercoin, etc..)
+ * ✓ __scrypt__ (Litecoin, Dogecoin, Feathercoin, ...)
  * ✓ __scrypt:N__ (Vertcoin [VTC])
- * ✓ __sha256d__ (Bitcoin, Freicoin, Peercoin/PPCoin, Terracoin, etc..)
- * ✓ __blake__ (Neos/Saffron Blake-256)
+ * ✓ __sha256d__ (Bitcoin, Freicoin, Peercoin/PPCoin, Terracoin, ...)
+ * ✓ __blake__ (Neos/Saffron [SFR] Blake-256)
  * ✓ __cryptonight__ (Bytecoin [BCN], Monero)
  * ✓ __fresh__ (FreshCoin)
  * ✓ __neoscrypt__ (Feathercoin)
- * ✓ __nist5__ (TalkCoin [TAC], [UPM])
+ * ✓ __nist5__ (MistCoin [MIC], TalkCoin [TAC], ...)
  * ✓ __pentablake__ (Joincoin)
  * ✓ __qubit__ (MyriadCoin [MYR])
  * ✓ __s3__ (OneCoin)
- * ✓ __x11__ (Darkcoin [DRK], Hirocoin, Limecoin)
- * ✓ __x13__ (Sherlockcoin, [ACE], [B2B], [GRC], [XHC], etc..)
+ * ✓ __x11__ (Darkcoin [DRK], Hirocoin, Limecoin, ...)
+ * ✓ __x13__ (Sherlockcoin, [ACE], [B2B], [GRC], [XHC], ...)
  * ✓ __x14__ (X14, Webcoin [WEB])
  * ✓ __x15__ (RadianceCoin [RCE])
 

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([cpuminer-multi], [1.0.7])
+AC_INIT([cpuminer-multi], [1.0.8])
 
 AC_PREREQ([2.59c])
 AC_CANONICAL_SYSTEM

cpu-miner.c

@@ -682,6 +682,7 @@ static bool gbt_work_decode(const json_t *val, struct work *work)
 		goto out;
 	}
 	work->height = json_integer_value(tmp);
+	applog(LOG_BLUE, "Current block is %d", work->height);
 
 	tmp = json_object_get(val, "version");
 	if (!tmp || !json_is_integer(tmp)) {
@@ -692,8 +693,8 @@ static bool gbt_work_decode(const json_t *val, struct work *work)
 	if (version > 2) {
 		if (version_reduce) {
 			version = 2;
-		} else if (have_gbt && allow_getwork && !version_force && version == 1024) {
-			applog(LOG_DEBUG, "Switching to getwork");
+		} else if (have_gbt && allow_getwork && !version_force) {
+			applog(LOG_DEBUG, "Switching to getwork (gbt version: %d)", version);
 			have_gbt = false;
 			goto out;
 		} else if (!version_force) {