diff options
author | Samuel Dobson <dobsonsa68@gmail.com> | 2021-08-09 14:10:22 +1200 |
---|---|---|
committer | Samuel Dobson <dobsonsa68@gmail.com> | 2021-08-09 14:21:22 +1200 |
commit | a162edfdd1e655845961ba5e888e92c3047efde1 (patch) | |
tree | 758fabe21d2b42e4c8e23e2e6d125f957648ab84 /src/wallet/rpcwallet.cpp | |
parent | 8fa03c4ddf833d767214f147873600e036858d37 (diff) | |
parent | fa6fd3dd6a4e7f30eff5963836aed43fe01af078 (diff) | |
download | bitcoin-a162edfdd1e655845961ba5e888e92c3047efde1.tar.xz |
Merge bitcoin/bitcoin#22359: wallet: Do not set fInMempool in transactionAddedToMempool when tx is not in the mempool
fa6fd3dd6a4e7f30eff5963836aed43fe01af078 wallet: Properly set fInMempool in mempool notifications (MarcoFalke)
Pull request description:
A wallet method (like bumping the fee) might have set `fInMempool` to false because the transaction was removed from the mempool (See commit fa4e088cbac035b8029a10b492849540150d0622).
Avoid setting it back to true (incorrectly) in the validation interface background thread.
Fixes #22357
ACKs for top commit:
ryanofsky:
Code review ACK fa6fd3dd6a4e7f30eff5963836aed43fe01af078. Only change since last review is extending workaround to `transactionRemovedFromMempool`. Since we know this workaround is imperfect and the goal of this PR is mainly to fix CI errors, I would probably be inclined to limit the workaround to as few places as possible where we have seen actual failures, instead of adding the workaround to as many places as possible, where there is some chance it might trigger new failures. But since this workaround is so straightforward and almost looks like a real fix, probably it doesn't matter.
meshcollider:
utACK fa6fd3dd6a4e7f30eff5963836aed43fe01af078
Tree-SHA512: d690136a577f1f532aa1fee80d3f6600ff7fc61286fbf564a53d7938d5ae52d33f0dbb0fef8b8c041a4970fb424f0b9f1ee7ce791e0ff8354e0000ecc9e22b84
Diffstat (limited to 'src/wallet/rpcwallet.cpp')
0 files changed, 0 insertions, 0 deletions