Don't mark wallet as dirty if key already exists.
Fix incorrect method name used in error message.
This commit is contained in:
parent
4cea36bef3
commit
0feffd1424
|
@ -565,12 +565,12 @@ Value z_importkey(const Array& params, bool fHelp)
|
||||||
auto addr = key.address();
|
auto addr = key.address();
|
||||||
|
|
||||||
{
|
{
|
||||||
pwalletMain->MarkDirty();
|
|
||||||
|
|
||||||
// Don't throw error in case a key is already there
|
// Don't throw error in case a key is already there
|
||||||
if (pwalletMain->HaveSpendingKey(addr))
|
if (pwalletMain->HaveSpendingKey(addr))
|
||||||
return Value::null;
|
return Value::null;
|
||||||
|
|
||||||
|
pwalletMain->MarkDirty();
|
||||||
|
|
||||||
if (!pwalletMain-> AddZKey(key))
|
if (!pwalletMain-> AddZKey(key))
|
||||||
throw JSONRPCError(RPC_WALLET_ERROR, "Error adding spending key to wallet");
|
throw JSONRPCError(RPC_WALLET_ERROR, "Error adding spending key to wallet");
|
||||||
|
|
||||||
|
|
|
@ -80,7 +80,7 @@ CZCPaymentAddress CWallet::GenerateNewZKey()
|
||||||
|
|
||||||
// Check for collision, even though it is unlikely to ever occur
|
// Check for collision, even though it is unlikely to ever occur
|
||||||
if (CCryptoKeyStore::HaveSpendingKey(addr))
|
if (CCryptoKeyStore::HaveSpendingKey(addr))
|
||||||
throw std::runtime_error("CWallet::GenerateNewSpendingKey(): Collision detected");
|
throw std::runtime_error("CWallet::GenerateNewZKey(): Collision detected");
|
||||||
|
|
||||||
// Create new metadata
|
// Create new metadata
|
||||||
int64_t nCreationTime = GetTime();
|
int64_t nCreationTime = GetTime();
|
||||||
|
@ -88,7 +88,7 @@ CZCPaymentAddress CWallet::GenerateNewZKey()
|
||||||
|
|
||||||
CZCPaymentAddress pubaddr(addr);
|
CZCPaymentAddress pubaddr(addr);
|
||||||
if (!AddZKey(k))
|
if (!AddZKey(k))
|
||||||
throw std::runtime_error("CWallet::GenerateNewSpendingKey(): AddZKey failed");
|
throw std::runtime_error("CWallet::GenerateNewZKey(): AddZKey failed");
|
||||||
return pubaddr;
|
return pubaddr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue