diff options
| author | Gavin Andresen <[email protected]> | 2013-05-03 14:32:47 -0700 |
|---|---|---|
| committer | Gavin Andresen <[email protected]> | 2013-05-03 14:32:47 -0700 |
| commit | aa62b2c43390d2a5f2b8cdc5b0674b6798d60c29 (patch) | |
| tree | a2e8e8fb6b9830b24d9dcbd921cfbbed4c8eba0b /src/wallet.cpp | |
| parent | Merge pull request #2603 from sipa/nobestblock (diff) | |
| parent | Do not write to wallet during LoadWallet (diff) | |
| download | discoin-aa62b2c43390d2a5f2b8cdc5b0674b6798d60c29.tar.xz discoin-aa62b2c43390d2a5f2b8cdc5b0674b6798d60c29.zip | |
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 c7eb4f74e..9658dab67 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)) |