[RPC]Add assetlabel support to some commands

Remain the support of assetlabel parameter that was previously present.

1. sendtoaddress
 Print 'optional' explicitly in the help text.↲
2. getreceivedbyaddress
 Add the 3rd parameter as "assetlabel"
 Print 'optional' explicitly in the help text.↲
3. getreceivedbylabel
 Add the 3rd parameter as "assetlabel"
 Print 'optional' explicitly in the help text.↲
4. getbalance
 Set the name of 4th parameter as "assetlabel".
 Print 'optional' explicitly in the help text.↲
5. listreceivedbyaddress
 Set the name of 5th parameter as "assetlabel".
 Enable assetlabel selection to the result of amounts.
 Print 'optional' explicitly in the help text.↲
6. gettransaction
 Add the 3rd parameter as "assetlabel"

notice) Also getwalletinfo had a parameter to specify "assetlabel".
But no need to add a parameter because the command is a catch-all one.

src/wallet/rpcwallet.cpp

@@ -429,7 +429,7 @@ static UniValue sendtoaddress(const JSONRPCRequest& request)
  " \"UNSET\"\n"
  " \"ECONOMICAL\"\n"
  " \"CONSERVATIVE\""},
- {"assetlabel", RPCArg::Type::STR, RPCArg::Optional::OMITTED, "Hex asset id or asset label for balance."},
+ {"assetlabel", RPCArg::Type::STR, RPCArg::Optional::OMITTED_NAMED_ARG, "Hex asset id or asset label for balance."},
  {"ignoreblindfail", RPCArg::Type::BOOL, /* default */ "true", "Return a transaction even when a blinding attempt fails due to number of blinded inputs/outputs."},
  },
  RPCResult{
@@ -647,14 +647,14 @@ static UniValue getreceivedbyaddress(const JSONRPCRequest& request)
  return NullUniValue;
  }
 
