Send transaction data in segwit

Signed-off-by: Anthony Fieroni <bvbfan@abv.bg>
This commit is contained in:
Anthony Fieroni authored and Brannon King committed 2019-10-25 16:17:57 -06:00
1 parent b92d588b2b
commit b10bedb90c
4 files changed
+22 -8

No files matched your search

+2
View File
@@ -1501,6 +1501,7 @@ struct pool {
uint32_t gbt_version;
uint32_t curtime;
uint32_t gbt_bits;
char *txn_data;
unsigned char *txn_hashes;
size_t gbt_txns;
size_t coinbase_len;
@@ -1573,6 +1574,7 @@ struct work {
bool gbt;
char *coinbase;
char *txn_data;
int gbt_txns;
unsigned int work_block;
+14
View File
@@ -2009,6 +2009,8 @@ void clean_work(struct work *w)
free(w->job_id);
free(w->ntime);
free(w->coinbase);
if (w->txn_data)
free(w->txn_data);
free(w->nonce1);
memset(w, 0, sizeof(struct work));
}
@@ -2039,6 +2041,9 @@ static bool __build_gbt_txns(struct pool *pool, json_t *res_val)
free(pool->txn_hashes);
pool->txn_hashes = NULL;
if (pool->txn_data)
free(pool->txn_data);
pool->txn_data = NULL;
pool->gbt_txns = 0;
txn_array = json_object_get(res_val, "transactions");
@@ -2060,6 +2065,8 @@ static bool __build_gbt_txns(struct pool *pool, json_t *res_val)
json_t *array_elem = json_array_get(txn_array, i);
json_t *txid = json_object_get(array_elem, "txid");
if (!txid) txid = json_object_get(array_elem, "hash");
json_t *data = json_object_get(array_elem, "data");
pool->txn_data = realloc_strcat(pool->txn_data, json_string_value(data));
hex2bin(bin, json_string_value(txid), 32);
swab256(pool->txn_hashes + 32 * i, bin);
} else
@@ -2240,6 +2247,8 @@ static void gen_gbt_work(struct pool *pool, struct work *work)
memcpy(work->target, pool->gbt_target, 32);
work->coinbase = bin2hex(pool->coinbase, pool->coinbase_len);
if (pool->txn_data)
work->txn_data = strdup(pool->txn_data);
/* For encoding the block data on submission */
work->gbt_txns = pool->gbt_txns + 1;
@@ -3491,6 +3500,9 @@ static bool submit_upstream_work(struct work *work, CURL *curl, char *curl_err_s
s = strdup("{\"id\": 0, \"method\": \"submitblock\", \"params\": [\"");
s = (char *)realloc_strcat(s, gbt_block);
if (have_segwit && work->txn_data)
s = realloc_strcat(s, work->txn_data);
if (work->job_id) {
s = (char *)realloc_strcat(s, "\", {\"workid\": \"");
s = (char *)realloc_strcat(s, work->job_id);
@@ -4314,6 +4326,8 @@ static void _copy_work(struct work *work, const struct work *base_work, int noff
}
if (base_work->coinbase)
work->coinbase = strdup(base_work->coinbase);
if (base_work->txn_data)
work->txn_data = strdup(base_work->txn_data);
}
/* Generates a copy of an existing work struct, creating fresh heap allocations
+5 -7
View File
@@ -3107,9 +3107,9 @@ void dev_error(struct cgpu_info *dev, enum dev_reason reason)
}
/* Realloc an existing string to fit an extra string s, appending s to it. */
void *realloc_strcat(char *ptr, char *s)
void *realloc_strcat(char *ptr, const char *s)
{
size_t old = strlen(ptr), len = strlen(s);
size_t old = ptr ? strlen(ptr) : 0u, len = s ? strlen(s) : 0u;
char *ret;
if (!len)
@@ -3118,12 +3118,10 @@ void *realloc_strcat(char *ptr, char *s)
len += old + 1;
align_len(&len);
ret = (char *)malloc(len);
ret = (char *)realloc(ptr, len);
if (unlikely(!ret))
quithere(1, "Failed to malloc");
sprintf(ret, "%s%s", ptr, s);
free(ptr);
quithere(1, "Failed to realloc");
strcpy(ret + old, s);
return ret;
}
+1 -1
View File
@@ -144,7 +144,7 @@ bool initiate_stratum(struct pool *pool);
bool restart_stratum(struct pool *pool);
void suspend_stratum(struct pool *pool);
void dev_error(struct cgpu_info *dev, enum dev_reason reason);
void *realloc_strcat(char *ptr, char *s);
void *realloc_strcat(char *ptr, const char *s);
void RenameThread(const char* name);
void address_to_pubkeyhash(unsigned char *pkh, const char *addr);
void _cgsem_init(cgsem_t *cgsem, const char *file, const char *func, const int line);