diff --git a/doc/release-notes.md b/doc/release-notes.md
index 99fdb893c3..9ef69854e1 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -1,21 +1,24 @@
 Bitcoin ABC version 0.21.8 is now available from:
 
   <https://download.bitcoinabc.org/0.21.8/>
 
 This release includes the following features and fixes:
 
 Updated RPCs
 ------------
 
 - The `getrawtransaction` RPC no longer checks the unspent UTXO set for
   a transaction. The remaining behaviors are as follows: 1. If a
   blockhash is provided, check the corresponding block. 2. If no
   blockhash is provided, check the mempool. 3. If no blockhash is
   provided but txindex is enabled, also check txindex.
 - `getaddressinfo` now reports `solvable`, a boolean indicating whether
   all information necessary for signing is present in the wallet
   (ignoring private keys).
 - `getaddressinfo`, `listunspent`, and `scantxoutset` have a new output
   field `desc`, an output descriptor that encapsulates all signing information
   and key paths for the address (only available when `solvable` is true for
   `getaddressinfo` and `listunspent`).
+- The `importmulti` RPC will now contain a new per-request `warnings`
+  field with strings that explain when fields are being ignored or
+  inconsistent, if any.
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
index 7ac490b7b9..6cc483d37a 100644
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -1,1626 +1,1715 @@
 // Copyright (c) 2009-2016 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <chain.h>
 #include <config.h>
 #include <core_io.h>
 #include <interfaces/chain.h>
 #include <key_io.h>
 #include <merkleblock.h>
 #include <rpc/server.h>
 #include <rpc/util.h>
 #include <script/script.h>
 #include <script/standard.h>
 #include <sync.h>
 #include <util/system.h>
 #include <util/time.h>
 #include <util/translation.h>
 #include <validation.h>
 #include <wallet/rpcwallet.h>
 #include <wallet/wallet.h>
 
 #include <boost/algorithm/string.hpp>
 
 #include <univalue.h>
 
 #include <cstdint>
 
 static std::string EncodeDumpString(const std::string &str) {
     std::stringstream ret;
     for (const uint8_t c : str) {
         if (c <= 32 || c >= 128 || c == '%') {
             ret << '%' << HexStr(&c, &c + 1);
         } else {
             ret << c;
         }
     }
     return ret.str();
 }
 
 static std::string DecodeDumpString(const std::string &str) {
     std::stringstream ret;
     for (unsigned int pos = 0; pos < str.length(); pos++) {
         uint8_t c = str[pos];
         if (c == '%' && pos + 2 < str.length()) {
             c = (((str[pos + 1] >> 6) * 9 + ((str[pos + 1] - '0') & 15)) << 4) |
                 ((str[pos + 2] >> 6) * 9 + ((str[pos + 2] - '0') & 15));
             pos += 2;
         }
         ret << c;
     }
     return ret.str();
 }
 
 bool GetWalletAddressesForKey(const Config &config, CWallet *const pwallet,
                               const CKeyID &keyid, std::string &strAddr,
                               std::string &strLabel) {
     bool fLabelFound = false;
     CKey key;
     pwallet->GetKey(keyid, key);
     for (const auto &dest : GetAllDestinationsForKey(key.GetPubKey())) {
         if (pwallet->mapAddressBook.count(dest)) {
             if (!strAddr.empty()) {
                 strAddr += ",";
             }
             strAddr += EncodeDestination(dest, config);
             strLabel = EncodeDumpString(pwallet->mapAddressBook[dest].name);
             fLabelFound = true;
         }
     }
     if (!fLabelFound) {
         strAddr = EncodeDestination(
             GetDestinationForKey(key.GetPubKey(),
                                  pwallet->m_default_address_type),
             config);
     }
     return fLabelFound;
 }
 
 static const int64_t TIMESTAMP_MIN = 0;
 
 static void RescanWallet(CWallet &wallet, const WalletRescanReserver &reserver,
                          int64_t time_begin = TIMESTAMP_MIN,
                          bool update = true) {
     int64_t scanned_time = wallet.RescanFromTime(time_begin, reserver, update);
     if (wallet.IsAbortingRescan()) {
         throw JSONRPCError(RPC_MISC_ERROR, "Rescan aborted by user.");
     } else if (scanned_time > time_begin) {
         throw JSONRPCError(RPC_WALLET_ERROR,
                            "Rescan was unable to fully rescan the blockchain. "
                            "Some transactions may be missing.");
     }
 }
 
 UniValue importprivkey(const Config &config, const JSONRPCRequest &request) {
     std::shared_ptr<CWallet> const wallet = GetWalletForJSONRPCRequest(request);
     CWallet *const pwallet = wallet.get();
     if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) {
         return NullUniValue;
     }
 
     if (request.fHelp || request.params.size() < 1 ||
         request.params.size() > 3) {
         throw std::runtime_error(RPCHelpMan{
             "importprivkey",
             "\nAdds a private key (as returned by dumpprivkey) to "
             "your wallet. Requires a new wallet backup.\n"
             "Hint: use importmulti to import more than one private key.\n"
             "\nNote: This call can take minutes to complete if rescan is true, "
             "during that time, other rpc calls\n"
             "may report that the imported key exists but related transactions "
             "are still missing, leading to temporarily incorrect/bogus "
             "balances and unspent outputs until rescan completes.\n",
             {
                 {"privkey", RPCArg::Type::STR, /* opt */ false,
                  /* default_val */ "", "The private key (see dumpprivkey)"},
                 {"label", RPCArg::Type::STR, /* opt */ true,
                  /* default_val */
                  "\"\"", "An optional label"},
                 {"rescan", RPCArg::Type::BOOL, /* opt */ true,
                  /* default_val */ "true",
                  "Rescan the wallet for transactions"},
             },
             RPCResults{},
             RPCExamples{
                 "\nDump a private key\n" +
                 HelpExampleCli("dumpprivkey", "\"myaddress\"") +
                 "\nImport the private key with rescan\n" +
                 HelpExampleCli("importprivkey", "\"mykey\"") +
                 "\nImport using a label and without rescan\n" +
                 HelpExampleCli("importprivkey", "\"mykey\" \"testing\" false") +
                 "\nImport using default blank label and without rescan\n" +
                 HelpExampleCli("importprivkey", "\"mykey\" \"\" false") +
                 "\nAs a JSON-RPC call\n" +
                 HelpExampleRpc("importprivkey",
                                "\"mykey\", \"testing\", false")},
         }
                                      .ToString());
     }
 
     if (pwallet->IsWalletFlagSet(WALLET_FLAG_DISABLE_PRIVATE_KEYS)) {
         throw JSONRPCError(RPC_WALLET_ERROR,
                            "Cannot import private keys to a wallet with "
                            "private keys disabled");
     }
 
     WalletRescanReserver reserver(pwallet);
     bool fRescan = true;
     {
         auto locked_chain = pwallet->chain().lock();
         LOCK(pwallet->cs_wallet);
 
         EnsureWalletIsUnlocked(pwallet);
 
         std::string strSecret = request.params[0].get_str();
         std::string strLabel = "";
         if (!request.params[1].isNull()) {
             strLabel = request.params[1].get_str();
         }
 
         // Whether to perform rescan after import
         if (!request.params[2].isNull()) {
             fRescan = request.params[2].get_bool();
         }
 
         if (fRescan && pwallet->chain().getPruneMode()) {
             throw JSONRPCError(RPC_WALLET_ERROR,
                                "Rescan is disabled in pruned mode");
         }
 
         if (fRescan && !reserver.reserve()) {
             throw JSONRPCError(RPC_WALLET_ERROR,
                                "Wallet is currently rescanning. Abort existing "
                                "rescan or wait.");
         }
 
         CKey key = DecodeSecret(strSecret);
         if (!key.IsValid()) {
             throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY,
                                "Invalid private key encoding");
         }
 
         CPubKey pubkey = key.GetPubKey();
         assert(key.VerifyPubKey(pubkey));
         CKeyID vchAddress = pubkey.GetID();
         {
             pwallet->MarkDirty();
             // We don't know which corresponding address will be used; label
             // them all
             for (const auto &dest : GetAllDestinationsForKey(pubkey)) {
                 pwallet->SetAddressBook(dest, strLabel, "receive");
             }
 
             // Don't throw error in case a key is already there
             if (pwallet->HaveKey(vchAddress)) {
                 return NullUniValue;
             }
 
             pwallet->LearnAllRelatedScripts(pubkey);
 
             // whenever a key is imported, we need to scan the whole chain
             pwallet->UpdateTimeFirstKey(1);
             pwallet->mapKeyMetadata[vchAddress].nCreateTime = 1;
 
             if (!pwallet->AddKeyPubKey(key, pubkey)) {
                 throw JSONRPCError(RPC_WALLET_ERROR,
                                    "Error adding key to wallet");
             }
         }
     }
     if (fRescan) {
         RescanWallet(*pwallet, reserver);
     }
 
     return NullUniValue;
 }
 
 UniValue abortrescan(const Config &config, const JSONRPCRequest &request) {
     std::shared_ptr<CWallet> const wallet = GetWalletForJSONRPCRequest(request);
     CWallet *const pwallet = wallet.get();
     if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) {
         return NullUniValue;
     }
 
     if (request.fHelp || request.params.size() > 0) {
         throw std::runtime_error(RPCHelpMan{
             "abortrescan",
             "\nStops current wallet rescan triggered by "
             "an RPC call, e.g. by an importprivkey call.\n",
             {},
             RPCResults{},
             RPCExamples{"\nImport a private key\n" +
                         HelpExampleCli("importprivkey", "\"mykey\"") +
                         "\nAbort the running wallet rescan\n" +
                         HelpExampleCli("abortrescan", "") +
                         "\nAs a JSON-RPC call\n" +
                         HelpExampleRpc("abortrescan", "")},
         }
                                      .ToString());
     }
 
     if (!pwallet->IsScanning() || pwallet->IsAbortingRescan()) {
         return false;
     }
     pwallet->AbortRescan();
     return true;
 }
 
 static void ImportAddress(CWallet *, const CTxDestination &dest,
                           const std::string &strLabel);
 static void ImportScript(CWallet *const pwallet, const CScript &script,
                          const std::string &strLabel, bool isRedeemScript)
     EXCLUSIVE_LOCKS_REQUIRED(pwallet->cs_wallet) {
     if (!isRedeemScript && ::IsMine(*pwallet, script) == ISMINE_SPENDABLE) {
         throw JSONRPCError(RPC_WALLET_ERROR, "The wallet already contains the "
                                              "private key for this address or "
                                              "script");
     }
 
     pwallet->MarkDirty();
 
     if (!pwallet->HaveWatchOnly(script) &&
         !pwallet->AddWatchOnly(script, 0 /* nCreateTime */)) {
         throw JSONRPCError(RPC_WALLET_ERROR, "Error adding address to wallet");
     }
 
     if (isRedeemScript) {
         const CScriptID id(script);
         if (!pwallet->HaveCScript(id) && !pwallet->AddCScript(script)) {
             throw JSONRPCError(RPC_WALLET_ERROR,
                                "Error adding p2sh redeemScript to wallet");
         }
         ImportAddress(pwallet, id, strLabel);
     } else {
         CTxDestination destination;
         if (ExtractDestination(script, destination)) {
             pwallet->SetAddressBook(destination, strLabel, "receive");
         }
     }
 }
 
 static void ImportAddress(CWallet *const pwallet, const CTxDestination &dest,
                           const std::string &strLabel)
     EXCLUSIVE_LOCKS_REQUIRED(pwallet->cs_wallet) {
     CScript script = GetScriptForDestination(dest);
     ImportScript(pwallet, script, strLabel, false);
     // add to address book or update label
     if (IsValidDestination(dest)) {
         pwallet->SetAddressBook(dest, strLabel, "receive");
     }
 }
 
 UniValue importaddress(const Config &config, const JSONRPCRequest &request) {
     std::shared_ptr<CWallet> const wallet = GetWalletForJSONRPCRequest(request);
     CWallet *const pwallet = wallet.get();
     if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) {
         return NullUniValue;
     }
 
     if (request.fHelp || request.params.size() < 1 ||
         request.params.size() > 4) {
         throw std::runtime_error(RPCHelpMan{
             "importaddress",
             "\nAdds an address or script (in hex) that can be "
             "watched as if it were in your wallet but cannot be "
             "used to spend. Requires a new wallet backup.\n"
             "\nNote: This call can take minutes to complete if rescan is true, "
             "during that time, other rpc calls\n"
             "may report that the imported address exists but related "
             "transactions are still missing, leading to temporarily "
             "incorrect/bogus balances and unspent outputs until rescan "
             "completes.\n"
             "If you have the full public key, you should call importpubkey "
             "instead of this.\n"
             "\nNote: If you import a non-standard raw script in hex form, "
             "outputs sending to it will be treated\n"
             "as change, and not show up in many RPCs.\n",
             {
                 {"address", RPCArg::Type::STR, /* opt */ false,
                  /* default_val */ "",
                  "The Bitcoin address (or hex-encoded script)"},
                 {"label", RPCArg::Type::STR, /* opt */ true,
                  /* default_val */ "\"\"", "An optional label"},
                 {"rescan", RPCArg::Type::BOOL, /* opt */ true,
                  /* default_val */ "true",
                  "Rescan the wallet for transactions"},
                 {"p2sh", RPCArg::Type::BOOL, /* opt */ true,
                  /* default_val */ "false",
                  "Add the P2SH version of the script as well"},
             },
             RPCResults{},
             RPCExamples{"\nImport an address with rescan\n" +
                         HelpExampleCli("importaddress", "\"myaddress\"") +
                         "\nImport using a label without rescan\n" +
                         HelpExampleCli("importaddress",
                                        "\"myaddress\" \"testing\" false") +
                         "\nAs a JSON-RPC call\n" +
                         HelpExampleRpc("importaddress",
                                        "\"myaddress\", \"testing\", false")},
         }
                                      .ToString());
     }
 
     std::string strLabel;
     if (!request.params[1].isNull()) {
         strLabel = request.params[1].get_str();
     }
 
     // Whether to perform rescan after import
     bool fRescan = true;
     if (!request.params[2].isNull()) {
         fRescan = request.params[2].get_bool();
     }
 
     if (fRescan && pwallet->chain().getPruneMode()) {
         throw JSONRPCError(RPC_WALLET_ERROR,
                            "Rescan is disabled in pruned mode");
     }
 
     WalletRescanReserver reserver(pwallet);
     if (fRescan && !reserver.reserve()) {
         throw JSONRPCError(
             RPC_WALLET_ERROR,
             "Wallet is currently rescanning. Abort existing rescan or wait.");
     }
 
     // Whether to import a p2sh version, too
     bool fP2SH = false;
     if (!request.params[3].isNull()) {
         fP2SH = request.params[3].get_bool();
     }
 
     {
         auto locked_chain = pwallet->chain().lock();
         LOCK(pwallet->cs_wallet);
 
         CTxDestination dest = DecodeDestination(request.params[0].get_str(),
                                                 config.GetChainParams());
         if (IsValidDestination(dest)) {
             if (fP2SH) {
                 throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY,
                                    "Cannot use the p2sh flag with an address - "
                                    "use a script instead");
             }
             ImportAddress(pwallet, dest, strLabel);
         } else if (IsHex(request.params[0].get_str())) {
             std::vector<uint8_t> data(ParseHex(request.params[0].get_str()));
             ImportScript(pwallet, CScript(data.begin(), data.end()), strLabel,
                          fP2SH);
         } else {
             throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY,
                                "Invalid Bitcoin address or script");
         }
     }
     if (fRescan) {
         RescanWallet(*pwallet, reserver);
         pwallet->ReacceptWalletTransactions();
     }
 
     return NullUniValue;
 }
 
 UniValue importprunedfunds(const Config &config,
                            const JSONRPCRequest &request) {
     std::shared_ptr<CWallet> const wallet = GetWalletForJSONRPCRequest(request);
     CWallet *const pwallet = wallet.get();
     if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) {
         return NullUniValue;
     }
 
     if (request.fHelp || request.params.size() != 2) {
         throw std::runtime_error(RPCHelpMan{
             "importprunedfunds",
             "\nImports funds without rescan. Corresponding address or script "
             "must previously be included in wallet. Aimed towards pruned "
             "wallets. The end-user is responsible to import additional "
             "transactions that subsequently spend the imported outputs or "
             "rescan after the point in the blockchain the transaction is "
             "included.\n",
             {
                 {"rawtransaction", RPCArg::Type::STR_HEX, /* opt */ false,
                  /* default_val */ "",
                  "A raw transaction in hex funding an already-existing "
                  "address in wallet"},
                 {"txoutproof", RPCArg::Type::STR_HEX, /* opt */ false,
                  /* default_val */ "",
                  "The hex output from gettxoutproof that contains the "
                  "transaction"},
             },
             RPCResults{},
             RPCExamples{""},
         }
                                      .ToString());
     }
 
     CMutableTransaction tx;
     if (!DecodeHexTx(tx, request.params[0].get_str())) {
         throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "TX decode failed");
     }
     uint256 txid = tx.GetId();
     CWalletTx wtx(pwallet, MakeTransactionRef(std::move(tx)));
 
     CDataStream ssMB(ParseHexV(request.params[1], "proof"), SER_NETWORK,
                      PROTOCOL_VERSION);
     CMerkleBlock merkleBlock;
     ssMB >> merkleBlock;
 
     // Search partial merkle tree in proof for our transaction and index in
     // valid block
     std::vector<uint256> vMatch;
     std::vector<size_t> vIndex;
     size_t txnIndex = 0;
     if (merkleBlock.txn.ExtractMatches(vMatch, vIndex) ==
         merkleBlock.header.hashMerkleRoot) {
         auto locked_chain = pwallet->chain().lock();
         if (locked_chain->getBlockHeight(merkleBlock.header.GetHash()) ==
             nullopt) {
             throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY,
                                "Block not found in chain");
         }
 
         std::vector<uint256>::const_iterator it;
         if ((it = std::find(vMatch.begin(), vMatch.end(), txid)) ==
             vMatch.end()) {
             throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY,
                                "Transaction given doesn't exist in proof");
         }
 
         txnIndex = vIndex[it - vMatch.begin()];
     } else {
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY,
                            "Something wrong with merkleblock");
     }
 
     wtx.nIndex = txnIndex;
     wtx.hashBlock = merkleBlock.header.GetHash();
 
     auto locked_chain = pwallet->chain().lock();
     LOCK(pwallet->cs_wallet);
 
     if (pwallet->IsMine(*wtx.tx)) {
         pwallet->AddToWallet(wtx, false);
         return NullUniValue;
     }
 
     throw JSONRPCError(
         RPC_INVALID_ADDRESS_OR_KEY,
         "No addresses in wallet correspond to included transaction");
 }
 
 UniValue removeprunedfunds(const Config &config,
                            const JSONRPCRequest &request) {
     std::shared_ptr<CWallet> const wallet = GetWalletForJSONRPCRequest(request);
     CWallet *const pwallet = wallet.get();
     if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) {
         return NullUniValue;
     }
 
     if (request.fHelp || request.params.size() != 1) {
         throw std::runtime_error(RPCHelpMan{
             "removeprunedfunds",
             "\nDeletes the specified transaction from the wallet. Meant "
             "for use with pruned wallets and as a companion to "
             "importprunedfunds. This will affect wallet balances.\n",
             {
                 {"txid", RPCArg::Type::STR_HEX, /* opt */ false,
                  /* default_val */ "",
                  "The hex-encoded id of the transaction you are deleting"},
             },
             RPCResults{},
             RPCExamples{
                 HelpExampleCli("removeprunedfunds",
                                "\"a8d0c0184dde994a09ec054286f1"
                                "ce581bebf46446a512166eae762873"
                                "4ea0a5\"") +
                 "\nAs a JSON-RPC call\n" +
                 HelpExampleRpc(
                     "removeprunedfunds",
                     "\"a8d0c0184dde994a09ec054286f1ce581bebf46446a512166"
                     "eae7628734ea0a5\"")},
         }
                                      .ToString());
     }
 
     auto locked_chain = pwallet->chain().lock();
     LOCK(pwallet->cs_wallet);
 
     TxId txid(ParseHashV(request.params[0], "txid"));
     std::vector<TxId> txIds;
     txIds.push_back(txid);
     std::vector<TxId> txIdsOut;
 
     if (pwallet->ZapSelectTx(txIds, txIdsOut) != DBErrors::LOAD_OK) {
         throw JSONRPCError(RPC_WALLET_ERROR,
                            "Could not properly delete the transaction.");
     }
 
     if (txIdsOut.empty()) {
         throw JSONRPCError(RPC_INVALID_PARAMETER,
                            "Transaction does not exist in wallet.");
     }
 
     return NullUniValue;
 }
 
 UniValue importpubkey(const Config &config, const JSONRPCRequest &request) {
     std::shared_ptr<CWallet> const wallet = GetWalletForJSONRPCRequest(request);
     CWallet *const pwallet = wallet.get();
     if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) {
         return NullUniValue;
     }
 
     if (request.fHelp || request.params.size() < 1 ||
         request.params.size() > 4) {
         throw std::runtime_error(RPCHelpMan{
             "importpubkey",
             "\nAdds a public key (in hex) that can be watched as if "
             "it were in your wallet but cannot be used to spend. "
             "Requires a new wallet backup.\n"
             "\nNote: This call can take minutes to complete if rescan is true, "
             "during that time, other rpc calls\n"
             "may report that the imported pubkey exists but related "
             "transactions are still missing, leading to temporarily "
             "incorrect/bogus balances and unspent outputs until rescan "
             "completes.\n",
             {
                 {"pubkey", RPCArg::Type::STR, /* opt */ false,
                  /* default_val */ "", "The hex-encoded public key"},
                 {"label", RPCArg::Type::STR, /* opt */ true,
                  /* default_val */ "\"\"", "An optional label"},
                 {"rescan", RPCArg::Type::BOOL, /* opt */ true,
                  /* default_val */ "true",
                  "Rescan the wallet for transactions"},
             },
             RPCResults{},
             RPCExamples{"\nImport a public key with rescan\n" +
                         HelpExampleCli("importpubkey", "\"mypubkey\"") +
                         "\nImport using a label without rescan\n" +
                         HelpExampleCli("importpubkey",
                                        "\"mypubkey\" \"testing\" false") +
                         "\nAs a JSON-RPC call\n" +
                         HelpExampleRpc("importpubkey",
                                        "\"mypubkey\", \"testing\", false")},
         }
                                      .ToString());
     }
 
     std::string strLabel;
     if (!request.params[1].isNull()) {
         strLabel = request.params[1].get_str();
     }
 
     // Whether to perform rescan after import
     bool fRescan = true;
     if (!request.params[2].isNull()) {
         fRescan = request.params[2].get_bool();
     }
 
     if (fRescan && pwallet->chain().getPruneMode()) {
         throw JSONRPCError(RPC_WALLET_ERROR,
                            "Rescan is disabled in pruned mode");
     }
 
     WalletRescanReserver reserver(pwallet);
     if (fRescan && !reserver.reserve()) {
         throw JSONRPCError(
             RPC_WALLET_ERROR,
             "Wallet is currently rescanning. Abort existing rescan or wait.");
     }
 
     if (!IsHex(request.params[0].get_str())) {
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY,
                            "Pubkey must be a hex string");
     }
     std::vector<uint8_t> data(ParseHex(request.params[0].get_str()));
     CPubKey pubKey(data.begin(), data.end());
     if (!pubKey.IsFullyValid()) {
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY,
                            "Pubkey is not a valid public key");
     }
 
     {
         auto locked_chain = pwallet->chain().lock();
         LOCK(pwallet->cs_wallet);
 
         for (const auto &dest : GetAllDestinationsForKey(pubKey)) {
             ImportAddress(pwallet, dest, strLabel);
         }
         ImportScript(pwallet, GetScriptForRawPubKey(pubKey), strLabel, false);
         pwallet->LearnAllRelatedScripts(pubKey);
     }
     if (fRescan) {
         RescanWallet(*pwallet, reserver);
         pwallet->ReacceptWalletTransactions();
     }
 
     return NullUniValue;
 }
 
 UniValue importwallet(const Config &config, const JSONRPCRequest &request) {
     std::shared_ptr<CWallet> const wallet = GetWalletForJSONRPCRequest(request);
     CWallet *const pwallet = wallet.get();
     if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) {
         return NullUniValue;
     }
 
     if (request.fHelp || request.params.size() != 1) {
         throw std::runtime_error(RPCHelpMan{
             "importwallet",
             "\nImports keys from a wallet dump file (see dumpwallet). "
             "Requires a new wallet backup to include imported keys.\n",
             {
                 {"filename", RPCArg::Type::STR, /* opt */ false,
                  /* default_val */ "", "The wallet file"},
             },
             RPCResults{},
             RPCExamples{"\nDump the wallet\n" +
                         HelpExampleCli("dumpwallet", "\"test\"") +
                         "\nImport the wallet\n" +
                         HelpExampleCli("importwallet", "\"test\"") +
                         "\nImport using the json rpc call\n" +
                         HelpExampleRpc("importwallet", "\"test\"")},
         }
                                      .ToString());
     }
 
     if (pwallet->chain().getPruneMode()) {
         throw JSONRPCError(RPC_WALLET_ERROR,
                            "Importing wallets is disabled in pruned mode");
     }
 
     WalletRescanReserver reserver(pwallet);
     if (!reserver.reserve()) {
         throw JSONRPCError(
             RPC_WALLET_ERROR,
             "Wallet is currently rescanning. Abort existing rescan or wait.");
     }
 
     int64_t nTimeBegin = 0;
     bool fGood = true;
     {
         auto locked_chain = pwallet->chain().lock();
         LOCK(pwallet->cs_wallet);
 
         EnsureWalletIsUnlocked(pwallet);
 
         fsbridge::ifstream file;
         file.open(request.params[0].get_str(), std::ios::in | std::ios::ate);
         if (!file.is_open()) {
             throw JSONRPCError(RPC_INVALID_PARAMETER,
                                "Cannot open wallet dump file");
         }
         Optional<int> tip_height = locked_chain->getHeight();
         nTimeBegin = tip_height ? locked_chain->getBlockTime(*tip_height) : 0;
 
         int64_t nFilesize = std::max<int64_t>(1, file.tellg());
         file.seekg(0, file.beg);
 
         // Use uiInterface.ShowProgress instead of pwallet.ShowProgress because
         // pwallet.ShowProgress has a cancel button tied to AbortRescan which we
         // don't want for this progress bar showing the import progress.
         // uiInterface.ShowProgress does not have a cancel button.
 
         // show progress dialog in GUI
         pwallet->chain().showProgress(
             strprintf("%s " + _("Importing...").translated,
                       pwallet->GetDisplayName()),
             0, false);
         std::vector<std::tuple<CKey, int64_t, bool, std::string>> keys;
         std::vector<std::pair<CScript, int64_t>> scripts;
         while (file.good()) {
             pwallet->chain().showProgress(
                 "",
                 std::max(1, std::min<int>(50, 100 * double(file.tellg()) /
                                                   double(nFilesize))),
                 false);
             std::string line;
             std::getline(file, line);
             if (line.empty() || line[0] == '#') {
                 continue;
             }
 
             std::vector<std::string> vstr;
             boost::split(vstr, line, boost::is_any_of(" "));
             if (vstr.size() < 2) {
                 continue;
             }
             CKey key = DecodeSecret(vstr[0]);
             if (key.IsValid()) {
                 int64_t nTime = ParseISO8601DateTime(vstr[1]);
                 std::string strLabel;
                 bool fLabel = true;
                 for (size_t nStr = 2; nStr < vstr.size(); nStr++) {
                     if (vstr[nStr].front() == '#') {
                         break;
                     }
                     if (vstr[nStr] == "change=1") {
                         fLabel = false;
                     }
                     if (vstr[nStr] == "reserve=1") {
                         fLabel = false;
                     }
                     if (vstr[nStr].substr(0, 6) == "label=") {
                         strLabel = DecodeDumpString(vstr[nStr].substr(6));
                         fLabel = true;
                     }
                 }
                 keys.push_back(std::make_tuple(key, nTime, fLabel, strLabel));
             } else if (IsHex(vstr[0])) {
                 std::vector<uint8_t> vData(ParseHex(vstr[0]));
                 CScript script = CScript(vData.begin(), vData.end());
                 int64_t birth_time = ParseISO8601DateTime(vstr[1]);
                 scripts.push_back(
                     std::pair<CScript, int64_t>(script, birth_time));
             }
         }
         file.close();
         // We now know whether we are importing private keys, so we can error if
         // private keys are disabled
         if (keys.size() > 0 &&
             pwallet->IsWalletFlagSet(WALLET_FLAG_DISABLE_PRIVATE_KEYS)) {
             // hide progress dialog in GUI
             pwallet->chain().showProgress("", 100, false);
             throw JSONRPCError(
                 RPC_WALLET_ERROR,
                 "Importing wallets is disabled when private keys are disabled");
         }
         double total = double(keys.size() + scripts.size());
         double progress = 0;
         for (const auto &key_tuple : keys) {
             pwallet->chain().showProgress(
                 "",
                 std::max(50, std::min<int>(75, 100 * progress / total) + 50),
                 false);
             const CKey &key = std::get<0>(key_tuple);
             int64_t time = std::get<1>(key_tuple);
             bool has_label = std::get<2>(key_tuple);
             std::string label = std::get<3>(key_tuple);
 
             CPubKey pubkey = key.GetPubKey();
             assert(key.VerifyPubKey(pubkey));
             CKeyID keyid = pubkey.GetID();
             if (pwallet->HaveKey(keyid)) {
                 pwallet->WalletLogPrintf(
                     "Skipping import of %s (key already present)\n",
                     EncodeDestination(keyid, config));
                 continue;
             }
             pwallet->WalletLogPrintf("Importing %s...\n",
                                      EncodeDestination(keyid, config));
             if (!pwallet->AddKeyPubKey(key, pubkey)) {
                 fGood = false;
                 continue;
             }
             pwallet->mapKeyMetadata[keyid].nCreateTime = time;
             if (has_label) {
                 pwallet->SetAddressBook(keyid, label, "receive");
             }
             nTimeBegin = std::min(nTimeBegin, time);
             progress++;
         }
         for (const auto &script_pair : scripts) {
             pwallet->chain().showProgress(
                 "",
                 std::max(50, std::min<int>(75, 100 * progress / total) + 50),
                 false);
             const CScript &script = script_pair.first;
             int64_t time = script_pair.second;
             CScriptID id(script);
             if (pwallet->HaveCScript(id)) {
                 pwallet->WalletLogPrintf(
                     "Skipping import of %s (script already present)\n",
                     HexStr(script));
                 continue;
             }
             if (!pwallet->AddCScript(script)) {
                 pwallet->WalletLogPrintf("Error importing script %s\n",
                                          HexStr(script));
                 fGood = false;
                 continue;
             }
             if (time > 0) {
                 pwallet->m_script_metadata[id].nCreateTime = time;
                 nTimeBegin = std::min(nTimeBegin, time);
             }
             progress++;
         }
         // hide progress dialog in GUI
         pwallet->chain().showProgress("", 100, false);
         pwallet->UpdateTimeFirstKey(nTimeBegin);
     }
     // hide progress dialog in GUI
     pwallet->chain().showProgress("", 100, false);
     RescanWallet(*pwallet, reserver, nTimeBegin, false /* update */);
     pwallet->MarkDirty();
 
     if (!fGood) {
         throw JSONRPCError(RPC_WALLET_ERROR,
                            "Error adding some keys/scripts to wallet");
     }
 
     return NullUniValue;
 }
 
 UniValue dumpprivkey(const Config &config, const JSONRPCRequest &request) {
     std::shared_ptr<CWallet> const wallet = GetWalletForJSONRPCRequest(request);
     CWallet *const pwallet = wallet.get();
     if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) {
         return NullUniValue;
     }
 
     if (request.fHelp || request.params.size() != 1) {
         throw std::runtime_error(RPCHelpMan{
             "dumpprivkey",
             "\nReveals the private key corresponding to 'address'.\n"
             "Then the importprivkey can be used with this output\n",
             {
                 {"address", RPCArg::Type::STR, /* opt */ false,
                  /* default_val */ "",
                  "The bitcoin address for the private key"},
             },
             RPCResult{"\"key\"                (string) The private key\n"},
             RPCExamples{HelpExampleCli("dumpprivkey", "\"myaddress\"") +
                         HelpExampleCli("importprivkey", "\"mykey\"") +
                         HelpExampleRpc("dumpprivkey", "\"myaddress\"")},
         }
                                      .ToString());
     }
 
     auto locked_chain = pwallet->chain().lock();
     LOCK(pwallet->cs_wallet);
 
     EnsureWalletIsUnlocked(pwallet);
 
     std::string strAddress = request.params[0].get_str();
     CTxDestination dest =
         DecodeDestination(strAddress, config.GetChainParams());
     if (!IsValidDestination(dest)) {
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY,
                            "Invalid Bitcoin address");
     }
     auto keyid = GetKeyForDestination(*pwallet, dest);
     if (keyid.IsNull()) {
         throw JSONRPCError(RPC_TYPE_ERROR, "Address does not refer to a key");
     }
     CKey vchSecret;
     if (!pwallet->GetKey(keyid, vchSecret)) {
         throw JSONRPCError(RPC_WALLET_ERROR, "Private key for address " +
                                                  strAddress + " is not known");
     }
     return EncodeSecret(vchSecret);
 }
 
 UniValue dumpwallet(const Config &config, const JSONRPCRequest &request) {
     std::shared_ptr<CWallet> const wallet = GetWalletForJSONRPCRequest(request);
     CWallet *const pwallet = wallet.get();
     if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) {
         return NullUniValue;
     }
 
     if (request.fHelp || request.params.size() != 1) {
         throw std::runtime_error(RPCHelpMan{
             "dumpwallet",
             "\nDumps all wallet keys in a human-readable format to "
             "a server-side file. This does not allow overwriting "
             "existing files.\n"
             "Imported scripts are included in the dumpsfile, but "
             "corresponding addresses may not be added automatically "
             "by importwallet.\n"
             "Note that if your wallet contains keys which are not "
             "derived from your HD seed (e.g. imported keys), these "
             "are not covered by\n"
             "only backing up the seed itself, and must be backed up "
             "too (e.g. ensure you back up the whole dumpfile).\n",
             {
                 {"filename", RPCArg::Type::STR, /* opt */ false,
                  /* default_val */ "",
                  "The filename with path (either absolute or relative to "
                  "bitcoind)"},
             },
             RPCResult{
                 "{                           (json object)\n"
                 "  \"filename\" : {        (string) The filename with full "
                 "absolute path\n"
                 "}\n"},
             RPCExamples{HelpExampleCli("dumpwallet", "\"test\"") +
                         HelpExampleRpc("dumpwallet", "\"test\"")},
         }
                                      .ToString());
     }
 
     auto locked_chain = pwallet->chain().lock();
     LOCK(pwallet->cs_wallet);
 
     EnsureWalletIsUnlocked(pwallet);
 
     fs::path filepath = request.params[0].get_str();
     filepath = fs::absolute(filepath);
 
     /**
      * Prevent arbitrary files from being overwritten. There have been reports
      * that users have overwritten wallet files this way:
      * https://github.com/bitcoin/bitcoin/issues/9934
      * It may also avoid other security issues.
      */
     if (fs::exists(filepath)) {
         throw JSONRPCError(RPC_INVALID_PARAMETER,
                            filepath.string() + " already exists. If you are "
                                                "sure this is what you want, "
                                                "move it out of the way first");
     }
 
     fsbridge::ofstream file;
     file.open(filepath);
     if (!file.is_open()) {
         throw JSONRPCError(RPC_INVALID_PARAMETER,
                            "Cannot open wallet dump file");
     }
 
     std::map<CTxDestination, int64_t> mapKeyBirth;
     const std::map<CKeyID, int64_t> &mapKeyPool = pwallet->GetAllReserveKeys();
     pwallet->GetKeyBirthTimes(*locked_chain, mapKeyBirth);
 
     std::set<CScriptID> scripts = pwallet->GetCScripts();
     // TODO: include scripts in GetKeyBirthTimes() output instead of separate
 
     // sort time/key pairs
     std::vector<std::pair<int64_t, CKeyID>> vKeyBirth;
     for (const auto &entry : mapKeyBirth) {
         if (const CKeyID *keyID = boost::get<CKeyID>(&entry.first)) {
             // set and test
             vKeyBirth.push_back(std::make_pair(entry.second, *keyID));
         }
     }
     mapKeyBirth.clear();
     std::sort(vKeyBirth.begin(), vKeyBirth.end());
 
     // produce output
     file << strprintf("# Wallet dump created by Bitcoin %s\n", CLIENT_BUILD);
     file << strprintf("# * Created on %s\n", FormatISO8601DateTime(GetTime()));
     const Optional<int> tip_height = locked_chain->getHeight();
     file << strprintf("# * Best block at time of backup was %i (%s),\n",
                       tip_height.value_or(-1),
                       tip_height
                           ? locked_chain->getBlockHash(*tip_height).ToString()
                           : "(missing block hash)");
     file << strprintf("#   mined on %s\n",
                       tip_height ? FormatISO8601DateTime(
                                        locked_chain->getBlockTime(*tip_height))
                                  : "(missing block time)");
     file << "\n";
 
     // add the base58check encoded extended master if the wallet uses HD
     CKeyID seed_id = pwallet->GetHDChain().seed_id;
     if (!seed_id.IsNull()) {
         CKey seed;
         if (pwallet->GetKey(seed_id, seed)) {
             CExtKey masterKey;
             masterKey.SetSeed(seed.begin(), seed.size());
 
             file << "# extended private masterkey: " << EncodeExtKey(masterKey)
                  << "\n\n";
         }
     }
     for (std::vector<std::pair<int64_t, CKeyID>>::const_iterator it =
              vKeyBirth.begin();
          it != vKeyBirth.end(); it++) {
         const CKeyID &keyid = it->second;
         std::string strTime = FormatISO8601DateTime(it->first);
         std::string strAddr;
         std::string strLabel;
         CKey key;
         if (pwallet->GetKey(keyid, key)) {
             file << strprintf("%s %s ", EncodeSecret(key), strTime);
             if (GetWalletAddressesForKey(config, pwallet, keyid, strAddr,
                                          strLabel)) {
                 file << strprintf("label=%s", strLabel);
             } else if (keyid == seed_id) {
                 file << "hdseed=1";
             } else if (mapKeyPool.count(keyid)) {
                 file << "reserve=1";
             } else if (pwallet->mapKeyMetadata[keyid].hdKeypath == "s") {
                 file << "inactivehdseed=1";
             } else {
                 file << "change=1";
             }
             file << strprintf(
                 " # addr=%s%s\n", strAddr,
                 (pwallet->mapKeyMetadata[keyid].hdKeypath.size() > 0
                      ? " hdkeypath=" + pwallet->mapKeyMetadata[keyid].hdKeypath
                      : ""));
         }
     }
     file << "\n";
     for (const CScriptID &scriptid : scripts) {
         CScript script;
         std::string create_time = "0";
         std::string address = EncodeDestination(scriptid, config);
         // get birth times for scripts with metadata
         auto it = pwallet->m_script_metadata.find(scriptid);
         if (it != pwallet->m_script_metadata.end()) {
             create_time = FormatISO8601DateTime(it->second.nCreateTime);
         }
         if (pwallet->GetCScript(scriptid, script)) {
             file << strprintf("%s %s script=1",
                               HexStr(script.begin(), script.end()),
                               create_time);
             file << strprintf(" # addr=%s\n", address);
         }
     }
     file << "\n";
     file << "# End of dump\n";
     file.close();
 
     UniValue reply(UniValue::VOBJ);
     reply.pushKV("filename", filepath.string());
 
     return reply;
 }
 
