Browse Source

Don't try to submit a block locally in proxy mode if we're missing transactions

master
Con Kolivas 10 years ago
parent
commit
7661f4206b
  1. 2
      src/generator.c
  2. 3
      src/stratifier.c

2
src/generator.c

@ -1519,7 +1519,7 @@ static int proxy_mode(ckpool_t *ckp, proc_instance_t *pi)
if (alive_btcd(si)) if (alive_btcd(si))
LOGNOTICE("Backup btcd %s:%s alive", si->cs.url, si->cs.port); LOGNOTICE("Backup btcd %s:%s alive", si->cs.url, si->cs.port);
else { else {
LOGWARNING("Backup btcd %s:%s failed!", si->cs.url, si->cs.port); LOGNOTICE("Backup btcd %s:%s failed!", si->cs.url, si->cs.port);
ckp->btcdbackup = NULL; ckp->btcdbackup = NULL;
free(si); free(si);
} }

3
src/stratifier.c

@ -1549,6 +1549,9 @@ test_blocksolve(stratum_instance_t *client, workbase_t *wb, const uchar *data, c
return; return;
LOGWARNING("Possible block solve diff %f !", diff); LOGWARNING("Possible block solve diff %f !", diff);
/* Can't submit a block in proxy mode without the transactions */
if (wb->proxy && wb->merkles)
return;
ts_realtime(&ts_now); ts_realtime(&ts_now);
sprintf(cdfield, "%lu,%lu", ts_now.tv_sec, ts_now.tv_nsec); sprintf(cdfield, "%lu,%lu", ts_now.tv_sec, ts_now.tv_nsec);

Loading…
Cancel
Save