Browse Source

Merge branch 'dev' into spvdex

etomic
jl777 7 years ago
committed by GitHub
parent
commit
8cc49052b0
  1. 1
      iguana/exchanges/LP_ordermatch.c
  2. 4
      iguana/exchanges/LP_prices.c
  3. 2
      iguana/exchanges/LP_utxos.c

1
iguana/exchanges/LP_ordermatch.c

@ -512,6 +512,7 @@ struct LP_utxoinfo *LP_address_utxopair(int32_t iambob,struct LP_address_utxo **
targetval2 = (targetval / 8) * 9 + 2*txfee; targetval2 = (targetval / 8) * 9 + 2*txfee;
//printf("found mini.%d %.8f for targetval %.8f -> targetval2 %.8f, ratio %.2f\n",mini,dstr(up->U.value),dstr(targetval),dstr(targetval2),(double)up->U.value/targetval); //printf("found mini.%d %.8f for targetval %.8f -> targetval2 %.8f, ratio %.2f\n",mini,dstr(up->U.value),dstr(targetval),dstr(targetval2),(double)up->U.value/targetval);
if ( (double)up->U.value/targetval < LP_MINVOL-1 ) if ( (double)up->U.value/targetval < LP_MINVOL-1 )
{ {
if ( (mini= LP_nearest_utxovalue(coin,utxos,m,targetval2 * 1.01)) >= 0 ) if ( (mini= LP_nearest_utxovalue(coin,utxos,m,targetval2 * 1.01)) >= 0 )
{ {

4
iguana/exchanges/LP_prices.c

@ -1017,7 +1017,7 @@ void LP_pricefeedupdate(bits256 pubkey,char *base,char *rel,double price)
pubp->timestamp = (uint32_t)time(NULL); pubp->timestamp = (uint32_t)time(NULL);
} else printf("error creating pubkey entry\n"); } else printf("error creating pubkey entry\n");
} }
else if ( (rand() % 100) == 0 ) //else if ( (rand() % 100) == 0 )
printf("error finding %s/%s %.8f\n",base,rel,price); // printf("error finding %s/%s %.8f\n",base,rel,price);
} }

2
iguana/exchanges/LP_utxos.c

@ -309,7 +309,7 @@ struct LP_utxoinfo *LP_utxoadd(int32_t iambob,char *symbol,bits256 txid,int32_t
}*/ }*/
if ( (coin= LP_coinfind(symbol)) == 0 || (IAMLP == 0 && coin->inactive != 0) ) if ( (coin= LP_coinfind(symbol)) == 0 || (IAMLP == 0 && coin->inactive != 0) )
{ {
printf("LP_utxoadd reject inactive %s\n",symbol); //printf("LP_utxoadd reject inactive %s\n",symbol);
return(0); return(0);
} }
txfee = LP_txfeecalc(coin,0); txfee = LP_txfeecalc(coin,0);

Loading…
Cancel
Save