mirror/bitcoin
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Have importpubkey use CWallet's ImportScriptPubKeys and ImportPubKeys functions

Browse Source 
Behavior changes:
* If any scripts for the pubkey were already in the wallet, their timestamps will be set to 1 and label updated
This commit is contained in:
Andrew Chow committed 2019-07-24 11:42:37 -04:00
1 parent c6a8274247
commit a00d1e5ec5
1 file changed
+8 -3
Download Patch File Download Diff File Expand all files Collapse all files
src/wallet/rpcdump.cpp
+8 -3
View File
@@ -538,11 +538,16 @@ UniValue importpubkey(const JSONRPCRequest& request)
auto locked_chain = pwallet->chain().lock(); auto locked_chain = pwallet->chain().lock();
LOCK(pwallet->cs_wallet); LOCK(pwallet->cs_wallet);
std::set<CScript> script_pub_keys;
for (const auto& dest : GetAllDestinationsForKey(pubKey)) { for (const auto& dest : GetAllDestinationsForKey(pubKey)) {
ImportAddress(pwallet, dest, strLabel); script_pub_keys.insert(GetScriptForDestination(dest));
} }
ImportScript(pwallet, GetScriptForRawPubKey(pubKey), strLabel, false);
pwallet->LearnAllRelatedScripts(pubKey); pwallet->MarkDirty();
pwallet->ImportScriptPubKeys(strLabel, script_pub_keys, true /* have_solving_data */, true /* apply_label */, 1 /* timestamp */);
pwallet->ImportPubKeys({pubKey.GetID()}, {{pubKey.GetID(), pubKey}} , {} /* key_origins */, false /* add_keypool */, false /* internal */, 1 /* timestamp */);
} }
if (fRescan) if (fRescan)
{ {