From 3d27c0d172d028f7ae9f342f6e69d76ffec5dc57 Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 8 Mar 2016 18:18:48 -0300 Subject: [PATCH] test --- iguana/iguana777.h | 2 ++ iguana/iguana_bundles.c | 2 +- iguana/iguana_ramchain.c | 5 ++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/iguana/iguana777.h b/iguana/iguana777.h index f1bc9c905..76a11c5bb 100755 --- a/iguana/iguana777.h +++ b/iguana/iguana777.h @@ -32,6 +32,8 @@ typedef int32_t (*blockhashfunc)(uint8_t *blockhashp,uint8_t *serialized,int32_t #define IGUANA_WIDTH 1024 #define IGUANA_HEIGHT 200 +#define IGUANA_HEADPERCENTAGE 1.0 +#define IGUANA_TAILPERCENTAGE 1.0 #define IGUANA_MAXPENDHDRS 1 #define _IGUANA_MAXPENDING 8 //64 #define _IGUANA_MAXBUNDLES 8 diff --git a/iguana/iguana_bundles.c b/iguana/iguana_bundles.c index 758213be7..816980809 100755 --- a/iguana/iguana_bundles.c +++ b/iguana/iguana_bundles.c @@ -403,7 +403,7 @@ int64_t iguana_bundlecalcs(struct iguana_info *coin,struct iguana_bundle *bp,int } //bp->metric = bp->numhashes; bp->metric = 1000 + sqrt(sqrt(bp->n * (1 + bp->numsaved + bp->numrecv)) * (10 + coin->bundlescount - bp->hdrsi)); - if ( done > coin->bundlescount/3 && bp->hdrsi > coin->bundlescount*.8 ) + if ( done > coin->bundlescount*IGUANA_HEADPERCENTAGE && bp->hdrsi > coin->bundlescount*IGUANA_TAILPERCENTAGE ) bp->metric *= 1000; return(bp->estsize); } diff --git a/iguana/iguana_ramchain.c b/iguana/iguana_ramchain.c index 0c9b4d924..ce8a6b03b 100755 --- a/iguana/iguana_ramchain.c +++ b/iguana/iguana_ramchain.c @@ -1753,6 +1753,7 @@ int32_t iguana_ramchain_iterate(struct iguana_info *coin,struct iguana_ramchain int32_t j,metalen,hdrsi,prevout,scriptlen; uint32_t sequenceid,destspendind=0,desttxidind=0; bits256 prevhash; uint64_t value; uint8_t type,_script[IGUANA_MAXSCRIPTSIZE]; struct iguana_unspent *u; struct scriptdata *script; struct iguana_txid *tx; struct iguana_ramchaindata *rdata; uint8_t *rmd160,*scriptdata; + printf("iterate ramchain.%p rdata.%p dest.%p ht.%d/%d\n",ramchain,ramchain->H.data,dest,bp->bundleheight,bp->n); if ( (rdata= ramchain->H.data) == 0 ) { printf("iguana_ramchain_iterate cant iterate without data\n"); @@ -1760,7 +1761,7 @@ int32_t iguana_ramchain_iterate(struct iguana_info *coin,struct iguana_ramchain } if ( dest != 0 ) _iguana_ramchain_setptrs(RAMCHAIN_DESTPTRS,dest->H.data); - else printf("iterate %d/%d dest.%p ramchain.%p rdata.%p\n",bp->bundleheight,bp->n,dest,ramchain,rdata); + else fprintf(stderr,"iterate %d/%d dest.%p ramchain.%p rdata.%p\n",bp->bundleheight,bp->n,dest,ramchain,rdata); _iguana_ramchain_setptrs(RAMCHAIN_PTRS,ramchain->H.data); ramchain->H.ROflag = 1; ramchain->H.unspentind = ramchain->H.spendind = ramchain->pkind = rdata->firsti; @@ -1770,6 +1771,7 @@ int32_t iguana_ramchain_iterate(struct iguana_info *coin,struct iguana_ramchain desttxidind = dest->H.txidind; destspendind = dest->H.spendind; } + printf("txid loop\n"); for (ramchain->H.txidind=rdata->firsti; ramchain->H.txidindnumtxids; ramchain->H.txidind++) { if ( 1 && ramchain->expanded != 0 ) @@ -2506,6 +2508,7 @@ if ( bp->bundleheight != 32000 ) { if ( (block= bp->blocks[bundlei]) != 0 ) { + printf("blocksetcounters\n"); iguana_blocksetcounters(coin,block,dest); coin->blocks.RO[bp->bundleheight+bundlei] = block->RO; destB[bundlei] = block->RO;