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/wallet.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/wallet.cpp')
| -rw-r--r-- | src/wallet/wallet.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 2d413fb9f9..769322969d 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -3416,7 +3416,17 @@ bool CWallet::InitLoadWallet() } walletInstance->SetBroadcastTransactions(GetBoolArg("-walletbroadcast", DEFAULT_WALLETBROADCAST)); + { + LOCK(walletInstance->cs_wallet); + LogPrintf("setKeyPool.size() = %u\n", walletInstance->GetKeyPoolSize()); + LogPrintf("mapWallet.size() = %u\n", walletInstance->mapWallet.size()); + LogPrintf("mapAddressBook.size() = %u\n", walletInstance->mapAddressBook.size()); + } + // Add wallet transactions that aren't already in a block to mapTransactions + walletInstance->ReacceptWalletTransactions(); + pwalletMain = walletInstance; + return true; } |