[RPC] Split part of validateaddress into getaddressinfo #10583

 195 | -                    ret.push_back(Pair("hdkeypath", it->second.hdKeypath));
 196 | -                    ret.push_back(Pair("hdmasterkeyid", it->second.hdMasterKeyID.GetHex()));
 197 | -                }
 198 | +        try {
 199 | +            ret.pushKVs(getaddressinfo(request));
 200 | +        } catch (UniValue e) {

---

3214 | +{
3215 | +    CWallet * const pwallet = GetWalletForJSONRPCRequest(request);
3216 | +    if (!EnsureWalletIsAvailable(pwallet, request.fHelp))
3217 | +        return NullUniValue;
3218 | +
3219 | +    if (request.fHelp || request.params.size() != 1)

---

3223 | +            "to be in the wallet.\n"
3224 | +            "\nArguments:\n"
3225 | +            "1. \"address\"     (string, required) The bitcoin address to get the information of.\n"
3226 | +            "\nResult:\n"
3227 | +            "{\n"
3228 | +            "  \"address\" : \"address\", (string) The bitcoin address validated\n"

---

3169 | @@ -3169,6 +3170,114 @@ UniValue generate(const JSONRPCRequest& request)
3170 |      return generateBlocks(coinbase_script, num_generate, max_tries, true);
3171 |  }
3172 |  
3173 | +class DescribeAddressVisitor : public boost::static_visitor<UniValue>
3174 | +{
3175 | +public:
3176 | +    CWallet * const pwallet;
3177 | +
3178 | +    DescribeAddressVisitor(CWallet *_pwallet) : pwallet(_pwallet) {}

---

3175 | +public:
3176 | +    CWallet * const pwallet;
3177 | +
3178 | +    DescribeAddressVisitor(CWallet *_pwallet) : pwallet(_pwallet) {}
3179 | +
3180 | +    UniValue operator()(const CNoDestination &dest) const { return UniValue(UniValue::VOBJ); }

---

  82 | +#ifdef ENABLE_WALLET
  83 | +        if (!::vpwallets.empty()) {
  84 | +            ret.pushKVs(getaddressinfo(request));
  85 | +        }
  86 | +#endif
  87 | +        if (ret["address"].isNull()) {

---

3225 | +};
3226 | +
3227 | +UniValue getaddressinfo(const JSONRPCRequest& request)
3228 | +{
3229 | +    CWallet * const pwallet = GetWalletForJSONRPCRequest(request);
3230 | +    if (!EnsureWalletIsAvailable(pwallet, request.fHelp))

---

3272 | +    ret.push_back(Pair("address", currentAddress));
3273 | +
3274 | +    CScript scriptPubKey = GetScriptForDestination(dest);
3275 | +    ret.push_back(Pair("scriptPubKey", HexStr(scriptPubKey.begin(), scriptPubKey.end())));;
3276 | +    
3277 | +    ret.push_back(Pair("isscript", scriptPubKey.IsPayToScriptHash()));

---

3234 | +        throw std::runtime_error(
3235 | +            "getaddressinfo \"address\"\n"
3236 | +            "\nReturn information about the given bitcoin address. Some information requires the address\n"
3237 | +            "to be in the wallet.\n"
3238 | +            "\nArguments:\n"
3239 | +            "1. \"address\"     (string, required) The bitcoin address to get the information of.\n"

---

3237 | +            "to be in the wallet.\n"
3238 | +            "\nArguments:\n"
3239 | +            "1. \"address\"     (string, required) The bitcoin address to get the information of.\n"
3240 | +            "\nResult:\n"
3241 | +            "{\n"
3242 | +            "  \"address\" : \"address\", (string) The bitcoin address validated\n"

---

3252 | +            "      ,...\n"
3253 | +            "    ]\n"
3254 | +            "  \"sigsrequired\" : xxxxx        (numeric, optional) Number of signatures required to spend multisig output\n"
3255 | +            "  \"pubkey\" : \"publickeyhex\",    (string) The hex value of the raw public key\n"
3256 | +            "  \"iscompressed\" : true|false,  (boolean) If the address is compressed\n"
3257 | +            "  \"timestamp\" : timestamp,        (number, optional) The creation time of the key if available in seconds since epoch (Jan 1 1970 GMT)\n"

---

  82 |          throw std::runtime_error(
  83 |              "validateaddress \"address\"\n"
  84 |              "\nReturn information about the given bitcoin address.\n"
  85 | +            "Parts of this command have been deprecated and moved to getaddressinfo\n"
  86 |              "\nArguments:\n"
  87 |              "1. \"address\"     (string, required) The bitcoin address to validate\n"

---

  86 |              "\nArguments:\n"
  87 |              "1. \"address\"     (string, required) The bitcoin address to validate\n"
  88 |              "\nResult:\n"
  89 |              "{\n"
  90 |              "  \"isvalid\" : true|false,       (boolean) If the address is valid or not. If not, this is the only property returned.\n"
  91 |              "  \"address\" : \"address\", (string) The bitcoin address validated\n"

---

 114 | +            "  \"iscompressed\" : true|false,  (boolean) DEPRECATED. If the address is compressed\n"
 115 |              "  \"account\" : \"account\"         (string) DEPRECATED. The account associated with the address, \"\" is the default account\n"
 116 | -            "  \"timestamp\" : timestamp,        (number, optional) The creation time of the key if available in seconds since epoch (Jan 1 1970 GMT)\n"
 117 | -            "  \"hdkeypath\" : \"keypath\"       (string, optional) The HD keypath if the key is HD and available\n"
 118 | -            "  \"hdmasterkeyid\" : \"<hash160>\" (string, optional) The Hash160 of the HD master pubkey\n"
 119 | +            "  \"timestamp\" : timestamp,        (number, optional) DEPRECATED. The creation time of the key if available in seconds since epoch (Jan 1 1970 GMT)\n"

---

  80 |  {
  81 |      if (request.fHelp || request.params.size() != 1)
  82 |          throw std::runtime_error(
  83 |              "validateaddress \"address\"\n"
  84 |              "\nReturn information about the given bitcoin address.\n"
  85 | +            "Parts of this command have been deprecated and moved to getaddressinfo. To have those deprecated\n"

---

 112 | +            ret.pushKVs(getaddressinfo(request));
 113 |          }
 114 |  #endif
 115 | +        if (ret["address"].isNull()) {
 116 | +            std::string currentAddress = EncodeDestination(dest);
 117 | +            ret.push_back(Pair("address", currentAddress));

---

   9 | @@ -10,6 +10,7 @@
  10 |  class CRPCTable;
  11 |  class CWallet;
  12 |  class JSONRPCRequest;
  13 | +class UniValue;

---

3274 | +
3275 | +    CScript scriptPubKey = GetScriptForDestination(dest);
3276 | +    ret.push_back(Pair("scriptPubKey", HexStr(scriptPubKey.begin(), scriptPubKey.end())));;
3277 | +
3278 | +    isminetype mine = pwallet ? IsMine(*pwallet, dest) : ISMINE_NO;
3279 | +    ret.push_back(Pair("ismine", (mine & ISMINE_SPENDABLE) ? true : false));

---

  19 | +        self.log.info("Using -deprecatedrpc=estimatefee bypasses the error")
  20 | +        self.nodes[1].estimatefee(1)
  21 | +
  22 | +        # test validateaddress deprecation
  23 | +        dep_validate_address = self.nodes[0].validateaddress("mnvGjUy3NMj67yJ6gkK5o9e5RS33Z2Vqcu")
  24 | +        assert("ismine" not in dep_validate_address)

---

  17 | +        assert_raises_jsonrpc(-32, 'estimatefee is deprecated', self.nodes[0].estimatefee, 1)
  18 | +
  19 | +        self.log.info("Using -deprecatedrpc=estimatefee bypasses the error")
  20 | +        self.nodes[1].estimatefee(1)
  21 | +
  22 | +        # test validateaddress deprecation

---

  18 | +
  19 | +        self.log.info("Using -deprecatedrpc=estimatefee bypasses the error")
  20 | +        self.nodes[1].estimatefee(1)
  21 | +
  22 | +        # test validateaddress deprecation
  23 | +        dep_validate_address = self.nodes[0].validateaddress("mnvGjUy3NMj67yJ6gkK5o9e5RS33Z2Vqcu")

---

  18 | @@ -19,5 +19,11 @@ def run_test(self):
  19 |          self.log.info("Using -deprecatedrpc=estimatefee bypasses the error")
  20 |          self.nodes[1].estimatefee(1)
  21 |  
  22 | +        # test validateaddress deprecation
  23 | +        dep_validate_address = self.nodes[0].validateaddress("mnvGjUy3NMj67yJ6gkK5o9e5RS33Z2Vqcu")
  24 | +        assert("ismine" not in dep_validate_address)

---

  81 |      if (request.fHelp || request.params.size() != 1)
  82 |          throw std::runtime_error(
  83 |              "validateaddress \"address\"\n"
  84 |              "\nReturn information about the given bitcoin address.\n"
  85 | +            "DEPRECATION WARNING: Parts of this command have been deprecated and moved to getaddressinfo. To have those deprecated\n"
  86 | +            "information shown, start bitcoind with -deprecatedrpc=validateaddress"

---

3270 | +    UniValue ret(UniValue::VOBJ);
3271 | +    CTxDestination dest = DecodeDestination(request.params[0].get_str());
3272 | +
3273 | +    // Make sure the destination is valid
3274 | +    if (!IsValidDestination(dest)) {
3275 | +        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid address");

---

3279 | +    ret.pushKV("address", currentAddress);
3280 | +
3281 | +    CScript scriptPubKey = GetScriptForDestination(dest);
3282 | +    ret.pushKV("scriptPubKey", HexStr(scriptPubKey.begin(), scriptPubKey.end()));
3283 | +
3284 | +    isminetype mine = pwallet ? IsMine(*pwallet, dest) : ISMINE_NO;

---

3226 | +
3227 | +UniValue getaddressinfo(const JSONRPCRequest& request)
3228 | +{
3229 | +    CWallet * const pwallet = GetWalletForJSONRPCRequest(request);
3230 | +    if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) {
3231 | +            return NullUniValue;

---

3215 | +            UniValue a(UniValue::VARR);
3216 | +            for (const CTxDestination& addr : addresses) {
3217 | +                a.push_back(EncodeDestination(addr));
3218 | +            }
3219 | +            obj.push_back(Pair("addresses", a));
3220 | +            if (whichType == TX_MULTISIG)

---

  82 |          throw std::runtime_error(
  83 |              "validateaddress \"address\"\n"
  84 |              "\nReturn information about the given bitcoin address.\n"
  85 | +            "DEPRECATION WARNING: Parts of this command have been deprecated and moved to getaddressinfo. Clients must\n"
  86 | +            "transition to using getaddressinfo to access this information before upgrading to v0.17. To have those deprecated\n"
  87 | +            "information shown, start bitcoind with -deprecatedrpc=validateaddress"

---

3243 | +            "  \"address\" : \"address\",        (string) The bitcoin address validated\n"
3244 | +            "  \"scriptPubKey\" : \"hex\",       (string) The hex encoded scriptPubKey generated by the address\n"
3245 | +            "  \"ismine\" : true|false,        (boolean) If the address is yours or not\n"
3246 | +            "  \"iswatchonly\" : true|false,   (boolean) If the address is watchonly\n"
3247 | +            "  \"isscript\" : true|false,      (boolean) If the key is a script\n"
3248 | +            "  \"script\" : \"type\"             (string, optional) The output script type. Possible types: nonstandard, pubkey, pubkeyhash, scripthash, multisig, nulldata, witness_v0_keyhash, witness_v0_scripthash\n"

---

 132 | -#ifdef ENABLE_WALLET
 133 | -    CWallet * const pwallet = GetWalletForJSONRPCRequest(request);
 134 | -
 135 | -    LOCK2(cs_main, pwallet ? &pwallet->cs_wallet : nullptr);
 136 | -#else
 137 |      LOCK(cs_main);

---

3263 | +            + HelpExampleCli("getaddressinfo", "\"1PSSGeFHDnKNxiEyFrD1wcEaHr9hrQDDWc\"")
3264 | +            + HelpExampleRpc("getaddressinfo", "\"1PSSGeFHDnKNxiEyFrD1wcEaHr9hrQDDWc\"")
3265 | +        );
3266 | +    }
3267 | +
3268 | +    LOCK2(cs_main, pwallet->cs_wallet);

---

  98 | -            "  \"iswatchonly\" : true|false,   (boolean) If the address is watchonly\n"
  99 |              "  \"isscript\" : true|false,      (boolean) If the key is a script\n"
 100 | -            "  \"script\" : \"type\"             (string, optional) The output script type. Possible types: nonstandard, pubkey, pubkeyhash, scripthash, multisig, nulldata, witness_v0_keyhash, witness_v0_scripthash\n"
 101 | -            "  \"hex\" : \"hex\",                (string, optional) The redeemscript for the p2sh address\n"
 102 | -            "  \"addresses\"                   (string, optional) Array of addresses associated with the known redeemscript\n"
 103 | +            "  \"ismine\" : true|false,        (boolean) DEPRECATED. If the address is yours or not\n"

---

 114 | -            "  \"pubkey\" : \"publickeyhex\",    (string) The hex value of the raw public key\n"
 115 | -            "  \"iscompressed\" : true|false,  (boolean) If the address is compressed\n"
 116 | +            "  \"sigsrequired\" : xxxxx        (numeric, optional) DEPRECATED. Number of signatures required to spend multisig output\n"
 117 | +            "  \"pubkey\" : \"publickeyhex\",    (string) DEPRECATED. The hex value of the raw public key\n"
 118 | +            "  \"iscompressed\" : true|false,  (boolean) DEPRECATED. If the address is compressed\n"
 119 |              "  \"account\" : \"account\"         (string) DEPRECATED. The account associated with the address, \"\" is the default account\n"

---

 425 | @@ -426,6 +426,15 @@ def run_test(self):
 426 |  
 427 |          # Verify nothing new in wallet
 428 |          assert_equal(total_txs, len(self.nodes[0].listtransactions("*",99999)))
 429 | +        

---

 147 | +            "  \"ismine\" : true|false,        (boolean) DEPRECATED. If the address is yours or not\n"
 148 | +            "  \"iswatchonly\" : true|false,   (boolean) DEPRECATED. If the address is watchonly\n"
 149 | +            "  \"iswitness\" : true|false,     (boolean) DEPRECATED. If the address is a witness address\n"
 150 | +            "  \"witness_version\" : version   (numeric, optional) DEPRECATED. The version number of the witness program\n"
 151 | +            "  \"witness_program\" : \"hex\"   (string, optional) DEPRECATED. The hex value of the witness program\n"
 152 | +            "  \"isscript\" : true|false,      (boolean) DEPRECATED. If the key is a script\n"

---

3405 | +            "      \"address\"\n"
3406 | +            "      ,...\n"
3407 | +            "    ]\n"
3408 | +            "  \"sigsrequired\" : xxxxx        (numeric, optional) Number of signatures required to spend multisig output\n"
3409 | +            "  \"pubkey\" : \"publickeyhex\",    (string) The hex value of the raw public key\n"
3410 | +            "  \"iscompressed\" : true|false,  (boolean) If the address is compressed\n"

---

 148 | +            "  \"iswatchonly\" : true|false,   (boolean) DEPRECATED. If the address is watchonly\n"
 149 | +            "  \"iswitness\" : true|false,     (boolean) DEPRECATED. If the address is a witness address\n"
 150 | +            "  \"witness_version\" : version   (numeric, optional) DEPRECATED. The version number of the witness program\n"
 151 | +            "  \"witness_program\" : \"hex\"   (string, optional) DEPRECATED. The hex value of the witness program\n"
 152 | +            "  \"isscript\" : true|false,      (boolean) DEPRECATED. If the key is a script\n"
 153 | +            "  \"redeemscript\" : \"type\"       (string, optional) DEPRECATED. The type of the redeemscript. Possible types: nonstandard, pubkey, pubkeyhash, scripthash, multisig, nulldata, witness_v0_keyhash, witness_v0_scripthash\n"

---

 125 |      if (request.fHelp || request.params.size() != 1)
 126 |          throw std::runtime_error(
 127 |              "validateaddress \"address\"\n"
 128 |              "\nReturn information about the given bitcoin address.\n"
 129 | +            "DEPRECATION WARNING: Parts of this command have been deprecated and moved to getaddressinfo. Clients must\n"
 130 | +            "transition to using getaddressinfo to access this information before upgrading to v0.17. To have those deprecated\n"

---

  71 | +    return UniValue(UniValue::VOBJ);
  72 | +}
  73 | +
  74 | +UniValue DescribeAddressVisitor::operator()(const CKeyID &keyID) const {
  75 | +    UniValue obj(UniValue::VOBJ);
  76 | +    CPubKey vchPubKey;

---

  79 | +    return obj;
  80 | +}
  81 | +
  82 | +UniValue DescribeAddressVisitor::operator()(const CScriptID &scriptID) const {
  83 | +    UniValue obj(UniValue::VOBJ);
  84 | +    CScript subscript;

---

  88 | +}
  89 | +
  90 | +UniValue DescribeAddressVisitor::operator()(const WitnessV0KeyHash& id) const
  91 | +{
  92 | +    UniValue obj(UniValue::VOBJ);
  93 | +    CPubKey pubkey;

---

  99 | +}
 100 | +
 101 | +UniValue DescribeAddressVisitor::operator()(const WitnessV0ScriptHash& id) const
 102 | +{
 103 | +    UniValue obj(UniValue::VOBJ);
 104 | +    CScript subscript;

---

 110 | +}
 111 | +
 112 | +UniValue DescribeAddressVisitor::operator()(const WitnessUnknown& id) const
 113 | +{
 114 | +    UniValue obj(UniValue::VOBJ);
 115 | +    CScript subscript;

---

  22 | @@ -16,4 +23,17 @@ CPubKey HexToPubKey(const std::string& hex_in);
  23 |  CPubKey AddrToPubKey(CKeyStore* const keystore, const std::string& addr_in);
  24 |  CScript CreateMultisigRedeemscript(const int required, const std::vector<CPubKey>& pubkeys);
  25 |  
  26 | +class DescribeAddressVisitor : public boost::static_visitor<UniValue>

---

  71 | +    }
  72 | +
  73 | +    UniValue operator()(const WitnessV0ScriptHash& id) const
  74 | +    {
  75 | +        UniValue obj(UniValue::VOBJ);
  76 | +        CScript subscript;

---

  42 | +
  43 | +    UniValue operator()(const CNoDestination &dest) const { return UniValue(UniValue::VOBJ); }
  44 | +
  45 | +    UniValue operator()(const CKeyID &keyID) const {
  46 | +        UniValue obj(UniValue::VOBJ);
  47 | +        CPubKey vchPubKey;

---

  50 | +        return obj;
  51 | +    }
  52 | +
  53 | +    UniValue operator()(const CScriptID &scriptID) const {
  54 | +        UniValue obj(UniValue::VOBJ);
  55 | +        CScript subscript;

---

  60 |  
  61 | -    explicit DescribeAddressVisitor(CWallet *_pwallet) : pwallet(_pwallet) {}
  62 | +    UniValue operator()(const WitnessV0KeyHash& id) const
  63 | +    {
  64 | +        UniValue obj(UniValue::VOBJ);
  65 | +        CPubKey pubkey;

---

  82 | +    }
  83 | +
  84 | +    UniValue operator()(const WitnessUnknown& id) const
  85 | +    {
  86 | +        UniValue obj(UniValue::VOBJ);
  87 | +        CScript subscript;

---

 156 |              "validateaddress \"address\"\n"
 157 |              "\nReturn information about the given bitcoin address.\n"
 158 | +            "DEPRECATION WARNING: Parts of this command have been deprecated and moved to getaddressinfo. Clients must\n"
 159 | +            "transition to using getaddressinfo to access this information before upgrading to v0.18. The following deprecated\n"
 160 | +            "fields have moved to getaddressinfo and will only be shown here with -deprecatedrpc=validateaddress: ismine, iswatchonly,\n"
 161 | +            "script, hex, pubkeys, sigsrequired, pubkey, embedded, iscompressed, account, timestamp, hdkeypath, kdmasterkeyid.\n"

---

3560 | +
3561 | +        // The "addresses" field is confusing because it refers to public keys using their P2PKH address.
3562 | +        // For that reason, only add the 'addresses' field when needed for backward compatibility. New applications
3563 | +        // can use the 'embedded'->'address' field for P2SH or P2WSH wrapped addresses, and 'pubkeys' for
3564 | +        // inspecting multisig participants.
3565 | +        if (IsDeprecatedRPCEnabled("validateaddress")) obj.pushKV("addresses", std::move(a));

---

 121 | +};
 122 | +
 123 | +UniValue DescribeAddress(CTxDestination dest)
 124 | +{
 125 | +    return boost::apply_visitor(DescribeAddressVisitor(), dest);
 126 | +}

---

  81 | +        obj.push_back(Pair("isscript", false));
  82 | +        obj.push_back(Pair("iswitness", false));
  83 | +        return obj;
  84 | +    }
  85 | +
  86 | +    UniValue operator()(const CScriptID &scriptID) const {

---

  70 | +class DescribeAddressVisitor : public boost::static_visitor<UniValue>
  71 | +{
  72 | +public:
  73 | +    explicit DescribeAddressVisitor() {}
  74 | +
  75 | +    UniValue operator()(const CNoDestination &dest) const {

---

 194 | -            "  \"hdkeypath\" : \"keypath\"       (string, optional) The HD keypath if the key is HD and available\n"
 195 | -            "  \"hdmasterkeyid\" : \"<hash160>\" (string, optional) The Hash160 of the HD master pubkey\n"
 196 | +            "  \"isscript\" : true|false,      (boolean) If the key is a script\n"
 197 | +            "  \"iswitness\" : true|false,     (boolean) If the address is a witness address\n"
 198 | +            "  \"witness_version\" : version   (numeric, optional) The version number of the witness program\n"
 199 | +            "  \"witness_program\" : \"hex\"   (string, optional) The hex value of the witness program\n"

---

 333 | @@ -335,6 +334,7 @@ libbitcoin_common_a_SOURCES = \
 334 |    scheduler.cpp \
 335 |    script/sign.cpp \
 336 |    script/standard.cpp \
 337 | +  script/ismine.cpp \

---

 388 | @@ -389,10 +389,10 @@ endif
 389 |  
 390 |  bitcoind_LDADD = \
 391 |    $(LIBBITCOIN_SERVER) \
 392 | +  $(LIBBITCOIN_WALLET) \

---

  22 | @@ -16,4 +23,6 @@ CPubKey HexToPubKey(const std::string& hex_in);
  23 |  CPubKey AddrToPubKey(CKeyStore* const keystore, const std::string& addr_in);
  24 |  CScript CreateMultisigRedeemscript(const int required, const std::vector<CPubKey>& pubkeys);
  25 |  
  26 | +UniValue DescribeAddress(CTxDestination dest);

---

  26 | @@ -27,6 +27,7 @@
  27 |  #include <wallet/feebumper.h>
  28 |  #include <wallet/wallet.h>
  29 |  #include <wallet/walletdb.h>
  30 | +#include <wallet/rpcwallet.h>

---

3515 | @@ -3515,6 +3516,207 @@ UniValue rescanblockchain(const JSONRPCRequest& request)
3516 |      return response;
3517 |  }
3518 |  
3519 | +class DescribeWalletAddressVisitor : public boost::static_visitor<UniValue>
3520 | +{
3521 | +public:
3522 | +    CWallet * const pwallet;

---

  74 | +
  75 | +    UniValue operator()(const CNoDestination &dest) const {
  76 | +        return UniValue(UniValue::VOBJ);
  77 | +    }
  78 | +
  79 | +    UniValue operator()(const CKeyID &keyID) const {

---

3566 | +
3567 | +    explicit DescribeWalletAddressVisitor(CWallet *_pwallet) : pwallet(_pwallet) {}
3568 | +
3569 | +    UniValue operator()(const CNoDestination &dest) const { return UniValue(UniValue::VOBJ); }
3570 | +
3571 | +    UniValue operator()(const CKeyID &keyID) const {

---

3576 | +            obj.pushKV("iscompressed", vchPubKey.IsCompressed());
3577 | +        }
3578 | +        return obj;
3579 | +    }
3580 | +
3581 | +    UniValue operator()(const CScriptID &scriptID) const {

---

  70 | +class DescribeAddressVisitor : public boost::static_visitor<UniValue>
  71 | +{
  72 | +public:
  73 | +    explicit DescribeAddressVisitor() {}
  74 | +
  75 | +    UniValue operator()(const CNoDestination &dest) const 

---

3564 | +        if (include_addresses) obj.pushKV("addresses", std::move(a));
3565 | +    }
3566 | +
3567 | +    explicit DescribeWalletAddressVisitor(CWallet *_pwallet) : pwallet(_pwallet) {}
3568 | +
3569 | +    UniValue operator()(const CNoDestination &dest) const { return UniValue(UniValue::VOBJ); }

---

3687 | +    isminetype mine = IsMine(*pwallet, dest);
3688 | +    ret.pushKV("ismine", bool(mine & ISMINE_SPENDABLE));
3689 | +    ret.pushKV("iswatchonly", bool(mine & ISMINE_WATCH_ONLY));
3690 | +    UniValue detail = DescribeWalletAddress(pwallet, dest);
3691 | +    ret.pushKVs(detail);
3692 | +    if (pwallet->mapAddressBook.count(dest)) {

---

3643 | +            "  \"ismine\" : true|false,        (boolean) If the address is yours or not\n"
3644 | +            "  \"iswatchonly\" : true|false,   (boolean) If the address is watchonly\n"
3645 | +            "  \"isscript\" : true|false,      (boolean) If the key is a script\n"
3646 | +            "  \"iswitness\" : true|false,     (boolean) If the address is a witness address\n"
3647 | +            "  \"witness_version\" : version   (numeric, optional) The version number of the witness program\n"
3648 | +            "  \"witness_program\" : \"hex\"   (string, optional) The hex value of the witness program\n"

---

3644 | +            "  \"iswatchonly\" : true|false,   (boolean) If the address is watchonly\n"
3645 | +            "  \"isscript\" : true|false,      (boolean) If the key is a script\n"
3646 | +            "  \"iswitness\" : true|false,     (boolean) If the address is a witness address\n"
3647 | +            "  \"witness_version\" : version   (numeric, optional) The version number of the witness program\n"
3648 | +            "  \"witness_program\" : \"hex\"   (string, optional) The hex value of the witness program\n"
3649 | +            "  \"script\" : \"type\"       (string, optional) The output script type. Only if \"isscript\" is true and the redeemscript is known. Possible types: nonstandard, pubkey, pubkeyhash, scripthash, multisig, nulldata, witness_v0_keyhash, witness_v0_scripthash, witness_unknown\n"

---

3653 | +            "      \"pubkey\"\n"
3654 | +            "      ,...\n"
3655 | +            "    ]\n"
3656 | +            "  \"sigsrequired\" : xxxxx        (numeric, optional) Number of signatures required to spend multisig output (only if \"script\" is \"multisig\")\n"
3657 | +            "  \"pubkey\" : \"publickeyhex\",    (string, optional) The hex value of the raw public key, for single-key addresses (possibly embedded in P2SH or P2WSH)\n"
3658 | +            "  \"embedded\" : {...},           (object, optional) Information about the address embedded in P2SH or P2WSH, if relevant and known. It includes all getaddressinfo output fields for the embedded address, excluding metadata (\"timestamp\", \"hdkeypath\", \"hdmasterkeyid\") and relation to the wallet (\"ismine\", \"iswatchonly\", \"account\").\n"

---

3562 | +        // can use the 'embedded'->'address' field for P2SH or P2WSH wrapped addresses, and 'pubkeys' for
3563 | +        // inspecting multisig participants.
3564 | +        if (include_addresses) obj.pushKV("addresses", std::move(a));
3565 | +    }
3566 | +
3567 | +    explicit DescribeWalletAddressVisitor(CWallet *_pwallet) : pwallet(_pwallet) {}

---

3613 | +    UniValue operator()(const WitnessUnknown& id) const { return UniValue(UniValue::VOBJ); }
3614 | +};
3615 | +
3616 | +UniValue DescribeWalletAddress(CWallet* pwallet, const CTxDestination& dest)
3617 | +{
3618 | +    UniValue ret(UniValue::VOBJ);

---

3579 | +    }
3580 | +
3581 | +    UniValue operator()(const CScriptID &scriptID) const {
3582 | +        UniValue obj(UniValue::VOBJ);
3583 | +        CScript subscript;
3584 | +        if (pwallet && pwallet->GetCScript(scriptID, subscript)) {

---

3569 | +    UniValue operator()(const CNoDestination &dest) const { return UniValue(UniValue::VOBJ); }
3570 | +
3571 | +    UniValue operator()(const CKeyID &keyID) const {
3572 | +        UniValue obj(UniValue::VOBJ);
3573 | +        CPubKey vchPubKey;
3574 | +        if (pwallet && pwallet->GetPubKey(keyID, vchPubKey)) {

---

3601 | +    {
3602 | +        UniValue obj(UniValue::VOBJ);
3603 | +        CScript subscript;
3604 | +        CRIPEMD160 hasher;
3605 | +        uint160 hash;
3606 | +        hasher.Write(id.begin(), 32).Finalize(hash.begin());

---

3602 | +        UniValue obj(UniValue::VOBJ);
3603 | +        CScript subscript;
3604 | +        CRIPEMD160 hasher;
3605 | +        uint160 hash;
3606 | +        hasher.Write(id.begin(), 32).Finalize(hash.begin());
3607 | +        if (pwallet && pwallet->GetCScript(CScriptID(hash), subscript)) {

---

 253 | -                if (!meta->hdKeypath.empty()) {
 254 | -                    ret.pushKV("hdkeypath", meta->hdKeypath);
 255 | -                    ret.pushKV("hdmasterkeyid", meta->hdMasterKeyID.GetHex());
 256 | -                }
 257 | -            }
 258 | +        if (!::vpwallets.empty() && IsDeprecatedRPCEnabled("validateaddress")) {

---

  75 | +    UniValue operator()(const CNoDestination &dest) const 
  76 | +    {
  77 | +        return UniValue(UniValue::VOBJ);
  78 | +    }
  79 | +
  80 | +    UniValue operator()(const CKeyID &keyID) const

---

  83 | +        obj.pushKV("isscript", false);
  84 | +        obj.pushKV("iswitness", false);
  85 | +        return obj;
  86 | +    }
  87 | +
  88 | +    UniValue operator()(const CScriptID &scriptID) const

---

3589 | +
3590 | +    UniValue operator()(const WitnessV0KeyHash& id) const
3591 | +    {
3592 | +        UniValue obj(UniValue::VOBJ);
3593 | +        CPubKey pubkey;
3594 | +        if (pwallet && pwallet->GetPubKey(CKeyID(id), pubkey)) {

---