+struct ImportData {
+    // Input data
+    //! Provided redeemScript; will be moved to `import_scripts` if relevant.
+    std::unique_ptr<CScript> redeemscript;
+
+    // Output data
+    std::set<CScript> import_scripts;
+    //! Import these private keys if available (the value indicates whether if
+    //! the key is required for solvability)
+    std::map<CKeyID, bool> used_keys;
+};
+
+enum class ScriptContext {
+    //! Top-level scriptPubKey
+    TOP,
+    //! P2SH redeemScript
+    P2SH,
+};
+
+// Analyse the provided scriptPubKey, determining which keys and which redeem
+// scripts from the ImportData struct are needed to spend it, and mark them as
+// used. Returns an error string, or the empty string for success.
+static std::string RecurseImportData(const CScript &script,
+                                     ImportData &import_data,
+                                     const ScriptContext script_ctx) {
+    // Use Solver to obtain script type and parsed pubkeys or hashes:
+    std::vector<std::vector<uint8_t>> solverdata;
+    txnouttype script_type = Solver(script, solverdata);
+
+    switch (script_type) {
+        case TX_PUBKEY: {
+            CPubKey pubkey(solverdata[0].begin(), solverdata[0].end());
+            import_data.used_keys.emplace(pubkey.GetID(), false);
+            return "";
+        }
+        case TX_PUBKEYHASH: {
+            CKeyID id = CKeyID(uint160(solverdata[0]));
+            import_data.used_keys[id] = true;
+            return "";
+        }
+        case TX_SCRIPTHASH: {
+            if (script_ctx == ScriptContext::P2SH) {
+                throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY,
+                                   "Trying to nest P2SH inside another P2SH");
+            }
+            assert(script_ctx == ScriptContext::TOP);
+            CScriptID id = CScriptID(uint160(solverdata[0]));
+            // Remove redeemscript from import_data to check for superfluous
+            // script later.
+            auto subscript = std::move(import_data.redeemscript);
+            if (!subscript) {
+                return "missing redeemscript";
+            }
+            if (CScriptID(*subscript) != id) {
+                return "redeemScript does not match the scriptPubKey";
+            }
+            import_data.import_scripts.emplace(*subscript);
+            return RecurseImportData(*subscript, import_data,
+                                     ScriptContext::P2SH);
+        }
+        case TX_MULTISIG: {
+            for (size_t i = 1; i + 1 < solverdata.size(); ++i) {
+                CPubKey pubkey(solverdata[i].begin(), solverdata[i].end());
+                import_data.used_keys.emplace(pubkey.GetID(), false);
+            }
+            return "";
+        }
+        case TX_NULL_DATA:
+            return "unspendable script";
+        case TX_NONSTANDARD:
+        default:
+            return "unrecognized script";
+    }
+}
+
 static UniValue ProcessImport(CWallet *const pwallet, const UniValue &data,
                               const int64_t timestamp)
     EXCLUSIVE_LOCKS_REQUIRED(pwallet->cs_wallet) {
+    UniValue warnings(UniValue::VARR);
+    UniValue result(UniValue::VOBJ);
+
     try {
         // First ensure scriptPubKey has either a script or JSON with "address"
         // string
         const UniValue &scriptPubKey = data["scriptPubKey"];
         bool isScript = scriptPubKey.getType() == UniValue::VSTR;
         if (!isScript && !(scriptPubKey.getType() == UniValue::VOBJ &&
                            scriptPubKey.exists("address"))) {
             throw JSONRPCError(RPC_INVALID_PARAMETER,
                                "scriptPubKey must be string with script or "
                                "JSON with address string");
         }
         const std::string &output = isScript
                                         ? scriptPubKey.get_str()
                                         : scriptPubKey["address"].get_str();
 
         // Optional fields.
         const std::string &strRedeemScript =
             data.exists("redeemscript") ? data["redeemscript"].get_str() : "";
         const UniValue &pubKeys =
             data.exists("pubkeys") ? data["pubkeys"].get_array() : UniValue();
         const UniValue &keys =
             data.exists("keys") ? data["keys"].get_array() : UniValue();
         const bool internal =
             data.exists("internal") ? data["internal"].get_bool() : false;
         const bool watchOnly =
             data.exists("watchonly") ? data["watchonly"].get_bool() : false;
         const std::string &label =
             data.exists("label") && !internal ? data["label"].get_str() : "";
 
         // If private keys are disabled, abort if private keys are being
         // imported
         if (pwallet->IsWalletFlagSet(WALLET_FLAG_DISABLE_PRIVATE_KEYS) &&
             !keys.isNull()) {
             throw JSONRPCError(RPC_WALLET_ERROR,
                                "Cannot import private keys to a wallet with "
                                "private keys disabled");
         }
 
         // Generate the script and destination for the scriptPubKey provided
         CScript script;
         CTxDestination dest;
-
         if (!isScript) {
             dest = DecodeDestination(output, pwallet->chainParams);
             if (!IsValidDestination(dest)) {
                 throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY,
-                                   "Invalid address");
+                                   "Invalid address \"" + output + "\"");
             }
             script = GetScriptForDestination(dest);
         } else {
             if (!IsHex(output)) {
                 throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY,
-                                   "Invalid scriptPubKey");
+                                   "Invalid scriptPubKey \"" + output + "\"");
             }
