Test

iguana/exchanges/LP_include.h

@@ -363,6 +363,7 @@ struct LP_quoteinfo
 {
     struct basilisk_request R;
     bits256 srchash,desthash,txid,txid2,desttxid,feetxid,privkey;
+    int64_t othercredits;
     uint64_t satoshis,txfee,destsatoshis,desttxfee,aliceid;
     uint32_t timestamp,quotetime,tradeid;
     int32_t vout,vout2,destvout,feevout,pair;
@@ -537,7 +538,7 @@ int32_t LP_gettx_presence(char *symbol,bits256 expectedtxid);
 double LP_getestimatedrate(struct iguana_info *coin);
 struct LP_utxoinfo *_LP_utxofind(int32_t iambob,bits256 txid,int32_t vout);
 struct LP_utxoinfo *_LP_utxo2find(int32_t iambob,bits256 txid,int32_t vout);
-int64_t LP_dynamictrust(bits256 pubkey,int64_t kmdvalue);
+int64_t LP_dynamictrust(int64_t credits,bits256 pubkey,int64_t kmdvalue);
 struct LP_address *LP_addressfind(struct iguana_info *coin,char *coinaddr);
 int64_t LP_outpoint_amount(char *symbol,bits256 txid,int32_t vout);
 

iguana/exchanges/LP_instantdex.c

@@ -454,41 +454,41 @@ void LP_instantdex_deposits(struct iguana_info *coin)
 }
 #endif
 
-int64_t LP_dynamictrust(bits256 pubkey,int64_t kmdvalue)
+int64_t LP_dynamictrust(int64_t credits,bits256 pubkey,int64_t kmdvalue)
 {
     struct LP_pubswap *ptr,*tmp; struct LP_swapstats *sp; struct LP_pubkey_info *pubp; struct LP_address *ap; char coinaddr[64]; struct iguana_info *coin; int64_t swaps_kmdvalue = 0;
     if ( (coin= LP_coinfind("KMD")) != 0 && (pubp= LP_pubkeyfind(pubkey)) != 0 )
     {
         bitcoin_address(coinaddr,coin->taddr,coin->pubtype,pubp->pubsecp,33);
-        if ((ap= LP_address(coin,coinaddr)) != 0 )//&& ap->instantdex_credits >= kmdvalue )
+        if ( credits != 0 )
+            printf("%s %s othercredits %.8f\n",coin->symbol,coinaddr,dstr(credits));
+        DL_FOREACH_SAFE(pubp->bobswaps,ptr,tmp)
         {
-            DL_FOREACH_SAFE(pubp->bobswaps,ptr,tmp)
-            {
-                if ( (sp= ptr->swap) != 0 && LP_swap_finished(sp,1) == 0 )
-                    swaps_kmdvalue += LP_kmdvalue(sp->Q.srccoin,sp->Q.satoshis);
-            }
-            DL_FOREACH_SAFE(pubp->aliceswaps,ptr,tmp)
-            {
-                if ( (sp= ptr->swap) != 0 && LP_swap_finished(sp,1) == 0 )
-                    swaps_kmdvalue += LP_kmdvalue(sp->Q.destcoin,sp->Q.destsatoshis);
-            }
-            if ( ap->instantdex_credits != 0 && (swaps_kmdvalue+kmdvalue) > ap->instantdex_credits )
-                printf("%s instantdex_credits %.8f vs (%.8f + current %.8f)\n",coinaddr,dstr(ap->instantdex_credits),dstr(swaps_kmdvalue),dstr(kmdvalue));
-            //if ( ap->instantdex_credits > swaps_kmdvalue+kmdvalue )
-                return(ap->instantdex_credits - (swaps_kmdvalue+kmdvalue));
+            if ( (sp= ptr->swap) != 0 && LP_swap_finished(sp,1) == 0 )
+                swaps_kmdvalue += LP_kmdvalue(sp->Q.srccoin,sp->Q.satoshis);
+        }
+        DL_FOREACH_SAFE(pubp->aliceswaps,ptr,tmp)
+        {
+            if ( (sp= ptr->swap) != 0 && LP_swap_finished(sp,1) == 0 )
+                swaps_kmdvalue += LP_kmdvalue(sp->Q.destcoin,sp->Q.destsatoshis);
         }
+        if ( credits == 0 && (ap= LP_address(coin,coinaddr)) != 0 )
+            credits = ap->instantdex_credits;
+        if ( credits != 0 && (swaps_kmdvalue+kmdvalue) > credits )
+            printf("REJECT: %s instantdex_credits %.8f vs (%.8f + current %.8f)\n",coinaddr,dstr(credits),dstr(swaps_kmdvalue),dstr(kmdvalue));
+        return(credits - (swaps_kmdvalue+kmdvalue));
     }
     return(0);
 }
 
 int64_t LP_instantdex_proofcheck(char *coinaddr,cJSON *proof,int32_t num)
 {
-    uint8_t rmd160[20],addrtype; int32_t i,j; bits256 prevtxid,txid; char othersmartaddr[64]; struct iguana_info *coin; struct LP_address *ap = 0;
+    uint8_t rmd160[20],addrtype; int64_t credits=0; int32_t i,j; bits256 prevtxid,txid; char othersmartaddr[64]; struct iguana_info *coin; struct LP_address *ap = 0;
     if ( (coin= LP_coinfind("KMD")) != 0 )
     {
         bitcoin_addr2rmd160(0,&addrtype,rmd160,coinaddr);
         bitcoin_address(othersmartaddr,0,60,rmd160,20);
-        if ((ap= LP_address(coin,othersmartaddr)) != 0 )//&& (coin->electrum == 0 || ap->didinstantdex == 0) )
+        if ((ap= LP_address(coin,othersmartaddr)) != 0 )
         {
             ap->instantdex_credits = 0;
             for (i=0; i<num; i++)
@@ -503,12 +503,13 @@ int64_t LP_instantdex_proofcheck(char *coinaddr,cJSON *proof,int32_t num)
                 if ( j == i )
                     LP_instantdex_creditcalc(coin,1,txid,othersmartaddr);
             }
+            credits = ap->instantdex_credits;
             ap->didinstantdex = 1;
             if ( ap->instantdex_credits > 0 )
                 printf("validated instantdex %s.[%d] proof.(%s) credits %.8f\n",othersmartaddr,num,jprint(proof,0),dstr(ap->instantdex_credits));
         } //else printf("cant find ap.%p or already did %d %.8f\n",ap,ap!=0?ap->didinstantdex:-1,ap!=0?dstr(ap->instantdex_credits):-1);
     }
