diff options
author | Andrew Chow <github@achow101.com> | 2023-05-27 12:45:54 -0400 |
---|---|---|
committer | Andrew Chow <github@achow101.com> | 2023-05-27 13:07:09 -0400 |
commit | 7d33ae755de2bff806fe600bdaebedbd7fa67aba (patch) | |
tree | 136fb71453158f362f8dbb0d99aa3b4dac63f9cb /ci | |
parent | 927b001502a74a7224f04cfe6ffddc9a59409ba1 (diff) | |
parent | 89df7987c2f1eea42454c2b0efc31a924fbfd3a8 (diff) | |
download | bitcoin-7d33ae755de2bff806fe600bdaebedbd7fa67aba.tar.xz |
Merge bitcoin/bitcoin#27145: wallet: when a block is disconnected, update transactions that are no longer conflicted
89df7987c2f1eea42454c2b0efc31a924fbfd3a8 Add wallets_conflicts (Antoine Riard)
dced203162d45e542f187f8d0d07dab85c52cf28 wallet, tests: mark unconflicted txs as inactive (ishaanam)
096487c4dcfadebe5ca959927f5426cae1c304d5 wallet: introduce generic recursive tx state updating function (ishaanam)
Pull request description:
This implements a fix for #7315. Previously when a block was disconnected any transactions that were conflicting with transactions mined in that block were not updated to be marked as inactive. The fix implemented here is described on the [Bitcoin DevWiki](https://github.com/bitcoin-core/bitcoin-devwiki/wiki/Wallet-Transaction-Conflict-Tracking#idea-refresh-conflicted). A test which tested the previous behavior has also been updated.
Second attempt at #17543
ACKs for top commit:
achow101:
ACK 89df7987c2f1eea42454c2b0efc31a924fbfd3a8
rajarshimaitra:
tACK 89df7987c2f1eea42454c2b0efc31a924fbfd3a8.
glozow:
ACK 89df7987c2f1eea42454c2b0efc31a924fbfd3a8
furszy:
Tested ACK 89df7987
Tree-SHA512: 3133b151477e8818302fac29e96de30cd64c09a8fe3a7612074a34ba1a332e69148162e6cb3f1074d9d9c9bab5ef9996967d325d8c4c99ba42b5fe3b66a60546
Diffstat (limited to 'ci')
0 files changed, 0 insertions, 0 deletions