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

Test

dev
jl777 7 years ago
parent
b4736afb36
commit
ee3c92f8b8
4 changed files with 53 additions and 40 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. 1
      iguana/exchanges/LP_include.h
  2. 47
      iguana/exchanges/LP_nativeDEX.c
  3. 35
      iguana/exchanges/mm.c
  4. 2
      iguana/exchanges/stats.c

1
iguana/exchanges/LP_include.h
View File

@ -518,6 +518,7 @@ int64_t LP_myzcredits();
void test_validate(struct iguana_info *coin,char *signedtx); void test_validate(struct iguana_info *coin,char *signedtx);
void LP_instantdex_depositadd(char *coinaddr,bits256 txid); void LP_instantdex_depositadd(char *coinaddr,bits256 txid);
int64_t LP_instantdex_creditcalc(struct iguana_info *coin,int32_t dispflag,bits256 txid,char *refaddr); int64_t LP_instantdex_creditcalc(struct iguana_info *coin,int32_t dispflag,bits256 txid,char *refaddr);
void LP_ports(uint16_t *pullportp,uint16_t *pubportp,uint16_t *busportp,uint16_t netid);
int32_t LP_destaddr(char *destaddr,cJSON *item); int32_t LP_destaddr(char *destaddr,cJSON *item);
int32_t LP_waitmempool(char *symbol,char *coinaddr,bits256 txid,int32_t vout,int32_t duration); int32_t LP_waitmempool(char *symbol,char *coinaddr,bits256 txid,int32_t vout,int32_t duration);
cJSON *LP_statslog_disp(uint32_t starttime,uint32_t endtime,char *refgui,bits256 refpubkey,char *refbase,char *refrel); cJSON *LP_statslog_disp(uint32_t starttime,uint32_t endtime,char *refgui,bits256 refpubkey,char *refbase,char *refrel);

47
iguana/exchanges/LP_nativeDEX.c
View File

