From 7d4c48d1d8cdab54f5c56c9419f23b1330d40305 Mon Sep 17 00:00:00 2001 From: Tanguy Pruvot Date: Sat, 13 Feb 2016 16:14:57 +0100 Subject: [PATCH] 1.7.3 stratum test --- ccminer.cpp | 3 ++- configure.ac | 2 +- cpuminer-config.h | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ccminer.cpp b/ccminer.cpp index 8315af0..81a7e0c 100644 --- a/ccminer.cpp +++ b/ccminer.cpp @@ -1320,7 +1320,7 @@ err_out: static bool stratum_gen_work(struct stratum_ctx *sctx, struct work *work) { uchar merkle_root[64]; - uchar extraheader[256] = { 0 }; + uchar extraheader[128] = { 0 }; int i, headersize = 0; if (!sctx->job.job_id) { @@ -1623,6 +1623,7 @@ static void *miner_thread(void *userdata) if (have_stratum) { uint32_t sleeptime = 0; + if (opt_algo != ALGO_DECRED) // decred use extradata... while (!work_done && time(NULL) >= (g_work_time + opt_scantime)) { usleep(100*1000); if (sleeptime > 4) { diff --git a/configure.ac b/configure.ac index 18bb159..3e7ac00 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([ccminer], [1.7.2], [], [ccminer], [http://github.com/tpruvot/ccminer]) +AC_INIT([ccminer], [1.7.3], [], [ccminer], [http://github.com/tpruvot/ccminer]) AC_PREREQ([2.59c]) AC_CANONICAL_SYSTEM diff --git a/cpuminer-config.h b/cpuminer-config.h index 7fc48f0..20f0201 100644 --- a/cpuminer-config.h +++ b/cpuminer-config.h @@ -162,7 +162,7 @@ #define PACKAGE_NAME "ccminer" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "ccminer 1.7.2" +#define PACKAGE_STRING "ccminer 1.7.3" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "ccminer" @@ -171,7 +171,7 @@ #define PACKAGE_URL "http://github.com/tpruvot/ccminer" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.7.2" +#define PACKAGE_VERSION "1.7.3" /* If using the C implementation of alloca, define if you know the direction of stack growth for your system; otherwise it will be @@ -185,7 +185,7 @@ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION "1.7.2" +#define VERSION "1.7.3" /* Define curl_free() as free() if our version of curl lacks curl_free. */ /* #undef curl_free */