-
             std::vector<uint8_t> vData(ParseHex(output));
             script = CScript(vData.begin(), vData.end());
             if (!ExtractDestination(script, dest) && !internal) {
                 throw JSONRPCError(RPC_INVALID_PARAMETER,
                                    "Internal must be set to true for "
                                    "nonstandard scriptPubKey imports.");
             }
         }
 
-        // Watchonly and private keys
-        if (watchOnly && keys.size()) {
-            throw JSONRPCError(
-                RPC_INVALID_PARAMETER,
-                "Watch-only addresses should not include private keys");
+        // Parse all arguments
+        ImportData import_data;
+        if (strRedeemScript.size()) {
+            if (!IsHex(strRedeemScript)) {
+                throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY,
+                                   "Invalid redeem script \"" +
+                                       strRedeemScript +
+                                       "\": must be hex string");
+            }
+            auto parsed_redeemscript = ParseHex(strRedeemScript);
+            import_data.redeemscript = std::make_unique<CScript>(
+                parsed_redeemscript.begin(), parsed_redeemscript.end());
+        }
+        std::map<CKeyID, CPubKey> pubkey_map;
+        for (size_t i = 0; i < pubKeys.size(); ++i) {
+            const auto &str = pubKeys[i].get_str();
+            if (!IsHex(str)) {
+                throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY,
+                                   "Pubkey \"" + str +
+                                       "\" must be a hex string");
+            }
+            auto parsed_pubkey = ParseHex(str);
+            CPubKey pubkey(parsed_pubkey.begin(), parsed_pubkey.end());
+            if (!pubkey.IsFullyValid()) {
+                throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY,
+                                   "Pubkey \"" + str +
+                                       "\" is not a valid public key");
+            }
+            pubkey_map.emplace(pubkey.GetID(), pubkey);
+        }
+        std::map<CKeyID, CKey> privkey_map;
+        for (size_t i = 0; i < keys.size(); ++i) {
+            const auto &str = keys[i].get_str();
+            CKey key = DecodeSecret(str);
+            if (!key.IsValid()) {
+                throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY,
+                                   "Invalid private key encoding");
+            }
+            CPubKey pubkey = key.GetPubKey();
+            CKeyID id = pubkey.GetID();
+            if (pubkey_map.count(id)) {
+                pubkey_map.erase(id);
+            }
+            privkey_map.emplace(id, key);
         }
 
         // Internal addresses should not have a label
         if (internal && data.exists("label")) {
             throw JSONRPCError(RPC_INVALID_PARAMETER,
                                "Internal addresses should not have a label");
         }
 
