Merge pull request #726 from jl777/dev

bugfixes

CMakeLists.txt

@@ -23,7 +23,7 @@ download_project(PROJ nanomsg
         UPDATE_DISCONNECTED 1
         )
 
-find_library(NANOMSG_LIBRARY NAMES nanomsg PATHS ${DEPS_INSTALL_PREFIX}/lib)
+find_library(NANOMSG_LIBRARY NAMES nanomsg PATHS ${DEPS_INSTALL_PREFIX}/lib NO_DEFAULT_PATH)
 include_directories("${CMAKE_SOURCE_DIR}")
 add_subdirectory(cpp-ethereum)
 add_subdirectory(iguana/exchanges)

Jenkinsfile

@@ -0,0 +1,20 @@
+pipeline {
+  agent {
+    docker {
+      image 'artempikulin/cmake-ubuntu'
+    }
+    
+  }
+  stages {
+    stage('Build') {
+      steps {
+        sh '''git submodule update --init --recursive
+rm -rf build
+mkdir build
+cd build
+cmake ..
+cmake --build . --target marketmaker-testnet'''
+      }
+    }
+  }
+}

appveyor.yml

@@ -0,0 +1,6 @@
+version: 1.0.{build}
+branches:
+  only:
+  - etomic
+build_script:
+- cmd: marketmaker_build_etomic.cmd

crypto777/CMakeLists.txt

@@ -2,4 +2,10 @@ file(GLOB sources "*.c")
 file(GLOB headers "*.h")
 add_library(libcrypto777 ${sources} ${headers})
 target_compile_definitions(libcrypto777 PRIVATE USE_STATIC_NANOMSG)
-target_link_libraries(libcrypto777 PUBLIC curl ${NANOMSG_LIBRARY})
+target_link_libraries(libcrypto777 PUBLIC curl ${NANOMSG_LIBRARY})
+if(WIN32)
+add_definitions(-DNATIVE_WINDOWS)
+add_definitions(-DIGUANA_LOG2PACKETSIZE=20)
+add_definitions(-DIGUANA_MAXPACKETSIZE=1572864)
+include_directories("${CMAKE_SOURCE_DIR}/includes")
+endif()

crypto777/bitcoind_RPC.c

@@ -164,7 +164,11 @@ char *bitcoind_RPC(char **retstrp,char *debugstr,char *url,char *userpass,char *
     if ( url[0] == 0 )
         strcpy(url,"http://127.0.0.1:7776");
     if ( specialcase != 0 && (0) )
+    {
+        //int32_t zeroval();
         printf("<<<<<<<<<<< bitcoind_RPC: userpass.(%s) url.(%s) command.(%s) params.(%s)\n",userpass,url,command,params);
+        //printf("die.%d\n",1/zeroval());
+    }
 try_again:
     if ( retstrp != 0 )
         *retstrp = 0;

crypto777/iguana_utils.c

@@ -557,7 +557,7 @@ int _increasing_uint64(const void *a,const void *b)
 #undef uint64_b
 }
 
-static int _decreasing_uint64(const void *a,const void *b)
+int _decreasing_uint64(const void *a,const void *b)
 {
 #define uint64_a (*(uint64_t *)a)
 #define uint64_b (*(uint64_t *)b)
@@ -570,7 +570,7 @@ static int _decreasing_uint64(const void *a,const void *b)
 #undef uint64_b
 }
 
-static int _decreasing_uint32(const void *a,const void *b)
+int _decreasing_uint32(const void *a,const void *b)
 {
 #define uint32_a (*(uint32_t *)a)
 #define uint32_b (*(uint32_t *)b)

iguana/dpow/dpow_fsm.c

@@ -312,7 +312,7 @@ bits256 dpow_calcMoM(uint32_t *MoMdepthp,struct supernet_info *myinfo,struct igu
     bits256 MoM,blockhash,merkle,*merkles; cJSON *blockjson; uint64_t signedmask; int32_t breakht=0,notht=0,ht,maxdepth = 1440,MoMdepth = 0;
     memset(MoM.bytes,0,sizeof(MoM));
     blockhash = dpow_getblockhash(myinfo,coin,height);
-    printf("start MoM calc %s height.%d\n",coin->symbol,height);
+    //printf("start MoM calc %s height.%d\n",coin->symbol,height);
     if ( (blockjson= dpow_getblock(myinfo,coin,blockhash)) != 0 )
     {
         merkle = jbits256(blockjson,"merkleroot");
@@ -368,7 +368,7 @@ bits256 dpow_calcMoM(uint32_t *MoMdepthp,struct supernet_info *myinfo,struct igu
         } else printf("%s.ht%d null merkles\n",coin->symbol,height);
     } else printf("%s.ht%d null block\n",coin->symbol,height);
     *MoMdepthp = MoMdepth;
-    printf("done MoM calc %s height.%d MoMdepth.%d\n",coin->symbol,height,MoMdepth);
+    //printf("done MoM calc %s height.%d MoMdepth.%d\n",coin->symbol,height,MoMdepth);
     return(MoM);
 }
 

iguana/dpow/dpow_rpc.c

@@ -1277,6 +1277,8 @@ int32_t dpow_issuer_iteration(struct dpow_info *dp,struct iguana_info *coin,int3
     if ( height <= 0 )
         height = 1;
     *isrealtimep = 0;
+    if ( coin->getinfostr[0] == 0 )
+        strcpy(coin->getinfostr,"getinfo");
     if ( (retstr= dpow_issuemethod(coin->chain->userpass,(char *)coin->getinfostr,0,port)) != 0 )
     {
         if ( (infoobj= cJSON_Parse(retstr)) != 0 )

iguana/exchanges/CMakeLists.txt

@@ -1,14 +1,30 @@
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 set(MM_SOURCES mm.c ../mini-gmp.c ../groestl.c ../segwit_addr.c ../keccak.c LP_etomic.c)
 set(MM_LIBS curl pthread libcrypto777 libjpeg libsecp256k1)
+if(WIN32)
+link_directories(${CMAKE_SOURCE_DIR}/marketmaker_depends/curl/build_msvc_2015_win64/lib/Release ${CMAKE_SOURCE_DIR}/marketmaker_depends/pthread-win32/bin/x64_MSVC2015.Release ${CMAKE_SOURCE_DIR}/marketmaker_depends/nanomsg/build_msvc_2015_win64/Release)
+set(MM_LIBS ${MM_LIBS} nanomsg)
+endif()
 add_executable(marketmaker-testnet ${MM_SOURCES})
 add_executable(marketmaker-mainnet ${MM_SOURCES})
 include_directories(../../crypto777)
+if(WIN32)
+target_compile_definitions(marketmaker-mainnet PRIVATE)
+target_compile_definitions(marketmaker-testnet PRIVATE ETOMIC_TESTNET)
+else()
 target_compile_definitions(marketmaker-testnet PRIVATE ETOMIC_TESTNET USE_STATIC_NANOMSG)
 target_compile_definitions(marketmaker-mainnet PRIVATE USE_STATIC_NANOMSG)
+endif()
 if(UNIX)
     target_link_libraries(marketmaker-testnet m)
     target_link_libraries(marketmaker-mainnet m)
 endif()
-target_link_libraries(marketmaker-testnet ${MM_LIBS} etomiclib-testnet)
-target_link_libraries(marketmaker-mainnet ${MM_LIBS} etomiclib-mainnet)
+if(WIN32)
+add_definitions(-DNATIVE_WINDOWS)
+add_definitions(-DIGUANA_LOG2PACKETSIZE=20)
+add_definitions(-DIGUANA_MAXPACKETSIZE=1572864)
+add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+include_directories("${CMAKE_SOURCE_DIR}/includes")
+endif()
+target_link_libraries(marketmaker-testnet ${MM_LIBS} etomiclib-testnet -static-libgcc -static-libstdc++)
+target_link_libraries(marketmaker-mainnet ${MM_LIBS} etomiclib-mainnet -static-libgcc -static-libstdc++)

iguana/exchanges/LP_commands.c

@@ -375,6 +375,11 @@ jpg(srcfile, destfile, power2=7, password, data="", required, ind=0)\n\
                 jaddbits256(retjson,"privkey",privkey);
                 bitcoin_priv2wif(coin,wiftaddr,wifstr,privkey,wiftype);
                 jaddstr(retjson,"wif",wifstr);
+#ifndef NOTETOMIC
+                char ethaddr[50];
+                LP_etomic_pubkeystr_to_addr(pubsecp, ethaddr);
+                jaddstr(retjson,"ethaddr",ethaddr);
+#endif
                 return(jprint(retjson,1));
             } else return(clonestr("{\"error\":\"need to have passphrase\"}"));
         }
@@ -477,18 +482,30 @@ jpg(srcfile, destfile, power2=7, password, data="", required, ind=0)\n\
             }
             else if ( strcmp(method,"buy") == 0 )
             {
-                //*
+                int32_t fomo = 0; double vol;
+                if ( jobj(argjson,"fomo") != 0 )
+                {
+                    fomo = 1;
+                    price = 1.;
+                    vol = jdouble(argjson,"fomo");
+                } else vol = jdouble(argjson,"relvolume");
                 if ( price > SMALLVAL )
                 {
-                    return(LP_autobuy(ctx,myipaddr,pubsock,base,rel,price,jdouble(argjson,"relvolume"),jint(argjson,"timeout"),jint(argjson,"duration"),jstr(argjson,"gui"),juint(argjson,"nonce"),jbits256(argjson,"destpubkey"),0));
+                    return(LP_autobuy(ctx,fomo,myipaddr,pubsock,base,rel,price,vol,jint(argjson,"timeout"),jint(argjson,"duration"),jstr(argjson,"gui"),juint(argjson,"nonce"),jbits256(argjson,"destpubkey"),0));
                 } else return(clonestr("{\"error\":\"no price set\"}"));
             }
             else if ( strcmp(method,"sell") == 0 )
             {
-                //*
+                int32_t fomo = 0; double vol;
+                if ( jobj(argjson,"dump") != 0 )
+                {
+                    fomo = 1;
+                    price = 1.;
+                    vol = jdouble(argjson,"dump");
+                } else vol = jdouble(argjson,"basevolume");
                 if ( price > SMALLVAL )
                 {
-                    return(LP_autobuy(ctx,myipaddr,pubsock,rel,base,1./price,jdouble(argjson,"basevolume"),jint(argjson,"timeout"),jint(argjson,"duration"),jstr(argjson,"gui"),juint(argjson,"nonce"),jbits256(argjson,"destpubkey"),0));
+                    return(LP_autobuy(ctx,fomo,myipaddr,pubsock,rel,base,1./price,vol,jint(argjson,"timeout"),jint(argjson,"duration"),jstr(argjson,"gui"),juint(argjson,"nonce"),jbits256(argjson,"destpubkey"),0));
                 } else return(clonestr("{\"error\":\"no price set\"}"));
             }
         }
