Skip to content

Commit 6d00035

Browse files
stevenroosestevenroose
committed
Merge #778: Remove 'bitcoin' from address descriptions
e92ac19 Remove 'bitcoin' from address descriptions (Gregory Sanders) Pull request description: fixes #777 Alternative would be to have the `-chain` name be put there, but honestly seems overkill. Tree-SHA512: a54e95f0755134fc6a1df51962a82957678d777406bda62a3f11359f52b8d72cd8c5199248f764ffbcf888b343737801d4ba19a58181a9b41bd4d3e5db656230
2 parents 45f04d9 + e92ac19 commit 6d00035

File tree

1 file changed

+24
-24
lines changed

1 file changed

+24
-24
lines changed

‎src/wallet/rpcwallet.cpp

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ static UniValue getnewaddress(const JSONRPCRequest& request)
178178
if (request.fHelp || request.params.size() > 2)
179179
throw std::runtime_error(
180180
RPCHelpMan{"getnewaddress",
181-
"\nReturns a new Bitcoin address for receiving payments.\n"
181+
"\nReturns a new address for receiving payments.\n"
182182
"If 'label' is specified, it is added to the address book \n"
183183
"so payments received with the address will be associated with 'label'.\n"
184184
"When the wallet doesn't give blinded addresses by default (-blindedaddresses=0), \n"
@@ -188,7 +188,7 @@ static UniValue getnewaddress(const JSONRPCRequest& request)
188188
{"address_type", RPCArg::Type::STR, /* default */ "set by -addresstype", "The address type to use. Options are \"legacy\", \"p2sh-segwit\", and \"bech32\". Default is set by -addresstype."},
189189
},
190190
RPCResult{
191-
"\"address\" (string) The new bitcoin address\n"
191+
"\"address\" (string) The new address\n"
192192
},
193193
RPCExamples{
194194
HelpExampleCli("getnewaddress", "")
@@ -320,7 +320,7 @@ static UniValue setlabel(const JSONRPCRequest& request)
320320
RPCHelpMan{"setlabel",
321321
"\nSets the label associated with the given address.\n",
322322
{
323-
{"address", RPCArg::Type::STR, RPCArg::Optional::NO, "The bitcoin address to be associated with a label."},
323+
{"address", RPCArg::Type::STR, RPCArg::Optional::NO, "The address to be associated with a label."},
324324
{"label", RPCArg::Type::STR, RPCArg::Optional::NO, "The label to assign to the address."},
325325
},
326326
RPCResults{},
@@ -414,7 +414,7 @@ static UniValue sendtoaddress(const JSONRPCRequest& request)
414414
"\nSend an amount to a given address." +
415415
HelpRequiringPassphrase(pwallet) + "\n",
416416
{
417-
{"address", RPCArg::Type::STR, RPCArg::Optional::NO, "The bitcoin address to send to."},
417+
{"address", RPCArg::Type::STR, RPCArg::Optional::NO, "The address to send to."},
418418
{"amount", RPCArg::Type::AMOUNT, RPCArg::Optional::NO, "The amount in " + CURRENCY_UNIT + " to send. eg 0.1"},
419419
{"comment", RPCArg::Type::STR, RPCArg::Optional::OMITTED_NAMED_ARG, "A comment used to store what the transaction is for.\n"
420420
" This is not part of the transaction, just kept in your wallet."},
@@ -527,7 +527,7 @@ static UniValue listaddressgroupings(const JSONRPCRequest& request)
527527
"[\n"
528528
" [\n"
529529
" [\n"
530-
" \"address\", (string) The bitcoin address\n"
530+
" \"address\", (string) The address\n"
531531
" amount, (numeric) The amount in " + CURRENCY_UNIT + "\n"
532532
" \"label\" (string, optional) The label\n"
533533
" ]\n"
@@ -585,7 +585,7 @@ static UniValue signmessage(const JSONRPCRequest& request)
585585
"\nSign a message with the private key of an address" +
586586
HelpRequiringPassphrase(pwallet) + "\n",
587587
{
588-
{"address", RPCArg::Type::STR, RPCArg::Optional::NO, "The bitcoin address to use for the private key."},
588+
{"address", RPCArg::Type::STR, RPCArg::Optional::NO, "The address to use for the private key."},
589589
{"message", RPCArg::Type::STR, RPCArg::Optional::NO, "The message to create a signature of."},
590590
},
591591
RPCResult{
@@ -652,7 +652,7 @@ static UniValue getreceivedbyaddress(const JSONRPCRequest& request)
652652
RPCHelpMan{"getreceivedbyaddress",
653653
"\nReturns the total amount received by the given address in transactions with at least minconf confirmations.\n",
654654
{
655-
{"address", RPCArg::Type::STR, RPCArg::Optional::NO, "The bitcoin address for transactions."},
655+
{"address", RPCArg::Type::STR, RPCArg::Optional::NO, "The address for transactions."},
656656
{"minconf", RPCArg::Type::NUM, /* default */ "1", "Only include transactions confirmed at least this many times."},
657657
{"assetlabel", RPCArg::Type::STR, RPCArg::Optional::OMITTED_NAMED_ARG, "Hex asset id or asset label for balance."},
658658
},
@@ -920,7 +920,7 @@ static UniValue sendmany(const JSONRPCRequest& request)
920920
{"dummy", RPCArg::Type::STR, RPCArg::Optional::NO, "Must be set to \"\" for backwards compatibility.", "\"\""},
921921
{"amounts", RPCArg::Type::OBJ, RPCArg::Optional::NO, "A json object with addresses and amounts",
922922
{
923-
{"address", RPCArg::Type::AMOUNT, RPCArg::Optional::NO, "The bitcoin address is the key, the numeric amount (can be string) in " + CURRENCY_UNIT + " is the value"},
923+
{"address", RPCArg::Type::AMOUNT, RPCArg::Optional::NO, "The address is the key, the numeric amount (can be string) in " + CURRENCY_UNIT + " is the value"},
924924
},
925925
},
926926
{"minconf", RPCArg::Type::NUM, /* default */ "1", "Only use the balance confirmed at least this many times."},
@@ -1129,9 +1129,9 @@ static UniValue addmultisigaddress(const JSONRPCRequest& request)
11291129
"If 'label' is specified, assign address to that label.\n",
11301130
{
11311131
{"nrequired", RPCArg::Type::NUM, RPCArg::Optional::NO, "The number of required signatures out of the n keys or addresses."},
1132-
{"keys", RPCArg::Type::ARR, RPCArg::Optional::NO, "A json array of bitcoin addresses or hex-encoded public keys",
1132+
{"keys", RPCArg::Type::ARR, RPCArg::Optional::NO, "A json array of addresses or hex-encoded public keys",
11331133
{
1134-
{"key", RPCArg::Type::STR, RPCArg::Optional::OMITTED, "bitcoin address or hex-encoded public key"},
1134+
{"key", RPCArg::Type::STR, RPCArg::Optional::OMITTED, "address or hex-encoded public key"},
11351135
},
11361136
},
11371137
{"label", RPCArg::Type::STR, RPCArg::Optional::OMITTED_NAMED_ARG, "A label to assign the addresses to."},
@@ -1654,7 +1654,7 @@ UniValue listtransactions(const JSONRPCRequest& request)
16541654
RPCResult{
16551655
"[\n"
16561656
" {\n"
1657-
" \"address\":\"address\", (string) The bitcoin address of the transaction.\n"
1657+
" \"address\":\"address\", (string) The address of the transaction.\n"
16581658
" \"category\": (string) The transaction category.\n"
16591659
" \"send\" Transactions sent.\n"
16601660
" \"receive\" Non-coinbase transactions received.\n"
@@ -1789,7 +1789,7 @@ static UniValue listsinceblock(const JSONRPCRequest& request)
17891789
RPCResult{
17901790
"{\n"
17911791
" \"transactions\": [\n"
1792-
" \"address\":\"address\", (string) The bitcoin address of the transaction.\n"
1792+
" \"address\":\"address\", (string) The address of the transaction.\n"
17931793
" \"category\": (string) The transaction category.\n"
17941794
" \"send\" Transactions sent.\n"
17951795
" \"receive\" Non-coinbase transactions received.\n"
@@ -1943,7 +1943,7 @@ static UniValue gettransaction(const JSONRPCRequest& request)
19431943
" may be unknown for unconfirmed transactions not in the mempool\n"
19441944
" \"details\" : [\n"
19451945
" {\n"
1946-
" \"address\" : \"address\", (string) The bitcoin address involved in the transaction\n"
1946+
" \"address\" : \"address\", (string) The address involved in the transaction\n"
19471947
" \"category\" : (string) The transaction category.\n"
19481948
" \"send\" Transactions sent.\n"
19491949
" \"receive\" Non-coinbase transactions received.\n"
@@ -2989,9 +2989,9 @@ static UniValue listunspent(const JSONRPCRequest& request)
29892989
{
29902990
{"minconf", RPCArg::Type::NUM, /* default */ "1", "The minimum confirmations to filter"},
29912991
{"maxconf", RPCArg::Type::NUM, /* default */ "9999999", "The maximum confirmations to filter"},
2992-
{"addresses", RPCArg::Type::ARR, /* default */ "empty array", "A json array of bitcoin addresses to filter",
2992+
{"addresses", RPCArg::Type::ARR, /* default */ "empty array", "A json array of addresses to filter",
29932993
{
2994-
{"address", RPCArg::Type::STR, RPCArg::Optional::OMITTED, "bitcoin address"},
2994+
{"address", RPCArg::Type::STR, RPCArg::Optional::OMITTED, "address"},
29952995
},
29962996
},
29972997
{"include_unsafe", RPCArg::Type::BOOL, /* default */ "true", "Include outputs that are not safe to spend\n"
@@ -3011,7 +3011,7 @@ static UniValue listunspent(const JSONRPCRequest& request)
30113011
" {\n"
30123012
" \"txid\" : \"txid\", (string) the transaction id \n"
30133013
" \"vout\" : n, (numeric) the vout value\n"
3014-
" \"address\" : \"address\", (string) the bitcoin address\n"
3014+
" \"address\" : \"address\", (string) the address\n"
30153015
" \"label\" : \"label\", (string) The associated label, or \"\" for the default label\n"
30163016
" \"scriptPubKey\" : \"key\", (string) the script key\n"
30173017
" \"amount\" : x.xxx, (numeric) the transaction output amount in " + CURRENCY_UNIT + "\n"
@@ -3254,7 +3254,7 @@ void FundTransaction(CWallet* const pwallet, CMutableTransaction& tx, CAmount& f
32543254
// Single destination for default asset (policyAsset).
32553255
CTxDestination dest = DecodeDestination(options["changeAddress"].get_str());
32563256
if (!IsValidDestination(dest)) {
3257-
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "changeAddress must be a valid bitcoin address");
3257+
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "changeAddress must be a valid address");
32583258
}
32593259
destinations[::policyAsset] = dest;
32603260
} else if (options["changeAddress"].isObject()) {
@@ -3270,7 +3270,7 @@ void FundTransaction(CWallet* const pwallet, CMutableTransaction& tx, CAmount& f
32703270

32713271
CTxDestination dest = DecodeDestination(kv.second.get_str());
32723272
if (!IsValidDestination(dest)) {
3273-
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "changeAddress must be a valid bitcoin address");
3273+
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "changeAddress must be a valid address");
32743274
}
32753275

32763276
destinations[asset] = dest;
@@ -3381,7 +3381,7 @@ static UniValue fundrawtransaction(const JSONRPCRequest& request)
33813381
{"hexstring", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "The hex string of the raw transaction"},
33823382
{"options", RPCArg::Type::OBJ, RPCArg::Optional::OMITTED_NAMED_ARG, "for backward compatibility: passing in a true instead of an object will result in {\"includeWatching\":true}",
33833383
{
3384-
{"changeAddress", RPCArg::Type::STR, /* default */ "pool address", "The bitcoin address to receive the change"},
3384+
{"changeAddress", RPCArg::Type::STR, /* default */ "pool address", "The address to receive the change"},
33853385
{"changePosition", RPCArg::Type::NUM, /* default */ "random", "The index of the change output"},
33863386
{"change_type", RPCArg::Type::STR, /* default */ "set by -changetype", "The output type to use. Only valid if changeAddress is not specified. Options are \"legacy\", \"p2sh-segwit\", and \"bech32\"."},
33873387
{"includeWatching", RPCArg::Type::BOOL, /* default */ "false", "Also select inputs which are watch only"},
@@ -4044,14 +4044,14 @@ UniValue getaddressinfo(const JSONRPCRequest& request)
40444044
if (request.fHelp || request.params.size() != 1) {
40454045
throw std::runtime_error(
40464046
RPCHelpMan{"getaddressinfo",
4047-
"\nReturn information about the given bitcoin address. Some information requires the address\n"
4047+
"\nReturn information about the given address. Some information requires the address\n"
40484048
"to be in the wallet.\n",
40494049
{
4050-
{"address", RPCArg::Type::STR, RPCArg::Optional::NO, "The bitcoin address to get the information of."},
4050+
{"address", RPCArg::Type::STR, RPCArg::Optional::NO, "The address to get the information of."},
40514051
},
40524052
RPCResult{
40534053
"{\n"
4054-
" \"address\" : \"address\", (string) The bitcoin address validated\n"
4054+
" \"address\" : \"address\", (string) The address validated\n"
40554055
" \"scriptPubKey\" : \"hex\", (string) The hex-encoded scriptPubKey generated by the address\n"
40564056
" \"ismine\" : true|false, (boolean) If the address is yours or not\n"
40574057
" \"iswatchonly\" : true|false, (boolean) If the address is watchonly\n"
@@ -4605,7 +4605,7 @@ UniValue walletcreatefundedpsbt(const JSONRPCRequest& request)
46054605
{
46064606
{"", RPCArg::Type::OBJ, RPCArg::Optional::OMITTED, "",
46074607
{
4608-
{"address", RPCArg::Type::AMOUNT, RPCArg::Optional::NO, "A key-value pair. The key (string) is the bitcoin address, the value (float or string) is the amount in " + CURRENCY_UNIT + ""},
4608+
{"address", RPCArg::Type::AMOUNT, RPCArg::Optional::NO, "A key-value pair. The key (string) is the address, the value (float or string) is the amount in " + CURRENCY_UNIT + ""},
46094609
},
46104610
},
46114611
{"", RPCArg::Type::OBJ, RPCArg::Optional::OMITTED, "",
@@ -4618,7 +4618,7 @@ UniValue walletcreatefundedpsbt(const JSONRPCRequest& request)
46184618
{"locktime", RPCArg::Type::NUM, /* default */ "0", "Raw locktime. Non-0 value also locktime-activates inputs"},
46194619
{"options", RPCArg::Type::OBJ, RPCArg::Optional::OMITTED_NAMED_ARG, "",
46204620
{
4621-
{"changeAddress", RPCArg::Type::STR_HEX, /* default */ "pool address", "The bitcoin address to receive the change"},
4621+
{"changeAddress", RPCArg::Type::STR_HEX, /* default */ "pool address", "The address to receive the change"},
46224622
{"changePosition", RPCArg::Type::NUM, /* default */ "random", "The index of the change output"},
46234623
{"change_type", RPCArg::Type::STR, /* default */ "set by -changetype", "The output type to use. Only valid if changeAddress is not specified. Options are \"legacy\", \"p2sh-segwit\", and \"bech32\"."},
46244624
{"includeWatching", RPCArg::Type::BOOL, /* default */ "false", "Also select inputs which are watch only"},

0 commit comments

Comments
 (0)