-        CScript scriptpubkey_script = script;
-        CTxDestination scriptpubkey_dest = dest;
-
-        // P2SH
-        if (!strRedeemScript.empty() && script.IsPayToScriptHash()) {
-            // Check the redeemScript is valid
-            if (!IsHex(strRedeemScript)) {
-                throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY,
-                                   "Invalid redeem script: must be hex string");
+        // Verify and process input data
+        bool have_solving_data =
+            import_data.redeemscript || pubkey_map.size() || privkey_map.size();
+        if (have_solving_data) {
+            // Match up data in import_data with the scriptPubKey in script.
+            auto error =
+                RecurseImportData(script, import_data, ScriptContext::TOP);
+
+            // Verify whether the watchonly option corresponds to the
+            // availability of private keys.
+            bool spendable = std::all_of(
+                import_data.used_keys.begin(), import_data.used_keys.end(),
+                [&](const std::pair<CKeyID, bool> &used_key) {
+                    return privkey_map.count(used_key.first) > 0;
+                });
+            if (!watchOnly && !spendable) {
+                warnings.push_back("Some private keys are missing, outputs "
+                                   "will be considered watchonly. If this is "
+                                   "intentional, specify the watchonly flag.");
             }
-
-            // Import redeem script.
-            std::vector<uint8_t> vData(ParseHex(strRedeemScript));
-            CScript redeemScript = CScript(vData.begin(), vData.end());
-            CScriptID redeem_id(redeemScript);
-
-            // Check that the redeemScript and scriptPubKey match
-            if (GetScriptForDestination(redeem_id) != script) {
-                throw JSONRPCError(
-                    RPC_INVALID_ADDRESS_OR_KEY,
-                    "The redeemScript does not match the scriptPubKey");
+            if (watchOnly && spendable) {
+                warnings.push_back(
+                    "All private keys are provided, outputs will be considered "
+                    "spendable. If this is intentional, do not specify the "
+                    "watchonly flag.");
             }
 
-            pwallet->MarkDirty();
-
-            if (!pwallet->AddWatchOnly(redeemScript, timestamp)) {
-                throw JSONRPCError(RPC_WALLET_ERROR,
-                                   "Error adding address to wallet");
-            }
-
-            if (!pwallet->HaveCScript(redeem_id) &&
-                !pwallet->AddCScript(redeemScript)) {
-                throw JSONRPCError(RPC_WALLET_ERROR,
-                                   "Error adding p2sh redeemScript to wallet");
-            }
-        }
-
-        // (P2SH-)P2PK/P2PKH
-        if (dest.type() == typeid(CKeyID)) {
-            CPubKey pubkey;
-            if (keys.size()) {
-                pubkey = DecodeSecret(keys[0].get_str()).GetPubKey();
-            }
-            if (pubKeys.size()) {
-                const std::string &strPubKey = pubKeys[0].get_str();
-                if (!IsHex(strPubKey)) {
-                    throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY,
-                                       "Pubkey must be a hex string");
-                }
-                std::vector<uint8_t> vData(ParseHex(pubKeys[0].get_str()));
-                CPubKey pubkey_temp(vData.begin(), vData.end());
-                if (pubkey.size() && pubkey_temp != pubkey) {
-                    throw JSONRPCError(
-                        RPC_INVALID_ADDRESS_OR_KEY,
-                        "Private key does not match public key for address");
+            // Check that all required keys for solvability are provided.
+            if (error.empty()) {
+                for (const auto &require_key : import_data.used_keys) {
+                    if (!require_key.second) {
+                        // Not a required key
+                        continue;
+                    }
+                    if (pubkey_map.count(require_key.first) == 0 &&
+                        privkey_map.count(require_key.first) == 0) {
+                        error = "some required keys are missing";
+                    }
                 }
-                pubkey = pubkey_temp;
             }
-            if (pubkey.size() > 0) {
-                if (!pubkey.IsFullyValid()) {
-                    throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY,
-                                       "Pubkey is not a valid public key");
-                }
 
-                // Check the key corresponds to the destination given
-                std::vector<CTxDestination> destinations =
-                    GetAllDestinationsForKey(pubkey);
-                if (std::find(destinations.begin(), destinations.end(), dest) ==
-                    destinations.end()) {
-                    throw JSONRPCError(
-                        RPC_INVALID_ADDRESS_OR_KEY,
-                        "Key does not match address destination");
+            if (!error.empty()) {
+                warnings.push_back("Importing as non-solvable: " + error +
+                                   ". If this is intentional, don't provide "
+                                   "any keys, pubkeys or redeemscript.");
+                import_data = ImportData();
+                pubkey_map.clear();
+                privkey_map.clear();
+                have_solving_data = false;
+            } else {
+                // RecurseImportData() removes any relevant redeemscript from
+                // import_data, so we can use that to discover if a superfluous
+                // one was provided.
+                if (import_data.redeemscript) {
+                    warnings.push_back(
+                        "Ignoring redeemscript as this is not a P2SH script.");
                 }
-
-                // This is necessary to force the wallet to import the pubKey
-                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");
+                for (auto it = privkey_map.begin(); it != privkey_map.end();) {
+                    auto oldit = it++;
+                    if (import_data.used_keys.count(oldit->first) == 0) {
+                        warnings.push_back("Ignoring irrelevant private key.");
+                        privkey_map.erase(oldit);
+                    }
                 }
-
-                pwallet->MarkDirty();
-
-                if (!pwallet->AddWatchOnly(scriptRawPubKey, timestamp)) {
-                    throw JSONRPCError(RPC_WALLET_ERROR,
-                                       "Error adding address to wallet");
+                for (auto it = pubkey_map.begin(); it != pubkey_map.end();) {
+                    auto oldit = it++;
+                    auto key_data_it = import_data.used_keys.find(oldit->first);
+                    if (key_data_it == import_data.used_keys.end() ||
+                        !key_data_it->second) {
+                        warnings.push_back(
+                            "Ignoring public key \"" + HexStr(oldit->first) +
+                            "\" as it doesn't appear inside P2PKH.");
+                        pubkey_map.erase(oldit);
+                    }
                 }
             }
         }
 
-        // Import the address
-        if (::IsMine(*pwallet, scriptpubkey_script) == ISMINE_SPENDABLE) {
+        // Check whether we have any work to do
+        if (::IsMine(*pwallet, script) & ISMINE_SPENDABLE) {
             throw JSONRPCError(RPC_WALLET_ERROR,
                                "The wallet already contains the private key "
                                "for this address or script");
         }
 
+        // All good, time to import
         pwallet->MarkDirty();
 
-        if (!pwallet->AddWatchOnly(scriptpubkey_script, timestamp)) {
-            throw JSONRPCError(RPC_WALLET_ERROR,
-                               "Error adding address to wallet");
-        }
-
-        if (!watchOnly &&
-            !pwallet->HaveCScript(CScriptID(scriptpubkey_script)) &&
-            !pwallet->AddCScript(scriptpubkey_script)) {
-            throw JSONRPCError(RPC_WALLET_ERROR,
-                               "Error adding scriptPubKey script to wallet");
-        }
-
-        // if not internal add to address book or update label
-        if (!internal) {
-            if (IsValidDestination(scriptpubkey_dest)) {
-                pwallet->SetAddressBook(scriptpubkey_dest, label, "receive");
+        for (const auto &entry : import_data.import_scripts) {
+            if (!pwallet->HaveCScript(CScriptID(entry)) &&
+                !pwallet->AddCScript(entry)) {
+                throw JSONRPCError(RPC_WALLET_ERROR,
+                                   "Error adding script to wallet");
             }
         }
-
-        // Import private keys.
-        for (size_t i = 0; i < keys.size(); i++) {
-            const std::string &strPrivkey = keys[i].get_str();
-
-            // Checks.
-            CKey key = DecodeSecret(strPrivkey);
-
-            if (!key.IsValid()) {
-                throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY,
-                                   "Invalid private key encoding");
-            }
-
-            CPubKey pubKey = key.GetPubKey();
-            assert(key.VerifyPubKey(pubKey));
-
-            CKeyID vchAddress = pubKey.GetID();
-            pwallet->MarkDirty();
-
-            if (pwallet->HaveKey(vchAddress)) {
-                throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY,
-                                   "Already have this key");
-            }
-
-            pwallet->mapKeyMetadata[vchAddress].nCreateTime = timestamp;
-
-            if (!pwallet->AddKeyPubKey(key, pubKey)) {
+        for (const auto &entry : privkey_map) {
+            const CKey &key = entry.second;
+            CPubKey pubkey = key.GetPubKey();
+            const CKeyID &id = entry.first;
+            assert(key.VerifyPubKey(pubkey));
+            pwallet->mapKeyMetadata[id].nCreateTime = timestamp;
+            // If the private key is not present in the wallet, insert it.
+            if (!pwallet->HaveKey(id) && !pwallet->AddKeyPubKey(key, pubkey)) {
                 throw JSONRPCError(RPC_WALLET_ERROR,
                                    "Error adding key to wallet");
             }
-
             pwallet->UpdateTimeFirstKey(timestamp);
         }
+        for (const auto &entry : pubkey_map) {
+            const CPubKey &pubkey = entry.second;
+            const CKeyID &id = entry.first;
+            CPubKey temp;
+            if (!pwallet->GetPubKey(id, temp) &&
+                !pwallet->AddWatchOnly(GetScriptForRawPubKey(pubkey),
+                                       timestamp)) {
+                throw JSONRPCError(RPC_WALLET_ERROR,
+                                   "Error adding address to wallet");
+            }
+        }
+        if (!have_solving_data || !::IsMine(*pwallet, script)) {
+            // Always call AddWatchOnly for non-solvable watch-only, so that
+            // watch timestamp gets updated
+            if (!pwallet->AddWatchOnly(script, timestamp)) {
+                throw JSONRPCError(RPC_WALLET_ERROR,
+                                   "Error adding address to wallet");
+            }
+        }
+        if (!internal) {
+            assert(IsValidDestination(dest));
+            pwallet->SetAddressBook(dest, label, "receive");
+        }
 
-        UniValue result = UniValue(UniValue::VOBJ);
         result.pushKV("success", UniValue(true));
-        return result;
     } catch (const UniValue &e) {
-        UniValue result = UniValue(UniValue::VOBJ);
         result.pushKV("success", UniValue(false));
         result.pushKV("error", e);
-        return result;
     } catch (...) {
-        UniValue result = UniValue(UniValue::VOBJ);
         result.pushKV("success", UniValue(false));
         result.pushKV("error",
                       JSONRPCError(RPC_MISC_ERROR, "Missing required fields"));
-        return result;
     }
+
+    if (warnings.size()) {
+        result.pushKV("warnings", warnings);
+    }
+    return result;
 }
 
 static int64_t GetImportTimestamp(const UniValue &data, int64_t now) {
     if (data.exists("timestamp")) {
         const UniValue &timestamp = data["timestamp"];
         if (timestamp.isNum()) {
             return timestamp.get_int64();
         } else if (timestamp.isStr() && timestamp.get_str() == "now") {
             return now;
         }
         throw JSONRPCError(RPC_TYPE_ERROR,
                            strprintf("Expected number or \"now\" timestamp "
                                      "value for key. got type %s",
                                      uvTypeName(timestamp.type())));
     }
     throw JSONRPCError(RPC_TYPE_ERROR,
                        "Missing required timestamp field for key");
 }
 
 UniValue importmulti(const Config &config, const JSONRPCRequest &mainRequest) {
     std::shared_ptr<CWallet> const wallet =
         GetWalletForJSONRPCRequest(mainRequest);
     CWallet *const pwallet = wallet.get();
     if (!EnsureWalletIsAvailable(pwallet, mainRequest.fHelp)) {
         return NullUniValue;
     }
 
     if (mainRequest.fHelp || mainRequest.params.size() < 1 ||
         mainRequest.params.size() > 2) {
         throw std::runtime_error(RPCHelpMan{
             "importmulti",
-            "\nImport addresses/scripts (with private or public keys, "
-            "redeem script (P2SH)), rescanning all addresses in "
-            "one-shot-only (rescan can be disabled via options). Requires "
-            "a new wallet backup.\n"
-            "\nNote: This call can take minutes to complete if rescan is true, "
-            "during that time, other rpc calls\n"
-            "may report that the imported keys, addresses or scripts exists "
-            "but related transactions are still missing.\n",
+            "\nImport addresses/scripts (with private or public keys, redeem "
+            "script (P2SH)), rescanning all addresses in one-shot-only (rescan "
+            "can be disabled via options). Requires a new wallet backup.\n",
             {
                 {"requests",
                  RPCArg::Type::ARR,
                  /* opt */ false,
                  /* default_val */ "",
                  "Data to be imported",
                  {
                      {
                          "",
                          RPCArg::Type::OBJ,
                          /* opt */ false,
                          /* default_val */ "",
                          "",
                          {
                              {"scriptPubKey",
                               RPCArg::Type::STR,
                               /* opt */ false,
                               /* default_val */ "",
                               "Type of scriptPubKey (string for script, "
                               "json for address)",
                               /* oneline_description */ "",
                               {"\"<script>\" | { \"address\":\"<address>\" "
                                "}",
                                "string / json"}},
                              {"timestamp",
                               RPCArg::Type::NUM,
                               /* opt */ false,
                               /* default_val */ "",
                               "Creation time of the key in seconds since "
                               "epoch (Jan 1 1970 GMT),\n"
                               "                                            "
                               "                  or the string \"now\" to "
                               "substitute the current synced blockchain "
                               "time. The timestamp of the oldest\n"
                               "                                            "
                               "                  key will determine how "
                               "far back blockchain rescans need to begin "
                               "for missing wallet transactions.\n"
                               "                                            "
                               "                  \"now\" can be specified "
                               "to bypass scanning, for keys which are "
                               "known to never have been used, and\n"
                               "                                            "
                               "                  0 can be specified to "
                               "scan the entire blockchain. Blocks up to 2 "
                               "hours before the earliest key\n"
                               "                                            "
                               "                  creation time of all keys "
                               "being imported by the importmulti call will "
                               "be scanned.",
                               /* oneline_description */ "",
                               {"timestamp | \"now\"", "integer / string"}},
                              {"redeemscript", RPCArg::Type::STR,
-                              /* opt */ true, /* default_val */ "",
+                              /* opt */ true, /* default_val */ "omitted",
                               "Allowed only if the scriptPubKey is a P2SH "
                               "address/scriptPubKey"},
                              {"pubkeys",
                               RPCArg::Type::ARR,
                               /* opt */ true,
-                              /* default_val */ "",
-                              "Array of strings giving pubkeys that must "
-                              "occur in the output or redeemscript",
+                              /* default_val */ "empty array",
+                              "Array of strings giving pubkeys to import. They "
+                              "must occur in P2PKH scripts. They are not "
+                              "required when the private key is also provided "
+                              "(see the \"keys\" argument).",
                               {
-                                  {"pubKey", RPCArg::Type::STR,
-                                   /* opt */ false, /* default_val */ "", ""},
+                                  {"pubKey", RPCArg::Type::STR, /* opt */ false,
+                                   /* default_val */ "", ""},
                               }},
                              {"keys",
                               RPCArg::Type::ARR,
                               /* opt */ true,
-                              /* default_val */ "",
-                              "Array of strings giving private keys whose "
-                              "corresponding public keys must occur in the "
-                              "output or redeemscript",
+                              /* default_val */ "empty array",
+                              "Array of strings giving private keys to import. "
+                              "The corresponding public keys must occur in the "
+                              "output or redeemscript.",
                               {
                                   {"key", RPCArg::Type::STR,
                                    /* opt */ false, /* default_val */ "", ""},
                               }},
                              {"internal", RPCArg::Type::BOOL,
                               /* opt */ true, /* default_val */ "false",
                               "Stating whether matching outputs should be "
-                              "treated as not incoming payments aka "
-                              "change"},
+                              "treated as not incoming payments (also known as "
+                              "change)"},
                              {"watchonly", RPCArg::Type::BOOL,
                               /* opt */ true, /* default_val */ "false",
                               "Stating whether matching outputs should be "
-                              "considered watched even when they're not "
-                              "spendable, only allowed if keys are empty"},
+                              "considered watched even when not all private "
+                              "keys are provided."},
                              {"label", RPCArg::Type::STR, /* opt */ true,
                               /* default_val */ "''",
                               "Label to assign to the address, only "
                               "allowed with internal=false"},
                          },
                      },
                  },
                  "\"requests\""},
                 {"options",
                  RPCArg::Type::OBJ,
                  /* opt */ true,
-                 /* default_val */ "",
+                 /* default_val */ "null",
                  "",
                  {
                      {"rescan", RPCArg::Type::BOOL, /* opt */ true,
                       /* default_val */ "true",
                       "Stating if should rescan the blockchain after all "
                       "imports"},
                  },
                  "\"options\""},
             },
-            RPCResult{
-                "\nResponse is an array with the same size as the input that "
-                "has the execution result :\n"
-                "  [{ \"success\": true } , { \"success\": false, \"error\": { "
-                "\"code\": -1, \"message\": \"Internal Server Error\"} }, ... "
-                "]\n"},
+            RPCResult{"\nResponse is an array with the same size as the input "
+                      "that has the execution result :\n"
+                      "  [{\"success\": true}, {\"success\": true, "
+                      "\"warnings\": [\"Ignoring irrelevant private key\"]}, "
+                      "{\"success\": false, \"error\": {\"code\": -1, "
+                      "\"message\": \"Internal Server Error\"}}, ...]\n"},
             RPCExamples{
                 HelpExampleCli(
                     "importmulti",
                     "'[{ \"scriptPubKey\": { \"address\": \"<my address>\" }, "
                     "\"timestamp\":1455191478 }, "
                     "{ \"scriptPubKey\": { \"address\": \"<my 2nd address>\" "
                     "}, "
                     "\"label\": \"example 2\", \"timestamp\": 1455191480 }]'") +
                 HelpExampleCli(
                     "importmulti",
                     "'[{ \"scriptPubKey\": { \"address\": \"<my address>\" }, "
                     "\"timestamp\":1455191478 }]' '{ \"rescan\": false}'")
 
             },
         }
                                      .ToString());
     }
 
     RPCTypeCheck(mainRequest.params, {UniValue::VARR, UniValue::VOBJ});
 
     const UniValue &requests = mainRequest.params[0];
 
     // Default options
     bool fRescan = true;
 
     if (!mainRequest.params[1].isNull()) {
         const UniValue &options = mainRequest.params[1];
 
         if (options.exists("rescan")) {
             fRescan = options["rescan"].get_bool();
         }
     }
 
     WalletRescanReserver reserver(pwallet);
     if (fRescan && !reserver.reserve()) {
         throw JSONRPCError(
             RPC_WALLET_ERROR,
             "Wallet is currently rescanning. Abort existing rescan or wait.");
     }
 
     int64_t now = 0;
     bool fRunScan = false;
     int64_t nLowestTimestamp = 0;
     UniValue response(UniValue::VARR);
     {
         auto locked_chain = pwallet->chain().lock();
         LOCK(pwallet->cs_wallet);
         EnsureWalletIsUnlocked(pwallet);
 
         // Verify all timestamps are present before importing any keys.
         const Optional<int> tip_height = locked_chain->getHeight();
         now =
             tip_height ? locked_chain->getBlockMedianTimePast(*tip_height) : 0;
         for (const UniValue &data : requests.getValues()) {
             GetImportTimestamp(data, now);
         }
 
         const int64_t minimumTimestamp = 1;
 
         if (fRescan && tip_height) {
             nLowestTimestamp = locked_chain->getBlockTime(*tip_height);
         } else {
             fRescan = false;
         }
 
         for (const UniValue &data : requests.getValues()) {
             const int64_t timestamp =
                 std::max(GetImportTimestamp(data, now), minimumTimestamp);
             const UniValue result = ProcessImport(pwallet, data, timestamp);
             response.push_back(result);
 
             if (!fRescan) {
                 continue;
             }
 
             // If at least one request was successful then allow rescan.
             if (result["success"].get_bool()) {
                 fRunScan = true;
             }
 
             // Get the lowest timestamp.
             if (timestamp < nLowestTimestamp) {
                 nLowestTimestamp = timestamp;
             }
         }
     }
     if (fRescan && fRunScan && requests.size()) {
         int64_t scannedTime = pwallet->RescanFromTime(
             nLowestTimestamp, reserver, true /* update */);
         pwallet->ReacceptWalletTransactions();
 
         if (pwallet->IsAbortingRescan()) {
             throw JSONRPCError(RPC_MISC_ERROR, "Rescan aborted by user.");
         }
         if (scannedTime > nLowestTimestamp) {
             std::vector<UniValue> results = response.getValues();
             response.clear();
             response.setArray();
             size_t i = 0;
             for (const UniValue &request : requests.getValues()) {
                 // If key creation date is within the successfully scanned
                 // range, or if the import result already has an error set, let
                 // the result stand unmodified. Otherwise replace the result
                 // with an error message.
                 if (scannedTime <= GetImportTimestamp(request, now) ||
                     results.at(i).exists("error")) {
                     response.push_back(results.at(i));
                 } else {
                     UniValue result = UniValue(UniValue::VOBJ);
                     result.pushKV("success", UniValue(false));
                     result.pushKV(
                         "error",
                         JSONRPCError(
                             RPC_MISC_ERROR,
                             strprintf(
                                 "Rescan failed for key with creation timestamp "
                                 "%d. There was an error reading a block from "
                                 "time %d, which is after or within %d seconds "
                                 "of key creation, and could contain "
                                 "transactions pertaining to the key. As a "
                                 "result, transactions and coins using this key "
                                 "may not appear in the wallet. This error "
                                 "could be caused by pruning or data corruption "
                                 "(see bitcoind log for details) and could be "
                                 "dealt with by downloading and rescanning the "
                                 "relevant blocks (see -reindex and -rescan "
                                 "options).",
                                 GetImportTimestamp(request, now),
                                 scannedTime - TIMESTAMP_WINDOW - 1,
                                 TIMESTAMP_WINDOW)));
                     response.push_back(std::move(result));
                 }
                 ++i;
             }
         }
     }
 
     return response;
 }
 
 // clang-format off
 static const CRPCCommand commands[] = {
     //  category            name                        actor (function)          argNames
     //  ------------------- ------------------------    ----------------------    ----------
     { "wallet",             "abortrescan",              abortrescan,              {} },
     { "wallet",             "dumpprivkey",              dumpprivkey,              {"address"}  },
     { "wallet",             "dumpwallet",               dumpwallet,               {"filename"} },
     { "wallet",             "importmulti",              importmulti,              {"requests","options"} },
     { "wallet",             "importprivkey",            importprivkey,            {"privkey","label","rescan"} },
     { "wallet",             "importwallet",             importwallet,             {"filename"} },
     { "wallet",             "importaddress",            importaddress,            {"address","label","rescan","p2sh"} },
     { "wallet",             "importprunedfunds",        importprunedfunds,        {"rawtransaction","txoutproof"} },
     { "wallet",             "importpubkey",             importpubkey,             {"pubkey","label","rescan"} },
     { "wallet",             "removeprunedfunds",        removeprunedfunds,        {"txid"} },
 };
 // clang-format on
 
 void RegisterDumpRPCCommands(
     interfaces::Chain &chain,
     std::vector<std::unique_ptr<interfaces::Handler>> &handlers) {
     for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++) {
         handlers.emplace_back(chain.handleRpc(commands[vcidx]));
     }
 }
diff --git a/test/functional/wallet_importmulti.py b/test/functional/wallet_importmulti.py
index 0f081c5f7e..db8534475f 100755
--- a/test/functional/wallet_importmulti.py
+++ b/test/functional/wallet_importmulti.py
@@ -1,512 +1,535 @@
 #!/usr/bin/env python3
 # Copyright (c) 2014-2019 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 """Test the importmulti RPC.
 
 Test importmulti by generating keys on node0, importing the scriptPubKeys and
 addresses on node1 and then testing the address info for the different address
 variants.
 
 - `get_key()` and `get_multisig()` are called to generate keys on node0 and
   return the privkeys, pubkeys and all variants of scriptPubKey and address.
 - `test_importmulti()` is called to send an importmulti call to node1, test
   success, and (if unsuccessful) test the error code and error message returned.
 - `test_address()` is called to call getaddressinfo for an address on node1
   and test the values returned."""
 from collections import namedtuple
 
 from test_framework.address import (
     key_to_p2pkh,
     script_to_p2sh,
 )
 from test_framework.script import (
     CScript,
     OP_2,
     OP_3,
     OP_CHECKMULTISIG,
     OP_CHECKSIG,
     OP_DUP,
     OP_EQUAL,
     OP_EQUALVERIFY,
     OP_HASH160,
     OP_NOP,
     hash160,
 )
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import (
     assert_equal,
     assert_greater_than,
     assert_raises_rpc_error,
     hex_str_to_bytes,
 )
 
 Key = namedtuple('Key', ['privkey',
                          'pubkey',
                          'p2pkh_script',
                          'p2pkh_addr'])
 
 Multisig = namedtuple('Multisig', ['privkeys',
                                    'pubkeys',
                                    'p2sh_script',
                                    'p2sh_addr',
                                    'redeem_script'])
 
 
 class ImportMultiTest(BitcoinTestFramework):
     def set_test_params(self):
         self.num_nodes = 2
         self.setup_clean_chain = True
 
     def skip_test_if_missing_module(self):
         self.skip_if_no_wallet()
 
     def setup_network(self, split=False):
         self.setup_nodes()
 
     def get_key(self):
         """Generate a fresh key on node0
 
         Returns a named tuple of privkey, pubkey and all address and scripts."""
         addr = self.nodes[0].getnewaddress()
         pubkey = self.nodes[0].getaddressinfo(addr)['pubkey']
         pkh = hash160(hex_str_to_bytes(pubkey))
         return Key(self.nodes[0].dumpprivkey(addr),
                    pubkey,
                    # p2pkh
                    CScript([OP_DUP, OP_HASH160, pkh,
                             OP_EQUALVERIFY, OP_CHECKSIG]).hex(),
                    # p2pkh addr
                    key_to_p2pkh(pubkey))
 
     def get_multisig(self):
         """Generate a fresh multisig on node0
 
         Returns a named tuple of privkeys, pubkeys and all address and scripts."""
         addrs = []
         pubkeys = []
         for _ in range(3):
             addr = self.nodes[0].getaddressinfo(self.nodes[0].getnewaddress())
             addrs.append(addr['address'])
             pubkeys.append(addr['pubkey'])
         script_code = CScript([OP_2] + [hex_str_to_bytes(pubkey)
                                         for pubkey in pubkeys] + [OP_3, OP_CHECKMULTISIG])
         return Multisig([self.nodes[0].dumpprivkey(addr) for addr in addrs],
                         pubkeys,
                         # p2sh
                         CScript([OP_HASH160, hash160(
                             script_code), OP_EQUAL]).hex(),
                         # p2sh addr
                         script_to_p2sh(script_code),
                         # redeem script
                         script_code.hex())
 
-    def test_importmulti(self, req, success,
-                         error_code=None, error_message=None):
+    def test_importmulti(self, req, success, error_code=None,
+                         error_message=None, warnings=[]):
         """Run importmulti and assert success"""
         result = self.nodes[1].importmulti([req])
+        observed_warnings = []
+        if 'warnings' in result[0]:
+            observed_warnings = result[0]['warnings']
+        assert_equal(
+            "\n".join(
+                sorted(warnings)), "\n".join(
+                sorted(observed_warnings)))
         assert_equal(result[0]['success'], success)
         if error_code is not None:
             assert_equal(result[0]['error']['code'], error_code)
             assert_equal(result[0]['error']['message'], error_message)
 
     def test_address(self, address, **kwargs):
         """Get address info for `address` and test whether the returned values are as expected."""
         addr_info = self.nodes[1].getaddressinfo(address)
         for key, value in kwargs.items():
             if value is None:
                 if key in addr_info.keys():
                     raise AssertionError(
                         "key {} unexpectedly returned in getaddressinfo.".format(key))
             elif addr_info[key] != value:
                 raise AssertionError(
                     "key {} value {} did not match expected value {}".format(
                         key, addr_info[key], value))
 
     def run_test(self):
         self.log.info("Mining blocks...")
         self.nodes[0].generate(1)
         self.nodes[1].generate(1)
         timestamp = self.nodes[1].getblock(
             self.nodes[1].getbestblockhash())['mediantime']
 
         node0_address1 = self.nodes[0].getaddressinfo(
             self.nodes[0].getnewaddress())
 
         # Check only one address
         assert_equal(node0_address1['ismine'], True)
 
         # Node 1 sync test
         assert_equal(self.nodes[1].getblockcount(), 1)
 
         # Address Test - before import
         address_info = self.nodes[1].getaddressinfo(node0_address1['address'])
         assert_equal(address_info['iswatchonly'], False)
         assert_equal(address_info['ismine'], False)
 
         # RPC importmulti -----------------------------------------------
 
         # Bitcoin Address (implicit non-internal)
         self.log.info("Should import an address")
         key = self.get_key()
         address = key.p2pkh_addr
         self.test_importmulti({"scriptPubKey": {"address": address},
                                "timestamp": "now"},
                               True)
         self.test_address(address,
                           iswatchonly=True,
                           ismine=False,
                           timestamp=timestamp,
                           ischange=False)
         watchonly_address = address
         watchonly_timestamp = timestamp
 
         self.log.info("Should not import an invalid address")
         self.test_importmulti({"scriptPubKey": {"address": "not valid address"},
                                "timestamp": "now"},
                               False,
                               error_code=-5,
-                              error_message='Invalid address')
+                              error_message='Invalid address \"not valid address\"')
 
         # ScriptPubKey + internal
         self.log.info("Should import a scriptPubKey with internal flag")
         key = self.get_key()
         self.test_importmulti({"scriptPubKey": key.p2pkh_script,
                                "timestamp": "now",
                                "internal": True},
                               True)
         self.test_address(key.p2pkh_addr,
                           iswatchonly=True,
                           ismine=False,
                           timestamp=timestamp,
                           ischange=True)
 
         # ScriptPubKey + internal + label
         self.log.info(
             "Should not allow a label to be specified when internal is true")
         key = self.get_key()
         self.test_importmulti({"scriptPubKey": key.p2pkh_script,
                                "timestamp": "now",
                                "internal": True,
                                "label": "Example label"},
                               False,
                               error_code=-8,
                               error_message='Internal addresses should not have a label')
 
         # Nonstandard scriptPubKey + !internal
         self.log.info(
             "Should not import a nonstandard scriptPubKey without internal flag")
         nonstandardScriptPubKey = key.p2pkh_script + CScript([OP_NOP]).hex()
         key = self.get_key()
         address = key.p2pkh_addr
         self.test_importmulti({"scriptPubKey": nonstandardScriptPubKey,
                                "timestamp": "now"},
                               False,
                               error_code=-8,
                               error_message='Internal must be set to true for nonstandard scriptPubKey imports.')
         self.test_address(address,
                           iswatchonly=False,
                           ismine=False,
                           timestamp=None)
 
         # Address + Public key + !Internal(explicit)
         self.log.info("Should import an address with public key")
         key = self.get_key()
         address = key.p2pkh_addr
         self.test_importmulti({"scriptPubKey": {"address": address},
                                "timestamp": "now",
                                "pubkeys": [key.pubkey],
                                "internal": False},
-                              True)
+                              True,
+                              warnings=["Some private keys are missing, outputs will be considered watchonly. If this is intentional, specify the watchonly flag."])
         self.test_address(address,
                           iswatchonly=True,
                           ismine=False,
                           timestamp=timestamp)
 
         # ScriptPubKey + Public key + internal
         self.log.info(
             "Should import a scriptPubKey with internal and with public key")
         key = self.get_key()
         address = key.p2pkh_addr
         self.test_importmulti({"scriptPubKey": key.p2pkh_script,
                                "timestamp": "now",
                                "pubkeys": [key.pubkey],
                                "internal": True},
-                              True)
+                              True,
+                              warnings=["Some private keys are missing, outputs will be considered watchonly. If this is intentional, specify the watchonly flag."])
         self.test_address(address,
                           iswatchonly=True,
                           ismine=False,
                           timestamp=timestamp)
 
         # Nonstandard scriptPubKey + Public key + !internal
         self.log.info(
             "Should not import a nonstandard scriptPubKey without internal and with public key")
         key = self.get_key()
         address = key.p2pkh_addr
         self.test_importmulti({"scriptPubKey": nonstandardScriptPubKey,
                                "timestamp": "now",
                                "pubkeys": [key.pubkey]},
                               False,
                               error_code=-8,
                               error_message='Internal must be set to true for nonstandard scriptPubKey imports.')
         self.test_address(address,
                           iswatchonly=False,
                           ismine=False,
                           timestamp=None)
 
         # Address + Private key + !watchonly
         self.log.info("Should import an address with private key")
         key = self.get_key()
         address = key.p2pkh_addr
         self.test_importmulti({"scriptPubKey": {"address": address},
                                "timestamp": "now",
                                "keys": [key.privkey]},
                               True)
         self.test_address(address,
                           iswatchonly=False,
                           ismine=True,
                           timestamp=timestamp)
 
         self.log.info(
             "Should not import an address with private key if is already imported")
         self.test_importmulti({"scriptPubKey": {"address": address},
                                "timestamp": "now",
                                "keys": [key.privkey]},
                               False,
                               error_code=-4,
                               error_message='The wallet already contains the private key for this address or script')
 
         # Address + Private key + watchonly
         self.log.info(
-            "Should not import an address with private key and with watchonly")
+            "Should import an address with private key and with watchonly")
         key = self.get_key()
         address = key.p2pkh_addr
         self.test_importmulti({"scriptPubKey": {"address": address},
                                "timestamp": "now",
                                "keys": [key.privkey],
                                "watchonly": True},
-                              False,
-                              error_code=-8,
-                              error_message='Watch-only addresses should not include private keys')
+                              True,
+                              warnings=["All private keys are provided, outputs will be considered spendable. If this is intentional, do not specify the watchonly flag."])
         self.test_address(address,
                           iswatchonly=False,
-                          ismine=False,
-                          timestamp=None)
+                          ismine=True,
+                          timestamp=timestamp)
 
         # ScriptPubKey + Private key + internal
         self.log.info(
             "Should import a scriptPubKey with internal and with private key")
         key = self.get_key()
         address = key.p2pkh_addr
         self.test_importmulti({"scriptPubKey": key.p2pkh_script,
                                "timestamp": "now",
                                "keys": [key.privkey],
                                "internal": True},
                               True)
         self.test_address(address,
                           iswatchonly=False,
                           ismine=True,
                           timestamp=timestamp)
 
         # Nonstandard scriptPubKey + Private key + !internal
         self.log.info(
             "Should not import a nonstandard scriptPubKey without internal and with private key")
         key = self.get_key()
         address = key.p2pkh_addr
         self.test_importmulti({"scriptPubKey": nonstandardScriptPubKey,
                                "timestamp": "now",
                                "keys": [key.privkey]},
                               False,
                               error_code=-8,
                               error_message='Internal must be set to true for nonstandard scriptPubKey imports.')
         self.test_address(address,
                           iswatchonly=False,
                           ismine=False,
                           timestamp=None)
 
         # P2SH address
         multisig = self.get_multisig()
         self.nodes[1].generate(100)
         self.nodes[1].sendtoaddress(multisig.p2sh_addr, 10.00)
         self.nodes[1].generate(1)
         timestamp = self.nodes[1].getblock(
             self.nodes[1].getbestblockhash())['mediantime']
 
         self.log.info("Should import a p2sh")
         self.test_importmulti({"scriptPubKey": {"address": multisig.p2sh_addr},
                                "timestamp": "now"},
                               True)
         self.test_address(multisig.p2sh_addr,
                           isscript=True,
                           iswatchonly=True,
                           timestamp=timestamp)
         p2shunspent = self.nodes[1].listunspent(
             0, 999999, [multisig.p2sh_addr])[0]
         assert_equal(p2shunspent['spendable'], False)
         assert_equal(p2shunspent['solvable'], False)
 
         # P2SH + Redeem script
         multisig = self.get_multisig()
         self.nodes[1].generate(100)
         self.nodes[1].sendtoaddress(multisig.p2sh_addr, 10.00)
         self.nodes[1].generate(1)
         timestamp = self.nodes[1].getblock(
             self.nodes[1].getbestblockhash())['mediantime']
 
         self.log.info("Should import a p2sh with respective redeem script")
         self.test_importmulti({"scriptPubKey": {"address": multisig.p2sh_addr},
                                "timestamp": "now",
                                "redeemscript": multisig.redeem_script},
-                              True)
-        self.test_address(multisig.p2sh_addr, timestamp=timestamp)
+                              True,
+                              warnings=["Some private keys are missing, outputs will be considered watchonly. If this is intentional, specify the watchonly flag."])
+        self.test_address(
+            multisig.p2sh_addr,
+            timestamp=timestamp,
+            iswatchonly=True,
+            ismine=False,
+            solvable=True)
 
         p2shunspent = self.nodes[1].listunspent(
             0, 999999, [multisig.p2sh_addr])[0]
         assert_equal(p2shunspent['spendable'], False)
         assert_equal(p2shunspent['solvable'], True)
 
         # P2SH + Redeem script + Private Keys + !Watchonly
         multisig = self.get_multisig()
         self.nodes[1].generate(100)
         self.nodes[1].sendtoaddress(multisig.p2sh_addr, 10.00)
         self.nodes[1].generate(1)
         timestamp = self.nodes[1].getblock(
             self.nodes[1].getbestblockhash())['mediantime']
 
         self.log.info(
             "Should import a p2sh with respective redeem script and private keys")
         self.test_importmulti({"scriptPubKey": {"address": multisig.p2sh_addr},
                                "timestamp": "now",
                                "redeemscript": multisig.redeem_script,
                                "keys": multisig.privkeys[0:2]},
-                              True)
+                              True,
+                              warnings=["Some private keys are missing, outputs will be considered watchonly. If this is intentional, specify the watchonly flag."])
         self.test_address(multisig.p2sh_addr,
-                          timestamp=timestamp)
+                          timestamp=timestamp,
+                          ismine=False,
+                          iswatchonly=True,
+                          solvable=True)
 
         p2shunspent = self.nodes[1].listunspent(
             0, 999999, [multisig.p2sh_addr])[0]
         assert_equal(p2shunspent['spendable'], False)
         assert_equal(p2shunspent['solvable'], True)
 
         # P2SH + Redeem script + Private Keys + Watchonly
         multisig = self.get_multisig()
         self.nodes[1].generate(100)
         self.nodes[1].sendtoaddress(multisig.p2sh_addr, 10.00)
         self.nodes[1].generate(1)
         timestamp = self.nodes[1].getblock(
             self.nodes[1].getbestblockhash())['mediantime']
 
         self.log.info(
             "Should import a p2sh with respective redeem script and private keys")
         self.test_importmulti({"scriptPubKey": {"address": multisig.p2sh_addr},
                                "timestamp": "now",
                                "redeemscript": multisig.redeem_script,
                                "keys": multisig.privkeys[0:2],
                                "watchonly": True},
-                              False,
-                              error_code=-8,
-                              error_message='Watch-only addresses should not include private keys')
+                              True)
+        self.test_address(multisig.p2sh_addr,
+                          iswatchonly=True,
+                          ismine=False,
+                          solvable=True,
+                          timestamp=timestamp)
 
         # Address + Public key + !Internal + Wrong pubkey
-        self.log.info("Should not import an address with a wrong public key")
+        self.log.info(
+            "Should not import an address with the wrong public key as non-solvable")
         key = self.get_key()
         address = key.p2pkh_addr
         wrong_key = self.get_key().pubkey
         self.test_importmulti({"scriptPubKey": {"address": address},
                                "timestamp": "now",
                                "pubkeys": [wrong_key]},
-                              False,
-                              error_code=-5,
-                              error_message='Key does not match address destination')
+                              True,
+                              warnings=["Importing as non-solvable: some required keys are missing. If this is intentional, don't provide any keys, pubkeys or redeemscript.", "Some private keys are missing, outputs will be considered watchonly. If this is intentional, specify the watchonly flag."])
         self.test_address(address,
-                          iswatchonly=False,
+                          iswatchonly=True,
                           ismine=False,
-                          timestamp=None)
+                          solvable=False,
+                          timestamp=timestamp)
 
         # ScriptPubKey + Public key + internal + Wrong pubkey
         self.log.info(
-            "Should not import a scriptPubKey with internal and with a wrong public key")
+            "Should import a scriptPubKey with internal and with a wrong public key as non-solvable")
         key = self.get_key()
         address = key.p2pkh_addr
         wrong_key = self.get_key().pubkey
         self.test_importmulti({"scriptPubKey": key.p2pkh_script,
                                "timestamp": "now",
                                "pubkeys": [wrong_key],
                                "internal": True},
-                              False,
-                              error_code=-5,
-                              error_message='Key does not match address destination')
+                              True,
+                              warnings=["Importing as non-solvable: some required keys are missing. If this is intentional, don't provide any keys, pubkeys or redeemscript.", "Some private keys are missing, outputs will be considered watchonly. If this is intentional, specify the watchonly flag."])
         self.test_address(address,
-                          iswatchonly=False,
+                          iswatchonly=True,
                           ismine=False,
-                          timestamp=None)
+                          solvable=False,
+                          timestamp=timestamp)
 
         # Address + Private key + !watchonly + Wrong private key
-        self.log.info("Should not import an address with a wrong private key")
+        self.log.info(
+            "Should import an address with a wrong private key as non-solvable")
         key = self.get_key()
         address = key.p2pkh_addr
         wrong_privkey = self.get_key().privkey
         self.test_importmulti({"scriptPubKey": {"address": address},
                                "timestamp": "now",
                                "keys": [wrong_privkey]},
-                              False,
-                              error_code=-5,
-                              error_message='Key does not match address destination')
+                              True,
+                              warnings=["Importing as non-solvable: some required keys are missing. If this is intentional, don't provide any keys, pubkeys or redeemscript.", "Some private keys are missing, outputs will be considered watchonly. If this is intentional, specify the watchonly flag."])
         self.test_address(address,
-                          iswatchonly=False,
+                          iswatchonly=True,
                           ismine=False,
-                          timestamp=None)
+                          solvable=False,
+                          timestamp=timestamp)
 
         # ScriptPubKey + Private key + internal + Wrong private key
         self.log.info(
-            "Should not import a scriptPubKey with internal and with a wrong private key")
+            "Should import a scriptPubKey with internal and with a wrong private key as non-solvable")
         key = self.get_key()
         address = key.p2pkh_addr
         wrong_privkey = self.get_key().privkey
         self.test_importmulti({"scriptPubKey": key.p2pkh_script,
                                "timestamp": "now",
                                "keys": [wrong_privkey],
                                "internal": True},
-                              False,
-                              error_code=-5,
-                              error_message='Key does not match address destination')
+                              True,
+                              warnings=["Importing as non-solvable: some required keys are missing. If this is intentional, don't provide any keys, pubkeys or redeemscript.", "Some private keys are missing, outputs will be considered watchonly. If this is intentional, specify the watchonly flag."])
         self.test_address(address,
-                          iswatchonly=False,
+                          iswatchonly=True,
                           ismine=False,
-                          timestamp=None)
+                          solvable=False,
+                          timestamp=timestamp)
 
         # Importing existing watch only address with new timestamp should
         # replace saved timestamp.
         assert_greater_than(timestamp, watchonly_timestamp)
         self.log.info("Should replace previously saved watch only timestamp.")
         self.test_importmulti({"scriptPubKey": {"address": watchonly_address},
                                "timestamp": "now"},
                               True)
         self.test_address(watchonly_address,
                           iswatchonly=True,
                           ismine=False,
                           timestamp=timestamp)
         watchonly_timestamp = timestamp
 
         # restart nodes to check for proper serialization/deserialization of
         # watch only address
         self.stop_nodes()
         self.start_nodes()
         self.test_address(watchonly_address,
                           iswatchonly=True,
                           ismine=False,
                           timestamp=watchonly_timestamp)
 
         # Bad or missing timestamps
         self.log.info("Should throw on invalid or missing timestamp values")
         assert_raises_rpc_error(-3, 'Missing required timestamp field for key',
                                 self.nodes[1].importmulti, [{"scriptPubKey": key.p2pkh_script}])
         assert_raises_rpc_error(-3, 'Expected number or "now" timestamp value for key. got type string',
                                 self.nodes[1].importmulti, [{
                                     "scriptPubKey": key.p2pkh_script,
                                     "timestamp": ""
                                 }])
 
 
 if __name__ == '__main__':
     ImportMultiTest().main()