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

Blacklisting

etomic
jl777 8 years ago
parent
7cd19bb1c5
commit
23903882df
3 changed files with 11 additions and 7 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. 4
      iguana/exchanges/LP_include.h
  2. 12
      iguana/exchanges/LP_ordermatch.c
  3. 2
      iguana/exchanges/LP_prices.c

4
iguana/exchanges/LP_include.h
View File

@ -24,7 +24,7 @@
#define LP_COMMAND_SENDSOCK NN_PUSH #define LP_COMMAND_SENDSOCK NN_PUSH
#define LP_COMMAND_RECVSOCK NN_PULL #define LP_COMMAND_RECVSOCK NN_PULL
#define LP_MAXPUBKEY_ERRORS 3
#define PSOCK_KEEPALIVE 600 #define PSOCK_KEEPALIVE 600
#define MAINLOOP_PERSEC 10 #define MAINLOOP_PERSEC 10
#define MAX_PSOCK_PORT 60000 #define MAX_PSOCK_PORT 60000
@ -164,7 +164,7 @@ struct iguana_info
struct _LP_utxoinfo { bits256 txid; uint64_t value; int32_t vout; }; struct _LP_utxoinfo { bits256 txid; uint64_t value; int32_t vout; };
struct LP_utxostats { uint32_t lasttime,errors,swappending,spentflag,lastspentcheck; }; struct LP_utxostats { uint32_t lasttime,errors,swappending,spentflag,lastspentcheck,bestflag; };
struct LP_utxobob { struct _LP_utxoinfo utxo,deposit; }; struct LP_utxobob { struct _LP_utxoinfo utxo,deposit; };

12
iguana/exchanges/LP_ordermatch.c
View File

