lukechilds
/
SuperNET
mirror of https://github.com/lukechilds/SuperNET.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Test

beta
jl777 7 years ago
parent
98b38fa81e
commit
43a445509a
2 changed files with 5 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      iguana/exchanges/LP_ordermatch.c
  2. 2
      iguana/exchanges/LP_utxos.c

8
iguana/exchanges/LP_ordermatch.c
View File

@ -485,7 +485,7 @@ struct LP_utxoinfo *LP_address_utxopair(struct LP_utxoinfo *utxo,struct LP_addre
utxo->deposit.txid = up2->U.txid; utxo->deposit.txid = up2->U.txid;
utxo->deposit.vout = up2->U.vout; utxo->deposit.vout = up2->U.vout;
utxo->deposit.value = up2->U.value; utxo->deposit.value = up2->U.value;
utxo->S.satoshis = SATOSHIDEN * ((volume + dstr(desttxfee)) / price); utxo->S.satoshis = SATOSHIDEN * (volume / price);
return(utxo); return(utxo);
} }
} }
@ -923,12 +923,12 @@ struct LP_utxoinfo *LP_buyutxo(struct LP_utxoinfo *bestutxo,double *ordermatchpr
//printf("%s minvol %.8f %.8f maxvol %.8f\n",jprint(item,0),minvol,relvolume,maxvol); //printf("%s minvol %.8f %.8f maxvol %.8f\n",jprint(item,0),minvol,relvolume,maxvol);
//if ( relvolume >= minvol && relvolume <= maxvol ) //if ( relvolume >= minvol && relvolume <= maxvol )
{ {
if ( (bestutxo= LP_address_utxopair(bestutxo,utxos,max,basecoin,coinaddr,txfee,dstr(bestutxo->S.satoshis * price - desttxfee),price,0,desttxfee)) != 0 ) if ( (bestutxo= LP_address_utxopair(bestutxo,utxos,max,basecoin,coinaddr,txfee,dstr(autxo->S.satoshis),price,0,desttxfee)) != 0 )
{ {
bestutxo->pubkey = pubp->pubkey; bestutxo->pubkey = pubp->pubkey;
safecopy(bestutxo->gui,gui,sizeof(bestutxo->gui)); safecopy(bestutxo->gui,gui,sizeof(bestutxo->gui));
autxo->S.satoshis = bestutxo->S.satoshis * price - desttxfee; //autxo->S.satoshis = bestutxo->S.satoshis * price - desttxfee;
*bestsatoshisp = bestutxo->S.satoshis - txfee; *bestsatoshisp = bestutxo->S.satoshis;
*ordermatchpricep = price; *ordermatchpricep = price;
*bestdestsatoshisp = autxo->S.satoshis; *bestdestsatoshisp = autxo->S.satoshis;
printf("ordermatch %.8f %.8f %.8f txfees (%.8f %.8f)\n",price,dstr(*bestsatoshisp),dstr(*bestdestsatoshisp),dstr(txfee),dstr(desttxfee)); printf("ordermatch %.8f %.8f %.8f txfees (%.8f %.8f)\n",price,dstr(*bestsatoshisp),dstr(*bestdestsatoshisp),dstr(txfee),dstr(desttxfee));

2
iguana/exchanges/LP_utxos.c
View File

@ -290,7 +290,7 @@ struct LP_utxoinfo *LP_utxo_bestfit(char *symbol,uint64_t destsatoshis)
continue; continue;
if ( LP_isavailable(utxo) > 0 && LP_ismine(utxo) > 0 ) if ( LP_isavailable(utxo) > 0 && LP_ismine(utxo) > 0 )
{ {
if ( utxo->S.satoshis >= destsatoshis/2 && (bestutxo == 0 || (bestutxo->S.satoshis < destsatoshis && utxo->S.satoshis >= destsatoshis) || (bestutxo->S.satoshis >= destsatoshis && utxo->S.satoshis < bestutxo->S.satoshis)) ) if ( utxo->S.satoshis >= destsatoshis && (bestutxo == 0 || (bestutxo->S.satoshis < destsatoshis && utxo->S.satoshis >= destsatoshis) || (bestutxo->S.satoshis >= destsatoshis && utxo->S.satoshis < bestutxo->S.satoshis)) )
{ {
if ( LP_iseligible(&srcvalue,&srcvalue2,utxo->iambob,symbol,utxo->payment.txid,utxo->payment.vout,utxo->S.satoshis,utxo->fee.txid,utxo->fee.vout) == 0 ) if ( LP_iseligible(&srcvalue,&srcvalue2,utxo->iambob,symbol,utxo->payment.txid,utxo->payment.vout,utxo->S.satoshis,utxo->fee.txid,utxo->fee.vout) == 0 )
{ {

Write Preview
Loading…
Cancel
Save