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
7eddb039bc
commit
9439511dec
6 changed files with 440 additions and 340 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. 38
      iguana/exchanges/LP_bitcoin.c
  2. 3
      iguana/exchanges/LP_include.h
  3. 242
      iguana/exchanges/LP_nativeDEX.c
  4. 24
      iguana/exchanges/LP_remember.c
  5. 344
      iguana/exchanges/LP_rpc.c
  6. 115
      iguana/exchanges/LP_transaction.c

38
iguana/exchanges/LP_bitcoin.c
View File

@ -18,6 +18,29 @@
// marketmaker // marketmaker
// //
struct { bits256 privkey; uint8_t rmd160[20]; } LP_privkeys[100]; int32_t LP_numprivkeys;
bits256 LP_privkeyfind(uint8_t rmd160[20])
{
int32_t i; static bits256 zero;
for (i=0; i<LP_numprivkeys; i++)
if ( memcmp(rmd160,LP_privkeys[i].rmd160,20) == 0 )
return(LP_privkeys[i].privkey);
return(zero);
}
int32_t LP_privkeyadd(bits256 privkey,uint8_t rmd160[20])
{
bits256 tmpkey;
tmpkey = LP_privkeyfind(rmd160);
if ( bits256_nonz(privkey) != 0 )
return(-bits256_cmp(privkey,tmpkey));
LP_privkeys[LP_numprivkeys].privkey = privkey;
memcpy(LP_privkeys[LP_numprivkeys].rmd160,rmd160,20);
LP_numprivkeys++;
return(LP_numprivkeys);
}
int32_t iguana_rwnum(int32_t rwflag,uint8_t *serialized,int32_t len,void *endianedp) int32_t iguana_rwnum(int32_t rwflag,uint8_t *serialized,int32_t len,void *endianedp)
{ {
int32_t i; uint64_t x; int32_t i; uint64_t x;
@ -738,6 +761,21 @@ int32_t bitcoin_priv2wiflong(char *wifstr,bits256 privkey,uint8_t addrtype)
return((int32_t)strlen(wifstr)); return((int32_t)strlen(wifstr));
} }
bits256 LP_privkey(char *coinaddr)
{
bits256 privkey; uint8_t addrtype,rmd160[20];
bitcoin_addr2rmd160(&addrtype,rmd160,coinaddr);
privkey = LP_privkeyfind(rmd160);
return(privkey);
}
bits256 LP_pubkey(bits256 privkey)
{
bits256 pubkey;
pubkey = curve25519(privkey,curve25519_basepoint9());
return(pubkey);
}
char *_setVsigner(uint8_t pubtype,struct vin_info *V,int32_t ind,char *pubstr,char *wifstr) char *_setVsigner(uint8_t pubtype,struct vin_info *V,int32_t ind,char *pubstr,char *wifstr)
{ {
uint8_t addrtype; uint8_t addrtype;

3
iguana/exchanges/LP_include.h
View File

@ -171,7 +171,7 @@ struct basilisk_swapinfo
struct iguana_info struct iguana_info
{ {
uint64_t txfee,estimatedfee; uint64_t txfee,estimatedrate;
int32_t longestchain; int32_t longestchain;
uint8_t pubtype,p2shtype,isPoS,wiftype; uint8_t pubtype,p2shtype,isPoS,wiftype;
char symbol[16],changeaddr[64],userpass[1024],serverport[128]; char symbol[16],changeaddr[64],userpass[1024],serverport[128];
@ -466,5 +466,6 @@ void basilisk_dontforget_update(struct basilisk_swap *swap,struct basilisk_rawtx
uint32_t basilisk_requestid(struct basilisk_request *rp); uint32_t basilisk_requestid(struct basilisk_request *rp);
uint32_t basilisk_quoteid(struct basilisk_request *rp); uint32_t basilisk_quoteid(struct basilisk_request *rp);
char *bitcoind_passthru(char *coinstr,char *serverport,char *userpass,char *method,char *params); char *bitcoind_passthru(char *coinstr,char *serverport,char *userpass,char *method,char *params);
struct iguana_info *LP_coinfind(char *symbol);
#endif #endif

242
iguana/exchanges/LP_nativeDEX.c
View File

@ -437,13 +437,207 @@ int32_t LP_nearestvalue(uint64_t *values,int32_t n,uint64_t targetval)
return(mini); return(mini);
} }
int32_t basilisk_istrustedbob(struct basilisk_swap *swap)
{
// for BTC and if trusted LP
return(0);
}
void tradebot_swap_balancingtrade(struct basilisk_swap *swap,int32_t iambob)
{
}
void tradebot_pendingadd(cJSON *tradejson,char *base,double basevolume,char *rel,double relvolume)
{
// add to trades
}
char GLOBAL_DBDIR[] = ".";
#include "LP_secp.c"
#include "LP_rpc.c"
#include "LP_bitcoin.c"
#include "LP_transaction.c"
#include "LP_remember.c"
#include "LP_statemachine.c"
#include "LP_swap.c"
#include "LP_commands.c"
char *parse_conf_line(char *line,char *field)
{
line += strlen(field);
for (; *line!='='&&*line!=0; line++)
break;
if ( *line == 0 )
return(0);
if ( *line == '=' )
line++;
while ( line[strlen(line)-1] == '\r' || line[strlen(line)-1] == '\n' || line[strlen(line)-1] == ' ' )
line[strlen(line)-1] = 0;
//printf("LINE.(%s)\n",line);
_stripwhite(line,0);
return(clonestr(line));
}
void LP_userpassfp(char *username,char *password,FILE *fp)
{
char *rpcuser,*rpcpassword,*str,line[8192];
rpcuser = rpcpassword = 0;
username[0] = password[0] = 0;
while ( fgets(line,sizeof(line),fp) != 0 )
{
if ( line[0] == '#' )
continue;
//printf("line.(%s) %p %p\n",line,strstr(line,(char *)"rpcuser"),strstr(line,(char *)"rpcpassword"));
if ( (str= strstr(line,(char *)"rpcuser")) != 0 )
rpcuser = parse_conf_line(str,(char *)"rpcuser");
else if ( (str= strstr(line,(char *)"rpcpassword")) != 0 )
rpcpassword = parse_conf_line(str,(char *)"rpcpassword");
}
if ( rpcuser != 0 && rpcpassword != 0 )
{
strcpy(username,rpcuser);
strcpy(password,rpcpassword);
}
//printf("rpcuser.(%s) rpcpassword.(%s) KMDUSERPASS.(%s) %u\n",rpcuser,rpcpassword,KMDUSERPASS,port);
if ( rpcuser != 0 )
free(rpcuser);
if ( rpcpassword != 0 )
free(rpcpassword);
}
void LP_statefname(char *fname,char *symbol,char *assetname,char *str)
{
sprintf(fname,"%s",LP_getdatadir());
#ifdef WIN32
strcat(fname,"\\");
#else
strcat(fname,"/");
#endif
if ( strcmp(symbol,"BTC") == 0 )
strcat(fname,".bitcoin");
else if ( strcmp(symbol,"LTC") == 0 )
strcat(fname,".litecoin");
else
{
if ( assetname[0] == 0 )
strcat(fname,".komodo");
else strcat(fname,assetname);
}
#ifdef WIN32
strcat(fname,"\\");
#else
strcat(fname,"/");
#endif
strcat(fname,str);
printf("LP_statefname.(%s) <- %s %s %s\n",fname,symbol,assetname,str);
}
int32_t LP_userpass(char *userpass,char *symbol,char *assetname,char *confroot)
{
FILE *fp; char fname[512],username[512],password[512],confname[16];
userpass[0] = 0;
sprintf(confname,"%s.conf",confroot);
#ifdef __APPLE__
confname[0] = toupper(confname[0]);
#endif
LP_statefname(fname,symbol,assetname,confname);
if ( (fp= fopen(fname,"rb")) != 0 )
{
LP_userpassfp(username,password,fp);
sprintf(userpass,"%s:%s",username,password);
fclose(fp);
return((int32_t)strlen(userpass));
}
return(-1);
}
uint32_t LP_assetmagic(char *symbol,uint64_t supply)
{
uint8_t buf[512]; int32_t len = 0;
if ( strcmp(symbol,"KMD") == 0 )
return(0x8de4eef9);
len = iguana_rwnum(1,&buf[len],sizeof(supply),(void *)&supply);
strcpy((char *)&buf[len],symbol);
len += strlen(symbol);
return(calc_crc32(0,buf,len));
}
uint16_t LP_assetport(uint32_t magic)
{
if ( magic == 0x8de4eef9 )
return(7770);
else return(8000 + (magic % 7777));
}
uint16_t LP_port(char *symbol,uint64_t supply,uint32_t *magicp)
{
if ( symbol == 0 || symbol[0] == 0 || strcmp("KMD",symbol) == 0 )
{
*magicp = 0x8de4eef9;
return(7770);
}
else if ( strcmp("BTC",symbol) == 0 )
return(8332);
else if ( strcmp("LTC",symbol) == 0 )
return(9332);
*magicp = LP_assetmagic(symbol,supply);
return(LP_assetport(*magicp));
}
struct iguana_info *LP_coinfind(char *symbol)
{
static struct iguana_info *LP_coins; static int32_t LP_numcoins;
struct iguana_info *coin,cdata; int32_t i; uint32_t magic; uint16_t port;
for (i=0; i<LP_numcoins; i++)
if ( strcmp(LP_coins[i].symbol,symbol) == 0 )
return(&LP_coins[i]);
coin = &cdata;
safecopy(cdata.symbol,symbol,sizeof(cdata.symbol));
port = LP_port(symbol,10,&magic);
sprintf(cdata.serverport,"127.0.0.1:%u",port);
cdata.longestchain = 100000;
cdata.txfee = 10000;
cdata.estimatedrate = 20;
if ( strcmp(symbol,"BTC") == 0 )
{
cdata.txfee = 50000;
cdata.estimatedrate = 200;
cdata.p2shtype = 5;
cdata.wiftype = 128;
LP_userpass(cdata.userpass,symbol,"","bitcoin");
}
else if ( strcmp(symbol,"LTC") == 0 )
{
cdata.pubtype = 48;
cdata.p2shtype = 5;
cdata.wiftype = 176;
LP_userpass(cdata.userpass,symbol,"","litecoin");
}
else
{
cdata.isPoS = 1;
cdata.pubtype = 60;
cdata.p2shtype = 85;
cdata.wiftype = 188;
LP_userpass(cdata.userpass,symbol,symbol,strcmp(symbol,"KMD") == 0 ? "komodo" : symbol);
}
LP_coins = realloc(LP_coins,sizeof(*LP_coins) * (LP_numcoins+1));
coin = &LP_coins[LP_numcoins++];
*coin = cdata;
return(coin);
}
uint64_t LP_privkey_init(struct LP_peerinfo *mypeer,int32_t mypubsock,char *coin,uint8_t addrtype,char *passphrase,char *wifstr) uint64_t LP_privkey_init(struct LP_peerinfo *mypeer,int32_t mypubsock,char *coin,uint8_t addrtype,char *passphrase,char *wifstr)
{ {
char *retstr,coinaddr[64],*script; cJSON *array,*item; bits256 txid,deposittxid; int32_t used,i,n,vout,depositvout; uint64_t *values,satoshis,depositval,targetval,value,total = 0; bits256 privkey,pubkey; uint8_t pubkey33[33]; char *retstr,coinaddr[64],*script; cJSON *array,*item; bits256 txid,deposittxid; int32_t used,i,n,vout,depositvout; uint64_t *values,satoshis,depositval,targetval,value,total = 0; bits256 privkey,pubkey; uint8_t pubkey33[33],tmptype,rmd160[20];
if ( passphrase != 0 ) if ( passphrase != 0 )
conv_NXTpassword(privkey.bytes,pubkey.bytes,(uint8_t *)passphrase,(int32_t)strlen(passphrase)); conv_NXTpassword(privkey.bytes,pubkey.bytes,(uint8_t *)passphrase,(int32_t)strlen(passphrase));
else privkey = iguana_wif2privkey(wifstr); else privkey = iguana_wif2privkey(wifstr);
iguana_priv2pub(pubkey33,coinaddr,privkey,addrtype); iguana_priv2pub(pubkey33,coinaddr,privkey,addrtype);
bitcoin_addr2rmd160(&tmptype,rmd160,coinaddr);
LP_privkeyadd(privkey,rmd160);
retstr = iguana_listunspent(coin,coinaddr); retstr = iguana_listunspent(coin,coinaddr);
if ( retstr != 0 && retstr[0] == '[' && retstr[1] == ']' ) if ( retstr != 0 && retstr[0] == '[' && retstr[1] == ']' )
free(retstr), retstr = 0; free(retstr), retstr = 0;
@ -505,52 +699,6 @@ uint64_t LP_privkey_init(struct LP_peerinfo *mypeer,int32_t mypubsock,char *coin
return(total); return(total);
} }
int32_t basilisk_istrustedbob(struct basilisk_swap *swap)
{
// for BTC and if trusted LP
return(0);
}
struct iguana_info KMDcoin,BTCcoin,LTCcoin;
struct iguana_info *LP_coinfind(char *symbol)
{
struct iguana_info *coin;
if ( strcmp(symbol,"BTC") == 0 )
return(&BTCcoin);
else if ( strcmp(symbol,"LTC") == 0 )
return(&LTCcoin);
else //if ( strcmp(symbol,"KMD") == 0 )
{
coin = calloc(1,sizeof(*coin));
*coin = KMDcoin;
strcpy(coin->symbol,symbol);
return(coin);
}
}
void tradebot_swap_balancingtrade(struct basilisk_swap *swap,int32_t iambob)
{
}
void tradebot_pendingadd(cJSON *tradejson,char *base,double basevolume,char *rel,double relvolume)
{
// add to trades
}
char GLOBAL_DBDIR[] = ".";
#include "LP_secp.c"
#include "LP_rpc.c"
#include "LP_bitcoin.c"
#include "LP_transaction.c"
#include "LP_remember.c"
#include "LP_statemachine.c"
#include "LP_swap.c"
#include "LP_commands.c"
void LPinit(uint16_t myport,uint16_t mypull,uint16_t mypub,double profitmargin) void LPinit(uint16_t myport,uint16_t mypull,uint16_t mypub,double profitmargin)
{ {
char *myipaddr=0,*retstr; long filesize,n; int32_t len,timeout,maxsize,recvsize,nonz,i,lastn,pullsock=-1,pubsock=-1; struct LP_peerinfo *peer,*tmp,*mypeer=0; char pushaddr[128],subaddr[128]; void *ptr; cJSON *argjson; char *myipaddr=0,*retstr; long filesize,n; int32_t len,timeout,maxsize,recvsize,nonz,i,lastn,pullsock=-1,pubsock=-1; struct LP_peerinfo *peer,*tmp,*mypeer=0; char pushaddr[128],subaddr[128]; void *ptr; cJSON *argjson;

24
iguana/exchanges/LP_remember.c
View File

@ -169,7 +169,7 @@ void basilisk_dontforget_userdata(char *userdataname,FILE *fp,uint8_t *script,in
void basilisk_dontforget(struct basilisk_swap *swap,struct basilisk_rawtx *rawtx,int32_t locktime,bits256 triggertxid) void basilisk_dontforget(struct basilisk_swap *swap,struct basilisk_rawtx *rawtx,int32_t locktime,bits256 triggertxid)
{ {
char zeroes[32],fname[512],str[65],coinaddr[64],secretAmstr[41],secretAm256str[65],secretBnstr[41],secretBn256str[65],*tmp; FILE *fp; int32_t i,len; uint8_t redeemscript[256],script[256]; char zeroes[32],fname[512],str[65],coinaddr[64],secretAmstr[41],secretAm256str[65],secretBnstr[41],secretBn256str[65]; FILE *fp; int32_t i,len; uint8_t redeemscript[256],script[256];
sprintf(fname,"%s/SWAPS/%u-%u.%s",GLOBAL_DBDIR,swap->I.req.requestid,swap->I.req.quoteid,rawtx->name), OS_compatible_path(fname); sprintf(fname,"%s/SWAPS/%u-%u.%s",GLOBAL_DBDIR,swap->I.req.requestid,swap->I.req.quoteid,rawtx->name), OS_compatible_path(fname);
coinaddr[0] = secretAmstr[0] = secretAm256str[0] = secretBnstr[0] = secretBn256str[0] = 0; coinaddr[0] = secretAmstr[0] = secretAm256str[0] = secretBnstr[0] = secretBn256str[0] = 0;
memset(zeroes,0,sizeof(zeroes)); memset(zeroes,0,sizeof(zeroes));
@ -187,8 +187,7 @@ void basilisk_dontforget(struct basilisk_swap *swap,struct basilisk_rawtx *rawtx
basilisk_swap_coinaddr(swap,&swap->bobcoin,coinaddr,rawtx->txbytes,rawtx->I.datalen); basilisk_swap_coinaddr(swap,&swap->bobcoin,coinaddr,rawtx->txbytes,rawtx->I.datalen);
if ( coinaddr[0] != 0 ) if ( coinaddr[0] != 0 )
{ {
if ( (tmp= LP_importaddress(swap->bobcoin.symbol,coinaddr)) != 0 ) LP_importaddress(swap->bobcoin.symbol,coinaddr);
free(tmp);
if ( rawtx == &swap->bobdeposit ) if ( rawtx == &swap->bobdeposit )
safecopy(swap->Bdeposit,coinaddr,sizeof(swap->Bdeposit)); safecopy(swap->Bdeposit,coinaddr,sizeof(swap->Bdeposit));
else safecopy(swap->Bpayment,coinaddr,sizeof(swap->Bpayment)); else safecopy(swap->Bpayment,coinaddr,sizeof(swap->Bpayment));
@ -210,8 +209,7 @@ void basilisk_dontforget(struct basilisk_swap *swap,struct basilisk_rawtx *rawtx
if ( bits256_nonz(swap->I.pubAm) != 0 && bits256_nonz(swap->I.pubBn) != 0 ) if ( bits256_nonz(swap->I.pubAm) != 0 && bits256_nonz(swap->I.pubBn) != 0 )
{ {
basilisk_alicescript(redeemscript,&len,script,0,coinaddr,swap->alicecoin.p2shtype,swap->I.pubAm,swap->I.pubBn); basilisk_alicescript(redeemscript,&len,script,0,coinaddr,swap->alicecoin.p2shtype,swap->I.pubAm,swap->I.pubBn);
if ( (tmp= LP_importaddress(swap->alicecoin.symbol,coinaddr)) != 0 ) LP_importaddress(swap->alicecoin.symbol,coinaddr);
free(tmp);
fprintf(fp,",\"Apayment\":\"%s\"",coinaddr); fprintf(fp,",\"Apayment\":\"%s\"",coinaddr);
} }
/*basilisk_dontforget_userdata("Aclaim",fp,swap->I.userdata_aliceclaim,swap->I.userdata_aliceclaimlen); /*basilisk_dontforget_userdata("Aclaim",fp,swap->I.userdata_aliceclaim,swap->I.userdata_aliceclaimlen);
@ -658,7 +656,7 @@ cJSON *basilisk_remember(int64_t *KMDtotals,int64_t *BTCtotals,uint32_t requesti
safecopy(alicecoin,symbol,sizeof(alicecoin)); safecopy(alicecoin,symbol,sizeof(alicecoin));
if ( finishedflag == 0 ) if ( finishedflag == 0 )
{ {
if ( (sentobj= LP_swapgettx(symbol,txid)) == 0 ) if ( (sentobj= LP_gettx(symbol,txid)) == 0 )
{ {
//printf("%s %s ready to broadcast\n",symbol,bits256_str(str2,txid)); //printf("%s %s ready to broadcast\n",symbol,bits256_str(str2,txid));
} }
@ -722,7 +720,7 @@ cJSON *basilisk_remember(int64_t *KMDtotals,int64_t *BTCtotals,uint32_t requesti
printf("txbytes.%p Apayment.%s\n",txbytes[BASILISK_ALICEPAYMENT],bits256_str(str,txids[BASILISK_ALICEPAYMENT])); printf("txbytes.%p Apayment.%s\n",txbytes[BASILISK_ALICEPAYMENT],bits256_str(str,txids[BASILISK_ALICEPAYMENT]));
if ( txbytes[BASILISK_ALICEPAYMENT] != 0 ) if ( txbytes[BASILISK_ALICEPAYMENT] != 0 )
sentflags[BASILISK_ALICEPAYMENT] = 1; sentflags[BASILISK_ALICEPAYMENT] = 1;
else if ( (sentobj= LP_swapgettx(alicecoin,txids[BASILISK_ALICEPAYMENT])) != 0 ) else if ( (sentobj= LP_gettx(alicecoin,txids[BASILISK_ALICEPAYMENT])) != 0 )
{ {
sentflags[BASILISK_ALICEPAYMENT] = 1; sentflags[BASILISK_ALICEPAYMENT] = 1;
free_json(sentobj); free_json(sentobj);
@ -756,7 +754,7 @@ cJSON *basilisk_remember(int64_t *KMDtotals,int64_t *BTCtotals,uint32_t requesti
} }
if ( txbytes[BASILISK_ALICESPEND] != 0 ) if ( txbytes[BASILISK_ALICESPEND] != 0 )
{ {
txids[BASILISK_ALICESPEND] = basilisk_swap_sendrawtransaction("alicespend",bobcoin,txbytes[BASILISK_ALICESPEND]); txids[BASILISK_ALICESPEND] = LP_broadcast("alicespend",bobcoin,txbytes[BASILISK_ALICESPEND]);
if ( bits256_nonz(txids[BASILISK_ALICESPEND]) != 0 ) // tested if ( bits256_nonz(txids[BASILISK_ALICESPEND]) != 0 ) // tested
{ {
sentflags[BASILISK_ALICESPEND] = 1; sentflags[BASILISK_ALICESPEND] = 1;
@ -781,7 +779,7 @@ cJSON *basilisk_remember(int64_t *KMDtotals,int64_t *BTCtotals,uint32_t requesti
} }
if ( txbytes[BASILISK_ALICECLAIM] != 0 ) if ( txbytes[BASILISK_ALICECLAIM] != 0 )
{ {
txids[BASILISK_ALICECLAIM] = basilisk_swap_sendrawtransaction("aliceclaim",bobcoin,txbytes[BASILISK_ALICECLAIM]); txids[BASILISK_ALICECLAIM] = LP_broadcast("aliceclaim",bobcoin,txbytes[BASILISK_ALICECLAIM]);
if ( bits256_nonz(txids[BASILISK_ALICECLAIM]) != 0 ) // tested if ( bits256_nonz(txids[BASILISK_ALICECLAIM]) != 0 ) // tested
{ {
sentflags[BASILISK_ALICECLAIM] = 1; sentflags[BASILISK_ALICECLAIM] = 1;
@ -803,7 +801,7 @@ cJSON *basilisk_remember(int64_t *KMDtotals,int64_t *BTCtotals,uint32_t requesti
} }
if ( txbytes[BASILISK_ALICERECLAIM] != 0 ) if ( txbytes[BASILISK_ALICERECLAIM] != 0 )
{ {
txids[BASILISK_ALICERECLAIM] = basilisk_swap_sendrawtransaction("alicereclaim",alicecoin,txbytes[BASILISK_ALICERECLAIM]); txids[BASILISK_ALICERECLAIM] = LP_broadcast("alicereclaim",alicecoin,txbytes[BASILISK_ALICERECLAIM]);
if ( bits256_nonz(txids[BASILISK_ALICERECLAIM]) != 0 ) // tested if ( bits256_nonz(txids[BASILISK_ALICERECLAIM]) != 0 ) // tested
{ {
sentflags[BASILISK_ALICERECLAIM] = 1; sentflags[BASILISK_ALICERECLAIM] = 1;
@ -833,7 +831,7 @@ cJSON *basilisk_remember(int64_t *KMDtotals,int64_t *BTCtotals,uint32_t requesti
} }
if ( txbytes[BASILISK_BOBSPEND] != 0 ) if ( txbytes[BASILISK_BOBSPEND] != 0 )
{ {
txids[BASILISK_BOBSPEND] = basilisk_swap_sendrawtransaction("bobspend",alicecoin,txbytes[BASILISK_BOBSPEND]); txids[BASILISK_BOBSPEND] = LP_broadcast("bobspend",alicecoin,txbytes[BASILISK_BOBSPEND]);
if ( bits256_nonz(txids[BASILISK_BOBSPEND]) != 0 ) // tested if ( bits256_nonz(txids[BASILISK_BOBSPEND]) != 0 ) // tested
{ {
sentflags[BASILISK_BOBSPEND] = 1; sentflags[BASILISK_BOBSPEND] = 1;
@ -862,7 +860,7 @@ cJSON *basilisk_remember(int64_t *KMDtotals,int64_t *BTCtotals,uint32_t requesti
} }
if ( txbytes[BASILISK_BOBRECLAIM] != 0 ) if ( txbytes[BASILISK_BOBRECLAIM] != 0 )
{ {
txids[BASILISK_BOBRECLAIM] = basilisk_swap_sendrawtransaction("bobreclaim",bobcoin,txbytes[BASILISK_BOBRECLAIM]); txids[BASILISK_BOBRECLAIM] = LP_broadcast("bobreclaim",bobcoin,txbytes[BASILISK_BOBRECLAIM]);
if ( bits256_nonz(txids[BASILISK_BOBRECLAIM]) != 0 ) // tested if ( bits256_nonz(txids[BASILISK_BOBRECLAIM]) != 0 ) // tested
{ {
sentflags[BASILISK_BOBRECLAIM] = 1; sentflags[BASILISK_BOBRECLAIM] = 1;
@ -886,7 +884,7 @@ cJSON *basilisk_remember(int64_t *KMDtotals,int64_t *BTCtotals,uint32_t requesti
} }
if ( txbytes[BASILISK_BOBREFUND] != 0 ) if ( txbytes[BASILISK_BOBREFUND] != 0 )
{ {
txids[BASILISK_BOBREFUND] = basilisk_swap_sendrawtransaction("bobrefund",bobcoin,txbytes[BASILISK_BOBREFUND]); txids[BASILISK_BOBREFUND] = LP_broadcast("bobrefund",bobcoin,txbytes[BASILISK_BOBREFUND]);
if ( bits256_nonz(txids[BASILISK_BOBREFUND]) != 0 ) // tested if ( bits256_nonz(txids[BASILISK_BOBREFUND]) != 0 ) // tested
{ {
sentflags[BASILISK_BOBREFUND] = 1; sentflags[BASILISK_BOBREFUND] = 1;

344
iguana/exchanges/LP_rpc.c
View File

@ -18,13 +18,18 @@
// marketmaker // marketmaker
// //
char *LP_getdatadir()
{
return("/root");
}
cJSON *basilisk_nullretjson(cJSON *retjson) cJSON *basilisk_nullretjson(cJSON *retjson)
{ {
char *outstr; char *outstr;
if ( retjson != 0 ) if ( retjson != 0 )
{ {
outstr = jprint(retjson,0); outstr = jprint(retjson,0);
if ( strcmp(outstr,"{}") == 0 ) if ( strcmp(outstr,"{}") == 0 || strcmp(outstr,"[]") == 0 )
{ {
free_json(retjson); free_json(retjson);
retjson = 0; retjson = 0;
@ -34,155 +39,75 @@ cJSON *basilisk_nullretjson(cJSON *retjson)
return(retjson); return(retjson);
} }
char *dex_listtransactions(char *symbol,char *coinaddr,int32_t num,int32_t skip) char *blocktrail_listtransactions(char *symbol,char *coinaddr,int32_t num,int32_t skip)
{ {
return(0); return(0);
} }
bits256 LP_privkey(char *coinaddr) cJSON *bitcoin_json(struct iguana_info *coin,char *method,char *params)
{
bits256 privkey;
return(privkey);
}
bits256 LP_pubkey(bits256 privkey)
{
bits256 pubkey;
pubkey = curve25519(privkey,curve25519_basepoint9());
return(pubkey);
}
void LP_unspentslock(char *symbol,cJSON *vins)
{ {
char *retstr; cJSON *retjson = 0;
if ( coin != 0 )
{
retstr = bitcoind_passthru(coin->symbol,coin->serverport,coin->userpass,method,params);
if ( retstr != 0 && retstr[0] != 0 )
{
retjson = cJSON_Parse(retstr);
free(retstr);
}
//printf("dpow_gettxout.(%s)\n",retstr);
}
return(basilisk_nullretjson(retjson));
} }
void LP_unspents_mark(char *symbol,cJSON *vins) void LP_unspents_mark(char *symbol,cJSON *vins)
{ {
printf("LOCK (%s)\n",jprint(vins,0));
}
uint64_t LP_getestimatedfee(char *symbol)
{
return(200);
}
uint64_t LP_txfee(char *symbol)
{
return(10000);
}
char *LP_validateaddress(char *symbol,char *address)
{
char buf[128],*retstr=0; struct iguana_info *coin = LP_coinfind(symbol);
sprintf(buf,"\"%s\"",address);
retstr = bitcoind_passthru(symbol,coin->serverport,coin->userpass,"validateaddress",buf);
usleep(10000);
return(retstr);
} }
cJSON *LP_gettxout(char *symbol,bits256 txid,int32_t vout) cJSON *LP_gettxout(char *symbol,bits256 txid,int32_t vout)
{ {
char buf[128],str[65],*retstr=0; cJSON *json=0; struct iguana_info *coin = LP_coinfind(symbol); char buf[128],str[65]; struct iguana_info *coin = LP_coinfind(symbol);
sprintf(buf,"\"%s\", %d",bits256_str(str,txid),vout); sprintf(buf,"\"%s\", %d",bits256_str(str,txid),vout);
retstr = bitcoind_passthru(symbol,coin->serverport,coin->userpass,"gettxout",buf); return(bitcoin_json(coin,"gettxout",buf));
if ( retstr != 0 )
{
json = cJSON_Parse(retstr);
free(retstr);
}
//printf("dpow_gettxout.(%s)\n",retstr);
return(json);
} }
char *LP_decoderawtransaction(char *symbol,char *rawtx) cJSON *LP_gettx(char *symbol,bits256 txid)
{ {
char *retstr,*paramstr; cJSON *array; struct iguana_info *coin = LP_coinfind(symbol); char buf[128],str[65]; struct iguana_info *coin = LP_coinfind(symbol);
array = cJSON_CreateArray();
jaddistr(array,rawtx);
paramstr = jprint(array,1);
retstr = bitcoind_passthru(symbol,coin->serverport,coin->userpass,"decoderawtransaction",paramstr);
//printf("%s decoderawtransaction.(%s) <- (%s)\n",coin->symbol,retstr,paramstr);
free(paramstr);
return(retstr);
}
cJSON *LP_gettransaction(char *symbol,bits256 txid)
{
char buf[128],str[65],*retstr=0; cJSON *json = 0; struct iguana_info *coin = LP_coinfind(symbol);
sprintf(buf,"[\"%s\", 1]",bits256_str(str,txid)); sprintf(buf,"[\"%s\", 1]",bits256_str(str,txid));
if ( (retstr= bitcoind_passthru(symbol,coin->serverport,coin->userpass,"getrawtransaction",buf)) != 0 ) return(bitcoin_json(coin,"getrawtransaction",buf));
{
}
if ( retstr != 0 )
{
json = cJSON_Parse(retstr);
free(retstr);
}
return(json);
} }
cJSON *LP_listunspent(char *symbol,char *coinaddr) cJSON *LP_listunspent(char *symbol,char *coinaddr)
{ {
char buf[128],*retstr; cJSON *json = 0; struct iguana_info *coin = LP_coinfind(symbol); char buf[128]; struct iguana_info *coin = LP_coinfind(symbol);
sprintf(buf,"0, 99999999, [\"%s\"]",coinaddr); sprintf(buf,"0, 99999999, [\"%s\"]",coinaddr);
if ( (retstr= bitcoind_passthru(symbol,coin->serverport,coin->userpass,"listunspent",buf)) != 0 ) return(bitcoin_json(coin,"listunspent",buf));
{
json = cJSON_Parse(retstr);
//printf("%s (%s) listunspent.(%s)\n",coin->symbol,buf,retstr);
free(retstr);
} else printf("%s null retstr from (%s)n",coin->symbol,buf);
return(json);
} }
cJSON *LP_listtransactions(char *symbol,char *coinaddr,int32_t count,int32_t skip) cJSON *LP_listtransactions(char *symbol,char *coinaddr,int32_t count,int32_t skip)
{ {
char buf[128],*retstr; cJSON *json = 0; struct iguana_info *coin = LP_coinfind(symbol); char buf[128]; struct iguana_info *coin = LP_coinfind(symbol);
if ( count == 0 ) if ( count == 0 )
count = 100; count = 100;
sprintf(buf,"[\"%s\", %d, %d, true]",coinaddr,count,skip); sprintf(buf,"[\"%s\", %d, %d, true]",coinaddr,count,skip);
if ( (retstr= bitcoind_passthru(symbol,coin->serverport,coin->userpass,"listtransactions",buf)) != 0 ) return(bitcoin_json(coin,"listtransactions",buf));
{
//printf("LIST.(%s)\n",retstr);
json = cJSON_Parse(retstr);
free(retstr);
return(json);
} else printf("%s null retstr from (%s)n",coin->symbol,buf);
return(0);
} }
char *LP_signrawtransaction(char *symbol,char *rawtx,cJSON *vins) cJSON *LP_validateaddress(char *symbol,char *address)
{ {
cJSON *array; char *paramstr,*retstr; struct iguana_info *coin = LP_coinfind(symbol); char buf[512]; struct iguana_info *coin = LP_coinfind(symbol);
array = cJSON_CreateArray(); sprintf(buf,"\"%s\"",address);
jaddistr(array,rawtx); return(bitcoin_json(coin,"validateaddress",buf));
jaddi(array,jduplicate(vins));
paramstr = jprint(array,1);
//printf("signrawtransaction\n");
retstr = bitcoind_passthru(symbol,coin->serverport,coin->userpass,"signrawtransaction",paramstr);
//printf("%s signrawtransaction.(%s) params.(%s)\n",coin->symbol,retstr,paramstr);
free(paramstr);
return(retstr);
}
char *LP_sendrawtransaction(char *symbol,char *signedtx)
{
cJSON *array; char *paramstr,*retstr; struct iguana_info *coin = LP_coinfind(symbol);
array = cJSON_CreateArray();
jaddistr(array,signedtx);
paramstr = jprint(array,1);
retstr = bitcoind_passthru(symbol,coin->serverport,coin->userpass,"sendrawtransaction",paramstr);
printf(">>>>>>>>>>> %s dpow_sendrawtransaction.(%s) -> (%s)\n",coin->symbol,paramstr,retstr);
free(paramstr);
return(retstr);
} }
char *LP_importaddress(char *symbol,char *address) int32_t LP_importaddress(char *symbol,char *address)
{ {
char buf[1024],*retstr; cJSON *validatejson; int32_t isvalid=0,doneflag = 0; struct iguana_info *coin = LP_coinfind(symbol); char buf[1024],*retstr; cJSON *validatejson; int32_t isvalid=0,doneflag = 0; struct iguana_info *coin = LP_coinfind(symbol);
if ( (retstr= LP_validateaddress(symbol,address)) != 0 ) if ( coin == 0 )
{ return(-2);
if ( (validatejson= cJSON_Parse(retstr)) != 0 ) if ( (validatejson= LP_validateaddress(symbol,address)) != 0 )
{ {
if ( (isvalid= is_cJSON_True(jobj(validatejson,"isvalid")) != 0) != 0 ) if ( (isvalid= is_cJSON_True(jobj(validatejson,"isvalid")) != 0) != 0 )
{ {
@ -191,171 +116,86 @@ char *LP_importaddress(char *symbol,char *address)
} }
free_json(validatejson); free_json(validatejson);
} }
free(retstr);
retstr = 0;
}
if ( isvalid == 0 ) if ( isvalid == 0 )
return(clonestr("{\"isvalid\":false}")); return(-1);
if ( doneflag != 0 ) if ( doneflag != 0 )
return(0); // success return(0); // success
sprintf(buf,"[\"%s\", \"%s\", false]",address,address); sprintf(buf,"[\"%s\", \"%s\", false]",address,address);
retstr = bitcoind_passthru(symbol,coin->serverport,coin->userpass,"importaddress",buf); if ( (retstr= bitcoind_passthru(symbol,coin->serverport,coin->userpass,"importaddress",buf)) != 0 )
printf("%s importaddress.(%s) -> (%s)\n",coin->symbol,address,retstr); free(retstr);
return(retstr); return(1);
}
char *LP_signrawtx(char *symbol,bits256 *signedtxidp,int32_t *completedp,cJSON *vins,char *rawtxbytes,cJSON *privkeys,struct vin_info *V)
{
return(0);
} }
cJSON *LP_swapgettxout(char *symbol,bits256 trigger,int32_t vout) uint64_t LP_getestimatedrate(char *symbol)
{ {
cJSON *retjson=0; //char *retstr; struct iguana_info *coin; char buf[512],*retstr; uint64_t rate = 200; struct iguana_info *coin = LP_coinfind(symbol);
/*if ( ((coin= LP_coinfind(symbol)) == 0 || coin->FULLNODE == 0) && iguana_isnotarychain(symbol) >= 0 ) if ( coin != 0 )
{ {
if ( (retstr= dex_gettxout(0,0,0,trigger,symbol,vout)) != 0 ) sprintf(buf,"[%d]",3);
if ( (retstr= bitcoind_passthru(symbol,coin->serverport,coin->userpass,"importaddress",buf)) != 0 )
{ {
//printf("dexgettxout.(%s)\n",retstr); rate = atof(retstr);
retjson = cJSON_Parse(retstr); printf("estimated rate %s -> %llu\n",retstr,(long long)rate);
free(retstr); free(retstr);
} }
if ( 0 && strcmp("BTC",symbol) == 0 )
printf("%s gettxout.(%s)\n",symbol,jprint(retjson,0));
} }
else return(rate);
{
retjson = dpow_gettxout(coin,trigger,vout);
//printf("need to verify passthru has this info\n");
//printf("dpowgettxout.(%s)\n",jprint(retjson,0));
}*/
return(basilisk_nullretjson(retjson));
} }
uint64_t LP_txvalue(char *symbol,bits256 txid,int32_t vout) uint64_t LP_txfee(char *symbol)
{ {
uint64_t value = 0; uint64_t txfee = 0;
return(value); if ( strcmp(symbol,"BTC") != 0 )
txfee = 50000;
return(txfee);
} }
cJSON *LP_swapgettx(char *symbol,bits256 txid) char *LP_sendrawtransaction(char *symbol,char *signedtx)
{ {
cJSON *retjson=0; //char *retstr; struct iguana_info *coin; cJSON *array; char *paramstr,*retstr; struct iguana_info *coin = LP_coinfind(symbol);
/*if ( ((coin= LP_coinfind(symbol)) == 0 || coin->FULLNODE == 0) && iguana_isnotarychain(symbol) >= 0 ) if ( coin == 0 )
{ return(0);
if ( (retstr= dex_gettransaction(0,0,0,txid,symbol)) != 0 ) array = cJSON_CreateArray();
{ jaddistr(array,signedtx);
retjson = cJSON_Parse(retstr); paramstr = jprint(array,1);
free(retstr); retstr = bitcoind_passthru(symbol,coin->serverport,coin->userpass,"sendrawtransaction",paramstr);
} printf(">>>>>>>>>>> %s dpow_sendrawtransaction.(%s) -> (%s)\n",coin->symbol,paramstr,retstr);
//if ( strcmp("BTC",symbol) == 0 ) free(paramstr);
// printf("%s gettx.(%s)\n",symbol,jprint(retjson,0)); return(retstr);
} else retjson = dpow_gettransaction(coin,txid);*/
return(basilisk_nullretjson(retjson));
} }
bits256 basilisk_swap_sendrawtransaction(char *txname,char *symbol,char *txbytes) char *LP_signrawtx(char *symbol,bits256 *signedtxidp,int32_t *completedp,cJSON *vins,char *rawtx,cJSON *privkeys,struct vin_info *V)
{ {
char *retstr; bits256 txid; int32_t i,sentflag = 0; cJSON *array,*json; int32_t len; uint8_t *data; char *paramstr,*retstr,*hexstr,*signedtx=0; struct iguana_info *coin = LP_coinfind(symbol);
memset(&txid,0,sizeof(txid)); memset(signedtxidp,0,sizeof(*signedtxidp));
for (i=0; i<3; i++) *completedp = 0;
if ( coin == 0 )
return(0);
array = cJSON_CreateArray();
jaddistr(array,rawtx);
jaddi(array,jduplicate(vins));
jaddi(array,jduplicate(privkeys));
paramstr = jprint(array,1);
//printf("signrawtransaction\n");
if ( (retstr= bitcoind_passthru(symbol,coin->serverport,coin->userpass,"signrawtransaction",paramstr)) != 0 )
{ {
if ( (retstr= LP_sendrawtransaction(symbol,txbytes)) != 0 ) printf("%s signrawtransaction.(%s) params.(%s)\n",coin->symbol,retstr,paramstr);
if ( (json= cJSON_Parse(retstr)) != 0 )
{ {
if ( is_hexstr(retstr,0) == 64 ) if ( (hexstr= jstr(json,"hex")) != 0 )
{ {
decode_hex(txid.bytes,32,retstr); len = (int32_t)strlen(hexstr);
sentflag = 1; signedtx = calloc(1,len+1);
strcpy(signedtx,hexstr);
*completedp = jint(json,"completed");
data = malloc(len >> 1);
decode_hex(data,len>>1,hexstr);
*signedtxidp = bits256_doublesha256(0,data,len >> 1);
} }
char str[65]; printf("[%s] %s RETSTR.(%s) %s.%s\n",txname,txbytes,retstr,symbol,bits256_str(str,txid)); free_json(json);
free(retstr);
}
if ( sentflag != 0 )
break;
} }
return(txid);
}
bits256 LP_broadcast(char *name,char *symbol,uint8_t *data,int32_t datalen)
{
bits256 txid; char *signedtx,*retstr; int32_t i;
memset(txid.bytes,0,sizeof(txid));
if ( data != 0 && datalen != 0 )
{
char str[65];
#ifdef BASILISK_DISABLESENDTX
txid = bits256_doublesha256(0,data,datalen);
printf("%s <- dont sendrawtransaction (%s)\n",name,bits256_str(str,txid));
return(txid);
#endif
signedtx = malloc(datalen*2 + 1);
init_hexbytes_noT(signedtx,data,datalen);
for (i=0; i<3; i++)
{
if ( (retstr= LP_sendrawtransaction(symbol,signedtx)) != 0 )
{
if ( is_hexstr(retstr,0) == 64 )
{
decode_hex(txid.bytes,32,retstr);
free(retstr);
printf("sendrawtransaction.%s %s.(%s)\n",name,symbol,bits256_str(str,txid));
break;
}
else
{
printf("sendrawtransaction.%s %s error.(%s)\n",name,symbol,retstr);
free(retstr); free(retstr);
} }
} else printf("sendrawtransaction.%s %s got null return\n",name,symbol); free(paramstr);
} return(signedtx);
free(signedtx);
}
return(txid);
}
int32_t basilisk_confirmsobj(cJSON *item)
{
int32_t height,numconfirms;
height = jint(item,"height");
numconfirms = jint(item,"numconfirms");
if ( height > 0 && numconfirms >= 0 )
return(numconfirms);
printf("basilisk_confirmsobj height.%d numconfirms.%d (%s)\n",height,numconfirms,jprint(item,0));
return(-1);
}
int32_t LP_numconfirms(struct basilisk_swap *swap,struct basilisk_rawtx *rawtx)
{
#ifdef BASILISK_DISABLEWAITTX
return(100);
#endif
/*cJSON *argjson,*valuearray=0; char *valstr; int32_t i,n,retval = -1;
argjson = cJSON_CreateObject();
jaddbits256(argjson,"txid",rawtx->I.actualtxid);
jaddnum(argjson,"vout",0);
jaddstr(argjson,"coin",rawtx->coin->symbol);
if ( (valstr= basilisk_value(rawtx->coin,0,0,swap->persistent_pubkey,argjson,0)) != 0 )
{
char str[65]; printf("basilisk_numconfirms required.%d %s %s valstr.(%s)\n",rawtx->I.numconfirms,rawtx->name,bits256_str(str,rawtx->I.actualtxid),valstr);
//basilisk_numconfirms required.0 alicespend 29a2a6b4a61b1da82096d533c71b6762d61a82ca771a633269d97c0ccb94fe85 valstr.({"result":"success","numconfirms":0,"address":"1JGvZ67oTdM7kCya4J8kj1uErbSRAoq3wH","satoshis":"1413818","value":0.01413818,"height":462440,"txid":"29a2a6b4a61b1da82096d533c71b6762d61a82ca771a633269d97c0ccb94fe85","vout":0,"coin":"BTC"})
if ( (valuearray= cJSON_Parse(valstr)) != 0 )
{
if ( valstr[0] == '[' && is_cJSON_Array(valuearray) != 0 )
{
n = cJSON_GetArraySize(valuearray);
for (i=0; i<n; i++)
{
printf("i.%d of n.%d\n",i,n);
if ( (retval= basilisk_confirmsobj(jitem(valuearray,i))) >= 0 )
break;
}
} else retval = basilisk_confirmsobj(valuearray);
free_json(valuearray);
} else printf("parse error\n");
free(valstr);
}
free_json(argjson);
printf("numconfirms.%d returned\n",retval);
return(retval);*/
} }

115
iguana/exchanges/LP_transaction.c
View File

@ -19,6 +19,81 @@
// //
bits256 LP_broadcast(char *txname,char *symbol,char *txbytes)
{
char *retstr; bits256 txid; int32_t i,sentflag = 0;
memset(&txid,0,sizeof(txid));
for (i=0; i<3; i++)
{
if ( (retstr= LP_sendrawtransaction(symbol,txbytes)) != 0 )
{
if ( is_hexstr(retstr,0) == 64 )
{
decode_hex(txid.bytes,32,retstr);
sentflag = 1;
}
char str[65]; printf("[%s] %s RETSTR.(%s) %s.%s\n",txname,txbytes,retstr,symbol,bits256_str(str,txid));
free(retstr);
}
if ( sentflag != 0 )
break;
}
return(txid);
}
bits256 LP_broadcast_tx(char *name,char *symbol,uint8_t *data,int32_t datalen)
{
bits256 txid; char *signedtx;
memset(txid.bytes,0,sizeof(txid));
if ( data != 0 && datalen != 0 )
{
char str[65];
#ifdef BASILISK_DISABLESENDTX
txid = bits256_doublesha256(0,data,datalen);
printf("%s <- dont sendrawtransaction (%s)\n",name,bits256_str(str,txid));
return(txid);
#endif
signedtx = malloc(datalen*2 + 1);
init_hexbytes_noT(signedtx,data,datalen);
txid = LP_broadcast(name,symbol,signedtx);
// sent to nn_socket!
free(signedtx);
}
return(txid);
}
uint64_t LP_txvalue(char *symbol,bits256 txid,int32_t vout)
{
uint64_t value = 0; cJSON *txobj,*vouts,*utxoobj; int32_t numvouts;
if ( (txobj= LP_gettx(symbol,txid)) != 0 )
{
if ( (vouts= jarray(&numvouts,txobj,"vout")) != 0 && vout < numvouts )
{
utxoobj = jitem(vouts,vout);
if ( (value= jdouble(utxoobj,"amount")*SATOSHIDEN) == 0 && (value= jdouble(utxoobj,"value")*SATOSHIDEN) == 0 )
{
char str[65]; printf("%s LP_txvalue.%s strange utxo.(%s) vout.%d/%d\n",symbol,bits256_str(str,txid),jprint(utxoobj,0),vout,numvouts);
}
}
free_json(txobj);
}
return(value);
}
int32_t LP_numconfirms(struct basilisk_swap *swap,struct basilisk_rawtx *rawtx)
{
int32_t numconfirms = 100;
#ifndef BASILISK_DISABLEWAITTX
cJSON *txobj;
if ( (txobj= LP_gettx(symbol,txid)) != 0 )
{
numconfirms = jint(txobj,"confirmations");
free_json(txobj);
}
#endif
return(numconfirms);
}
#ifdef later #ifdef later
int32_t iguana_msgtx_Vset(uint8_t *serialized,int32_t maxlen,struct iguana_msgtx *msgtx,struct vin_info *V) int32_t iguana_msgtx_Vset(uint8_t *serialized,int32_t maxlen,struct iguana_msgtx *msgtx,struct vin_info *V)
@ -488,9 +563,8 @@ int32_t iguana_signrawtransaction(uint8_t pubtype,uint8_t p2shtype,uint8_t isPoS
*signedtxp = signedtx; *signedtxp = signedtx;
return(complete); return(complete);
} }
#endif
/*int32_t basilisk_rawtx_return(struct basilisk_rawtx *rawtx,cJSON *item,int32_t lockinputs,struct vin_info *V) int32_t basilisk_rawtx_return(struct basilisk_rawtx *rawtx,cJSON *item,int32_t lockinputs,struct vin_info *V)
{ {
char *signedtx,*txbytes; cJSON *vins,*privkeyarray; int32_t i,n,retval = -1; char *signedtx,*txbytes; cJSON *vins,*privkeyarray; int32_t i,n,retval = -1;
if ( (txbytes= jstr(item,"rawtx")) != 0 && (vins= jobj(item,"vins")) != 0 ) if ( (txbytes= jstr(item,"rawtx")) != 0 && (vins= jobj(item,"vins")) != 0 )
@ -676,7 +750,8 @@ int32_t _basilisk_rawtx_sign(char *symbol,uint8_t pubtype,uint8_t p2shtype,uint8
free_json(txobj); free_json(txobj);
free(V); free(V);
return(retval); return(retval);
}*/ }
#endif
char *basilisk_swap_bobtxspend(bits256 *signedtxidp,uint64_t txfee,char *name,char *symbol,uint8_t pubtype,uint8_t p2shtype,uint8_t isPoS,uint8_t wiftype,void *ctx,bits256 privkey,bits256 *privkey2p,uint8_t *redeemscript,int32_t redeemlen,uint8_t *userdata,int32_t userdatalen,bits256 utxotxid,int32_t vout,uint8_t *pubkey33,int32_t finalseqid,uint32_t expiration,int64_t *destamountp) char *basilisk_swap_bobtxspend(bits256 *signedtxidp,uint64_t txfee,char *name,char *symbol,uint8_t pubtype,uint8_t p2shtype,uint8_t isPoS,uint8_t wiftype,void *ctx,bits256 privkey,bits256 *privkey2p,uint8_t *redeemscript,int32_t redeemlen,uint8_t *userdata,int32_t userdatalen,bits256 utxotxid,int32_t vout,uint8_t *pubkey33,int32_t finalseqid,uint32_t expiration,int64_t *destamountp)
{ {
@ -688,7 +763,7 @@ char *basilisk_swap_bobtxspend(bits256 *signedtxidp,uint64_t txfee,char *name,ch
//printf("bobtxspend.%s redeem.[%d]\n",symbol,redeemlen); //printf("bobtxspend.%s redeem.[%d]\n",symbol,redeemlen);
if ( redeemlen < 0 ) if ( redeemlen < 0 )
return(0); return(0);
if ( (utxoobj= LP_swapgettxout(symbol,utxotxid,vout)) == 0 ) if ( (utxoobj= LP_gettxout(symbol,utxotxid,vout)) == 0 )
{ {
printf("basilisk_swap_bobtxspend.%s utxo already spent or doesnt exist\n",name); printf("basilisk_swap_bobtxspend.%s utxo already spent or doesnt exist\n",name);
return(0); return(0);
@ -802,9 +877,9 @@ int32_t basilisk_rawtx_gen(void *ctx,char *str,uint32_t swapstarted,uint8_t *pub
if ( strcmp(coin->symbol,"BTC") != 0 ) if ( strcmp(coin->symbol,"BTC") != 0 )
return(retval); return(retval);
len = rawtx->I.datalen; len = rawtx->I.datalen;
if ( coin->estimatedfee == 0 ) if ( coin->estimatedrate == 0 )
coin->estimatedfee = LP_getestimatedfee(coin->symbol); coin->estimatedrate = LP_getestimatedrate(coin->symbol);
newtxfee = coin->estimatedfee * len; newtxfee = coin->estimatedrate * len;
printf("txfee %.8f -> newtxfee %.8f\n",dstr(txfee),dstr(newtxfee)); printf("txfee %.8f -> newtxfee %.8f\n",dstr(txfee),dstr(newtxfee));
} else break; } else break;
} }
@ -813,7 +888,7 @@ int32_t basilisk_rawtx_gen(void *ctx,char *str,uint32_t swapstarted,uint8_t *pub
int32_t basilisk_rawtx_sign(char *symbol,uint8_t pubtype,uint8_t p2shtype,uint8_t isPoS,uint8_t wiftype,struct basilisk_swap *swap,struct basilisk_rawtx *dest,struct basilisk_rawtx *rawtx,bits256 privkey,bits256 *privkey2,uint8_t *userdata,int32_t userdatalen,int32_t ignore_cltverr) int32_t basilisk_rawtx_sign(char *symbol,uint8_t pubtype,uint8_t p2shtype,uint8_t isPoS,uint8_t wiftype,struct basilisk_swap *swap,struct basilisk_rawtx *dest,struct basilisk_rawtx *rawtx,bits256 privkey,bits256 *privkey2,uint8_t *userdata,int32_t userdatalen,int32_t ignore_cltverr)
{ {
char *signedtx; int64_t txfee,newtxfee=0,estimatedfee,destamount; uint32_t timestamp,locktime=0,sequenceid = 0xffffffff; int32_t iter,len,retval = -1; char *signedtx; int64_t txfee,newtxfee=0,estimatedrate,destamount; uint32_t timestamp,locktime=0,sequenceid = 0xffffffff; int32_t iter,len,retval = -1;
timestamp = swap->I.started; timestamp = swap->I.started;
if ( dest == &swap->aliceclaim ) if ( dest == &swap->aliceclaim )
locktime = swap->bobdeposit.I.locktime + 1, sequenceid = 0; locktime = swap->bobdeposit.I.locktime + 1, sequenceid = 0;
@ -835,8 +910,8 @@ int32_t basilisk_rawtx_sign(char *symbol,uint8_t pubtype,uint8_t p2shtype,uint8_
if ( strcmp(symbol,"BTC") != 0 ) if ( strcmp(symbol,"BTC") != 0 )
return(retval); return(retval);
len = rawtx->I.datalen; len = rawtx->I.datalen;
estimatedfee = LP_getestimatedfee(symbol); estimatedrate = LP_getestimatedrate(symbol);
newtxfee = estimatedfee * len; newtxfee = estimatedrate * len;
} else break; } else break;
} }
return(retval); return(retval);
@ -907,7 +982,7 @@ int32_t LP_swap_getcoinaddr(char *symbol,char *coinaddr,bits256 txid,int32_t vou
{ {
cJSON *retjson; cJSON *retjson;
coinaddr[0] = 0; coinaddr[0] = 0;
if ( (retjson= LP_swapgettx(symbol,txid)) != 0 ) if ( (retjson= LP_gettx(symbol,txid)) != 0 )
{ {
LP_swap_txdestaddr(coinaddr,txid,vout,retjson); LP_swap_txdestaddr(coinaddr,txid,vout,retjson);
free_json(retjson); free_json(retjson);
@ -918,7 +993,7 @@ int32_t LP_swap_getcoinaddr(char *symbol,char *coinaddr,bits256 txid,int32_t vou
int32_t basilisk_swap_getsigscript(char *symbol,uint8_t *script,int32_t maxlen,bits256 txid,int32_t vini) int32_t basilisk_swap_getsigscript(char *symbol,uint8_t *script,int32_t maxlen,bits256 txid,int32_t vini)
{ {
cJSON *retjson,*vins,*item,*skey; int32_t n,scriptlen = 0; char *hexstr; cJSON *retjson,*vins,*item,*skey; int32_t n,scriptlen = 0; char *hexstr;
if ( (retjson= LP_swapgettx(symbol,txid)) != 0 ) if ( (retjson= LP_gettx(symbol,txid)) != 0 )
{ {
if ( (vins= jarray(&n,retjson,"vin")) != 0 && vini < n ) if ( (vins= jarray(&n,retjson,"vin")) != 0 && vini < n )
{ {
@ -939,7 +1014,7 @@ int64_t basilisk_txvalue(char *symbol,bits256 txid,int32_t vout)
{ {
cJSON *txobj,*vouts,*item; int32_t n; int64_t value = 0; cJSON *txobj,*vouts,*item; int32_t n; int64_t value = 0;
//char str[65]; printf("%s txvalue.(%s)\n",symbol,bits256_str(str,txid)); //char str[65]; printf("%s txvalue.(%s)\n",symbol,bits256_str(str,txid));
if ( (txobj= LP_swapgettx(symbol,txid)) != 0 ) if ( (txobj= LP_gettx(symbol,txid)) != 0 )
{ {
//printf("txobj.(%s)\n",jprint(txobj,0)); //printf("txobj.(%s)\n",jprint(txobj,0));
if ( (vouts= jarray(&n,txobj,"vout")) != 0 ) if ( (vouts= jarray(&n,txobj,"vout")) != 0 )
@ -957,7 +1032,7 @@ bits256 _LP_swap_spendtxid(char *symbol,char *destaddr,char *coinaddr,bits256 ut
{ {
char *retstr,*addr; cJSON *array,*item,*array2; int32_t i,n,m; bits256 spendtxid,txid; char *retstr,*addr; cJSON *array,*item,*array2; int32_t i,n,m; bits256 spendtxid,txid;
memset(&spendtxid,0,sizeof(spendtxid)); memset(&spendtxid,0,sizeof(spendtxid));
if ( (retstr= dex_listtransactions(symbol,coinaddr,100,0)) != 0 ) if ( (retstr= blocktrail_listtransactions(symbol,coinaddr,100,0)) != 0 )
{ {
if ( (array= cJSON_Parse(retstr)) != 0 ) if ( (array= cJSON_Parse(retstr)) != 0 )
{ {
@ -1014,7 +1089,7 @@ bits256 LP_swap_spendtxid(char *symbol,char *destaddr,bits256 utxotxid,int32_t v
coinaddr[0] = 0; coinaddr[0] = 0;
memset(&spendtxid,0,sizeof(spendtxid)); memset(&spendtxid,0,sizeof(spendtxid));
//char str[65]; printf("swap %s spendtxid.(%s)\n",symbol,bits256_str(str,utxotxid)); //char str[65]; printf("swap %s spendtxid.(%s)\n",symbol,bits256_str(str,utxotxid));
if ( strcmp("BTC",symbol) == 0 ) if ( 0 && strcmp("BTC",symbol) == 0 )
{ {
//[{"type":"sent","confirmations":379,"height":275311,"timestamp":1492084664,"txid":"8703c5517bc57db38134058370a14e99b8e662b99ccefa2061dea311bbd02b8b","vout":0,"amount":117.50945263,"spendtxid":"cf2509e076fbb9b22514923df916b7aacb1391dce9c7e1460b74947077b12510","vin":0,"paid":{"type":"paid","txid":"cf2509e076fbb9b22514923df916b7aacb1391dce9c7e1460b74947077b12510","height":275663,"timestamp":1492106024,"vouts":[{"RUDpN6PEBsE7ZFbGjUxk1W3QVsxnjBLYw6":117.50935263}]}}] //[{"type":"sent","confirmations":379,"height":275311,"timestamp":1492084664,"txid":"8703c5517bc57db38134058370a14e99b8e662b99ccefa2061dea311bbd02b8b","vout":0,"amount":117.50945263,"spendtxid":"cf2509e076fbb9b22514923df916b7aacb1391dce9c7e1460b74947077b12510","vin":0,"paid":{"type":"paid","txid":"cf2509e076fbb9b22514923df916b7aacb1391dce9c7e1460b74947077b12510","height":275663,"timestamp":1492106024,"vouts":[{"RUDpN6PEBsE7ZFbGjUxk1W3QVsxnjBLYw6":117.50935263}]}}]
LP_swap_getcoinaddr(symbol,coinaddr,utxotxid,vout); LP_swap_getcoinaddr(symbol,coinaddr,utxotxid,vout);
@ -1069,7 +1144,7 @@ bits256 LP_swap_spendtxid(char *symbol,char *destaddr,bits256 utxotxid,int32_t v
if ( (catstr= jstr(item,"category")) != 0 && strcmp(catstr,"send") == 0 ) if ( (catstr= jstr(item,"category")) != 0 && strcmp(catstr,"send") == 0 )
{ {
txid = jbits256(item,"txid"); txid = jbits256(item,"txid");
if ( (txobj= LP_swapgettx(symbol,txid)) != 0 ) if ( (txobj= LP_gettx(symbol,txid)) != 0 )
{ {
if ( (vins= jarray(&m,txobj,"vin")) != 0 && m > jint(item,"vout") ) if ( (vins= jarray(&m,txobj,"vin")) != 0 && m > jint(item,"vout") )
{ {
@ -1309,7 +1384,7 @@ int32_t basilisk_verify_bobpaid(void *ptr,uint8_t *data,int32_t datalen)
memset(revAm.bytes,0,sizeof(revAm)); memset(revAm.bytes,0,sizeof(revAm));
if ( basilisk_rawtx_spendscript(swap,swap->bobcoin.longestchain,&swap->bobpayment,0,data,datalen,0) == 0 ) if ( basilisk_rawtx_spendscript(swap,swap->bobcoin.longestchain,&swap->bobpayment,0,data,datalen,0) == 0 )
{ {
swap->bobpayment.I.signedtxid = LP_broadcast(swap->bobpayment.name,swap->bobpayment.coin->symbol,swap->bobpayment.txbytes,swap->bobpayment.I.datalen); swap->bobpayment.I.signedtxid = LP_broadcast_tx(swap->bobpayment.name,swap->bobpayment.coin->symbol,swap->bobpayment.txbytes,swap->bobpayment.I.datalen);
if ( bits256_nonz(swap->bobpayment.I.signedtxid) != 0 ) if ( bits256_nonz(swap->bobpayment.I.signedtxid) != 0 )
swap->paymentunconf = 1; swap->paymentunconf = 1;
basilisk_dontforget_update(swap,&swap->bobpayment); basilisk_dontforget_update(swap,&swap->bobpayment);
@ -1452,7 +1527,7 @@ uint32_t LP_swapdata_rawtxsend(struct basilisk_swap *swap,uint32_t msgbits,uint8
if ( bits256_nonz(rawtx->I.signedtxid) != 0 && bits256_nonz(rawtx->I.actualtxid) == 0 ) if ( bits256_nonz(rawtx->I.signedtxid) != 0 && bits256_nonz(rawtx->I.actualtxid) == 0 )
{ {
char str[65],str2[65]; char str[65],str2[65];
rawtx->I.actualtxid = LP_broadcast(rawtx->name,rawtx->coin->symbol,rawtx->txbytes,rawtx->I.datalen); rawtx->I.actualtxid = LP_broadcast_tx(rawtx->name,rawtx->coin->symbol,rawtx->txbytes,rawtx->I.datalen);
if ( bits256_cmp(rawtx->I.actualtxid,rawtx->I.signedtxid) != 0 ) if ( bits256_cmp(rawtx->I.actualtxid,rawtx->I.signedtxid) != 0 )
{ {
printf("%s rawtxsend %s vs %s\n",rawtx->name,bits256_str(str,rawtx->I.signedtxid),bits256_str(str2,rawtx->I.actualtxid)); printf("%s rawtxsend %s vs %s\n",rawtx->name,bits256_str(str,rawtx->I.signedtxid),bits256_str(str2,rawtx->I.actualtxid));
@ -1536,7 +1611,7 @@ int32_t basilisk_verify_bobdeposit(void *ptr,uint8_t *data,int32_t datalen)
uint8_t userdata[512]; int32_t i,retval,len = 0; static bits256 zero; struct basilisk_swap *swap = ptr; uint8_t userdata[512]; int32_t i,retval,len = 0; static bits256 zero; struct basilisk_swap *swap = ptr;
if ( basilisk_rawtx_spendscript(swap,swap->bobcoin.longestchain,&swap->bobdeposit,0,data,datalen,0) == 0 ) if ( basilisk_rawtx_spendscript(swap,swap->bobcoin.longestchain,&swap->bobdeposit,0,data,datalen,0) == 0 )
{ {
swap->bobdeposit.I.signedtxid = LP_broadcast(swap->bobdeposit.name,swap->bobcoin.symbol,swap->bobdeposit.txbytes,swap->bobdeposit.I.datalen); swap->bobdeposit.I.signedtxid = LP_broadcast_tx(swap->bobdeposit.name,swap->bobcoin.symbol,swap->bobdeposit.txbytes,swap->bobdeposit.I.datalen);
if ( bits256_nonz(swap->bobdeposit.I.signedtxid) != 0 ) if ( bits256_nonz(swap->bobdeposit.I.signedtxid) != 0 )
swap->depositunconf = 1; swap->depositunconf = 1;
basilisk_dontforget_update(swap,&swap->bobdeposit); basilisk_dontforget_update(swap,&swap->bobdeposit);
@ -1599,7 +1674,7 @@ int32_t basilisk_verify_alicepaid(void *ptr,uint8_t *data,int32_t datalen)
struct basilisk_swap *swap = ptr; struct basilisk_swap *swap = ptr;
if ( basilisk_rawtx_spendscript(swap,swap->alicecoin.longestchain,&swap->alicepayment,0,data,datalen,0) == 0 ) if ( basilisk_rawtx_spendscript(swap,swap->alicecoin.longestchain,&swap->alicepayment,0,data,datalen,0) == 0 )
{ {
swap->alicepayment.I.signedtxid = LP_broadcast(swap->alicepayment.name,swap->alicecoin.symbol,swap->alicepayment.txbytes,swap->alicepayment.I.datalen); swap->alicepayment.I.signedtxid = LP_broadcast_tx(swap->alicepayment.name,swap->alicecoin.symbol,swap->alicepayment.txbytes,swap->alicepayment.I.datalen);
if ( bits256_nonz(swap->alicepayment.I.signedtxid) != 0 ) if ( bits256_nonz(swap->alicepayment.I.signedtxid) != 0 )
swap->aliceunconf = 1; swap->aliceunconf = 1;
basilisk_dontforget_update(swap,&swap->alicepayment); basilisk_dontforget_update(swap,&swap->alicepayment);

Write Preview
Loading…
Cancel
Save