diff options
| author | Jonas Schnelli <dev@jonasschnelli.ch> | 2018-02-17 22:26:46 +1100 |
|---|---|---|
| committer | Jonas Schnelli <dev@jonasschnelli.ch> | 2018-02-17 22:27:08 +1100 |
| commit | 8a98dfeebf58b8fc9b7c966ae0f99ad0760d7800 (patch) | |
| tree | 50f3c13cc873959396d00038baa6ee297551d289 /src/rpc/util.h | |
| parent | 294a766eb85068ba6e397702b1aac50dcae8fb37 (diff) | |
| parent | b22cce014852b082d80f1cc35f902b375cba0318 (diff) | |
| download | bitcoin-8a98dfeebf58b8fc9b7c966ae0f99ad0760d7800.tar.xz | |
Merge #10583: [RPC] Split part of validateaddress into getaddressinfo
b22cce014 scripted-diff: validateaddress to getaddressinfo in tests (Andrew Chow)
b98bfc5ed Create getaddressinfo RPC and deprecate parts of validateaddress (Andrew Chow)
1598f3230 [rpc] Move DescribeAddressVisitor to rpc/util (John Newbery)
39633ecd5 [rpc] split wallet and non-wallet parts of DescribeAddressVisitor (John Newbery)
Pull request description:
This PR makes a new RPC command called `getaddressinfo` which relies on the wallet. It contains all of `validateaddress`'s address info stuff. Those parts in `validateaddress` have been marked as deprecated. The tests have been updated to use `getaddressinfo` except the `disablewallet` test which is the only test that actually uses `validateaddress` to validate an address.
Tree-SHA512: ce00ed0f2416200b8de1e0a75e8517c024be0b6153457d302c3879b3491cce28191e7c29aed08ec7d2eeeadc62918f5c43a7cb79cd2e4b6d9291bd83ec31c852
Diffstat (limited to 'src/rpc/util.h')
| -rw-r--r-- | src/rpc/util.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/rpc/util.h b/src/rpc/util.h index 568a4260ba..5380d45a83 100644 --- a/src/rpc/util.h +++ b/src/rpc/util.h @@ -5,6 +5,13 @@ #ifndef BITCOIN_RPC_UTIL_H #define BITCOIN_RPC_UTIL_H +#include <pubkey.h> +#include <script/standard.h> +#include <univalue.h> +#include <utilstrencodings.h> + +#include <boost/variant/static_visitor.hpp> + #include <string> #include <vector> @@ -16,4 +23,6 @@ CPubKey HexToPubKey(const std::string& hex_in); CPubKey AddrToPubKey(CKeyStore* const keystore, const std::string& addr_in); CScript CreateMultisigRedeemscript(const int required, const std::vector<CPubKey>& pubkeys); +UniValue DescribeAddress(const CTxDestination& dest); + #endif // BITCOIN_RPC_UTIL_H |