From 6456799c657181722b1e794c98ec1a1a447be7ae Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 24 May 2016 14:04:00 -0500
Subject: [PATCH] test

---
 iguana/exchanges777.h         |  2 +-
 iguana/iguana_instantdex.c    |  5 +++++
 iguana/iguana_realtime.c      |  2 +-
 iguana/swaps/iguana_BTCswap.c | 21 ++++++++++-----------
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/iguana/exchanges777.h b/iguana/exchanges777.h
index ac1eba212..0ba7633f3 100755
--- a/iguana/exchanges777.h
+++ b/iguana/exchanges777.h
@@ -24,7 +24,7 @@
 
 #define INSTANTDEX_DECKSIZE 777
 #define INSTANTDEX_HOPS 2
-#define INSTANTDEX_DURATION 60
+#define INSTANTDEX_DURATION 30
 
 #define INSTANTDEX_ORDERSTATE_IDLE 0
 #define INSTANTDEX_ORDERSTATE_HAVEOTHERFEE 1
diff --git a/iguana/iguana_instantdex.c b/iguana/iguana_instantdex.c
index 71a128cd8..6d6c528a9 100755
--- a/iguana/iguana_instantdex.c
+++ b/iguana/iguana_instantdex.c
@@ -1344,6 +1344,11 @@ char *instantdex_parse(struct supernet_info *myinfo,struct instantdex_msghdr *ms
             A.offer.minperc = 100;
         if ( (swap= instantdex_statemachinefind(myinfo,exchange,A.orderid)) != 0 )
         {
+            if ( signerbits == swap->othertrader.txid )
+            {
+                swap->expiration += INSTANTDEX_DURATION;
+                printf("OTHER SIDE sent packet\n");
+            }
             if ( swap->cutverified == 0 && swap->choosei >= 0 && serdatalen == sizeof(swap->privkeys) )
                 instantdex_privkeyextract(myinfo,swap,serdata,serdatalen);
             printf("found existing state machine %llx choosei.%d other.%d\n",(long long)A.orderid,swap->choosei,swap->otherchoosei);
diff --git a/iguana/iguana_realtime.c b/iguana/iguana_realtime.c
index 9d95e6894..65b726921 100755
--- a/iguana/iguana_realtime.c
+++ b/iguana/iguana_realtime.c
@@ -345,7 +345,7 @@ int32_t iguana_realtime_update(struct iguana_info *coin)
         }
         else
         {
-            printf("walkchain error n.%d != %d\n",n,coin->RTheight-1);
+            printf("walkchain error n.%d != %d\n",n,coin->RTheight-1-offset);
             coin->RTdatabad = 1;
         }
     }
diff --git a/iguana/swaps/iguana_BTCswap.c b/iguana/swaps/iguana_BTCswap.c
index aa71bbc08..8447b9d26 100755
--- a/iguana/swaps/iguana_BTCswap.c
+++ b/iguana/swaps/iguana_BTCswap.c
@@ -211,7 +211,7 @@ int32_t instantdex_feetxverify(struct supernet_info *myinfo,struct iguana_info *
             {
                 if ( memcmp(script,msgtx.vouts[0].pk_script,n) == 0 )
                 {
-                    //printf("feetx script verified.(%s)\n",swap->otherfeetx);
+                    printf("feetx script verified.(%s)\n",swap->otherfee->txbytes);
                     retval = 0;
                 }
                 else
@@ -226,9 +226,7 @@ int32_t instantdex_feetxverify(struct supernet_info *myinfo,struct iguana_info *
             } else printf("pk_scriptlen %d mismatch %d\n",msgtx.vouts[0].pk_scriptlen,n);
             free_json(txobj);
         } else printf("error converting (%s) txobj\n",swap->otherfee->txbytes);
-    } else if ( swap->otherfee != 0 )
-        retval = 0;
-    else printf("no feetx to verify\n");
+    } else printf("no feetx to verify\n");
     return(retval);
 }
 
@@ -258,13 +256,10 @@ struct bitcoin_statetx *instantdex_bobtx(struct supernet_info *myinfo,struct bit
 int32_t instantdex_paymentverify(struct supernet_info *myinfo,struct iguana_info *coin,struct bitcoin_swapinfo *swap,cJSON *argjson,int32_t depositflag)
 {
     cJSON *txobj; bits256 txid; uint32_t n,locktime; int32_t i,secretstart,retval = -1; uint64_t x;
-    struct iguana_msgtx msgtx; uint8_t script[512],rmd160[20]; int64_t relsatoshis,amount,insurance = 0;
+    struct iguana_msgtx msgtx; uint8_t script[512],rmd160[20]; int64_t amount;
     if ( coin != 0 && jstr(argjson,depositflag != 0 ? "deposit" : "payment") != 0 )
     {
-        relsatoshis = swap->altsatoshis;
-        if ( depositflag != 0 )
-            insurance = (100 * relsatoshis) / INSTANTDEX_INSURANCEDIV + coin->chain->txfee;
-        amount = relsatoshis + insurance;
+        amount = swap->BTCsatoshis + depositflag*swap->insurance*100;
         if ( swap->deposit != 0 && (txobj= bitcoin_hex2json(coin,&txid,&msgtx,swap->deposit->txbytes)) != 0 )
         {
             locktime = swap->expiration;
@@ -296,7 +291,7 @@ int32_t instantdex_paymentverify(struct supernet_info *myinfo,struct iguana_info
             free_json(txobj);
         }
     }
-    return(retval * 0);
+    return(retval);
 }
 
 int32_t instantdex_altpaymentverify(struct supernet_info *myinfo,struct iguana_info *coin,struct bitcoin_swapinfo *swap,cJSON *argjson)
@@ -327,7 +322,7 @@ int32_t instantdex_altpaymentverify(struct supernet_info *myinfo,struct iguana_i
             free_json(txobj);
         }
     }
-    return(retval * 0);
+    return(retval);
 }
 
 struct bitcoin_statetx *instantdex_alicetx(struct supernet_info *myinfo,struct iguana_info *altcoin,char *msigaddr,bits256 pubAm,bits256 pubBn,int64_t amount,struct bitcoin_swapinfo *swap)
@@ -393,7 +388,11 @@ int32_t instantdex_pubkeyargs(struct supernet_info *myinfo,struct bitcoin_swapin
     char buf[3]; int32_t i,n,m,len=0; bits256 pubi; uint64_t txid; uint8_t secret160[20],pubkey[33];
     sprintf(buf,"%c0",'A' - 0x02 + firstbyte);
     if ( numpubs > 2 )
+    {
+        if ( swap->numpubs+2 >= numpubs )
+            return(numpubs);
         printf(">>>>>> start generating %s\n",buf);
+    }
     for (i=n=m=0; i<numpubs*100 && n<numpubs; i++)
     {
         pubi = instantdex_derivekeypair(myinfo,&swap->privkeys[n],pubkey,privkey,hash);