From 2e9f7e89d3eb3737dbd6374a71ce93bdfb6b82b0 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Fri, 8 Dec 2017 10:39:24 +0400
Subject: [PATCH] Fix CHMEX leap second issue #36

---
 crypto777/OS_time.c              | 6 +++---
 iguana/exchanges/LP_instantdex.c | 7 ++++++-
 iguana/exchanges/LP_nativeDEX.c  | 1 +
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/crypto777/OS_time.c b/crypto777/OS_time.c
index b5d2efc09..2a1279730 100755
--- a/crypto777/OS_time.c
+++ b/crypto777/OS_time.c
@@ -21,7 +21,7 @@
 #define TAI_PACK 8
 #define TAI_UTC_DIFF ((uint64_t)4611686018427387914ULL)
 
-//#define UTC_ADJUST -36
+//#define UTC_ADJUST -37
 #define tai_approx(t) ((double) ((t)->x))
 #define tai_less(t,u) ((t)->x < (u)->x)
 
@@ -300,7 +300,7 @@ void tai_add(struct tai *t,struct tai *u,struct tai *v) { t->x = u->x + v->x; }
 void tai_sub(struct tai *t,struct tai *u,struct tai *v) { t->x = u->x - v->x; }
 
 // {"leapseconds":["+1972-06-30", "+1972-12-31", "+1973-12-31", "+1974-12-31", "+1975-12-31", "+1976-12-31", "+1977-12-31", "+1982-06-30", "+1983-06-30", "+1985-06-30", "+1987-12-31", "+1989-12-31", "+1990-12-31", "+1992-06-30", "+1993-06-30", "+1994-06-30", "+1995-12-31", "+1997-06-30", "+1998-12-31", "+2005-12-31", "+2008-12-31", "+2012-06-30", "+2015-06-30"]}
-char *leapseconds[] = { "+1972-06-30", "+1972-12-31", "+1973-12-31", "+1974-12-31", "+1975-12-31", "+1976-12-31", "+1977-12-31", "+1982-06-30", "+1983-06-30", "+1985-06-30", "+1987-12-31", "+1989-12-31", "+1990-12-31", "+1992-06-30", "+1993-06-30", "+1994-06-30", "+1995-12-31", "+1997-06-30", "+1998-12-31", "+2005-12-31", "+2008-12-31", "+2012-06-30", "+2015-06-30" };
+char *leapseconds[] = { "+1972-06-30", "+1972-12-31", "+1973-12-31", "+1974-12-31", "+1975-12-31", "+1976-12-31", "+1977-12-31", "+1982-06-30", "+1983-06-30", "+1985-06-30", "+1987-12-31", "+1989-12-31", "+1990-12-31", "+1992-06-30", "+1993-06-30", "+1994-06-30", "+1995-12-31", "+1997-06-30", "+1998-12-31", "+2005-12-31", "+2008-12-31", "+2012-06-30", "+2015-06-30",  "+2016-12-31" };
 struct tai leaptais[sizeof(leapseconds)/sizeof(*leapseconds)];
 
 char *dayname[7] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" } ;
@@ -355,7 +355,7 @@ struct tai tai_now()
     {
         First_TAI = t, First_utc = (uint32_t)now;
 #ifndef DISABLE_LEAPS
-        UTC_ADJUST = -36;
+        UTC_ADJUST = -37;
 #endif
         //printf("TAINOW.%llu %03.3f UTC.%u vs %u [diff %d]\n",(long long)t.x,t.millis,First_utc,tai2utc(t),UTC_ADJUST);
     }
diff --git a/iguana/exchanges/LP_instantdex.c b/iguana/exchanges/LP_instantdex.c
index e59153b6f..f8bef39e8 100644
--- a/iguana/exchanges/LP_instantdex.c
+++ b/iguana/exchanges/LP_instantdex.c
@@ -480,10 +480,15 @@ int64_t LP_dynamictrust(int64_t credits,bits256 pubkey,int64_t kmdvalue)
             credits = ap->instantdex_credits;
         if ( credits != 0 && (swaps_kmdvalue+kmdvalue) > credits )
         {
+            DL_FOREACH_SAFE(pubp->bobswaps,ptr,tmp)
+            {
+                if ( (sp= ptr->swap) != 0 && LP_swap_finished(sp,1) == 0 )
+                    printf("unfinished bob %llu r%u-r%u src.%s %.8f dest.%s %.8f -> price %.8f value %.8f\n",(long long)sp->aliceid,sp->Q.R.requestid,sp->Q.R.quoteid,sp->Q.srccoin,dstr(sp->Q.satoshis),sp->Q.destcoin,dstr(sp->Q.destsatoshis),(double)sp->Q.destsatoshis/(sp->Q.satoshis+1),dstr(LP_kmdvalue(sp->Q.destcoin,sp->Q.destsatoshis)));
+            }
             DL_FOREACH_SAFE(pubp->aliceswaps,ptr,tmp)
             {
                 if ( (sp= ptr->swap) != 0 && LP_swap_finished(sp,1) == 0 )
-                    printf("unfinished %llu r%u-r%u dest.%s %.8f -> value %.8f\n",(long long)sp->aliceid,sp->Q.R.requestid,sp->Q.R.quoteid,sp->Q.destcoin,dstr(sp->Q.destsatoshis),dstr(LP_kmdvalue(sp->Q.destcoin,sp->Q.destsatoshis)));
+                    printf("unfinished alice %llu r%u-r%u src.%s %.8f dest.%s %.8f -> price %.8f value %.8f\n",(long long)sp->aliceid,sp->Q.R.requestid,sp->Q.R.quoteid,sp->Q.srccoin,dstr(sp->Q.satoshis),sp->Q.destcoin,dstr(sp->Q.destsatoshis),(double)sp->Q.destsatoshis/(sp->Q.satoshis+1),dstr(LP_kmdvalue(sp->Q.destcoin,sp->Q.destsatoshis)));
             }
             printf("REJECT: %s instantdex_credits %.8f vs (%.8f + current %.8f)\n",coinaddr,dstr(credits),dstr(swaps_kmdvalue),dstr(kmdvalue));
         }
diff --git a/iguana/exchanges/LP_nativeDEX.c b/iguana/exchanges/LP_nativeDEX.c
index fa0fce39d..52ba08f12 100644
--- a/iguana/exchanges/LP_nativeDEX.c
+++ b/iguana/exchanges/LP_nativeDEX.c
@@ -17,6 +17,7 @@
 //  LP_nativeDEX.c
 //  marketmaker
 //
+// fundvalue -> autoprice, cmc +margin -> autoprice, signals -> autoprice
 // https://github.com/bitcoin/bips/blob/master/bip-0143.mediawiki for signing BCH/BTG
 // there is an issue about waiting for notarization for a swap that never starts
 // use electrum in case of addr change in swap