You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Wladimir J. van der Laan df91e11ae1 Merge #11126: Acquire cs_main lock before cs_wallet during wallet initialization ... de9a1db Acquire cs_main lock before cs_wallet during wallet initialization (Russell Yanofsky) Pull request description: `CWallet::MarkConflicted` may acquire the `cs_main` lock after `CWalletDB::LoadWallet` acquires the `cs_wallet` lock during wallet initialization. (`CWalletDB::LoadWallet` calls `ReadKeyValue` which calls `CWallet::LoadToWallet` which calls `CWallet::MarkConflicted`). This is the opposite order that `cs_main` and `cs_wallet` locks are acquired in the rest of the code, and so leads to `POTENTIAL DEADLOCK DETECTED` errors if bitcoin is built with `-DDEBUG_LOCKORDER`. This commit changes `CWallet::LoadWallet` (which calls `CWalletDB::LoadWallet`) to acquire both locks in the standard order. Error was reported by @luke-jr in https://botbot.me/freenode/bitcoin-core-dev/msg/90244330/ Tree-SHA512: 353fe21bc0a4a2828b41876897001a3c414d4b115ee7430925bd391d8bc396fca81661145d00996c1ba1a01516d9acf8b89fb5c3da27092f5f3aa7e37ef26ffa		7 years ago
..
test	Acquire cs_main lock before cs_wallet during wallet initialization	7 years ago
coincontrol.h	Make QT fee displays use GetMinimumFee instead of estimateSmartFee	7 years ago
crypter.cpp	Merge #10193: scripted-diff: Remove #include <boost/foreach.hpp>	7 years ago
crypter.h	Remove vchDefaultKey and have better first run detection	7 years ago
db.cpp	Merge #11017: [wallet] Close DB on error.	7 years ago
db.h	Merge #9964: Add const to methods that do not modify the object for which it is called	7 years ago
feebumper.cpp	Merge #10976: [MOVEONLY] Move some static functions out of wallet.h/cpp	7 years ago
feebumper.h	Refactor to use CoinControl in GetMinimumFee and FeeBumper	7 years ago
fees.cpp	MOVEONLY: Fee functions wallet/wallet.cpp -> wallet/fees.cpp	7 years ago
fees.h	Move some static functions out of wallet.h/cpp	7 years ago
init.cpp	MOVEONLY: Init functions wallet/wallet.cpp -> wallet/init.cpp	7 years ago
init.h	Move some static functions out of wallet.h/cpp	7 years ago
rpcdump.cpp	[wallet] Cache keyid -> keypool id mappings	7 years ago
rpcwallet.cpp	Merge #10976: [MOVEONLY] Move some static functions out of wallet.h/cpp	7 years ago
rpcwallet.h	scripted-diff: Use the C++11 keyword nullptr to denote the pointer literal instead of the macro NULL	7 years ago
wallet.cpp	Merge #11126: Acquire cs_main lock before cs_wallet during wallet initialization	7 years ago
wallet.h	Merge #10976: [MOVEONLY] Move some static functions out of wallet.h/cpp	7 years ago
walletdb.cpp	Merge #10952: [wallet] Remove vchDefaultKey and have better first run detection	7 years ago
walletdb.h	Merge #10952: [wallet] Remove vchDefaultKey and have better first run detection	7 years ago