Test

iguana/exchanges/LP_commands.c

@@ -18,6 +18,17 @@
 //  marketmaker
 //
 
+char *LP_numutxos()
+{
+    cJSON *retjson = cJSON_CreateObject();
+    if ( LP_mypeer != 0 )
+    {
+        jaddnum(retjson,"numutxos",LP_mypeer->numutxos);
+        jaddnum(retjson,"numpeers",LP_mypeer->numpeers);
+        jaddnum(retjson,"session",LP_sessionid);
+    } jaddstr(retjson,"error","client node");
+    return(jprint(retjson,1));
+}
 
 char *stats_JSON(void *ctx,char *myipaddr,int32_t pubsock,cJSON *argjson,char *remoteaddr,uint16_t port) // from rpc port
 {
@@ -266,6 +277,8 @@ trust(pubkey, trust)\n\
         retstr = LP_spentcheck(argjson);
     else if ( strcmp(method,"getcoins") == 0 )
         return(jprint(LP_coinsjson(),1));
+    else if ( strcmp(method,"numutxos") == 0 )
+        return(LP_numutxos());
     else if ( strcmp(method,"postprice") == 0 )
         retstr = LP_postedprice(argjson);
     //else if ( strcmp(method,"broadcast") == 0 )

iguana/exchanges/LP_nativeDEX.c

@@ -309,7 +309,7 @@ void command_rpcloop(void *myipaddr)
 int32_t LP_mainloop_iter(void *ctx,char *myipaddr,struct LP_peerinfo *mypeer,int32_t pubsock,char *pushaddr,uint16_t myport,char *passphrase)
 {
     static uint32_t counter,numpeers; //lastforward
-    struct LP_utxoinfo *utxo,*utmp; struct iguana_info *coin,*ctmp; char *retstr,*origipaddr; struct LP_peerinfo *peer,*tmp,*mostpeer; uint32_t now; int32_t mostutxos,nonz = 0,n=0,lastn=-1;
+    struct LP_utxoinfo *utxo,*utmp; cJSON *retjson; struct iguana_info *coin,*ctmp; char *retstr,*origipaddr; struct LP_peerinfo *peer,*tmp,*mostpeer; uint32_t id,now; int32_t mostutxos,nonz = 0,n=0,num,lastn=-1;
     now = (uint32_t)time(NULL);
     if ( (origipaddr= myipaddr) == 0 )
         origipaddr = "127.0.0.1";
@@ -328,8 +328,25 @@ int32_t LP_mainloop_iter(void *ctx,char *myipaddr,struct LP_peerinfo *mypeer,int
             if ( IAMLP == 0 )
                 continue;
         }
-        if ( IAMLP != 0 && strcmp(peer->ipaddr,myipaddr) != 0 )
-            LP_peersquery(mypeer,pubsock,peer->ipaddr,peer->port,myipaddr,myport);
+        if ( IAMLP != 0 && LP_mypeer != 0 && strcmp(peer->ipaddr,myipaddr) != 0 )
+        {
+            if ( (retstr= issue_LP_numutxos(peer->ipaddr,peer->port,LP_mypeer->ipaddr,LP_mypeer->port,LP_mypeer->numpeers,LP_mypeer->numutxos)) != 0 )
+            {
+                printf("%s\n",retstr);
+                if ( (retjson= cJSON_Parse(retstr)) != 0 )
+                {
+                    if ( (num= jint(retjson,"numutxos")) > peer->numutxos )
+                        peer->numutxos = num;
+                    if ( (num= jint(retjson,"numpeers")) > peer->numpeers )
+                        peer->numpeers = num;
+                    if ( (id= juint(retjson,"session")) != 0 )
+                        peer->sessionid = id;
+                    free_json(retjson);
+                }
+                free(retstr);
+                retstr = 0;
+            }
+        }
         printf("%d ",peer->numutxos);
         if ( peer->numutxos > mostutxos )
         {

iguana/exchanges/LP_peers.c

@@ -65,18 +65,15 @@ if ( strncmp("5.9.253",ipaddr,strlen("5.9.253")) != 0 )
     {
         if ( (peer= LP_peerfind(ipbits,port)) != 0 )
         {
-            //if ( profitmargin != 0. )
-            //    peer->profitmargin = profitmargin;
-            if ( numpeers > peer->numpeers )
+            /*if ( numpeers > peer->numpeers )
                 peer->numpeers = numpeers;
             if ( numutxos > peer->numutxos )
                 peer->numutxos = numutxos;
             if ( peer->sessionid == 0 )
-                peer->sessionid = sessionid;
+                peer->sessionid = sessionid;*/
         }
         else
         {
-            printf("LPaddpeer %s\n",ipaddr);
             peer = calloc(1,sizeof(*peer));
             if ( strcmp(peer->ipaddr,LP_myipaddr) == 0 )
                 peer->sessionid = LP_sessionid;
@@ -221,7 +218,7 @@ void LP_peersquery(struct LP_peerinfo *mypeer,int32_t mypubsock,char *destipaddr
     peer = LP_peerfind((uint32_t)calc_ipbits(destipaddr),destport);
     if ( (retstr= issue_LP_getpeers(destipaddr,destport,myipaddr,myport,mypeer!=0?mypeer->numpeers:0,mypeer!=0?mypeer->numutxos:0)) != 0 )
     {
-        printf("got.(%s)\n",retstr);
+        //printf("got.(%s)\n",retstr);
         now = (uint32_t)time(NULL);
         LP_peersparse(mypeer,mypubsock,destipaddr,destport,retstr,now);
         free(retstr);

iguana/exchanges/LP_rpc.c

@@ -57,6 +57,15 @@ char *issue_LP_getpeers(char *destip,uint16_t destport,char *ipaddr,uint16_t por
     return(retstr);
 }
 
+char *issue_LP_numutxos(char *destip,uint16_t destport,char *ipaddr,uint16_t port,int32_t numpeers,int32_t numutxos)
+{
+    char url[512],*retstr;
+    sprintf(url,"http://%s:%u/api/stats/numutxos?ipaddr=%s&port=%u&numpeers=%d&numutxos=%d",destip,destport,ipaddr,port,numpeers,numutxos);
+    retstr = LP_issue_curl("numutxos",destip,port,url);
+    //printf("%s -> getpeers.(%s)\n",destip,retstr);
+    return(retstr);
+}
+
 char *issue_LP_getutxos(char *destip,uint16_t destport,char *coin,int32_t lastn,char *ipaddr,uint16_t port,int32_t numpeers,int32_t numutxos)
 {
     char url[512];