aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMike Cassano <mcassano@gmail.com>2012-12-06 13:05:11 -0600
committerMike Cassano <mcassano@gmail.com>2012-12-06 20:18:17 -0600
commit44051af1a87a5fb8f4e88442c0eb64a1b4ecf2e6 (patch)
tree24af1313f2b244e6b573dcd61575f03f81a79854 /src
parentd79775a04d6dfc03dfc71d7811375a33e1e5c833 (diff)
add rescan bool to importprivkey to control whether to do a rescan after import
Diffstat (limited to 'src')
-rw-r--r--src/rpcdump.cpp18
1 files changed, 13 insertions, 5 deletions
diff --git a/src/rpcdump.cpp b/src/rpcdump.cpp
index 55d5d79e23..77cef02736 100644
--- a/src/rpcdump.cpp
+++ b/src/rpcdump.cpp
@@ -34,15 +34,21 @@ public:
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"
"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;