@@ -661,14 +678,14 @@ jpg(srcfile, destfile, power2=7, password, data="", required, ind=0)\n\
             }
             if ( strcmp(method,"inventory") == 0 )
             {
-                struct iguana_info *ptr;
+                struct iguana_info *ptr; int32_t num;
                 if ( (ptr= LP_coinfind(coin)) != 0 )
                 {
                     LP_address(ptr,ptr->smartaddr);
                     if ( jint(argjson,"reset") != 0 )
                     {
                         ptr->privkeydepth = 0;
-                        LP_address_utxo_reset(ptr);
+                        LP_address_utxo_reset(&num,ptr);
                         LP_passphrase_init(jstr(argjson,"passphrase"),G.gui,G.netid,G.seednode);
                     }
                     if ( bits256_nonz(G.LP_privkey) != 0 )
@@ -682,7 +699,7 @@ jpg(srcfile, destfile, power2=7, password, data="", required, ind=0)\n\
                     //jadd(retjson,"alice",LP_inventory(coin));
                     //jadd(retjson,"bob",LP_inventory(coin,1));
                     //LP_smartutxos_push(ptr);
-                    LP_address_utxo_reset(ptr);
+                    LP_address_utxo_reset(&num,ptr);
                     return(jprint(retjson,1));
                 }
             }

iguana/exchanges/LP_etomic.h

@@ -51,4 +51,6 @@ uint8_t LP_etomic_is_empty_tx_id(char *txId);
 
 uint64_t LP_etomic_get_balance(struct iguana_info *coin, char *coinaddr);
 
+void LP_etomic_pubkeystr_to_addr(char *pubkey, char *output);
+
 #endif //SUPERNET_LP_ETOMIC_H

iguana/exchanges/LP_include.h

@@ -303,7 +303,7 @@ struct iguana_info
     portable_mutex_t txmutex,addrmutex,addressutxo_mutex; struct LP_transaction *transactions; struct LP_address *addresses;
     uint64_t txfee;
     int32_t numutxos,notarized,longestchain,firstrefht,firstscanht,lastscanht,height; uint16_t busport,did_addrutxo_reset;
-    uint32_t txversion,dPoWtime,lastresetutxo,loadedcache,electrumlist,lastunspent,importedprivkey,lastpushtime,lastutxosync,addr_listunspent_requested,lastutxos,updaterate,counter,inactive,lastmempool,lastgetinfo,ratetime,heighttime,lastmonitor,obooktime;
+    uint32_t txversion,dPoWtime,lastautosplit,lastresetutxo,loadedcache,electrumlist,lastunspent,importedprivkey,lastpushtime,lastutxosync,addr_listunspent_requested,lastutxos,updaterate,counter,inactive,lastmempool,lastgetinfo,ratetime,heighttime,lastmonitor,obooktime;
     uint8_t pubtype,p2shtype,isPoS,wiftype,wiftaddr,taddr,noimportprivkey_flag,userconfirms,isassetchain,maxconfirms;
     char symbol[128],smartaddr[64],userpass[1024],serverport[128],instantdex_address[64],estimatefeestr[32],getinfostr[32],etomic[64];
     // portfolio
