From 550e1327bdeb1b47442e89e6408857f955bc3019 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 21 Sep 2017 12:54:51 +0200
Subject: [PATCH] Test

---
 iguana/exchanges/LP_ordermatch.c | 15 ++++++++-------
 iguana/exchanges/LP_rpc.c        |  2 +-
 iguana/exchanges/LP_socket.c     | 10 +++++-----
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/iguana/exchanges/LP_ordermatch.c b/iguana/exchanges/LP_ordermatch.c
index 9c98c7c59..a6fa028ea 100644
--- a/iguana/exchanges/LP_ordermatch.c
+++ b/iguana/exchanges/LP_ordermatch.c
@@ -290,21 +290,26 @@ double LP_quote_validate(struct LP_utxoinfo *autxo,struct LP_utxoinfo *butxo,str
         if ( strcmp(autxo->coinaddr,qp->destaddr) != 0 )
             return(-10);
     }
-    if ( destvalue < qp->desttxfee+qp->destsatoshis || srcvalue < qp->txfee+qp->satoshis )
+    if ( (autxo != 0 && destvalue < qp->desttxfee+qp->destsatoshis) || (butxo != 0 && srcvalue < qp->txfee+qp->satoshis) )
     {
         printf("destvalue %.8f srcvalue %.8f, destsatoshis %.8f or satoshis %.8f is too small txfees %.8f %.8f?\n",dstr(destvalue),dstr(srcvalue),dstr(qp->destsatoshis),dstr(qp->satoshis),dstr(qp->desttxfee),dstr(qp->txfee));
         return(-11);
     }
     if ( qp->satoshis != 0 )
