diff options
author | Gavin Andresen <gavinandresen@gmail.com> | 2013-05-03 14:32:47 -0700 |
---|---|---|
committer | Gavin Andresen <gavinandresen@gmail.com> | 2013-05-03 14:32:47 -0700 |
commit | aa62b2c43390d2a5f2b8cdc5b0674b6798d60c29 (patch) | |
tree | a2e8e8fb6b9830b24d9dcbd921cfbbed4c8eba0b /src/wallet.cpp | |
parent | aa6b3061ee59b8c4d962097118298bafbd080c18 (diff) | |
parent | 2f15e86a68aba56a8ea8e01e58b2fb7b71846b51 (diff) | |
download | bitcoin-aa62b2c43390d2a5f2b8cdc5b0674b6798d60c29.tar.xz |
Merge pull request #2607 from gavinandresen/loadwalletfix
Do not write to wallet during LoadWallet
Diffstat (limited to 'src/wallet.cpp')
-rw-r--r-- | src/wallet.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/wallet.cpp b/src/wallet.cpp index c7eb4f74e8..9658dab678 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -71,6 +71,11 @@ bool CWallet::AddCryptedKey(const CPubKey &vchPubKey, const vector<unsigned char return false; } +bool CWallet::LoadCryptedKey(const CPubKey &vchPubKey, const std::vector<unsigned char> &vchCryptedSecret) +{ + return CCryptoKeyStore::AddCryptedKey(vchPubKey, vchCryptedSecret); +} + bool CWallet::AddCScript(const CScript& redeemScript) { if (!CCryptoKeyStore::AddCScript(redeemScript)) |