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
f82c946b96
commit
22a8120d0f
4 changed files with 70 additions and 63 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. 5
      iguana/exchanges/LP_commands.c
  2. 2
      iguana/exchanges/LP_forwarding.c
  3. 40
      iguana/exchanges/LP_rpc.c
  4. 86
      iguana/exchanges/LP_utxos.c

5
iguana/exchanges/LP_commands.c
View File

@ -223,8 +223,9 @@ forwardhex(pubkey,hex)\n\
return(LP_utxos(1,LP_mypeer,jstr(argjson,"coin"),jint(argjson,"lastn"))); return(LP_utxos(1,LP_mypeer,jstr(argjson,"coin"),jint(argjson,"lastn")));
else if ( strcmp(method,"notified") == 0 ) else if ( strcmp(method,"notified") == 0 )
{ {
LP_utxoaddjson(1,LP_mypubsock,argjson); if ( LP_utxoaddjson(1,LP_mypubsock,argjson) != 0 )
return(clonestr("{\"result\":\"success\",\"notifyutxo\":\"received\"}")); return(clonestr("{\"result\":\"success\",\"notifyutxo\":\"received\"}"));
else return(clonestr("{\"error\":\"couldnt add utxo\"}"));
} }
else if ( IAMLP != 0 ) else if ( IAMLP != 0 )
{ {

2
iguana/exchanges/LP_forwarding.c
View File

@ -127,7 +127,7 @@ char *LP_register(bits256 pubkey,char *ipaddr,uint16_t port)
strcpy(ptr->pushaddr,pushaddr); strcpy(ptr->pushaddr,pushaddr);
if ( (ptr->pushsock= LP_pushsock_create(ptr,pushaddr)) < 0 ) if ( (ptr->pushsock= LP_pushsock_create(ptr,pushaddr)) < 0 )
return(clonestr("{\"error\":\"couldnt recreate pushsock\",\"registered\":0}")); return(clonestr("{\"error\":\"couldnt recreate pushsock\",\"registered\":0}"));
} else printf("no need to create identical endpoint\n"); } //else printf("no need to create identical endpoint\n");
} }
return(clonestr("{\"error\":\"already registered\",\"registered\":1}")); return(clonestr("{\"error\":\"already registered\",\"registered\":1}"));
} }

40
iguana/exchanges/LP_rpc.c
View File

