From 6c984b615c25b880a703229bff05fcdfc9ddfd7e Mon Sep 17 00:00:00 2001 From: jl777 Date: Mon, 21 Mar 2016 02:29:21 -0300 Subject: [PATCH] test --- iguana/iguana_bundles.c | 16 ++++++++++------ iguana/main.c | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/iguana/iguana_bundles.c b/iguana/iguana_bundles.c index 38fdd1e27..a1bfc9fec 100755 --- a/iguana/iguana_bundles.c +++ b/iguana/iguana_bundles.c @@ -389,7 +389,9 @@ int32_t iguana_bundleissue(struct iguana_info *coin,struct iguana_bundle *bp,int lag = i; else if ( lag > 10*i ) lag = 10*i;*/ - lag = 10; + if ( strcmp("BTC",coin->symbol) == 0 ) + lag = 10; + else lag = 3; if ( (numpeers= coin->peers.numranked) > 8 )//&& bp->currentflag < bp->n ) { if ( bp->currentflag == 0 ) @@ -516,10 +518,12 @@ int32_t iguana_bundleissue(struct iguana_info *coin,struct iguana_bundle *bp,int counter++; if ( priority != 0 ) { - //if ( (addr= coin->peers.ranked[rand() % numpeers]) != 0 ) - // iguana_sendblockreqPT(coin,addr,bp,i,block->RO.hash2,0); - iguana_blockQ("kick",coin,bp,i,block->RO.hash2,bp == coin->current && now > block->issued+lag*10); - //printf("[%d:%d] ",bp->hdrsi,i); + iguana_blockQ("kick",coin,bp,i,block->RO.hash2,bp == coin->current && now > block->issued+lag); + if ( bp == coin->current && now > block->issued+lag*3 && (addr= coin->peers.ranked[rand() % numpeers]) != 0 ) + { + printf("[%d:%d] ",bp->hdrsi,i); + iguana_sendblockreqPT(coin,addr,bp,i,block->RO.hash2,0); + } } else iguana_blockQ("kick",coin,bp,i,block->RO.hash2,0); flag++; } //else printf("%d ",now - block->issued); @@ -626,7 +630,7 @@ int32_t iguana_bundletweak(struct iguana_info *coin,struct iguana_bundle *bp) int64_t iguana_bundlecalcs(struct iguana_info *coin,struct iguana_bundle *bp) { - FILE *fp; int32_t bundlei,checki,hdrsi,numhashes,numsaved,numcached,numrecv,minrequests; + int32_t bundlei,checki,hdrsi,numhashes,numsaved,numcached,numrecv,minrequests; //FILE *fp; int64_t datasize; struct iguana_block *block; char fname[1024]; static bits256 zero; if ( bp->emitfinish > coin->startutc ) { diff --git a/iguana/main.c b/iguana/main.c index 21e13d08c..07f2443f0 100755 --- a/iguana/main.c +++ b/iguana/main.c @@ -1117,7 +1117,7 @@ void iguana_main(void *arg) sleep(1); char *str; //iguana_launchcoin(MYINFO.rpcsymbol,cJSON_Parse("{}")); - if ( 1 && (str= SuperNET_JSON(&MYINFO,cJSON_Parse("{\"startpend\":128,\"endpend\":128,\"userhome\":\"/Users/jimbolaptop/Library/Application Support\",\"agent\":\"iguana\",\"method\":\"addcoin\",\"services\":128,\"maxpeers\":256,\"newcoin\":\"BTCD\",\"active\":1,\"numhelpers\":64,\"poll\":1}"),0)) != 0 ) + if ( 1 && (str= SuperNET_JSON(&MYINFO,cJSON_Parse("{\"startpend\":128,\"endpend\":128,\"userhome\":\"/Users/jimbolaptop/Library/Application Support\",\"agent\":\"iguana\",\"method\":\"addcoin\",\"services\":129,\"maxpeers\":256,\"newcoin\":\"BTCD\",\"active\":1,\"numhelpers\":64,\"poll\":1}"),0)) != 0 ) { free(str); if ( 0 && (str= SuperNET_JSON(&MYINFO,cJSON_Parse("{\"userhome\":\"/Users/jimbolaptop/Library/Application Support\",\"agent\":\"iguana\",\"method\":\"addcoin\",\"services\":1024,\"maxpeers\":256,\"newcoin\":\"BTCD\",\"active\":1}"),0)) != 0 )