diff --git a/iguana/iguana777.h b/iguana/iguana777.h index 237229576..e286b5465 100755 --- a/iguana/iguana777.h +++ b/iguana/iguana777.h @@ -39,7 +39,7 @@ typedef int32_t (*blockhashfunc)(uint8_t *blockhashp,uint8_t *serialized,int32_t #define IGUANA_MAXPENDHDRS 1 #define _IGUANA_MAXPENDING 7 #define IGUANA_MINPENDBUNDLES 32 -#define IGUANA_MAXPENDBUNDLES 32 +#define IGUANA_MAXPENDBUNDLES 128 #define IGUANA_BUNDLELOOP 10000 #define IGUANA_RPCPORT 7778 #define IGUANA_MAXRAMCHAINSIZE ((uint64_t)1024L * 1024L * 1024L * 16) diff --git a/iguana/iguana_bundles.c b/iguana/iguana_bundles.c index f2f5f589f..20c61c39f 100755 --- a/iguana/iguana_bundles.c +++ b/iguana/iguana_bundles.c @@ -525,7 +525,7 @@ void iguana_bundlestats(struct iguana_info *coin,char *str) coin->numsaved = numsaved; coin->spaceused = spaceused; char str4[65]; - sprintf(str,"v.%d/%d (%d 1st.%d) to %d N[%d] Q.%d h.%d r.%d c.%s s.%d d.%d E.%d:%d M.%d L.%d est.%d %s %d:%02d:%02d %03.3f peers.%d/%d Q.(%d %d)",numv,firstgap!=0?firstgap->numsaved:0,coin->pendbalances,firstgap!=0?firstgap->hdrsi:0,coin->lastpending!=0?coin->lastpending->hdrsi:0,count,coin->numbundlesQ,numhashes,coin->blocksrecv,mbstr(str4,spaceused),numsaved,done,numemit,coin->numreqsent,coin->blocks.hwmchain.height,coin->longestchain,coin->MAXBUNDLES,mbstr(str2,estsize),(int32_t)difft.x/3600,(int32_t)(difft.x/60)%60,(int32_t)difft.x%60,difft.millis,p,coin->MAXPEERS,queue_size(&coin->priorityQ),queue_size(&coin->blocksQ)); + sprintf(str,"v.%d/%d (%d 1st.%d) to %d N[%d] Q.%d h.%d r.%d c.%s s.%d d.%d E.%d:%d M.%d L.%d est.%d %s %d:%02d:%02d %03.3f peers.%d/%d Q.(%d %d)",numv,coin->pendbalances,firstgap!=0?firstgap->numsaved:0,firstgap!=0?firstgap->hdrsi:0,coin->lastpending!=0?coin->lastpending->hdrsi:0,count,coin->numbundlesQ,numhashes,coin->blocksrecv,mbstr(str4,spaceused),numsaved,done,numemit,coin->numreqsent,coin->blocks.hwmchain.height,coin->longestchain,coin->MAXBUNDLES,mbstr(str2,estsize),(int32_t)difft.x/3600,(int32_t)(difft.x/60)%60,(int32_t)difft.x%60,difft.millis,p,coin->MAXPEERS,queue_size(&coin->priorityQ),queue_size(&coin->blocksQ)); //sprintf(str+strlen(str),"%s.%-2d %s time %.2f files.%d Q.%d %d\n",coin->symbol,flag,str,(double)(time(NULL)-coin->starttime)/60.,coin->peers.numfiles,queue_size(&coin->priorityQ),queue_size(&coin->blocksQ)); if ( time(NULL) > lastdisp+10 ) { diff --git a/iguana/iguana_recv.c b/iguana/iguana_recv.c index 58be02a3b..a785bdc8f 100755 --- a/iguana/iguana_recv.c +++ b/iguana/iguana_recv.c @@ -419,6 +419,10 @@ int32_t iguana_bundlekick(struct iguana_info *coin,struct iguana_bundle *bp,int3 if ( bp == 0 ) return(0); now = (uint32_t)time(NULL); + if ( bp == coin->current ) + { + + } for (i=n=counter=issued=0; in; i++) { if ( (block= bp->blocks[i]) != 0 ) @@ -616,7 +620,7 @@ int32_t iguana_bundleiters(struct iguana_info *coin,struct iguana_bundle *bp,int bp->emitfinish = 1; if ( (lastbp= coin->lastpending) != 0 && lastbp->hdrsi < coin->bundlescount-1 ) coin->lastpending = coin->bundles[lastbp->hdrsi + 1]; - if ( (rand() % 3) == 0 ) + if ( (rand() % 2) == 0 ) { if ( coin->MAXBUNDLES > IGUANA_MINPENDBUNDLES ) coin->MAXBUNDLES--;