- if (request.fHelp || request.params.size() < 1 || request.params.size() > 2)
+ if (request.fHelp || request.params.size() < 1 || request.params.size() > 3)
  throw std::runtime_error(
  RPCHelpMan{"getreceivedbyaddress",
  "\nReturns the total amount received by the given address in transactions with at least minconf confirmations.\n",
  {
  {"address", RPCArg::Type::STR, RPCArg::Optional::NO, "The bitcoin address for transactions."},
  {"minconf", RPCArg::Type::NUM, /* default */ "1", "Only include transactions confirmed at least this many times."},
- {"assetlabel", RPCArg::Type::STR, RPCArg::Optional::OMITTED, "Hex asset id or asset label for balance."},
+ {"assetlabel", RPCArg::Type::STR, RPCArg::Optional::OMITTED_NAMED_ARG, "Hex asset id or asset label for balance."},
  },
  RPCResult{
  "amount (numeric) The total amount in " + CURRENCY_UNIT + " received at this address.\n"
@@ -735,14 +735,14 @@ static UniValue getreceivedbylabel(const JSONRPCRequest& request)
  return NullUniValue;
  }
 
- if (request.fHelp || request.params.size() < 1 || request.params.size() > 2)
+ if (request.fHelp || request.params.size() < 1 || request.params.size() > 3)
  throw std::runtime_error(
  RPCHelpMan{"getreceivedbylabel",
  "\nReturns the total amount received by addresses with <label> in transactions with at least [minconf] confirmations.\n",
  {
  {"label", RPCArg::Type::STR, RPCArg::Optional::NO, "The selected label, may be the default label using \"\"."},
  {"minconf", RPCArg::Type::NUM, /* default */ "1", "Only include transactions confirmed at least this many times."},
- {"assetlabel", RPCArg::Type::STR, RPCArg::Optional::OMITTED, "Hex asset id or asset label for balance."},
+ {"assetlabel", RPCArg::Type::STR, RPCArg::Optional::OMITTED_NAMED_ARG, "Hex asset id or asset label for balance."},
  },
  RPCResult{
  "amount (numeric) The total amount in " + CURRENCY_UNIT + " received for this label.\n"
@@ -828,7 +828,7 @@ static UniValue getbalance(const JSONRPCRequest& request)
  {"dummy", RPCArg::Type::STR, RPCArg::Optional::OMITTED_NAMED_ARG, "Remains for backward compatibility. Must be excluded or set to \"*\"."},
  {"minconf", RPCArg::Type::NUM, /* default */ "0", "Only include transactions confirmed at least this many times."},
  {"include_watchonly", RPCArg::Type::BOOL, /* default */ "false", "Also include balance in watch-only addresses (see 'importaddress')"},
- {"assetlabel", RPCArg::Type::STR, RPCArg::Optional::OMITTED, "Hex asset id or asset label for balance."},
+ {"assetlabel", RPCArg::Type::STR, RPCArg::Optional::OMITTED_NAMED_ARG, "Hex asset id or asset label for balance."},
  },
  RPCResult{
  "amount (numeric) The total amount in " + CURRENCY_UNIT + " received for this wallet.\n"
@@ -1281,7 +1281,7 @@ static UniValue ListReceived(interfaces::Chain::Lock& locked_chain, CWallet * co
 
  bool has_filtered_address = false;
  CTxDestination filtered_address = CNoDestination();
- if (!by_label && params.size() > 3 && params[3].get_str() != "") {
+ if (!by_label && params[3].isStr() && params[3].get_str() != "") {
  if (!IsValidDestinationString(params[3].get_str())) {
  throw JSONRPCError(RPC_WALLET_ERROR, "address_filter parameter was invalid");
  }
@@ -1391,7 +1391,7 @@ static UniValue ListReceived(interfaces::Chain::Lock& locked_chain, CWallet * co
  if(fIsWatchonly)
  obj.pushKV("involvesWatchonly", true);
  obj.pushKV("address", EncodeDestination(address));
- obj.pushKV("amount", AmountMapToUniv(mapAmount, ""));
+ obj.pushKV("amount", AmountMapToUniv(mapAmount, strasset));
  obj.pushKV("confirmations", (nConf == std::numeric_limits<int>::max() ? 0 : nConf));
  obj.pushKV("label", label);
  UniValue transactions(UniValue::VARR);
@@ -1444,7 +1444,7 @@ static UniValue listreceivedbyaddress(const JSONRPCRequest& request)
  {"include_empty", RPCArg::Type::BOOL, /* default */ "false", "Whether to include addresses that haven't received any payments."},
  {"include_watchonly", RPCArg::Type::BOOL, /* default */ "false", "Whether to include watch-only addresses (see 'importaddress')."},
  {"address_filter", RPCArg::Type::STR, RPCArg::Optional::OMITTED_NAMED_ARG, "If present, only return information on this address."},
- {"assetlabel", RPCArg::Type::STR, RPCArg::Optional::OMITTED, "Hex asset id or asset label for balance."},
+ {"assetlabel", RPCArg::Type::STR, RPCArg::Optional::OMITTED_NAMED_ARG, "Hex asset id or asset label for balance."},
  },
  RPCResult{
  "[\n"
@@ -1918,13 +1918,14 @@ static UniValue gettransaction(const JSONRPCRequest& request)
  return NullUniValue;
  }
 
- if (request.fHelp || request.params.size() < 1 || request.params.size() > 2)
+ if (request.fHelp || request.params.size() < 1 || request.params.size() > 3)
  throw std::runtime_error(
  RPCHelpMan{"gettransaction",
  "\nGet detailed information about in-wallet transaction <txid>\n",
  {
  {"txid", RPCArg::Type::STR, RPCArg::Optional::NO, "The transaction id"},
  {"include_watchonly", RPCArg::Type::BOOL, /* default */ "false", "Whether to include watch-only addresses in balance calculation and details[]"},
+ {"assetlabel", RPCArg::Type::STR, RPCArg::Optional::OMITTED_NAMED_ARG, "Hex asset id or asset label for balance."},
  },
  RPCResult{
  "{\n"
@@ -1983,6 +1984,11 @@ static UniValue gettransaction(const JSONRPCRequest& request)
  if(request.params[1].get_bool())
  filter = filter | ISMINE_WATCH_ONLY;
 
+ std::string asset = "";
+ if (request.params[2].isStr() && !request.params[2].get_str().empty()) {
+ asset = request.params[2].get_str();
+ }
+
  UniValue entry(UniValue::VOBJ);
  auto it = pwallet->mapWallet.find(hash);
  if (it == pwallet->mapWallet.end()) {
@@ -2004,7 +2010,7 @@ static UniValue gettransaction(const JSONRPCRequest& request)
  nFee[::policyAsset] = wtx.IsFromMe(filter) ? total_out - nDebit[::policyAsset] : 0;
  }
 
- entry.pushKV("amount", AmountMapToUniv(nNet - nFee, ""));
+ entry.pushKV("amount", AmountMapToUniv(nNet - nFee, asset));
  if (wtx.IsFromMe(filter))
  entry.pushKV("fee", AmountMapToUniv(nFee, ""));
 
@@ -6545,12 +6551,12 @@ static const CRPCCommand commands[] =
  { "wallet", "encryptwallet", &encryptwallet, {"passphrase"} },
  { "wallet", "getaddressesbylabel", &getaddressesbylabel, {"label"} },
  { "wallet", "getaddressinfo", &getaddressinfo, {"address"} },
- { "wallet", "getbalance", &getbalance, {"dummy","minconf","include_watchonly"} },
+ { "wallet", "getbalance", &getbalance, {"dummy","minconf","include_watchonly","assetlabel"} },
  { "wallet", "getnewaddress", &getnewaddress, {"label","address_type"} },
  { "wallet", "getrawchangeaddress", &getrawchangeaddress, {"address_type"} },
- { "wallet", "getreceivedbyaddress", &getreceivedbyaddress, {"address","minconf"} },
- { "wallet", "getreceivedbylabel", &getreceivedbylabel, {"label","minconf"} },
- { "wallet", "gettransaction", &gettransaction, {"txid","include_watchonly"} },
+ { "wallet", "getreceivedbyaddress", &getreceivedbyaddress, {"address","minconf","assetlabel"} },
+ { "wallet", "getreceivedbylabel", &getreceivedbylabel, {"label","minconf","assetlabel"} },
+ { "wallet", "gettransaction", &gettransaction, {"txid","include_watchonly","assetlabel"} },
  { "wallet", "getunconfirmedbalance", &getunconfirmedbalance, {} },
  { "wallet", "getwalletinfo", &getwalletinfo, {} },
  { "wallet", "importaddress", &importaddress, {"address","label","rescan","p2sh"} },
@@ -6563,7 +6569,7 @@ static const CRPCCommand commands[] =
  { "wallet", "listaddressgroupings", &listaddressgroupings, {} },
  { "wallet", "listlabels", &listlabels, {"purpose"} },
  { "wallet", "listlockunspent", &listlockunspent, {} },
- { "wallet", "listreceivedbyaddress", &listreceivedbyaddress, {"minconf","include_empty","include_watchonly","address_filter"} },
+ { "wallet", "listreceivedbyaddress", &listreceivedbyaddress, {"minconf","include_empty","include_watchonly","address_filter","assetlabel"} },
  { "wallet", "listreceivedbylabel", &listreceivedbylabel, {"minconf","include_empty","include_watchonly"} },
  { "wallet", "listsinceblock", &listsinceblock, {"blockhash","target_confirmations","include_watchonly","include_removed"} },
  { "wallet", "listtransactions", &listtransactions, {"label|dummy","count","skip","include_watchonly"} },

test/functional/feature_confidential_transactions.py

@@ -186,6 +186,10 @@ def run_test(self):
 
  # Check 2's listreceivedbyaddress
  received_by_address = self.nodes[2].listreceivedbyaddress(0, False, False, "", "bitcoin")
+ validate_by_address = [(address2, value1 + value3), (address, value0 + value2)]
+ assert_equal(sorted([(ele['address'], ele['amount']) for ele in received_by_address], key=lambda t: t[0]),
+ sorted(validate_by_address, key = lambda t: t[0]))
+ received_by_address = self.nodes[2].listreceivedbyaddress(0, False, False, "")
  validate_by_address = [(address2, {"bitcoin": value1 + value3}), (address, {"bitcoin": value0 + value2})]
  assert_equal(sorted([(ele['address'], ele['amount']) for ele in received_by_address], key=lambda t: t[0]),
  sorted(validate_by_address, key = lambda t: t[0]))
@@ -215,6 +219,7 @@ def run_test(self):
  assert(found_unblinded)
 
  assert_equal(self.nodes[1].gettransaction(raw_tx_id, True)['amount']["bitcoin"], value3)
+ assert_equal(self.nodes[1].gettransaction(raw_tx_id, True, "bitcoin")['amount'], value3)
  list_unspent = self.nodes[1].listunspent(1, 9999999, [], True, {"asset": "bitcoin"})
  assert_equal(list_unspent[0]['amount']+list_unspent[1]['amount'], value1+value3)
  received_by_address = self.nodes[1].listreceivedbyaddress(1, False, True)
@@ -357,6 +362,7 @@ def run_test(self):
  # Assets balance checking, note that accounts are completely ignored because
  # balance queries with accounts are horrifically broken upstream
  assert_equal(self.nodes[0].getbalance("*", 0, False, "bitcoin"), self.nodes[0].getbalance("*", 0, False, "bitcoin"))
+ assert_equal(self.nodes[0].getbalance("*", 0, False)['bitcoin'], self.nodes[0].getbalance("*", 0, False, "bitcoin"))
  assert_equal(self.nodes[0].getwalletinfo()['balance']['bitcoin'], self.nodes[0].getbalance("*", 0, False, "bitcoin"))
 
  # Send some bitcoin and other assets over as well to fund wallet

test/functional/wallet_labels.py

@@ -90,7 +90,10 @@ def run_test(self):
  for label in labels:
  assert_equal(
  node.getreceivedbyaddress(label.addresses[0])['bitcoin'], amount_to_send)
+ assert_equal(
+ node.getreceivedbyaddress(label.addresses[0], 1, "bitcoin"), amount_to_send)
  assert_equal(node.getreceivedbylabel(label.name)['bitcoin'], amount_to_send)
+ assert_equal(node.getreceivedbylabel(label.name, 1, "bitcoin"), amount_to_send)
 
  for i, label in enumerate(labels):
  to_label = labels[(i + 1) % len(labels)]