#include "init.h" // for pwalletMain
#include "bitcoinrpc.h"
-#include "ui_interface.h"
+#include "interface.h"
#include "base58.h"
#define printf OutputDebugStringF
{
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();
}
return CBitcoinSecret(vchSecret, fCompressed).ToString();
}
-Value dumppem(const Array& params, bool fHelp)
-{
- if (fHelp || params.size() != 3)
- throw runtime_error(
- "dumppem <novacoinaddress> <filename> <passphrase>\n"
- "Dump the key pair corresponding to <novacoinaddress> and store it as encrypted PEM file."
- + HelpRequiringPassphrase());
-
- EnsureWalletIsUnlocked();
-
- string strAddress = params[0].get_str();
- SecureString strPassKey;
- strPassKey.reserve(100);
- strPassKey = params[2].get_str().c_str();
-
- CBitcoinAddress address;
- if (!address.SetString(strAddress))
- throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid NovaCoin address");
- if (fWalletUnlockMintOnly)
- throw JSONRPCError(RPC_WALLET_UNLOCK_NEEDED, "Wallet is unlocked for minting only.");
- CKeyID keyID;
- if (!address.GetKeyID(keyID))
- throw JSONRPCError(RPC_TYPE_ERROR, "Address does not refer to a key");
- if (!pwalletMain->GetPEM(keyID, params[1].get_str(), strPassKey))
- throw JSONRPCError(RPC_WALLET_ERROR, "Error dumping key pair to file");
-
- return Value::null;
-}
-
Value dumpwallet(const Array& params, bool fHelp)
{
if (fHelp || params.size() != 1)