diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-08-24 10:32:59 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-08-24 10:33:16 +0200 |
| commit | f9167003d947fa994cdd14406da79a1758acb7b3 (patch) | |
| tree | ed03842a9672d119ec97c1a0f0a931f49e3f7319 /src/wallet/walletdb.cpp | |
| parent | 9358893518a19f38eab9186c768ad81c7a2f9cec (diff) | |
| parent | 8680d3aa800aa4fab8c321b92cc7f3fa97a8a0a3 (diff) | |
| download | bitcoin-f9167003d947fa994cdd14406da79a1758acb7b3.tar.xz | |
Merge #8445: Move CWallet::setKeyPool to private section of CWallet.
8680d3a Move wallet initialization logic from AppInit2 to CWallet::InitLoadWallet (Patrick Strateman)
e86eb71 Move CWallet::setKeyPool to private section of CWallet (Patrick Strateman)
Diffstat (limited to 'src/wallet/walletdb.cpp')
| -rw-r--r-- | src/wallet/walletdb.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp index f824492cb6..e6e9fc484b 100644 --- a/src/wallet/walletdb.cpp +++ b/src/wallet/walletdb.cpp @@ -556,14 +556,8 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue, ssKey >> nIndex; CKeyPool keypool; ssValue >> keypool; - pwallet->setKeyPool.insert(nIndex); - - // If no metadata exists yet, create a default with the pool key's - // creation time. Note that this may be overwritten by actually - // stored metadata for that key later, which is fine. - CKeyID keyid = keypool.vchPubKey.GetID(); - if (pwallet->mapKeyMetadata.count(keyid) == 0) - pwallet->mapKeyMetadata[keyid] = CKeyMetadata(keypool.nTime); + + pwallet->LoadKeyPool(nIndex, keypool); } else if (strType == "version") { |