diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2017-01-03 14:10:41 -0800 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2017-01-03 14:11:11 -0800 |
| commit | 2a524b8e8fe69ef487fd8ea1b4f7a03f473ed201 (patch) | |
| tree | 0adf634d3f43b22447ed7139775436a0927e7316 /src/wallet/wallet.h | |
| parent | ce5c1f4acae43477989cdf9a82ed33703919cda2 (diff) | |
| parent | 5394b3940dec1fd35952d344e6373fb7115c5490 (diff) | |
| download | bitcoin-2a524b8e8fe69ef487fd8ea1b4f7a03f473ed201.tar.xz | |
Merge #8776: Wallet refactoring leading up to multiwallet
5394b39 Wallet: Split main logic from InitLoadWallet into CreateWalletFromFile (Luke Dashjr)
fb0c934 Wallet: Let the interval-flushing thread figure out the filename (Luke Dashjr)
Diffstat (limited to 'src/wallet/wallet.h')
| -rw-r--r-- | src/wallet/wallet.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index a97a5e5a7e..79ef96c911 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -18,6 +18,7 @@ #include "wallet/rpcwallet.h" #include <algorithm> +#include <atomic> #include <map> #include <set> #include <stdexcept> @@ -558,6 +559,8 @@ private: class CWallet : public CCryptoKeyStore, public CValidationInterface { private: + static std::atomic<bool> fFlushThreadRunning; + /** * Select a set of coins such that nValueRet >= nTargetValue and at least * all coins from coinControl are selected; Never select unconfirmed coins @@ -920,6 +923,7 @@ public: static std::string GetWalletHelpString(bool showDebug); /* Initializes the wallet, returns a new CWallet instance or a null pointer in case of an error */ + static CWallet* CreateWalletFromFile(const std::string walletFile); static bool InitLoadWallet(); /** |