-    return(ap->instantdex_credits);
+    return(credits);
 }
 
 int64_t LP_myzcredits()

iguana/exchanges/LP_ordermatch.c

@@ -85,23 +85,6 @@ uint64_t LP_txfeecalc(struct iguana_info *coin,uint64_t txfee,int32_t txlen)
     return(txfee);
 }
 
-/*double LP_qprice_calc(int64_t *destsatoshisp,int64_t *satoshisp,double price,uint64_t b_satoshis,uint64_t txfee,uint64_t a_value,uint64_t maxdestsatoshis,uint64_t desttxfee)
-{
-    uint64_t destsatoshis,satoshis;
-    a_value -= (desttxfee + 1);
-    destsatoshis = ((b_satoshis - txfee) * price);
-    if ( destsatoshis > a_value )
-        destsatoshis = a_value;
-    if ( maxdestsatoshis != 0 && destsatoshis > maxdestsatoshis-desttxfee-1 )
-        destsatoshis = maxdestsatoshis-desttxfee-1;
-    satoshis = (destsatoshis / price + 0.49) - txfee;
-    *destsatoshisp = destsatoshis;
-    *satoshisp = satoshis;
-    if ( satoshis > 0 )
-        return((double)destsatoshis / satoshis);
-    else return(0.);
-}*/
-
 int32_t LP_quote_checkmempool(struct LP_quoteinfo *qp,struct LP_utxoinfo *autxo,struct LP_utxoinfo *butxo)
 {
     int32_t selector,spendvini; bits256 spendtxid;
@@ -477,7 +460,7 @@ int32_t LP_connectstartbob(void *ctx,int32_t pubsock,char *base,char *rel,double
             printf("requestid.%u quoteid.%u is already in progres\n",qp->R.requestid,qp->R.quoteid);
             return(-1);
         }
-        if ( (swap= LP_swapinit(1,0,privkey,&qp->R,qp,LP_dynamictrust(qp->desthash,LP_kmdvalue(qp->destcoin,qp->destsatoshis)) > 0)) == 0 )
+        if ( (swap= LP_swapinit(1,0,privkey,&qp->R,qp,LP_dynamictrust(qp->othercredits,qp->desthash,LP_kmdvalue(qp->destcoin,qp->destsatoshis)) > 0)) == 0 )
         {
             printf("cant initialize swap\n");
             return(-1);
@@ -635,7 +618,7 @@ char *LP_connectedalice(struct LP_quoteinfo *qp,char *pairstr) // alice
     if ( bits256_nonz(qp->privkey) != 0 )//&& qp->quotetime >= qp->timestamp-3 )
     {
         retjson = cJSON_CreateObject();
-        if ( (swap= LP_swapinit(0,0,qp->privkey,&qp->R,qp,LP_dynamictrust(qp->srchash,LP_kmdvalue(qp->srccoin,qp->satoshis)) > 0)) == 0 )
+        if ( (swap= LP_swapinit(0,0,qp->privkey,&qp->R,qp,LP_dynamictrust(qp->othercredits,qp->srchash,LP_kmdvalue(qp->srccoin,qp->satoshis)) > 0)) == 0 )
         {
             jaddstr(retjson,"error","couldnt swapinit");
             LP_availableset(qp->desttxid,qp->vout);
@@ -999,7 +982,7 @@ int32_t LP_trades_bestpricecheck(void *ctx,struct LP_trade *tp)
         if ( (retstr= LP_quotereceived(&Q)) != 0 )
             free(retstr);
         //LP_trades_gotreserved(ctx,&Q,&tp->Qs[LP_RESERVED]);
-        dynamictrust = LP_dynamictrust(Q.srchash,LP_kmdvalue(Q.srccoin,Q.satoshis));
+        dynamictrust = LP_dynamictrust(Q.othercredits,Q.srchash,LP_kmdvalue(Q.srccoin,Q.satoshis));
         if ( tp->bestprice == 0. )
             flag = 1;
         else if ( qprice < tp->bestprice && pubp->slowresponse <= tp->bestresponse*1.05 )
@@ -1222,7 +1205,7 @@ int32_t LP_tradecommand(void *ctx,char *myipaddr,int32_t pubsock,cJSON *argjson,
             {
                 //printf("CONNECTED.(%s)\n",jprint(argjson,0));
                 if ( (proof= jarray(&num,argjson,"proof")) != 0 && num > 0 )
-                    LP_instantdex_proofcheck(Q.coinaddr,proof,num);
+                    Q.othercredits = LP_instantdex_proofcheck(Q.coinaddr,proof,num);
                 if ( Qtrades == 0 )
                     LP_trades_gotconnected(ctx,&Q,&Q2,jstr(argjson,"pair"));
                 else LP_tradecommandQ(&Q,jstr(argjson,"pair"),LP_CONNECTED);
@@ -1258,7 +1241,7 @@ int32_t LP_tradecommand(void *ctx,char *myipaddr,int32_t pubsock,cJSON *argjson,
             {
                 printf("CONNECT.(%s)\n",jprint(argjson,0));
                 if ( (proof= jarray(&num,argjson,"proof")) != 0 && num > 0 )
-                    LP_instantdex_proofcheck(Q.destaddr,proof,num);
+                    Q.othercredits = LP_instantdex_proofcheck(Q.destaddr,proof,num);
                 if ( Qtrades == 0 )
                     LP_trades_gotconnect(ctx,&Q,&Q2,jstr(argjson,"pair"));
                 else LP_tradecommandQ(&Q,jstr(argjson,"pair"),LP_CONNECT);

iguana/exchanges/LP_statemachine.c

@@ -474,6 +474,22 @@ void LP_instantdex_txidadd(bits256 txid)
  exit(-1);
  }*/
 
+/*double LP_qprice_calc(int64_t *destsatoshisp,int64_t *satoshisp,double price,uint64_t b_satoshis,uint64_t txfee,uint64_t a_value,uint64_t maxdestsatoshis,uint64_t desttxfee)
+ {
+ uint64_t destsatoshis,satoshis;
+ a_value -= (desttxfee + 1);
+ destsatoshis = ((b_satoshis - txfee) * price);
+ if ( destsatoshis > a_value )
+ destsatoshis = a_value;
+ if ( maxdestsatoshis != 0 && destsatoshis > maxdestsatoshis-desttxfee-1 )
+ destsatoshis = maxdestsatoshis-desttxfee-1;
+ satoshis = (destsatoshis / price + 0.49) - txfee;
+ *destsatoshisp = destsatoshis;
+ *satoshisp = satoshis;
+ if ( satoshis > 0 )
+ return((double)destsatoshis / satoshis);
+ else return(0.);
+ }*/
 char *issue_LP_getprices(char *destip,uint16_t destport)
 {
     char url[512];

iguana/exchanges/LP_stats.c

@@ -760,7 +760,7 @@ cJSON *LP_statslog_disp(uint32_t starttime,uint32_t endtime,char *refgui,bits256
     }
     HASH_ITER(hh,LP_pubkeyinfos,pubp,ptmp)
     {
-        pubp->dynamictrust = LP_dynamictrust(pubp->pubkey,0);
+        pubp->dynamictrust = LP_dynamictrust(0,pubp->pubkey,0);
     }
     //printf("RT.%d completed.%d\n",LP_RTcount,LP_swapscount);
     jadd(retjson,"swaps",array);