Commit 9ad02fe3037dcf89e4c981a0be4aa9ff7ea919ef
2012-11-18T21:48:44
Support workid for block submission on GBT pools that use it.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92
diff --git a/cgminer.c b/cgminer.c
index 6a38c75..76f2fae 100644
--- a/cgminer.c
+++ b/cgminer.c
@@ -1471,6 +1471,7 @@ static void gen_gbt_work(struct pool *pool, struct work *work)
unsigned char *merkleroot;
char *cbhex;
+ memset(work->job_id, 0, 64);
mutex_lock(&pool->gbt_lock);
__build_gbt_coinbase(pool);
merkleroot = __gbt_merkleroot(pool);
@@ -1488,6 +1489,9 @@ static void gen_gbt_work(struct pool *pool, struct work *work)
/* For encoding the block data on submission */
work->gbt_txns = pool->gbt_txns + 1;
+
+ if (pool->gbt_workid)
+ sprintf(work->job_id, "%s", pool->gbt_workid);
mutex_unlock(&pool->gbt_lock);
memcpy(work->data + 4 + 32, merkleroot, 32);
@@ -1529,6 +1533,7 @@ static bool gbt_decode(struct pool *pool, json_t *res_val)
int curtime;
bool submitold;
const char *bits;
+ const char *workid;
previousblockhash = json_string_value(json_object_get(res_val, "previousblockhash"));
target = json_string_value(json_object_get(res_val, "target"));
@@ -1539,6 +1544,7 @@ static bool gbt_decode(struct pool *pool, json_t *res_val)
curtime = json_integer_value(json_object_get(res_val, "curtime"));
submitold = json_is_true(json_object_get(res_val, "submitold"));
bits = json_string_value(json_object_get(res_val, "bits"));
+ workid = json_string_value(json_object_get(res_val, "workid"));
if (!previousblockhash || !target || !coinbasetxn || !longpollid ||
!expires || !version || !curtime || !bits) {
@@ -1555,12 +1561,19 @@ static bool gbt_decode(struct pool *pool, json_t *res_val)
applog(LOG_DEBUG, "curtime: %d", curtime);
applog(LOG_DEBUG, "submitold: %s", submitold ? "true" : "false");
applog(LOG_DEBUG, "bits: %s", bits);
+ if (workid)
+ applog(LOG_DEBUG, "workid: %s", workid);
mutex_lock(&pool->gbt_lock);
free(pool->coinbasetxn);
pool->coinbasetxn = strdup(coinbasetxn);
free(pool->longpollid);
pool->longpollid = strdup(longpollid);
+ free(pool->gbt_workid);
+ if (workid)
+ pool->gbt_workid = strdup(workid);
+ else
+ pool->gbt_workid = NULL;
hex2bin(hash_swap, previousblockhash, 32);
swap256(pool->previousblockhash, hash_swap);
@@ -2321,7 +2334,10 @@ static bool submit_upstream_work(struct work *work, CURL *curl, bool resubmit)
free(varint);
strcat(gbt_block, work->gbt_coinbase);
- sprintf(s, "{\"id\": 0, \"method\": \"submitblock\", \"params\": [\"%s\", {}]}", gbt_block);
+ if (strlen(work->job_id))
+ sprintf(s, "{\"id\": 0, \"method\": \"submitblock\", \"params\": [\"%s\", {\"workid\": \"%s\"}]}", gbt_block, work->job_id);
+ else
+ sprintf(s, "{\"id\": 0, \"method\": \"submitblock\", \"params\": [\"%s\", {}]}", gbt_block);
} else
sprintf(s, "{\"method\": \"getwork\", \"params\": [ \"%s\" ], \"id\":1}", hexstr);
applog(LOG_DEBUG, "DBG: sending %s submit RPC call: %s", pool->rpc_url, s);
@@ -5000,6 +5016,9 @@ static struct work *hash_pop(const struct timespec *abstime)
static bool reuse_work(struct work *work, struct pool *pool)
{
+ if (work->mined && (pool_strategy == POOL_BALANCE || pool_strategy == POOL_LOADBALANCE))
+ return false;
+
if (pool->has_stratum) {
if (!pool->stratum_active)
return false;
diff --git a/miner.h b/miner.h
index 4eea0db..f098e23 100644
--- a/miner.h
+++ b/miner.h
@@ -915,6 +915,7 @@ struct pool {
unsigned char gbt_target[32];
char *coinbasetxn;
char *longpollid;
+ char *gbt_workid;
int gbt_expires;
uint32_t gbt_version;
uint32_t curtime;