merge-script
af697df271
Merge ElementsProject/elements#1569 : Linter fixes
...
CI / test each commit (push) Has been cancelled
CI / macOS 14 native, arm64, no depends, sqlite only, gui (push) Has been cancelled
CI / macOS 14 native, arm64, fuzz (push) Has been cancelled
CI / Win64 native, VS 2022 (push) Has been cancelled
CI / Win64 native fuzz, VS 2022 (push) Has been cancelled
CI / ASan + LSan + UBSan + integer, no depends, USDT (push) Has been cancelled
CI / lint (push) Has been cancelled
713da86406bd2dbdcceb0ee8558f3a713da86406
2026-07-10 13:06:25 +02:00
Tom Trevethan
bd2dbdcceb
Fix: linter errors
2026-07-06 01:42:43 +01:00
Byron Hambly
0e0d01913a
mempool: disable full-RBF, require BIP125 opt-in signaling
...
Bitcoin Core defaults to accepting any fee-bumping replacement
regardless of signaling (full-RBF). Revert this for Elements: only
replace mempool transactions that explicitly opt in via BIP125
nSequence signaling (or TRUC), and report fullrbf=false in
getmempoolinfo.
Update feature_rbf.py accordingly, and add a regression test for
CVE-2021-31876 confirming that inherited signaling from an
unconfirmed parent does not make a non-signaling child replaceable.
2026-06-25 15:10:01 +02:00
Byron Hambly
20c5d373e3
fix: minor fixes
2026-06-23 12:09:01 +02:00
Tom Trevethan
5485fde8e1
re-enable add checks for CCheckQueueControl in connectblock
2026-05-26 14:15:17 +01:00
ivanlele
c1820ce4b9
Merge 8cb6ab0b97 into merged_master (Bitcoin PR bitcoin/bitcoin#32025 )
2026-04-16 14:51:03 +00:00
ivanlele
e6f317377c
Merge 504d0c21e2 into merged_master (Bitcoin PR bitcoin/bitcoin#31439 )
2026-04-16 09:11:31 +00:00
ikripaka
bde05e1016
Merge 5d6f6fd00d into merged_master (Bitcoin PR bitcoin/bitcoin#31490 )
2026-04-10 12:22:58 +00:00
ivanlele
5a8d695fd6
Merge df5c643f92 into merged_master (Bitcoin PR bitcoin/bitcoin#31556 )
2026-04-09 12:54:35 +00:00
ivanlele
1b86811536
Merge 9355578a77 into merged_master (Bitcoin PR bitcoin/bitcoin#31534 )
2026-04-09 11:11:07 +00:00
ivanlele
1d5f60cb85
Merge ea53568a06 into merged_master (Bitcoin PR bitcoin/bitcoin#31393 )
2026-04-09 10:08:37 +00:00
Tom Trevethan
1288483aed
Merge d73f37dda2 into merged_master (Bitcoin PR bitcoin/bitcoin#31346 )
2026-04-09 01:16:46 +01:00
ivanlele
45641f31b5
Merge 22723c809a into merged_master (Bitcoin PR bitcoin/bitcoin#31072 )
2026-04-08 14:30:14 +00:00
ivanlele
7f6a0e57ea
Merge ff873a20a7 into merged_master (Bitcoin PR bitcoin/bitcoin#31313 )
2026-04-08 11:22:26 +00:00
ivanlele
b6c4218280
Merge c9a7418a8d into merged_master (Bitcoin PR bitcoin/bitcoin#31096 )
2026-04-08 11:05:56 +00:00
ivanlele
0b3b9db42b
Merge 6f24662eb9 into merged_master (Bitcoin PR bitcoin/bitcoin#31175 )
2026-04-08 11:05:48 +00:00
ikripaka
9c0f3edb5a
Merge 3867d2421a into merged_master (Bitcoin PR bitcoin/bitcoin#31112 )
2026-04-08 10:07:51 +00:00
ivanlele
e293bb0f64
Merge f7144b24be into merged_master (Bitcoin PR bitcoin/bitcoin#31279 )
2026-04-06 10:49:00 +00:00
ivanlele
d4461d4c55
Merge f34fe0806a into merged_master (Bitcoin PR bitcoin/bitcoin#31122 )
2026-04-06 09:06:05 +00:00
ivanlele
27489a7346
Merge 85bcfeea23 into merged_master (Bitcoin PR bitcoin/bitcoin#30666 )
2026-04-03 13:50:20 +00:00
ivanlele
0b7f41f563
Merge 69c0313444 into merged_master (Bitcoin PR bitcoin/bitcoin#31269 )
2026-04-03 11:46:39 +00:00
ivanlele
744c517dac
Merge b0222bbb49 into merged_master (Bitcoin PR bitcoin/bitcoin#30239 )
2026-04-03 10:45:45 +00:00
ivanlele
b766b3f8c8
Merge 19f277711e into merged_master (Bitcoin PR bitcoin/bitcoin#26593 )
2026-04-02 15:08:15 +00:00
ivanlele
83750eb16f
Merge 0903ce8dbc into merged_master (Bitcoin PR bitcoin/bitcoin#30592 )
2026-04-02 15:05:13 +00:00
ivanlele
4f35a50320
Merge 6b73eb9a1a into merged_master (Bitcoin PR bitcoin/bitcoin#31064 )
2026-04-02 09:35:28 +00:00
Tom Trevethan
030ab66c70
Merge 54c4b09f08 into merged_master (Bitcoin PR bitcoin/bitcoin#31042 )
2026-04-01 22:41:52 +01:00
Tom Trevethan
a7e8a376fa
Merge 74fb19317a into merged_master (Bitcoin PR bitcoin/bitcoin#30849 )
2026-03-31 23:04:42 +01:00
ivanlele
05ebad86cd
Merge d9f8dc6453 into merged_master (Bitcoin PR bitcoin/bitcoin#31097 )
2026-03-30 14:21:02 +00:00
ivanlele
5337c68698
Merge e8f72aefd2 into merged_master (Bitcoin PR bitcoin/bitcoin#29877 )
2026-03-30 12:55:52 +00:00
ivanlele
55dd6d547d
Merge 9f45062b9b into merged_master (Bitcoin PR bitcoin/bitcoin#30937 )
2026-03-30 10:51:11 +00:00
ivanlele
96b8f1c3c3
Merge 5837e3463f into merged_master (Bitcoin PR bitcoin/bitcoin#30967 )
2026-03-30 10:15:21 +00:00
Tom Trevethan
9d1caaea8e
Merge da612cea03 into merged_master (Bitcoin PR bitcoin/bitcoin#30962 )
2026-03-26 23:36:46 +00:00
Tom Trevethan
5e863b61b0
Merge dabc74e86c into merged_master (Bitcoin PR bitcoin/bitcoin#30409 )
2026-03-26 22:46:45 +00:00
ivanlele
3a99f4b046
Merge 6fc4692797 into merged_master (Bitcoin PR bitcoin/bitcoin#29624 )
2026-03-26 14:09:14 +00:00
ivanlele
a4f8f89bf4
Merge 349632e022 into merged_master (Bitcoin PR bitcoin/bitcoin#30807 )
2026-03-25 13:50:36 +00:00
ivanlele
b28b274b1b
Merge d4b5553849 into merged_master (Bitcoin PR bitcoin/bitcoin#30742 )
2026-03-24 14:10:04 +00:00
ivanlele
a51624f2ed
Merge d4cc0c6845 into merged_master (Bitcoin PR bitcoin/bitcoin#30750 )
2026-03-24 11:43:55 +00:00
Tom Trevethan
f60016e6ad
Merge 338b9d82dc into merged_master (Bitcoin PR bitcoin/bitcoin#30681 )
2026-03-13 13:51:41 +00:00
Tom Trevethan
2669293095
Merge d79ea809d2 into merged_master (Bitcoin PR bitcoin/bitcoin#30647 )
2026-03-13 11:24:00 +00:00
ivanlele
07a5840843
Merge 40c11ac318 into merged_master (Bitcoin PR bitcoin/bitcoin#30624 )
2026-03-12 14:32:13 +00:00
ivanlele
d71a7ff4c7
Merge 9a696397e7 into merged_master (Bitcoin PR bitcoin/bitcoin#30598 )
2026-03-12 13:54:56 +00:00
ivanlele
d2e2c989ec
Merge 389cf32aca into merged_master (Bitcoin PR bitcoin/bitcoin#30604 )
2026-03-12 13:33:16 +00:00
ivanlele
23859ef13f
Merge 24ced52744 into merged_master (Bitcoin PR bitcoin/bitcoin#28687 )
2026-03-12 13:25:17 +00:00
ivanlele
06180927d1
Merge 27a770b34b into merged_master (Bitcoin PR bitcoin/bitcoin#28280 )
2026-03-12 13:14:24 +00:00
ivanlele
d06014267a
Merge da083d4bbd into merged_master (Bitcoin PR bitcoin/bitcoin#29775 )
2026-03-11 17:10:37 +00:00
ivanlele
35710f3683
Merge 69df012e74 into merged_master (Bitcoin PR bitcoin/bitcoin#30497 )
2026-03-11 11:53:41 +00:00
ivanlele
4fc984078d
Merge 21c2879f37 into merged_master (Bitcoin PR bitcoin/bitcoin#30560 )
2026-03-11 11:41:20 +00:00
ivanlele
c54dc2f736
Merge 1a19a4d960 into merged_master (Bitcoin PR bitcoin/bitcoin#29656 )
2026-03-11 10:36:54 +00:00
ivanlele
fc35d77bf1
Merge 5d28013044 into merged_master (Bitcoin PR bitcoin/bitcoin#30507 )
2026-03-10 12:26:42 +00:00
ivanlele
81a9987cda
Merge 9607277032 into merged_master (Bitcoin PR bitcoin/bitcoin#30111 )
2026-03-10 10:34:59 +00:00
