mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-13 12:33:42 +02:00
[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.
This commit is contained in:
Akio Nakamura
Gregory Sanders
parent
7a3c9972d0
commit
a965d44204
3 changed files with 26 additions and 11 deletions
|
|
@ -609,7 +609,7 @@ 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(
|
||||
"getreceivedbyaddress \"address\" ( minconf )\n"
|
||||
"\nReturns the total amount received by the given address in transactions with at least minconf confirmations.\n"
|
||||
|
|
@ -692,7 +692,7 @@ 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(
|
||||
"getreceivedbylabel \"label\" ( minconf )\n"
|
||||
"\nReturns the total amount received by addresses with <label> in transactions with at least [minconf] confirmations.\n"
|
||||
|
|
@ -1285,7 +1285,7 @@ static UniValue ListReceived(CWallet * const pwallet, const UniValue& params, bo
|
|||
|
||||
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");
|
||||
}
|
||||
|
|
@ -1395,7 +1395,7 @@ static UniValue ListReceived(CWallet * const pwallet, const UniValue& params, bo
|
|||
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);
|
||||
|
|
@ -1894,13 +1894,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(
|
||||
"gettransaction \"txid\" ( include_watchonly )\n"
|
||||
"\nGet detailed information about in-wallet transaction <txid>\n"
|
||||
"\nArguments:\n"
|
||||
"1. \"txid\" (string, required) The transaction id\n"
|
||||
"2. \"include_watchonly\" (bool, optional, default=false) Whether to include watch-only addresses in balance calculation and details[]\n"
|
||||
"3. \"assetlabel\" (string, optional) Hex asset id or asset label for balance.\n"
|
||||
"\nResult:\n"
|
||||
"{\n"
|
||||
" \"amount\" : x.xxx, (numeric) The transaction amount in " + CURRENCY_UNIT + "\n"
|
||||
|
|
@ -1952,6 +1953,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()) {
|
||||
|
|
@ -1973,7 +1979,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, ""));
|
||||
|
||||
|
|
@ -6251,12 +6257,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"} },
|
||||
|
|
@ -6269,7 +6275,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, {"dummy","count","skip","include_watchonly"} },
|
||||
|
|
|
|||
|
|
@ -181,6 +181,10 @@ class CTTest (BitcoinTestFramework):
|
|||
|
||||
# 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]))
|
||||
|
|
@ -210,6 +214,7 @@ class CTTest (BitcoinTestFramework):
|
|||
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)
|
||||
|
|
@ -352,6 +357,7 @@ class CTTest (BitcoinTestFramework):
|
|||
# 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
|
||||
|
|
|
|||
|
|
@ -89,7 +89,10 @@ class WalletLabelsTest(BitcoinTestFramework):
|
|||
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)]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue