test

iguana/iguana777.h

@@ -26,7 +26,7 @@ typedef int32_t (*blockhashfunc)(uint8_t *blockhashp,uint8_t *serialized,int32_t
 #define IGUANA_SERIALIZE_SPENDVECTORGEN
 //#define IGUANA_DISABLEPEERS
 #define _IGUANA_MAXSTUCKTIME 30
-#define IGUANA_MAXITERATIONS 10000
+#define IGUANA_MAXITERATIONS 100
 #define IGUANA_DEFAULTLAG 30
 
 #define IGUANA_MAXCOINS 64

iguana/iguana_bundles.c

@@ -569,11 +569,12 @@ int32_t iguana_bundlerequests(struct iguana_info *coin,uint8_t missings[IGUANA_M
                                 {
                                     hash2 = block->RO.hash2;
                                     lagaddr = &coin->peers.active[block->peerid];
-                                    if ( priority > 2 && block->issued != 0 && block->issued < now-10 && block->peerid != 0 )
+                                    if ( block->issued != 0 && block->peerid != 0 )
                                     {
-                                        lagaddr->laggard++;
+                                        if ( (now - block->issued) > 60 )
+                                            lagaddr->laggard++;
                                         printf("addr.%s laggard.%d lag.%d\n",lagaddr->ipaddr,lagaddr->laggard,block->issued - now);
-                                        if ( coin->peers.numranked > 64 )
+                                        if ( lagaddr->laggard > 10 && coin->peers.numranked > 64 )
                                             lagaddr->dead = (uint32_t)time(NULL);
                                     }
                                     if ( addr->addrind < 0x100 )

iguana/iguana_init.c

@@ -156,7 +156,7 @@ int32_t iguana_savehdrs(struct iguana_info *coin)
                 fprintf(fp,"%d %s %s %s\n",bp->bundleheight,bits256_str(str,bp->hashes[0]),shastr,bits256_str(str2,bp->hashes[1]));
             } else break;
         }
-        printf("compare hdrs.txt %ld vs (%s) %ld\n",ftell(fp),fname,(long)OS_filesize(fname));
+        //printf("compare hdrs.txt %ld vs (%s) %ld\n",ftell(fp),fname,(long)OS_filesize(fname));
         if ( ftell(fp) > OS_filesize(fname) )
         {
             printf("new hdrs.txt %ld vs (%s) %ld\n",ftell(fp),fname,(long)OS_filesize(fname));

iguana/iguana_recv.c

@@ -312,7 +312,7 @@ void iguana_gotblockM(struct iguana_info *coin,struct iguana_peer *addr,struct i
         static uint64_t received[IGUANA_MAXPEERS],count[IGUANA_MAXPEERS];
         received[addr->addrind] += recvlen;
         count[addr->addrind]++;
-        if ( (rand() % 1000) == 0 )
+        if ( (rand() % 10000) == 0 )
         {
             uint64_t sum2 = 0,sum = 0;
             for (i=0; i<sizeof(received)/sizeof(*received); i++)
@@ -327,7 +327,11 @@ void iguana_gotblockM(struct iguana_info *coin,struct iguana_peer *addr,struct i
     {
         block = bp->blocks[bundlei];
         if ( block != 0 )
+        {
+            if ( block->peerid != 0 && block->issued != 0 && time(NULL)-block->issued < 60 )
+                addr->laggard--;
             block->peerid = 0;
+        }
         if ( bp->emitfinish != 0 )
         {
             numAfteremit++;
@@ -861,7 +865,7 @@ struct iguana_bundlereq *iguana_recvblockhashes(struct iguana_info *coin,struct
                 }
             }
         }
-        printf("%s.[%d] no match to allhashes\n",bits256_str(str,blockhashes[1]),num);
+        //printf("%s.[%d] no match to allhashes\n",bits256_str(str,blockhashes[1]),num);
         struct iguana_block *block;
         if ( (block= iguana_blockhashset("recvhashes",coin,-1,blockhashes[1],1)) != 0 )
         {

iguana/main.c

@@ -1186,7 +1186,7 @@ void iguana_main(void *arg)
     if ( 1 )
     {
         sleep(1);
-        if ( 1 && (str= SuperNET_JSON(myinfo,cJSON_Parse("{\"VALIDATE\":1,\"prefetchlag\":13,\"startpend\":2048,\"endpend\":2048,\"userhome\":\"/Users/jimbolaptop/Library/Application Support\",\"agent\":\"iguana\",\"method\":\"addcoin\",\"services\":128,\"maxpeers\":118,\"newcoin\":\"BTCD\",\"active\":1,\"numhelpers\":8,\"poll\":1}"),0,myinfo->rpcport)) != 0 )
+        if ( 1 && (str= SuperNET_JSON(myinfo,cJSON_Parse("{\"VALIDATE\":1,\"prefetchlag\":13,\"startpend\":2048,\"endpend\":2048,\"userhome\":\"/Users/jimbolaptop/Library/Application Support\",\"agent\":\"iguana\",\"method\":\"addcoin\",\"services\":128,\"maxpeers\":256,\"newcoin\":\"BTCD\",\"active\":1,\"numhelpers\":8,\"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 )