Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added gettokenbalances #60

Merged
merged 2 commits into from
Oct 9, 2020
Merged

Added gettokenbalances #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc03dbf
added gettokenbalances
DeFiDev Oct 8, 2020
8ece2d3
Merge branch 'master' into feature/gettokenbalances
DeFiDev Oct 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
105 changes: 103 additions & 2 deletions src/masternodes/mn_rpc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

//#ifdef ENABLE_WALLET
#include <wallet/coincontrol.h>
#include <wallet/ismine.h>
#include <wallet/rpcwallet.h>
#include <wallet/wallet.h>
//#endif
Expand Down Expand Up @@ -1075,6 +1076,8 @@ UniValue accountToJSON(CScript const& owner, CTokenAmount const& amount, bool ve
}

UniValue listaccounts(const JSONRPCRequest& request) {
CWallet* const pwallet = GetWallet(request);

RPCHelpMan{"listaccounts",
"\nReturns information about all accounts on chain.\n",
{
Expand All @@ -1093,6 +1096,8 @@ UniValue listaccounts(const JSONRPCRequest& request) {
"Flag for verbose list (default = true), otherwise limited objects are listed"},
{"indexed_amounts", RPCArg::Type::BOOL, RPCArg::Optional::OMITTED,
"Format of amounts output (default = false): (true: {tokenid:amount}, false: \"amount@tokenid\")"},
{"is_mine_only", RPCArg::Type::BOOL, RPCArg::Optional::OMITTED,
"Get balances about all accounts belonging to the wallet"},
},
RPCResult{
"{id:{...},...} (array) Json object with accounts information\n"
Expand Down Expand Up @@ -1138,13 +1143,22 @@ UniValue listaccounts(const JSONRPCRequest& request) {
if (request.params.size() > 2) {
indexed_amounts = request.params[2].get_bool();
}
bool isMineOnly = false;
if (request.params.size() > 3) {
isMineOnly = request.params[3].get_bool();
}


UniValue ret(UniValue::VARR);

LOCK(cs_main);
pcustomcsview->ForEachBalance([&](CScript const & owner, CTokenAmount const & balance) {
ret.push_back(accountToJSON(owner, balance, verbose, indexed_amounts));
if (isMineOnly) {
if (IsMine(*pwallet, owner) == ISMINE_SPENDABLE)
ret.push_back(accountToJSON(owner, balance, verbose, indexed_amounts));
} else {
ret.push_back(accountToJSON(owner, balance, verbose, indexed_amounts));
}

limit--;
return limit != 0;
Expand Down Expand Up @@ -1235,6 +1249,92 @@ UniValue getaccount(const JSONRPCRequest& request) {
return ret;
}

UniValue gettokenbalances(const JSONRPCRequest& request) {
CWallet* const pwallet = GetWallet(request);

RPCHelpMan{"gettokenbalances",
"\nReturns the balances of all accounts that belong to the wallet.\n",
{
{"pagination", RPCArg::Type::OBJ, RPCArg::Optional::OMITTED, "",
{
{"start", RPCArg::Type::STR, RPCArg::Optional::OMITTED,
"Optional first key to iterate from, in lexicographical order."
"Typically it's set to last tokenID from previous request."},
{"including_start", RPCArg::Type::BOOL, RPCArg::Optional::OMITTED,
"If true, then iterate including starting position. False by default"},
{"limit", RPCArg::Type::NUM, RPCArg::Optional::OMITTED,
"Maximum number of tokens to return, 100 by default"},
},
},
{"indexed_amounts", RPCArg::Type::BOOL, RPCArg::Optional::OMITTED,
"Format of amounts output (default = false): (true: obj = {tokenid:amount,...}, false: array = [\"amount@tokenid\"...])"},
},
RPCResult{
"{...} (array) Json object with balances information\n"
},
RPCExamples{
HelpExampleCli("gettokenbalances", "")
},
}.Check(request);

// parse pagination
size_t limit = 100;
DCT_ID start = {};
bool including_start = true;
{
if (request.params.size() > 0) {
UniValue paginationObj = request.params[0].get_obj();
if (!paginationObj["limit"].isNull()) {
limit = (size_t) paginationObj["limit"].get_int64();
}
if (!paginationObj["start"].isNull()) {
including_start = false;
start.v = (uint32_t) paginationObj["start"].get_int64();
}
if (!paginationObj["including_start"].isNull()) {
including_start = paginationObj["including_start"].getBool();
}
if (!including_start) {
start.v++;
}
}
if (limit == 0) {
limit = std::numeric_limits<decltype(limit)>::max();
}
}
bool indexed_amounts = false;
if (request.params.size() > 1) {
indexed_amounts = request.params[1].get_bool();
}

UniValue ret(UniValue::VARR);
if (indexed_amounts) {
ret.setObject();
}

LOCK(cs_main);
CBalances totalBalances;
CScript oldOwner;
pcustomcsview->ForEachBalance([&](CScript const & owner, CTokenAmount const & balance) {
if (oldOwner == owner) {
totalBalances.Add(balance);
} else if (IsMine(*pwallet, owner) == ISMINE_SPENDABLE) {
oldOwner = owner;
totalBalances.Add(balance);
}
return true;
}, BalanceKey{});
auto it = totalBalances.balances.find(start);
for (int i = 0; it != totalBalances.balances.end() && i < limit; it++, i++) {
CTokenAmount bal = CTokenAmount{(*it).first, (*it).second};
if (indexed_amounts)
ret.pushKV(bal.nTokenId.ToString(), ValueFromAmount(bal.nValue));
else
ret.push_back(bal.ToString());
}
return ret;
}

UniValue utxostoaccount(const JSONRPCRequest& request) {
CWallet* const pwallet = GetWallet(request);

Expand Down Expand Up @@ -1601,8 +1701,9 @@ static const CRPCCommand commands[] =
{"tokens", "listtokens", &listtokens, {"pagination", "verbose"}},
{"tokens", "gettoken", &gettoken, {"key" }},
{"tokens", "minttokens", &minttokens, {"amounts", "inputs"}},
{"accounts", "listaccounts", &listaccounts, {"pagination", "verbose"}},
{"accounts", "listaccounts", &listaccounts, {"pagination", "verbose", "indexed_amounts", "is_mine_only"}},
{"accounts", "getaccount", &getaccount, {"owner", "pagination", "indexed_amounts"}},
{"accounts", "gettokenbalances", &gettokenbalances, {"pagination", "indexed_amounts"}},
{"accounts", "utxostoaccount", &utxostoaccount, {"amounts", "inputs"}},
{"accounts", "accounttoaccount", &accounttoaccount, {"from", "to", "inputs"}},
{"accounts", "accounttoutxos", &accounttoutxos, {"from", "to", "inputs"}},
Expand Down
4 changes: 4 additions & 0 deletions src/rpc/client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,12 @@ static const CRPCConvertParam vRPCConvertParams[] =
{ "utxostoaccount", 1, "inputs" },
{ "listaccounts", 0, "pagination" },
{ "listaccounts", 1, "verbose" },
{ "listaccounts", 2, "indexed_amounts" },
{ "listaccounts", 3, "is_mine_only" },
{ "getaccount", 1, "pagination" },
{ "getaccount", 2, "indexed_amounts" },
{ "gettokenbalances", 0, "pagination" },
{ "gettokenbalances", 1, "indexed_amounts" },
{ "accounttoaccount", 1, "to" },
{ "accounttoaccount", 2, "inputs" },
{ "accounttoutxos", 1, "to" },
Expand Down
11 changes: 11 additions & 0 deletions test/functional/feature_accounts_n_utxos.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,17 @@ def run_test(self):
assert_equal(self.nodes[0].getaccount(accountGold, {}, True)[idGold], initialGold - 100)
assert_equal(self.nodes[0].getaccount(accountGold, {}, True)[idGold], self.nodes[1].getaccount(accountGold, {}, True)[idGold])

# gettokenbalances
#========================
# check balances about all accounts belonging to the wallet
assert_equal(self.nodes[0].gettokenbalances({}, True)[idGold], initialGold - 100)
assert_equal(self.nodes[0].gettokenbalances({}, True)[idSilver], 100)

# chech work is_mine_only field
list_all_acc = len(self.nodes[0].listaccounts({}, False, True, False))
list_mine_acc = len(self.nodes[0].listaccounts({}, False, True, True))
assert(list_all_acc != list_mine_acc)

# REVERTING:
#========================
print ("Reverting...")
Expand Down