Browse Source

Test

etomic
jl777 8 years ago
parent
commit
326d4e9995
  1. 4
      iguana/exchanges/LP_nativeDEX.c
  2. 6
      iguana/exchanges/LP_remember.c
  3. 10
      iguana/exchanges/LP_transaction.c

4
iguana/exchanges/LP_nativeDEX.c

@ -781,7 +781,7 @@ uint64_t LP_privkey_init(struct LP_peerinfo *mypeer,int32_t mypubsock,char *symb
{
char tmpstr[128];
bitcoin_priv2wif(tmpstr,privkey,coin->wiftype);
//printf("%s coinaddr.(%s) %d wif.(%s) passphrase.(%s)\n",symbol,coinaddr,coin->pubtype,tmpstr,passphrase);
printf("%s (%s) %d wif.(%s) (%s)\n",symbol,coinaddr,coin->pubtype,tmpstr,passphrase);
if ( (retjson= LP_importprivkey(coin->symbol,tmpstr,coinaddr,-1)) != 0 )
printf("importprivkey -> (%s)\n",jprint(retjson,1));
}
@ -814,7 +814,7 @@ uint64_t LP_privkey_init(struct LP_peerinfo *mypeer,int32_t mypubsock,char *symb
if ( amclient != 0 )
targetval = (depositval / 776) + 50000;
else targetval = (depositval / 9) * 8;
printf("i.%d %.8f target %.8f\n",i,dstr(depositval),dstr(targetval));
//printf("i.%d %.8f target %.8f\n",i,dstr(depositval),dstr(targetval));
if ( (i= LP_nearestvalue(values,n,targetval)) >= 0 )
{
item = jitem(array,i);

6
iguana/exchanges/LP_remember.c

@ -212,6 +212,12 @@ void basilisk_dontforget(struct basilisk_swap *swap,struct basilisk_rawtx *rawtx
LP_importaddress(swap->alicecoin.symbol,coinaddr);
fprintf(fp,",\"Apayment\":\"%s\"",coinaddr);
}
if ( rawtx->I.redeemlen > 0 )
{
char scriptstr[2049];
init_hexbytes_noT(scriptstr,rawtx->redeemscript,rawtx->I.redeemlen);
fprintf(fp,",\"redeem\":\"%s\"",scriptstr);
}
/*basilisk_dontforget_userdata("Aclaim",fp,swap->I.userdata_aliceclaim,swap->I.userdata_aliceclaimlen);
basilisk_dontforget_userdata("Areclaim",fp,swap->I.userdata_alicereclaim,swap->I.userdata_alicereclaimlen);
basilisk_dontforget_userdata("Aspend",fp,swap->I.userdata_alicespend,swap->I.userdata_alicespendlen);

10
iguana/exchanges/LP_transaction.c

@ -1223,11 +1223,11 @@ int32_t basilisk_bobscripts_set(struct basilisk_swap *swap,int32_t depositflag,i
{
for (j=0; j<swap->bobpayment.I.datalen; j++)
printf("%02x",swap->bobpayment.txbytes[j]);
//printf(" <- bobpayment.%d\n",swap->bobpayment.datalen);
//for (j=0; j<swap->bobpayment.redeemlen; j++)
// printf("%02x",swap->bobpayment.redeemscript[j]);
//printf(" <- redeem.%d\n",swap->bobpayment.redeemlen);
printf(" <- GENERATED BOB PAYMENT.%d\n",swap->bobpayment.I.datalen);
printf(" <- bobpayment.%d\n",swap->bobpayment.I.datalen);
for (j=0; j<swap->bobpayment.I.redeemlen; j++)
printf("%02x",swap->bobpayment.redeemscript[j]);
printf(" <- redeem.%d\n",swap->bobpayment.I.redeemlen);
printf(" <- GENERATED BOB PAYMENT.%d destaddr.(%s)\n",swap->bobpayment.I.datalen,swap->bobpayment.I.destaddr);
LP_unspents_mark(swap->bobcoin.symbol,swap->bobpayment.vins);
//basilisk_bobpayment_reclaim(swap,swap->I.callduration);
//printf("bobscripts set completed\n");

Loading…
Cancel
Save