Commit graph

2402 commits

Author SHA1 Message Date
Byron Hambly
15ee93eec6 Merge 8741cd88b4 into merged_master (Bitcoin PR bitcoin/bitcoin#26913) 2025-04-03 11:17:09 +02:00
Byron Hambly
70fcaeee5d Merge e6ff110820 into merged_master (Bitcoin PR bitcoin/bitcoin#26810) 2025-04-03 10:40:27 +02:00
Byron Hambly
4b62493f28 Merge 0c2a1288a2 into merged_master (Bitcoin PR bitcoin/bitcoin#26835) 2025-04-02 10:02:41 +02:00
Tom Trevethan
0fa67e0cb9 Merge 296e882250 into merged_master (Bitcoin PR bitcoin/bitcoin#26598) 2025-04-01 15:13:59 +00:00
Tom Trevethan
a42526d5d7 Merge 4717a5aa31 into merged_master (Bitcoin PR bitcoin/bitcoin#26772) 2025-04-01 09:57:06 +00:00
Byron Hambly
2210416134 Merge f301bf52ab into merged_master (Bitcoin PR bitcoin/bitcoin#26257) 2025-04-01 08:27:16 +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
047c6214c2 Merge 06dd571534 into merged_master (Bitcoin PR bitcoin/bitcoin#26748) 2025-03-31 16:30:09 +02:00
Tom Trevethan
9bb1474ac0 Merge bbfcbcfa0c into merged_master (Bitcoin PR bitcoin/bitcoin#24611) 2025-03-25 14:13:15 +00:00
Byron Hambly
df7b13ca93 Merge a035b6a0c4 into merged_master (Bitcoin PR bitcoin/bitcoin#26565) 2025-03-04 10:43:34 +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
d804a76d50 Merge 0fe225e378 into merged_master (Bitcoin PR bitcoin/bitcoin#26470) 2025-03-03 15:09:32 +02:00
Byron Hambly
ac19bab3c5 Merge 32599766ca into merged_master (Bitcoin PR bitcoin/bitcoin#26335) 2025-03-03 15:01:52 +02:00
Byron Hambly
07aebbf505
lint: fixes 2025-02-14 15:54:27 +02:00
Byron Hambly
a12e099e07
Merge 24b43eaa66 into merged_master (Elements PR #1413) 2025-02-14 14:14:34 +02:00
Byron Hambly
2f1b86e84a
lint: fix shellcheck, spelling, and locale 2025-02-13 16:08:39 +02:00
Byron Hambly
5f6c1e599f
Merge 8a948be6df into merged_master (Elements PR #1210) 2025-02-13 11:10:35 +02:00
Byron Hambly
8a948be6df
Merge pull request #1210 from gwillen/feature-andrew-merge-script
Check in Andrew's script for merging changes into Elements integration branch
2025-02-13 09:48:39 +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
8499b13762
lint: fix lint issues 2024-12-03 14:02:33 +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
222570ec21 Merge 1d6c605165 into merged_master (Bitcoin PR bitcoin/bitcoin#26057) 2024-11-27 10:47:00 +02:00
Byron Hambly
627bc0cfe6 Merge a361c6cae7 into merged_master (Bitcoin PR bitcoin/bitcoin#26047) 2024-11-26 13:54:37 +02:00
Byron Hambly
ed3a451efb Merge 995fdef14a into merged_master (Bitcoin PR bitcoin/bitcoin#26059) 2024-11-26 13:36:21 +02:00
Byron Hambly
6b70e5124c Merge 3c5fb9691b into merged_master (Bitcoin PR bitcoin/bitcoin#26007) 2024-11-26 13:09:22 +02:00
Byron Hambly
79c64f7721 Merge 19585eeb77 into merged_master (Bitcoin PR bitcoin/bitcoin#25853) 2024-11-26 13:03:52 +02:00
Byron Hambly
1cba475520 Merge b2215b316d into merged_master (Bitcoin PR bitcoin/bitcoin#26018) 2024-11-26 13:03:49 +02:00
Byron Hambly
32ac81efbc Merge df31e468b9 into merged_master (Bitcoin PR bitcoin/bitcoin#25861) 2024-11-26 11:55:28 +02:00
Byron Hambly
c5086c4549 Merge 1420547ec3 into merged_master (Bitcoin PR bitcoin/bitcoin#25911) 2024-11-22 09:09:14 +02:00
Byron Hambly
0f2eb6fd58 Merge aa774f3e11 into merged_master (Bitcoin PR bitcoin/bitcoin#25829) 2024-11-03 15:50:57 +02:00
Byron Hambly
1a1b2d1d88 Merge 0f90b58686 into merged_master (Bitcoin PR bitcoin/bitcoin#25833) 2024-11-02 16:56:56 +02:00
Byron Hambly
2aadddfd48 Merge b1a2021f78 into merged_master (Bitcoin PR bitcoin/bitcoin#25788) 2024-10-29 14:27:49 +02:00
Byron Hambly
fe630216d1 Merge 92f6461cfd into merged_master (Bitcoin PR bitcoin/bitcoin#25779) 2024-10-25 12:24:22 +02:00
Byron Hambly
a49deb7571 Merge 8e37afcb13 into merged_master (Bitcoin PR bitcoin/bitcoin#25484) 2024-10-24 12:54:03 +02:00
Byron Hambly
65fbede59b Merge 86133df7a2 into merged_master (Bitcoin PR bitcoin/bitcoin#25662) 2024-10-18 12:35:26 +02:00
Byron Hambly
6db4ca0b66 Merge d67f89bd95 into merged_master (Bitcoin PR bitcoin/bitcoin#25625)
Commented out the change to the psbt test with a FIXME, due to
differences between PSBT/PSET
2024-10-18 12:05:54 +02:00
Byron Hambly
f9818655f1 Merge ad466b85cd into merged_master (Bitcoin PR bitcoin/bitcoin#25639) 2024-10-17 15:32:00 +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
1aeb46938b Merge c49b0405fb into merged_master (Bitcoin PR bitcoin/bitcoin#25558) 2024-10-13 06:58:09 +00:00
James Dorfman
a585dc698b Merge 5ab6a94276 into merged_master (Bitcoin PR bitcoin/bitcoin#25552) 2024-10-13 06:28:13 +00:00
James Dorfman
34a2f8869b Merge 9fb2a2bc67 into merged_master (Bitcoin PR bitcoin/bitcoin#25536) 2024-10-09 18:27:25 +00:00
James Dorfman
7005cb67f0 Merge ca08e00a1b into merged_master (Bitcoin PR bitcoin/bitcoin#25508) 2024-10-09 05:41:14 +00:00
James Dorfman
1e00030f3f Merge b04f42efe3 into merged_master (Bitcoin PR bitcoin/bitcoin#25490) 2024-10-09 05:39:30 +00:00
James Dorfman
009eeb3714 Merge ceae0eb7e3 into merged_master (Bitcoin PR bitcoin/bitcoin#25437) 2024-09-19 19:05:34 +00:00
James Dorfman
2a2ffcbeb4 Merge 1b5610852e into merged_master (Bitcoin PR bitcoin/bitcoin#25488) 2024-09-17 18:36:17 +00:00
James Dorfman
4b69418986 Merge aaeb315ff0 into merged_master (Bitcoin PR bitcoin/bitcoin#25357) 2024-09-16 05:49:46 +00:00
James Dorfman
4444780579 Merge 0dd3477333 into merged_master (Bitcoin PR bitcoin/bitcoin#25458) 2024-09-16 05:25:34 +00:00
James Dorfman
5218e5f117 Merge 7377ed778c into merged_master (Bitcoin PR bitcoin/bitcoin#25389) 2024-09-16 04:08:52 +00: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