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

Test

etomic
jl777 8 years ago
parent
adac8c4d75
commit
614c8bd979
3 changed files with 24 additions and 14 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. 21
      iguana/exchanges/LP_commands.c
  2. 15
      iguana/exchanges/LP_nativeDEX.c
  3. 2
      iguana/exchanges/mm.c

21
iguana/exchanges/LP_commands.c
View File

@ -35,7 +35,7 @@ struct basilisk_request *LP_requestinit(struct basilisk_request *rp,bits256 srch
return(rp); return(rp);
} }
double LP_pricequery(uint64_t *destsatoshisp,char *ipaddr,uint16_t port,char *base,char *rel,bits256 txid,int32_t vout) double LP_pricequery(uint64_t *txfeep,uint64_t *destsatoshisp,uint64_t *desttxfeep,char *ipaddr,uint16_t port,char *base,char *rel,bits256 txid,int32_t vout)
{ {
cJSON *reqjson; struct LP_peerinfo *peer; int32_t i,pushsock = -1; double price = 0.; cJSON *reqjson; struct LP_peerinfo *peer; int32_t i,pushsock = -1; double price = 0.;
if ( ipaddr != 0 && port >= 1000 ) if ( ipaddr != 0 && port >= 1000 )
@ -53,11 +53,11 @@ double LP_pricequery(uint64_t *destsatoshisp,char *ipaddr,uint16_t port,char *ba
jaddstr(reqjson,"rel",rel); jaddstr(reqjson,"rel",rel);
jaddstr(reqjson,"method","price"); jaddstr(reqjson,"method","price");
LP_send(pushsock,jprint(reqjson,1),1); LP_send(pushsock,jprint(reqjson,1),1);
for (i=0; i<30; i++) for (i=0; i<10; i++)
{ {
if ( (price= LP_pricecache(destsatoshisp,base,rel,txid,vout)) != 0. ) if ( (price= LP_pricecache(txfeep,destsatoshisp,desttxfeep,base,rel,txid,vout)) != 0. )
break; break;
usleep(100000); usleep(250000);
} }
} else printf("no pushsock for peer.%s:%u\n",ipaddr,port); } else printf("no pushsock for peer.%s:%u\n",ipaddr,port);
} else printf("cant find/create peer.%s:%u\n",ipaddr,port); } else printf("cant find/create peer.%s:%u\n",ipaddr,port);
@ -87,7 +87,7 @@ int32_t LP_sizematch(uint64_t mysatoshis,uint64_t othersatoshis)
cJSON *LP_tradecandidates(struct LP_utxoinfo *myutxo,char *base) cJSON *LP_tradecandidates(struct LP_utxoinfo *myutxo,char *base)
{ {
struct LP_peerinfo *peer,*tmp; char *utxostr,coinstr[16]; cJSON *array,*icopy,*retarray=0,*item; int32_t i,n; double price; int64_t estimatedbase; uint64_t destsatoshis; struct LP_peerinfo *peer,*tmp; char *utxostr,coinstr[16]; cJSON *array,*icopy,*retarray=0,*item; int32_t i,n; double price; int64_t estimatedbase; uint64_t txfee,destsatoshis,desttxfee;
if ( (price= LP_price(base,myutxo->coin)) == .0 ) if ( (price= LP_price(base,myutxo->coin)) == .0 )
return(0); return(0);
estimatedbase = myutxo->satoshis / price; estimatedbase = myutxo->satoshis / price;
@ -111,7 +111,7 @@ cJSON *LP_tradecandidates(struct LP_utxoinfo *myutxo,char *base)
if ( strcmp(coinstr,base) == 0 && LP_sizematch(estimatedbase,j64bits(item,"satoshis")) == 0 ) if ( strcmp(coinstr,base) == 0 && LP_sizematch(estimatedbase,j64bits(item,"satoshis")) == 0 )
{ {
icopy = 0; icopy = 0;
if ( (price= LP_pricecache(&destsatoshis,base,myutxo->coin,jbits256(item,"txid"),jint(item,"vout"))) != 0. ) if ( (price= LP_pricecache(&txfee,&destsatoshis,&desttxfee,base,myutxo->coin,jbits256(item,"txid"),jint(item,"vout"))) != 0. )
{ {
if ( LP_sizematch(myutxo->satoshis,destsatoshis) == 0 ) if ( LP_sizematch(myutxo->satoshis,destsatoshis) == 0 )
icopy = jduplicate(item); icopy = jduplicate(item);
@ -137,21 +137,23 @@ cJSON *LP_tradecandidates(struct LP_utxoinfo *myutxo,char *base)
cJSON *LP_bestprice(struct LP_utxoinfo *utxo,char *base) cJSON *LP_bestprice(struct LP_utxoinfo *utxo,char *base)
{ {
int32_t i,n,besti; cJSON *array,*item,*bestitem=0; double bestmetric,metric,bestprice=0.,price,prices[100]; uint64_t destsatoshis[100]; int32_t i,n,besti; cJSON *array,*item,*bestitem=0; double bestmetric,metric,bestprice=0.,price,prices[100]; uint64_t txfees[100],destsatoshis[100],desttxfees[100];
bestprice = 0.; bestprice = 0.;
if ( (array= LP_tradecandidates(utxo,base)) != 0 ) if ( (array= LP_tradecandidates(utxo,base)) != 0 )
{ {
if ( (n= cJSON_GetArraySize(array)) > 0 ) if ( (n= cJSON_GetArraySize(array)) > 0 )
{ {
memset(prices,0,sizeof(prices)); memset(prices,0,sizeof(prices));
memset(txfees,0,sizeof(txfees));
memset(destsatoshis,0,sizeof(destsatoshis)); memset(destsatoshis,0,sizeof(destsatoshis));
memset(desttxfees,0,sizeof(desttxfees));
//BTC 0.02500000 -> ([{"ipaddr":"5.9.253.196","port":7779,"profit":0.01035000,"base":"KMD","coin":"KMD","address":"RFQn4gNG555woQWQV1wPseR47spCduiJP5","script":"76a914434009423522682bd7cc1b18a614c3096d19683188ac","txid":"f5d5e2eb4ef85c78f95076d0d2d99af9e1b85968e57b3c7bdb282bd005f7c341","vout":1,"value":100,"deposit":"07902a65d11f0f577a0346432bcd2b6b53de5554c314209d1964693962524d69","dvout":1,"dvalue":120}]) //BTC 0.02500000 -> ([{"ipaddr":"5.9.253.196","port":7779,"profit":0.01035000,"base":"KMD","coin":"KMD","address":"RFQn4gNG555woQWQV1wPseR47spCduiJP5","script":"76a914434009423522682bd7cc1b18a614c3096d19683188ac","txid":"f5d5e2eb4ef85c78f95076d0d2d99af9e1b85968e57b3c7bdb282bd005f7c341","vout":1,"value":100,"deposit":"07902a65d11f0f577a0346432bcd2b6b53de5554c314209d1964693962524d69","dvout":1,"dvalue":120}])
for (i=0; i<n && i<sizeof(prices)/sizeof(*prices); i++) for (i=0; i<n && i<sizeof(prices)/sizeof(*prices); i++)
{ {
item = jitem(array,i); item = jitem(array,i);
if ( (price= jdouble(item,"price")) == 0. ) if ( (price= jdouble(item,"price")) == 0. )
{ {
price = LP_pricequery(&destsatoshis[i],jstr(item,"ipaddr"),jint(item,"port"),base,utxo->coin,jbits256(item,"txid"),jint(item,"vout")); price = LP_pricequery(&txfees[i],&destsatoshis[i],&desttxfees[i],jstr(item,"ipaddr"),jint(item,"port"),base,utxo->coin,jbits256(item,"txid"),jint(item,"vout"));
if ( destsatoshis[i] != 0 && (double)j64bits(item,"value")/destsatoshis[i] > price ) if ( destsatoshis[i] != 0 && (double)j64bits(item,"value")/destsatoshis[i] > price )
price = (double)j64bits(item,"satoshis")/destsatoshis[i]; price = (double)j64bits(item,"satoshis")/destsatoshis[i];
} }
@ -185,6 +187,9 @@ cJSON *LP_bestprice(struct LP_utxoinfo *utxo,char *base)
if ( jobj(bestitem,"price") != 0 ) if ( jobj(bestitem,"price") != 0 )
jdelete(bestitem,"price"); jdelete(bestitem,"price");
jaddnum(bestitem,"price",prices[besti]); jaddnum(bestitem,"price",prices[besti]);
jadd64bits(bestitem,"txfee",txfees[besti]);
jadd64bits(bestitem,"desttxfee",desttxfees[besti]);
jadd64bits(bestitem,"destsatoshis",destsatoshis[besti]);
} }
} }
free_json(array); free_json(array);

15
iguana/exchanges/LP_nativeDEX.c
View File

@ -17,6 +17,8 @@
// LP_nativeDEX.c // LP_nativeDEX.c
// marketmaker // marketmaker
// //
// jl777: fix price calcs based on specific txfees
// jl777: add change output
#include <stdio.h> #include <stdio.h>
#include "LP_include.h" #include "LP_include.h"
@ -90,25 +92,29 @@ struct LP_cacheinfo *LP_cachefind(char *base,char *rel,bits256 txid,int32_t vout
{ {
printf("expire price %.8f\n",ptr->price); printf("expire price %.8f\n",ptr->price);
ptr->price = 0.; ptr->price = 0.;
ptr->destsatoshis = 0; ptr->destsatoshis = ptr->txfee = ptr->desttxfee = 0;
ptr->timestamp = 0; ptr->timestamp = 0;
} }
return(ptr); return(ptr);
} }
double LP_pricecache(uint64_t *destsatoshisp,char *base,char *rel,bits256 txid,int32_t vout) double LP_pricecache(uint64_t *txfeep,uint64_t *destsatoshisp,uint64_t *desttxfeep,char *base,char *rel,bits256 txid,int32_t vout)
{ {
struct LP_cacheinfo *ptr; struct LP_cacheinfo *ptr;
if ( (ptr= LP_cachefind(base,rel,txid,vout)) != 0 ) if ( (ptr= LP_cachefind(base,rel,txid,vout)) != 0 )
{ {
if ( destsatoshisp != 0 ) if ( destsatoshisp != 0 )
{
*destsatoshisp = ptr->destsatoshis; *destsatoshisp = ptr->destsatoshis;
printf("found %s/%s %.8f\n",base,rel,ptr->price); *txfeep = ptr->txfee;
*desttxfeep = ptr->desttxfee;
}
//printf("found %s/%s %.8f\n",base,rel,ptr->price);
return(ptr->price); return(ptr->price);
} }
else if ( destsatoshisp != 0 ) else if ( destsatoshisp != 0 )
*destsatoshisp = 0; *destsatoshisp = 0;
char str[65]; printf("cachemiss %s/%s %s/v%d\n",base,rel,bits256_str(str,txid),vout); //char str[65]; printf("cachemiss %s/%s %s/v%d\n",base,rel,bits256_str(str,txid),vout);
return(0.); return(0.);
} }
@ -131,7 +137,6 @@ struct LP_cacheinfo *LP_cacheadd(char *base,char *rel,bits256 txid,int32_t vout,
ptr->satoshis = satoshis; ptr->satoshis = satoshis;
ptr->destsatoshis = satoshis * price; ptr->destsatoshis = satoshis * price;
ptr->timestamp = (uint32_t)time(NULL); ptr->timestamp = (uint32_t)time(NULL);
LP_pricecache(0,base,rel,txid,vout);
return(ptr); return(ptr);
} }

2
iguana/exchanges/mm.c
View File

@ -840,7 +840,7 @@ int main(int argc, const char * argv[])
HASH_ITER(hh,LP_utxoinfos,utxo,utmp) HASH_ITER(hh,LP_utxoinfos,utxo,utmp)
{ {
if ( (matchjson= LP_bestprice(utxo,"KMD")) != 0 ) if ( (matchjson= LP_bestprice(utxo,"KMD")) != 0 )
printf("bestprice (%s)\n",jprint(matchjson,1)); printf("bestprice %.8f txfees %.8f %.8f destsatoshis %.8f (%s)\n",jdouble(matchjson,"price"),dstr(j64bits(matchjson,"txfee")),dstr(j64bits(matchjson,"desttxfee")),dstr(j64bits(matchjson,"destsatoshis")),jprint(matchjson,1));
} }
} }
} }

Write Preview
Loading…
Cancel
Save