diff options
| author | Russell Yanofsky <[email protected]> | 2020-05-15 09:23:55 -0400 |
|---|---|---|
| committer | Russell Yanofsky <[email protected]> | 2020-05-15 09:23:55 -0400 |
| commit | b604c5c8b5892842f13dee89ae31812a28ab25d1 (patch) | |
| tree | 2a840e68c508b36c4a4e91a4cdf5ab9fa56db1af /src/httpserver.cpp | |
| parent | Merge #18975: test: Remove const to work around compiler error on xenial (diff) | |
| download | discoin-b604c5c8b5892842f13dee89ae31812a28ab25d1.tar.xz discoin-b604c5c8b5892842f13dee89ae31812a28ab25d1.zip | |
wallet: Minimal fix to restore conflicted transaction notifications
This fix is a based on the fix by Antoine Riard <[email protected]> in
https://github.com/bitcoin/bitcoin/pull/18600.
Unlike that PR, which implements some new behavior, this just restores previous
wallet notification and status behavior for transactions removed from the
mempool because they conflict with transactions in a block. The behavior was
accidentally changed in two `CWallet::BlockConnected` updates:
a31be09bfd77eed497a8e251d31358e16e2f2eb1 and
7e89994133725125dddbfa8d45484e3b9ed51c6e from
https://github.com/bitcoin/bitcoin/pull/16624, causing issue
https://github.com/bitcoin/bitcoin/issues/18325.
The change here could be improved and replaced with a more comprehensive
cleanup, so it includes a detailed comment explaining future considerations.
Fixes #18325
Co-authored-by: Antoine Riard <[email protected]>
Diffstat (limited to 'src/httpserver.cpp')
0 files changed, 0 insertions, 0 deletions