Import pubkeys when importing p2sh with importmulti

achow101 · achow101 · commit 7bcf2cbbf893 · 2018-08-26T16:06:35.000-04:00
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
@@ -917,6 +917,53 @@ static UniValue ProcessImport(CWallet * const pwallet, const UniValue& data, con
                 pwallet->SetAddressBook(dest, label, "receive");
             }
 
+            // Import public keys
+            for (size_t i = 0; i < pubKeys.size(); ++i) {
+                const std::string& pubkey = pubKeys[i].get_str();
+
+                if (!IsHex(pubkey)) {
+                    throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Pubkey must be a hex string");
+                }
+
+                std::vector<unsigned char> vData(ParseHex(pubkey));
+                CPubKey pubKey(vData.begin(), vData.end());
+
+                if (!pubKey.IsFullyValid()) {
+                    throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Pubkey is not a valid public key");
+                }
+
+                CTxDestination pubkey_dest = pubKey.GetID();
+                CScript pubKeyScript = GetScriptForDestination(pubkey_dest);
+
+                if (::IsMine(*pwallet, pubKeyScript) == ISMINE_SPENDABLE) {
+                    throw JSONRPCError(RPC_WALLET_ERROR, "The wallet already contains the private key for this address or script");
+                }
+
+                pwallet->MarkDirty();
+
+                if (!pwallet->AddWatchOnly(pubKeyScript, timestamp)) {
+                    throw JSONRPCError(RPC_WALLET_ERROR, "Error adding address to wallet");
+                }
+
+                // add to address book or update label
+                if (IsValidDestination(pubkey_dest)) {
+                    pwallet->SetAddressBook(pubkey_dest, label, "receive");
+                }
+
+                // TODO Is this necessary?
+                CScript scriptRawPubKey = GetScriptForRawPubKey(pubKey);
+
+                if (::IsMine(*pwallet, scriptRawPubKey) == ISMINE_SPENDABLE) {
+                    throw JSONRPCError(RPC_WALLET_ERROR, "The wallet already contains the private key for this address or script");
+                }
+
+                pwallet->MarkDirty();
+
+                if (!pwallet->AddWatchOnly(scriptRawPubKey, timestamp)) {
+                    throw JSONRPCError(RPC_WALLET_ERROR, "Error adding address to wallet");
+                }
+            }
+
             // Import private keys.
             if (keys.size()) {
                 for (size_t i = 0; i < keys.size(); i++) {
diff --git a/test/functional/wallet_importmulti.py b/test/functional/wallet_importmulti.py
@@ -446,6 +446,27 @@ def run_test (self):
                 "timestamp": "",
             }])
 
+        # Importing multiple public keys with 2-of-2 p2sh multisig
+        self.log.info("Pubkeys should be available after importing 2-of-2 p2sh multisig with pubkeys")
+        addr1 = self.nodes[1].getnewaddress()
+        addr2 = self.nodes[1].getnewaddress()
+        pub1 = self.nodes[1].getaddressinfo(addr1)['pubkey']
+        pub2 = self.nodes[1].getaddressinfo(addr2)['pubkey']
+        ms = self.nodes[1].createmultisig(2, [pub1, pub2])
+        result = self.nodes[0].importmulti(
+            [{
+                'scriptPubKey' : { 'address' : ms['address']},
+                'redeemscript' : ms['redeemScript'],
+                'pubkeys' : [pub1, pub2],
+                "timestamp": "now",
+            }]
+        )
+        assert result[0]['success']
+        import_pub1 = self.nodes[0].getaddressinfo(addr1)['pubkey']
+        assert_equal(pub1, import_pub1)
+        import_pub2 = self.nodes[0].getaddressinfo(addr2)['pubkey']
+        assert_equal(pub2, import_pub2)
+
 
 if __name__ == '__main__':
     ImportMultiTest ().main ()
