diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/init.cpp | 7 | ||||
| -rw-r--r-- | src/wallet/wallet.cpp | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/init.cpp b/src/init.cpp index eefef7ba0b..057d8eefee 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -1488,6 +1488,13 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler) uiInterface.NotifyBlockTip.disconnect(BlockNotifyGenesisWait); } +#ifdef ENABLE_WALLET + // Add wallet transactions that aren't already in a block to mempool + // Do this here as mempool requires genesis block to be loaded + if (pwalletMain) + pwalletMain->ReacceptWalletTransactions(); +#endif + // ********************************************************* Step 11: start node //// debug print diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index a1f69dd94d..6f86f3360d 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -3467,8 +3467,6 @@ bool CWallet::InitLoadWallet() 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; |