Browse Source

test

release/v0.1
jl777 9 years ago
parent
commit
949cfb499a
  1. 2
      iguana/iguana_bundles.c
  2. 13
      iguana/iguana_ramchain.c

2
iguana/iguana_bundles.c

@ -930,7 +930,7 @@ int32_t iguana_bundleiters(struct iguana_info *coin,struct OS_memspace *mem,stru
lag = time(NULL)-coin->stucktime; lag = time(NULL)-coin->stucktime;
if ( lag == coin->MAXSTUCKTIME/2 || lag == 3*coin->MAXSTUCKTIME/4 ) if ( lag == coin->MAXSTUCKTIME/2 || lag == 3*coin->MAXSTUCKTIME/4 )
{ {
if ( lag > coin->MAXSTUCKTIME/2 ) //if ( lag > coin->MAXSTUCKTIME/2 )
{ {
struct iguana_blockreq *breq; struct iguana_blockreq *breq;
while ( (breq= queue_dequeue(&coin->blocksQ,0)) != 0 ) while ( (breq= queue_dequeue(&coin->blocksQ,0)) != 0 )

13
iguana/iguana_ramchain.c

@ -2410,6 +2410,11 @@ int32_t iguana_bundlesaveHT(struct iguana_info *coin,struct OS_memspace *mem,str
sigspace = pubkeyspace = 0; sigspace = pubkeyspace = 0;
for (bundlei=starti,numtxids=numunspents=scriptspace=numspends=0; bundlei<=endi; bundlei++) for (bundlei=starti,numtxids=numunspents=scriptspace=numspends=0; bundlei<=endi; bundlei++)
{ {
if ( coin->active == 0 )
{
iguana_bundlemapfree(coin,mem,&HASHMEM,ipbits,ptrs,filesizes,num,R,starti,endi);
return(-1);
}
if ( (block= bp->blocks[bundlei]) == 0 || bits256_nonz(block->RO.hash2) == 0 || block != iguana_blockfind(coin,block->RO.hash2) || memcmp(block->RO.hash2.bytes,bp->hashes[bundlei].bytes,sizeof(bits256)) != 0 ) if ( (block= bp->blocks[bundlei]) == 0 || bits256_nonz(block->RO.hash2) == 0 || block != iguana_blockfind(coin,block->RO.hash2) || memcmp(block->RO.hash2.bytes,bp->hashes[bundlei].bytes,sizeof(bits256)) != 0 )
{ {
printf("block.%p error vs %p\n",block,iguana_blockfind(coin,block->RO.hash2)); printf("block.%p error vs %p\n",block,iguana_blockfind(coin,block->RO.hash2));
@ -2466,6 +2471,11 @@ int32_t iguana_bundlesaveHT(struct iguana_info *coin,struct OS_memspace *mem,str
iguana_ramchain_extras(coin,dest,&HASHMEM,0); iguana_ramchain_extras(coin,dest,&HASHMEM,0);
for (i=starti; i<=endi; i++) for (i=starti; i<=endi; i++)
{ {
if ( coin->active == 0 )
{
iguana_bundlemapfree(coin,mem,&HASHMEM,ipbits,ptrs,filesizes,num,R,starti,endi);
return(-1);
}
if ( (block= bp->blocks[i]) != 0 && block == iguana_blockfind(coin,bp->hashes[i]) ) if ( (block= bp->blocks[i]) != 0 && block == iguana_blockfind(coin,bp->hashes[i]) )
{ {
if ( bits256_nonz(block->RO.prev_block) == 0 && i > 0 ) if ( bits256_nonz(block->RO.prev_block) == 0 && i > 0 )
@ -2505,7 +2515,8 @@ int32_t iguana_bundlesaveHT(struct iguana_info *coin,struct OS_memspace *mem,str
bp->issued[bundlei] = 0; bp->issued[bundlei] = 0;
block->issued = 0; block->issued = 0;
} }
printf("error ramchain_iterate hdrs.%d bundlei.%d\n",bp->hdrsi,bundlei); if ( coin->active != 0 )
printf("error ramchain_iterate hdrs.%d bundlei.%d\n",bp->hdrsi,bundlei);
break; break;
} }
} }

Loading…
Cancel
Save