Merge pull request #876 from jl777/jl777

Jl777

iguana/dPoW.h

@@ -21,7 +21,7 @@
 #define DPOW_FIRSTRATIFY 1000
 
 #define DPOW_MAXFREQ 100
-#define DPOW_CHECKPOINTFREQ 5
+#define DPOW_CHECKPOINTFREQ 10
 #define DPOW_MINSIGS 13
 #define DPOW_MIN_ASSETCHAIN_SIGS 11
 //#define DPOW_M(bp) ((bp)->minsigs)  // (((bp)->numnotaries >> 1) + 1)

iguana/dpow/dpow_rpc.c

@@ -99,8 +99,7 @@ int32_t komodo_initjson(char *fname)
                 Notaries_port = port;
             if ( (num= juint(argjson,"BTCminsigs")) > Notaries_BTCminsigs )
                 Notaries_BTCminsigs = num;
-            if ( (num= juint(argjson,"minsigs")) > Notaries_minsigs )
-                Notaries_minsigs = num;
+            Notaries_minsigs = juint(argjson,"minsigs");
             if ( (array= jarray(&n,argjson,"seeds")) != 0 && n <= 64 )
             {
                 for (i=0; i<n&&i<64; i++)

iguana/exchanges/LP_nativeDEX.c

@@ -664,7 +664,7 @@ void LP_coinsloop(void *_coins)
                 {
                     if ( LP_blockinit(coin,coin->lastscanht) < 0 )
                     {
-                        printf("blockinit.%s %d error\n",coin->symbol,coin->lastscanht);
+                        printf("pleae ignore this blockinit.%s %d error\n",coin->symbol,coin->lastscanht);
                         sleep(10);
                         break;
                     }

iguana/exchanges/LP_network.c

@@ -27,6 +27,7 @@ struct psock
 } *PSOCKS;
 
 uint16_t Numpsocks,Psockport = MIN_PSOCK_PORT,Pcmdport = MAX_PSOCK_PORT;
+extern portable_mutex_t LP_commandQmutex;
 
 #ifdef FROM_JS
 
@@ -879,8 +880,16 @@ char *LP_psock(int32_t *pullsockp,char *ipaddr,int32_t ispaired,int32_t cmdchann
     
 char *issue_LP_psock(char *destip,uint16_t destport,int32_t ispaired,int32_t cmdchannel)
 {
-    char str[65],url[512],*retstr;
-    sprintf(url,"http://%s:%u/api/stats/psock?ispaired=%d&cmdchannel=%d&pubkey=%s&netid=%d",destip,destport-1,ispaired,cmdchannel,bits256_str(str,G.LP_mypub25519),G.netid);
+    char str[65],url[512],*retstr; bits256 pub25519; int32_t netid;
+#ifdef FROM_MARKETMAKER
+    pub25519 = G.LP_mypub25519;
+    netid = G.netid;
+#else
+    extern bits256 BET_mypub25519;
+    pub25519 = BET_mypub25519;
+    netid = 0;
+#endif
+    sprintf(url,"http://%s:%u/api/stats/psock?ispaired=%d&cmdchannel=%d&pubkey=%s&netid=%d",destip,destport-1,ispaired,cmdchannel,bits256_str(str,pub25519),netid);
     //return(LP_issue_curl("psock",destip,destport,url));
     retstr = issue_curlt(url,LP_HTTP_TIMEOUT*10);
     printf("issue_LP_psock got (%s) from %s\n",retstr,url); // this is needed?!

iguana/exchanges/LP_privkey.c

@@ -500,14 +500,16 @@ void verusblocks(struct iguana_info *coin,char *coinaddr)
                 if ( posflag != 0 )
                 {
                     numpos++;
-                    //printf("ht.%-5d lock.%-7d PoS coinbase.(%s) staked.(%s) %.8f\n",height,locked,addr0,stakingaddr,value);
+                    if ( num < 100 )
+                        printf("ht.%-5d lock.%-7d PoS coinbase.(%s) staked.(%s) %.8f\n",height,locked,addr0,stakingaddr,value);
                     if ( strcmp(coinaddr,stakingaddr) == 0 || strcmp("RTu3JZZKLJTcfNwBa19dWRagEfQq49STqC",stakingaddr) == 0 )
                         possum += value, npos++;
                 }
                 else
                 {
                     numpow++;
-                    //printf("ht.%-5d lock.%-7d PoW coinbase.(%s) %.8f\n",height,locked,addr0,value);
+                    if ( num < 100 )
+                        printf("ht.%-5d lock.%-7d PoW coinbase.(%s) %.8f\n",height,locked,addr0,value);
                     if ( strcmp(coinaddr,addr0) == 0 || strcmp("RTu3JZZKLJTcfNwBa19dWRagEfQq49STqC",stakingaddr) == 0 )
                         powsum += value, npow++;
                 }

iguana/exchanges/stats.c

@@ -33,6 +33,7 @@
 char *stats_JSON(void *ctx,int32_t fastflag,char *myipaddr,int32_t mypubsock,cJSON *argjson,char *remoteaddr,uint16_t port);
 void LP_queuecommand(char **retstrp,char *buf,int32_t responsesock,int32_t stats_JSONonly,uint32_t queueid);
 extern uint32_t DOCKERFLAG;
+extern char LP_myipaddr[];
 
 char *stats_validmethods[] =
 {
@@ -549,7 +550,7 @@ char *stats_rpcparse(char *retbuf,int32_t bufsize,int32_t *jsonflagp,int32_t *po
                     //free(buf);
                     //while ( retstr == 0 )
                     //    usleep(10000);
-                    if ( (retstr= stats_JSON(ctx,0,myipaddr,-1,argjson,remoteaddr,port)) != 0 )
+                    if ( (retstr= stats_JSON(ctx,0,LP_myipaddr,-1,argjson,remoteaddr,port)) != 0 )
                     {
                         if ( (retitem= cJSON_Parse(retstr)) != 0 )
                             jaddi(retarray,retitem);
@@ -598,7 +599,7 @@ char *stats_rpcparse(char *retbuf,int32_t bufsize,int32_t *jsonflagp,int32_t *po
                     buf = jprint(arg,0);
                     LP_queuecommand(&retstr,buf,IPC_ENDPOINT,1,queueid);
                     free(buf);
-                } else retstr = stats_JSON(ctx,jint(arg,"fast"),myipaddr,-1,arg,remoteaddr,port);
+                } else retstr = stats_JSON(ctx,jint(arg,"fast"),LP_myipaddr,-1,arg,remoteaddr,port);
 #endif
                 if ( fastflag == 0 )
                     portable_mutex_unlock(&LP_commandmutex);

iguana/m_notary_run

@@ -67,4 +67,4 @@ coins/eql_7776
 
 #curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"addnotary\",\"ipaddr\":\"$myip\"}"
 sleep 30
-curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"KMD\",\"pubkey\":\"$pubkey\",\"freq\":5}"
+curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"KMD\",\"pubkey\":\"$pubkey\"}"