Commit graph

951 commits

Author SHA1 Message Date
Byron Hambly
cbd7b123d9 Merge fc06881f13 into merged_master (Bitcoin PR bitcoin/bitcoin#27491) 2025-06-19 16:08:36 +02:00
Byron Hambly
1c2926b7c8 Merge 0eae93e65f into merged_master (Bitcoin PR bitcoin/bitcoin#26780) 2025-05-15 10:38:15 +02:00
Byron Hambly
5ac82e15a9 Merge 669af32632 into merged_master (Bitcoin PR bitcoin/bitcoin#27419) 2025-05-09 11:47:45 +02:00
Byron Hambly
0b1508bf01
ci: fix lint issues 2025-04-17 11:06:32 +02:00
Byron Hambly
e23e51f9ef Merge 369d4c03b7 into merged_master (Bitcoin PR bitcoin/bitcoin#27254) 2025-04-12 12:19:09 +02:00
Byron Hambly
59a4dcb178 Merge cbfbf46e57 into merged_master (Bitcoin PR bitcoin/bitcoin#25781) 2025-04-10 09:10:09 +02:00
Tom Trevethan
7acb7e26fb Merge 6e662a8985 into merged_master (Bitcoin PR bitcoin/bitcoin#23813) 2025-04-09 20:45:38 +00:00
Byron Hambly
d559388e4e Merge 5e1aab2334 into merged_master (Bitcoin PR bitcoin/bitcoin#27155) 2025-04-09 13:29:33 +02:00
Tom Trevethan
e09c9ea798 Merge 832fa2d238 into merged_master (Bitcoin PR bitcoin/bitcoin#25574) 2025-04-08 17:05:26 +00:00
Tom Trevethan
5b2b315520 Merge 9a288430df into merged_master (Bitcoin PR bitcoin/bitcoin#26900) 2025-04-04 14:21:48 +00:00
Tom Trevethan
1435fb334b Merge 79e007d1d6 into merged_master (Bitcoin PR bitcoin/bitcoin#25296) 2025-04-04 13:36:08 +00:00
Byron Hambly
c0a9017312 Merge a8c1ea50c7 into merged_master (Bitcoin PR bitcoin/bitcoin#26919) 2025-04-04 09:27:27 +02:00
Byron Hambly
27a72d99f5 Merge 7799f53542 into merged_master (Bitcoin PR bitcoin/bitcoin#26039) 2025-04-02 23:02:13 +02:00
Byron Hambly
1c6f71d9e8 Merge 04e54fd21f into merged_master (Bitcoin PR bitcoin/bitcoin#26325) 2025-04-02 21:53:32 +02:00
Tom Trevethan
ef3c367aa4 Merge 1801d8c3c9 into merged_master (Bitcoin PR bitcoin/bitcoin#26308) 2025-03-25 16:20:40 +00:00
Tom Trevethan
2897263ebf Merge 5d9b5305af into merged_master (Bitcoin PR bitcoin/bitcoin#19888) 2025-03-17 13:04:28 +00:00
Byron Hambly
028fd5fcbb Merge 5b3f05b7eb into merged_master (Bitcoin PR bitcoin/bitcoin#24226) 2025-03-04 13:22:16 +02:00
Byron Hambly
483d59e533
Merge df2f16666c into merged_master (Bitcoin PR bitcoin/bitcoin#26508) 2025-03-03 12:10:24 +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
72cac1605e
doc: clean up some fixme comments 2024-12-20 11:45:04 +02:00
Byron Hambly
8499b13762
lint: fix lint issues 2024-12-03 14:02:33 +02:00
Byron Hambly
70c819546f Merge aa2420cd18 into merged_master (Elements PR #1368) 2024-12-02 09:20:42 +02:00
Byron Hambly
b80b3aeff4 Merge 3a7e0a210c into merged_master (Bitcoin PR bitcoin/bitcoin#24513) 2024-11-26 14:42:49 +02:00
Byron Hambly
d7ccdef889 Merge 141540a71f into merged_master (Bitcoin PR bitcoin/bitcoin#25222) 2024-11-26 13:55:27 +02:00
Byron Hambly
68e38e5baf Merge 01e1627e25 into merged_master (Bitcoin PR bitcoin/bitcoin#25872) 2024-11-25 14:46:13 +02:00
Byron Hambly
b9abd5638d Merge a65f6d8cbb into merged_master (Bitcoin PR bitcoin/bitcoin#25699) 2024-10-18 14:44:59 +02:00
Byron Hambly
bcb3d32074 Merge f27d5f6305 into merged_master (Bitcoin PR bitcoin/bitcoin#25691) 2024-10-18 13:54:51 +02:00
Byron Hambly
ad4ecee6c0 Merge 895937edb2 into merged_master (Bitcoin PR bitcoin/bitcoin#25285) 2024-10-17 17:33:20 +02:00
Byron Hambly
21648b79ea Merge 5560682a44 into merged_master (Bitcoin PR bitcoin/bitcoin#25645) 2024-10-17 17:15:38 +02:00
James Dorfman
e938673fbd Merge 55b76ac1c0 into merged_master (Bitcoin PR bitcoin/bitcoin#25615) 2024-10-16 07:07:54 +00:00
James Dorfman
bf5189aa76 Merge c30b3e90f0 into merged_master (Bitcoin PR bitcoin/bitcoin#25472) 2024-10-16 05:44:43 +00:00
James Dorfman
a6d5d4ead6 Merge 46fcb52cb1 into merged_master (Bitcoin PR bitcoin/bitcoin#24944) 2024-10-16 05:04:19 +00:00
James Dorfman
d2ee4baaa2 Merge 53b1a2426c into merged_master (Bitcoin PR bitcoin/bitcoin#25471) 2024-10-09 05:41:28 +00:00
Andrew Poelstra
2532c4a6c4
rpc: add simplicity to getdeploymentinfo 2024-10-08 14:41:39 +00:00
James Dorfman
61b0543ba7 Merge cdcc74bbcc into merged_master (Elements PR #1270) 2024-09-23 16:51:13 +00:00
James Dorfman
412ab3ab46 Merge ee3ba5a76f into merged_master (Bitcoin PR bitcoin/bitcoin#25485) 2024-09-17 18:36:11 +00:00
James Dorfman
a95a6d31b2 Merge fa07ee165e into merged_master (Bitcoin PR bitcoin/bitcoin#25339) 2024-09-10 19:20:49 +00:00
James Dorfman
c472e94b84 Merge 8f3ab9a1b1 into merged_master (Bitcoin PR bitcoin/bitcoin#24931) 2024-09-09 21:13:17 +00:00
James Dorfman
d4a4f5d919 Merge 581e2bdbac into merged_master (Bitcoin PR bitcoin/bitcoin#24629) 2024-09-09 17:35:34 +00:00
James Dorfman
25c2ea0027 Merge 86cc31dab6 into merged_master (Bitcoin PR bitcoin/bitcoin#25249) 2024-09-06 19:20:19 +00:00
James Dorfman
db3aa6dd4a Merge 7008087548 into merged_master (Bitcoin PR bitcoin/bitcoin#24410) 2024-09-06 06:21:07 +00:00
James Dorfman
66bc45020f Merge 4d0c00dffd into merged_master (Bitcoin PR bitcoin/bitcoin#25168) 2024-08-13 20:10:21 +00:00
James Dorfman
06a6044137 Merge 0de36941ec into merged_master (Bitcoin PR bitcoin/bitcoin#25153) 2024-08-13 06:00:38 +00:00
James Dorfman
31df518140 Merge 7b3343f300 into merged_master (Bitcoin PR bitcoin/bitcoin#25108) 2024-08-13 04:20:55 +00:00
James Dorfman
a738660dbd Merge 8270740bef into merged_master (Bitcoin PR bitcoin/bitcoin#25114) 2024-08-12 04:44:05 +00:00
James Dorfman
72c9d9e01c Merge b019cdc036 into merged_master (Bitcoin PR bitcoin/bitcoin#25095) 2024-08-12 04:01:58 +00:00
James Dorfman
cb961ed28e Merge 1511c9efb4 into merged_master (Bitcoin PR bitcoin/bitcoin#24640) 2024-08-12 03:16:51 +00:00
James Dorfman
5854eae590 Merge 25dd4d8513 into merged_master (Bitcoin PR bitcoin/bitcoin#24595) 2024-08-12 02:29:42 +00:00
James Dorfman
3eb8d9b89e Merge 27d7b11e8c into merged_master (Bitcoin PR bitcoin/bitcoin#25106) 2024-08-09 17:48:02 +00:00
James Dorfman
3361822d32 Merge 59ac8bacd5 into merged_master (Bitcoin PR bitcoin/bitcoin#24804) 2024-08-09 16:39:33 +00:00