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.");
+ EnsureWalletIsUnlocked();
+
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);
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(keyid))
+ return Value::null;
+ pwalletMain->mapKeyMetadata[addr].nCreateTime = 1;
if (!pwalletMain->AddKey(key))
throw JSONRPCError(RPC_WALLET_ERROR, "Error adding key to wallet");
- pwalletMain->ScanForWalletTransactions(pindexGenesisBlock, true);
- pwalletMain->ReacceptWalletTransactions();
+ pwalletMain->MarkDirty();
+ pwalletMain->SetAddressBookName(addr, strLabel);
+
+ 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 Value::null;
CScript script;
CBitcoinAddress address(params[0].get_str());
if (address.IsValid()) {
- script.SetDestination(address.Get());
+ if (address.IsPair())
+ throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "It's senseless to import pubkey pair address.");
+ script.SetAddress(address);
} else if (IsHex(params[0].get_str())) {
std::vector<unsigned char> data(ParseHex(params[0].get_str()));
script = CScript(data.begin(), data.end());
- } else {
+ } else
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Novacoin address or script");
- }
string strLabel = "";
if (params.size() > 1)
{
LOCK2(cs_main, pwalletMain->cs_wallet);
+ if (::IsMine(*pwalletMain, script) == MINE_SPENDABLE)
+ throw JSONRPCError(RPC_WALLET_ERROR, "The wallet already contains the private key for this address or script");
// Don't throw error in case an address is already there
if (pwalletMain->HaveWatchOnly(script))
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");
return Value::null;
}
+Value removeaddress(const Array& params, bool fHelp)
+{
+ if (fHelp || params.size() != 1)
+ throw runtime_error(
+ "removeaddress 'address'\n"
+ "\nRemoves watch-only address or script (in hex) added by importaddress.\n"
+ "\nArguments:\n"
+ "1. 'address' (string, required) The address\n"
+ "\nExamples:\n"
+ "\nremoveaddress 4EqHMPgEAf56CQmU6ZWS8Ug4d7N3gsQVQA\n"
+ "\nRemove watch-only address 4EqHMPgEAf56CQmU6ZWS8Ug4d7N3gsQVQA\n");
+
+ CScript script;
+
+ CBitcoinAddress address(params[0].get_str());
+ if (address.IsValid()) {
+ if (address.IsPair())
+ throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Pubkey pair addresses aren't supported.");
+ script.SetAddress(address);
+ } else if (IsHex(params[0].get_str())) {
+ std::vector<unsigned char> data(ParseHex(params[0].get_str()));
+ script = CScript(data.begin(), data.end());
+ } else
+ throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Bitcoin address or script");
+
+ if (::IsMine(*pwalletMain, script) == MINE_SPENDABLE)
+ throw JSONRPCError(RPC_WALLET_ERROR, "The wallet contains the private key for this address or script - can't remove it");
+
+ if (!pwalletMain->HaveWatchOnly(script))
+ throw JSONRPCError(RPC_WALLET_ERROR, "The wallet does not contain this address or script");
+
+ LOCK2(cs_main, pwalletMain->cs_wallet);
+
+ pwalletMain->MarkDirty();
+
+ if (!pwalletMain->RemoveWatchOnly(script))
+ throw JSONRPCError(RPC_WALLET_ERROR, "Error removing address from wallet");
+
+ return Value::null;
+}
+
Value importwallet(const Array& params, bool fHelp)
{
if (fHelp || params.size() != 1)
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))
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)
return Value::null;
}
+
+Value dumpmalleablekey(const Array& params, bool fHelp)
+{
+ if (fHelp || params.size() != 1)
+ throw runtime_error (
+ "dumpmalleablekey <Key view>\n"
+ "Dump the private and public key pairs, which correspond to provided key view.\n");
+
+ EnsureWalletIsUnlocked();
+
+ CMalleableKey mKey;
+ CMalleableKeyView keyView;
+ keyView.SetString(params[0].get_str());
+
+ if (!pwalletMain->GetMalleableKey(keyView, mKey))
+ throw runtime_error("There is no such item in the wallet");
+
+ Object result;
+ result.push_back(Pair("PrivatePair", mKey.ToString()));
+ result.push_back(Pair("Address", CBitcoinAddress(mKey.GetMalleablePubKey()).ToString()));
+
+ return result;
+}
+
+Value importmalleablekey(const Array& params, bool fHelp)
+{
+ if (fHelp || params.size() != 1)
+ throw runtime_error (
+ "importmalleablekey <Key data>\n"
+ "Imports the private key pair into your wallet.\n");
+
+
+ EnsureWalletIsUnlocked();
+
+ CMalleableKey mKey;
+ bool fSuccess = mKey.SetString(params[0].get_str());
+
+ Object result;
+
+ if (fSuccess)
+ {
+ 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()));
+ }
+ else
+ result.push_back(Pair("Successful", false));
+
+ return result;
+}
git://git.novaco.in / novacoin.git / blobdiff