@ -135,7 +135,7 @@ uint32_t LP_rand()
char *activecoins[] = { "BTC", "KMD" }; char *activecoins[] = { "BTC", "KMD" };
char GLOBAL_DBDIR[] = { "DB" }; char GLOBAL_DBDIR[] = { "DB" };
char LP_myipaddr[64],LP_publicaddr[64],USERHOME[512] = { "/root" }; char LP_myipaddr[64],USERHOME[512] = { "/root" };
char LP_gui[16] = { "cli" }; char LP_gui[16] = { "cli" };
char *default_LPnodes[] = { "5.9.253.195", "5.9.253.196", "5.9.253.197", "5.9.253.198", "5.9.253.199", "5.9.253.200", "5.9.253.201", "5.9.253.202", "5.9.253.203", char *default_LPnodes[] = { "5.9.253.195", "5.9.253.196", "5.9.253.197", "5.9.253.198", "5.9.253.199", "5.9.253.200", "5.9.253.201", "5.9.253.202", "5.9.253.203",
@ -669,7 +669,7 @@ void LP_coinsloop(void *_coins)
} }
} }
int32_t LP_mainloop_iter(void *ctx,char *myipaddr,struct LP_peerinfo *mypeer,int32_t pubsock,char *pushaddr,uint16_t myport) int32_t LP_mainloop_iter(void *ctx,char *myipaddr,struct LP_peerinfo *mypeer,int32_t pubsock)
{ {
static uint32_t counter;//,didinstantdex; static uint32_t counter;//,didinstantdex;
struct iguana_info *coin,*ctmp; char *origipaddr; uint32_t now; int32_t notarized,height,nonz = 0; struct iguana_info *coin,*ctmp; char *origipaddr; uint32_t now; int32_t notarized,height,nonz = 0;
@ -849,9 +849,10 @@ void LP_initcoins(void *ctx,int32_t pubsock,cJSON *coins)
printf("privkey updates\n"); printf("privkey updates\n");
} }
void LP_initpeers(int32_t pubsock,struct LP_peerinfo *mypeer,char *myipaddr,uint16_t myport,char *seednode,uint16_t pushport,uint16_t subport) void LP_initpeers(int32_t pubsock,struct LP_peerinfo *mypeer,char *myipaddr,uint16_t myport,uint16_t netid,char *seednode)
{ {
int32_t i,j; uint32_t r; int32_t i,j; uint32_t r; uint16_t pushport,subport,busport;
LP_ports(&pushport,&subport,&busport,netid);
if ( IAMLP != 0 ) if ( IAMLP != 0 )
{ {
LP_mypeer = mypeer = LP_addpeer(mypeer,pubsock,myipaddr,myport,pushport,subport,1,G.LP_sessionid); LP_mypeer = mypeer = LP_addpeer(mypeer,pubsock,myipaddr,myport,pushport,subport,1,G.LP_sessionid);
@ -1149,7 +1150,7 @@ extern int32_t bitcoind_RPC_inittime;
void LPinit(uint16_t myport,uint16_t mypullport,uint16_t mypubport,uint16_t mybusport,char *passphrase,int32_t amclient,char *userhome,cJSON *argjson) void LPinit(uint16_t myport,uint16_t mypullport,uint16_t mypubport,uint16_t mybusport,char *passphrase,int32_t amclient,char *userhome,cJSON *argjson)
{ {
char *myipaddr=0,version[64]; long filesize,n; int32_t valid,timeout,pubsock=-1; struct LP_peerinfo *mypeer=0; char pushaddr[128],subaddr[128],bindaddr[128],*coins_str=0; cJSON *coinsjson=0; void *ctx = bitcoin_ctx(); char *myipaddr=0,version[64]; long filesize,n; int32_t valid,timeout; struct LP_peerinfo *mypeer=0; char pushaddr[128],subaddr[128],bindaddr[128],*coins_str=0; cJSON *coinsjson=0; void *ctx = bitcoin_ctx();
sprintf(version,"Marketmaker %s.%s %s rsize.%ld",LP_MAJOR_VERSION,LP_MINOR_VERSION,LP_BUILD_NUMBER,sizeof(struct basilisk_request)); sprintf(version,"Marketmaker %s.%s %s rsize.%ld",LP_MAJOR_VERSION,LP_MINOR_VERSION,LP_BUILD_NUMBER,sizeof(struct basilisk_request));
bitcoind_RPC_inittime = 1; bitcoind_RPC_inittime = 1;
printf("%s %u\n",version,calc_crc32(0,version,(int32_t)strlen(version))); printf("%s %u\n",version,calc_crc32(0,version,(int32_t)strlen(version)));
@ -1246,29 +1247,29 @@ void LPinit(uint16_t myport,uint16_t mypullport,uint16_t mypubport,uint16_t mybu
#endif #endif
if ( IAMLP != 0 ) if ( IAMLP != 0 )
{ {
pubsock = -1; LP_mypubsock = -1;
nanomsg_transportname(0,subaddr,myipaddr,mypubport); nanomsg_transportname(0,subaddr,myipaddr,mypubport);
nanomsg_transportname(1,bindaddr,myipaddr,mypubport); nanomsg_transportname(1,bindaddr,myipaddr,mypubport);
valid = 0; valid = 0;
if ( (pubsock= nn_socket(AF_SP,NN_PUB)) >= 0 ) if ( (LP_mypubsock= nn_socket(AF_SP,NN_PUB)) >= 0 )
{ {
valid = 0; valid = 0;
if ( nn_bind(pubsock,bindaddr) >= 0 ) if ( nn_bind(LP_mypubsock,bindaddr) >= 0 )
valid++; valid++;
if ( valid > 0 ) if ( valid > 0 )
{ {
timeout = 1; timeout = 1;
nn_setsockopt(pubsock,NN_SOL_SOCKET,NN_SNDTIMEO,&timeout,sizeof(timeout)); nn_setsockopt(LP_mypubsock,NN_SOL_SOCKET,NN_SNDTIMEO,&timeout,sizeof(timeout));
} }
else else
{ {
printf("error binding to (%s).%d\n",subaddr,pubsock); printf("error binding to (%s).%d\n",subaddr,LP_mypubsock);
if ( pubsock >= 0 ) if ( LP_mypubsock >= 0 )
nn_close(pubsock), pubsock = -1; nn_close(LP_mypubsock), LP_mypubsock = -1;
} }
} else printf("error getting pubsock %d\n",pubsock); } else printf("error getting pubsock %d\n",LP_mypubsock);
printf(">>>>>>>>> myipaddr.(%s) (%s) valid.%d pubbindaddr.%s pubsock.%d\n",bindaddr,subaddr,valid,bindaddr,pubsock); printf(">>>>>>>>> myipaddr.(%s) (%s) valid.%d pubbindaddr.%s pubsock.%d\n",bindaddr,subaddr,valid,bindaddr,LP_mypubsock);
LP_mypubsock = pubsock; LP_mypullsock = LP_initpublicaddr(ctx,&mypullport,pushaddr,myipaddr,mypullport,0);
} }
if ( (coinsjson= jobj(argjson,"coins")) == 0 ) if ( (coinsjson= jobj(argjson,"coins")) == 0 )
{ {
@ -1286,15 +1287,15 @@ void LPinit(uint16_t myport,uint16_t mypullport,uint16_t mypubport,uint16_t mybu
printf("no coins object or coins.json file, must abort\n"); printf("no coins object or coins.json file, must abort\n");
exit(-1); exit(-1);
} }
LP_initcoins(ctx,pubsock,coinsjson); LP_initcoins(ctx,LP_mypubsock,coinsjson);
RPC_port = myport; RPC_port = myport;
G.waiting = 1; G.waiting = 1;
LP_initpeers(pubsock,mypeer,myipaddr,myport,jstr(argjson,"seednode"),mypullport,mypubport); LP_initpeers(LP_mypubsock,LP_mypeer,LP_myipaddr,RPC_port,juint(argjson,"netid"),jstr(argjson,"seednode"));
LP_mypullsock = LP_initpublicaddr(ctx,&mypullport,pushaddr,myipaddr,mypullport,0); //LP_mypullsock = LP_initpublicaddr(ctx,&mypullport,pushaddr,myipaddr,mypullport,0);
strcpy(LP_publicaddr,pushaddr); //strcpy(LP_publicaddr,pushaddr);
//LP_publicport = mypullport; //LP_publicport = mypullport;
//LP_mybussock = LP_coinbus(mybusport); //LP_mybussock = LP_coinbus(mybusport);
printf("got %s, initpeers. LP_mypubsock.%d/%d pullsock.%d myport.%u mypullport.%d mypubport.%d pushaddr.%s\n",myipaddr,LP_mypubsock,pubsock,LP_mypullsock,myport,mypullport,mypubport,pushaddr); printf("got %s, initpeers. LP_mypubsock.%d pullsock.%d RPC_port.%u mypullport.%d mypubport.%d pushaddr.%s\n",myipaddr,LP_mypubsock,LP_mypullsock,RPC_port,mypullport,mypubport,pushaddr);
LP_passphrase_init(passphrase,jstr(argjson,"gui"),juint(argjson,"netid"),jstr(argjson,"seednode")); LP_passphrase_init(passphrase,jstr(argjson,"gui"),juint(argjson,"netid"),jstr(argjson,"seednode"));
#ifndef FROM_JS #ifndef FROM_JS
if ( IAMLP != 0 && OS_thread_create(malloc(sizeof(pthread_t)),NULL,(void *)LP_psockloop,(void *)myipaddr) != 0 ) if ( IAMLP != 0 && OS_thread_create(malloc(sizeof(pthread_t)),NULL,(void *)LP_psockloop,(void *)myipaddr) != 0 )
@ -1374,12 +1375,12 @@ void LPinit(uint16_t myport,uint16_t mypullport,uint16_t mypubport,uint16_t mybu
//fprintf(stderr,"."); //fprintf(stderr,".");
sleep(3); sleep(3);
} }
if ( LP_mainloop_iter(ctx,myipaddr,mypeer,pubsock,pushaddr,myport) != 0 ) if ( LP_mainloop_iter(ctx,myipaddr,mypeer,LP_mypubsock) != 0 )
nonz++; nonz++;
if ( didremote == 0 && LP_cmdcount > 0 ) if ( didremote == 0 && LP_cmdcount > 0 )
{ {
didremote = 1; didremote = 1;
uint16_t myport2 = myport-1; uint16_t myport2 = RPC_port-1;
printf("start remote port\n"); printf("start remote port\n");
if ( OS_thread_create(malloc(sizeof(pthread_t)),NULL,(void *)stats_rpcloop,(void *)&myport2) != 0 ) if ( OS_thread_create(malloc(sizeof(pthread_t)),NULL,(void *)stats_rpcloop,(void *)&myport2) != 0 )
{ {
@ -1450,7 +1451,7 @@ void LP_fromjs_iter()
//LP_pubkeys_query(); //LP_pubkeys_query();
//LP_utxosQ_process(); //LP_utxosQ_process();
//LP_nanomsg_recvs(ctx); //LP_nanomsg_recvs(ctx);
LP_mainloop_iter(ctx,LP_myipaddr,0,LP_mypubsock,LP_publicaddr,LP_RPCPORT); LP_mainloop_iter(ctx,LP_myipaddr,0,LP_mypubsock);
//queue_loop(0); //queue_loop(0);
if ( 0 ) // 10 seconds if ( 0 ) // 10 seconds
{ {

35
iguana/exchanges/mm.c
View File

@ -69,19 +69,13 @@ void LP_priceupdate(char *base,char *rel,double price,double avebid,double aveas
#endif #endif
#endif #endif
#include "LP_nativeDEX.c" #include "LP_nativeDEX.c"
void LP_main(void *ptr) void LP_ports(uint16_t *pullportp,uint16_t *pubportp,uint16_t *busportp,uint16_t netid)
{ {
char *passphrase; double profitmargin; int32_t netmod,netdiv,netid=0; uint16_t port,otherports; cJSON *argjson = ptr; int32_t netmod,netdiv; uint16_t otherports;
if ( (passphrase= jstr(argjson,"passphrase")) != 0 ) *pullportp = *pubportp = *busportp = 0;
{
profitmargin = jdouble(argjson,"profitmargin");
LP_profitratio += profitmargin;
if ( (port= juint(argjson,"rpcport")) < 1000 )
port = LP_RPCPORT;
if ( jobj(argjson,"netid") != 0 )
netid = juint(argjson,"netid");
if ( netid < 0 ) if ( netid < 0 )
netid = 0; netid = 0;
else if ( netid > (65535-40-LP_RPCPORT)/4 ) else if ( netid > (65535-40-LP_RPCPORT)/4 )
@ -95,8 +89,25 @@ void LP_main(void *ptr)
netdiv = (netid / 10); netdiv = (netid / 10);
otherports = (netdiv * 40) + (LP_RPCPORT + netmod); otherports = (netdiv * 40) + (LP_RPCPORT + netmod);
} else otherports = LP_RPCPORT; } else otherports = LP_RPCPORT;
printf("RPCport.%d remoteport.%d, nanoports %d %d %d\n",port,port-1,otherports+10,otherports+20,otherports+30); *pullportp = otherports + 10;
LPinit(port,otherports+10,otherports+20,otherports+30,passphrase,jint(argjson,"client"),jstr(argjson,"userhome"),argjson); *pubportp = otherports + 20;
*busportp = otherports + 30;
printf("RPCport.%d remoteport.%d, nanoports %d %d %d\n",RPC_port,RPC_port-1,*pullportp,*pubportp,*busportp);
}
void LP_main(void *ptr)
{
char *passphrase; double profitmargin; uint16_t netid=0,port,pullport,pubport,busport; cJSON *argjson = ptr;
if ( (passphrase= jstr(argjson,"passphrase")) != 0 )
{
profitmargin = jdouble(argjson,"profitmargin");
LP_profitratio += profitmargin;
if ( (port= juint(argjson,"rpcport")) < 1000 )
port = LP_RPCPORT;
if ( jobj(argjson,"netid") != 0 )
netid = juint(argjson,"netid");
LP_ports(&pullport,&pubport,&busport,netid);
LPinit(port,pullport,pubport,busport,passphrase,jint(argjson,"client"),jstr(argjson,"userhome"),argjson);
} }
} }

2
iguana/exchanges/stats.c
View File

@ -861,7 +861,7 @@ continue;
#ifndef FROM_MARKETMAKER #ifndef FROM_MARKETMAKER
portable_mutex_t LP_commandmutex; portable_mutex_t LP_commandmutex;
uint16_t LP_RPCPORT; uint16_t LP_RPCPORT = 7763;
void stats_kvjson(FILE *logfp,int32_t height,int32_t savedheight,uint32_t timestamp,char *key,cJSON *kvjson,bits256 pubkey,bits256 sigprev) void stats_kvjson(FILE *logfp,int32_t height,int32_t savedheight,uint32_t timestamp,char *key,cJSON *kvjson,bits256 pubkey,bits256 sigprev)
{ {

Write Preview
Loading…
Cancel
Save