Merge pull request #484 from jl777/spvdex

add back utxo info to orderbook, also critical section warning in swapstatus and fix for cipi's SVP validate error

iguana/exchanges/LP_cache.c

@@ -235,7 +235,7 @@ int32_t LP_merkleproof(struct iguana_info *coin,char *coinaddr,struct electrum_i
         return(0);
     if ( (tx= LP_transactionfind(coin,txid)) == 0 && strcmp(coinaddr,coin->smartaddr) == 0 )
     {
-        if ( (retjson= electrum_transaction(coin->symbol,ep,&retjson,txid)) != 0 )
+        if ( (retjson= electrum_transaction(coin->symbol,ep,&retjson,txid,0)) != 0 )
             free_json(retjson);
     }
     if ( tx != 0 )

iguana/exchanges/LP_include.h

@@ -23,7 +23,7 @@
 
 #define LP_MAJOR_VERSION "0"
 #define LP_MINOR_VERSION "1"
-#define LP_BUILD_NUMBER "15096"
+#define LP_BUILD_NUMBER "15256"
 #define LP_BARTERDEX_VERSION 1
 #define LP_MAGICBITS 8
 
@@ -364,12 +364,21 @@ struct basilisk_swap
     
 };
 
+struct LP_pubkey_quote
+{
+    struct LP_pubkey_quote *next,*prev;
+    float price;
+    uint32_t maxutxo,aveutxo;
+    uint8_t baseind,relind,numutxos,scale;
+};
+
 #define LP_MAXPRICEINFOS 256
 struct LP_pubkeyinfo
 {
     UT_hash_handle hh;
     bits256 pubkey;
-    float matrix[LP_MAXPRICEINFOS][LP_MAXPRICEINFOS];
+    struct LP_pubkey_quote *quotes;
+    //float matrix[LP_MAXPRICEINFOS][LP_MAXPRICEINFOS];
     //uint32_t timestamps[LP_MAXPRICEINFOS][LP_MAXPRICEINFOS];
     uint32_t timestamp,numerrors,lasttime;
     int32_t istrusted;

iguana/exchanges/LP_nativeDEX.c

@@ -17,11 +17,7 @@
 //  LP_nativeDEX.c
 //  marketmaker
 //
-// if ( G.LP_pendingswaps != 0 ) return(-1);
-// bot safe to exit?
-// 324744 and 50mb
 // BCH signing
-// single utxo allocations alice
 // alice waiting for bestprice
 //
 // previously, it used to show amount, kmd equiv, perc
@@ -97,7 +93,7 @@ struct LP_address_utxo *LP_garbage_collector2;
 
 //uint32_t LP_deadman_switch;
 uint16_t LP_fixed_pairport,LP_publicport;
-uint32_t LP_lastnonce,LP_counter;
+uint32_t LP_lastnonce,LP_counter,LP_swap_endcritical,LP_swap_critical;
 int32_t LP_mybussock = -1;
 int32_t LP_mypubsock = -1;
 int32_t LP_mypullsock = -1;
@@ -534,8 +530,6 @@ void LP_coinsloop(void *_coins)
             {
                 if ( (backupep= ep->prev) == 0 )
                     backupep = ep;
-                // skip cLP_address MNZ bXcSsYBiVKtTzYErqxvma4UsojZTEf5L6H
-                //printf("electrum %s\n",coin->symbol);
                 if ( (ap= LP_addressfind(coin,coin->smartaddr)) != 0 )
                 {
                     if ( (retjson= electrum_address_listunspent(coin->symbol,ep,&retjson,ap->coinaddr,1)) != 0 )
@@ -624,6 +618,8 @@ void LP_coinsloop(void *_coins)
             {
                 if ( LP_blockinit(coin,coin->lastscanht) < 0 )
                 {
+                    static uint32_t counter;
+                    if ( counter++ < 3 )
                         printf("blockinit.%s %d error\n",coin->symbol,coin->lastscanht);
                     break;
                 }
@@ -891,6 +887,11 @@ void LPinit(uint16_t myport,uint16_t mypullport,uint16_t mypubport,uint16_t mybu
     char *myipaddr=0,version[64]; long filesize,n; int32_t valid,timeout,pubsock=-1; struct LP_peerinfo *mypeer=0; char pushaddr[128],subaddr[128],bindaddr[128],*coins_str=0; cJSON *coinsjson=0; void *ctx = bitcoin_ctx();
     sprintf(version,"Marketmaker %s.%s %s rsize.%ld",LP_MAJOR_VERSION,LP_MINOR_VERSION,LP_BUILD_NUMBER,sizeof(struct basilisk_request));
     printf("%s %u\n",version,calc_crc32(0,version,(int32_t)strlen(version)));
+    if ( LP_MAXPRICEINFOS > 256 )
+    {
+        printf("LP_MAXPRICEINFOS %d wont fit in a uint8_t, need to increase the width of the baseind and relind for struct LP_pubkey_quote\n",LP_MAXPRICEINFOS);
+        exit(-1);
+    }
     LP_showwif = juint(argjson,"wif");
     if ( passphrase == 0 || passphrase[0] == 0 )
     {

iguana/exchanges/LP_ordermatch.c

@@ -405,7 +405,7 @@ struct LP_utxoinfo *LP_address_myutxopair(struct LP_utxoinfo *butxo,int32_t iamb
                 printf("targetval %.8f vol %.8f price %.8f txfee %.8f %s %s\n",dstr(targetval),relvolume,price,dstr(txfee),coin->symbol,coinaddr);
             }
             mini = -1;
-            if ( targetval != 0 && (mini= LP_nearest_utxovalue(coin,coinaddr,utxos,m,targetval)) >= 0 )
+            if ( targetval != 0 && (mini= LP_nearest_utxovalue(coin,coinaddr,utxos,m,targetval+txfee)) >= 0 )
             {
                 up = utxos[mini];
                 utxos[mini] = 0;
@@ -746,10 +746,23 @@ int32_t LP_aliceonly(char *symbol)
 
 int32_t LP_validSPV(char *symbol,char *coinaddr,bits256 txid,int32_t vout)
 {
-    struct electrum_info *ep,*backupep; struct LP_address_utxo *up; struct iguana_info *coin;
+    struct electrum_info *ep,*backupep; cJSON *txobj; struct LP_address_utxo *up; struct iguana_info *coin; struct LP_transaction *tx;
     coin = LP_coinfind(symbol);
     if ( coin != 0 && (ep= coin->electrum) != 0 )
     {
+        if ( (up= LP_address_utxofind(coin,coinaddr,txid,vout)) == 0 )
+        {
+            if ( (txobj= electrum_transaction(symbol,ep,&txobj,txid,coinaddr)) != 0 )
+                free_json(txobj);
+            if ( (tx= LP_transactionfind(coin,txid)) != 0 )
+            {
+                if ( vout < tx->numvouts && tx->height > 0 )
+                    LP_address_utxoadd((uint32_t)time(NULL),"LP_validSPV",coin,coinaddr,txid,vout,tx->outpoints[vout].value,tx->height,-1);
+                if ( tx->SPV <= 0 )
+                    return(-1);
+                return(0);
+            }
+        }
         if ( (up= LP_address_utxofind(coin,coinaddr,txid,vout)) != 0 )
         {
             if ( up->SPV < 0 )
@@ -1157,7 +1170,7 @@ char *LP_autobuy(void *ctx,char *myipaddr,int32_t mypubsock,char *base,char *rel
         printf("destsatoshis %.8f vs utxo %.8f this would have triggered an quote error -13\n",dstr(destsatoshis),dstr(autxo->payment.value));
         return(clonestr("{\"error\":\"cant find alice utxo that is small enough\"}"));
     }
-    bestsatoshis = LP_basesatoshis(dstr(destsatoshis),maxprice,txfee,desttxfee);
+    bestsatoshis = 1.001 * LP_basesatoshis(dstr(destsatoshis),maxprice,txfee,desttxfee);
     memset(&B,0,sizeof(B));
     strcpy(B.coin,base);
     if ( LP_quoteinfoinit(&Q,&B,rel,maxprice,bestsatoshis,destsatoshis) < 0 )

iguana/exchanges/LP_prices.c

@@ -18,7 +18,7 @@
 //  marketmaker
 //
 
-struct LP_orderbookentry { bits256 pubkey; double price; uint64_t minsatoshis,maxsatoshis,depth; uint32_t timestamp; int32_t numutxos; char coinaddr[64]; };
+struct LP_orderbookentry { bits256 pubkey; double price; uint64_t avesatoshis,maxsatoshis,depth; uint32_t timestamp; int32_t numutxos; char coinaddr[64]; };
 
 struct LP_priceinfo
 {
@@ -48,6 +48,79 @@ struct LP_cacheinfo
     uint32_t timestamp;
 } *LP_cacheinfos;
 
+
+float LP_pubkey_price(int32_t *numutxosp,int64_t *avesatoshisp,int64_t *maxsatoshisp,struct LP_pubkeyinfo *pubp,uint32_t baseind,uint32_t relind)
+{
+    struct LP_pubkey_quote *pq,*tmp; int32_t scale; int64_t scale64;
+    *numutxosp = 0;
+    *avesatoshisp = *maxsatoshisp = 0;
+    DL_FOREACH_SAFE(pubp->quotes,pq,tmp)
+    {
+        if ( baseind == pq->baseind && relind == pq->relind )
+        {
+            if ( (scale= pq->scale) == 0 )
+                pq->scale = scale = 6;
+            scale64 = 1;
+            while ( scale > 0 )
+            {
+                scale64 *= 10;
+                scale--;
+            }
+            *numutxosp = pq->numutxos;
+            *avesatoshisp = pq->aveutxo * scale64;
+            *maxsatoshisp = pq->maxutxo * scale64;
+            return(pq->price);
+        }
+    }
+    return(0);
+}
+
+void LP_pubkey_update(struct LP_pubkeyinfo *pubp,uint32_t baseind,uint32_t relind,float price,int64_t balance,char *utxocoin,int32_t numutxos,int64_t minutxo,int64_t maxutxo)
+{
+    struct LP_pubkey_quote *pq,*tmp; int64_t aveutxo,scale64,ave64,max64; int32_t scale;
+    DL_FOREACH_SAFE(pubp->quotes,pq,tmp)
+    {
+        if ( baseind == pq->baseind && relind == pq->relind )
+            break;
+        pq = 0;
+    }
+    if ( pq == 0 )
+    {
+        pq = calloc(1,sizeof(*pq));
+        pq->baseind = baseind;
+        pq->relind = relind;
+        pq->scale = 6; // millions of SATOSHIS, ie. 0.01
+        DL_APPEND(pubp->quotes,pq); // already serialized as only path is via stats_JSON()
+    }
+    pq->price = price;
+    if ( utxocoin != 0 && utxocoin[0] != 0 )
+    {
+        if ( (scale= pq->scale) == 0 )
+            pq->scale = scale = 6;
+        scale64 = 1;
+        while ( scale > 0 )
+        {
+            scale64 *= 10;
+            scale--;
+        }
+        if ( numutxos >= 256 )
+            pq->numutxos = 255;
+        else pq->numutxos = numutxos;
+        aveutxo = (balance + (scale64>>1)) / numutxos;
+        if ( (ave64= (aveutxo / scale64)) >= (1LL << 32) )
+            ave64 = (1LL << 32) - 1;
+        max64 = ((maxutxo + (scale64>>1)) / scale64);
+        if ( max64 >= (1LL << 32) )
+            max64 = (1LL << 32) - 1;
+        pq->aveutxo = (uint32_t)ave64;
+        pq->maxutxo = (uint32_t)max64;
+        //printf("price %.8f base.%s rel.%s utxocoin.%s balance %.8f numutxos.%u %u scale64 = %llu, ave %llu, ave32 %u (%llu) max32 %u (%llu)\n",price,LP_priceinfos[baseind].symbol,LP_priceinfos[relind].symbol,utxocoin,dstr(balance),numutxos,pq->numutxos,(long long)scale64,(long long)aveutxo,pq->aveutxo,(long long)pq->aveutxo * scale64,pq->maxutxo,(long long)pq->maxutxo * scale64);
+        //int64_t avesatoshis,maxsatoshis;
+        //price = LP_pubkey_price(&numutxos,&avesatoshis,&maxsatoshis,pubp,baseind,relind);
+        //printf("checkprice %.8f numutxos.%d ave %.8f max %.8f\n",price,numutxos,dstr(avesatoshis),dstr(maxsatoshis));
+    }
+}
+
 struct LP_priceinfo *LP_priceinfo(int32_t ind)
 {
     if ( ind < 0 || ind >= LP_MAXPRICEINFOS )
@@ -272,7 +345,7 @@ uint64_t LP_unspents_metric(struct iguana_info *coin,char *coinaddr)
 
 cJSON *LP_pubkeyjson(struct LP_pubkeyinfo *pubp)
 {
-    int32_t baseid,relid; char *base,hexstr[67],hexstr2[67],sigstr[256]; double price; cJSON *item,*array,*obj;
+    int32_t baseid,relid,numutxos; int64_t avesatoshis,maxsatoshis; char *base,hexstr[67],hexstr2[67],sigstr[256]; double price; cJSON *item,*array,*obj;
     obj = cJSON_CreateObject();
     array = cJSON_CreateArray();
     for (baseid=0; baseid<LP_numpriceinfos; baseid++)
@@ -280,7 +353,7 @@ cJSON *LP_pubkeyjson(struct LP_pubkeyinfo *pubp)
         base = LP_priceinfos[baseid].symbol;
         for (relid=0; relid<LP_numpriceinfos; relid++)
         {
-            price = pubp->matrix[baseid][relid];
+            price = LP_pubkey_price(&numutxos,&avesatoshis,&maxsatoshis,pubp,baseid,relid);//pubp->matrix[baseid][relid];
             if ( LP_pricevalid(price) > 0 )
             {
                 item = cJSON_CreateArray();
@@ -495,7 +568,8 @@ int32_t LP_mypriceset(int32_t *changedp,char *base,char *rel,double price)
         if ( (pubp= LP_pubkeyadd(G.LP_mypub25519)) != 0 )
         {
             pubp->timestamp = (uint32_t)time(NULL);
-            pubp->matrix[basepp->ind][relpp->ind] = price;
+            LP_pubkey_update(pubp,basepp->ind,relpp->ind,price,0,0,0,0,0);
+            //pubp->matrix[basepp->ind][relpp->ind] = price;
             //pubp->timestamps[basepp->ind][relpp->ind] = pubp->timestamp;
             //pubp->matrix[relpp->ind][basepp->ind] = (1. / price);
         }
@@ -671,7 +745,7 @@ 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,"minvolume",dstr(op->minsatoshis)*0.8);
+        jaddnum(item,"avevolume",dstr(op->avesatoshis)*0.8);
         jaddnum(item,"maxvolume",dstr(op->maxsatoshis)*0.8);
         jaddnum(item,"depth",dstr(op->depth)*0.8);
         jaddbits256(item,"pubkey",op->pubkey);
@@ -680,7 +754,7 @@ cJSON *LP_orderbookjson(char *symbol,struct LP_orderbookentry *op)
     return(item);
 }
 
-struct LP_orderbookentry *LP_orderbookentry(char *address,char *base,char *rel,double price,int32_t numutxos,uint64_t minsatoshis,uint64_t maxsatoshis,bits256 pubkey,uint32_t timestamp,uint64_t balance)
+struct LP_orderbookentry *LP_orderbookentry(char *address,char *base,char *rel,double price,int32_t numutxos,uint64_t avesatoshis,uint64_t maxsatoshis,bits256 pubkey,uint32_t timestamp,uint64_t balance)
 {
     struct LP_orderbookentry *op;
     if ( (op= calloc(1,sizeof(*op))) != 0 )
@@ -688,7 +762,7 @@ struct LP_orderbookentry *LP_orderbookentry(char *address,char *base,char *rel,d
         safecopy(op->coinaddr,address,sizeof(op->coinaddr));
         op->price = price;
         op->numutxos = numutxos;
-        op->minsatoshis = minsatoshis;
+        op->avesatoshis = avesatoshis;
         op->maxsatoshis = maxsatoshis;
         op->pubkey = pubkey;
         op->timestamp = timestamp;
@@ -718,7 +792,7 @@ void LP_pubkeys_query()
 
 int32_t LP_orderbook_utxoentries(uint32_t now,int32_t polarity,char *base,char *rel,struct LP_orderbookentry *(**arrayp),int32_t num,int32_t cachednum,int32_t duration)
 {
-    char coinaddr[64]; uint8_t zeroes[20]; struct LP_pubkeyinfo *pubp=0,*tmp; struct LP_priceinfo *basepp; struct LP_orderbookentry *op; struct LP_address *ap; struct iguana_info *basecoin; uint32_t oldest; double price; int32_t baseid,relid,n; uint64_t minsatoshis,maxsatoshis,balance;
+    char coinaddr[64]; uint8_t zeroes[20]; struct LP_pubkeyinfo *pubp=0,*tmp; struct LP_priceinfo *basepp; struct LP_orderbookentry *op; struct LP_address *ap; struct iguana_info *basecoin; uint32_t oldest; double price; int32_t baseid,relid,n; int64_t maxsatoshis,balance,avesatoshis;
     if ( (basepp= LP_priceinfoptr(&relid,base,rel)) != 0 )
         baseid = basepp->ind;
     else return(num);
@@ -737,23 +811,23 @@ int32_t LP_orderbook_utxoentries(uint32_t now,int32_t polarity,char *base,char *
         if ( pubp->timestamp < oldest )
             continue;
         bitcoin_address(coinaddr,basecoin->taddr,basecoin->pubtype,pubp->rmd160,sizeof(pubp->rmd160));
-        minsatoshis = maxsatoshis = n = 0;
+        avesatoshis = maxsatoshis = n = 0;
         ap = 0;
-        if ( (price= pubp->matrix[baseid][relid]) > SMALLVAL )//&& pubp->timestamps[baseid][relid] >= oldest )
+        if ( (price= LP_pubkey_price(&n,&avesatoshis,&maxsatoshis,pubp,baseid,relid)) > SMALLVAL ) //pubp->matrix[baseid][relid]) > SMALLVAL )//&& pubp->timestamps[baseid][relid] >= oldest )
         {
-            balance = 0;
-            if ( (ap= LP_addressfind(basecoin,coinaddr)) != 0 )
+            balance = avesatoshis * n;
+            //if ( (ap= LP_addressfind(basecoin,coinaddr)) != 0 )
             {
-                n = LP_address_minmax(&balance,&minsatoshis,&maxsatoshis,ap);
+                //n = LP_address_minmax(&balance,&minsatoshis,&maxsatoshis,ap);
                 if ( polarity > 0 )
                 {
                     balance *= price;
-                    minsatoshis *= price;
+                    avesatoshis *= price;
                     maxsatoshis *= price;
                 }
                 //printf("%s/%s %s n.%d ap->n.%d %.8f\n",base,rel,coinaddr,n,ap->n,dstr(ap->total));
             }
-            if ( (op= LP_orderbookentry(coinaddr,base,rel,polarity > 0 ? price : 1./price,n,minsatoshis,maxsatoshis,pubp->pubkey,pubp->timestamp,balance)) != 0 )
+            if ( (op= LP_orderbookentry(coinaddr,base,rel,polarity > 0 ? price : 1./price,n,avesatoshis,maxsatoshis,pubp->pubkey,pubp->timestamp,balance)) != 0 )
             {
                 *arrayp = realloc(*arrayp,sizeof(*(*arrayp)) * (num+1));
                 (*arrayp)[num++] = op;
@@ -1036,7 +1110,7 @@ cJSON *LP_pricearray(char *base,char *rel,uint32_t firsttime,uint32_t lasttime,i
     return(retarray);
 }
 
-void LP_pricefeedupdate(bits256 pubkey,char *base,char *rel,double price)
+void LP_pricefeedupdate(bits256 pubkey,char *base,char *rel,double price,char *utxocoin,int32_t numrelutxos,int64_t balance,int64_t minutxo,int64_t maxutxo)
 {
     struct LP_priceinfo *basepp,*relpp; uint32_t now; uint64_t price64; struct LP_pubkeyinfo *pubp; char str[65],fname[512]; FILE *fp;
     //printf("check PRICEFEED UPDATE.(%s/%s) %.8f %s\n",base,rel,price,bits256_str(str,pubkey));
@@ -1073,9 +1147,11 @@ void LP_pricefeedupdate(bits256 pubkey,char *base,char *rel,double price)
             if ( (LP_rand() % 1000) == 0 )
                 printf("PRICEFEED UPDATE.(%-6s/%6s) %12.8f %s %12.8f\n",base,rel,price,bits256_str(str,pubkey),1./price);
             pubp->timestamp = (uint32_t)time(NULL);
-            if ( fabs(pubp->matrix[basepp->ind][relpp->ind] - price) > SMALLVAL )
+            LP_pubkey_update(pubp,basepp->ind,relpp->ind,price,balance,utxocoin,numrelutxos,minutxo,maxutxo);
+            //pubp->depthinfo[basepp->ind][relpp->ind] = LP_depthinfo_compact();
+            //if ( fabs(pubp->matrix[basepp->ind][relpp->ind] - price) > SMALLVAL )
             {
-                pubp->matrix[basepp->ind][relpp->ind] = price;
+                //pubp->matrix[basepp->ind][relpp->ind] = price;
                 //pubp->timestamps[basepp->ind][relpp->ind] = pubp->timestamp;
                 dxblend(&basepp->relvals[relpp->ind],price,0.9);
                 dxblend(&relpp->relvals[basepp->ind],1. / price,0.9);

iguana/exchanges/LP_remember.c

@@ -456,6 +456,12 @@ cJSON *LP_swap_json(struct LP_swap_remember *rswap)
 {
     cJSON *item,*array; int32_t i;
     item = cJSON_CreateObject();
+    if ( LP_swap_endcritical < LP_swap_critical )
+    {
+        jaddstr(item,"warning","swaps in critical section");
+        jaddnum(item,"critical",LP_swap_critical);
+        jaddnum(item,"endcritical",LP_swap_endcritical);
+    }
     jaddnum(item,"expiration",rswap->expiration);// - INSTANTDEX_LOCKTIME*2);
     jaddnum(item,"tradeid",rswap->tradeid);
     jaddnum(item,"requestid",rswap->requestid);

iguana/exchanges/LP_rpc.c

@@ -429,7 +429,7 @@ cJSON *LP_gettx(char *symbol,bits256 txid)
     }
     else
     {
-        if ( (retjson= electrum_transaction(symbol,coin->electrum,&retjson,txid)) != 0 )
+        if ( (retjson= electrum_transaction(symbol,coin->electrum,&retjson,txid,0)) != 0 )
             return(retjson);
         else printf("failed blockchain.transaction.get %s %s\n",coin->symbol,bits256_str(str,txid));
         return(cJSON_Parse("{\"error\":\"no transaction bytes\"}"));
@@ -507,7 +507,7 @@ cJSON *LP_gettxout(char *symbol,char *coinaddr,bits256 txid,int32_t vout)
         }
         if ( coinaddr[0] == 0 )
         {
-            if ( (txobj= electrum_transaction(symbol,coin->electrum,&txobj,txid)) != 0 )
+            if ( (txobj= electrum_transaction(symbol,coin->electrum,&txobj,txid,0)) != 0 )
             {
                 if ( (vouts= jarray(&n,txobj,"vout")) != 0 && n > 0 )
                     LP_destaddr(coinaddr,jitem(vouts,vout));

iguana/exchanges/LP_signatures.c

@@ -451,7 +451,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; char pubsecpstr[67]; uint32_t timestamp; uint64_t price64; bits256 zero; cJSON *reqjson = cJSON_CreateObject();
+    struct iguana_info *basecoin,*relcoin; struct LP_address *ap; char pubsecpstr[67]; uint32_t numutxos,timestamp; uint64_t price64,balance,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 )
     {
@@ -467,6 +468,18 @@ char *LP_pricepings(void *ctx,char *myipaddr,int32_t pubsock,char *base,char *re
         jaddnum(reqjson,"timestamp",timestamp);
         init_hexbytes_noT(pubsecpstr,G.LP_pubsecp,33);
         jaddstr(reqjson,"pubsecp",pubsecpstr);
+        if ( (ap= LP_address(basecoin,basecoin->smartaddr)) != 0 )
+        {
+            if ( (numutxos= LP_address_minmax(&balance,&minsize,&maxsize,ap)) != 0 )
+            {
+                //printf("%s numutxos.%d balance %.8f min %.8f max %.8f\n",base,numutxos,dstr(balance),dstr(minsize),dstr(maxsize));
+                jaddstr(reqjson,"utxocoin",base);
+                jaddnum(reqjson,"n",numutxos);
+                jaddnum(reqjson,"bal",dstr(balance));
+                jaddnum(reqjson,"min",dstr(minsize));
+                jaddnum(reqjson,"max",dstr(maxsize));
+            }
+        }
         LP_price_sigadd(reqjson,timestamp,G.LP_privkey,G.LP_pubsecp,G.LP_mypub25519,base,rel,price64);
         LP_reserved_msg(0,base,rel,zero,jprint(reqjson,1));
         return(clonestr("{\"result\":\"success\"}"));
@@ -484,7 +497,7 @@ char *LP_postprice_recv(cJSON *argjson)
         {
             if ( LP_price_sigcheck(juint(argjson,"timestamp"),jstr(argjson,"sig"),jstr(argjson,"pubsecp"),pubkey,base,rel,j64bits(argjson,"price64")) == 0 )
             {
-                LP_pricefeedupdate(pubkey,base,rel,price);
+                LP_pricefeedupdate(pubkey,base,rel,price,jstr(argjson,"utxocoin"),jint(argjson,"n"),jdouble(argjson,"bal")*SATOSHIDEN,jdouble(argjson,"min")*SATOSHIDEN,jdouble(argjson,"max")*SATOSHIDEN);
                 return(clonestr("{\"result\":\"success\"}"));
             } else return(clonestr("{\"error\":\"sig failure\"}"));
         }

iguana/exchanges/LP_socket.c

@@ -742,12 +742,27 @@ cJSON *_electrum_transaction(char *symbol,struct electrum_info *ep,cJSON **retjs
     return(*retjsonp);
 }
 
-cJSON *electrum_transaction(char *symbol,struct electrum_info *ep,cJSON **retjsonp,bits256 txid)
+cJSON *electrum_transaction(char *symbol,struct electrum_info *ep,cJSON **retjsonp,bits256 txid,char *SPVcheck)
 {
-    cJSON *retjson;
+    cJSON *retjson,*array; struct LP_transaction *tx; struct iguana_info *coin;
+    coin = LP_coinfind(symbol);
     if ( ep != 0 )
         portable_mutex_lock(&ep->txmutex);
     retjson = _electrum_transaction(symbol,ep,retjsonp,txid);
+    if ( ep != 0 && coin != 0 && SPVcheck != 0 && SPVcheck[0] != 0 && (tx= LP_transactionfind(coin,txid)) != 0 )
+    {
+        if ( tx->height <= 0 )
+        {
+            if ( (array= electrum_address_listunspent(symbol,ep,&array,SPVcheck,2)) != 0 )
+            {
+                printf("SPVcheck.%s got %d unspents\n",SPVcheck,cJSON_GetArraySize(array));
+                free_json(array);
+            }
+        }
+        if ( tx->height > 0 )
+            tx->SPV = LP_merkleproof(coin,SPVcheck,ep,txid,tx->height);
+        char str[65]; printf("%s %s %s SPV height %d SPV %d\n",coin->symbol,SPVcheck,bits256_str(str,txid),tx->height,tx->SPV);
+    }
     if ( ep != 0 )
         portable_mutex_unlock(&ep->txmutex);
     return(retjson);
@@ -789,7 +804,7 @@ void electrum_test()
     decode_hex(hash.bytes,sizeof(hash),"b967a7d55889fe11e993430921574ec6379bc8ce712a652c3fcb66c6be6e925c");
     if ( (retjson= electrum_getmerkle(symbol,ep,0,hash,403000)) != 0 )
         printf("electrum_getmerkle %s\n",jprint(retjson,1));
-    if ( (retjson= electrum_transaction(symbol,ep,0,hash)) != 0 )
+    if ( (retjson= electrum_transaction(symbol,ep,0,hash,0)) != 0 )
         printf("electrum_transaction %s\n",jprint(retjson,1));
     addr = "14NeevLME8UAANiTCVNgvDrynUPk1VcQKb";
     if ( (retjson= electrum_address_gethistory(symbol,ep,0,addr)) != 0 )

iguana/exchanges/LP_swap.c

@@ -796,6 +796,7 @@ void LP_bobloop(void *_swap)
             basilisk_bobdeposit_refund(swap,swap->I.putduration);
             //printf("depositlen.%d\n",swap->bobdeposit.I.datalen);
             LP_swapsfp_update(&swap->I.req);
+            LP_swap_critical = (uint32_t)time(NULL);
             if ( LP_waitfor(swap->N.pair,swap,LP_SWAPSTEP_TIMEOUT*10,LP_verify_otherfee) < 0 )
                 printf("error waiting for alicefee\n");
             else if ( LP_swapdata_rawtxsend(swap->N.pair,swap,0x200,data,maxlen,&swap->bobdeposit,0x100,0) == 0 )
@@ -804,6 +805,7 @@ void LP_bobloop(void *_swap)
                 printf("error waiting for alicepayment\n");
             else
             {
+                LP_swap_critical = (uint32_t)time(NULL);
                 if ( basilisk_bobscripts_set(swap,0,1) < 0 )
                     printf("error bobscripts payment\n");
                 else
@@ -813,9 +815,11 @@ void LP_bobloop(void *_swap)
                     else m = swap->I.aliceconfirms;
                     while ( (n= LP_numconfirms(swap->I.alicestr,swap->alicepayment.I.destaddr,swap->alicepayment.I.signedtxid,0,1)) < m ) // sync with alice
                     {
+                        LP_swap_critical = (uint32_t)time(NULL);
                         char str[65];printf("%d wait for alicepayment %s numconfs.%d %s %s\n",n,swap->alicepayment.I.destaddr,m,swap->I.alicestr,bits256_str(str,swap->alicepayment.I.signedtxid));
                         sleep(10);
                     }
+                    LP_swap_critical = (uint32_t)time(NULL);
                     if ( LP_swapdata_rawtxsend(swap->N.pair,swap,0x8000,data,maxlen,&swap->bobpayment,0x4000,0) == 0 )
                         printf("error sending bobpayment\n");
                     //if ( LP_waitfor(swap->N.pair,swap,10,LP_verify_alicespend) < 0 )
@@ -826,6 +830,7 @@ void LP_bobloop(void *_swap)
                     basilisk_bobpayment_reclaim(swap,swap->I.callduration);
                     if ( swap->N.pair >= 0 )
                         nn_close(swap->N.pair), swap->N.pair = -1;
+                    LP_swap_endcritical = (uint32_t)time(NULL);
                     LP_swapwait(swap->I.req.requestid,swap->I.req.quoteid,LP_atomic_locktime(swap->I.bobstr,swap->I.alicestr)*2,30);
                 }
             }
@@ -857,6 +862,7 @@ void LP_aliceloop(void *_swap)
         else
         {
             LP_swapsfp_update(&swap->I.req);
+            LP_swap_critical = (uint32_t)time(NULL);
             if ( LP_swapdata_rawtxsend(swap->N.pair,swap,0x80,data,maxlen,&swap->myfee,0x40,0) == 0 )
                 printf("error sending alicefee\n");
             else if ( LP_waitfor(swap->N.pair,swap,1800,LP_verify_bobdeposit) < 0 )
@@ -870,14 +876,17 @@ void LP_aliceloop(void *_swap)
                 else m = swap->I.aliceconfirms;
                 while ( (n= LP_numconfirms(swap->I.alicestr,swap->alicepayment.I.destaddr,swap->alicepayment.I.signedtxid,0,1)) < m )
                 {
+                    LP_swap_critical = (uint32_t)time(NULL);
                     char str[65];printf("%d wait for alicepayment %s numconfs.%d %s %s\n",n,swap->alicepayment.I.destaddr,m,swap->I.alicestr,bits256_str(str,swap->alicepayment.I.signedtxid));
                     sleep(10);
                 }
                 swap->sentflag = 1;
+                LP_swap_critical = (uint32_t)time(NULL);
                 if ( LP_waitfor(swap->N.pair,swap,1800,LP_verify_bobpayment) < 0 )
                     printf("error waiting for bobpayment\n");
                 else
                 {
+                    LP_swap_endcritical = (uint32_t)time(NULL);
                     while ( (n= LP_numconfirms(swap->I.bobstr,swap->bobpayment.I.destaddr,swap->bobpayment.I.signedtxid,0,1)) < swap->I.bobconfirms )
                     {
                         char str[65];printf("%d wait for bobpayment %s numconfs.%d %s %s\n",n,swap->bobpayment.I.destaddr,swap->I.bobconfirms,swap->I.bobstr,bits256_str(str,swap->bobpayment.I.signedtxid));

iguana/exchanges/LP_transaction.c

@@ -118,7 +118,7 @@ bits256 LP_broadcast(char *txname,char *symbol,char *txbytes,bits256 expectedtxi
                     }
                     else if ( (errstr= jstr(retjson,"error")) != 0 && strcmp(errstr,"timeout") == 0 && coin != 0 && coin->electrum != 0 )
                     {
-                        if ( totalretries < 10 )
+                        if ( totalretries < 4 )
                         {
                             printf("time error with electrum, retry.%d\n",totalretries);
                             totalretries++;