diff options
author | Jeff Garzik <jgarzik@bitpay.com> | 2013-05-30 07:55:25 -0700 |
---|---|---|
committer | Jeff Garzik <jgarzik@bitpay.com> | 2013-05-30 07:55:25 -0700 |
commit | e2f42142a03fa817a7fe6529fc1d55ef2d016352 (patch) | |
tree | a298361e95260b418a2bf82665390441e954954e /src/wallet.h | |
parent | 1803fa1db995e61258f1542e1766aec5b104d87d (diff) | |
parent | 896185d7ed3fa23415424c608f0897d6139640f4 (diff) | |
download | bitcoin-e2f42142a03fa817a7fe6529fc1d55ef2d016352.tar.xz |
Merge pull request #2600 from sipa/keyrefactor
Refactor key.cpp/.h
Diffstat (limited to 'src/wallet.h')
-rw-r--r-- | src/wallet.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wallet.h b/src/wallet.h index dcba4675eb..7fcb8e13ce 100644 --- a/src/wallet.h +++ b/src/wallet.h @@ -136,9 +136,9 @@ public: // Generate a new key CPubKey GenerateNewKey(); // Adds a key to the store, and saves it to disk. - bool AddKey(const CKey& key); + bool AddKeyPubKey(const CKey& key, const CPubKey &pubkey); // Adds a key to the store, without saving it to disk (used by LoadWallet) - bool LoadKey(const CKey& key) { return CCryptoKeyStore::AddKey(key); } + bool LoadKey(const CKey& key, const CPubKey &pubkey) { return CCryptoKeyStore::AddKeyPubKey(key, pubkey); } bool LoadMinVersion(int nVersion) { nWalletVersion = nVersion; nWalletMaxVersion = std::max(nWalletMaxVersion, nVersion); return true; } |