#27307 follow-up: update mempool conflict tests + docs #30365

1. 
   ishaanam commented at 6:35 pm on June 30, 2024: contributor

   #27307 follow-up:

   • updates description of mempoolconflicts and walletconflicts in gettransaction
   • adds release notes for 27307
   • removes unnecessary line from wallet_conflicts.py
2. DrahtBot added the label CI failed on Jun 30, 2024
3. 
   DrahtBot commented at 8:09 pm on June 30, 2024: contributor

   🚧 At least one of the CI tasks failed. Make sure to run all tests locally, according to the documentation.

   Possibly this is due to a silent merge conflict (the changes in this pull request being incompatible with the current code in the target branch). If so, make sure to rebase on the latest commit of the target branch.

   Leave a comment here, if you need help tracking down a confusing failure.

   Debug: https://github.com/bitcoin/bitcoin/runs/26861809422

4. 
   DrahtBot commented at 9:30 pm on June 30, 2024: contributor

   The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

   Code Coverage

   For detailed information about the code coverage, see the test coverage report.

   Reviews

   See the guideline for information on the review process.

   Type	Reviewers
   ACK	furszy, fjahr, tdb3, achow101

   If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.

   Conflicts

   Reviewers, this pull request conflicts with the following ones:

   • #29680 (wallet: fix unrelated parent conflict doesn’t cause child tx to be marked as conflict by Eunovo)

   If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

5. in doc/release-notes-27307.md:5 in e108d56453 outdated

   0@@ -0,0 +1,8 @@
   1+Wallet
   2+---
   3+
   4+The wallet now detects when wallet transactions conflict with the mempool. Mempool
   5+Conflicting transactions can be seen in the `"mempoolconflicts"` field of
   

   ---

   ---

   

   fjahr commented at 10:00 pm on June 30, 2024:

   0conflicting transactions can be seen in the `"mempoolconflicts"` field of
   

   ---

   

   ishaanam commented at 3:10 pm on July 1, 2024:

   Done
6. in test/functional/wallet_conflicts.py:40 in e108d56453 outdated

   36@@ -37,7 +37,6 @@ def run_test(self):
   37         """
   38 
   39         self.test_block_conflicts()
   40-        self.generatetoaddress(self.nodes[0], COINBASE_MATURITY + 7, self.nodes[2].getnewaddress())
   

   ---

   ---

   

   fjahr commented at 10:03 pm on June 30, 2024:

   Linter fails because the import of COINBASE_MATURITY is not needed anymore (line 12).

   ---

   

   ishaanam commented at 3:11 pm on July 1, 2024:

   Done, thanks
7. ishaanam force-pushed on Jul 1, 2024
8. in doc/release-notes-27307.md:8 in b267a95858 outdated

   0@@ -0,0 +1,8 @@
   1+Wallet
   2+---
   3+
   4+The wallet now detects when wallet transactions conflict with the mempool. Mempool
   5+conflicting transactions can be seen in the `"mempoolconflicts"` field of
   6+`gettransaction`. The inputs of mempool conflicted transactions can now be respent
   7+without manually abandoning the transactions, which can cause wallet balances to
   8+appear higher.
   

   ---

   ---

   

   furszy commented at 3:22 pm on July 1, 2024:

   can now be respent without manually abandoning the transactions “when the parent transaction is dropped from the mempool”? etc.

   ---

   

   ishaanam commented at 4:28 pm on July 1, 2024:

   Done
9. wallet: update mempool conflicts tests + docs 7d55796c53
10. ishaanam force-pushed on Jul 1, 2024
11. 
    furszy commented at 7:34 pm on July 1, 2024: member

    utACK 7d55796c530
12. 
    fjahr commented at 9:24 pm on July 1, 2024: contributor

    ACK 7d55796c530f891493302059c6200d4a606c1ca9

    The CI failures are related to #30368, not this change.

13. tdb3 approved
14. 
    tdb3 commented at 11:21 pm on July 1, 2024: contributor

    ACK 7d55796c530f891493302059c6200d4a606c1ca9 Good follow up. Ran wallet_conflicts locally without issue.
15. maflcko added this to the milestone 28.0 on Jul 2, 2024
16. maflcko added the label Wallet on Jul 2, 2024
17. 
    achow101 commented at 8:44 pm on July 2, 2024: member

    ACK 7d55796c530f891493302059c6200d4a606c1ca9
18. achow101 merged this on Jul 2, 2024
19. achow101 closed this on Jul 2, 2024

    ---

Contributors
ishaanam DrahtBot fjahr furszy tdb3 achow101

Labels
Wallet CI failed

Milestone
28.0