diff options
| author | Ava Chow <github@achow101.com> | 2024-07-02 16:51:07 -0400 |
|---|---|---|
| committer | Ava Chow <github@achow101.com> | 2024-07-02 16:51:07 -0400 |
| commit | 74d61151e50802502b9bf7bcc6bf97ea4cb86457 (patch) | |
| tree | 9385363755fa0d396e04581b95d161ce6d3d6d55 /doc | |
| parent | be63674c182ed007c902d3004d0a17f34f8b2ece (diff) | |
| parent | 7d55796c530f891493302059c6200d4a606c1ca9 (diff) | |
Merge bitcoin/bitcoin#30365: #27307 follow-up: update mempool conflict tests + docs
7d55796c530f891493302059c6200d4a606c1ca9 wallet: update mempool conflicts tests + docs (ishaanam)
Pull request description:
#27307 follow-up:
- updates description of `mempoolconflicts` and `walletconflicts` in `gettransaction`
- adds release notes for 27307
- removes unnecessary line from `wallet_conflicts.py`
ACKs for top commit:
fjahr:
ACK 7d55796c530f891493302059c6200d4a606c1ca9
achow101:
ACK 7d55796c530f891493302059c6200d4a606c1ca9
furszy:
utACK 7d55796c530
tdb3:
ACK 7d55796c530f891493302059c6200d4a606c1ca9
Tree-SHA512: b3c368c7072cacdaf5fd18ecb0a88ab76ce02f65d56fce55a3316afa0989b9417c31e563aa8d9dd8f6294add154b4fdeb4ada5081c6b8a5fe9953f0e8a4812f4
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/release-notes-27307.md | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/release-notes-27307.md b/doc/release-notes-27307.md new file mode 100644 index 0000000000..58fc7098b5 --- /dev/null +++ b/doc/release-notes-27307.md @@ -0,0 +1,8 @@ +Wallet +--- + +The wallet now detects when wallet transactions conflict with the mempool. Mempool +conflicting transactions can be seen in the `"mempoolconflicts"` field of +`gettransaction`. The inputs of mempool conflicted transactions can now be respent +without manually abandoning the transactions when the parent transaction is dropped +from the mempool, which can cause wallet balances to appear higher. |