From 328331656996e995fac349b4c30f10b5c2479395 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 5 Mar 2017 20:07:50 +0200 Subject: [PATCH] Test --- basilisk/basilisk_MSG.c | 2 +- basilisk/jumblr.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/basilisk/basilisk_MSG.c b/basilisk/basilisk_MSG.c index 64aecc90d..3af06c656 100755 --- a/basilisk/basilisk_MSG.c +++ b/basilisk/basilisk_MSG.c @@ -479,7 +479,7 @@ int32_t basilisk_process_retarray(struct supernet_info *myinfo,void *ptr,int32_t item = jitem(retarray,i); if ( jobj(item,"error") != 0 ) continue; - printf("(%s).%d ",jprint(item,0),i); + //printf("(%s).%d ",jprint(item,0),i); if ( (datalen= basilisk_message_returned(key,data,maxlen,item)) > 0 ) { duration = juint(item,"duration"); diff --git a/basilisk/jumblr.c b/basilisk/jumblr.c index ec3e797dc..a39e7b0a5 100755 --- a/basilisk/jumblr.c +++ b/basilisk/jumblr.c @@ -383,6 +383,7 @@ void jumblr_DEXcheck(struct supernet_info *myinfo,struct iguana_info *coinkmd,ch printf("BTC deposits %.8f, min %.8f\n",btcavail,minbtc); vals = cJSON_CreateObject(); jaddstr(vals,"source","BTC"); + jaddbits256(vals,"srchash",curve25519(privkey,curve25519_basepoint9())); jaddstr(vals,"dest","KMD"); jaddnum(vals,"amount",btcavail*.3); jaddnum(vals,"minprice",kmdprice*.95); @@ -494,6 +495,7 @@ STRING_ARG(jumblr,setpassphrase,passphrase) retjson = cJSON_CreateObject(); jaddstr(retjson,"result","success"); privkey = jumblr_privkey(myinfo,BTCaddr,KMDaddr,JUMBLR_DEPOSITPREFIX); + myinfo->jumblr_depositkey = curve25519(privkey,curve25519_basepoint9()); bitcoin_priv2wif(wifstr,privkey,coin->chain->wiftype); if ( coin->FULLNODE < 0 ) jumblr_importprivkey(myinfo,coin,wifstr); @@ -506,7 +508,8 @@ STRING_ARG(jumblr,setpassphrase,passphrase) jumblr_importprivkey(myinfo,coinbtc,wifstr); jaddnum(retjson,"BTCdeposits",dstr(jumblr_balance(myinfo,coinbtc,BTCaddr))); } - jumblr_privkey(myinfo,BTCaddr,KMDaddr,""); + privkey = jumblr_privkey(myinfo,BTCaddr,KMDaddr,""); + myinfo->jumblr_pubkey = curve25519(privkey,curve25519_basepoint9()); jaddstr(retjson,"KMDjumblr",KMDaddr); jaddstr(retjson,"BTCjumblr",BTCaddr); if ( coinbtc != 0 )