BTCPrivate
/
BitcoinPrivate-legacy
mirror of https://github.com/BTCPrivate/BitcoinPrivate-legacy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Don't mark wallet as dirty if key already exists. 

Fix incorrect method name used in error message.
This commit is contained in:
Simon 2016-08-11 11:37:00 -07:00
parent 4cea36bef3
commit 0feffd1424
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wallet/rpcdump.cpp
View File

@ -565,12 +565,12 @@ Value z_importkey(const Array& params, bool fHelp)
auto addr = key.address();
{
pwalletMain->MarkDirty();
// Don't throw error in case a key is already there
if (pwalletMain->HaveSpendingKey(addr))
return Value::null;
pwalletMain->MarkDirty();
if (!pwalletMain-> AddZKey(key))
throw JSONRPCError(RPC_WALLET_ERROR, "Error adding spending key to wallet");

4
src/wallet/wallet.cpp
View File

@ -80,7 +80,7 @@ CZCPaymentAddress CWallet::GenerateNewZKey()
// Check for collision, even though it is unlikely to ever occur
if (CCryptoKeyStore::HaveSpendingKey(addr))
throw std::runtime_error("CWallet::GenerateNewSpendingKey(): Collision detected");
throw std::runtime_error("CWallet::GenerateNewZKey(): Collision detected");
// Create new metadata
int64_t nCreationTime = GetTime();
@ -88,7 +88,7 @@ CZCPaymentAddress CWallet::GenerateNewZKey()
CZCPaymentAddress pubaddr(addr);
if (!AddZKey(k))
throw std::runtime_error("CWallet::GenerateNewSpendingKey(): AddZKey failed");
throw std::runtime_error("CWallet::GenerateNewZKey(): AddZKey failed");
return pubaddr;
}