From da16b12e6815ce4fdefd676dc51a8980095ff3ab Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 15 Nov 2016 19:30:14 -0300 Subject: [PATCH] test --- src/rpcmisc.cpp | 4 ++-- src/wallet/rpcwallet.cpp | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/rpcmisc.cpp b/src/rpcmisc.cpp index dc4f82074..b2f8aa0b2 100644 --- a/src/rpcmisc.cpp +++ b/src/rpcmisc.cpp @@ -39,7 +39,7 @@ using namespace std; * * 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) { @@ -92,7 +92,7 @@ Value getinfo(const Array& params, bool fHelp) if (pwalletMain) { obj.push_back(Pair("walletversion", pwalletMain->GetVersion())); 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 obj.push_back(Pair("blocks", (int)chainActive.Height())); diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 4854a4807..91638174d 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -2494,7 +2494,7 @@ Value listunspent(const Array& params, bool fHelp) return results; } -uint64_t komod_interestsum() +uint64_t komodo_interestsum() { uint64_t interest,sum = 0; vector vecOutputs; @@ -3210,9 +3210,11 @@ Value z_gettotalbalance(const Array& params, bool fHelp) // so we use our own method to get balance of utxos. CAmount nBalance = getBalanceTaddr("", nMinDepth); CAmount nPrivateBalance = getBalanceZaddr("", nMinDepth); - CAmount nTotalBalance = nBalance + nPrivateBalance; + uint64_t interest = komodo_interestsum(); + CAmount nTotalBalance = nBalance + nPrivateBalance + interest; Object result; 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("total", FormatMoney(nTotalBalance, false))); return result;