diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2019-04-01 15:26:58 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2019-04-01 15:27:02 -0400 |
| commit | 5a2a9b5b0603c1206e4419ffd0fd0d4939813fc2 (patch) | |
| tree | ce746ca42baa1130424d47ab2c9cb677277c7903 /src/wallet/wallet.h | |
| parent | 35477e9e4e3f0f207ac6fa5764886b15bf9af8d0 (diff) | |
| parent | 4bf1b1cefa9723bf2cfa8b1a938757abc99bb17b (diff) | |
Merge #15652: wallet: Update transactions with current mempool after load
4bf1b1cefa qa: Check unconfirmed balance after loadwallet (João Barbosa)
2ebf650b2e wallet: Update transactions with current mempool after load (João Barbosa)
57908a739c interfaces: Add Chain::requestMempoolTransactions (João Barbosa)
0440481c6b wallet: Move CWallet::ReacceptWalletTransactions locks to callers (João Barbosa)
Pull request description:
Fixes #15591.
ACKs for commit 4bf1b1:
MarcoFalke:
re-utACK 4bf1b1cefa
jnewbery:
utACK 4bf1b1cefa9723bf2cfa8b1a938757abc99bb17b
Tree-SHA512: 604b1057c7f9fc3772084bf6914e52dd1a68a1cfd365f907e8ec78f6f5f726bc56a3cad9f2b665642714fbf3d51e37c1184ac396460bddeafd918e8f9f7af392
Diffstat (limited to 'src/wallet/wallet.h')
| -rw-r--r-- | src/wallet/wallet.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 86448efcaf..24a1b92f7d 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -945,7 +945,7 @@ public: }; ScanResult ScanForWalletTransactions(const uint256& first_block, const uint256& last_block, const WalletRescanReserver& reserver, bool fUpdate); void TransactionRemovedFromMempool(const CTransactionRef &ptx) override; - void ReacceptWalletTransactions(); + void ReacceptWalletTransactions(interfaces::Chain::Lock& locked_chain) EXCLUSIVE_LOCKS_REQUIRED(cs_wallet); void ResendWalletTransactions(interfaces::Chain::Lock& locked_chain, int64_t nBestBlockTime) override; // ResendWalletTransactionsBefore may only be called if fBroadcastTransactions! std::vector<uint256> ResendWalletTransactionsBefore(interfaces::Chain::Lock& locked_chain, int64_t nTime); |