Commit a57760e15166153b39da78b3c00390d5cc463513
2014-03-12T23:02:31
Abstract out the merkle bin calculation for gbt solo
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 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131
diff --git a/cgminer.c b/cgminer.c
index 9d4cc66..2231626 100644
--- a/cgminer.c
+++ b/cgminer.c
@@ -2171,45 +2171,52 @@ static bool pool_localgen(struct pool *pool)
return (pool->has_stratum || pool->has_gbt);
}
-static bool gbt_solo_decode(struct pool *pool, json_t *res_val)
+static void gbt_merkle_bins(struct pool *pool, json_t *transaction_arr)
{
- json_t *value, *transaction_arr;
- const char *previousblockhash;
- const char *target;
- char *hashbin = NULL, hashhex[68];
- int version;
- int curtime;
- const char *bits;
- int height;
- size_t index;
+ json_t *value, *arr_val;
int transactions, i, j;
- previousblockhash = json_string_value(json_object_get(res_val, "previousblockhash"));
- target = json_string_value(json_object_get(res_val, "target"));
- transaction_arr = json_object_get(res_val, "transactions");
+ pool->merkles = 0;
transactions = json_array_size(transaction_arr);
if (transactions) {
- unsigned char binswap[32], merklebin[1024];
- int binleft, binlen = transactions * 32 + 32, merkleoff = 0;
-
- hashbin = calloc(binlen + 32, 1);
- if (unlikely(!hashbin))
- quit(1, "Failed to malloc hashbin in gbt_solo_decode");
- json_array_foreach(transaction_arr, index, value) {
- const char *hash = json_string_value(json_object_get(value, "hash"));
-
- if (!hex2bin(binswap, hash, 32))
- quit(1, "Failed to hex2bin hash in gbt_solo_decode");
- swab256(hashbin + 32 + (32 * index), binswap);
+ unsigned char *hashbin;
+ char hashhex[68];
+ unsigned char binswap[32];
+ int binleft, binlen = transactions * 32 + 32;
+
+ hashbin = alloca(binlen + 32);
+ memset(hashbin, 0, 32);
+ for (i = 0; i < transactions; i++) {
+ const char *hash;
+
+ arr_val = json_array_get(transaction_arr, i);
+ if (!arr_val) {
+ applog(LOG_ERR, "json_array_get fail of arr_val");
+ continue;
+ }
+ value = json_object_get(arr_val, "hash");
+ if (!value) {
+ applog(LOG_ERR, "json_object_get fail of value");
+ continue;
+ }
+ hash = json_string_value(value);
+ if (!hash) {
+ applog(LOG_ERR, "json_string_value fail of hash");
+ continue;
+ }
+ if (!hex2bin(binswap, hash, 32)) {
+ applog(LOG_ERR, "Failed to hex2bin hash in gbt_merkle_bins");
+ continue;
+ }
+ swab256(hashbin + 32 + 32 * i, binswap);
}
binleft = binlen / 32;
if (binleft > 1) {
while (42) {
if (binleft == 1)
break;
- memcpy(merklebin + merkleoff, hashbin + 32, 32);
- merkleoff += 32;
- applog(LOG_ERR, "Len %d left %d", binlen, binleft);
+ memcpy(pool->merklebin + (pool->merkles * 32), hashbin + 32, 32);
+ pool->merkles++;
if (binleft % 2) {
memcpy(hashbin + binlen, hashbin + binlen - 32, 32);
binlen += 32;
@@ -2222,12 +2229,29 @@ static bool gbt_solo_decode(struct pool *pool, json_t *res_val)
binlen = binleft * 32;
}
}
- for (i = 0; i < merkleoff; i += 32) {
- __bin2hex(hashhex, merklebin + i, 32);
+ for (i = 0; i < pool->merkles; i++) {
+ __bin2hex(hashhex, pool->merklebin + i * 32, 32);
applog(LOG_WARNING, "MH%d %s",i, hashhex);
}
exit(0);
}
+}
+
+
+static bool gbt_solo_decode(struct pool *pool, json_t *res_val)
+{
+ json_t *transaction_arr;
+ const char *previousblockhash;
+ const char *target;
+ int version;
+ int curtime;
+ const char *bits;
+ int height;
+
+ previousblockhash = json_string_value(json_object_get(res_val, "previousblockhash"));
+ target = json_string_value(json_object_get(res_val, "target"));
+ transaction_arr = json_object_get(res_val, "transactions");
+ gbt_merkle_bins(pool, transaction_arr);
version = json_integer_value(json_object_get(res_val, "version"));
curtime = json_integer_value(json_object_get(res_val, "curtime"));
bits = json_string_value(json_object_get(res_val, "bits"));
diff --git a/miner.h b/miner.h
index fe81d9b..0312271 100644
--- a/miner.h
+++ b/miner.h
@@ -1257,7 +1257,8 @@ struct pool {
int coinbase_len;
bool gbt_solo;
- char *transactions;
+ int merkles;
+ unsigned char merklebin[16 * 32];
/* Shared by both stratum & GBT */
unsigned char *coinbase;