From 96241149c42152749e930ede92d2dc9d8375f3d7 Mon Sep 17 00:00:00 2001 From: jl777 Date: Thu, 7 Apr 2016 18:27:04 -0500 Subject: [PATCH] test --- iguana/iguana_bundles.c | 6 +++--- iguana/iguana_ramchain.c | 9 +++++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/iguana/iguana_bundles.c b/iguana/iguana_bundles.c index 605315d3f..7403d81d9 100755 --- a/iguana/iguana_bundles.c +++ b/iguana/iguana_bundles.c @@ -340,7 +340,7 @@ struct iguana_bundle *iguana_bundlecreate(struct iguana_info *coin,int32_t *bund *bundleip = 0; bits256_str(str,bundlehash2); sprintf(dirname,"%s/%s/%d",GLOBALTMPDIR,coin->symbol,bp->bundleheight), OS_ensure_directory(dirname); - sprintf(dirname,"DB/%s/%d",coin->symbol,bp->bundleheight), OS_ensure_directory(dirname); + //sprintf(dirname,"DB/%s/%d",coin->symbol,bp->bundleheight), OS_ensure_directory(dirname); //printf("ht.%d alloc.[%d] new hdrs.%s %s\n",bp->bundleheight,coin->bundlescount,str,bits256_str(str2,allhash)); iguana_bundlehash2add(coin,0,bp,0,bundlehash2); if ( issueflag != 0 ) @@ -513,8 +513,8 @@ int32_t iguana_bundleissuemissing(struct iguana_info *coin,struct iguana_bundle printf("priority.%d [%d] durations %.2f counts[%d %d] \n",priority,bp->hdrsi,aveduration,(int32_t)bp->durationscount,bp->duplicatescount); } else aveduration = IGUANA_DEFAULTLAG; lag = aveduration * mult; - if ( lag < 20 ) - lag = 20; + if ( bp != coin->current && lag < 30 ) + lag = 30; if ( (num= coin->peers.numranked) != 0 ) { max = num;//log2(num * num) + 1; diff --git a/iguana/iguana_ramchain.c b/iguana/iguana_ramchain.c index 683453e3d..6da081db5 100755 --- a/iguana/iguana_ramchain.c +++ b/iguana/iguana_ramchain.c @@ -1716,11 +1716,16 @@ bits256 iguana_merkle(struct iguana_info *coin,bits256 *tree,struct iguana_msgtx long iguana_ramchain_data(struct iguana_info *coin,struct iguana_peer *addr,struct iguana_txblock *origtxdata,struct iguana_msgtx *txarray,int32_t txn_count,uint8_t *data,int32_t recvlen) { int32_t verifyflag = 0; static uint64_t totalrecv; - RAMCHAIN_DECLARE; struct iguana_ramchain R,*mapchain,*ramchain = &addr->ramchain; + RAMCHAIN_DECLARE; uint32_t addr_ipbits; struct iguana_ramchain R,*mapchain,*ramchain = &addr->ramchain; struct iguana_msgtx *tx; char fname[1024]; uint8_t rmd160[20]; long fsize; void *ptr; int32_t i,j,fpos,pubkeysize,msize,sigsize,firsti=1,err,flag,bundlei = -2; bits256 merkle_root; struct iguana_bundle *bp = 0; struct iguana_block *block; uint32_t scriptspace,stackspace; totalrecv += recvlen; + if ( (addr_ipbits= (uint32_t)addr->ipbits) == 0 ) + { + printf("killed addr? calling ramchain data\n"); + return(-1); + } if ( bits256_nonz(origtxdata->block.RO.merkle_root) == 0 ) { memset(&origtxdata->block.RO.prev_block,0,sizeof(bits256)); @@ -1843,7 +1848,7 @@ long iguana_ramchain_data(struct iguana_info *coin,struct iguana_peer *addr,stru B[0] = block->RO; ramchain->H.data->scriptspace = ramchain->H.scriptoffset = scriptspace; ramchain->H.data->stackspace = ramchain->H.stacksize = stackspace; - if ( (fpos= (int32_t)iguana_ramchain_save(coin,RAMCHAIN_ARG,(uint32_t)addr->ipbits,block->RO.hash2,block->RO.prev_block,bundlei,0)) >= 0 ) + if ( (fpos= (int32_t)iguana_ramchain_save(coin,RAMCHAIN_ARG,addr_ipbits,block->RO.hash2,block->RO.prev_block,bundlei,0)) >= 0 ) { //char str[65]; printf("saved.%s [%d:%d]\n",bits256_str(str,block->RO.hash2),bp->hdrsi,bundlei); origtxdata->datalen = (int32_t)ramchain->H.data->allocsize;