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

test

Browse Source
This commit is contained in:
jl777
2016-11-15 19:30:14 -03:00
parent 7098e8b929
commit da16b12e68
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/rpcmisc.cpp
View File

@@ -39,7 +39,7 @@ using namespace std;
* *
* Or alternatively, create a specific query method for the information. * Or alternatively, create a specific query method for the information.
**/ **/
uint64_t komod_interestsum(); uint64_t komodo_interestsum();
Value getinfo(const Array& params, bool fHelp) Value getinfo(const Array& params, bool fHelp)
{ {
@@ -92,7 +92,7 @@ Value getinfo(const Array& params, bool fHelp)
if (pwalletMain) { if (pwalletMain) {
obj.push_back(Pair("walletversion", pwalletMain->GetVersion())); obj.push_back(Pair("walletversion", pwalletMain->GetVersion()));
obj.push_back(Pair("balance", ValueFromAmount(pwalletMain->GetBalance()))); obj.push_back(Pair("balance", ValueFromAmount(pwalletMain->GetBalance())));
obj.push_back(Pair("interest", ValueFromAmount(komod_interestsum()))); obj.push_back(Pair("interest", ValueFromAmount(komodo_interestsum())));
} }
#endif #endif
obj.push_back(Pair("blocks", (int)chainActive.Height())); obj.push_back(Pair("blocks", (int)chainActive.Height()));

6
src/wallet/rpcwallet.cpp
View File

@@ -2494,7 +2494,7 @@ Value listunspent(const Array& params, bool fHelp)
return results; return results;
} }
uint64_t komod_interestsum() uint64_t komodo_interestsum()
{ {
uint64_t interest,sum = 0; uint64_t interest,sum = 0;
vector<COutput> vecOutputs; vector<COutput> vecOutputs;
@@ -3210,9 +3210,11 @@ Value z_gettotalbalance(const Array& params, bool fHelp)
// so we use our own method to get balance of utxos. // so we use our own method to get balance of utxos.
CAmount nBalance = getBalanceTaddr("", nMinDepth); CAmount nBalance = getBalanceTaddr("", nMinDepth);
CAmount nPrivateBalance = getBalanceZaddr("", nMinDepth); CAmount nPrivateBalance = getBalanceZaddr("", nMinDepth);
CAmount nTotalBalance = nBalance + nPrivateBalance; uint64_t interest = komodo_interestsum();
CAmount nTotalBalance = nBalance + nPrivateBalance + interest;
Object result; Object result;
result.push_back(Pair("transparent", FormatMoney(nBalance, false))); result.push_back(Pair("transparent", FormatMoney(nBalance, false)));
result.push_back(Pair("interest", FormatMoney(interest, false)));
result.push_back(Pair("private", FormatMoney(nPrivateBalance, false))); result.push_back(Pair("private", FormatMoney(nPrivateBalance, false)));
result.push_back(Pair("total", FormatMoney(nTotalBalance, false))); result.push_back(Pair("total", FormatMoney(nTotalBalance, false)));
return result; return result;