diff options
| author | Patrick Strateman <patrick.strateman@gmail.com> | 2016-08-19 15:50:48 -0700 |
|---|---|---|
| committer | Patrick Strateman <patrick.strateman@gmail.com> | 2016-08-20 14:03:47 -0700 |
| commit | 8680d3aa800aa4fab8c321b92cc7f3fa97a8a0a3 (patch) | |
| tree | 84cd028dd0f80ba73c8abb5d37317392a224ab8a /src/wallet | |
| parent | e86eb71604e73ad35b8b1f59d73af22e353a156e (diff) | |
| download | bitcoin-8680d3aa800aa4fab8c321b92cc7f3fa97a8a0a3.tar.xz | |
Move wallet initialization logic from AppInit2 to CWallet::InitLoadWallet
Diffstat (limited to 'src/wallet')
| -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 ee9254050c..04f08e38c3 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -3411,7 +3411,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; } |