Use BN_dup

[novacoin.git] / src / rpcdump.cpp

diff --git a/src/rpcdump.cpp b/src/rpcdump.cpp
index 94eaad2..01ebf94 100644 (file)
--- 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();
         }
@@ -217,7 +216,7 @@ Value dumpprivkey(const Array& params, bool fHelp)
     CBitcoinAddress address;
     if (!address.SetString(strAddress))
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid NovaCoin address");
-    if (fWalletUnlockMintOnly) // ppcoin: no dumpprivkey in mint-only mode
+    if (fWalletUnlockMintOnly)
         throw JSONRPCError(RPC_WALLET_UNLOCK_NEEDED, "Wallet is unlocked for minting only.");
     CKeyID keyID;
     if (!address.GetKeyID(keyID))
@@ -285,7 +284,7 @@ Value importmalleablekey(const Array& params, bool fHelp)
 
     if (fSuccess)
     {
-        fSuccess = pwalletMain->AddMalleableKey(mKey);
+        fSuccess = pwalletMain->AddKey(mKey);
         result.push_back(Pair("Successful", fSuccess));
         result.push_back(Pair("Address", CBitcoinAddress(mKey.GetMalleablePubKey()).ToString()));
         result.push_back(Pair("KeyView", CMalleableKeyView(mKey).ToString()));