// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
-#include "init.h" // for pwalletMain
+#include "init.h"
#include "bitcoinrpc.h"
-#include "ui_interface.h"
+#include "interface.h"
#include "base58.h"
+#include "wallet.h"
#define printf OutputDebugStringF
bool fCompressed;
CSecret secret = vchSecret.GetSecret(fCompressed);
key.SetSecret(secret, fCompressed);
- CKeyID vchAddress = key.GetPubKey().GetID();
+ CKeyID keyid = key.GetPubKey().GetID();
+ CBitcoinAddress addr = CBitcoinAddress(keyid);
{
LOCK2(cs_main, pwalletMain->cs_wallet);
- pwalletMain->MarkDirty();
- pwalletMain->SetAddressBookName(vchAddress, strLabel);
-
// Don't throw error in case a key is already there
- if (pwalletMain->HaveKey(vchAddress))
+ if (pwalletMain->HaveKey(keyid))
return Value::null;
- pwalletMain->mapKeyMetadata[vchAddress].nCreateTime = 1;
-
+ 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();
}
pwalletMain->MarkDirty();
if (address.IsValid())
- pwalletMain->SetAddressBookName(address.Get(), strLabel);
+ pwalletMain->SetAddressBookName(address, strLabel);
if (!pwalletMain->AddWatchOnly(script))
throw JSONRPCError(RPC_WALLET_ERROR, "Error adding address to wallet");
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))
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()));