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

Optionally filter balances by min value in z_getbalances

Browse Source
This commit is contained in:
Duke Leto
2021-04-14 20:15:11 -04:00
parent ab934fd094
commit 07931668cf
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/rpc/client.cpp
View File

@@ -3,7 +3,6 @@
// Copyright (c) 2016-2020 The Hush developers
// Distributed under the GPLv3 software license, see the accompanying
// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
/******************************************************************************
* Copyright © 2014-2019 The SuperNET Developers. *
* *
@@ -22,10 +21,8 @@
#include "rpc/client.h"
#include "rpc/protocol.h"
#include "util.h"
#include <set>
#include <stdint.h>
#include <univalue.h>
using namespace std;
@@ -138,8 +135,6 @@ static const CRPCConvertParam vRPCConvertParams[] =
{ "z_listunspent", 1 },
{ "z_listunspent", 2 },
{ "z_listunspent", 3 },
{ "z_getbalances", 0},
{ "z_getbalances", 1},
{ "z_getbalance", 1},
{ "z_getnotescount", 0},
{ "z_gettotalbalance", 0},

23
src/wallet/rpcwallet.cpp
View File

@@ -3636,7 +3636,7 @@ UniValue z_getbalances(const UniValue& params, bool fHelp, const CPubKey& mypk)
if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue;
if (fHelp || params.size() > 0)
if (fHelp || params.size() > 1)
throw runtime_error(
"z_getbalances\n"
"\nReturns array of addresses with their unspent shielded balances.\n"
@@ -3656,28 +3656,31 @@ UniValue z_getbalances(const UniValue& params, bool fHelp, const CPubKey& mypk)
"\nExamples\n"
+ HelpExampleCli("z_getbalances", "")
+ HelpExampleCli("z_getbalances", "0.01")
+ HelpExampleRpc("z_getbalances", "")
+ HelpExampleRpc("z_getbalances", "0.42069")
);
RPCTypeCheck(params, boost::assign::list_of(UniValue::VNUM));
//RPCTypeCheck(params, boost::assign::list_of(UniValue::VNUM));
LOCK2(cs_main, pwalletMain->cs_wallet);
// ignore amount=0 zaddrs by default
CAmount nMinBal = 1; // puposhis
if (params.size() > 0)
nMinBal = AmountFromValue(params[0]);
std::set<libzcash::PaymentAddress> zaddrs = {};
std::set<libzcash::SaplingPaymentAddress> saplingzaddrs = {};
pwalletMain->GetSaplingPaymentAddresses(saplingzaddrs);
zaddrs.insert(saplingzaddrs.begin(), saplingzaddrs.end());
UniValue results(UniValue::VARR);
int nMinDepth = 1;
int nMaxDepth = 9999999;
std::vector<SaplingNoteEntry> saplingEntries;
pwalletMain->GetFilteredNotes(saplingEntries, zaddrs, nMinDepth);
std::map<std::string, CAmount> mapBalances;
for (auto & entry : saplingEntries) {
auto zaddr = EncodePaymentAddress(entry.address);
CAmount nBalance = CAmount(entry.note.value());
@@ -3698,11 +3701,15 @@ UniValue z_getbalances(const UniValue& params, bool fHelp, const CPubKey& mypk)
return l.first > r.first;
});
UniValue results(UniValue::VARR);
for (auto & entry : vec) {
UniValue obj(UniValue::VOBJ);
obj.push_back(Pair("address", entry.first));
obj.push_back(Pair("balance", (double) entry.second / (uint64_t) 100000000L ));
results.push_back(obj);
auto balance = (double) entry.second / (uint64_t) 100000000L;
obj.push_back(Pair("balance", balance));
if(entry.second >= nMinBal) {
results.push_back(obj);
}
}
return results;