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
e151cada58
test: update and re-enable trim headers functional test
...
The trim_headers test was previously moved to extended tests, and only
worked with legacy wallets. Update it to work with descriptor wallets,
and move it back to base scripts in functional tests.
2026-07-02 14:10:12 +02:00
ivanlele
ccbd9a2ae6
Merge dc3a714633 into merged_master (Bitcoin PR bitcoin/bitcoin#31794 )
2026-04-16 11:38:35 +00:00
ivanlele
02debdd5fa
Merge c4b46b4589 into merged_master (Bitcoin PR bitcoin/bitcoin#31629 )
2026-04-16 09:22:46 +00:00
ivanlele
6621ad41b3
Merge 8775731e6d into merged_master (Bitcoin PR bitcoin/bitcoin#31241 )
2026-04-14 08:34:56 +00:00
Tom Trevethan
c5cac8efa2
Merge 712cab3a8f into merged_master (Bitcoin PR bitcoin/bitcoin#31061 )
2026-04-10 00:46:01 +01:00
Tom Trevethan
759f93db75
Merge 35bf426e02 into merged_master (Bitcoin PR bitcoin/bitcoin#28724 )
2026-04-09 23:08:37 +01:00
Tom Trevethan
b408880bd7
Merge 0a77441158 into merged_master (Bitcoin PR bitcoin/bitcoin#31451 )
2026-04-09 22:40:50 +01:00
ivanlele
ce1172bd1b
Merge 9039d8f1a1 into merged_master (Bitcoin PR bitcoin/bitcoin#31374 )
2026-04-08 14:48:55 +00:00
ivanlele
45641f31b5
Merge 22723c809a into merged_master (Bitcoin PR bitcoin/bitcoin#31072 )
2026-04-08 14:30:14 +00:00
ivanlele
ac8bc8abde
Merge 2eccb8bc5e into merged_master (Bitcoin PR bitcoin/bitcoin#31248 )
2026-04-08 13:39:57 +00:00
ivanlele
1a7957489c
Merge 39950e148d into merged_master (Bitcoin PR bitcoin/bitcoin#31295 )
2026-04-08 11:41:35 +00:00
ivanlele
fc057a869c
Merge ccc2d3abcd into merged_master (Bitcoin PR bitcoin/bitcoin#31287 )
2026-04-03 13:51:29 +00:00
Tom Trevethan
030ab66c70
Merge 54c4b09f08 into merged_master (Bitcoin PR bitcoin/bitcoin#31042 )
2026-04-01 22:41:52 +01:00
ivanlele
04affef8b8
Merge c16e909b3e into merged_master (Bitcoin PR bitcoin/bitcoin#28574 )
2026-03-30 16:42:26 +00:00
ivanlele
55dd6d547d
Merge 9f45062b9b into merged_master (Bitcoin PR bitcoin/bitcoin#30937 )
2026-03-30 10:51:11 +00:00
Tom Trevethan
88cd2cefd5
Merge 90a5786bba into merged_master (Bitcoin PR bitcoin/bitcoin#30678 )
2026-03-26 23:32:52 +00:00
ivanlele
a51624f2ed
Merge d4cc0c6845 into merged_master (Bitcoin PR bitcoin/bitcoin#30750 )
2026-03-24 11:43:55 +00:00
ivanlele
d4117b96b3
Merge a0abcbd382 into merged_master (Bitcoin PR bitcoin/bitcoin#22838 )
2026-03-23 11:21:19 +00:00
Tom Trevethan
fc0ac93eb7
Merge 78567b052d into merged_master (Bitcoin PR bitcoin/bitcoin#30697 )
2026-03-15 23:55:38 +00:00
Tom Trevethan
41e233bbdb
Merge 5ce2285b87 into merged_master (Bitcoin PR bitcoin/bitcoin#30691 )
2026-03-13 12:03:53 +00:00
Tom Trevethan
97f20db96c
Merge ee367170cb into merged_master (Bitcoin PR bitcoin/bitcoin#30621 )
2026-03-13 01:54:45 +00:00
Tom Trevethan
9b79195ec9
Merge 99ecb9a630 into merged_master (Bitcoin PR bitcoin/bitcoin#30659 )
2026-03-13 01:35:37 +00:00
ivanlele
c92a822cbe
Merge bb25e0691f into merged_master (Bitcoin PR bitcoin/bitcoin#30485 )
2026-03-11 14:21:29 +00:00
ikripaka
a1e0374a3f
Merge 6f9db1ebca into merged_master (Bitcoin PR bitcoin/bitcoin#30357 )
2026-03-09 10:16:25 +00:00
ikripaka
055b97a616
Merge d9aa7b23e4 into merged_master (Bitcoin PR bitcoin/bitcoin#26596 )
2026-03-05 18:34:53 +00:00
ivanlele
59a40df21e
Merge a19563ac86 into merged_master (Bitcoin PR bitcoin/bitcoin#30316 )
2026-03-02 12:24:24 +00:00
ikripaka
006073614d
Merge 011a895a82 into merged_master (Bitcoin PR bitcoin/bitcoin#29015 )
2026-02-27 22:51:31 +00:00
Tom Trevethan
848288ba1c
Merge 5acdc2b97d into merged_master (Bitcoin PR bitcoin/bitcoin#26606 )
2026-02-22 23:33:14 +00:00
ivanlele
f64242fec3
Merge 8efd03ad04 into merged_master (Bitcoin PR bitcoin/bitcoin#29494 )
2026-02-19 16:14:46 +00:00
ivanlele
660a2b7f06
Merge 2d3056751b into merged_master (Bitcoin PR bitcoin/bitcoin#29906 )
2026-02-19 11:04:47 +00:00
ivanlele
0f50b83d1e
Merge a7129f827c into merged_master (Bitcoin PR bitcoin/bitcoin#24313 )
2026-02-18 14:19:06 +00:00
ivanlele
d585152878
Merge 4373414d26 into merged_master (Bitcoin PR bitcoin/bitcoin#29130 )
2026-02-17 10:07:57 +00:00
ivanlele
b92a1dd970
Merge c8e3978114 into merged_master (Bitcoin PR bitcoin/bitcoin#27307 )
2026-02-17 10:01:46 +00:00
ivanlele
711e86714a
Merge b4a05751b6 into merged_master (Bitcoin PR #29586 )
2026-02-12 17:32:36 +00:00
Byron Hambly
70de4be566
Merge 22a5ccfb06 into merged_master (Bitcoin PR bitcoin/bitcoin#29510 )
2025-12-04 11:44:07 +02:00
Byron Hambly
1bc20d7011
Merge b1a46b212f into merged_master (Bitcoin PR bitcoin/bitcoin#26008 )
2025-12-04 09:07:39 +02:00
Tom Trevethan
14df0ae22f
Merge 128b4a8038 into merged_master (Bitcoin PR bitcoin/bitcoin#29403 )
2025-12-04 00:28:49 +00:00
Tom Trevethan
c2d8f099b1
Merge 6ff0aa089c into merged_master (Bitcoin PR bitcoin/bitcoin#28987 )
2025-12-03 23:34:15 +00:00
Byron Hambly
c8128c16e2
Merge 835948d44b into merged_master (Bitcoin PR bitcoin/bitcoin#26836 )
2025-11-30 17:10:09 +02:00
Byron Hambly
cf0043f303
Merge 03d95cc630 into merged_master (Bitcoin PR bitcoin/bitcoin#29375 )
2025-11-30 15:49:58 +02:00
Byron Hambly
776d0a85b4
Merge a11585692e into merged_master (Bitcoin PR bitcoin/bitcoin#28868 )
2025-11-29 14:47:39 +02:00
Byron Hambly
c34920f56a
Merge 93e10cab5d into merged_master (Bitcoin PR bitcoin/bitcoin#29367 )
2025-11-29 14:43:31 +02:00
Byron Hambly
9d50e4e1b4
Merge 5a1473e2c0 into merged_master (Bitcoin PR bitcoin/bitcoin#28976 )
2025-11-29 14:11:23 +02:00
Byron Hambly
5f14b5796a
Merge 6f732ffc3c into merged_master (Bitcoin PR bitcoin/bitcoin#28774 )
2025-11-18 14:54:48 +02:00
Byron Hambly
89d27d03d6
Merge fe1eccd4d7 into merged_master (Bitcoin PR bitcoin/bitcoin#29243 )
2025-11-18 11:38:23 +02:00
Byron Hambly
720001ebba
Merge c2d04f1319 into merged_master (Bitcoin PR bitcoin/bitcoin#28610 )
2025-11-18 08:50:00 +02:00
Byron Hambly
e2aa52246d
Merge 265250687b into merged_master (Bitcoin PR bitcoin/bitcoin#28455 )
2025-11-17 21:16:45 +02:00
Byron Hambly
51196515b4
Merge 08e6aaabef into merged_master (Bitcoin PR bitcoin/bitcoin#28920 )
2025-11-17 17:27:30 +02:00
