Merge branch 'dev' of https://github.com/jl777/SuperNET into etomic

.gitignore

@@ -259,3 +259,6 @@ build
 
 .idea
 Release/*
+
+build_win64_release/*
+DB/*

iguana/exchanges/LP_commands.c

@@ -168,10 +168,10 @@ timelock(coin, duration, destaddr=(tradeaddr), amount)\n\
 unlockedspend(coin, txid)\n\
 opreturndecrypt(coin, txid, passphrase)\n\
 getendpoint(port=5555)\n\
+listtransactions(coin, address, count=10, skip=0)\n\
 jpg(srcfile, destfile, power2=7, password, data="", required, ind=0)\n\
 \"}"));
-    //sell(base, rel, price, basevolume, timeout=10, duration=3600)\n\
-    
+
     if ( (base= jstr(argjson,"base")) == 0 )
         base = "";
     if ((rel= jstr(argjson,"rel")) == 0 )
@@ -612,6 +612,12 @@ jpg(srcfile, destfile, power2=7, password, data="", required, ind=0)\n\
             {
                 return(LP_unlockedspend(ctx,coin,jbits256(argjson,"txid")));
             }
+            // cJSON *LP_listtransactions(char *symbol,char *coinaddr,int32_t count,int32_t skip)
+            else if ( strcmp(method,"listtransactions") == 0 )
+            {
+                if ( (ptr= LP_coinfind(coin)) != 0 )
+                    return(jprint(LP_listtransactions(coin,jstr(argjson,"address"),juint(argjson,"count"),juint(argjson,"skip")),1));
+            }
             else if ( strcmp(method,"getrawtransaction") == 0 )
             {
                 return(jprint(LP_gettx("stats_JSON",coin,jbits256(argjson,"txid"),0),1));

iguana/exchanges/LP_include.h

@@ -556,6 +556,7 @@ uint16_t LP_randpeer(char *destip);
 void LP_tradebot_pauseall();
 int32_t LP_etomic_pub2addr(char *coinaddr,uint8_t pub64[64]);
 void LP_portfolio_reset();
+int32_t LP_autoref_clear(char *base,char *rel);
 int32_t bitcoin_addr2rmd160(char *symbol,uint8_t taddr,uint8_t *addrtypep,uint8_t rmd160[20],char *coinaddr);
 struct LP_pubkey_info *LP_pubkeyadd(bits256 pubkey);
 uint32_t LP_atomic_locktime(char *base,char *rel);

iguana/exchanges/LP_portfolio.c

@@ -22,7 +22,7 @@ struct LP_portfoliotrade { double metric; char buycoin[65],sellcoin[65]; };
 
 struct LP_autoprice_ref
 {
-    char refbase[65],refrel[65],base[65],rel[65],fundbid[16],fundask[16];
+    char refbase[65],refrel[65],base[65],rel[65],fundbid[16],fundask[16],usdpeg;
     double buymargin,sellmargin,factor,offset,lastbid,lastask;
     cJSON *fundvalue;
     uint32_t count;
@@ -455,6 +455,21 @@ double LP_tickered_price(int32_t bidask,char *base,char *rel,double price,cJSON
     return(price);
 }
 
+int32_t LP_autoref_clear(char *base,char *rel)
+{
+    int32_t i;
+    for (i=0; i<num_LP_autorefs; i++)
+    {
+        if ( (strcmp(rel,LP_autorefs[i].rel) == 0 && strcmp(base,LP_autorefs[i].base) == 0) ||
+            (strcmp(base,LP_autorefs[i].rel) == 0 && strcmp(rel,LP_autorefs[i].base) == 0) )
+        {
+            memset(&LP_autorefs[i],0,sizeof(LP_autorefs[i]));
+            return(i);
+        }
+    }
+    return(-1);
+}
+
 void LP_autoprice_iter(void *ctx,struct LP_priceinfo *btcpp)
 {
     static cJSON *tickerjson; static uint32_t lasttime;
@@ -463,19 +478,25 @@ void LP_autoprice_iter(void *ctx,struct LP_priceinfo *btcpp)
     if ( (retstr= issue_curlt("https://bittrex.com/api/v1.1/public/getmarketsummaries",LP_HTTP_TIMEOUT*10)) == 0 )
     {
         printf("trex error getting marketsummaries\n");
-        sleep(60);
-        return;
+        sleep(40);
+        //return;
+    }
+    else
+    {
+        nxtkmd = LP_pricesparse(ctx,1,retstr,btcpp);
+        free(retstr);
     }
-    nxtkmd = LP_pricesparse(ctx,1,retstr,btcpp);
-    free(retstr);
     if ( (retstr= issue_curlt("https://www.cryptopia.co.nz/api/GetMarkets",LP_HTTP_TIMEOUT*10)) == 0 )
     {
         printf("cryptopia error getting marketsummaries\n");
-        sleep(60);
-        return;
+        sleep(40);
+        //return;
+    }
+    else
+    {
+        LP_pricesparse(ctx,0,retstr,btcpp);
+        free(retstr);
     }
-    LP_pricesparse(ctx,0,retstr,btcpp);
-    free(retstr);
     if ( (kmdpp= LP_priceinfofind("KMD")) != 0 )
     {
         for (i=0; i<32; i++)
@@ -534,6 +555,8 @@ void LP_autoprice_iter(void *ctx,struct LP_priceinfo *btcpp)
     {
         rel = LP_autorefs[i].rel;
         base = LP_autorefs[i].base;
+        if ( rel[0] == 0 || base[0] == 0 )
+            continue;
         buymargin = LP_autorefs[i].buymargin;
         sellmargin = LP_autorefs[i].sellmargin;
         offset = LP_autorefs[i].offset;
@@ -574,15 +597,27 @@ void LP_autoprice_iter(void *ctx,struct LP_priceinfo *btcpp)
             //printf("%s/%s for %s/%s margin %.8f/%.8f\n",base,rel,LP_autorefs[i].refbase,LP_autorefs[i].refrel,buymargin,sellmargin);
             if ( (price_btc= LP_CMCbtcprice(&price_usd,LP_autorefs[i].refbase)) > SMALLVAL )
             {
-                if ( strcmp(rel,"KMD") == 0 && kmd_btc > SMALLVAL )
-                    price = kmd_btc / price_btc;
-                else if ( strcmp(rel,"BCH") == 0 && bch_btc > SMALLVAL )
-                    price = bch_btc / price_btc;
-                else if ( strcmp(rel,"BTC") == 0 )
-                    price = 1. / price_btc;
-                else continue;
+                if ( LP_autorefs[i].usdpeg != 0 )
+                {
+                    if ( price_usd > SMALLVAL )
+                        price = 1. / price_usd;
+                    else continue;
+                }
+                else
+                {
+                    if ( strcmp(rel,"KMD") == 0 && kmd_btc > SMALLVAL )
+                        price = kmd_btc / price_btc;
+                    else if ( strcmp(rel,"BCH") == 0 && bch_btc > SMALLVAL )
+                        price = bch_btc / price_btc;
+                    else if ( strcmp(rel,"BTC") == 0 )
+                        price = 1. / price_btc;
+                    else continue;
+                }
                 if ( factor > 0. )
+                {
+                    //printf("USD %.8f KMDBTC %.8f pricebtc %.8f price %.8f -> factor %.8f %.8f\n",price_usd,kmd_btc,price_btc,price,factor,(price * factor) + offset);
                     price = (price * factor) + offset;
+                }
                 newprice = (price * (1. + buymargin));
                 if ( LP_autorefs[i].lastbid < SMALLVAL )
                     LP_autorefs[i].lastbid = newprice;
@@ -598,7 +633,7 @@ void LP_autoprice_iter(void *ctx,struct LP_priceinfo *btcpp)
                 newprice = LP_autorefs[i].lastask;
                 LP_mypriceset(&changed,base,rel,newprice);
                 LP_pricepings(ctx,LP_myipaddr,LP_mypubsock,base,rel,newprice);
-            }
+            } //else printf("null return from CMC\n");
         }
         else
         {
@@ -719,8 +754,9 @@ int32_t LP_autoprice(void *ctx,char *base,char *rel,cJSON *argjson)
                     safecopy(LP_autorefs[num_LP_autorefs].fundbid,fundvalue_bid,sizeof(LP_autorefs[num_LP_autorefs].fundbid));
                     safecopy(LP_autorefs[num_LP_autorefs].fundask,fundvalue_ask,sizeof(LP_autorefs[num_LP_autorefs].fundask));
                 }
-                LP_autorefs[i].buymargin = buymargin;
-                LP_autorefs[i].sellmargin = sellmargin;
+                LP_autorefs[num_LP_autorefs].usdpeg = juint(argjson,"usdpeg");
+                LP_autorefs[num_LP_autorefs].buymargin = buymargin;
+                LP_autorefs[num_LP_autorefs].sellmargin = sellmargin;
                 LP_autorefs[num_LP_autorefs].factor = factor;
                 LP_autorefs[num_LP_autorefs].offset = offset;
                 safecopy(LP_autorefs[num_LP_autorefs].refbase,refbase,sizeof(LP_autorefs[num_LP_autorefs].refbase));
@@ -858,14 +894,15 @@ void prices_loop(void *ctx)
     char *retstr; cJSON *retjson,*array; char *buycoin,*sellcoin; struct iguana_info *buy,*sell; uint32_t requestid,quoteid; int32_t i,n,m; struct LP_portfoliotrade trades[256]; struct LP_priceinfo *btcpp;
     strcpy(prices_loop_stats.name,"prices_loop");
     prices_loop_stats.threshold = 600000.;
+    printf("start prices_loop\n");
     while ( LP_STOP_RECEIVED == 0 )
     {
+        //printf("G.initializing.%d prices loop autoprices.%d autorefs.%d\n",G.initializing,LP_autoprices,num_LP_autorefs);
         if ( G.initializing != 0 )
         {
-            sleep(1);
+            sleep(30);
             continue;
         }
-        //printf("prices loop autoprices.%d autorefs.%d\n",LP_autoprices,num_LP_autorefs);
         LP_millistats_update(&prices_loop_stats);
         LP_tradebots_timeslice(ctx);
         if ( (btcpp= LP_priceinfofind("BTC")) == 0 )

iguana/exchanges/LP_prices.c

@@ -532,6 +532,7 @@ int32_t LP_mypriceset(int32_t *changedp,char *base,char *rel,double price)
             relpp->sellmargins[basepp->ind] = 0.;
             relpp->offsets[basepp->ind] = 0.;
             relpp->factors[basepp->ind] = 0.;
+            LP_autoref_clear(base,rel);
             margin = 0.;
         }
         else if ( (minprice= basepp->minprices[relpp->ind]) > SMALLVAL && price < minprice )
@@ -1230,7 +1231,7 @@ double LP_CMCbtcprice(double *price_usdp,char *symbol)
             item = jitem(ticker,0);
             price_btc = jdouble(item,"price_btc");
             *price_usdp = jdouble(item,"price_usd");
-            //printf("%.8f item.(%s)\n",price_btc,jprint(item,0));
+//printf("%.8f item.(%s)\n",price_btc,jprint(item,0));
             free_json(ticker);
         }
         free(retstr);

iguana/exchanges/LP_rpc.c

@@ -495,6 +495,39 @@ cJSON *LP_listreceivedbyaddress(char *symbol,char *coinaddr)
     } else return(electrum_address_gethistory(symbol,coin->electrum,&retjson,coinaddr,zero));
 }
 
+
+cJSON *LP_listtransactions(char *symbol,char *coinaddr,int32_t count,int32_t skip)
+{
+    char buf[128],*addr; bits256 zero; cJSON *retjson,*array,*item; int32_t i,n; struct iguana_info *coin;
+    if ( symbol == 0 || symbol[0] == 0 )
+        return(cJSON_Parse("{\"error\":\"null symbol\"}"));
+    coin = LP_coinfind(symbol);
+    if ( coin == 0 || (IAMLP == 0 && coin->inactive != 0) )
+        return(cJSON_Parse("{\"error\":\"no coin\"}"));
+    memset(zero.bytes,0,sizeof(zero));
+    if ( coin->electrum == 0 )
+    {
+        if ( count == 0 )
+            count = 10;
+        sprintf(buf,"[\"\", %d, %d, true]",count,skip);
+        retjson = cJSON_CreateArray();
+        if ( (array= bitcoin_json(coin,"listtransactions",buf)) != 0 )
+        {
+            if ( (n= cJSON_GetArraySize(array)) > 0 )
+            {
+                for (i=0; i<n; i++)
+                {
+                    item = jitem(array,i);
+                    if ( (addr= jstr(item,"address")) != 0 && strcmp(addr,coinaddr) == 0 )
+                        jaddi(retjson,jduplicate(item));
+                }
+            }
+            free_json(array);
+        }
+        return(retjson);
+    } else return(electrum_address_gethistory(symbol,coin->electrum,&retjson,coinaddr,zero));
+}
+
 int64_t LP_listunspent_parseitem(struct iguana_info *coin,bits256 *txidp,int32_t *voutp,int32_t *heightp,cJSON *item)
 {
     int64_t satoshis = 0;

iguana/exchanges/auto_usd

@@ -0,0 +1,2 @@
+source userpass
+curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"autoprice\",\"base\":\"KMD\",\"rel\":\"OOT\",\"factor\":0.15,\"buymargin\":0.0001,\"sellmargin\":0.2,\"refbase\":\"komodo\",\"refrel\":\"coinmarketcap\",\"usdpeg\":1}"

iguana/exchanges/listtransactions

@@ -0,0 +1,3 @@
+#!/bin/bash
+source userpass
+curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"listtransactions\",\"coin\":\"CHIPS\",\"address\":\"RMfQwu5ey23eWJ4as2ckd8dqsQJwo836ny\"}"

marketmaker_build_depends.cmd

@@ -75,7 +75,7 @@ cd curl
 mkdir build_msvc_2015_win32
 mkdir build_msvc_2015_win64
 cd build_msvc_2015_win64
-cmake -G "Visual Studio 14 2015 Win64" ..
+cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_USE_WINSSL:BOOL=ON ..
 cmake --build . --config Release --target libcurl
 
 rem cmake .. -G"Visual Studio 14 2015 Win64" -DCURL_STATICLIB=ON -DCURL_DISABLE_LDAP=ON -DCURL_STATIC_CRT=ON