Permalink
Browse files

Merge #7687: Stop treating importaddress'ed scripts as change

595b22e Stop treating importaddress'ed scripts as change (Pieter Wuille)
  • Loading branch information...
laanwj committed Jun 20, 2016
2 parents 65c2058 + 595b22e commit a6ddb19bd91df2b485080590f6f63c1e7da7ed0c
Showing with 7 additions and 0 deletions.
  1. +7 −0 src/wallet/rpcdump.cpp
View
@@ -167,6 +167,11 @@ void ImportScript(const CScript& script, const string& strLabel, bool isRedeemSc
if (!pwalletMain->HaveCScript(script) && !pwalletMain->AddCScript(script))
throw JSONRPCError(RPC_WALLET_ERROR, "Error adding p2sh redeemScript to wallet");
ImportAddress(CBitcoinAddress(CScriptID(script)), strLabel);
} else {
CTxDestination destination;
if (ExtractDestination(script, destination)) {
pwalletMain->SetAddressBook(destination, strLabel, "receive");
}
}
}
@@ -195,6 +200,8 @@ UniValue importaddress(const UniValue& params, bool fHelp)
"4. p2sh (boolean, optional, default=false) Add the P2SH version of the script as well\n"
"\nNote: This call can take minutes to complete if rescan is true.\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"
"\nExamples:\n"
"\nImport a script with rescan\n"
+ HelpExampleCli("importaddress", "\"myscript\"") +

0 comments on commit a6ddb19

Please sign in to comment.