@@ -3746,7 +3746,6 @@ UniValue getaddressinfo(const JSONRPCRequest& request)
3746
3746
" hdseedid) and relation to the wallet (ismine, iswatchonly)." },
3747
3747
}},
3748
3748
{RPCResult::Type::BOOL, " iscompressed" , /* optional */ true , " If the pubkey is compressed." },
3749
- {RPCResult::Type::STR, " label" , " DEPRECATED. The label associated with the address. Defaults to \"\" . Replaced by the labels array below." },
3750
3749
{RPCResult::Type::NUM_TIME, " timestamp" , /* optional */ true , " The creation time of the key, if available, expressed in " + UNIX_EPOCH_TIME + " ." },
3751
3750
{RPCResult::Type::STR, " hdkeypath" , /* optional */ true , " The HD keypath, if the key is HD and available." },
3752
3751
{RPCResult::Type::STR_HEX, " hdseedid" , /* optional */ true , " The Hash160 of the HD seed." },
@@ -3801,14 +3800,6 @@ UniValue getaddressinfo(const JSONRPCRequest& request)
3801
3800
UniValue detail = DescribeWalletAddress (pwallet, dest);
3802
3801
ret.pushKVs (detail);
3803
3802
3804
- // DEPRECATED: Return label field if existing. Currently only one label can
3805
- // be associated with an address, so the label should be equivalent to the
3806
- // value of the name key/value pair in the labels array below.
3807
- const auto * address_book_entry = pwallet->FindAddressBookEntry (dest);
3808
- if (pwallet->chain ().rpcEnableDeprecated (" label" ) && address_book_entry) {
3809
- ret.pushKV (" label" , address_book_entry->GetLabel ());
3810
- }
3811
-
3812
3803
ret.pushKV (" ischange" , pwallet->IsChange (scriptPubKey));
3813
3804
3814
3805
ScriptPubKeyMan* spk_man = pwallet->GetScriptPubKeyMan (scriptPubKey);
@@ -3829,6 +3820,7 @@ UniValue getaddressinfo(const JSONRPCRequest& request)
3829
3820
// stable if we allow multiple labels to be associated with an address in
3830
3821
// the future.
3831
3822
UniValue labels (UniValue::VARR);
3823
+ const auto * address_book_entry = pwallet->FindAddressBookEntry (dest);
3832
3824
if (address_book_entry) {
3833
3825
// DEPRECATED: The previous behavior of returning an array containing a
3834
3826
// JSON object of `name` and `purpose` key/value pairs is deprecated.
0 commit comments