@@ -498,6 +498,7 @@ int32_t LP_numconfirms(char *symbol,char *coinaddr,bits256 txid,int32_t vout,int
 void LP_aliceid(uint32_t tradeid,uint64_t aliceid,char *event,uint32_t requestid,uint32_t quoteid);
 void LP_autoprices_update(char *method,char *base,double basevol,char *rel,double relvol);
 cJSON *LP_cache_transaction(struct iguana_info *coin,bits256 txid,uint8_t *serialized,int32_t len);
+uint64_t LP_balance(uint64_t *valuep,int32_t iambob,char *symbol,char *coinaddr);
 cJSON *LP_transaction_fromdata(struct iguana_info *coin,bits256 txid,uint8_t *serialized,int32_t len);
 uint64_t LP_RTsmartbalance(struct iguana_info *coin);
 int32_t LP_getheight(int32_t *notarizedp,struct iguana_info *coin);
@@ -572,6 +573,7 @@ int64_t LP_dynamictrust(int64_t credits,bits256 pubkey,int64_t kmdvalue);
 struct LP_address *LP_addressfind(struct iguana_info *coin,char *coinaddr);
 int64_t LP_outpoint_amount(char *symbol,bits256 txid,int32_t vout);
 void LP_initpeers(int32_t pubsock,struct LP_peerinfo *mypeer,char *myipaddr,uint16_t myport,uint16_t netid,char *seednode);
+int _decreasing_uint64(const void *a,const void *b);
 
 void LP_listunspent_query(char *symbol,char *coinaddr);
 int32_t bitcoin_priv2wif(char *symbol,uint8_t wiftaddr,char *wifstr,bits256 privkey,uint8_t addrtype);

iguana/exchanges/LP_nativeDEX.c

@@ -566,7 +566,8 @@ void LP_coinsloop(void *_coins)
                 continue;
             if ( coin->did_addrutxo_reset == 0 )
             {
-                LP_address_utxo_reset(coin);
+                int32_t num;
+                LP_address_utxo_reset(&num,coin);
                 coin->did_addrutxo_reset = 1;
             }
             if ( coin->longestchain == 1 ) // special init value

iguana/exchanges/LP_ordermatch.c

@@ -1444,9 +1444,9 @@ int32_t LP_tradecommand(void *ctx,char *myipaddr,int32_t pubsock,cJSON *argjson,
     return(retval);
 }
 
-char *LP_autobuy(void *ctx,char *myipaddr,int32_t mypubsock,char *base,char *rel,double maxprice,double relvolume,int32_t timeout,int32_t duration,char *gui,uint32_t nonce,bits256 destpubkey,uint32_t tradeid)
+char *LP_autobuy(void *ctx,int32_t fomoflag,char *myipaddr,int32_t mypubsock,char *base,char *rel,double maxprice,double relvolume,int32_t timeout,int32_t duration,char *gui,uint32_t nonce,bits256 destpubkey,uint32_t tradeid)
 {
-    uint64_t desttxfee,txfee; uint32_t lastnonce; int64_t bestsatoshis=0,destsatoshis; struct iguana_info *basecoin,*relcoin; struct LP_utxoinfo *autxo,B,A; struct LP_quoteinfo Q; bits256 pubkeys[100]; struct LP_address_utxo *utxos[4096]; int32_t maxiters=100,i,max=(int32_t)(sizeof(utxos)/sizeof(*utxos));
+    uint64_t desttxfee,txfee,balance; uint32_t lastnonce; int64_t bestsatoshis=0,destsatoshis; struct iguana_info *basecoin,*relcoin; struct LP_utxoinfo *autxo,B,A; struct LP_quoteinfo Q; bits256 pubkeys[100]; struct LP_address_utxo *utxos[4096]; int32_t num=0,maxiters=100,i,max=(int32_t)(sizeof(utxos)/sizeof(*utxos));
     basecoin = LP_coinfind(base);
     relcoin = LP_coinfind(rel);
     if ( gui == 0 )
@@ -1483,15 +1483,41 @@ char *LP_autobuy(void *ctx,char *myipaddr,int32_t mypubsock,char *base,char *rel
         jaddnum(retjson,"wait",Alice_expiration-time(NULL));
         return(jprint(retjson,1));
     } else LP_alicequery_clear();
+    LP_address_utxo_reset(&num,relcoin);
+    if ( num <= 1 )
+    {
+        if ( time(NULL) > relcoin->lastautosplit+300 )
+        {
+            relcoin->lastautosplit = (uint32_t)time(NULL);
+            return(LP_autosplit(relcoin));
+        }
+        return(clonestr("{\"error\":\"not enough utxo, please make more deposits\"}"));
+    }
+    LP_txfees(&txfee,&desttxfee,base,rel);
+    if ( txfee != 0 && txfee < 10000 )
+        txfee = 10000;
+    if ( desttxfee != 0 && desttxfee < 10000 )
+        desttxfee = 10000;
+    if ( fomoflag != 0 )
+    {
+        uint64_t median,minutxo,maxutxo;
+        maxprice = 0.; // fomo -> price is 1. and needs to be set
+        LP_address_minmax(0,&median,&minutxo,&maxutxo,relcoin,relcoin->smartaddr); // limit to largest utxo
+        if ( maxutxo > 0 )
+        {
+            relvolume = MIN(relvolume,dstr(maxutxo) - dstr(desttxfee)*3);
+            printf("maxutxo %.8f relvolume %.8f desttxfee %.8f\n",dstr(maxutxo),relvolume,dstr(desttxfee));
+            maxprice = LP_fomoprice(base,rel,&relvolume);
+            printf("fomoprice %.8f relvolume %.8f\n",maxprice,relvolume);
+        } else printf("no utxo available\n");
+    }
     if ( maxprice <= 0. || relvolume <= 0. || LP_priceinfofind(base) == 0 || LP_priceinfofind(rel) == 0 )
         return(clonestr("{\"error\":\"invalid parameter\"}"));
     if ( strcmp("BTC",rel) == 0 )
         maxprice *= 1.01;
     else maxprice *= 1.001;
     memset(pubkeys,0,sizeof(pubkeys));
-    LP_txfees(&txfee,&desttxfee,base,rel);
     destsatoshis = SATOSHIDEN * relvolume + 2*desttxfee;
-    LP_address_utxo_reset(relcoin);
     autxo = 0;
     for (i=0; i<maxiters; i++)
     {

iguana/exchanges/LP_portfolio.c

@@ -459,6 +459,7 @@ void LP_autoprice_iter(void *ctx,struct LP_priceinfo *btcpp)
 {
     static cJSON *tickerjson; static uint32_t lasttime;
     char *retstr,*base,*rel; cJSON *retjson,*bid,*ask,*fundjson,*argjson; uint64_t bidsatoshis,asksatoshis; int32_t i,changed; double bidprice,askprice,bch_usd,bch_btc,nxtkmd,price,factor,offset,newprice,buymargin,sellmargin,price_btc,price_usd,kmd_btc,kmd_usd; struct LP_priceinfo *kmdpp,*fiatpp,*nxtpp,*basepp,*relpp;
+    printf("AUTOPRICE numautorefs.%d\n",num_LP_autorefs);
     if ( (retstr= issue_curlt("https://bittrex.com/api/v1.1/public/getmarketsummaries",LP_HTTP_TIMEOUT*10)) == 0 )
     {
         printf("trex error getting marketsummaries\n");
@@ -677,7 +678,7 @@ int32_t LP_autoprice(void *ctx,char *base,char *rel,cJSON *argjson)
         refrel = jstr(argjson,"refrel");
         fundvalue_bid = jstr(argjson,"fundvalue_bid");
         fundvalue_ask = jstr(argjson,"fundvalue_ask");
-        if ( fundvalue_bid != 0 || fundvalue_ask != 0 || fixedprice > SMALLVAL || (refbase != 0 && refrel != 0) )
+        if ( fundvalue_bid != 0 || fundvalue_ask != 0 || fixedprice > SMALLVAL || (refbase != 0 && refrel != 0 && strlen(refbase) > 0 && strlen(refrel) > 0) )
         {
             if ( fixedprice > SMALLVAL )
             {
@@ -762,7 +763,7 @@ int32_t LP_portfolio_trade(void *ctx,uint32_t *requestidp,uint32_t *quoteidp,str
             //if ( LP_utxo_bestfit(sell->symbol,SATOSHIDEN * relvolume) != 0 )
             {
                 memset(zero.bytes,0,sizeof(zero));
-                if ( (retstr2= LP_autobuy(ctx,"127.0.0.1",-1,buy->symbol,sell->symbol,maxprice,relvolume,60,24*3600,gui,LP_lastnonce+1,zero,1)) != 0 )
+                if ( (retstr2= LP_autobuy(ctx,0,"127.0.0.1",-1,buy->symbol,sell->symbol,maxprice,relvolume,60,24*3600,gui,LP_lastnonce+1,zero,1)) != 0 )
                 {
                     if ( (retjson2= cJSON_Parse(retstr2)) != 0 )
                     {

iguana/exchanges/LP_prices.c

@@ -755,9 +755,9 @@ cJSON *LP_orderbookjson(char *symbol,struct LP_orderbookentry *op)
         jaddstr(item,"address",op->coinaddr);
         jaddnum(item,"price",op->price);
         jaddnum(item,"numutxos",op->numutxos);
-        jaddnum(item,"avevolume",dstr(op->avesatoshis)*0.8);
-        jaddnum(item,"maxvolume",dstr(op->maxsatoshis)*0.8);
-        jaddnum(item,"depth",dstr(op->depth)*0.8);
+        jaddnum(item,"avevolume",dstr(op->avesatoshis));
+        jaddnum(item,"maxvolume",dstr(op->maxsatoshis));
+        jaddnum(item,"depth",dstr(op->depth));
         jaddbits256(item,"pubkey",op->pubkey);
         jaddnum(item,"age",time(NULL)-op->timestamp);
         jaddnum(item,"zcredits",dstr(op->dynamictrust));
@@ -969,6 +969,43 @@ char *LP_orderbook(char *base,char *rel,int32_t duration)
     return(jprint(retjson,1));
 }
 
+double LP_fomoprice(char *base,char *rel,double *relvolumep)
+{
+    char *retstr; cJSON *retjson,*asks,*item; int32_t i,numasks; double maxvol=0.,relvolume,biggest,price,fomoprice = 0.;
+    relvolume = *relvolumep;
+    if ( (retstr= LP_orderbook(base,rel,0)) != 0 )
+    {
+        if ( (retjson= cJSON_Parse(retstr)) != 0 )
+        {
+            if ( (asks= jarray(&numasks,retjson,"asks")) != 0 && numasks > 0 )
+            {
+                for (i=0; i<numasks; i++)
+                {
+                    item = jitem(asks,i);
+                    biggest = jdouble(item,"maxvolume");
+                    price = jdouble(item,"price");
+                    if ( biggest > maxvol )
+                    {
+                        maxvol = biggest;
+                        fomoprice = price;
+                    }
+                    printf("fomoprice (%.8f) i.%d %.8f vol %.8f [max %.8f @ %.8f]\n",relvolume,i,price,biggest,maxvol,fomoprice);
+                }
+            }
+            free_json(retjson);
+        }
+        free(retstr);
+    }
+    if ( maxvol > 0. && fomoprice > 0. )
+    {
+        if ( maxvol < relvolume )
+            relvolume = maxvol * 0.98;
+        fomoprice /= 0.95;
+    } else fomoprice = 0.;
+    *relvolumep = relvolume;
+    return(fomoprice);
+}
+
 int64_t LP_KMDvalue(struct iguana_info *coin,int64_t balance)
 {
     double price = 0.; int64_t KMDvalue=0;

iguana/exchanges/LP_remember.c

@@ -440,7 +440,7 @@ int32_t basilisk_isbobcoin(int32_t iambob,int32_t ind)
     }
 }
 
-int32_t basilisk_swap_isfinished(uint32_t requestid,uint32_t quoteid,uint32_t expiration,int32_t iambob,bits256 *txids,int32_t *sentflags,bits256 paymentspent,bits256 Apaymentspent,bits256 depositspent)
+int32_t basilisk_swap_isfinished(uint32_t requestid,uint32_t quoteid,uint32_t expiration,int32_t iambob,bits256 *txids,int32_t *sentflags,bits256 paymentspent,bits256 Apaymentspent,bits256 depositspent,uint32_t lockduration)
 {
     int32_t i,n = 0; uint32_t now = (uint32_t)time(NULL);
     if ( bits256_nonz(paymentspent) != 0 && bits256_nonz(Apaymentspent) != 0 && bits256_nonz(depositspent) != 0 )
@@ -460,7 +460,7 @@ int32_t basilisk_swap_isfinished(uint32_t requestid,uint32_t quoteid,uint32_t ex
             } else return(1);
         }
     }
-    if ( now > expiration - INSTANTDEX_LOCKTIME )
+    if ( now > expiration - lockduration )
     {
         if ( bits256_nonz(paymentspent) != 0 )
             n++;
@@ -683,7 +683,7 @@ cJSON *LP_swap_json(struct LP_swap_remember *rswap)
 
 int32_t LP_rswap_init(struct LP_swap_remember *rswap,uint32_t requestid,uint32_t quoteid,int32_t forceflag)
 {
-    char fname[1024],*fstr,*secretstr,*srcstr,*deststr,*dest33,*txname; long fsize; cJSON *item,*txobj,*array; bits256 privkey; struct iguana_info *coin; uint32_t r,q; int32_t i,j,n; uint8_t other33[33];
+    char fname[1024],*fstr,*secretstr,*srcstr,*deststr,*dest33,*txname; long fsize; cJSON *item,*txobj,*array; bits256 privkey; struct iguana_info *coin; uint32_t r,q; int32_t i,j,n; uint8_t other33[33]; uint32_t lockduration;
     memset(rswap,0,sizeof(*rswap));
     rswap->requestid = requestid;
     rswap->quoteid = quoteid;
@@ -816,7 +816,8 @@ int32_t LP_rswap_init(struct LP_swap_remember *rswap,uint32_t requestid,uint32_t
             }
             free_json(txobj);
         }
-        rswap->origfinishedflag = basilisk_swap_isfinished(requestid,quoteid,rswap->expiration,rswap->iambob,rswap->txids,rswap->sentflags,rswap->paymentspent,rswap->Apaymentspent,rswap->depositspent);
+        lockduration = LP_atomic_locktime(rswap->bobcoin,rswap->alicecoin);
+        rswap->origfinishedflag = basilisk_swap_isfinished(requestid,quoteid,rswap->expiration,rswap->iambob,rswap->txids,rswap->sentflags,rswap->paymentspent,rswap->Apaymentspent,rswap->depositspent,lockduration);
         rswap->finishedflag = rswap->origfinishedflag;
         if ( forceflag != 0 )
             rswap->finishedflag = rswap->origfinishedflag = 0;
@@ -1067,7 +1068,7 @@ int32_t LP_spends_set(struct LP_swap_remember *rswap)
 cJSON *basilisk_remember(int32_t fastflag,int64_t *KMDtotals,int64_t *BTCtotals,uint32_t requestid,uint32_t quoteid,int32_t forceflag,int32_t pendingonly)
 {
     static void *ctx;
-    struct LP_swap_remember rswap; int32_t i,j,flag,numspent,len,secretstart,redeemlen; char str[65],*srcAdest,*srcBdest,*destAdest,*destBdest,otheraddr[64],*fstr,fname[512],bobtomic[128],alicetomic[128],bobstr[65],alicestr[65]; cJSON *item,*txoutobj,*retjson; bits256 rev,revAm,signedtxid,zero,deadtxid; uint32_t claimtime; struct iguana_info *bob=0,*alice=0; uint8_t redeemscript[1024],userdata[1024]; long fsize;
+    struct LP_swap_remember rswap; int32_t i,j,flag,numspent,len,secretstart,redeemlen; char str[65],*srcAdest,*srcBdest,*destAdest,*destBdest,otheraddr[64],*fstr,fname[512],bobtomic[128],alicetomic[128],bobstr[65],alicestr[65]; cJSON *item,*txoutobj,*retjson; bits256 rev,revAm,signedtxid,zero,deadtxid; uint32_t claimtime,lockduration; struct iguana_info *bob=0,*alice=0; uint8_t redeemscript[1024],userdata[1024]; long fsize;
     sprintf(fname,"%s/SWAPS/%u-%u.finished",GLOBAL_DBDIR,requestid,quoteid), OS_compatible_path(fname);
     if ( (fstr= OS_filestr(&fsize,fname)) != 0 )
     {
@@ -1096,6 +1097,7 @@ cJSON *basilisk_remember(int32_t fastflag,int64_t *KMDtotals,int64_t *BTCtotals,
     bob = LP_coinfind(rswap.bobcoin);
     LP_etomicsymbol(bobstr,bobtomic,rswap.src);
     LP_etomicsymbol(alicestr,alicetomic,rswap.dest);
+    lockduration = LP_atomic_locktime(rswap.bobcoin,rswap.alicecoin);
     if ( rswap.bobcoin[0] == 0 || rswap.alicecoin[0] == 0 || strcmp(rswap.bobcoin,bobstr) != 0 || strcmp(rswap.alicecoin,alicestr) != 0 )
     {
         //printf("legacy r%u-q%u DB SWAPS.(%u %u) %llu files BOB.(%s) Alice.(%s) src.(%s) dest.(%s)\n",requestid,quoteid,rswap.requestid,rswap.quoteid,(long long)rswap.aliceid,rswap.bobcoin,rswap.alicecoin,rswap.src,rswap.dest);
@@ -1216,7 +1218,7 @@ cJSON *basilisk_remember(int32_t fastflag,int64_t *KMDtotals,int64_t *BTCtotals,
         rswap.paymentspent = basilisk_swap_spendupdate(rswap.iambob,rswap.bobcoin,rswap.bobpaymentaddr,rswap.sentflags,rswap.txids,BASILISK_BOBPAYMENT,BASILISK_ALICESPEND,BASILISK_BOBRECLAIM,0,srcAdest,srcBdest,rswap.Adestaddr,rswap.destaddr);
         rswap.Apaymentspent = basilisk_swap_spendupdate(rswap.iambob,rswap.alicecoin,rswap.alicepaymentaddr,rswap.sentflags,rswap.txids,BASILISK_ALICEPAYMENT,BASILISK_ALICERECLAIM,BASILISK_BOBSPEND,0,destAdest,destBdest,rswap.Adestaddr,rswap.destaddr);
         rswap.depositspent = basilisk_swap_spendupdate(rswap.iambob,rswap.bobcoin,rswap.bobdepositaddr,rswap.sentflags,rswap.txids,BASILISK_BOBDEPOSIT,BASILISK_ALICECLAIM,BASILISK_BOBREFUND,0,srcAdest,srcBdest,rswap.Adestaddr,rswap.destaddr);
-        rswap.finishedflag = basilisk_swap_isfinished(requestid,quoteid,rswap.expiration,rswap.iambob,rswap.txids,rswap.sentflags,rswap.paymentspent,rswap.Apaymentspent,rswap.depositspent);
+        rswap.finishedflag = basilisk_swap_isfinished(requestid,quoteid,rswap.expiration,rswap.iambob,rswap.txids,rswap.sentflags,rswap.paymentspent,rswap.Apaymentspent,rswap.depositspent,lockduration);
         LP_spends_set(&rswap);
         if ( rswap.iambob == 0 )
         {
@@ -1455,7 +1457,14 @@ cJSON *basilisk_remember(int32_t fastflag,int64_t *KMDtotals,int64_t *BTCtotals,
                         free_json(txoutobj), flag = 0;
                     else flag = -1, rswap.depositspent = deadtxid;
                 }
-                if ( flag == 0 && (bits256_nonz(rswap.Apaymentspent) != 0 || time(NULL) > rswap.dlocktime-777 || (bits256_nonz(rswap.txids[BASILISK_ALICEPAYMENT]) == 0 && time(NULL) > rswap.plocktime-777) || (bits256_nonz(rswap.txids[BASILISK_BOBPAYMENT]) == 0 && time(NULL) > rswap.dlocktime-3*INSTANTDEX_LOCKTIME/2)) )
+                //printf("lockduration.%d plocktime.%u lag.%d\n",lockduration,rswap.plocktime,(int32_t)(time(NULL) - (rswap.plocktime-lockduration+1800)));
+                if ( flag == 0 && (
+                                   bits256_nonz(rswap.Apaymentspent) != 0 ||
+                                   time(NULL) > rswap.dlocktime-777 ||
+                                   (bits256_nonz(rswap.txids[BASILISK_ALICEPAYMENT]) == 0 && time(NULL) > rswap.plocktime-777) ||
+                                   (bits256_nonz(rswap.txids[BASILISK_BOBPAYMENT]) != 0 && rswap.sentflags[BASILISK_BOBPAYMENT] == 0 && time(NULL) > rswap.plocktime-lockduration+1800) || // failed bobpayment
+                                   (bits256_nonz(rswap.txids[BASILISK_BOBPAYMENT]) == 0 && time(NULL) > rswap.dlocktime-3*lockduration/2)
+                                   ) )
                 {
                     //printf("do the refund! paymentspent.%s now.%u vs expiration.%u\n",bits256_str(str,rswap.paymentspent),(uint32_t)time(NULL),rswap.expiration);
                     //if ( txbytes[BASILISK_BOBREFUND] == 0 )
@@ -1508,7 +1517,7 @@ cJSON *basilisk_remember(int32_t fastflag,int64_t *KMDtotals,int64_t *BTCtotals,
     LP_totals_update(rswap.iambob,rswap.alicecoin,rswap.bobcoin,KMDtotals,BTCtotals,rswap.sentflags,rswap.values);
     if ( (numspent= LP_spends_set(&rswap)) == 3 )
         rswap.finishedflag = 1;
-    else rswap.finishedflag = basilisk_swap_isfinished(requestid,quoteid,rswap.expiration,rswap.iambob,rswap.txids,rswap.sentflags,rswap.paymentspent,rswap.Apaymentspent,rswap.depositspent);
+    else rswap.finishedflag = basilisk_swap_isfinished(requestid,quoteid,rswap.expiration,rswap.iambob,rswap.txids,rswap.sentflags,rswap.paymentspent,rswap.Apaymentspent,rswap.depositspent,lockduration);
     if ( rswap.origfinishedflag == 0 && rswap.finishedflag != 0 )
     {
         char fname[1024],*itemstr; FILE *fp;

iguana/exchanges/LP_rpc.c

@@ -150,6 +150,7 @@ uint64_t LP_RTsmartbalance(struct iguana_info *coin)
                 item = jitem(array,i);
                 value = LP_value_extract(item,1);
                 valuesum += value;
+                //printf("%s -> %.8f\n",jprint(item,0),dstr(value));
             }
         }
         free_json(array);
@@ -370,7 +371,7 @@ int32_t LP_address_iswatchonly(char *symbol,char *address)
         return(0);
     if ( (retjson= LP_validateaddress(symbol,address)) != 0 )
     {
-        if ( (obj= jobj(retjson,"iswatchonly")) != 0 && is_cJSON_True(obj) != 0 )
+        if ( ((obj= jobj(retjson,"iswatchonly")) != 0 || (obj= jobj(retjson,"watchonly")) != 0) && is_cJSON_True(obj) != 0 )
         {
             doneflag = 1;
             //printf("%s iswatchonly (%s)\n",address,jprint(retjson,0));
@@ -411,15 +412,18 @@ cJSON *LP_listunspent(char *symbol,char *coinaddr,bits256 reftxid,bits256 reftxi
     {
         if ( (ap= LP_addressfind(coin,coinaddr)) != 0 )
         {
-            if ( ap->unspenttime == 0 )
+            if ( ap->unspenttime == 0 || strcmp(coin->symbol,"DYN") == 0 )
                 usecache = 0;
-            else if ( G.LP_pendingswaps != 0 && time(NULL) > ap->unspenttime+1 )
+            else if ( time(NULL) > ap->unspenttime+3 )
                 usecache = 0;
+            //printf("%s %s usecache.%d iswatched.%d\n",coin->symbol,coinaddr,usecache,LP_address_iswatchonly(symbol,coinaddr));
             if ( usecache != 0 && (retstr= LP_unspents_filestr(symbol,coinaddr)) != 0 )
             {
                 retjson = cJSON_Parse(retstr);
                 free(retstr);
-                return(retjson);
+                if ( cJSON_GetArraySize(retjson) > 0 )
+                    return(retjson);
+                else free_json(retjson);
             }
         }
         //printf("%s %s usecache.%d iswatched.%d\n",coin->symbol,coinaddr,usecache,LP_address_iswatchonly(symbol,coinaddr));
@@ -429,8 +433,8 @@ cJSON *LP_listunspent(char *symbol,char *coinaddr,bits256 reftxid,bits256 reftxi
                 numconfs = 0;
             else numconfs = 1;
             sprintf(buf,"[%d, 99999999, [\"%s\"]]",numconfs,coinaddr);
-//printf("LP_listunspent.(%s %s)\n",symbol,coinaddr);
             retjson = bitcoin_json(coin,"listunspent",buf);
+//printf("LP_listunspent.(%s %s) -> %s\n",symbol,coinaddr,jprint(retjson,0));
             if ( (n= cJSON_GetArraySize(retjson)) > 0 )
             {
                 array = cJSON_CreateArray();
@@ -575,7 +579,7 @@ int32_t LP_importaddress(char *symbol,char *address)
             //printf("validated.(%s)\n",jprint(validatejson,0));
             if ( (isvalid= is_cJSON_True(jobj(validatejson,"isvalid")) != 0) != 0 )
             {
-                if ( is_cJSON_True(jobj(validatejson,"iswatchonly")) != 0 || is_cJSON_True(jobj(validatejson,"ismine")) != 0 )
+                if ( is_cJSON_True(jobj(validatejson,"iswatchonly")) != 0 || is_cJSON_True(jobj(validatejson,"watchonly")) != 0 || is_cJSON_True(jobj(validatejson,"ismine")) != 0 )
                     doneflag = 1;
             }
             free_json(validatejson);

iguana/exchanges/LP_signatures.c

@@ -422,9 +422,8 @@ int32_t LP_price_sigadd(cJSON *item,uint32_t timestamp,bits256 priv,uint8_t *pub
 
 char *LP_pricepings(void *ctx,char *myipaddr,int32_t pubsock,char *base,char *rel,double price)
 {
-    struct iguana_info *basecoin,*relcoin,*kmd; struct LP_address *ap; char pubsecpstr[67]; uint32_t numutxos,timestamp; uint64_t price64,balance,minsize,maxsize; bits256 zero; cJSON *reqjson;
+    struct iguana_info *basecoin,*relcoin,*kmd; struct LP_address *ap; char pubsecpstr[67]; uint32_t numutxos,timestamp; uint64_t price64,median,minsize,maxsize; bits256 zero; cJSON *reqjson;
     reqjson = cJSON_CreateObject();
-    // LP_addsig
     if ( (basecoin= LP_coinfind(base)) != 0 && (relcoin= LP_coinfind(rel)) != 0 )//&& basecoin->electrum == 0 )//&& relcoin->electrum == 0 )
     {
         memset(zero.bytes,0,sizeof(zero));
@@ -441,12 +440,12 @@ char *LP_pricepings(void *ctx,char *myipaddr,int32_t pubsock,char *base,char *re
         jaddstr(reqjson,"pubsecp",pubsecpstr);
         if ( (kmd= LP_coinfind("KMD")) != 0 && (ap= LP_address(kmd,kmd->smartaddr)) != 0 && ap->instantdex_credits != 0 )
             jaddnum(reqjson,"credits",dstr(ap->instantdex_credits));
-        if ( (numutxos= LP_address_minmax(&balance,&minsize,&maxsize,basecoin,basecoin->smartaddr)) != 0 )
+        if ( (numutxos= LP_address_minmax(1,&median,&minsize,&maxsize,basecoin,basecoin->smartaddr)) != 0 )
         {
-            //printf("send %s numutxos.%d balance %.8f min %.8f max %.8f\n",base,numutxos,dstr(balance),dstr(minsize),dstr(maxsize));
+            //printf("send %s numutxos.%d median %.8f min %.8f max %.8f\n",base,numutxos,dstr(median),dstr(minsize),dstr(maxsize));
             jaddstr(reqjson,"utxocoin",base);
             jaddnum(reqjson,"n",numutxos);
-            jaddnum(reqjson,"bal",dstr(balance));
+            jaddnum(reqjson,"bal",dstr(median) * numutxos);
             jaddnum(reqjson,"min",dstr(minsize));
             jaddnum(reqjson,"max",dstr(maxsize));
         }

iguana/exchanges/LP_tradebots.c

@@ -338,7 +338,7 @@ void LP_tradebot_timeslice(void *ctx,struct LP_tradebot *bot)
                     {
                         if ( remaining < 0.001 )
                             break;
-                        if ( (retstr= LP_autobuy(ctx,LP_myipaddr,LP_mypubsock,bot->base,bot->rel,bot->maxprice,remaining/i,0,0,G.gui,0,destpubkey,tradeid)) != 0 )
+                        if ( (retstr= LP_autobuy(ctx,0,LP_myipaddr,LP_mypubsock,bot->base,bot->rel,bot->maxprice,remaining/i,0,0,G.gui,0,destpubkey,tradeid)) != 0 )
                         {
                             if ( (retjson2= cJSON_Parse(retstr)) != 0 )
                             {

iguana/exchanges/LP_transaction.c

@@ -1521,12 +1521,12 @@ char *LP_opreturndecrypt(void *ctx,char *symbol,bits256 utxotxid,char *passphras
 char *LP_withdraw(struct iguana_info *coin,cJSON *argjson)
 {
     static void *ctx;
-    int32_t broadcast,allocated_outputs=0,iter,i,utxovout,autofee,completed=0,maxV,numvins,numvouts,datalen,suppress_pubkeys; bits256 privkey; struct LP_address *ap; char changeaddr[64],vinaddr[64],str[65],*signret,*signedtx=0,*rawtx=0; struct vin_info *V; uint32_t locktime; cJSON *retjson,*item,*outputs,*vins=0,*txobj=0,*privkeys=0; struct iguana_msgtx msgtx; bits256 utxotxid,signedtxid; uint64_t txfee,newtxfee=10000;
+    int32_t broadcast,allocated_outputs=0,iter,i,num,utxovout,autofee,completed=0,maxV,numvins,numvouts,datalen,suppress_pubkeys; bits256 privkey; struct LP_address *ap; char changeaddr[64],vinaddr[64],str[65],*signret,*signedtx=0,*rawtx=0; struct vin_info *V; uint32_t locktime; cJSON *retjson,*item,*outputs,*vins=0,*txobj=0,*privkeys=0; struct iguana_msgtx msgtx; bits256 utxotxid,signedtxid; uint64_t txfee,newtxfee=10000;
 //printf("withdraw.%s %s\n",coin->symbol,jprint(argjson,0));
     if ( coin->etomic[0] != 0 )
     {
         if ( (coin= LP_coinfind("ETOMIC")) == 0 )
-            return(0);
+            return(clonestr("{\"error\":\"use LP_eth_withdraw for ETH or ERC20\"}"));
     }
     if ( ctx == 0 )
         ctx = bitcoin_ctx();
@@ -1569,14 +1569,7 @@ char *LP_withdraw(struct iguana_info *coin,cJSON *argjson)
     V = malloc(maxV * sizeof(*V));
     for (iter=0; iter<2; iter++)
     {
-        if ( (ap= LP_address_utxo_reset(coin)) == 0 )
-        {
-            printf("LP_withdraw error utxo reset %s\n",coin->symbol);
-            free(V);
-            if ( allocated_outputs != 0 )
-                free_json(outputs);
-            return(0);
-        }
+        LP_address_utxo_reset(&num,coin);
         privkeys = cJSON_CreateArray();
         vins = cJSON_CreateArray();
         memset(V,0,sizeof(*V) * maxV);
@@ -1660,6 +1653,42 @@ char *LP_withdraw(struct iguana_info *coin,cJSON *argjson)
     return(jprint(retjson,1));
 }
 
+char *LP_autosplit(struct iguana_info *coin)
+{
+    char *retstr; cJSON *argjson,*withdrawjson,*outputs,*item; int64_t total,balance,halfval;
+    if ( coin->etomic[0] == 0 )
+    {
+        if ( coin->electrum != 0 )
+            balance = LP_unspents_load(coin->symbol,coin->smartaddr);
+        else balance = LP_RTsmartbalance(coin);
+        //printf("%s balance %.8f\n",coin->symbol,dstr(balance));
+        balance -= coin->txfee - 0.001;
+        if ( balance > coin->txfee )
+        {
+            halfval = (balance / 100) * 45;
+            argjson = cJSON_CreateObject();
+            outputs = cJSON_CreateArray();
+            item = cJSON_CreateObject();
+            jaddnum(item,coin->smartaddr,dstr(halfval));
+            jaddi(outputs,item);
+            item = cJSON_CreateObject();
+            jaddnum(item,coin->smartaddr,dstr(halfval));
+            jaddi(outputs,item);
+            item = cJSON_CreateObject();
+            jaddnum(item,coin->smartaddr,dstr(balance - 2*halfval));
+            jaddi(outputs,item);
+            jadd(argjson,"outputs",outputs);
+            jaddnum(argjson,"broadcast",1);
+            jaddstr(argjson,"coin",coin->symbol);
+            //printf("autosplit.(%s)\n",jprint(argjson,0));
+            retstr = LP_withdraw(coin,argjson);
+            free_json(argjson);
+            return(retstr);
+        } else return(clonestr("{\"error\":\"less than 0.0011 in balance\"}"));
+    }
+    return(clonestr("{\"error\":\"couldnt autosplit\"}"));
+}
+
 #ifndef NOTETOMIC
 
 char *LP_eth_withdraw(struct iguana_info *coin,cJSON *argjson)
@@ -1685,6 +1714,8 @@ char *LP_eth_withdraw(struct iguana_info *coin,cJSON *argjson)
 
 #endif
 
+
+
 int32_t basilisk_rawtx_gen(void *ctx,char *str,uint32_t swapstarted,uint8_t *pubkey33,int32_t iambob,int32_t lockinputs,struct basilisk_rawtx *rawtx,uint32_t locktime,uint8_t *script,int32_t scriptlen,int64_t txfee,int32_t minconf,int32_t delay,bits256 privkey,uint8_t *changermd160,char *vinaddr)
 {
     struct iguana_info *coin; int32_t len,retval=-1; char *retstr,*hexstr; cJSON *argjson,*outputs,*item,*retjson,*obj;

iguana/exchanges/LP_utxo.c

@@ -283,30 +283,64 @@ struct LP_address *LP_address(struct iguana_info *coin,char *coinaddr)
     return(ap);
 }
 
-int32_t LP_address_minmax(uint64_t *balancep,uint64_t *minp,uint64_t *maxp,struct iguana_info *coin,char *coinaddr)
+int32_t LP_address_minmax(int32_t iambob,uint64_t *medianp,uint64_t *minp,uint64_t *maxp,struct iguana_info *coin,char *coinaddr)
 {
-    cJSON *array,*item; bits256 txid,zero; int64_t value; int32_t i,vout,height,n = 0;
-    *minp = *maxp = *balancep = 0;
+    cJSON *array,*item; bits256 txid,zero; int64_t max,max2,value; uint64_t *buf; int32_t i,m=0,vout,height,n = 0;
+    *minp = *maxp = *medianp = max = max2 = 0;
     memset(zero.bytes,0,sizeof(zero));
     if ( (array= LP_listunspent(coin->symbol,coinaddr,zero,zero)) != 0 )
     {
         //printf("address minmax.(%s)\n",jprint(array,0));
         if ( (n= cJSON_GetArraySize(array)) > 0 )
         {
-            for (i=0; i<n; i++)
+            buf = calloc(sizeof(*buf),n);
+            for (i=m=0; i<n; i++)
             {
                 item = jitem(array,i);
                 value = LP_listunspent_parseitem(coin,&txid,&vout,&height,item);
-                if ( value > *maxp )
-                    *maxp = value;
+                if ( LP_allocated(txid,vout) != 0 )
+                    continue;
+                buf[m++] = value;
+                if ( value > max )
+                {
+                    max2 = max;
+                    max = value;
+                }
+                else if ( value > max2 )
+                    max2 = value;
                 if ( *minp == 0 || value < *minp )
                     *minp = value;
-                *balancep += value;
             }
+            if ( m > 1 )
+            {
+                revsort64s(buf,m,sizeof(*buf));
+                if ( iambob != 0 )
+                {
+                    if ( max == buf[0] && max2 == buf[1] )
+                    {
+                        for (i=1; i<m; i++)
+                        {
+                            if ( max >= LP_DEPOSITSATOSHIS(buf[i]) )
+                            {
+                                *maxp = buf[i];
+                                *medianp = buf[m/2];
+                                break;
+                            }
+                        }
+                    } else printf("sort error? max %.8f != %.8f\n",dstr(max),dstr(buf[0]));
+                }
+                else
+                {
+                    *maxp = buf[0];
+                    *medianp = buf[m/2];
+                    printf("alice addressmin max %s %.8f %.8f %.8f num.%d\n",coin->symbol,dstr(*minp),dstr(*maxp),dstr(*medianp),m);
+                }
+            } else *minp = *maxp = *medianp = 0;
+            free(buf);
         }
         free_json(array);
     }
-    return(n);
+    return(m/2);
 }
 
 int32_t LP_address_utxo_ptrs(struct iguana_info *coin,int32_t iambob,struct LP_address_utxo **utxos,int32_t max,struct LP_address *ap,char *coinaddr)
@@ -326,7 +360,7 @@ int32_t LP_address_utxo_ptrs(struct iguana_info *coin,int32_t iambob,struct LP_a
                 {
                     if ( LP_value_extract(txout,0) == 0 )
                     {
-                        //printf("LP_address_utxo_ptrs skip zero value %s/v%d\n",bits256_str(str,up->U.txid),up->U.vout);
+//char str[65]; printf("LP_address_utxo_ptrs skip zero value %s/v%d\n",bits256_str(str,up->U.txid),up->U.vout);
                         free_json(txout);
                         up->spendheight = 1;
                         if ( (tx= LP_transactionfind(coin,up->U.txid)) != 0 && up->U.vout < tx->numvouts )
@@ -337,7 +371,7 @@ int32_t LP_address_utxo_ptrs(struct iguana_info *coin,int32_t iambob,struct LP_a
                 }
                 else
                 {
-                    //printf("LP_address_utxo_ptrs skips %s %s payment %s/v%d is spent\n",coin->symbol,coinaddr,bits256_str(str,up->U.txid),up->U.vout);
+//char str[65]; printf("LP_address_utxo_ptrs skips %s %s payment %s/v%d is spent\n",coin->symbol,coinaddr,bits256_str(str,up->U.txid),up->U.vout);
                     up->spendheight = 1;
                     if ( (tx= LP_transactionfind(coin,up->U.txid)) != 0 && up->U.vout < tx->numvouts )
                         tx->outpoints[up->U.vout].spendheight = 1;
@@ -482,11 +516,12 @@ int32_t LP_address_utxoadd(int32_t skipsearch,uint32_t timestamp,char *debug,str
     return(retval);
 }
 
-struct LP_address *LP_address_utxo_reset(struct iguana_info *coin)
+struct LP_address *LP_address_utxo_reset(int32_t *nump,struct iguana_info *coin)
 {
     struct LP_address *ap; struct LP_address_utxo *up,*tmp; int32_t i,n,numconfs,m,vout,height; cJSON *array,*item,*txobj; bits256 zero; int64_t value; bits256 txid; uint32_t now;
     LP_address(coin,coin->smartaddr);
     memset(zero.bytes,0,sizeof(zero));
+    *nump = 0;
     LP_listunspent_issue(coin->symbol,coin->smartaddr,2,zero,zero);
     if ( (ap= LP_addressfind(coin,coin->smartaddr)) == 0 )
     {
@@ -499,7 +534,6 @@ struct LP_address *LP_address_utxo_reset(struct iguana_info *coin)
     portable_mutex_lock(&coin->addressutxo_mutex);
     if ( (array= LP_listunspent(coin->symbol,coin->smartaddr,zero,zero)) != 0 )
     {
-        //printf("reset %s ap->utxos\n",coin->symbol);
         portable_mutex_lock(&coin->addrmutex);
         portable_mutex_lock(&LP_gcmutex);
         DL_FOREACH_SAFE(ap->utxos,up,tmp)
@@ -514,9 +548,9 @@ struct LP_address *LP_address_utxo_reset(struct iguana_info *coin)
         if ( (n= cJSON_GetArraySize(array)) > 0 )
         {
             char str[65];
+            *nump = n;
             for (i=m=0; i<n; i++)
             {
-                //{"tx_hash":"38d1b7c73015e1b1d6cb7fc314cae402a635b7d7ea294970ab857df8777a66f4","tx_pos":0,"height":577975,"value":238700}
                 item = jitem(array,i);
                 value = LP_listunspent_parseitem(coin,&txid,&vout,&height,item);
                 if ( bits256_nonz(txid) == 0 )
@@ -525,20 +559,20 @@ struct LP_address *LP_address_utxo_reset(struct iguana_info *coin)
                 {
                     if ( (txobj= LP_gettxout(coin->symbol,coin->smartaddr,txid,vout)) == 0 )
                     {
-                        //printf("skip null gettxout %s.v%d\n",bits256_str(str,txid),vout);
+//printf("skip null gettxout %s.v%d\n",bits256_str(str,txid),vout);
                         continue;
                     }
                     else free_json(txobj);
                     if ( (numconfs= LP_numconfirms(coin->symbol,coin->smartaddr,txid,vout,0)) <= 0 )
                     {
-                        //printf("skip numconfs.%d %s.v%d\n",numconfs,bits256_str(str,txid),vout);
+//printf("skip numconfs.%d %s.v%d\n",numconfs,bits256_str(str,txid),vout);
                         continue;
                     }
                 }
                 LP_address_utxoadd(1,now,"withdraw",coin,coin->smartaddr,txid,vout,value,height,-1);
                 if ( (up= LP_address_utxofind(coin,coin->smartaddr,txid,vout)) == 0 )
                 {
-                    //printf("couldnt find just added %s/%d ht.%d %.8f\n",bits256_str(str,txid),vout,height,dstr(value));
+//printf("couldnt find just added %s/%d ht.%d %.8f\n",bits256_str(str,txid),vout,height,dstr(value));
                 }
                 else
                 {
@@ -641,6 +675,7 @@ cJSON *LP_address_balance(struct iguana_info *coin,char *coinaddr,int32_t electr
 {
     cJSON *array,*retjson,*item; bits256 zero; int32_t i,n; uint64_t balance = 0;
     memset(zero.bytes,0,sizeof(zero));
+    //printf("address balance call LP_listunspent %s electrum.%p etomic.%d\n",coin->symbol,coin->electrum,coin->etomic[0]);
 #ifndef NOTETOMIC
     if (coin->etomic[0] != 0) {
         balance = LP_etomic_get_balance(coin, coinaddr);
@@ -650,16 +685,21 @@ cJSON *LP_address_balance(struct iguana_info *coin,char *coinaddr,int32_t electr
     {
         if ( (array= LP_listunspent(coin->symbol,coinaddr,zero,zero)) != 0 )
         {
+            //printf("got address balance (%s)\n",jprint(array,0));
             if ( (n= cJSON_GetArraySize(array)) > 0 )
             {
                 for (i=0; i<n; i++)
                 {
                     item = jitem(array,i);
                     balance += LP_value_extract(item,1);
+                    //printf("i.%d (%s) balance %.8f\n",i,jprint(item,0),dstr(balance));
                 }
             }
             free_json(array);
         }
+        //uint64_t balance3,balance2 = LP_balance(&balance2,0,coin->symbol,coin->smartaddr);
+        //balance3 = LP_RTsmartbalance(coin);
+        //printf("balance %.8f vs balance2 %.8f vs balance3 %.8f\n",dstr(balance),dstr(balance2),dstr(balance3));
     }
     else
     {

iguana/exchanges/client

@@ -3,7 +3,7 @@ source passphrase
 source coins
 ./stop
 git pull;
-cp ../exchanges/updateprices;./updateprices
+cp ../exchanges/updateprices .;./updateprices
 cd ..; 
 ./m_mm;
 pkill -15 marketmaker; 

iguana/exchanges/dump

@@ -0,0 +1,3 @@
+#!/bin/bash
+source userpass
+curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"sell\",\"base\":\"KMD\",\"rel\":\"HODL\",\"dump\":40.00038}"

iguana/exchanges/etomicswap/CMakeLists.txt

@@ -4,6 +4,14 @@ add_library(etomiclib-mainnet etomiclib.cpp etomiccurl.c)
 target_compile_definitions(etomiclib-testnet PRIVATE ETOMIC_TESTNET)
 add_executable(alice alice.c)
 add_executable(bob bob.c)
+if(WIN32)
+add_definitions(-DNATIVE_WINDOWS)
+add_definitions(-DIGUANA_LOG2PACKETSIZE=20)
+add_definitions(-DIGUANA_MAXPACKETSIZE=1572864)
+add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+add_definitions(-DNOMINMAX)
+include_directories("${CMAKE_SOURCE_DIR}/includes")
+endif()
 include_directories("${CMAKE_SOURCE_DIR}/cpp-ethereum")
 target_link_libraries(etomiclib-testnet PUBLIC curl libcrypto777 ethcore devcrypto devcore pthread)
 target_link_libraries(etomiclib-mainnet PUBLIC curl libcrypto777 ethcore devcrypto devcore pthread)

iguana/exchanges/fomo

@@ -0,0 +1,3 @@
+#!/bin/bash
+source userpass
+curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"buy\",\"base\":\"KMD\",\"rel\":\"HODL\",\"fomo\":40.00038}"

iguana/iguana777.c

@@ -48,6 +48,7 @@ struct iguana_info *iguana_coinadd(char *symbol,char *name,cJSON *argjson,int32_
         {
             myinfo->allcoins_being_added = 1;
             coin = mycalloc('C',1,sizeof(*coin));
+            strcpy(coin->getinfostr,"getinfo");
             coin->blockspacesize = IGUANA_MAXPACKETSIZE + 8192;
             coin->blockspace = calloc(1,coin->blockspacesize);
             if ( virtcoin != 0 || ((privatechain= jstr(argjson,"geckochain")) != 0 && privatechain[0] != 0) )

iguana/m_mm

@@ -10,4 +10,5 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
 	nanomsg_lib="../OSlibs/osx/$(uname -m)/libnanomsg-static.a"
 fi
 
+rm marketmaker
 gcc -g -o marketmaker -DNOTETOMIC -I../crypto777 exchanges/mm.c ../crypto777/cJSON.c mini-gmp.c keccak.c groestl.c segwit_addr.c secp256k1.o ../agents/libcrypto777.a $nanomsg_lib -lcurl -lpthread  -lm

marketmaker_build_etomic.cmd

@@ -0,0 +1,56 @@
+@echo off
+rem (c) Decker
+
+echo [#1] Build nanomsg, curl and pthreads ...
+call marketmaker_build_depends.cmd
+copy marketmaker_depends\curl\build_msvc_2015_win64\lib\Release\libcurl_imp.lib marketmaker_depends\curl\build_msvc_2015_win64\lib\Release\curl.lib
+copy marketmaker_depends\pthread-win32\bin\x64_MSVC2015.Release\pthread_lib.lib marketmaker_depends\pthread-win32\bin\x64_MSVC2015.Release\pthread.lib
+
+echo [#2] Prepare build etomic needed things ...
+git submodule init
+git submodule update --init --recursive
+cd cpp-ethereum
+rem git submodule init
+rem git submodule update --init
+call scripts\install_deps.bat 
+cd ..
+mkdir build_win64_release
+cd build_win64_release
+cmake .. -G "Visual Studio 14 2015 Win64"
+
+rem Steps before build:
+rem 
+rem crypto777\CMakeLists.txt 
+rem Add:
+rem if(WIN32)
+rem add_definitions(-DNATIVE_WINDOWS)
+rem add_definitions(-DIGUANA_LOG2PACKETSIZE=20)
+rem add_definitions(-DIGUANA_MAXPACKETSIZE=1572864)
+rem include_directories("${CMAKE_SOURCE_DIR}/includes")
+rem endif()
+rem
+rem iguana\exchanges\CMakeLists.txt 
+rem
+rem if(WIN32)
+rem add_definitions(-DNATIVE_WINDOWS)
+rem add_definitions(-DIGUANA_LOG2PACKETSIZE=20)
+rem add_definitions(-DIGUANA_MAXPACKETSIZE=1572864)
+rem add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+rem include_directories("${CMAKE_SOURCE_DIR}/includes")
+rem endif()
+rem
+rem iguana\exchanges\etomicswap\CMakeLists.txt 
+rem
+rem if(WIN32)
+rem add_definitions(-DNATIVE_WINDOWS)
+rem add_definitions(-DIGUANA_LOG2PACKETSIZE=20)
+rem add_definitions(-DIGUANA_MAXPACKETSIZE=1572864)
+rem add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+rem add_definitions(-DNOMINMAX)
+rem include_directories("${CMAKE_SOURCE_DIR}/includes")
+rem endif()
+
+echo [#3] Build marketmaker-mainnet ...
+
+cmake --build . --config Release --target marketmaker-mainnet
+cd ..