Browse Source

Merge branch 'master' into release/v0.1

release/v0.1
jl777 8 years ago
parent
commit
0aded32c2a
  1. 2
      iguana/iguana777.c
  2. 4
      iguana/iguana_bundles.c

2
iguana/iguana777.c

@ -1048,7 +1048,7 @@ struct iguana_info *iguana_setcoin(char *symbol,void *launched,int32_t maxpeers,
if ( (coin->polltimeout= juint(json,"poll")) <= 0 )
coin->polltimeout = IGUANA_DEFAULT_POLLTIMEOUT;
coin->active = juint(json,"active");
if ( (coin->minconfirms = minconfirms) == 0 )
if ( (coin->minconfirms= minconfirms) == 0 )
coin->minconfirms = (strcmp(symbol,"BTC") == 0) ? 3 : 10;
if ( coin->chain == 0 && (coin->chain= iguana_createchain(json)) == 0 )
{

4
iguana/iguana_bundles.c

@ -206,7 +206,9 @@ int32_t iguana_bundlehash2add(struct iguana_info *coin,struct iguana_block **blo
*blockp = 0;
if ( bp == 0 || bits256_nonz(hash2) == 0 )
{
printf("iguana_bundlehash2add null hash2\n");
static uint32_t counter;
if ( counter++ < 100 )
printf("iguana_bundlehash2add null hash2 bp.%p\n",bp);
return(-1111);
}
if ( bits256_nonz(hash2) != 0 && (block= iguana_blockhashset("bundlehash2add",coin,-1,hash2,1)) != 0 )

Loading…
Cancel
Save