Skip to content

Commit 506bae3

Browse files
committed
Return all available information via validateaddress
`"validateaddress"` omits some information, even in cases where is it available. The primary motivation is to be able to retrieve redeemScripts, after using `"addmultisigaddress"`, when not all keys are available in the keystore, but the redeemScript actually is. The output of `"validateaddress"` with this commit: Keys not available: ```js validateaddress "n4KWZKx349gdMQGgTnZ8W6WfgSwybkGSK3" { "isvalid": true, "address": "n4KWZKx349gdMQGgTnZ8W6WfgSwybkGSK3", "scriptPubKey": "76a914fa20d564550b105787f7ce3a9ad7fd9a45cd407088ac", "ismine": false, "iswatchonly": false, "isscript": false } ``` ```js validateaddress "2N2g2H7gjA8a11g1yKBgh5VTqndyvbnWpBK" { "isvalid": true, "address": "2N2g2H7gjA8a11g1yKBgh5VTqndyvbnWpBK", "scriptPubKey": "a9146769c19a16c9400b908756e19a4d2afb9e9760e187", "ismine": false, "iswatchonly": false, "isscript": true } ``` After adding the redeemScript: ```js addmultisigaddress 2 '["02537357B156A33306A7A014A3748631C59DF405B56F11BA4AA4A3CE81501AF095","02F1FB200390E7864EF4450C07B15988179A57C3CF3A878F668E1070CB615749FE"]' 2N2g2H7gjA8a11g1yKBgh5VTqndyvbnWpBK validateaddress "2N2g2H7gjA8a11g1yKBgh5VTqndyvbnWpBK" { "isvalid": true, "address": "2N2g2H7gjA8a11g1yKBgh5VTqndyvbnWpBK", "scriptPubKey": "a9146769c19a16c9400b908756e19a4d2afb9e9760e187", "ismine": false, "iswatchonly": false, "isscript": true, "script": "multisig", "hex": "522102537357b156a33306a7a014a3748631c59df405b56f11ba4aa4a3ce81501af0952102f1fb200390e7864ef4450c07b15988179a57c3cf3a878f668e1070cb615749fe52ae", "addresses": [ "n4KWZKx349gdMQGgTnZ8W6WfgSwybkGSK3", "mmSKNtbYYHRrhTLKiok5TuYrGEs4Y2A4k6" ], "sigsrequired": 2, "account": "" } ``` All keys available: ```js validateaddress "n4KWZKx349gdMQGgTnZ8W6WfgSwybkGSK3" { "isvalid": true, "address": "n4KWZKx349gdMQGgTnZ8W6WfgSwybkGSK3", "scriptPubKey": "76a914fa20d564550b105787f7ce3a9ad7fd9a45cd407088ac", "ismine": true, "iswatchonly": false, "isscript": false, "pubkey": "02537357b156a33306a7a014a3748631c59df405b56f11ba4aa4a3ce81501af095", "iscompressed": true, "account": "" } ``` ```js validateaddress "2N2g2H7gjA8a11g1yKBgh5VTqndyvbnWpBK" { "isvalid": true, "address": "2N2g2H7gjA8a11g1yKBgh5VTqndyvbnWpBK", "scriptPubKey": "a9146769c19a16c9400b908756e19a4d2afb9e9760e187", "ismine": true, "iswatchonly": false, "isscript": true, "script": "multisig", "hex": "522102537357b156a33306a7a014a3748631c59df405b56f11ba4aa4a3ce81501af0952102f1fb200390e7864ef4450c07b15988179a57c3cf3a878f668e1070cb615749fe52ae", "addresses": [ "n4KWZKx349gdMQGgTnZ8W6WfgSwybkGSK3", "mmSKNtbYYHRrhTLKiok5TuYrGEs4Y2A4k6" ], "sigsrequired": 2, "account": "" } ```
1 parent defa4fc commit 506bae3

File tree

1 file changed

+6
-15
lines changed

1 file changed

+6
-15
lines changed

src/rpcmisc.cpp

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -109,20 +109,14 @@ UniValue getinfo(const UniValue& params, bool fHelp)
109109
#ifdef ENABLE_WALLET
110110
class DescribeAddressVisitor : public boost::static_visitor<UniValue>
111111
{
112-
private:
113-
isminetype mine;
114-
115112
public:
116-
DescribeAddressVisitor(isminetype mineIn) : mine(mineIn) {}
117-
118113
UniValue operator()(const CNoDestination &dest) const { return UniValue(UniValue::VOBJ); }
119114

120115
UniValue operator()(const CKeyID &keyID) const {
121116
UniValue obj(UniValue::VOBJ);
122117
CPubKey vchPubKey;
123118
obj.push_back(Pair("isscript", false));
124-
if (mine == ISMINE_SPENDABLE) {
125-
pwalletMain->GetPubKey(keyID, vchPubKey);
119+
if (pwalletMain->GetPubKey(keyID, vchPubKey)) {
126120
obj.push_back(Pair("pubkey", HexStr(vchPubKey)));
127121
obj.push_back(Pair("iscompressed", vchPubKey.IsCompressed()));
128122
}
@@ -131,10 +125,9 @@ class DescribeAddressVisitor : public boost::static_visitor<UniValue>
131125

132126
UniValue operator()(const CScriptID &scriptID) const {
133127
UniValue obj(UniValue::VOBJ);
128+
CScript subscript;
134129
obj.push_back(Pair("isscript", true));
135-
if (mine != ISMINE_NO) {
136-
CScript subscript;
137-
pwalletMain->GetCScript(scriptID, subscript);
130+
if (pwalletMain->GetCScript(scriptID, subscript)) {
138131
std::vector<CTxDestination> addresses;
139132
txnouttype whichType;
140133
int nRequired;
@@ -200,11 +193,9 @@ UniValue validateaddress(const UniValue& params, bool fHelp)
200193
#ifdef ENABLE_WALLET
201194
isminetype mine = pwalletMain ? IsMine(*pwalletMain, dest) : ISMINE_NO;
202195
ret.push_back(Pair("ismine", (mine & ISMINE_SPENDABLE) ? true : false));
203-
if (mine != ISMINE_NO) {
204-
ret.push_back(Pair("iswatchonly", (mine & ISMINE_WATCH_ONLY) ? true: false));
205-
UniValue detail = boost::apply_visitor(DescribeAddressVisitor(mine), dest);
206-
ret.pushKVs(detail);
207-
}
196+
ret.push_back(Pair("iswatchonly", (mine & ISMINE_WATCH_ONLY) ? true: false));
197+
UniValue detail = boost::apply_visitor(DescribeAddressVisitor(), dest);
198+
ret.pushKVs(detail);
208199
if (pwalletMain && pwalletMain->mapAddressBook.count(dest))
209200
ret.push_back(Pair("account", pwalletMain->mapAddressBook[dest].name));
210201
#endif

0 commit comments

Comments
 (0)