Commit graph

10 commits

Author SHA1 Message Date
ivanlele
aa41e29f97
Merge 3a29ff5dea into merged_master (Bitcoin PR bitcoin/bitcoin#30463) 2026-03-09 16:54:19 +00:00
ivanlele
ae200321ff
Merge 74d61151e5 into merged_master (Bitcoin PR bitcoin/bitcoin#30365
#27307)
2026-03-03 14:06:35 +00:00
ivanlele
b92a1dd970
Merge c8e3978114 into merged_master (Bitcoin PR bitcoin/bitcoin#27307) 2026-02-17 10:01:46 +00:00
Byron Hambly
93356d4ab1 Merge 7d33ae755d into merged_master (Bitcoin PR bitcoin/bitcoin#27145) 2025-06-25 09:42:54 +02:00
Hennadii Stepanov
a0473442d1
scripted-diff: Add __file__ argument to BitcoinTestFramework.init()
-BEGIN VERIFY SCRIPT-
sed -i -e 's/\s*().main\s*()/(__file__).main()/' $(git ls-files test/functional/*.py)
sed -i -e 's/def __init__(self)/def __init__(self, test_file)/' test/functional/test_framework/test_framework.py
-END VERIFY SCRIPT-
2024-07-16 22:06:47 +01:00
ishaanam
7d55796c53 wallet: update mempool conflicts tests + docs 2024-07-01 12:27:43 -04:00
ishaanam
5952292133 wallet, rpc: show mempool conflicts in gettransaction result 2024-03-20 15:05:37 -04:00
ishaanam
54e07ee22f wallet: track mempool conflicts
Behavior changes are:
- if a tx has a mempool conflict, the wallet will not attempt to
  rebroadcast it
- if a txo is spent by a mempool-conflicted tx, that txo is no
  longer considered spent
2024-03-20 15:05:34 -04:00
ishaanam
180973a941 test: Add tests for wallet mempool conflicts 2024-03-14 17:09:59 -04:00
Antoine Riard
89df7987c2 Add wallets_conflicts
Test the case of a tx being conflicted by multiple
txs with different depths. The conflicted tx is also spent by
a child tx for which confirmation status is tied to the parent's.
After a reorg of conflicting txs, the conflicted status should be
undone properly.

Co-authored-by: furszy <mfurszy@protonmail.com>
2023-05-14 10:45:27 -04:00