@ -22,9 +22,7 @@ char *LP_issue_curl(char *debugstr,char *destip,uint16_t port,char *url)
{ {
char *retstr = 0; int32_t maxerrs; struct LP_peerinfo *peer = 0; char *retstr = 0; int32_t maxerrs; struct LP_peerinfo *peer = 0;
peer = LP_peerfind((uint32_t)calc_ipbits(destip),port); peer = LP_peerfind((uint32_t)calc_ipbits(destip),port);
if ( strncmp("5.9.253",destip,strlen("5.9.253")) == 0 ) maxerrs = LP_MAXPEER_ERRORS;
maxerrs = LP_MAXPEER_ERRORS;
else maxerrs = 1;
if ( peer == 0 || peer->errors < maxerrs ) if ( peer == 0 || peer->errors < maxerrs )
{ {
if ( (retstr= issue_curlt(url,LP_HTTP_TIMEOUT)) == 0 ) if ( (retstr= issue_curlt(url,LP_HTTP_TIMEOUT)) == 0 )
@ -57,16 +55,18 @@ char *issue_LP_getutxos(char *destip,uint16_t destport,char *coin,int32_t lastn,
{ {
char url[512]; char url[512];
sprintf(url,"http://%s:%u/api/stats/getutxos?coin=%s&lastn=%d&ipaddr=%s&port=%u&profit=%.6f&numpeers=%d&numutxos=%d",destip,destport,coin,lastn,ipaddr,port,profitmargin,numpeers,numutxos); sprintf(url,"http://%s:%u/api/stats/getutxos?coin=%s&lastn=%d&ipaddr=%s&port=%u&profit=%.6f&numpeers=%d&numutxos=%d",destip,destport,coin,lastn,ipaddr,port,profitmargin,numpeers,numutxos);
return(issue_curlt(url,LP_HTTP_TIMEOUT)); return(LP_issue_curl("getutxos",destip,destport,url));
//return(issue_curlt(url,LP_HTTP_TIMEOUT));
} }
char *issue_LP_clientgetutxos(char *destip,uint16_t destport,char *coin,int32_t lastn) char *issue_LP_clientgetutxos(char *destip,uint16_t destport,char *coin,int32_t lastn)
{ {
char url[512],*retstr; char url[512];//,*retstr;
sprintf(url,"http://%s:%u/api/stats/getutxos?coin=%s&lastn=%d&ipaddr=127.0.0.1&port=0",destip,destport,coin,lastn); sprintf(url,"http://%s:%u/api/stats/getutxos?coin=%s&lastn=%d&ipaddr=127.0.0.1&port=0",destip,destport,coin,lastn);
retstr = issue_curlt(url,LP_HTTP_TIMEOUT); return(LP_issue_curl("clientgetutxos",destip,destport,url));
//retstr = issue_curlt(url,LP_HTTP_TIMEOUT);
//printf("%s clientgetutxos.(%s)\n",url,retstr); //printf("%s clientgetutxos.(%s)\n",url,retstr);
return(retstr); //return(retstr);
} }
char *issue_LP_notify(char *destip,uint16_t destport,char *ipaddr,uint16_t port,double profitmargin,int32_t numpeers,int32_t numutxos) char *issue_LP_notify(char *destip,uint16_t destport,char *ipaddr,uint16_t port,double profitmargin,int32_t numpeers,int32_t numutxos)
@ -78,7 +78,8 @@ char *issue_LP_notify(char *destip,uint16_t destport,char *ipaddr,uint16_t port,
return(0); return(0);
} }
sprintf(url,"http://%s:%u/api/stats/notify?ipaddr=%s&port=%u&profit=%.6f&numpeers=%d&numutxos=%d",destip,destport,ipaddr,port,profitmargin,numpeers,numutxos); sprintf(url,"http://%s:%u/api/stats/notify?ipaddr=%s&port=%u&profit=%.6f&numpeers=%d&numutxos=%d",destip,destport,ipaddr,port,profitmargin,numpeers,numutxos);
return(issue_curlt(url,LP_HTTP_TIMEOUT)); return(LP_issue_curl("notify",destip,destport,url));
//return(issue_curlt(url,LP_HTTP_TIMEOUT));
} }
char *issue_LP_notifyutxo(char *destip,uint16_t destport,struct LP_utxoinfo *utxo) char *issue_LP_notifyutxo(char *destip,uint16_t destport,struct LP_utxoinfo *utxo)
@ -100,7 +101,8 @@ char *issue_LP_notifyutxo(char *destip,uint16_t destport,struct LP_utxoinfo *utx
sprintf(url,"http://%s:%u/api/stats/notified?iambob=%d&pubkey=%s&profit=%.6f&coin=%s&txid=%s&vout=%d&value=%llu&txid2=%s&vout2=%d&value2=%llu&script=%s&address=%s&timestamp=%u",destip,destport,utxo->iambob,bits256_str(str3,utxo->pubkey),utxo->S.profitmargin,utxo->coin,bits256_str(str,utxo->payment.txid),utxo->payment.vout,(long long)utxo->payment.value,bits256_str(str2,utxo->deposit.txid),utxo->deposit.vout,(long long)utxo->deposit.value,utxo->spendscript,utxo->coinaddr,(uint32_t)time(NULL)); sprintf(url,"http://%s:%u/api/stats/notified?iambob=%d&pubkey=%s&profit=%.6f&coin=%s&txid=%s&vout=%d&value=%llu&txid2=%s&vout2=%d&value2=%llu&script=%s&address=%s&timestamp=%u",destip,destport,utxo->iambob,bits256_str(str3,utxo->pubkey),utxo->S.profitmargin,utxo->coin,bits256_str(str,utxo->payment.txid),utxo->payment.vout,(long long)utxo->payment.value,bits256_str(str2,utxo->deposit.txid),utxo->deposit.vout,(long long)utxo->deposit.value,utxo->spendscript,utxo->coinaddr,(uint32_t)time(NULL));
if ( strlen(url) > 1024 ) if ( strlen(url) > 1024 )
printf("WARNING long url.(%s)\n",url); printf("WARNING long url.(%s)\n",url);
return(issue_curlt(url,LP_HTTP_TIMEOUT)); return(LP_issue_curl("notifyutxo",destip,destport,url));
//return(issue_curlt(url,LP_HTTP_TIMEOUT));
} }
else else
{ {
@ -111,20 +113,22 @@ char *issue_LP_notifyutxo(char *destip,uint16_t destport,struct LP_utxoinfo *utx
char *issue_LP_register(char *destip,uint16_t destport,bits256 pubkey,char *ipaddr,uint16_t pushport) char *issue_LP_register(char *destip,uint16_t destport,bits256 pubkey,char *ipaddr,uint16_t pushport)
{ {
char url[512],str[65],*retstr; char url[512],str[65];//*retstr;
sprintf(url,"http://%s:%u/api/stats/register?client=%s&pushaddr=%s&pushport=%u",destip,destport,bits256_str(str,pubkey),ipaddr,pushport); sprintf(url,"http://%s:%u/api/stats/register?client=%s&pushaddr=%s&pushport=%u",destip,destport,bits256_str(str,pubkey),ipaddr,pushport);
retstr = issue_curlt(url,LP_HTTP_TIMEOUT); return(LP_issue_curl("register",destip,destport,url));
//retstr = issue_curlt(url,LP_HTTP_TIMEOUT);
//printf("getutxo.(%s) -> (%s)\n",url,retstr!=0?retstr:""); //printf("getutxo.(%s) -> (%s)\n",url,retstr!=0?retstr:"");
return(retstr); //return(retstr);
} }
char *issue_LP_psock(char *destip,uint16_t destport,int32_t ispaired) char *issue_LP_psock(char *destip,uint16_t destport,int32_t ispaired)
{ {
char url[512],*retstr; char url[512];
sprintf(url,"http://%s:%u/api/stats/psock?ispaired=%d",destip,destport,ispaired); sprintf(url,"http://%s:%u/api/stats/psock?ispaired=%d",destip,destport,ispaired);
retstr = issue_curlt(url,LP_HTTP_TIMEOUT); return(LP_issue_curl("psock",destip,destport,url));
//retstr = issue_curlt(url,LP_HTTP_TIMEOUT);
//printf("getutxo.(%s) -> (%s)\n",url,retstr!=0?retstr:""); //printf("getutxo.(%s) -> (%s)\n",url,retstr!=0?retstr:"");
return(retstr); //return(retstr);
} }
uint16_t LP_psock_get(char *connectaddr,char *publicaddr,int32_t ispaired) uint16_t LP_psock_get(char *connectaddr,char *publicaddr,int32_t ispaired)
@ -159,7 +163,8 @@ char *issue_LP_lookup(char *destip,uint16_t destport,bits256 pubkey)
char url[512],str[65]; char url[512],str[65];
sprintf(url,"http://%s:%u/api/stats/lookup?client=%s",destip,destport,bits256_str(str,pubkey)); sprintf(url,"http://%s:%u/api/stats/lookup?client=%s",destip,destport,bits256_str(str,pubkey));
//printf("getutxo.(%s)\n",url); //printf("getutxo.(%s)\n",url);
return(issue_curlt(url,LP_HTTP_TIMEOUT)); return(LP_issue_curl("lookup",destip,destport,url));
//return(issue_curlt(url,LP_HTTP_TIMEOUT));
} }
char *issue_LP_getprices(char *destip,uint16_t destport) char *issue_LP_getprices(char *destip,uint16_t destport)
@ -167,7 +172,8 @@ char *issue_LP_getprices(char *destip,uint16_t destport)
char url[512]; char url[512];
sprintf(url,"http://%s:%u/api/stats/getprices",destip,destport); sprintf(url,"http://%s:%u/api/stats/getprices",destip,destport);
//printf("getutxo.(%s)\n",url); //printf("getutxo.(%s)\n",url);
return(issue_curlt(url,LP_HTTP_TIMEOUT)); return(LP_issue_curl("getprices",destip,destport,url));
//return(issue_curlt(url,LP_HTTP_TIMEOUT));
} }
cJSON *bitcoin_json(struct iguana_info *coin,char *method,char *params) cJSON *bitcoin_json(struct iguana_info *coin,char *method,char *params)

