From: CryptoManiac <balthazar@yandex.ru>
Date: Sun, 3 Apr 2016 23:27:59 +0000 (+0300)
Subject: Merge branch 'master' of github.com:novacoin-project/novacoin
X-Git-Tag: nvc-v0.5.8~2
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=396877e60214f233b88100fa2831a97c5600e3f4;hp=2404891de8ac5b357d0abde90f2e286a3153fdef

Merge branch 'master' of github.com:novacoin-project/novacoin
---

diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp
index 60baac0..b32b86e 100644
--- a/src/bitcoinrpc.cpp
+++ b/src/bitcoinrpc.cpp
@@ -1256,6 +1256,7 @@ Array RPCConvertValues(const std::string &strMethod, const std::vector<std::stri
     if (strMethod == "keypoolrefill"          && n > 0) ConvertTo<int64_t>(params[0]);
     if (strMethod == "keypoolreset"           && n > 0) ConvertTo<int64_t>(params[0]);
     if (strMethod == "importaddress"          && n > 2) ConvertTo<bool>(params[2]);
+    if (strMethod == "importprivkey"          && n > 2) ConvertTo<bool>(params[2]);
 
     return params;
 }
diff --git a/src/rpcdump.cpp b/src/rpcdump.cpp
index bb877bf..756863c 100644
--- a/src/rpcdump.cpp
+++ b/src/rpcdump.cpp
@@ -67,23 +67,22 @@ Value importprivkey(const Array& params, bool fHelp)
     {
         LOCK2(cs_main, pwalletMain->cs_wallet);
 
-        pwalletMain->MarkDirty();
-        pwalletMain->SetAddressBookName(addr, strLabel);
-
         // Don't throw error in case a key is already there
         if (pwalletMain->HaveKey(keyid))
             return Value::null;
 
         pwalletMain->mapKeyMetadata[addr].nCreateTime = 1;
-
         if (!pwalletMain->AddKey(key))
             throw JSONRPCError(RPC_WALLET_ERROR, "Error adding key to wallet");
 
-        // whenever a key is imported, we need to scan the whole chain
-        pwalletMain->nTimeFirstKey = 1; // 0 would be considered 'no value'
+        pwalletMain->MarkDirty();
+        pwalletMain->SetAddressBookName(addr, strLabel);
 
-        if (fRescan) 
+        if (fRescan)
         {
+            // whenever a key is imported, we need to scan the whole chain
+            pwalletMain->nTimeFirstKey = 1; // 0 would be considered 'no value'
+
             pwalletMain->ScanForWalletTransactions(pindexGenesisBlock, true);
             pwalletMain->ReacceptWalletTransactions();
         }