@ -554,7 +554,7 @@ int32_t LP_tradecommand(void *ctx,char *myipaddr,int32_t pubsock,cJSON *argjson,
char *LP_autotrade(void *ctx,char *myipaddr,int32_t mypubsock,double profitmargin,char *base,char *rel,double maxprice,double volume,int32_t timeout) char *LP_autotrade(void *ctx,char *myipaddr,int32_t mypubsock,double profitmargin,char *base,char *rel,double maxprice,double volume,int32_t timeout)
{ {
int64_t satoshis,destsatoshis,desttxfee,txfee,bestdestsatoshis=0; bits256 txid,pubkey; char *obookstr; cJSON *orderbook,*asks,*item,*bestitem=0; struct LP_utxoinfo *autxo,*butxo,*bestutxo = 0; int32_t i,vout,numasks,DEXselector=0; uint32_t expiration; double ordermatchprice,bestmetric,metric,bestprice=0.,vol,price; struct LP_quoteinfo Q; int64_t satoshis,destsatoshis,desttxfee,txfee,bestdestsatoshis=0; bits256 txid,pubkey; char *obookstr; cJSON *orderbook,*asks,*item,*bestitem=0; struct LP_utxoinfo *autxo,*butxo,*bestutxo = 0; int32_t i,vout,numasks,DEXselector=0; uint32_t expiration; double ordermatchprice,bestmetric,metric,bestprice=0.,vol,price; struct LP_quoteinfo Q; struct LP_pubkeyinfo *pubp;
if ( maxprice <= 0. || volume <= 0. || LP_priceinfofind(base) == 0 || LP_priceinfofind(rel) == 0 ) if ( maxprice <= 0. || volume <= 0. || LP_priceinfofind(base) == 0 || LP_priceinfofind(rel) == 0 )
return(clonestr("{\"error\":\"invalid parameter\"}")); return(clonestr("{\"error\":\"invalid parameter\"}"));
if ( (autxo= LP_utxo_bestfit(rel,SATOSHIDEN * volume)) == 0 ) if ( (autxo= LP_utxo_bestfit(rel,SATOSHIDEN * volume)) == 0 )
@ -581,7 +581,7 @@ char *LP_autotrade(void *ctx,char *myipaddr,int32_t mypubsock,double profitmargi
if ( price > maxprice ) if ( price > maxprice )
price = maxprice; price = maxprice;
pubkey = jbits256(item,"pubkey"); pubkey = jbits256(item,"pubkey");
if ( bits256_cmp(pubkey,LP_mypubkey) != 0 ) if ( bits256_cmp(pubkey,LP_mypubkey) != 0 && (pubp= LP_pubkeyadd(pubkey)) != 0 && pubp->numerrors < LP_MAXPUBKEY_ERRORS )
{ {
if ( bestprice == 0. ) // assumes price ordered asks if ( bestprice == 0. ) // assumes price ordered asks
bestprice = price; bestprice = price;
@ -590,7 +590,7 @@ char *LP_autotrade(void *ctx,char *myipaddr,int32_t mypubsock,double profitmargi
vout = jint(item,"vout"); vout = jint(item,"vout");
vol = jdouble(item,"volume"); vol = jdouble(item,"volume");
metric = price / bestprice; metric = price / bestprice;
if ( (butxo= LP_utxofind(1,txid,vout)) != 0 && (long long)(vol*SATOSHIDEN) == butxo->S.satoshis && LP_isavailable(butxo) > 0 && LP_ismine(butxo) == 0 ) if ( (butxo= LP_utxofind(1,txid,vout)) != 0 && (long long)(vol*SATOSHIDEN) == butxo->S.satoshis && LP_isavailable(butxo) > 0 && LP_ismine(butxo) == 0 && butxo->T.bestflag == 0 )
{ {
destsatoshis = ((butxo->S.satoshis - txfee) * price); destsatoshis = ((butxo->S.satoshis - txfee) * price);
if ( destsatoshis > autxo->payment.value-desttxfee-1 ) if ( destsatoshis > autxo->payment.value-desttxfee-1 )
@ -630,6 +630,7 @@ char *LP_autotrade(void *ctx,char *myipaddr,int32_t mypubsock,double profitmargi
return(clonestr("{\"error\":\"cant set ordermatch quote\"}")); return(clonestr("{\"error\":\"cant set ordermatch quote\"}"));
if ( LP_quotedestinfo(&Q,autxo->payment.txid,autxo->payment.vout,autxo->fee.txid,autxo->fee.vout,LP_mypubkey,autxo->coinaddr) < 0 ) if ( LP_quotedestinfo(&Q,autxo->payment.txid,autxo->payment.vout,autxo->fee.txid,autxo->fee.vout,LP_mypubkey,autxo->coinaddr) < 0 )
return(clonestr("{\"error\":\"cant set ordermatch quote info\"}")); return(clonestr("{\"error\":\"cant set ordermatch quote info\"}"));
bestutxo->T.bestflag = (uint32_t)time(NULL);
price = LP_query(ctx,myipaddr,mypubsock,profitmargin,"request",&Q); price = LP_query(ctx,myipaddr,mypubsock,profitmargin,"request",&Q);
bestitem = LP_quotejson(&Q); bestitem = LP_quotejson(&Q);
if ( price > SMALLVAL ) if ( price > SMALLVAL )
@ -646,8 +647,11 @@ char *LP_autotrade(void *ctx,char *myipaddr,int32_t mypubsock,double profitmargi
sleep(1); sleep(1);
} }
if ( autxo->S.swap == 0 ) if ( autxo->S.swap == 0 )
{
if ( (pubp= LP_pubkeyadd(bestutxo->pubkey)) != 0 )
pubp->numerrors++;
jaddstr(bestitem,"status","couldnt establish connection"); jaddstr(bestitem,"status","couldnt establish connection");
else jaddstr(bestitem,"status","connected"); } else jaddstr(bestitem,"status","connected");
jaddnum(bestitem,"quotedprice",price); jaddnum(bestitem,"quotedprice",price);
jaddnum(bestitem,"maxprice",maxprice); jaddnum(bestitem,"maxprice",maxprice);
jaddnum(bestitem,"requestid",Q.R.requestid); jaddnum(bestitem,"requestid",Q.R.requestid);

2
iguana/exchanges/LP_prices.c
View File

@ -46,7 +46,7 @@ struct LP_pubkeyinfo
UT_hash_handle hh; UT_hash_handle hh;
bits256 pubkey; bits256 pubkey;
double matrix[LP_MAXPRICEINFOS][LP_MAXPRICEINFOS]; double matrix[LP_MAXPRICEINFOS][LP_MAXPRICEINFOS];
uint32_t timestamp,istrusted; uint32_t timestamp,istrusted,numerrors;
} *LP_pubkeyinfos; } *LP_pubkeyinfos;
struct LP_priceinfo *LP_priceinfofind(char *symbol) struct LP_priceinfo *LP_priceinfofind(char *symbol)

Write Preview
Loading…
Cancel
Save