diff options
| author | John Newbery <john@johnnewbery.com> | 2019-08-09 11:07:30 -0400 |
|---|---|---|
| committer | John Newbery <john@johnnewbery.com> | 2019-08-09 11:07:30 -0400 |
| commit | c8b53c3beafa289dcdbd8c2ee9f957bdeca79cbc (patch) | |
| tree | 037a90aebdff141019e52eed0872c177ef1a5e4b /src/wallet/wallet.h | |
| parent | 214c4ecb9ab306627a08abb35cf82c73f10ec627 (diff) | |
| download | bitcoin-c8b53c3beafa289dcdbd8c2ee9f957bdeca79cbc.tar.xz | |
[wallet] Restore confirmed/conflicted tx check in SubmitMemoryPoolAndRelay()
Restores the confirmed/conflicted tx check removed in
8753f5652b4710e66b50ce87788bf6f33619b75a. There should be no external
behaviour change (these txs would not get accepted to the mempool
anyway), but not having the check in the wallet causes log spam.
Also adds a comment to ResentWalletTransactions() that
confirmed/conflicted tx check is done in SubmitMemoryPoolAndRelay().
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 3a45c1ccc5..cf388ad827 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -580,7 +580,7 @@ public: int64_t GetTxTime() const; // Pass this transaction to node for mempool insertion and relay to peers if flag set to true - bool SubmitMemoryPoolAndRelay(std::string& err_string, bool relay); + bool SubmitMemoryPoolAndRelay(std::string& err_string, bool relay, interfaces::Chain::Lock& locked_chain); // TODO: Remove "NO_THREAD_SAFETY_ANALYSIS" and replace it with the correct // annotation "EXCLUSIVE_LOCKS_REQUIRED(pwallet->cs_wallet)". The annotation |