Commit graph

764 commits

Author SHA1 Message Date
Byron Hambly
e23e51f9ef Merge 369d4c03b7 into merged_master (Bitcoin PR bitcoin/bitcoin#27254) 2025-04-12 12:19:09 +02:00
Byron Hambly
e04de3e652 Merge 3963067555 into merged_master (Bitcoin PR bitcoin/bitcoin#26642) 2025-04-11 22:28:06 +02:00
Thomas Trevethan
9406f21187 Merge e695d8536e into merged_master (Bitcoin PR bitcoin/bitcoin#26177) 2025-04-11 12:02:49 +01:00
Byron Hambly
59a4dcb178 Merge cbfbf46e57 into merged_master (Bitcoin PR bitcoin/bitcoin#25781) 2025-04-10 09:10:09 +02:00
Byron Hambly
e24c402fac Merge b175bdb9b2 into merged_master (Bitcoin PR bitcoin/bitcoin#27238) 2025-04-10 08:26:17 +02:00
Byron Hambly
28ddb39e46 Merge 40d0b0a524 into merged_master (Bitcoin PR bitcoin/bitcoin#27239) 2025-04-10 07:04:03 +02:00
Tom Trevethan
842220464b Merge 2de0559f2c into merged_master (Bitcoin PR bitcoin/bitcoin#27189) 2025-04-09 18:54:57 +00:00
Tom Trevethan
d9ae059581 Merge d5e4f9a439 into merged_master (Bitcoin PR bitcoin/bitcoin#25740) 2025-04-09 18:53:55 +00:00
Tom Trevethan
0ab95ded19 Merge fc037c8c83 into merged_master (Bitcoin PR bitcoin/bitcoin#27150) 2025-04-09 17:42:19 +00:00
Byron Hambly
6ec7ce1641 Merge bb136aaf2c into merged_master (Bitcoin PR bitcoin/bitcoin#26533) 2025-04-09 12:28:27 +02:00
Byron Hambly
8c39ab51c2 Merge 519ec2650e into merged_master (Bitcoin PR bitcoin/bitcoin#27157) 2025-04-09 12:20:55 +02:00
Tom Trevethan
e09c9ea798 Merge 832fa2d238 into merged_master (Bitcoin PR bitcoin/bitcoin#25574) 2025-04-08 17:05:26 +00:00
Byron Hambly
61dada4d59 Merge 08b65df1bb into merged_master (Bitcoin PR bitcoin/bitcoin#26883) 2025-04-07 10:22:15 +02:00
Byron Hambly
9d216df88a Merge 9321df4487 into merged_master (Bitcoin PR bitcoin/bitcoin#25862) 2025-04-07 09:44:14 +02:00
Byron Hambly
a429c96e07 Merge 1bcabe6f2a into merged_master (Bitcoin PR bitcoin-core/gui#697) 2025-04-05 15:06:43 +02:00
Byron Hambly
3d66973c33 Merge 7241b936c5 into merged_master (Bitcoin PR bitcoin/bitcoin#26965) 2025-04-05 08:26:09 +02:00
Tom Trevethan
669ddecaca Merge 0a1d372ad0 into merged_master (Bitcoin PR bitcoin/bitcoin#26649) 2025-04-04 15:50:36 +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
7d07e14d44 Merge 6b7ccb98a5 into merged_master (Bitcoin PR bitcoin/bitcoin#26251) 2025-04-02 14:56:26 +00:00
Byron Hambly
bb18aed1c1 Merge 2f6a8e5e02 into merged_master (Bitcoin PR bitcoin/bitcoin#26695) 2025-04-01 21:37:29 +02:00
Tom Trevethan
147febdae3 Merge 65ecf24b5c into merged_master (Bitcoin PR bitcoin/bitcoin#26752) 2025-04-01 13:25:03 +00:00
Byron Hambly
80b3fcae86 Merge 80fc1af096 into merged_master (Bitcoin PR bitcoin/bitcoin#26289) 2025-04-01 09:10:14 +02:00
Byron Hambly
b4405ba453 Merge e9262ea32a into merged_master (Bitcoin PR bitcoin/bitcoin#26750) 2025-03-31 16:37:52 +02:00
Tom Trevethan
3f43afa4b9 Merge 7d51560003 into merged_master (Bitcoin PR bitcoin/bitcoin#26298) 2025-03-25 12:09:21 +00:00
Tom Trevethan
387af571cd Merge 1ff79292e3 into merged_master (Bitcoin PR bitcoin/bitcoin#26609) 2025-03-24 23:33:59 +00:00
Byron Hambly
6274a3e6a7 Merge bcee94d107 into merged_master (Bitcoin PR bitcoin/bitcoin#26359) 2025-03-04 11:18:33 +02:00
Byron Hambly
da8b6f2f7f
Merge d0b1f613c2 into merged_master (Bitcoin PR bitcoin/bitcoin#17786) 2025-03-03 11:12:31 +02:00
Byron Hambly
12db384dd7
Merge d7efd310f8 into merged_master (Elements PR #1400) 2025-02-12 15:14:37 +02:00
Pablo Greco
b703da1148 Fix build with gcc-15 2025-02-11 06:14:51 -08:00
MarcoFalke
371718bc99
Use CAmount for fee delta and modified fee
Cherry-pick of fa84a49526
https://github.com/bitcoin/bitcoin/pull/24625 (2/2)
2025-02-11 02:58:42 +00: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
a6f8dc6a86
tidy: fixes for clang tidy ci job 2024-12-04 14:16:45 +02:00
Byron Hambly
8499b13762
lint: fix lint issues 2024-12-03 14:02:33 +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
41692b9515 Merge 36e1b52511 into merged_master (Bitcoin PR bitcoin/bitcoin#25951) 2024-11-26 10:42:49 +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
54b236050d Merge e9035f867a into merged_master (Bitcoin PR bitcoin/bitcoin#25717)
The new minchainwork test was modified to use bitcoin regtest instead of
elements, which required a few changes and a FIXME.
2024-11-22 14:26:38 +02:00
Byron Hambly
7a022fb75d Merge c5f0cbefa3 into merged_master (Bitcoin PR bitcoin/bitcoin#25775) 2024-11-04 15:04:48 +02:00
Byron Hambly
3fd262a515 Merge 0f35f4ddf4 into merged_master (Bitcoin PR bitcoin/bitcoin#25786) 2024-11-04 12:32:04 +02:00
Byron Hambly
1006327a13 Merge 9eaef10801 into merged_master (Bitcoin PR bitcoin/bitcoin#25707) 2024-11-04 11:26:40 +02:00
Byron Hambly
79d275ea14 Merge 7312effe6a into merged_master (Bitcoin PR bitcoin/bitcoin#25527) 2024-10-25 11:03:47 +02:00
Byron Hambly
12dbf6cb9d Merge f6fdedf850 into merged_master (Bitcoin PR bitcoin/bitcoin#25648) 2024-10-24 20:20:13 +02:00
Byron Hambly
f88268fb7c Merge da23320998 into merged_master (Bitcoin PR bitcoin/bitcoin#25651) 2024-10-24 14:21:48 +02:00
Byron Hambly
52148abe10 Merge 5871b5b5ab into merged_master (Bitcoin PR bitcoin/bitcoin#25571) 2024-10-24 12:30:38 +02:00
Byron Hambly
cd56e507a9 Merge 6dc3084eec into merged_master (Bitcoin PR bitcoin/bitcoin#25668) 2024-10-18 13:21:40 +02:00
Byron Hambly
28d35f619e Merge 510ac41eac into merged_master (Bitcoin PR bitcoin/bitcoin#25331) 2024-10-18 13:14:02 +02:00
Byron Hambly
715350d30c Merge 1eedde157f into merged_master (Bitcoin PR bitcoin/bitcoin#25638) 2024-10-17 17:43:57 +02:00
Byron Hambly
d71cdde1aa Merge 0897b189e4 into merged_master (Bitcoin PR bitcoin/bitcoin#25308) 2024-10-17 17:25:50 +02:00
Byron Hambly
21648b79ea Merge 5560682a44 into merged_master (Bitcoin PR bitcoin/bitcoin#25645) 2024-10-17 17:15:38 +02:00
Byron Hambly
2081703f71 Merge 92c8e1849d into merged_master (Bitcoin PR bitcoin/bitcoin#25494) 2024-10-17 17:06:13 +02:00