diff --git a/iguana/btcd b/iguana/btcd index 1b6f249bb..efd66b4c2 100755 --- a/iguana/btcd +++ b/iguana/btcd @@ -1,9 +1,2 @@ mkdir /tmp/BTCD -curl --url "http://127.0.0.1:7778" --data "{\"prefetchlag\":-1,\"poll\":100,\"VALIDATE\":1,\"active\":1,\"agent\":\"iguana\",\"method\":\"addcoin\",\"newcoin\":\"BTCD\",\"startpend\":614,\"endpend\":614,\"services\":129,\"maxpeers\":64}" -curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"iguana\",\"method\":\"pausecoin\",\"coin\":\"BTC\"}" -curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"iguana\",\"method\":\"addnode\",\"coin\":\"BTCD\",\"ipaddr\":\"89.248.160.241\"}" -curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"iguana\",\"method\":\"addnode\",\"coin\":\"BTCD\",\"ipaddr\":\"89.248.160.244\"}" -curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"iguana\",\"method\":\"addnode\",\"coin\":\"BTCD\",\"ipaddr\":\"89.248.160.239\"}" -curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"iguana\",\"method\":\"addnode\",\"coin\":\"BTCD\",\"ipaddr\":\"96.41.29.70\"}" -curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"iguana\",\"method\":\"addnode\",\"coin\":\"BTCD\",\"ipaddr\":\"68.46.103.181\"}" - +curl --url "http://127.0.0.1:7778" --data "{\"prefetchlag\":-1,\"poll\":100,\"VALIDATE\":1,\"active\":1,\"agent\":\"iguana\",\"method\":\"addcoin\",\"newcoin\":\"BTCD\",\"startpend\":64,\"endpend\":32,\"services\":0,\"maxpeers\":64}" diff --git a/iguana/iguana777.c b/iguana/iguana777.c index 0f60cf51b..4a3fde516 100755 --- a/iguana/iguana777.c +++ b/iguana/iguana777.c @@ -416,8 +416,8 @@ int32_t iguana_utxogen(struct iguana_info *coin,int32_t helperid,int32_t convert { for (hdrsi=0; hdrsibundles[hdrsi],0); - //iguana_validateQ(coin,coin->bundles[hdrsi]); + //iguana_bundlevalidate(coin,coin->bundles[hdrsi],0); + iguana_validateQ(coin,coin->bundles[hdrsi]); } if ( coin->origbalanceswritten <= 1 ) hdrsi = 0; diff --git a/iguana/iguana777.h b/iguana/iguana777.h index 9c7b227b1..5dd6c38c5 100755 --- a/iguana/iguana777.h +++ b/iguana/iguana777.h @@ -46,7 +46,7 @@ typedef int32_t (*blockhashfunc)(uint8_t *blockhashp,uint8_t *serialized,int32_t #define IGUANA_HEADPERCENTAGE 0. #define IGUANA_TAILPERCENTAGE 1.0 #define IGUANA_MAXPENDHDRS 1 -#define IGUANA_MAXPENDINGREQUESTS 3 +#define IGUANA_MAXPENDINGREQUESTS 8 #define IGUANA_PENDINGREQUESTS 64 #define IGUANA_MINPENDBUNDLES 4 #define IGUANA_MAXPENDBUNDLES 16 diff --git a/iguana/iguana_ramchain.c b/iguana/iguana_ramchain.c index ea14ae8eb..0103ab42e 100755 --- a/iguana/iguana_ramchain.c +++ b/iguana/iguana_ramchain.c @@ -104,7 +104,7 @@ int32_t iguana_peerfname(struct iguana_info *coin,int32_t *hdrsip,char *dirname, bp = 0, bundlei = -2; if ( bits256_nonz(prevhash2) == 0 || (bp= iguana_bundlefind(coin,&bp,&bundlei,prevhash2)) == 0 || bundlei >= coin->chain->bundlesize-1 ) { - if ( dispflag != 0 ) + if ( 0 && dispflag != 0 ) printf("iguana_peerfname error finding.(%s) spec.%p bp.%p\n",bits256_str(str,hash2),bp!=0?bp->speculative:0,bp); return(-2); } diff --git a/iguana/iguana_recv.c b/iguana/iguana_recv.c index 37301bfaf..a3ad998a2 100755 --- a/iguana/iguana_recv.c +++ b/iguana/iguana_recv.c @@ -215,9 +215,7 @@ int32_t iguana_speculativefind(struct iguana_info *coin,struct iguana_bundle *bp if ( (tmp= bp->speculativecache[i]) != 0 ) { if ( memcmp(&recvlen,tmp,sizeof(recvlen)) != 0 || memcmp(&tmp[sizeof(recvlen)],data,recvlen) != 0 ) - printf("ERROR "); - if ( 0 && bp == coin->current ) - printf("[%d:%d] already has recvlen.%d for %s\n",bp->hdrsi,i,recvlen,bits256_str(str,block->RO.hash2)); + printf("data ERROR [%d:%d] already has recvlen.%d for %s\n",bp->hdrsi,i,recvlen,bits256_str(str,block->RO.hash2)); return(0); } bp->speculativecache[i] = mycalloc('p',1,recvlen + sizeof(recvlen)); diff --git a/iguana/main.c b/iguana/main.c index 6d283235c..ea4d968fd 100755 --- a/iguana/main.c +++ b/iguana/main.c @@ -1126,7 +1126,7 @@ void iguana_appletests(struct supernet_info *myinfo) exit(-1); } sleep(1); - if ( 1 && (str= SuperNET_JSON(myinfo,cJSON_Parse("{\"VALIDATE\":1,\"prefetchlag\":13,\"agent\":\"iguana\",\"method\":\"addcoin\",\"services\":0,\"maxpeers\":64,\"newcoin\":\"BTCD\",\"active\":1,\"numhelpers\":1,\"poll\":10}"),0,myinfo->rpcport)) != 0 ) + if ( 1 && (str= SuperNET_JSON(myinfo,cJSON_Parse("{\"VALIDATE\":1,\"prefetchlag\":13,\"agent\":\"iguana\",\"method\":\"addcoin\",\"startpend\":2048,\"endpend\":1,\"services\":0,\"maxpeers\":64,\"newcoin\":\"BTCD\",\"active\":1,\"numhelpers\":4,\"poll\":1}"),0,myinfo->rpcport)) != 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,myinfo->rpcport)) != 0 ) @@ -1300,8 +1300,6 @@ int32_t iguana_isbigendian() void iguana_main(void *arg) { int32_t usessl = 0, ismainnet = 1; struct supernet_info *myinfo; - if ( arg == 0 ) - arg = "{\"tmpdir\":\"/mnt/ramdisk\",\"numhelpers\":13}"; if ( (BIGENDIAN= iguana_isbigendian()) > 0 ) printf("BIGENDIAN\n"); else if ( BIGENDIAN == 0 )