Merge pull request #749 from jl777/jl777

Jl777

cpp-ethereum

@@ -1 +1 @@
-Subproject commit c25a98257e7104875503e183dd0f27d49b3efd56
+Subproject commit 633c62c08bc73c7c3935c948a8d6c656a3659976

iguana/exchanges/LP_remember.c

@@ -1770,6 +1770,8 @@ char *LP_recent_swaps(int32_t limit,char *uuidstr)
     if ( time(NULL) < Alice_expiration )
     {
         item = cJSON_CreateObject();
+        if ( uuidstr != 0 )
+            jaddstr(item,"uuid",uuidstr);
         jaddnum(item,"expiration",Alice_expiration);
         jaddnum(item,"timeleft",Alice_expiration-time(NULL));
         jaddnum(item,"tradeid",LP_Alicequery.tradeid);

iguana/exchanges/LP_transaction.c

@@ -1590,14 +1590,14 @@ char *LP_withdraw(struct iguana_info *coin,cJSON *argjson)
             if ( signedtx == 0 )
                 break;
             datalen = (int32_t)strlen(signedtx) / 2;
-            if ( iter == 0 && strcmp(coin->symbol,"BTC") == 0 )
+            if ( autofee != 0 && iter == 0 && strcmp(coin->symbol,"BTC") == 0 )
             {
                 newtxfee = LP_txfeecalc(coin,0,datalen);
                 printf("txfee %.8f -> newtxfee %.8f, numvins.%d\n",dstr(txfee),dstr(newtxfee),numvins);
                 for (i=0; i<numvins; i++)
                 {
                     item = jitem(vins,i);
-                    //printf("set available %s\n",jprint(item,0));
+//printf("set available %s\n",jprint(item,0));
                     LP_availableset(jbits256(item,"txid"),jint(item,"vout"));
                 }
                 free_json(vins), vins = 0;

iguana/exchanges/stats.c

@@ -576,7 +576,7 @@ char *stats_rpcparse(char *retbuf,int32_t bufsize,int32_t *jsonflagp,int32_t *po
                 if ( (fastflag= jint(arg,"fast")) == 0 )
                 {
                     if ( (method= jstr(arg,"method")) != 0 && (strcmp(method,"orderbook") == 0 || strcmp(method,"portfolio") == 0) )
-                        fastflag = 1;
+                        fastflag = 1*0;
                 }
                 if ( fastflag == 0 )
                     portable_mutex_lock(&LP_commandmutex);
@@ -857,7 +857,7 @@ void stats_rpcloop(void *args)
         req->sock = sock;
         req->ipbits = ipbits;
         req->port = port;
-        if ( spawned >= (IGUANA_MAXRPCTHREADS-1) )
+        if ( 1 || spawned >= (IGUANA_MAXRPCTHREADS-1) )
             LP_rpc_processreq(req);
         // this might lead to "cant open file errors"
         else if ( (retval= OS_thread_create(&req->T,NULL,(void *)LP_rpc_processreq,req)) != 0 )