Browse Source

Test

etomic
jl777 8 years ago
parent
commit
b3b7c10ebc
  1. 8
      basilisk/jumblr.c

8
basilisk/jumblr.c

@ -207,7 +207,7 @@ int64_t jumblr_balance(struct supernet_info *myinfo,struct iguana_info *coin,cha
free(retstr); free(retstr);
} }
} }
else if ( (retstr= _dex_getbalance(myinfo,coin->symbol,addr)) != 0 ) else if ( (retstr= dex_getbalance(myinfo,coin,0,0,coin->symbol,addr)) != 0 )
{ {
printf("retstr.(%s)\n",retstr); printf("retstr.(%s)\n",retstr);
if ( (retjson= cJSON_Parse(retstr)) != 0 ) if ( (retjson= cJSON_Parse(retstr)) != 0 )
@ -476,13 +476,15 @@ STRING_ARG(jumblr,setpassphrase,passphrase)
jaddstr(retjson,"result","success"); jaddstr(retjson,"result","success");
privkey = jumblr_privkey(myinfo,BTCaddr,KMDaddr,JUMBLR_DEPOSITPREFIX); privkey = jumblr_privkey(myinfo,BTCaddr,KMDaddr,JUMBLR_DEPOSITPREFIX);
bitcoin_priv2wif(wifstr,privkey,coin->chain->wiftype); bitcoin_priv2wif(wifstr,privkey,coin->chain->wiftype);
jumblr_importprivkey(myinfo,coin,wifstr); if ( coin->FULLNODE < 0 )
jumblr_importprivkey(myinfo,coin,wifstr);
jaddstr(retjson,"KMDdeposit",KMDaddr); jaddstr(retjson,"KMDdeposit",KMDaddr);
jaddstr(retjson,"BTCdeposit",BTCaddr); jaddstr(retjson,"BTCdeposit",BTCaddr);
if ( (coinbtc= iguana_coinfind("BTC")) != 0 ) if ( (coinbtc= iguana_coinfind("BTC")) != 0 )
{ {
bitcoin_priv2wif(wifstr,privkey,coinbtc->chain->wiftype); bitcoin_priv2wif(wifstr,privkey,coinbtc->chain->wiftype);
jumblr_importprivkey(myinfo,coinbtc,wifstr); if ( coinbtc->FULLNODE < 0 )
jumblr_importprivkey(myinfo,coinbtc,wifstr);
jaddnum(retjson,"BTCdeposits",jumblr_balance(myinfo,coinbtc,BTCaddr)); jaddnum(retjson,"BTCdeposits",jumblr_balance(myinfo,coinbtc,BTCaddr));
} }
jumblr_privkey(myinfo,BTCaddr,KMDaddr,""); jumblr_privkey(myinfo,BTCaddr,KMDaddr,"");

Loading…
Cancel
Save