-    {
         qprice = ((double)qp->destsatoshis / qp->satoshis);
+    LP_txfees(&txfee,&desttxfee,qp->srccoin,qp->destcoin);
+    printf("qprice %.8f <- %.8f/%.8f txfees.(%.8f %.8f) vs (%.8f %.8f)\n",qprice,dstr(qp->destsatoshis),dstr(qp->satoshis),dstr(qp->txfee),dstr(qp->desttxfee),dstr(txfee),dstr(desttxfee));
+    if ( qp->txfee < LP_REQUIRED_TXFEE*txfee || qp->desttxfee < LP_REQUIRED_TXFEE*desttxfee )
+        return(-14);
+    if ( butxo != 0 )
+    {
         if ( qp->satoshis < (srcvalue / LP_MINVOL) || srcvalue < qp->txfee*LP_MINSIZE_TXFEEMULT )
         {
             printf("utxo payment %.8f is less than %f covered by Q %.8f or <10x txfee %.8f\n",dstr(srcvalue),1./LP_MINVOL,dstr(qp->satoshis),dstr(qp->txfee));
             return(-12);
         }
     }
-    if ( qp->destsatoshis != 0 )
+    if ( autxo != 0 )
     {
         if ( qp->destsatoshis < (destvalue / LP_MINCLIENTVOL) || destvalue < qp->desttxfee*LP_MINSIZE_TXFEEMULT )
         {
@@ -312,10 +317,6 @@ double LP_quote_validate(struct LP_utxoinfo *autxo,struct LP_utxoinfo *butxo,str
             return(-13);
         }
     }
-    LP_txfees(&txfee,&desttxfee,qp->srccoin,qp->destcoin);
-    printf("qprice %.8f <- %.8f/%.8f txfees.(%.8f %.8f) vs (%.8f %.8f)\n",qprice,dstr(qp->destsatoshis),dstr(qp->satoshis),dstr(qp->txfee),dstr(qp->desttxfee),dstr(txfee),dstr(desttxfee));
-    if ( qp->txfee < LP_REQUIRED_TXFEE*txfee || qp->desttxfee < LP_REQUIRED_TXFEE*desttxfee )
-        return(-14);
     return(qprice);
 }
 
diff --git a/iguana/exchanges/LP_rpc.c b/iguana/exchanges/LP_rpc.c
index ab670a326..644838101 100644
--- a/iguana/exchanges/LP_rpc.c
+++ b/iguana/exchanges/LP_rpc.c
@@ -508,7 +508,7 @@ void LP_listunspent_issue(char *symbol,char *coinaddr)
                 retstr = issue_LP_listunspent(destip,destport,symbol,coinaddr);
                 if ( (retjson= cJSON_Parse(retstr)) != 0 )
                 {
-                    if ( electrum_process_array(coin,coinaddr,retjson) != 0 )
+                    if ( electrum_process_array(coin,coin->electrum,coinaddr,retjson) != 0 )
                     {
                         LP_postutxos(symbol,coinaddr); // might be good to not saturate
                     }
diff --git a/iguana/exchanges/LP_socket.c b/iguana/exchanges/LP_socket.c
index de2268507..28e7a582d 100644
--- a/iguana/exchanges/LP_socket.c
+++ b/iguana/exchanges/LP_socket.c
@@ -305,12 +305,12 @@ struct electrum_info *electrum_server(char *symbol,struct electrum_info *ep)
     return(ep);
 }
 
-int32_t electrum_process_array(struct iguana_info *coin,char *coinaddr,cJSON *array)
+int32_t electrum_process_array(struct iguana_info *coin,struct electrum_info *ep,char *coinaddr,cJSON *array)
 {
     int32_t i,v,n,flag = 0; char str[65]; uint64_t value; bits256 txid; cJSON *item,*txobj; struct LP_transaction *tx;
     if ( array != 0 && coin != 0 && (n= cJSON_GetArraySize(array)) > 0 )
     {
-        printf("PROCESS %s %s num.%d\n",coin->symbol,coinaddr,n);
+        printf("PROCESS %s/%s %s num.%d\n",coin->symbol,ep!=0?ep->symbol:"nanolistunspent",coinaddr,n);
         for (i=0; i<n; i++)
         {
             item = jitem(array,i);
@@ -451,7 +451,7 @@ cJSON *electrum_address_gethistory(char *symbol,struct electrum_info *ep,cJSON *
     cJSON *retjson; struct iguana_info *coin = LP_coinfind(symbol);
     retjson = electrum_strarg(symbol,ep,retjsonp,"blockchain.address.get_history",addr,ELECTRUM_TIMEOUT);
     printf("history.(%s)\n",jprint(retjson,0));
-    electrum_process_array(coin,addr,retjson);
+    electrum_process_array(coin,ep,addr,retjson);
     return(retjson);
 }
 
@@ -460,7 +460,7 @@ cJSON *electrum_address_getmempool(char *symbol,struct electrum_info *ep,cJSON *
     cJSON *retjson; struct iguana_info *coin = LP_coinfind(symbol);
     retjson = electrum_strarg(symbol,ep,retjsonp,"blockchain.address.get_mempool",addr,ELECTRUM_TIMEOUT);
     //printf("MEMPOOL.(%s)\n",jprint(retjson,0));
-    electrum_process_array(coin,addr,retjson);
+    electrum_process_array(coin,ep,addr,retjson);
     return(retjson);
 }
 
@@ -472,7 +472,7 @@ cJSON *electrum_address_listunspent(char *symbol,struct electrum_info *ep,cJSON
     {
         if ( (retjson= electrum_strarg(symbol,ep,retjsonp,"blockchain.address.listunspent",addr,ELECTRUM_TIMEOUT)) != 0 )
         {
-            if ( electrum_process_array(coin,addr,retjson) != 0 )
+            if ( electrum_process_array(coin,ep,addr,retjson) != 0 )
                 LP_postutxos(coin->symbol,addr);
             safecopy(coin->lastunspent,addr,sizeof(coin->lastunspent));
             coin->unspenttime = (uint32_t)time(NULL);