Skip to content
Permalink
Browse files

Take non-importing keys into account for spendability warning in desc…

…riptor import
  • Loading branch information...
sipa committed Apr 6, 2019
1 parent 6e59700 commit b5d39877242504160a7f2c24c60c07a845d7a064
Showing with 5 additions and 1 deletion.
  1. +3 −0 src/wallet/rpcdump.cpp
  2. +2 −1 test/functional/wallet_importmulti.py
@@ -1197,6 +1197,9 @@ static UniValue ProcessImportDescriptor(ImportData& import_data, std::map<CKeyID
bool spendable = std::all_of(pubkey_map.begin(), pubkey_map.end(),
[&](const std::pair<CKeyID, CPubKey>& used_key) {
return privkey_map.count(used_key.first) > 0;
}) && std::all_of(import_data.key_origins.begin(), import_data.key_origins.end(),
[&](const std::pair<CKeyID, std::pair<CPubKey, KeyOriginInfo>>& entry) {
return privkey_map.count(entry.first) > 0;
});
if (!watch_only && !spendable) {
warnings.push_back("Some private keys are missing, outputs will be considered watchonly. If this is intentional, specify the watchonly flag.");
@@ -629,7 +629,8 @@ def run_test(self):
self.log.info("Should import a 1-of-2 bare multisig from descriptor")
self.test_importmulti({"desc": descsum_create("multi(1," + key1.pubkey + "," + key2.pubkey + ")"),
"timestamp": "now"},
success=True)
success=True,
warnings=["Some private keys are missing, outputs will be considered watchonly. If this is intentional, specify the watchonly flag."])
self.log.info("Should not treat individual keys from the imported bare multisig as watchonly")
test_address(self.nodes[1],
key1.p2pkh_addr,

0 comments on commit b5d3987

Please sign in to comment.
You can’t perform that action at this time.