-
Notifications
You must be signed in to change notification settings - Fork 35.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
add rescan bool to importprivkey to control whether to do a rescan af…
…ter import
- Loading branch information
Showing
1 changed file
with
13 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -34,15 +34,21 @@ class CTxDump | |
|
||
Value importprivkey(const Array& params, bool fHelp) | ||
{ | ||
if (fHelp || params.size() < 1 || params.size() > 2) | ||
if (fHelp || params.size() < 1 || params.size() > 3) | ||
throw runtime_error( | ||
"importprivkey <bitcoinprivkey> [label]\n" | ||
"importprivkey <bitcoinprivkey> [label] [rescan=true]\n" | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
sipa
Member
|
||
"Adds a private key (as returned by dumpprivkey) to your wallet."); | ||
|
||
string strSecret = params[0].get_str(); | ||
string strLabel = ""; | ||
if (params.size() > 1) | ||
strLabel = params[1].get_str(); | ||
|
||
// Whether to perform rescan after import | ||
bool fRescan = true; | ||
if (params.size() > 2) | ||
fRescan = params[2].get_bool(); | ||
|
||
CBitcoinSecret vchSecret; | ||
bool fGood = vchSecret.SetString(strSecret); | ||
|
||
|
@@ -61,9 +67,11 @@ Value importprivkey(const Array& params, bool fHelp) | |
|
||
if (!pwalletMain->AddKey(key)) | ||
throw JSONRPCError(RPC_WALLET_ERROR, "Error adding key to wallet"); | ||
|
||
pwalletMain->ScanForWalletTransactions(pindexGenesisBlock, true); | ||
pwalletMain->ReacceptWalletTransactions(); | ||
|
||
if (fRescan) { | ||
pwalletMain->ScanForWalletTransactions(pindexGenesisBlock, true); | ||
pwalletMain->ReacceptWalletTransactions(); | ||
} | ||
} | ||
|
||
return Value::null; | ||
|
I would prefer to see this default to false.