Enable pubkey lookup for p2sh-p2wpkh in validateaddress

Github-Pull: bitcoin#8992 Rebased-From: 3d2db70
bitcoinknots · Dec 10, 2016 · 4762f19 · 4762f19
1 parent 41cced2
commit 4762f19
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/src/rpcmisc.cpp b/src/rpcmisc.cpp
@@ -137,6 +137,16 @@ class DescribeAddressVisitor : public boost::static_visitor<Object>
             int nRequired;
             ExtractDestinations(subscript, whichType, addresses, nRequired);
             obj.push_back(Pair("script", GetTxnOutputType(whichType)));
+            if (whichType == TX_WITNESS_V0_KEYHASH) {
+                int witnessversion;
+                std::vector<unsigned char> witnessprogram;
+                subscript.IsWitnessProgram(witnessversion, witnessprogram);
+                CPubKey vchPubKey;
+                if (pwalletMain->GetPubKey(CKeyID(uint160(witnessprogram)), vchPubKey)) {
+                    obj.push_back(Pair("pubkey", HexStr(vchPubKey)));
+                    obj.push_back(Pair("iscompressed", vchPubKey.IsCompressed()));
+                }
+            }
             obj.push_back(Pair("hex", HexStr(subscript.begin(), subscript.end())));
             Array a;
             BOOST_FOREACH(const CTxDestination& addr, addresses)