86
iguana/exchanges/LP_utxos.c
View File

@ -17,7 +17,6 @@
// LP_utxos.c // LP_utxos.c
// marketmaker // marketmaker
// //
// jl777: invalidate utxo when either part is spent. if not expected spend, mark as bad and generate new utxopair using other half
int32_t LP_ismine(struct LP_utxoinfo *utxo) int32_t LP_ismine(struct LP_utxoinfo *utxo)
{ {
@ -450,54 +449,55 @@ struct LP_utxoinfo *LP_utxoadd(int32_t iambob,int32_t mypubsock,char *symbol,bit
char str[65],str2[65],str3[65],str4[65],str5[65],str6[65]; char str[65],str2[65],str3[65],str4[65],str5[65],str6[65];
if ( dispflag != 0 ) if ( dispflag != 0 )
printf("error on subsequent utxo iambob.%d %.8f %.8f add.(%s %s) when.(%s %s) %d %d %d %d %d %d %d %d %d %d %d pubkeys.(%s vs %s)\n",iambob,dstr(val),dstr(val2),bits256_str(str,txid),bits256_str(str2,txid2),bits256_str(str3,utxo->payment.txid),bits256_str(str4,utxo->deposit.txid),bits256_cmp(txid,utxo->payment.txid) != 0,bits256_cmp(txid2,u.txid) != 0,vout != utxo->payment.vout,tmpsatoshis != utxo->S.satoshis,vout2 != u.vout,value2 != u.value,strcmp(symbol,utxo->coin) != 0,strcmp(spendscript,utxo->spendscript) != 0,strcmp(coinaddr,utxo->coinaddr) != 0,bits256_cmp(pubkey,utxo->pubkey) != 0,value != utxo->payment.value,bits256_str(str5,pubkey),bits256_str(str6,utxo->pubkey)); printf("error on subsequent utxo iambob.%d %.8f %.8f add.(%s %s) when.(%s %s) %d %d %d %d %d %d %d %d %d %d %d pubkeys.(%s vs %s)\n",iambob,dstr(val),dstr(val2),bits256_str(str,txid),bits256_str(str2,txid2),bits256_str(str3,utxo->payment.txid),bits256_str(str4,utxo->deposit.txid),bits256_cmp(txid,utxo->payment.txid) != 0,bits256_cmp(txid2,u.txid) != 0,vout != utxo->payment.vout,tmpsatoshis != utxo->S.satoshis,vout2 != u.vout,value2 != u.value,strcmp(symbol,utxo->coin) != 0,strcmp(spendscript,utxo->spendscript) != 0,strcmp(coinaddr,utxo->coinaddr) != 0,bits256_cmp(pubkey,utxo->pubkey) != 0,value != utxo->payment.value,bits256_str(str5,pubkey),bits256_str(str6,utxo->pubkey));
if ( utxo->T.spentflag != 0 || LP_txvalue(utxo->coinaddr,utxo->coin,utxo->payment.txid,utxo->payment.vout) < utxo->payment.value || LP_txvalue(utxo->coinaddr,utxo->coin,u.txid,u.vout) < u.value )
{
if ( utxo->T.spentflag == 0 )
utxo->T.spentflag = (uint32_t)time(NULL);
printf("original utxo pair not valid\n");
utxo = 0;
}
} }
else if ( profitmargin > SMALLVAL ) else if ( profitmargin > SMALLVAL )
utxo->S.profitmargin = profitmargin; utxo->S.profitmargin = profitmargin;
if ( utxo != 0 )
return(utxo);
}
utxo = calloc(1,sizeof(*utxo));
utxo->S.profitmargin = profitmargin;
utxo->pubkey = pubkey;
safecopy(utxo->coin,symbol,sizeof(utxo->coin));
safecopy(utxo->coinaddr,coinaddr,sizeof(utxo->coinaddr));
safecopy(utxo->spendscript,spendscript,sizeof(utxo->spendscript));
utxo->payment.txid = txid;
utxo->payment.vout = vout;
utxo->payment.value = value;
utxo->S.satoshis = tmpsatoshis;
if ( (utxo->iambob= iambob) != 0 )
{
utxo->deposit.txid = txid2;
utxo->deposit.vout = vout2;
utxo->deposit.value = value2;
} }
else else
{ {
/*if ( (val= LP_txvalue(destaddr,symbol,txid,vout)) != value || (val2= LP_txvalue(destaddr2,symbol,txid2,vout2)) != value2 || strcmp(destaddr,destaddr2) != 0 || strcmp(coinaddr,destaddr) != 0 ) utxo->fee.txid = txid2;
{ utxo->fee.vout = vout2;
printf("utxoadd mismatch %s/v%d (%s %.8f) + %s/v%d (%s %.8f) != %s %.8f %.8f\n",bits256_str(str,txid),vout,destaddr,dstr(val),bits256_str(str2,txid2),vout2,destaddr2,dstr(val2),coinaddr,dstr(value),dstr(value2)); utxo->fee.value = value2;
return(0); }
}*/ LP_utxosetkey(utxo->key,txid,vout);
utxo = calloc(1,sizeof(*utxo)); LP_utxosetkey(utxo->key2,txid2,vout2);
utxo->S.profitmargin = profitmargin; portable_mutex_lock(&LP_utxomutex);
utxo->pubkey = pubkey; HASH_ADD_KEYPTR(hh,LP_utxoinfos[iambob],utxo->key,sizeof(utxo->key),utxo);
safecopy(utxo->coin,symbol,sizeof(utxo->coin)); if ( _LP_utxo2find(iambob,txid2,vout2) == 0 )
safecopy(utxo->coinaddr,coinaddr,sizeof(utxo->coinaddr)); HASH_ADD_KEYPTR(hh2,LP_utxoinfos2[iambob],utxo->key2,sizeof(utxo->key2),utxo);
safecopy(utxo->spendscript,spendscript,sizeof(utxo->spendscript)); portable_mutex_unlock(&LP_utxomutex);
utxo->payment.txid = txid; if ( iambob != 0 )
utxo->payment.vout = vout; {
utxo->payment.value = value; if ( mypubsock >= 0 )
utxo->S.satoshis = tmpsatoshis; LP_send(mypubsock,jprint(LP_utxojson(utxo),1),1);
if ( (utxo->iambob= iambob) != 0 ) else LP_utxo_clientpublish(utxo);
{ if ( LP_mypeer != 0 && LP_ismine(utxo) > 0 )
utxo->deposit.txid = txid2; LP_mypeer->numutxos++;
utxo->deposit.vout = vout2;
utxo->deposit.value = value2;
}
else
{
utxo->fee.txid = txid2;
utxo->fee.vout = vout2;
utxo->fee.value = value2;
}
LP_utxosetkey(utxo->key,txid,vout);
LP_utxosetkey(utxo->key2,txid2,vout2);
portable_mutex_lock(&LP_utxomutex);
HASH_ADD_KEYPTR(hh,LP_utxoinfos[iambob],utxo->key,sizeof(utxo->key),utxo);
if ( _LP_utxo2find(iambob,txid2,vout2) == 0 )
HASH_ADD_KEYPTR(hh2,LP_utxoinfos2[iambob],utxo->key2,sizeof(utxo->key2),utxo);
portable_mutex_unlock(&LP_utxomutex);
if ( iambob != 0 )
{
if ( mypubsock >= 0 )
LP_send(mypubsock,jprint(LP_utxojson(utxo),1),1);
else LP_utxo_clientpublish(utxo);
if ( LP_mypeer != 0 && LP_ismine(utxo) > 0 )
LP_mypeer->numutxos++;
}
} }
return(utxo); return(utxo);
} }

Write Preview
Loading…
Cancel
Save