markow
/
ckpool
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Style and safecmp changes to segwit commits.

master
Con Kolivas 8 years ago
parent
50c1e00509
commit
2aedae4379
2 changed files with 38 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      src/bitcoin.c
  2. 55
      src/stratifier.c

16
src/bitcoin.c
Unescape View File

@ -16,13 +16,14 @@
#include "bitcoin.h" #include "bitcoin.h"
static const char *b58chars = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz"; static const char *b58chars = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz";
static char* understood_rules[] = {"segwit"}; static char* understood_rules[] = {"segwit"};
static bool check_required_rule(const char* rule) static bool check_required_rule(const char* rule)
{ {
unsigned int i; unsigned int i;
for(i = 0; i < sizeof(understood_rules) / sizeof(understood_rules[0]); i++) {
if(strcmp(understood_rules[i], rule) == 0) for (i = 0; i < sizeof(understood_rules) / sizeof(understood_rules[0]); i++) {
if (safecmp(understood_rules[i], rule) == 0)
return true; return true;
} }
return false; return false;
@ -99,13 +100,13 @@ bool gen_gbtbase(connsock_t *cs, gbtbase_t *gbt)
{ {
json_t *txn_array, *rules_array, *coinbase_aux, *res_val, *val; json_t *txn_array, *rules_array, *coinbase_aux, *res_val, *val;
const char *previousblockhash; const char *previousblockhash;
const char *witnessdata_check;
char hash_swap[32], tmp[32]; char hash_swap[32], tmp[32];
uint64_t coinbasevalue; uint64_t coinbasevalue;
const char *target; const char *target;
const char *flags; const char *flags;
const char *bits; const char *bits;
const char *rule; const char *rule;
const char *witnessdata_check;
int version; int version;
int curtime; int curtime;
int height; int height;
@ -124,11 +125,12 @@ bool gen_gbtbase(connsock_t *cs, gbtbase_t *gbt)
} }
rules_array = json_object_get(res_val, "rules"); rules_array = json_object_get(res_val, "rules");
if(rules_array) { if (rules_array) {
int rule_count = json_array_size(rules_array); int rule_count = json_array_size(rules_array);
for(i = 0; i < rule_count; i++) {
for (i = 0; i < rule_count; i++) {
rule = json_string_value(json_array_get(rules_array, i)); rule = json_string_value(json_array_get(rules_array, i));
if(rule && *rule++ == '!' && !check_required_rule(rule)) { if (rule && *rule++ == '!' && !check_required_rule(rule)) {
LOGERR("Required rule not understood: %s", rule); LOGERR("Required rule not understood: %s", rule);
goto out; goto out;
} }

55
src/stratifier.c
Unescape View File

@ -111,7 +111,7 @@ struct workbase {
int txns; int txns;
char *txn_data; char *txn_data;
char *txn_hashes; char *txn_hashes;
char witnessdata[73]; //null-terminated ascii char witnessdata[80]; //null-terminated ascii
bool insert_witness; bool insert_witness;
int merkles; int merkles;
char merklehash[16][68]; char merklehash[16][68];
@ -574,6 +574,8 @@ static void info_msg_entries(char_entry_t **entries)
} }
} }
static const int witnessdata_size = 36; // commitment header + hash
static void generate_coinbase(const ckpool_t *ckp, workbase_t *wb) static void generate_coinbase(const ckpool_t *ckp, workbase_t *wb)
{ {
uint64_t *u64, g64, d64 = 0; uint64_t *u64, g64, d64 = 0;
@ -663,12 +665,10 @@ static void generate_coinbase(const ckpool_t *ckp, workbase_t *wb)
memcpy(wb->coinb2bin + wb->coinb2len, sdata->pubkeytxnbin, sdata->pubkeytxnlen); memcpy(wb->coinb2bin + wb->coinb2len, sdata->pubkeytxnbin, sdata->pubkeytxnlen);
wb->coinb2len += sdata->pubkeytxnlen; wb->coinb2len += sdata->pubkeytxnlen;
if(wb->insert_witness) { if (wb->insert_witness) {
// 0 value // 0 value
wb->coinb2len += 8; wb->coinb2len += 8;
static const int witnessdata_size = 36; // commitment header + hash
wb->coinb2bin[wb->coinb2len++] = witnessdata_size + 2; // total scriptPubKey size wb->coinb2bin[wb->coinb2len++] = witnessdata_size + 2; // total scriptPubKey size
wb->coinb2bin[wb->coinb2len++] = 0x6a; // OP_RETURN wb->coinb2bin[wb->coinb2len++] = 0x6a; // OP_RETURN
wb->coinb2bin[wb->coinb2len++] = witnessdata_size; wb->coinb2bin[wb->coinb2len++] = witnessdata_size;
@ -1239,19 +1239,18 @@ static void wb_merkle_bins(ckpool_t *ckp, sdata_t *sdata, workbase_t *wb, json_t
memset(wb->txn_hashes, 0x20, wb->txns * 65); // Spaces memset(wb->txn_hashes, 0x20, wb->txns * 65); // Spaces
for (i = 0; i < wb->txns; i++) { for (i = 0; i < wb->txns; i++) {
const char *txid, *hash;
char binswap[32]; char binswap[32];
const char *txid;
const char *hash;
arr_val = json_array_get(txn_array, i); arr_val = json_array_get(txn_array, i);
// Post-segwit, txid returns the tx hash without witness data // Post-segwit, txid returns the tx hash without witness data
txid = json_string_value(json_object_get(arr_val, "txid")); txid = json_string_value(json_object_get(arr_val, "txid"));
hash = json_string_value(json_object_get(arr_val, "hash")); hash = json_string_value(json_object_get(arr_val, "hash"));
if(!txid) if (!txid)
txid = hash; txid = hash;
if (!txid) { if (unlikely(!txid)) {
LOGERR("missing txid for transaction"); LOGERR("Missing txid for transaction in wb_merkle_bins");
return; return;
} }
txn = json_string_value(json_object_get(arr_val, "data")); txn = json_string_value(json_object_get(arr_val, "data"));
@ -1327,24 +1326,26 @@ static void wb_merkle_bins(ckpool_t *ckp, sdata_t *sdata, workbase_t *wb, json_t
} }
static const unsigned char witness_nonce[32] = {0}; static const unsigned char witness_nonce[32] = {0};
static const int witness_nonce_size = sizeof(witness_nonce);
static const unsigned char witness_header[] = {0xaa, 0x21, 0xa9, 0xed}; static const unsigned char witness_header[] = {0xaa, 0x21, 0xa9, 0xed};
static void gbt_witness_data(workbase_t *wb, json_t *txn_array) static void gbt_witness_data(workbase_t *wb, json_t *txn_array)
{ {
int i, binlen, txncount; int i, binlen, txncount = json_array_size(txn_array);
const char* hash;
json_t *arr_val; json_t *arr_val;
uchar *hashbin; uchar *hashbin;
const char* hash;
txncount = json_array_size(txn_array);
binlen = txncount * 32 + 32; binlen = txncount * 32 + 32;
hashbin = alloca(binlen + 32); hashbin = alloca(binlen + 32);
memset(hashbin, 0, 32); memset(hashbin, 0, 32);
for (i = 0; i < txncount; i++) { for (i = 0; i < txncount; i++) {
char binswap[32]; char binswap[32];
arr_val = json_array_get(txn_array, i); arr_val = json_array_get(txn_array, i);
hash = json_string_value(json_object_get(arr_val, "hash")); hash = json_string_value(json_object_get(arr_val, "hash"));
if(!hash) { if (unlikely(!hash)) {
LOGERR("Hash missing for transaction"); LOGERR("Hash missing for transaction");
return; return;
} }
@ -1357,7 +1358,7 @@ static void gbt_witness_data(workbase_t *wb, json_t *txn_array)
// Build merkle root (copied from libblkmaker) // Build merkle root (copied from libblkmaker)
for (txncount++ ; txncount > 1 ; txncount /= 2) { for (txncount++ ; txncount > 1 ; txncount /= 2) {
if (txncount % 2 == 1) { if (txncount % 2) {
// Odd number, duplicate the last // Odd number, duplicate the last
memcpy(hashbin + 32 * txncount, hashbin + 32 * (txncount - 1), 32); memcpy(hashbin + 32 * txncount, hashbin + 32 * (txncount - 1), 32);
txncount++; txncount++;
@ -1368,10 +1369,10 @@ static void gbt_witness_data(workbase_t *wb, json_t *txn_array)
} }
} }
memcpy(hashbin + 32, &witness_nonce, sizeof(witness_nonce)); memcpy(hashbin + 32, &witness_nonce, witness_nonce_size);
gen_hash(hashbin, hashbin + sizeof(witness_header), 32 + sizeof(witness_nonce)); gen_hash(hashbin, hashbin + witness_nonce_size, 32 + witness_nonce_size);
memcpy(hashbin, witness_header, sizeof(witness_header)); memcpy(hashbin, witness_header, witness_nonce_size);
__bin2hex(wb->witnessdata, hashbin, 32 + sizeof(witness_header)); __bin2hex(wb->witnessdata, hashbin, 32 + witness_nonce_size);
wb->insert_witness = true; wb->insert_witness = true;
} }
@ -1381,16 +1382,16 @@ static void gbt_witness_data(workbase_t *wb, json_t *txn_array)
static void *do_update(void *arg) static void *do_update(void *arg)
{ {
struct update_req *ur = (struct update_req *)arg; struct update_req *ur = (struct update_req *)arg;
json_t *val, *txn_array, *rules_array;
const char* witnessdata_check, *rule;
int i, prio = ur->prio, retries = 0; int i, prio = ur->prio, retries = 0;
ckpool_t *ckp = ur->ckp; ckpool_t *ckp = ur->ckp;
sdata_t *sdata = ckp->sdata; sdata_t *sdata = ckp->sdata;
json_t *val, *txn_array, *rules_array;
bool new_block = false; bool new_block = false;
bool ret = false; bool ret = false;
workbase_t *wb; workbase_t *wb;
time_t now_t; time_t now_t;
char *buf; char *buf;
const char* witnessdata_check, *rule;
pthread_detach(pthread_self()); pthread_detach(pthread_self());
rename_proc("updater"); rename_proc("updater");
@ -1444,19 +1445,21 @@ retry:
wb->insert_witness = false; wb->insert_witness = false;
memset(wb->witnessdata, 0, sizeof(wb->witnessdata)); memset(wb->witnessdata, 0, sizeof(wb->witnessdata));
rules_array = json_object_get(val, "rules"); rules_array = json_object_get(val, "rules");
if(rules_array) {
if (rules_array) {
int rule_count = json_array_size(rules_array); int rule_count = json_array_size(rules_array);
for(i = 0; i < rule_count; i++) {
for (i = 0; i < rule_count; i++) {
rule = json_string_value(json_array_get(rules_array, i)); rule = json_string_value(json_array_get(rules_array, i));
if(!rule) if (!rule)
continue; continue;
if(*rule == '!') if (*rule == '!')
rule++; rule++;
if(strcmp(rule, "segwit")) { if (safecmp(rule, "segwit")) {
witnessdata_check = json_string_value(json_object_get(val, "default_witness_commitment")); witnessdata_check = json_string_value(json_object_get(val, "default_witness_commitment"));
gbt_witness_data(wb, txn_array); gbt_witness_data(wb, txn_array);
// Verify against the pre-calculated value if it exists. Skip the size/OP_RETURN bytes. // Verify against the pre-calculated value if it exists. Skip the size/OP_RETURN bytes.
if (wb->insert_witness && witnessdata_check[0] && strcmp(witnessdata_check + 4, wb->witnessdata) != 0) if (wb->insert_witness && witnessdata_check[0] && safecmp(witnessdata_check + 4, wb->witnessdata) != 0)
LOGERR("Witness from btcd: %s. Calculated Witness: %s", witnessdata_check + 4, wb->witnessdata); LOGERR("Witness from btcd: %s. Calculated Witness: %s", witnessdata_check + 4, wb->witnessdata);
break; break;
} }

Write Preview
Loading…
Cancel
Save