From: fsb4000 <fsb4000@yandex.ru>
Date: Wed, 4 Mar 2015 23:06:29 +0000 (+0600)
Subject: добавлен параметр rescan в RPC вызов "importprivkey"
X-Git-Tag: nvc-v0.5.3~72^2
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=c96ef11c13e5ea4c07c5224344fdb9bafd08bc2b

добавлен параметр rescan в RPC вызов "importprivkey"
---

diff --git a/src/rpcdump.cpp b/src/rpcdump.cpp
index 8608463..d29738d 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 <novacoinprivkey> [label]\n"
+            "importprivkey <novacoinprivkey> [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,11 +67,23 @@ Value importprivkey(const Array& params, bool fHelp)
         pwalletMain->MarkDirty();
         pwalletMain->SetAddressBookName(vchAddress, strLabel);
 
+        // Don't throw error in case a key is already there
+        if (pwalletMain->HaveKey(vchAddress))
+            return Value::null;
+
+        pwalletMain->mapKeyMetadata[vchAddress].nCreateTime = 1;
+
         if (!pwalletMain->AddKey(key))
             throw JSONRPCError(RPC_WALLET_ERROR, "Error adding key to wallet");
 
-        pwalletMain->ScanForWalletTransactions(pindexGenesisBlock, true);
-        pwalletMain->ReacceptWalletTransactions();
+        // whenever a key is imported, we need to scan the whole chain
+        pwalletMain->nTimeFirstKey = 1; // 0 would be considered 'no value'
+
+        if (fRescan) 
+        {
+            pwalletMain->ScanForWalletTransactions(pindexGenesisBlock, true);
+            pwalletMain->ReacceptWalletTransactions();
+        }
     }
 
     return Value::null;