DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

corrected GetCCaddress call in get TokenBalance

Browse Source
This commit is contained in:
dimxy
2019-01-12 15:30:21 +05:00
parent 0a76f9d897
commit 15c71c69f1
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/wallet/rpcwallet.cpp
View File

@@ -6976,7 +6976,7 @@ UniValue tokenorders(const UniValue& params, bool fHelp)
UniValue tokenbalance(const UniValue& params, bool fHelp) UniValue tokenbalance(const UniValue& params, bool fHelp)
{ {
UniValue result(UniValue::VOBJ); char destaddr[64]; uint256 tokenid; uint64_t balance; std::vector<unsigned char> pubkey; struct CCcontract_info *cp,C; UniValue result(UniValue::VOBJ); uint256 tokenid; uint64_t balance; std::vector<unsigned char> pubkey; struct CCcontract_info *cp,C;
CCerror.clear(); CCerror.clear();
cp = CCinit(&C,EVAL_ASSETS); cp = CCinit(&C,EVAL_ASSETS);
@@ -6992,13 +6992,17 @@ UniValue tokenbalance(const UniValue& params, bool fHelp)
pubkey = ParseHex(params[1].get_str().c_str()); pubkey = ParseHex(params[1].get_str().c_str());
else else
pubkey = Mypubkey(); pubkey = Mypubkey();
result.push_back(Pair("result", "success"));
if (GetCCaddress(cp,destaddr,pubkey2pk(pubkey)) != 0)
result.push_back(Pair("CCaddress",destaddr));
balance = GetTokenBalance(pubkey2pk(pubkey),tokenid); balance = GetTokenBalance(pubkey2pk(pubkey),tokenid);
if (CCerror.empty()) { if (CCerror.empty()) {
char destaddr[64];
result.push_back(Pair("result", "success"));
if (GetCCaddress(cp, destaddr, pubkey2pk(pubkey)) != 0)
result.push_back(Pair("CCaddress", destaddr));
result.push_back(Pair("tokenid", params[0].get_str())); result.push_back(Pair("tokenid", params[0].get_str()));
result.push_back(Pair("balance", (int64_t)balance)); result.push_back(Pair("balance", (int64_t)balance));
} }