From 020bee03a6171dad373090ef860f325cb31e26df Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 7 Dec 2017 17:20:43 +0400
Subject: [PATCH] Test

---
 iguana/exchanges/LP_coins.c       | 9 +++++++++
 iguana/exchanges/LP_commands.c    | 2 +-
 iguana/exchanges/LP_ordermatch.c  | 8 ++++++--
 iguana/exchanges/LP_transaction.c | 2 +-
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/iguana/exchanges/LP_coins.c b/iguana/exchanges/LP_coins.c
index 67312eb51..8c7de8da5 100644
--- a/iguana/exchanges/LP_coins.c
+++ b/iguana/exchanges/LP_coins.c
@@ -498,3 +498,12 @@ struct iguana_info *LP_coincreate(cJSON *item)
     return(0);
 }
 
+void LP_otheraddress(char *destcoin,char *otheraddr,char *srccoin,char *coinaddr)
+{
+    uint8_t addrtype,rmd160[20]; struct iguana_info *src,*dest;
+    if ( (src= LP_coinfind(srccoin)) != 0 && (dest= LP_coinfind(destcoin)) != 0 )
+    {
+        bitcoin_addr2rmd160(src->taddr,&addrtype,rmd160,coinaddr);
+        bitcoin_address(otheraddr,dest->taddr,dest->pubtype,rmd160,20);
+    } else printf("couldnt find %s or %s\n",srccoin,destcoin);
+}
diff --git a/iguana/exchanges/LP_commands.c b/iguana/exchanges/LP_commands.c
index dba961871..ea2d7d00d 100644
--- a/iguana/exchanges/LP_commands.c
+++ b/iguana/exchanges/LP_commands.c
@@ -350,7 +350,7 @@ instantdex_claim()\n\
                     return(clonestr("{\"error\":\"couldnt set price\"}"));
                 //else if ( LP_mypriceset(&changed,rel,base,1./price) < 0 )
                 //    return(clonestr("{\"error\":\"couldnt set price\"}"));
-                else if ( jobj(argjson,"broadcast") == 0 || jint(argjson,"broadcast") != 0 )
+                else if ( price == 0. || jobj(argjson,"broadcast") == 0 || jint(argjson,"broadcast") != 0 )
                     return(LP_pricepings(ctx,myipaddr,LP_mypubsock,base,rel,price * LP_profitratio));
                 else return(clonestr("{\"result\":\"success\"}"));
             }
diff --git a/iguana/exchanges/LP_ordermatch.c b/iguana/exchanges/LP_ordermatch.c
index 3db0881a8..a38fa3a7e 100644
--- a/iguana/exchanges/LP_ordermatch.c
+++ b/iguana/exchanges/LP_ordermatch.c
@@ -461,7 +461,7 @@ struct LP_utxoinfo *LP_address_myutxopair(struct LP_utxoinfo *butxo,int32_t iamb
 
 int32_t LP_connectstartbob(void *ctx,int32_t pubsock,char *base,char *rel,double price,struct LP_quoteinfo *qp)
 {
-    char pairstr[512]; cJSON *reqjson; bits256 privkey; int32_t pair=-1,retval = -1,DEXselector = 0; struct basilisk_swap *swap; struct iguana_info *coin;
+    char pairstr[512],otheraddr[64]; cJSON *reqjson; bits256 privkey; int32_t pair=-1,retval = -1,DEXselector = 0; struct basilisk_swap *swap; struct iguana_info *coin;
     qp->quotetime = (uint32_t)time(NULL);
     if ( (coin= LP_coinfind(qp->srccoin)) == 0 )
     {
@@ -505,6 +505,8 @@ int32_t LP_connectstartbob(void *ctx,int32_t pubsock,char *base,char *rel,double
                 LP_reserved_msg(0,base,rel,zero,jprint(reqjson,0));
                 free_json(reqjson);
                 LP_importaddress(qp->destcoin,qp->destaddr);
+                LP_otheraddress(qp->srccoin,otheraddr,qp->destcoin,qp->destaddr);
+                LP_importaddress(qp->srccoin,otheraddr);
                 retval = 0;
             } else printf("error launching swaploop\n");
         } else printf("couldnt bind to any port %s\n",pairstr);
@@ -573,7 +575,7 @@ int32_t LP_alice_eligible(uint32_t quotetime)
 
 char *LP_connectedalice(struct LP_quoteinfo *qp,char *pairstr) // alice
 {
-    cJSON *retjson; double bid,ask,price,qprice; int32_t pairsock = -1; int32_t DEXselector = 0; struct LP_utxoinfo *autxo,A,B,*butxo; struct basilisk_swap *swap; struct iguana_info *coin;
+    cJSON *retjson; char otheraddr[64]; double bid,ask,price,qprice; int32_t pairsock = -1; int32_t DEXselector = 0; struct LP_utxoinfo *autxo,A,B,*butxo; struct basilisk_swap *swap; struct iguana_info *coin;
     /*if ( LP_quoteparse(&Q,argjson) < 0 )
     {
         LP_aliceid(Q.tradeid,Q.aliceid,"error0",0,0);
@@ -656,6 +658,8 @@ char *LP_connectedalice(struct LP_quoteinfo *qp,char *pairstr) // alice
             //autxo->S.swap = swap;
             //swap->utxo = autxo;
             LP_importaddress(qp->srccoin,qp->coinaddr);
+            LP_otheraddress(qp->destcoin,otheraddr,qp->srccoin,qp->coinaddr);
+            LP_importaddress(qp->srccoin,otheraddr);
             LP_aliceid(qp->tradeid,qp->aliceid,"started",qp->R.requestid,qp->R.quoteid);
             printf("alice pairstr.(%s) pairsock.%d pthread_t %ld\n",pairstr,pairsock,sizeof(pthread_t));
             if ( OS_thread_create(malloc(sizeof(pthread_t)),NULL,(void *)LP_aliceloop,(void *)swap) == 0 )
diff --git a/iguana/exchanges/LP_transaction.c b/iguana/exchanges/LP_transaction.c
index 7afefdb9b..a00fe0319 100644
--- a/iguana/exchanges/LP_transaction.c
+++ b/iguana/exchanges/LP_transaction.c
@@ -1661,7 +1661,7 @@ bits256 LP_swap_spendtxid(char *symbol,char *destaddr,bits256 utxotxid,int32_t u
                     {
                         if ( (vins= jarray(&m,txobj,"vin")) != 0 )
                         {
-                            printf("vins.(%s)\n",jprint(vins,0));
+                            //printf("vins.(%s)\n",jprint(vins,0));
                             if ( utxovout < m )
                             {
                                 vin = jitem(vins,utxovout);