GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-15 12:51:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
46072 commits 49 branches 359 tags 252 MiB
Commit graph

2 commits

Author SHA1 Message Date
Byron Hambly
93356d4ab1 Merge 7d33ae755d into merged_master (Bitcoin PR bitcoin/bitcoin#27145) 2025-06-25 09:42:54 +02: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