Merge pull request #218 from jl777/dev

fix syncing notary chain second+ times

iguana/dpow/dpow_network.c

@@ -80,7 +80,7 @@ NN_CONNECT to (tcp://27.50.93.252:7775)*/
 
 void dex_init(struct supernet_info *myinfo)
 {
-    int32_t i,j,mask = 0; char *seeds[] = { "78.47.196.146", "149.56.29.163", "191.235.80.138", "94.102.63.226", "129.232.225.202", "104.255.64.3", "52.72.135.200" };
+    int32_t i,j,mask = 0; char *seeds[] = { "78.47.196.146", "5.9.102.210", "149.56.29.163", "191.235.80.138", "88.198.65.74", "94.102.63.226", "129.232.225.202", "104.255.64.3", "52.72.135.200", "149.56.28.84", "103.18.58.150", "221.121.144.140", "123.249.79.12", "103.18.58.146" };
     OS_randombytes((void *)&i,sizeof(i));
     srand(i);
     for (i=0; i<sizeof(myinfo->dexseed_ipaddrs)/sizeof(*myinfo->dexseed_ipaddrs); i++)

iguana/iguana777.h

@@ -131,7 +131,7 @@ struct supernet_info
     struct liquidity_info linfos[512];
     struct komodo_notaries NOTARY;
     char seedipaddr[64]; uint32_t dpowipbits[128]; int32_t numdpowipbits; portable_mutex_t notarymutex,dpowmutex;
-    char dexseed_ipaddrs[1][64]; uint32_t dexipbits[128]; int32_t numdexipbits; portable_mutex_t dexmutex;
+    char dexseed_ipaddrs[4][64]; uint32_t dexipbits[128]; int32_t numdexipbits; portable_mutex_t dexmutex;
     // compatibility
     bits256 pangea_category,instantdex_category;
     uint8_t logs[256],exps[510];

iguana/iguana_init.c

@@ -599,7 +599,7 @@ struct iguana_info *iguana_coinstart(struct supernet_info *myinfo,struct iguana_
             }
         }
     }
-    if ( (coin->notarychain= iguana_isnotarychain(coin->symbol)) >= 0 )
+    if ( (coin->notarychain= iguana_isnotarychain(coin->symbol)) >= 0 && coin->FULLNODE == 0 )
     {
         printf("SET %s NOTARYCHAIN.%d\n",coin->symbol,coin->notarychain);
         return(coin);
@@ -665,6 +665,7 @@ struct iguana_info *iguana_coinstart(struct supernet_info *myinfo,struct iguana_
             //sprintf(fname,"confs/%s_%s.txt",coin->symbol,(iter == 0) ? "peers" : "hdrs");
             //sprintf(fname,"tmp/%s/%s.txt",coin->symbol,(iter == 0) ? "peers" : "hdrs");
             OS_compatible_path(fname);
+            printf("check.(%s)\n",fname);
             if ( (fp= fopen(fname,"r")) != 0 )
             {
                 if ( coin->virtualchain == 0 || iter > 0 )

iguana/iguana_recv.c

@@ -1301,10 +1301,12 @@ struct iguana_bundle *iguana_bundleset(struct supernet_info *myinfo,struct iguan
 				{
 					if (prevbp->hdrsi + 1 == coin->bundlescount && prevbundlei == coin->chain->bundlesize - 1)
 					{
+                        if ( (prevbp->hdrsi % 10) == 9 )
+                            iguana_savehdrs(coin);
 						printf("%s AUTOCREATE.%d\n", coin->symbol, prevbp->bundleheight + coin->chain->bundlesize);
-						if ((bp = iguana_bundlecreate(coin, bundleip, prevbp->bundleheight + coin->chain->bundlesize, hash2, zero, 0)) != 0)
+						if ( (bp= iguana_bundlecreate(coin, bundleip, prevbp->bundleheight + coin->chain->bundlesize, hash2, zero, 0)) != 0)
 						{
-							if (bp->queued == 0)
+							if ( bp->queued == 0 )
 								iguana_bundleQ(myinfo, coin, bp, 1000);
 						}
 					}