From 05d25a2c90b3f2d6df155c7a8ad2bb42aaca8d57 Mon Sep 17 00:00:00 2001 From: jl777 Date: Mon, 27 Jun 2016 09:22:21 -0300 Subject: [PATCH] test --- basilisk/basilisk.c | 14 +++++++------- gecko/gecko_miner.c | 6 +++--- iguana/iguana_realtime.c | 8 ++++---- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/basilisk/basilisk.c b/basilisk/basilisk.c index 215a78a35..9b6f9ed99 100755 --- a/basilisk/basilisk.c +++ b/basilisk/basilisk.c @@ -86,7 +86,7 @@ uint8_t *basilisk_jsondata(int32_t extraoffset,uint8_t **ptrp,uint8_t *space,int if ( (hexstr= jstr(sendjson,"data")) != 0 ) { hexdata = get_dataptr(0,&allocptr,&hexlen,hexspace,sizeof(hexspace),hexstr); - printf("jsondata.%s from sendjson\n",hexstr); + //printf("jsondata.%s from sendjson\n",hexstr); jdelete(sendjson,"data"); } *ptrp = 0; @@ -105,9 +105,9 @@ uint8_t *basilisk_jsondata(int32_t extraoffset,uint8_t **ptrp,uint8_t *space,int free(sendstr); if ( hexlen > 0 ) { - int32_t i; for (i=0; ireceived.%d basilisk_p2p.(%s) from %s tag.%d\n",datalen,type,senderip!=0?senderip:"?",basilisktag); + //int32_t i; for (i=0; ireceived.%d basilisk_p2p.(%s) from %s tag.%d\n",datalen,type,senderip!=0?senderip:"?",basilisktag); basilisk_msgprocess(myinfo,_addr,ipbits,type,basilisktag,&data[len],datalen - len); } if ( ptr != 0 ) diff --git a/gecko/gecko_miner.c b/gecko/gecko_miner.c index c8e007169..0f3bf4bfd 100755 --- a/gecko/gecko_miner.c +++ b/gecko/gecko_miner.c @@ -81,13 +81,13 @@ uint32_t gecko_nBits(struct iguana_info *virt,uint32_t *prevtimestampp,struct ig targetval = bits256_from_compact(nBits); if ( diff > est ) { - targetval = bits256_ave(targetval,bits256_ave(targetval,bits256_lshift(targetval))); + targetval = bits256_ave(targetval,bits256_ave(targetval,bits256_rshift(targetval))); } else if ( diff < est ) { - targetval = bits256_ave(targetval,bits256_ave(targetval,bits256_rshift(targetval))); + targetval = bits256_ave(targetval,bits256_ave(targetval,bits256_lshift(targetval))); } - //printf("diff.%d est.%d nBits.%08x <- %08x\n",endtime - starttime,virt->chain->estblocktime * i,bits256_to_compact(targetval),nBits); + printf("diff.%d est.%d nBits.%08x <- %08x\n",diff,virt->chain->estblocktime * i,bits256_to_compact(targetval),nBits); nBits = bits256_to_compact(targetval); } if ( nBits > GECKO_EASIESTDIFF ) diff --git a/iguana/iguana_realtime.c b/iguana/iguana_realtime.c index b46aa189e..319e5a094 100755 --- a/iguana/iguana_realtime.c +++ b/iguana/iguana_realtime.c @@ -221,7 +221,7 @@ int32_t iguana_realtime_update(struct supernet_info *myinfo,struct iguana_info * } if ( coin->spendvectorsaved <= 1 ) { -printf("spendvectorsaved not yet\n"); +//printf("spendvectorsaved not yet\n"); usleep(100000); return(0); } @@ -283,7 +283,7 @@ printf("spendvectorsaved not yet\n"); bp->lastRT = (uint32_t)time(NULL); iguana_RTramchainalloc("RTbundle",coin,bp); bp->isRT = 1; - printf("RTheight.%d hwm.%d\n",coin->RTheight,coin->blocks.hwmchain.height); + //printf("RTheight.%d hwm.%d\n",coin->RTheight,coin->blocks.hwmchain.height); while ( (rdata= coin->RTramchain.H.data) != 0 && coin->RTheight <= coin->blocks.hwmchain.height-offset && coin->RTdatabad == 0 ) { dest = &coin->RTramchain; @@ -291,7 +291,7 @@ printf("spendvectorsaved not yet\n"); bundlei = (coin->RTheight % coin->chain->bundlesize); if ( (block= iguana_bundleblock(coin,&hash2,bp,bundlei)) != 0 ) iguana_bundlehashadd(coin,bp,bundlei,block); - printf("RT.%d vs hwm.%d starti.%d bp->n %d block.%p/%p ramchain.%p databad.%d prevnonz.%d\n",coin->RTheight,coin->blocks.hwmchain.height,coin->RTstarti,bp->n,block,bp->blocks[bundlei],dest->H.data,coin->RTdatabad,bits256_nonz(block->RO.prev_block)); + //printf("RT.%d vs hwm.%d starti.%d bp->n %d block.%p/%p ramchain.%p databad.%d prevnonz.%d\n",coin->RTheight,coin->blocks.hwmchain.height,coin->RTstarti,bp->n,block,bp->blocks[bundlei],dest->H.data,coin->RTdatabad,bits256_nonz(block->RO.prev_block)); if ( coin->RTdatabad == 0 && block != 0 && (block->height == 0 || bits256_nonz(block->RO.prev_block) != 0) ) { //printf("bundlei.%d blockht.%d RTheight.%d\n",bundlei,block->height,coin->RTheight); @@ -331,7 +331,7 @@ printf("spendvectorsaved not yet\n"); flag++; //coin->blocks.RO[bp->bundleheight+bundlei] = block->RO; coin->RTheight++; - printf(">>>> RT.%d hwm.%d L.%d T.%d U.%d S.%d P.%d X.%d -> size.%ld\n",coin->RTheight,coin->blocks.hwmchain.height,coin->longestchain,dest->H.txidind,dest->H.unspentind,dest->H.spendind,dest->pkind,dest->externalind,(long)dest->H.data->allocsize); + //printf(">>>> RT.%d hwm.%d L.%d T.%d U.%d S.%d P.%d X.%d -> size.%ld\n",coin->RTheight,coin->blocks.hwmchain.height,coin->longestchain,dest->H.txidind,dest->H.unspentind,dest->H.spendind,dest->pkind,dest->externalind,(long)dest->H.data->allocsize); if ( coin->RTramchain.H.data != 0 ) coin->RTramchain.H.data->numblocks = bundlei + 1; else break;