sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 03:52:49 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge #8928: Fix init segfault where InitLoadWallet() calls ATMP before genesis

Browse Source 
37aefff Fix init segfault where InitLoadWallet() calls ATMP before genesis (Matt Corallo)
This commit is contained in:
Wladimir J. van der Laan 2016-10-19 18:10:52 +02:00
commit c587577356
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/init.cpp
View File

@ -1493,6 +1493,13 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
uiInterface.NotifyBlockTip.disconnect(BlockNotifyGenesisWait); 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 // ********************************************************* Step 11: start node
//// debug print //// debug print

2
src/wallet/wallet.cpp
View File

@ -3466,8 +3466,6 @@ bool CWallet::InitLoadWallet()
LogPrintf("mapWallet.size() = %u\n", walletInstance->mapWallet.size()); LogPrintf("mapWallet.size() = %u\n", walletInstance->mapWallet.size());
LogPrintf("mapAddressBook.size() = %u\n", walletInstance->mapAddressBook.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; pwalletMain = walletInstance;