Commit graph

571 commits

Author SHA1 Message Date
Tom Trevethan
abdb6ca47f Merge 53f4607cc8 into merged_master (Bitcoin PR bitcoin/bitcoin#29696) 2026-02-16 22:00:20 +00:00
ivanlele
d14550ad5c
Merge 2ffaa92702 into merged_master (Bitcoin PR bitcoin/bitcoin#29703) 2026-02-16 16:37:41 +00:00
ivanlele
81a17ea31a Merge c07935bcf5 into merged_master (Bitcoin PR #28960) 2026-02-12 16:33:05 +00:00
Byron Hambly
dd92457989
Merge ba90b058bd into merged_master (Bitcoin PR bitcoin/bitcoin#29345) 2025-12-04 10:03:23 +02:00
Byron Hambly
a2db3449a2
Merge 3d52cedb49 into merged_master (Bitcoin PR bitcoin/bitcoin#29251) 2025-11-18 13:27:26 +02:00
Byron Hambly
783be0ad1b
Merge f1fcc9638c into merged_master (Bitcoin PR bitcoin/bitcoin#29170) 2025-11-18 11:51:30 +02:00
Byron Hambly
0c3e3643e0
Merge 014f52550b into merged_master (Bitcoin PR bitcoin/bitcoin#29186) 2025-11-18 09:54:57 +02:00
Byron Hambly
295f98e6d8
Merge 925a750d99 into merged_master (Bitcoin PR bitcoin/bitcoin#28844) 2025-11-17 19:09:22 +02:00
Byron Hambly
95b25a3028
Merge dce1dfbc47 into merged_master (Bitcoin PR bitcoin/bitcoin#28622) 2025-11-11 15:25:58 +02:00
Byron Hambly
402de2f938
Merge 1c8893bd1c into merged_master (Bitcoin PR bitcoin/bitcoin#28852) 2025-11-11 15:00:48 +02:00
Byron Hambly
1a150831f3
Merge 98b0acda0f into merged_master (Bitcoin PR bitcoin/bitcoin#28725) 2025-11-10 14:40:43 +02:00
Byron Hambly
9af1cbdb3f
Merge fb85bb2776 into merged_master (Bitcoin PR bitcoin/bitcoin#28783) 2025-11-06 11:38:25 +02:00
Byron Hambly
0362700e4e
Merge da8e397e4a into merged_master (Bitcoin PR bitcoin/bitcoin#28685) 2025-08-07 16:07:18 +02:00
Byron Hambly
64123a22f8
Merge 4caa10b580 into merged_master (Bitcoin PR bitcoin/bitcoin#28628) 2025-08-07 12:23:49 +02:00
Byron Hambly
e89707551e
Merge 76d89579b5 into merged_master (Bitcoin PR bitcoin/bitcoin#28630) 2025-08-07 12:20:14 +02:00
Byron Hambly
95a30fbffd
Merge 73dfa6da08 into merged_master (Bitcoin PR bitcoin/bitcoin#28631) 2025-08-07 09:20:55 +02:00
Byron Hambly
f8e8fd3a2d
Merge 154404e33f into merged_master (Bitcoin PR bitcoin/bitcoin#28624) 2025-08-06 20:35:59 +02:00
Byron Hambly
d01090d0df
Merge 3003861e78 into merged_master (Bitcoin PR bitcoin/bitcoin#28591) 2025-08-06 20:35:02 +02:00
Byron Hambly
37d3b62c98
Merge 2eacc61ad7 into merged_master (Bitcoin PR bitcoin/bitcoin#25970) 2025-08-06 15:10:33 +02:00
Byron Hambly
7fc909ab98
Merge e7b0004b37 into merged_master (Bitcoin PR bitcoin/bitcoin#27596)
ELEMENTS TODO assumeutxo for liquidv1
2025-08-06 14:33:15 +02:00
Byron Hambly
6a868386b5 Merge 7bf078f2b7 into merged_master (Bitcoin PR bitcoin/bitcoin#28237) 2025-07-04 21:24:50 +02:00
Byron Hambly
9af357b0e0 Merge 6c508ac3ff into merged_master (Bitcoin PR bitcoin/bitcoin#28258) 2025-07-03 21:09:40 +02:00
Byron Hambly
f093f750f2 Merge 3654d84c6f into merged_master (Bitcoin PR bitcoin/bitcoin#28245) 2025-07-03 21:09:37 +02:00
Byron Hambly
81083d47bf Merge 624333455a into merged_master (Bitcoin PR bitcoin/bitcoin#26296) 2025-07-03 20:38:42 +02:00
Byron Hambly
82e4ff741b Merge 1fde20faf8 into merged_master (Bitcoin PR bitcoin/bitcoin#28099) 2025-07-02 17:41:56 +02:00
Byron Hambly
55c95fd927 Merge c123e1d215 into merged_master (Bitcoin PR bitcoin/bitcoin#28069) 2025-07-01 13:34:08 +02:00
Byron Hambly
f86b72b128 Merge a8bd0fef25 into merged_master (Bitcoin PR bitcoin/bitcoin#27999) 2025-06-30 15:00:23 +02:00
Byron Hambly
04fc205a18 Merge 3367e1c850 into merged_master (Bitcoin PR bitcoin/bitcoin#28009) 2025-06-30 15:00:21 +02:00
Byron Hambly
acab5dd981 Merge ec822e88dd into merged_master (Bitcoin PR bitcoin/bitcoin#27813) 2025-06-30 13:48:25 +02:00
Byron Hambly
16d9ef4a8c Merge 35b01e8504 into merged_master (Bitcoin PR bitcoin/bitcoin#27676) 2025-06-28 09:59:07 +02:00
Byron Hambly
2acb8b75bf Merge 6cf47a8f44 into merged_master (Bitcoin PR bitcoin/bitcoin#27507) 2025-06-25 10:21:36 +02:00
Byron Hambly
53a14af7d9 Merge 49d543dcaf into merged_master (Bitcoin PR bitcoin/bitcoin#26953) 2025-05-15 13:12:50 +02:00
Tom Trevethan
fad4c02c57 Merge 0c579203d2 into merged_master (Bitcoin PR bitcoin/bitcoin#25867) 2025-04-08 12:33:05 +00:00
Byron Hambly
54025896c4 Merge fe1b325688 into merged_master (Bitcoin PR bitcoin/bitcoin#27029) 2025-04-06 21:44:29 +02:00
Byron Hambly
30170c6bd9 Merge aef8b4f43b into merged_master (Bitcoin PR bitcoin/bitcoin#26226) 2025-04-03 11:42:16 +02:00
Byron Hambly
4b62493f28 Merge 0c2a1288a2 into merged_master (Bitcoin PR bitcoin/bitcoin#26835) 2025-04-02 10:02:41 +02:00
Byron Hambly
b4405ba453 Merge e9262ea32a into merged_master (Bitcoin PR bitcoin/bitcoin#26750) 2025-03-31 16:37:52 +02:00
Byron Hambly
6658d3ce4b Merge 9c47eb4503 into merged_master (Bitcoin PR bitcoin/bitcoin#26446) 2025-03-03 15:12:03 +02:00
Byron Hambly
ca0a68b350
Merge UP TO 551c8e9526 into merged_master (UP TO bitcoin/bitcoin#26349)
Includes FIXMEs for a few functional tests
2025-02-05 09:50:17 +02:00
Byron Hambly
24ef305cd0 Merge a9ffebddbe into merged_master (Bitcoin PR bitcoin/bitcoin#26075) 2024-11-27 11:25:12 +02:00
Byron Hambly
076e809b74 Merge 821f5c824f into merged_master (Bitcoin PR bitcoin/bitcoin#25487) 2024-10-17 09:16:23 +02:00
James Dorfman
6d638f8e4d Merge a09033e22c into merged_master (Bitcoin PR bitcoin/bitcoin#25409) 2024-09-16 00:03:15 +00:00
James Dorfman
941d1a4586 Merge 3b3c66f859 into merged_master (Bitcoin PR bitcoin/bitcoin#25392) 2024-09-10 23:50:46 +00:00
James Dorfman
ac7b05a27d Merge 8035b5c80d into merged_master (Bitcoin PR bitcoin/bitcoin#25369) 2024-09-10 20:10:06 +00:00
James Dorfman
b6df20eb34 Merge d4475ea7ae into merged_master (Bitcoin PR bitcoin/bitcoin#22235) 2024-08-09 04:52:58 +00:00
James Dorfman
ede65a76c3 Merge 0047d9b89b into merged_master (Bitcoin PR bitcoin/bitcoin#24993) 2024-08-09 04:20:20 +00:00
James Dorfman
7ed5fcfb0f Merge 9446de160f into merged_master (Bitcoin PR bitcoin/bitcoin#24831) 2024-08-06 18:50:35 +00:00
James Dorfman
9d2e5152cd Merge bdbabc50ba into merged_master (Bitcoin PR bitcoin/bitcoin#24561) 2024-05-24 00:32:01 +00:00
fanquake
11ee058ef5
tidy: remove C compiler check
Also requires disabling FFI.
2024-03-22 13:48:00 +00:00
fanquake
c3a4ea1971
tidy: set CMAKE_CXX_STANDARD to 20 2024-03-22 13:38:23 +00:00