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

Merge pull request #629 from jl777/jl777 

tweak txfees, performance improvements
patch-3
jl777 7 years ago
committed by GitHub
parent
7eb9c458db e0c397e0ce
commit
faa3a35724
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 58 additions and 47 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. 2
      iguana/exchanges/LP_NXT.c
  2. 2
      iguana/exchanges/LP_RTmetrics.c
  3. 5
      iguana/exchanges/LP_bitcoin.c
  4. 12
      iguana/exchanges/LP_commands.c
  5. 4
      iguana/exchanges/LP_include.h
  6. 2
      iguana/exchanges/LP_instantdex.c
  7. 7
      iguana/exchanges/LP_nativeDEX.c
  8. 10
      iguana/exchanges/LP_ordermatch.c
  9. 3
      iguana/exchanges/LP_privkey.c
  10. 32
      iguana/exchanges/LP_remember.c
  11. 2
      iguana/exchanges/LP_rpc.c
  12. 2
      iguana/exchanges/LP_stats.c
  13. 16
      iguana/exchanges/LP_swap.c
  14. 2
      iguana/exchanges/LP_tradebots.c
  15. 2
      iguana/exchanges/coins

2
iguana/exchanges/LP_NXT.c
View File

@ -202,7 +202,7 @@ void NXTventure_liquidation()
cJSON *LP_NXT_redeems() cJSON *LP_NXT_redeems()
{ {
char url[1024],*retstr,*recv,*method,*msgstr,assetname[128]; uint64_t totals[2][sizeof(assetids)/sizeof(*assetids)],mult,txnum,assetid,qty; int32_t i,ind,numtx=0,past_marker=0; cJSON *item,*attach,*decjson,*array,*msgjson,*encjson,*retjson=0; char url[1024],*retstr,*recv,*method,*msgstr,assetname[128]; uint64_t totals[2][sizeof(assetids)/sizeof(*assetids)],mult,txnum,assetid,qty; int32_t i,ind,numtx=0,past_marker=0; cJSON *item,*attach,*decjson,*array,*msgjson,*encjson,*retjson=0;
uint64_t txnum_marker = calc_nxt64bits("4114304329372848717"); // 8537615468620726612"); // set to most recent processed uint64_t txnum_marker = calc_nxt64bits("2675953695997905027"); // 4114304329372848717, 8537615468620726612"); // set to most recent processed
uint64_t txnum_marker2 = calc_nxt64bits("7256847492742571143"); // dont change, end marker uint64_t txnum_marker2 = calc_nxt64bits("7256847492742571143"); // dont change, end marker
char *passphrase = ""; char *passphrase = "";
char *account = "NXT-MRBN-8DFH-PFMK-A4DBM"; char *account = "NXT-MRBN-8DFH-PFMK-A4DBM";

2
iguana/exchanges/LP_RTmetrics.c
View File

@ -132,7 +132,7 @@ void LP_RTmetrics_swapsinfo(char *refbase,char *refrel,cJSON *swaps,int32_t nums
quoteid = juint(item,"quoteid"); quoteid = juint(item,"quoteid");
LP_RTmetrics_pendingswap(srcpub,LP_kmdvalue(base,basesatoshis)); LP_RTmetrics_pendingswap(srcpub,LP_kmdvalue(base,basesatoshis));
LP_RTmetrics_pendingswap(destpub,LP_kmdvalue(rel,relsatoshis)); LP_RTmetrics_pendingswap(destpub,LP_kmdvalue(rel,relsatoshis));
if ( 0 && (retstr= basilisk_swapentry(requestid,quoteid,0)) != 0 ) // no need for this if ( 0 && (retstr= basilisk_swapentry(1,requestid,quoteid,0)) != 0 ) // no need for this
{ {
if ( (swapjson= cJSON_Parse(retstr)) != 0 ) if ( (swapjson= cJSON_Parse(retstr)) != 0 )
{ {

5
iguana/exchanges/LP_bitcoin.c
View File

@ -2152,7 +2152,12 @@ char *bitcoin_address(char *symbol,char *coinaddr,uint8_t taddr,uint8_t addrtype
coinaddr[0] = 0; coinaddr[0] = 0;
offset = 1 + (taddr != 0); offset = 1 + (taddr != 0);
if ( len != 20 ) if ( len != 20 )
{
calc_rmd160_sha256(data+offset,pubkey_or_rmd160,len); calc_rmd160_sha256(data+offset,pubkey_or_rmd160,len);
//for (i=0; i<20; i++)
// printf("%02x",data[offset+i]);
//printf(" rmd160\n");
}
else memcpy(data+offset,pubkey_or_rmd160,20); else memcpy(data+offset,pubkey_or_rmd160,20);
if ( strcmp(symbol,"BCH") == 0 ) if ( strcmp(symbol,"BCH") == 0 )
{ {

12
iguana/exchanges/LP_commands.c
View File

@ -120,10 +120,10 @@ buy(base, rel, price, relvolume, timeout=10, duration=3600, nonce)\n\
sell(base, rel, price, basevolume, timeout=10, duration=3600, nonce)\n\ sell(base, rel, price, basevolume, timeout=10, duration=3600, nonce)\n\
withdraw(coin, outputs[])\n\ withdraw(coin, outputs[])\n\
sendrawtransaction(coin, signedtx)\n\ sendrawtransaction(coin, signedtx)\n\
swapstatus(pending=0)\n\ swapstatus(pending=0, fast=0)\n\
swapstatus(coin, limit=10)\n\ swapstatus(coin, limit=10)\n\
swapstatus(base, rel, limit=10)\n\ swapstatus(base, rel, limit=10)\n\
swapstatus(requestid, quoteid, pending=0)\n\ swapstatus(requestid, quoteid, pending=0, fast=0)\n\
recentswaps(limit=3)\n\ recentswaps(limit=3)\n\
notarizations(coin)\n\ notarizations(coin)\n\
public API:\n \ public API:\n \
@ -334,12 +334,12 @@ jpg(srcfile, destfile, power2=7, password, data="", required, ind=0)\n\
{ {
uint32_t requestid,quoteid; uint32_t requestid,quoteid;
if ( (requestid= juint(argjson,"requestid")) != 0 && (quoteid= juint(argjson,"quoteid")) != 0 ) if ( (requestid= juint(argjson,"requestid")) != 0 && (quoteid= juint(argjson,"quoteid")) != 0 )
return(basilisk_swapentry(requestid,quoteid,1)); return(basilisk_swapentry(jint(argjson,"fast"),requestid,quoteid,1));
else if ( coin[0] != 0 ) else if ( coin[0] != 0 )
return(basilisk_swapentries(coin,0,jint(argjson,"limit"))); return(basilisk_swapentries(1,coin,0,jint(argjson,"limit")));
else if ( base[0] != 0 && rel[0] != 0 ) else if ( base[0] != 0 && rel[0] != 0 )
return(basilisk_swapentries(base,rel,jint(argjson,"limit"))); return(basilisk_swapentries(1,base,rel,jint(argjson,"limit")));
else return(basilisk_swaplist(0,0,1,jint(argjson,"pending"))); else return(basilisk_swaplist(jint(argjson,"fast"),0,0,1,jint(argjson,"pending")));
} }
else if ( strcmp(method,"dynamictrust") == 0 ) else if ( strcmp(method,"dynamictrust") == 0 )
{ {

4
iguana/exchanges/LP_include.h
View File

@ -101,7 +101,7 @@ void emscripten_usleep(int32_t x); // returns immediate, no sense for sleeping
#define LP_MINVOL 20 #define LP_MINVOL 20
#define LP_MINCLIENTVOL 200 #define LP_MINCLIENTVOL 200
#define LP_MINSIZE_TXFEEMULT 10 #define LP_MINSIZE_TXFEEMULT 10
#define LP_REQUIRED_TXFEE 0.8 #define LP_REQUIRED_TXFEE 0.75
#define LP_DEXFEE(destsatoshis) ((destsatoshis) / INSTANTDEX_INSURANCEDIV) #define LP_DEXFEE(destsatoshis) ((destsatoshis) / INSTANTDEX_INSURANCEDIV)
#define LP_DEPOSITSATOSHIS(satoshis) ((satoshis) + (satoshis >> 3)) #define LP_DEPOSITSATOSHIS(satoshis) ((satoshis) + (satoshis >> 3))
@ -537,7 +537,7 @@ int32_t LP_mempoolscan(char *symbol,bits256 searchtxid);
int32_t LP_txheight(struct iguana_info *coin,bits256 txid); int32_t LP_txheight(struct iguana_info *coin,bits256 txid);
int32_t LP_numpeers(); int32_t LP_numpeers();
double LP_CMCbtcprice(double *price_usdp,char *symbol); double LP_CMCbtcprice(double *price_usdp,char *symbol);
char *basilisk_swapentry(uint32_t requestid,uint32_t quoteid,int32_t forceflag); char *basilisk_swapentry(int32_t fastflag,uint32_t requestid,uint32_t quoteid,int32_t forceflag);
int64_t LP_KMDvalue(struct iguana_info *coin,int64_t balance); int64_t LP_KMDvalue(struct iguana_info *coin,int64_t balance);
int32_t LP_address_utxoadd(int32_t skipsearch,uint32_t timestamp,char *debug,struct iguana_info *coin,char *coinaddr,bits256 txid,int32_t vout,uint64_t value,int32_t height,int32_t spendheight); int32_t LP_address_utxoadd(int32_t skipsearch,uint32_t timestamp,char *debug,struct iguana_info *coin,char *coinaddr,bits256 txid,int32_t vout,uint64_t value,int32_t height,int32_t spendheight);
void LP_smartutxos_push(struct iguana_info *coin); void LP_smartutxos_push(struct iguana_info *coin);

2
iguana/exchanges/LP_instantdex.c
View File

@ -717,7 +717,7 @@ cJSON *LP_swapstats_item(struct LP_swapstats *sp,int32_t iambob)
memset(zero.bytes,0,sizeof(zero)); memset(zero.bytes,0,sizeof(zero));
LP_reserved_msg(0,"","",zero,jprint(reqjson,1)); LP_reserved_msg(0,"","",zero,jprint(reqjson,1));
} }
if ( (swapstr= basilisk_swapentry(sp->Q.R.requestid,sp->Q.R.quoteid,0)) != 0 ) if ( (swapstr= basilisk_swapentry(1,sp->Q.R.requestid,sp->Q.R.quoteid,0)) != 0 )
{ {
if ( (swapjson= cJSON_Parse(swapstr)) != 0 ) if ( (swapjson= cJSON_Parse(swapstr)) != 0 )
{ {

7
iguana/exchanges/LP_nativeDEX.c
View File

@ -85,7 +85,7 @@ void LP_millistats_update(struct LP_millistats *mp)
} }
#include "LP_include.h" #include "LP_include.h"
portable_mutex_t LP_peermutex,LP_UTXOmutex,LP_utxomutex,LP_commandmutex,LP_cachemutex,LP_swaplistmutex,LP_forwardmutex,LP_pubkeymutex,LP_networkmutex,LP_psockmutex,LP_coinmutex,LP_messagemutex,LP_portfoliomutex,LP_electrummutex,LP_butxomutex,LP_reservedmutex,LP_nanorecvsmutex,LP_tradebotsmutex,LP_gcmutex,LP_inusemutex,LP_cJSONmutex,LP_logmutex,LP_statslogmutex,LP_tradesmutex,LP_commandQmutex,LP_blockinit_mutex,LP_pendswap_mutex; portable_mutex_t LP_peermutex,LP_UTXOmutex,LP_utxomutex,LP_commandmutex,LP_cachemutex,LP_swaplistmutex,LP_forwardmutex,LP_pubkeymutex,LP_networkmutex,LP_psockmutex,LP_coinmutex,LP_messagemutex,LP_portfoliomutex,LP_electrummutex,LP_butxomutex,LP_reservedmutex,LP_nanorecvsmutex,LP_tradebotsmutex,LP_gcmutex,LP_inusemutex,LP_cJSONmutex,LP_logmutex,LP_statslogmutex,LP_tradesmutex,LP_commandQmutex,LP_blockinit_mutex,LP_pendswap_mutex,LP_listmutex;
int32_t LP_canbind; int32_t LP_canbind;
char *Broadcaststr,*Reserved_msgs[2][1000]; char *Broadcaststr,*Reserved_msgs[2][1000];
int32_t num_Reserved_msgs[2],max_Reserved_msgs[2]; int32_t num_Reserved_msgs[2],max_Reserved_msgs[2];
@ -961,7 +961,7 @@ void LP_swapsloop(void *ctx)
char *retstr; cJSON *retjson; uint32_t requestid,quoteid; int32_t nonz; struct LP_pendswap *sp,*tmp; char *retstr; cJSON *retjson; uint32_t requestid,quoteid; int32_t nonz; struct LP_pendswap *sp,*tmp;
strcpy(LP_swapsloop_stats.name,"LP_swapsloop"); strcpy(LP_swapsloop_stats.name,"LP_swapsloop");
LP_swapsloop_stats.threshold = 605000.; LP_swapsloop_stats.threshold = 605000.;
if ( (retstr= basilisk_swapentry(0,0,1)) != 0 ) if ( (retstr= basilisk_swapentry(0,0,0,1)) != 0 )
{ {
if ( (retjson= cJSON_Parse(retstr)) != 0 ) if ( (retjson= cJSON_Parse(retstr)) != 0 )
{ {
@ -1342,6 +1342,7 @@ void LPinit(uint16_t myport,uint16_t mypullport,uint16_t mypubport,uint16_t mybu
portable_mutex_init(&LP_commandQmutex); portable_mutex_init(&LP_commandQmutex);
portable_mutex_init(&LP_blockinit_mutex); portable_mutex_init(&LP_blockinit_mutex);
portable_mutex_init(&LP_pendswap_mutex); portable_mutex_init(&LP_pendswap_mutex);
portable_mutex_init(&LP_listmutex);
myipaddr = clonestr("127.0.0.1"); myipaddr = clonestr("127.0.0.1");
#ifndef _WIN32 #ifndef _WIN32
#ifndef FROM_JS #ifndef FROM_JS
@ -1592,7 +1593,7 @@ void LP_fromjs_iter()
{ {
LP_notify_pubkeys(ctx,LP_mypubsock); LP_notify_pubkeys(ctx,LP_mypubsock);
LP_privkey_updates(ctx,LP_mypubsock,0); LP_privkey_updates(ctx,LP_mypubsock,0);
if ( (retstr= basilisk_swapentry(0,0,0)) != 0 ) if ( (retstr= basilisk_swapentry(0,0,0,0)) != 0 )
free(retstr); free(retstr);
} }
} }

10
iguana/exchanges/LP_ordermatch.c
View File

@ -71,12 +71,12 @@ uint64_t LP_txfeecalc(struct iguana_info *coin,uint64_t txfee,int32_t txlen)
if ( txlen == 0 ) if ( txlen == 0 )
txlen = LP_AVETXSIZE; txlen = LP_AVETXSIZE;
coin->rate = LP_getestimatedrate(coin); coin->rate = LP_getestimatedrate(coin);
if ( (txfee= SATOSHIDEN * coin->rate * txlen) <= 10000 ) if ( (txfee= SATOSHIDEN * coin->rate * txlen) <= 20000 )
{ {
//coin->rate = -1.; //coin->rate = -1.;
coin->rate = _LP_getestimatedrate(coin); coin->rate = _LP_getestimatedrate(coin);
if ( (txfee= SATOSHIDEN * coin->rate * txlen) <= 10000 ) if ( (txfee= SATOSHIDEN * coin->rate * txlen) <= 20000 )
txfee = 10000; txfee = 20000;
} }
} else txfee = coin->txfee; } else txfee = coin->txfee;
if ( txfee < LP_MIN_TXFEE ) if ( txfee < LP_MIN_TXFEE )
@ -493,6 +493,7 @@ int32_t LP_connectstartbob(void *ctx,int32_t pubsock,char *base,char *rel,double
if ( OS_thread_create(malloc(sizeof(pthread_t)),NULL,(void *)LP_bobloop,(void *)swap) == 0 ) if ( OS_thread_create(malloc(sizeof(pthread_t)),NULL,(void *)LP_bobloop,(void *)swap) == 0 )
{ {
reqjson = LP_quotejson(qp); reqjson = LP_quotejson(qp);
LP_swapsfp_update(qp->R.requestid,qp->R.quoteid);
jaddstr(reqjson,"method","connected"); jaddstr(reqjson,"method","connected");
jaddstr(reqjson,"pair",pairstr); jaddstr(reqjson,"pair",pairstr);
if ( (kmdcoin= LP_coinfind("KMD")) != 0 ) if ( (kmdcoin= LP_coinfind("KMD")) != 0 )
@ -677,6 +678,7 @@ char *LP_connectedalice(struct LP_quoteinfo *qp,char *pairstr) // alice
{ {
retjson = LP_quotejson(qp); retjson = LP_quotejson(qp);
jaddstr(retjson,"result","success"); jaddstr(retjson,"result","success");
LP_swapsfp_update(qp->R.requestid,qp->R.quoteid);
//jaddnum(retjson,"requestid",qp->R.requestid); //jaddnum(retjson,"requestid",qp->R.requestid);
//jaddnum(retjson,"quoteid",qp->R.quoteid); //jaddnum(retjson,"quoteid",qp->R.quoteid);
} }
@ -1370,6 +1372,8 @@ int32_t LP_tradecommand(void *ctx,char *myipaddr,int32_t pubsock,cJSON *argjson,
} }
if ( strcmp(method,"request") == 0 ) // bob if ( strcmp(method,"request") == 0 ) // bob
{ {
if ( LP_Alicemaxprice != 0. )
return(retval);
bestprice = LP_bob_competition(&counter,aliceid,qprice,-1); bestprice = LP_bob_competition(&counter,aliceid,qprice,-1);
if ( Qtrades == 0 )//|| (bits256_cmp(Q.srchash,G.LP_mypub25519) == 0 && bits256_cmp(G.LP_mypub25519,Q.desthash) != 0) ) if ( Qtrades == 0 )//|| (bits256_cmp(Q.srchash,G.LP_mypub25519) == 0 && bits256_cmp(G.LP_mypub25519,Q.desthash) != 0) )
LP_trades_gotrequest(ctx,&Q,&Q2,jstr(argjson,"pair")); LP_trades_gotrequest(ctx,&Q,&Q2,jstr(argjson,"pair"));

3
iguana/exchanges/LP_privkey.c
View File

@ -358,12 +358,13 @@ bits256 LP_privkeycalc(void *ctx,uint8_t *pubkey33,bits256 *pubkeyp,struct iguan
} }
#endif #endif
OS_randombytes(tmpkey.bytes,sizeof(tmpkey)); OS_randombytes(tmpkey.bytes,sizeof(tmpkey));
siglen = 0;
if ( bits256_nonz(privkey) == 0 || (siglen= bitcoin_sign(ctx,coin->symbol,sig,tmpkey,privkey,0)) <= 0 ) if ( bits256_nonz(privkey) == 0 || (siglen= bitcoin_sign(ctx,coin->symbol,sig,tmpkey,privkey,0)) <= 0 )
{ {
printf("illegal privkey %s\n",bits256_str(str,privkey)); printf("illegal privkey %s\n",bits256_str(str,privkey));
exit(0); exit(0);
} }
if ( bitcoin_verify(ctx,sig,siglen,tmpkey,coin->pubkey33,33) != 0 ) if ( bits256_nonz(privkey) != 0 && bitcoin_verify(ctx,sig,siglen,tmpkey,coin->pubkey33,33) != 0 )
{ {
printf("signature.[%d] for %s by %s didnt verify\n",siglen,bits256_str(str,tmpkey),bits256_str(str2,privkey)); printf("signature.[%d] for %s by %s didnt verify\n",siglen,bits256_str(str,tmpkey),bits256_str(str2,privkey));
exit(0); exit(0);

32
iguana/exchanges/LP_remember.c
View File

@ -1030,7 +1030,7 @@ int32_t LP_spends_set(struct LP_swap_remember *rswap)
return(numspent); return(numspent);
} }
cJSON *basilisk_remember(int64_t *KMDtotals,int64_t *BTCtotals,uint32_t requestid,uint32_t quoteid,int32_t forceflag,int32_t pendingonly) cJSON *basilisk_remember(int32_t fastflag,int64_t *KMDtotals,int64_t *BTCtotals,uint32_t requestid,uint32_t quoteid,int32_t forceflag,int32_t pendingonly)
{ {
static void *ctx; static void *ctx;
struct LP_swap_remember rswap; int32_t i,j,flag,numspent,len,secretstart,redeemlen; char str[65],*srcAdest,*srcBdest,*destAdest,*destBdest,otheraddr[64],*fstr,fname[512],bobtomic[128],alicetomic[128],bobstr[65],alicestr[65]; cJSON *item,*txoutobj,*retjson; bits256 rev,revAm,signedtxid,zero,deadtxid; uint32_t claimtime; struct iguana_info *bob=0,*alice=0; uint8_t redeemscript[1024],userdata[1024]; long fsize; struct LP_swap_remember rswap; int32_t i,j,flag,numspent,len,secretstart,redeemlen; char str[65],*srcAdest,*srcBdest,*destAdest,*destBdest,otheraddr[64],*fstr,fname[512],bobtomic[128],alicetomic[128],bobstr[65],alicestr[65]; cJSON *item,*txoutobj,*retjson; bits256 rev,revAm,signedtxid,zero,deadtxid; uint32_t claimtime; struct iguana_info *bob=0,*alice=0; uint8_t redeemscript[1024],userdata[1024]; long fsize;
@ -1167,13 +1167,13 @@ cJSON *basilisk_remember(int64_t *KMDtotals,int64_t *BTCtotals,uint32_t requesti
printf("Alice.%s inactive.%u or Bob.%s inactive.%u\n",rswap.alicecoin,alice->inactive,rswap.bobcoin,bob->inactive); printf("Alice.%s inactive.%u or Bob.%s inactive.%u\n",rswap.alicecoin,alice->inactive,rswap.bobcoin,bob->inactive);
return(cJSON_Parse("{\"error\":\"inactive bob or alice coin\"}")); return(cJSON_Parse("{\"error\":\"inactive bob or alice coin\"}"));
} }
portable_mutex_lock(&LP_swaplistmutex);
//printf("src.(Adest %s, Bdest %s), dest.(Adest %s, Bdest %s)\n",srcAdest,srcBdest,destAdest,destBdest); //printf("src.(Adest %s, Bdest %s), dest.(Adest %s, Bdest %s)\n",srcAdest,srcBdest,destAdest,destBdest);
//printf("iambob.%d finishedflag.%d %s %.8f txfee, %s %.8f txfee\n",rswap.iambob,rswap.finishedflag,rswap.alicecoin,dstr(rswap.Atxfee),rswap.bobcoin,dstr(rswap.Btxfee)); //printf("iambob.%d finishedflag.%d %s %.8f txfee, %s %.8f txfee\n",rswap.iambob,rswap.finishedflag,rswap.alicecoin,dstr(rswap.Atxfee),rswap.bobcoin,dstr(rswap.Btxfee));
//printf("privAm.(%s) %p/%p\n",bits256_str(str,rswap.privAm),Adest,AAdest); //printf("privAm.(%s) %p/%p\n",bits256_str(str,rswap.privAm),Adest,AAdest);
//printf("privBn.(%s) %p/%p\n",bits256_str(str,rswap.privBn),Bdest,ABdest); //printf("privBn.(%s) %p/%p\n",bits256_str(str,rswap.privBn),Bdest,ABdest);
if ( rswap.finishedflag == 0 && rswap.bobcoin[0] != 0 && rswap.alicecoin[0] != 0 ) if ( fastflag == 0 && rswap.finishedflag == 0 && rswap.bobcoin[0] != 0 && rswap.alicecoin[0] != 0 )
{ {
portable_mutex_lock(&LP_swaplistmutex);
//printf("ALICE.(%s) 1st refht %s <- %d, scan %d %d\n",rswap.Adestaddr,alice->symbol,alice->firstrefht,alice->firstscanht,alice->lastscanht); //printf("ALICE.(%s) 1st refht %s <- %d, scan %d %d\n",rswap.Adestaddr,alice->symbol,alice->firstrefht,alice->firstscanht,alice->lastscanht);
//printf("BOB.(%s) 1st refht %s <- %d, scan %d %d\n",rswap.destaddr,bob->symbol,bob->firstrefht,bob->firstscanht,bob->lastscanht); //printf("BOB.(%s) 1st refht %s <- %d, scan %d %d\n",rswap.destaddr,bob->symbol,bob->firstrefht,bob->firstscanht,bob->lastscanht);
LP_rswap_checktx(&rswap,rswap.alicecoin,BASILISK_ALICEPAYMENT); LP_rswap_checktx(&rswap,rswap.alicecoin,BASILISK_ALICEPAYMENT);
@ -1429,6 +1429,7 @@ cJSON *basilisk_remember(int64_t *KMDtotals,int64_t *BTCtotals,uint32_t requesti
printf("bobrefund's time %u vs expiration %u\n",(uint32_t)time(NULL),rswap.expiration); printf("bobrefund's time %u vs expiration %u\n",(uint32_t)time(NULL),rswap.expiration);
} }
} }
portable_mutex_unlock(&LP_swaplistmutex);
} }
//printf("finish.%d iambob.%d REFUND %d %d %d %d\n",finishedflag,iambob,sentflags[BASILISK_BOBREFUND] == 0,sentflags[BASILISK_BOBDEPOSIT] != 0,bits256_nonz(txids[BASILISK_BOBDEPOSIT]) != 0,bits256_nonz(depositspent) == 0); //printf("finish.%d iambob.%d REFUND %d %d %d %d\n",finishedflag,iambob,sentflags[BASILISK_BOBREFUND] == 0,sentflags[BASILISK_BOBDEPOSIT] != 0,bits256_nonz(txids[BASILISK_BOBDEPOSIT]) != 0,bits256_nonz(depositspent) == 0);
if ( rswap.sentflags[BASILISK_ALICESPEND] != 0 || rswap.sentflags[BASILISK_BOBRECLAIM] != 0 ) if ( rswap.sentflags[BASILISK_ALICESPEND] != 0 || rswap.sentflags[BASILISK_BOBRECLAIM] != 0 )
@ -1487,7 +1488,6 @@ cJSON *basilisk_remember(int64_t *KMDtotals,int64_t *BTCtotals,uint32_t requesti
free_json(item); free_json(item);
item = 0; item = 0;
} }
portable_mutex_unlock(&LP_swaplistmutex);
return(item); return(item);
} }
@ -1513,7 +1513,7 @@ void for_satinder()
} else printf("error with satinder tx\n"); } else printf("error with satinder tx\n");
} }
char *basilisk_swaplist(uint32_t origrequestid,uint32_t origquoteid,int32_t forceflag,int32_t pendingonly) char *basilisk_swaplist(int32_t fastflag,uint32_t origrequestid,uint32_t origquoteid,int32_t forceflag,int32_t pendingonly)
{ {
uint64_t ridqids[4096],ridqid; char fname[512]; FILE *fp; cJSON *item,*retjson,*array,*totalsobj; uint32_t r,q,quoteid,requestid; int64_t KMDtotals[LP_MAXPRICEINFOS],BTCtotals[LP_MAXPRICEINFOS],Btotal,Ktotal; int32_t i,j,count=0; uint64_t ridqids[4096],ridqid; char fname[512]; FILE *fp; cJSON *item,*retjson,*array,*totalsobj; uint32_t r,q,quoteid,requestid; int64_t KMDtotals[LP_MAXPRICEINFOS],BTCtotals[LP_MAXPRICEINFOS],Btotal,Ktotal; int32_t i,j,count=0;
//portable_mutex_lock(&LP_swaplistmutex); //portable_mutex_lock(&LP_swaplistmutex);
@ -1526,7 +1526,7 @@ char *basilisk_swaplist(uint32_t origrequestid,uint32_t origquoteid,int32_t forc
if ( origrequestid != 0 && origquoteid != 0 ) if ( origrequestid != 0 && origquoteid != 0 )
{ {
//printf("orig req.%u q.%u\n",origrequestid,origquoteid); //printf("orig req.%u q.%u\n",origrequestid,origquoteid);
if ( (item= basilisk_remember(KMDtotals,BTCtotals,origrequestid,origquoteid,forceflag,0)) != 0 ) if ( (item= basilisk_remember(fastflag,KMDtotals,BTCtotals,origrequestid,origquoteid,forceflag,0)) != 0 )
jaddi(array,item); jaddi(array,item);
//printf("got.(%s)\n",jprint(item,0)); //printf("got.(%s)\n",jprint(item,0));
} }
@ -1568,7 +1568,7 @@ char *basilisk_swaplist(uint32_t origrequestid,uint32_t origquoteid,int32_t forc
{ {
if ( count < sizeof(ridqids)/sizeof(*ridqids) ) if ( count < sizeof(ridqids)/sizeof(*ridqids) )
ridqids[count++] = ridqid; ridqids[count++] = ridqid;
if ( (item= basilisk_remember(KMDtotals,BTCtotals,requestid,quoteid,0,pendingonly)) != 0 ) if ( (item= basilisk_remember(fastflag,KMDtotals,BTCtotals,requestid,quoteid,0,pendingonly)) != 0 )
jaddi(array,item); jaddi(array,item);
} }
} }
@ -1601,12 +1601,12 @@ char *basilisk_swaplist(uint32_t origrequestid,uint32_t origquoteid,int32_t forc
return(jprint(retjson,1)); return(jprint(retjson,1));
} }
char *basilisk_swapentry(uint32_t requestid,uint32_t quoteid,int32_t forceflag) char *basilisk_swapentry(int32_t fastflag,uint32_t requestid,uint32_t quoteid,int32_t forceflag)
{ {
cJSON *item; int64_t KMDtotals[LP_MAXPRICEINFOS],BTCtotals[LP_MAXPRICEINFOS]; cJSON *item; int64_t KMDtotals[LP_MAXPRICEINFOS],BTCtotals[LP_MAXPRICEINFOS];
memset(KMDtotals,0,sizeof(KMDtotals)); memset(KMDtotals,0,sizeof(KMDtotals));
memset(BTCtotals,0,sizeof(BTCtotals)); memset(BTCtotals,0,sizeof(BTCtotals));
if ( (item= basilisk_remember(KMDtotals,BTCtotals,requestid,quoteid,forceflag,0)) != 0 ) if ( (item= basilisk_remember(fastflag,KMDtotals,BTCtotals,requestid,quoteid,forceflag,0)) != 0 )
return(jprint(item,1)); return(jprint(item,1));
else return(clonestr("{\"error\":\"cant find requestid-quoteid\"}")); else return(clonestr("{\"error\":\"cant find requestid-quoteid\"}"));
} }
@ -1641,7 +1641,7 @@ char *LP_recent_swaps(int32_t limit)
item = cJSON_CreateArray(); item = cJSON_CreateArray();
jaddinum(item,requestid); jaddinum(item,requestid);
jaddinum(item,quoteid); jaddinum(item,quoteid);
if ( (retstr= basilisk_swapentry(requestid,quoteid,0)) != 0 ) if ( (retstr= basilisk_swapentry(1,requestid,quoteid,0)) != 0 )
{ {
if ( (swapjson= cJSON_Parse(retstr)) != 0 ) if ( (swapjson= cJSON_Parse(retstr)) != 0 )
{ {
@ -1733,14 +1733,14 @@ uint64_t basilisk_swap_addarray(cJSON *item,char *refbase,char *refrel)
return(ridqid); return(ridqid);
} }
char *basilisk_swapentries(char *refbase,char *refrel,int32_t limit) char *basilisk_swapentries(int32_t fastflag,char *refbase,char *refrel,int32_t limit)
{ {
uint64_t ridqids[1024],ridqid; char *liststr,*retstr2; cJSON *retjson,*array,*pending,*swapjson,*item,*retarray; int32_t i,j,n,count = 0; uint32_t requestid,quoteid; uint64_t ridqids[1024],ridqid; char *liststr,*retstr2; cJSON *retjson,*array,*pending,*swapjson,*item,*retarray; int32_t i,j,n,count = 0; uint32_t requestid,quoteid;
if ( limit <= 0 ) if ( limit <= 0 )
limit = 10; limit = 10;
memset(ridqids,0,sizeof(ridqids)); memset(ridqids,0,sizeof(ridqids));
retarray = cJSON_CreateArray(); retarray = cJSON_CreateArray();
if ( (liststr= basilisk_swaplist(0,0,0,0)) != 0 ) if ( (liststr= basilisk_swaplist(fastflag,0,0,0,0)) != 0 )
{ {
//printf("swapentry.(%s)\n",liststr); //printf("swapentry.(%s)\n",liststr);
if ( (retjson= cJSON_Parse(liststr)) != 0 ) if ( (retjson= cJSON_Parse(liststr)) != 0 )
@ -1762,6 +1762,7 @@ char *basilisk_swapentries(char *refbase,char *refrel,int32_t limit)
} }
} }
free_json(retjson); free_json(retjson);
retjson = 0;
} }
free(liststr); free(liststr);
} }
@ -1780,10 +1781,10 @@ char *basilisk_swapentries(char *refbase,char *refrel,int32_t limit)
for (j=0; j<count; j++) for (j=0; j<count; j++)
if ( ridqid == ridqids[j] ) if ( ridqid == ridqids[j] )
break; break;
//printf("j.%d count.%d %u %u ridqid.%16llx\n",j,count,requestid,quoteid,(long long)ridqid);
if ( j == count ) if ( j == count )
{ {
if ( (retstr2= basilisk_swapentry(requestid,quoteid,0)) != 0 ) printf("j.%d count.%d %u %u ridqid.%16llx\n",j,count,requestid,quoteid,(long long)ridqid);
if ( (retstr2= basilisk_swapentry(1,requestid,quoteid,0)) != 0 )
{ {
if ( (swapjson= cJSON_Parse(retstr2)) != 0 ) if ( (swapjson= cJSON_Parse(retstr2)) != 0 )
{ {
@ -1814,8 +1815,7 @@ char *basilisk_swapentries(char *refbase,char *refrel,int32_t limit)
{ {
if ( basilisk_swap_addarray(pending,refbase,refrel) > 0 ) if ( basilisk_swap_addarray(pending,refbase,refrel) > 0 )
jaddi(retarray,jduplicate(pending)); jaddi(retarray,jduplicate(pending));
else free_json(pending); }
} else free_json(pending);
} }
free_json(retjson); free_json(retjson);
} }

2
iguana/exchanges/LP_rpc.c
View File

@ -689,8 +689,6 @@ again:
//rate *= 1.25; //rate *= 1.25;
if ( rate < 0.00000005 ) if ( rate < 0.00000005 )
rate = 0.00000005; rate = 0.00000005;
//if ( coin->electrum != 0 )
// rate *= 1.5;
if ( fabs(rate - coin->rate) > SMALLVAL ) if ( fabs(rate - coin->rate) > SMALLVAL )
printf("%u t%u estimated rate.(%s) (%s) -> %.8f %.8f\n",(uint32_t)time(NULL),coin->ratetime,coin->symbol,retstr,rate,coin->rate); printf("%u t%u estimated rate.(%s) (%s) -> %.8f %.8f\n",(uint32_t)time(NULL),coin->ratetime,coin->symbol,retstr,rate,coin->rate);
coin->rate = rate; coin->rate = rate;

2
iguana/exchanges/LP_stats.c
View File

@ -674,7 +674,7 @@ char *LP_gettradestatus(uint64_t aliceid,uint32_t requestid,uint32_t quoteid)
return(clonestr("{\"result\":\"success\"}")); return(clonestr("{\"result\":\"success\"}"));
} }
} }
if ( (swapstr= basilisk_swapentry(requestid,quoteid,0)) != 0 ) if ( (swapstr= basilisk_swapentry(1,requestid,quoteid,0)) != 0 )
{ {
if ( (swapjson= cJSON_Parse(swapstr)) != 0 ) if ( (swapjson= cJSON_Parse(swapstr)) != 0 )
{ {

16
iguana/exchanges/LP_swap.c
View File

@ -554,9 +554,10 @@ int32_t LP_sendwait(char *statename,int32_t timeout,int32_t pairsock,struct basi
return(retval); return(retval);
} }
void LP_swapsfp_update(struct basilisk_request *rp) void LP_swapsfp_update(uint32_t requestid,uint32_t quoteid)
{ {
static FILE *swapsfp; static FILE *swapsfp;
portable_mutex_lock(&LP_listmutex);
if ( swapsfp == 0 ) if ( swapsfp == 0 )
{ {
char fname[512]; char fname[512];
@ -568,10 +569,11 @@ void LP_swapsfp_update(struct basilisk_request *rp)
} }
if ( swapsfp != 0 ) if ( swapsfp != 0 )
{ {
fwrite(&rp->requestid,1,sizeof(rp->requestid),swapsfp); fwrite(&requestid,1,sizeof(requestid),swapsfp);
fwrite(&rp->quoteid,1,sizeof(rp->quoteid),swapsfp); fwrite(&quoteid,1,sizeof(quoteid),swapsfp);
fflush(swapsfp); fflush(swapsfp);
} }
portable_mutex_unlock(&LP_listmutex);
} }
struct basilisk_rawtx *LP_swapdata_rawtx(struct basilisk_swap *swap,uint8_t *data,int32_t maxlen,struct basilisk_rawtx *rawtx) struct basilisk_rawtx *LP_swapdata_rawtx(struct basilisk_swap *swap,uint8_t *data,int32_t maxlen,struct basilisk_rawtx *rawtx)
@ -784,7 +786,7 @@ uint32_t LP_swapwait(uint32_t expiration,uint32_t requestid,uint32_t quoteid,int
} }
while ( expiration == 0 || time(NULL) < expiration ) while ( expiration == 0 || time(NULL) < expiration )
{ {
if ( (retstr= basilisk_swapentry(requestid,quoteid,1)) != 0 ) if ( (retstr= basilisk_swapentry(0,requestid,quoteid,1)) != 0 )
{ {
if ( (retjson= cJSON_Parse(retstr)) != 0 ) if ( (retjson= cJSON_Parse(retstr)) != 0 )
{ {
@ -809,7 +811,7 @@ uint32_t LP_swapwait(uint32_t expiration,uint32_t requestid,uint32_t quoteid,int
if ( retjson != 0 ) if ( retjson != 0 )
{ {
free_json(retjson); free_json(retjson);
if ( (retstr= basilisk_swapentry(requestid,quoteid,1)) != 0 ) if ( (retstr= basilisk_swapentry(0,requestid,quoteid,1)) != 0 )
{ {
printf("\n>>>>>>>>>>>>>>>>>>>>>>>>>\nSWAP completed! %u-%u %s\n",requestid,quoteid,retstr); printf("\n>>>>>>>>>>>>>>>>>>>>>>>>>\nSWAP completed! %u-%u %s\n",requestid,quoteid,retstr);
free(retstr); free(retstr);
@ -853,7 +855,7 @@ void LP_bobloop(void *_swap)
swap->bobrefund.utxotxid = swap->bobdeposit.I.signedtxid; swap->bobrefund.utxotxid = swap->bobdeposit.I.signedtxid;
basilisk_bobdeposit_refund(swap,swap->I.putduration); basilisk_bobdeposit_refund(swap,swap->I.putduration);
//printf("depositlen.%d\n",swap->bobdeposit.I.datalen); //printf("depositlen.%d\n",swap->bobdeposit.I.datalen);
LP_swapsfp_update(&swap->I.req); //LP_swapsfp_update(&swap->I.req);
LP_swap_critical = (uint32_t)time(NULL); LP_swap_critical = (uint32_t)time(NULL);
if ( LP_waitfor(swap->N.pair,swap,LP_SWAPSTEP_TIMEOUT*10,LP_verify_otherfee) < 0 ) if ( LP_waitfor(swap->N.pair,swap,LP_SWAPSTEP_TIMEOUT*10,LP_verify_otherfee) < 0 )
{ {
@ -937,7 +939,7 @@ void LP_aliceloop(void *_swap)
printf("basilisk_alicetxs error\n"); printf("basilisk_alicetxs error\n");
else else
{ {
LP_swapsfp_update(&swap->I.req); //LP_swapsfp_update(&swap->I.req);
LP_swap_critical = (uint32_t)time(NULL); LP_swap_critical = (uint32_t)time(NULL);
if ( LP_swapdata_rawtxsend(swap->N.pair,swap,0x80,data,maxlen,&swap->myfee,0x40,0) == 0 ) if ( LP_swapdata_rawtxsend(swap->N.pair,swap,0x80,data,maxlen,&swap->myfee,0x40,0) == 0 )
printf("error sending alicefee\n"); printf("error sending alicefee\n");

2
iguana/exchanges/LP_tradebots.c
View File

@ -52,7 +52,7 @@ void LP_tradebot_pauseall()
void LP_tradebot_updatestats(struct LP_tradebot *bot,struct LP_tradebot_trade *tp) void LP_tradebot_updatestats(struct LP_tradebot *bot,struct LP_tradebot_trade *tp)
{ {
char *swapstr,*status; int32_t flag; cJSON *swapjson; char *swapstr,*status; int32_t flag; cJSON *swapjson;
if ( (swapstr= basilisk_swapentry(tp->requestid,tp->quoteid,1)) != 0 ) if ( (swapstr= basilisk_swapentry(0,tp->requestid,tp->quoteid,1)) != 0 )
{ {
flag = 0; flag = 0;
if ( (swapjson= cJSON_Parse(swapstr)) != 0 ) if ( (swapjson= cJSON_Parse(swapstr)) != 0 )

2
iguana/exchanges/coins
View File

File diff suppressed because one or more lines are too long
Write Preview
Loading…
Cancel
Save